From 816a29f84460e39e355b3899592fbebbfedb53bd Mon Sep 17 00:00:00 2001
From: "peterv%netscape.com" <peterv%netscape.com>
Date: Sun, 8 Apr 2001 14:40:12 +0000
Subject: [PATCH] Fix for 74873 (Make transformiix |#include|s better). Patch
 by Axel Hecht. Not part of default build. r=peterv, sr=scc.

---
 extensions/transformiix/build/Makefile.in     |   2 +-
 extensions/transformiix/build/makefile.win    |   2 +-
 .../transformiix/macbuild/transformiix.mcp    | Bin 87720 -> 87720 bytes
 .../source/base/CommandLineUtils.h            |  12 +-
 .../transformiix/source/base/Double.cpp       |  10 +-
 .../transformiix/source/base/ErrorObserver.h  |   6 +-
 extensions/transformiix/source/base/List.h    |   6 +-
 extensions/transformiix/source/base/Makefile  |   6 +-
 .../transformiix/source/base/Makefile.in      |   2 +-
 .../transformiix/source/base/NamedMap.cpp     |   6 +-
 .../transformiix/source/base/NamedMap.h       |  10 +-
 extensions/transformiix/source/base/Stack.h   |  11 +-
 .../source/base/StringComparator.h            |  10 +-
 .../transformiix/source/base/StringList.h     |  10 +-
 .../transformiix/source/base/Tokenizer.h      |  11 +-
 .../transformiix/source/base/TxObject.h       |  16 ++-
 ...EObjectWrapper.cpp => TxObjectWrapper.cpp} |  14 +--
 .../transformiix/source/base/TxString.cpp     |  97 ++--------------
 .../transformiix/source/base/TxString.h       | 104 ++----------------
 .../transformiix/source/base/makefile.win     |   4 +-
 .../transformiix/source/base/primitives.h     |  18 +--
 .../transformiix/source/main/Makefile.in      |   2 +-
 .../transformiix/source/main/makefile.win     |   2 +-
 .../transformiix/source/main/transformiix.cpp |   3 +-
 .../transformiix/source/net/URIUtils.cpp      |   6 +-
 extensions/transformiix/source/net/URIUtils.h |  10 +-
 .../source/xml/NamespaceResolver.h            |   6 +-
 .../transformiix/source/xml/XMLDOMUtils.h     |   8 +-
 extensions/transformiix/source/xml/XMLUtils.h |   8 +-
 extensions/transformiix/source/xml/dom/dom.h  |   7 +-
 .../xml/dom/mozImpl/MozillaDocument.cpp       |  14 +--
 .../source/xml/dom/mozImpl/makedom            |   2 +-
 .../source/xml/dom/mozImpl/mozilladom.h       |   6 +-
 .../source/xml/dom/standalone/dom.h           |   2 +-
 .../source/xml/parser/XMLParser.h             |   9 +-
 .../source/xml/printer/HTMLPrinter.cpp        |   6 +-
 .../source/xml/printer/printers.h             |  12 +-
 .../source/xml/util/DOMHelper.cpp             |  20 ++--
 .../transformiix/source/xml/util/DOMHelper.h  |  10 +-
 .../source/xpath/AttributeExpr.cpp            |   3 +-
 .../source/xpath/BooleanFunctionCall.cpp      |   5 +-
 .../transformiix/source/xpath/ElementExpr.cpp |   3 +-
 extensions/transformiix/source/xpath/Expr.h   |  41 +++----
 .../transformiix/source/xpath/ExprLexer.h     |   7 +-
 .../transformiix/source/xpath/ExprParser.cpp  |   6 +-
 .../transformiix/source/xpath/ExprParser.h    |   9 +-
 .../transformiix/source/xpath/ExprResult.h    |   8 +-
 .../transformiix/source/xpath/FunctionLib.h   |  23 ++--
 .../source/xpath/MultiplicativeExpr.cpp       |   5 +-
 .../transformiix/source/xpath/NodeSet.h       |   5 +-
 .../source/xpath/NodeSetFunctionCall.cpp      |   7 +-
 .../source/xpath/NumberFunctionCall.cpp       |   5 +-
 .../source/xpath/StringFunctionCall.cpp       |   7 +-
 extensions/transformiix/source/xslt/Names.h   |   6 +-
 .../transformiix/source/xslt/Numbering.cpp    |   5 +-
 .../transformiix/source/xslt/Numbering.h      |   6 +-
 .../source/xslt/ProcessorState.cpp            |  31 ++++--
 .../transformiix/source/xslt/ProcessorState.h |  10 +-
 .../source/xslt/VariableBinding.h             |   9 +-
 .../source/xslt/XSLTProcessor.cpp             |  14 ++-
 .../transformiix/source/xslt/XSLTProcessor.h  |  20 +---
 .../xslt/functions/CurrentFunctionCall.cpp    |   1 +
 .../xslt/functions/DocumentFunctionCall.cpp   |   1 +
 .../xslt/functions/ElementAvailableFnCall.cpp |   1 +
 .../functions/FunctionAvailableFnCall.cpp     |   1 +
 .../xslt/functions/GenerateIdFunctionCall.cpp |   3 +-
 .../functions/SystemPropertyFunctionCall.cpp  |   1 +
 .../source/xslt/functions/XSLTFunctions.h     |  16 ++-
 .../source/xslt/util/NodeSorter.cpp           |   5 +-
 .../source/xslt/util/NodeSorter.h             |  22 ++--
 .../transformiix/source/xslt/util/NodeStack.h |  13 +--
 71 files changed, 308 insertions(+), 481 deletions(-)
 rename extensions/transformiix/source/base/{MITREObjectWrapper.cpp => TxObjectWrapper.cpp} (78%)

diff --git a/extensions/transformiix/build/Makefile.in b/extensions/transformiix/build/Makefile.in
index 2225d21dae35..0ef2e13bc647 100644
--- a/extensions/transformiix/build/Makefile.in
+++ b/extensions/transformiix/build/Makefile.in
@@ -38,7 +38,7 @@ OBJS =../source/base/ArrayList.o \
   ../source/base/Double.o \
   ../source/base/Integer.o \
   ../source/base/List.o \
-  ../source/base/MITREObjectWrapper.o \
+  ../source/base/TxObjectWrapper.o \
   ../source/base/Map.o \
   ../source/base/NamedMap.o \
   ../source/base/SimpleErrorObserver.o \
diff --git a/extensions/transformiix/build/makefile.win b/extensions/transformiix/build/makefile.win
index d5f1bcd85219..35d3ce7e13ed 100644
--- a/extensions/transformiix/build/makefile.win
+++ b/extensions/transformiix/build/makefile.win
@@ -39,7 +39,7 @@ CPP_OBJS=							\
 	..\source\base\$(OBJDIR)\Double.obj \
 	..\source\base\$(OBJDIR)\Integer.obj \
 	..\source\base\$(OBJDIR)\List.obj \
-	..\source\base\$(OBJDIR)\MITREObjectWrapper.obj \
+	..\source\base\$(OBJDIR)\TxObjectWrapper.obj \
 	..\source\base\$(OBJDIR)\Map.obj \
 	..\source\base\$(OBJDIR)\NamedMap.obj \
 	..\source\base\$(OBJDIR)\SimpleErrorObserver.obj \
diff --git a/extensions/transformiix/macbuild/transformiix.mcp b/extensions/transformiix/macbuild/transformiix.mcp
index 1e16241b12be99a6b28570e654a5be37e9f03a89..eaf81de635de8e922dbfa6f1e5d5283acae88bdb 100755
GIT binary patch
delta 503
zcmZ9G-z$S*6vv;l*K0DxN{TnEhzqn(yHI{iHnzRqcSbR3ZSx~3wd6uEZnzRz&&AXd
z#l=d~)+6sO-M>rz19#lGkV27O=dn<p`keDUr*oe3O=rY(M$EQBZ;lXhO^9WgkP4I}
zN1o=an1NLB61$C$Q<wxUfAZDq05y#KHd}-yQ>{)+eE$1IF>Z<&kODgsGE%7}h-EI}
z%(F^cyrpttO^q(i&#q3cL}Ib|6?*VuOZeBBV|dX7S(@@Bsl!`meonU;#?cM4?tB0Z
z$Thq{h-?%aOG<^v&G_h+B7sa(%3HmPwHK*Ixb<#i6j2aAJ6BKfpRq$xN3S})2>X~L
zkT=uUU}u@zBfEH)wN8Hug6#6r<C%W`O&8LPlptluFzpLTFhZw84;}oR8{wz86+7ZV
zxCI{~BfsbAxq3+(!gq8qut)bJ5){~dBz~*yc0o)KbsWtlPg<erPujE-fOjaygnvkz
q>H*23rCd-|A{M?EvOTy^l(_qE!L5}m;1ppYDUX94LfXbSv<qK(qJ~fa

delta 444
zcmZ3nmUYEi)(zT>wi_527!EKna7QvQ@Bo<%8yJdqtYKhq;^0}fAOR!*1<XJiqyS8B
zdv{gn|Nnpen==@dnIum!FflMNLewPzsXA650mP>_FJWFQJ<)yNW`2cQwaHVzN>2>v
z-)!cd!8Cc1=ah*7ER)T=q}bnGss8_ep7mzI*58bigM7q*0yPW_xjhhpEI%GjZ=i7?
zt9>R{`$;qUPM+@fT`~a3_X1)OAQk{(V<7eeV*kyn{TDM%W>YMkygyK#@#N%p3ErE{
zf_AWPwn{Q&nJgd2D%I->RA&UlDnQHv#O^@M0mL4YtKy^?Jtt3#d#(vG-wlXCW`pe3
z2V#(YAh-Acu`dvV?VG&Xf6L^!g!_~2f+kKrl_))VVWREkXNk2JHs3tAlxg|{6UNWe
zn@t&2w=ZC1{KW_%CkD7|kFa8t=4M?9G{$OsfGeXh%XDK;bX9KKx%?O%SsB%)`vf!U
NGs<nR31-w`1^`GoctZdH

diff --git a/extensions/transformiix/source/base/CommandLineUtils.h b/extensions/transformiix/source/base/CommandLineUtils.h
index bf59aadfce89..5ed45b6caead 100644
--- a/extensions/transformiix/source/base/CommandLineUtils.h
+++ b/extensions/transformiix/source/base/CommandLineUtils.h
@@ -21,20 +21,18 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: CommandLineUtils.h,v 1.3 2000/04/13 06:40:07 kvisco%ziplink.net Exp $
+ * $Id: CommandLineUtils.h,v 1.4 2001/04/08 14:38:03 peterv%netscape.com Exp $
  */
 
-#include "baseutils.h"
-#include "StringList.h"
-#include "NamedMap.h"
-#include "TxString.h"
-
 #ifndef TRANSFRMX_COMMANDLINEUTILS_H
 #define TRANSFRMX_COMMANDLINEUTILS_H
 
+#include "StringList.h"
+#include "NamedMap.h"
+
 /**
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.3 $ $Date: 2000/04/13 06:40:07 $
+ * @version $Revision: 1.4 $ $Date: 2001/04/08 14:38:03 $
 **/
 class CommandLineUtils {
 
diff --git a/extensions/transformiix/source/base/Double.cpp b/extensions/transformiix/source/base/Double.cpp
index 553c99e965ea..645406703645 100644
--- a/extensions/transformiix/source/base/Double.cpp
+++ b/extensions/transformiix/source/base/Double.cpp
@@ -27,10 +27,18 @@
  * Eric Du, duxy@leyou.com.cn
  *   -- added fix for FreeBSD
  *
- * $Id: Double.cpp,v 1.3 2000/02/18 00:11:23 kvisco%ziplink.net Exp $
+ * $Id: Double.cpp,v 1.4 2001/04/08 14:38:13 peterv%netscape.com Exp $
  */
 
 #include "primitives.h"
+#include  <math.h>
+#ifdef WIN32
+#include <float.h>
+#endif
+//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+#ifdef __FreeBSD__
+#include <floatingpoint.h>
+#endif
 
 //----------------------------/
 //- Implementation of Double -/
diff --git a/extensions/transformiix/source/base/ErrorObserver.h b/extensions/transformiix/source/base/ErrorObserver.h
index da007b8a67d4..4868afd4eee8 100644
--- a/extensions/transformiix/source/base/ErrorObserver.h
+++ b/extensions/transformiix/source/base/ErrorObserver.h
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: ErrorObserver.h,v 1.3 2000/04/12 22:30:37 nisheeth%netscape.com Exp $
+ * $Id: ErrorObserver.h,v 1.4 2001/04/08 14:38:18 peterv%netscape.com Exp $
  */
 
 #ifndef MITRE_ERROROBSERVER_H
@@ -29,12 +29,12 @@
 
 #include "baseutils.h"
 #include "TxString.h"
-#include "iostream.h"
+#include <iostream.h>
 
 /**
  * A simple interface for observing errors
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.3 $ $Date: 2000/04/12 22:30:37 $
+ * @version $Revision: 1.4 $ $Date: 2001/04/08 14:38:18 $
 **/
 class ErrorObserver {
 
diff --git a/extensions/transformiix/source/base/List.h b/extensions/transformiix/source/base/List.h
index c86ae8e3dc2a..7ae8cc4a5c25 100644
--- a/extensions/transformiix/source/base/List.h
+++ b/extensions/transformiix/source/base/List.h
@@ -21,14 +21,14 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: List.h,v 1.6 2000/05/29 07:14:03 kvisco%ziplink.net Exp $
+ * $Id: List.h,v 1.7 2001/04/08 14:35:50 peterv%netscape.com Exp $
  */
 
-#include "baseutils.h"
-
 #ifndef TRANSFRMX_LIST_H
 #define TRANSFRMX_LIST_H
 
+#include "baseutils.h"
+
 /**
  * Represents an ordered list of Object pointers. Modeled after a Java 2 List.
 **/
diff --git a/extensions/transformiix/source/base/Makefile b/extensions/transformiix/source/base/Makefile
index f3f7fc1fe477..f39719cdb4ac 100644
--- a/extensions/transformiix/source/base/Makefile
+++ b/extensions/transformiix/source/base/Makefile
@@ -9,7 +9,7 @@ BASE_OBJS = ArrayList.o               \
             Integer.o \
             List.o \
             Map.o \
-            MITREObjectWrapper.o \
+            TxObjectWrapper.o \
             NamedMap.o \
             SimpleErrorObserver.o \
             Stack.o \
@@ -41,8 +41,8 @@ List.o: List.h List.cpp
 Map.o: Map.h Map.cpp
 	$(CC) -c Map.cpp
 
-MITREObjectWrapper.o: MITREObject.h MITREObjectWrapper.cpp
-	$(CC) -c MITREObjectWrapper.cpp
+TxObjectWrapper.o: TxObject.h TxObjectWrapper.cpp
+	$(CC) -c TxObjectWrapper.cpp
 
 NamedMap.o: TxString.h NamedMap.h NamedMap.cpp
 	$(CC) -c NamedMap.cpp
diff --git a/extensions/transformiix/source/base/Makefile.in b/extensions/transformiix/source/base/Makefile.in
index e1898ce75d6a..8e5ac4d109f5 100644
--- a/extensions/transformiix/source/base/Makefile.in
+++ b/extensions/transformiix/source/base/Makefile.in
@@ -32,7 +32,7 @@ CPPSRCS	= ArrayList.cpp             \
 	Integer.cpp \
 	List.cpp \
 	Map.cpp \
-	MITREObjectWrapper.cpp \
+	TxObjectWrapper.cpp          \
 	NamedMap.cpp \
 	SimpleErrorObserver.cpp \
 	Stack.cpp \
diff --git a/extensions/transformiix/source/base/NamedMap.cpp b/extensions/transformiix/source/base/NamedMap.cpp
index 4043ca3aa2c8..483b29673ea0 100644
--- a/extensions/transformiix/source/base/NamedMap.cpp
+++ b/extensions/transformiix/source/base/NamedMap.cpp
@@ -25,13 +25,13 @@
  *    -- fixed memory leak in NamedMap::hashKey method by deleting
  *       up char[] chars;
  *
- * $Id: NamedMap.cpp,v 1.6 2001/04/03 12:36:04 peterv%netscape.com Exp $
+ * $Id: NamedMap.cpp,v 1.7 2001/04/08 14:36:06 peterv%netscape.com Exp $
  */
 
 /**
- * A Named Map for MITREObjects
+ * A Named Map for TxObjects
  * @author <a href="kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.6 $ $Date: 2001/04/03 12:36:04 $
+ * @version $Revision: 1.7 $ $Date: 2001/04/08 14:36:06 $
 **/
 
 #include "NamedMap.h"
diff --git a/extensions/transformiix/source/base/NamedMap.h b/extensions/transformiix/source/base/NamedMap.h
index 5e5d088a234b..81da62bd56ad 100644
--- a/extensions/transformiix/source/base/NamedMap.h
+++ b/extensions/transformiix/source/base/NamedMap.h
@@ -21,25 +21,23 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: NamedMap.h,v 1.5 2001/01/22 09:38:29 kvisco%ziplink.net Exp $
+ * $Id: NamedMap.h,v 1.6 2001/04/08 14:36:55 peterv%netscape.com Exp $
  */
 
 /**
- * A Named Map for MITREObjects
+ * A Named Map for TxObjects
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.5 $ $Date: 2001/01/22 09:38:29 $
+ * @version $Revision: 1.6 $ $Date: 2001/04/08 14:36:55 $
 **/
 
 #ifndef TRANSFRMX_NAMEDMAP_H
 #define TRANSFRMX_NAMEDMAP_H
 
-#include "TxString.h"
 #include "baseutils.h"
-#include "MITREObject.h"
 #include "TxObject.h"
 #include "StringList.h"
 
-class NamedMap : public MITREObject {
+class NamedMap : public TxObject {
 
 
 public:
diff --git a/extensions/transformiix/source/base/Stack.h b/extensions/transformiix/source/base/Stack.h
index fac9a5b023e0..8cda6acb616c 100644
--- a/extensions/transformiix/source/base/Stack.h
+++ b/extensions/transformiix/source/base/Stack.h
@@ -21,22 +21,21 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: Stack.h,v 1.2 1999/11/15 07:12:41 nisheeth%netscape.com Exp $
+ * $Id: Stack.h,v 1.3 2001/04/08 14:39:07 peterv%netscape.com Exp $
  */
 
 /**
  * Stack
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.2 $ $Date: 1999/11/15 07:12:41 $
+ * @version $Revision: 1.3 $ $Date: 2001/04/08 14:39:07 $
 **/
 
-#include "List.h"
-#include "baseutils.h"
-
-
 #ifndef MITRE_STACK_H
 #define MITRE_STACK_H
 
+#include "List.h"
+#include "baseutils.h"
+
 typedef ListIterator StackIterator;
 
 class Stack : private List {
diff --git a/extensions/transformiix/source/base/StringComparator.h b/extensions/transformiix/source/base/StringComparator.h
index 3d3ce3a9e693..598a0674ebe7 100644
--- a/extensions/transformiix/source/base/StringComparator.h
+++ b/extensions/transformiix/source/base/StringComparator.h
@@ -20,14 +20,14 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: StringComparator.h,v 1.2 2000/04/12 22:30:54 nisheeth%netscape.com Exp $
+ * $Id: StringComparator.h,v 1.3 2001/04/08 14:39:12 peterv%netscape.com Exp $
  */
 
- #include "TxString.h"
- #include "TxObject.h"
+#ifndef TRANSFRMX_STRING_COMPARATOR_H
+#define TRANSFRMX_STRING_COMPARATOR_H
 
- #ifndef TRANSFRMX_STRING_COMPARATOR_H
- #define TRANSFRMX_STRING_COMPARATOR_H
+#include "TxString.h"
+#include "TxObject.h"
 
 /*
    An interface for handling String comparisons
diff --git a/extensions/transformiix/source/base/StringList.h b/extensions/transformiix/source/base/StringList.h
index c9a3f6b45bfc..499171048662 100644
--- a/extensions/transformiix/source/base/StringList.h
+++ b/extensions/transformiix/source/base/StringList.h
@@ -23,21 +23,21 @@
  * Bob Miller, kbob@oblix.com
  *    -- plugged core leak.
  *
- * $Id: StringList.h,v 1.8 2000/04/12 22:30:57 nisheeth%netscape.com Exp $
+ * $Id: StringList.h,v 1.9 2001/04/08 14:34:37 peterv%netscape.com Exp $
  */
 
 /**
  * A class for keeping an ordered list of Strings
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.8 $ $Date: 2000/04/12 22:30:57 $
+ * @version $Revision: 1.9 $ $Date: 2001/04/08 14:34:37 $
 **/
 
-#include "TxString.h"
-#include "baseutils.h"
-
 #ifndef TRANSFRMX_STRINGLIST_H
 #define TRANSFRMX_STRINGLIST_H
 
+#include "TxString.h"
+#include "baseutils.h"
+
 class StringList {
    friend class StringListIterator;
 
diff --git a/extensions/transformiix/source/base/Tokenizer.h b/extensions/transformiix/source/base/Tokenizer.h
index 83b2390d7a8f..b499443c51e9 100644
--- a/extensions/transformiix/source/base/Tokenizer.h
+++ b/extensions/transformiix/source/base/Tokenizer.h
@@ -25,24 +25,23 @@
  * Larry Fitzpatrick, OpenText, lef@opentext.com
  *    -- 19990806, added void return type declaration for ::nextToken()
  *
- * $Id: Tokenizer.h,v 1.3 2000/04/12 22:31:03 nisheeth%netscape.com Exp $
+ * $Id: Tokenizer.h,v 1.4 2001/04/08 14:38:39 peterv%netscape.com Exp $
  */
 
 /**
  * Tokenizer
  * A simple String tokenizer
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.3 $ $Date: 2000/04/12 22:31:03 $
+ * @version $Revision: 1.4 $ $Date: 2001/04/08 14:38:39 $
 **/
 
 
-#include "baseutils.h"
-#include "TxString.h"
-
-
 #ifndef MITRE_TOKENIZER_H
 #define MITRE_TOKENIZER_H
 
+#include "baseutils.h"
+#include "TxString.h"
+
 class Tokenizer {
 
 public:
diff --git a/extensions/transformiix/source/base/TxObject.h b/extensions/transformiix/source/base/TxObject.h
index aa99df61252e..88fc25bb0553 100644
--- a/extensions/transformiix/source/base/TxObject.h
+++ b/extensions/transformiix/source/base/TxObject.h
@@ -19,15 +19,15 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: TxObject.h,v 1.3 2000/06/11 12:29:54 Peter.VanderBeken%pandora.be Exp $
+ * $Id: TxObject.h,v 1.4 2001/04/08 14:38:44 peterv%netscape.com Exp $
  */
 
 
-#include "baseutils.h"
-
 #ifndef TRANSFRMX_TXOBJECT_H
 #define TRANSFRMX_TXOBJECT_H
 
+#include "baseutils.h"
+
 class TxObject {
 
  public:
@@ -59,4 +59,14 @@ class TxObject {
     } //-- equals
 };
 
+/**
+ * A Simple TxObject wrapper class
+**/
+class TxObjectWrapper : public TxObject {
+public:
+    TxObjectWrapper();
+    virtual ~TxObjectWrapper();
+    void* object;
+};
+
 #endif
diff --git a/extensions/transformiix/source/base/MITREObjectWrapper.cpp b/extensions/transformiix/source/base/TxObjectWrapper.cpp
similarity index 78%
rename from extensions/transformiix/source/base/MITREObjectWrapper.cpp
rename to extensions/transformiix/source/base/TxObjectWrapper.cpp
index d200bc0ab3b8..347f3f646421 100644
--- a/extensions/transformiix/source/base/MITREObjectWrapper.cpp
+++ b/extensions/transformiix/source/base/TxObjectWrapper.cpp
@@ -20,27 +20,25 @@
  * Contributor(s): 
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
- *
- * $Id: MITREObjectWrapper.cpp,v 1.3 2000/02/22 11:09:51 kvisco%ziplink.net Exp $
  */
 
-#include "MITREObject.h"
+#include "TxObject.h"
 
    //--------------------------------------/
-  //- A Simple MITREObject wrapper class -/
+  //- A Simple TxObject wrapper class -/
  //--------------------------------------/
 
 /**
  * Default Constructor
 **/
-MITREObjectWrapper::MITREObjectWrapper() {
+TxObjectWrapper::TxObjectWrapper() {
     this->object = 0;
-} //-- MITREObjectWrapper
+} //-- TxObjectWrapper
 
 /**
  * Default destructor
 **/
-MITREObjectWrapper::~MITREObjectWrapper() {
+TxObjectWrapper::~TxObjectWrapper() {
     this->object = 0;
-} //-- ~MITREObjectWrapper
+} //-- ~TxObjectWrapper
 
diff --git a/extensions/transformiix/source/base/TxString.cpp b/extensions/transformiix/source/base/TxString.cpp
index 669563860d43..8908f337df19 100644
--- a/extensions/transformiix/source/base/TxString.cpp
+++ b/extensions/transformiix/source/base/TxString.cpp
@@ -15,99 +15,16 @@
  * lost profits even if the Copyright owner has been advised of the
  * possibility of their occurrence.
  *
- * Please see release.txt distributed with this file for more information.
+ * Contributor(s):
+ *
+ * Tom Kneeland
+ *    -- original author.
+ *
+ * Keith Visco <kvisco@ziplink.net>
+ * Larry Fitzpatrick
  *
  */
 
-// Tom Kneeland (3/17/99)
-//
-//  Implementation of a simple String class
-//
-// Modification History:
-// Who  When      What
-// TK   03/17/99  Created
-// TK   03/23/99  Released without "lastIndexOf" functions
-// TK   04/02/99  Added support for 'const' strings, and added
-//                'operator=' for constant char*.
-// TK   04/09/99  Overloaded the output operator (<<).  Currently it only
-//                supports outputing the String to a C sytle character based
-//                stream.
-// TK   04/09/99  Provided support for the extraction of the DOM_CHAR
-//                representation of the string.  The new method, "toDomChar()"
-//                returns a constant pointer to the internal DOM_CHAR string
-//                buffer.
-// TK   04/10/99  Added the implementation for appending an array of DOM_CHARs
-//                to a string.  It should be noted that a length needs to be
-//                provided in order to determine the length of the source
-//                array.
-// TK   04/22/99  Fixed a bug where setting a string equal to NULL would cause
-//                a core dump.  Also added support for constructing a string
-//                using the NULL identifier.
-//                Modified the output operator (<<) to accept a const String
-//                reference.  This eliminates a wasteful copy constructor call.
-// TK   04/28/99  Modified the clear() method to leave the DOM_CHAR array
-//                in place.
-// TK   04/28/99  Added 3 new member functions: insert, deleteChars, and
-//                replace.
-// TK   05/05/99  Added support for implicit integer conversion.  This allows
-//                integers to be appended, inserted, and used as replacements
-//                for DOM_CHARs. To support this feature, ConvertInt has been
-//                added which converts the given integer to a string and stores
-//                it in the target.
-// TK   05/05/99  Converted DOM_CHAR to UNICODE_CHAR
-//
-// KV   07/29/1999  Added lastIndexOf methods
-// KV   07/29/1999  Changed indexOf methods with no offset, to call the
-//                  indexOf methods with offset of 0. This allows re-use of
-//                  code, makes it easier to debug, and minimizes the size of
-//                  the implementation
-// LF  08/06/1999   In method #operator=,
-//                  added line: return *this
-// KV  08/11/1999  changed charAt to return -1, if index is out of bounds, instead of 0,
-//                 since 0, is a valid character, and this makes my code more compatible
-//                 with Java
-// KV  08/11/1999  removed PRBool, uses baseutils.h (MBool)
-// TK  12/03/1999  Made some of the interface functions virtual, to support
-//                 wrapping Mozilla nsStrings in a String interface
-// TK  12/09/1999  Since "String" can be extended, we can not be certin of its
-//                 implementation, therefore any function accepting a String
-//                 object as an argument must only deal with its public
-//                 interface.  The following member functions have been
-//                 modified: append, insert, replace, indexOf, isEqual,
-//                           lastIndexOf, and subString
-//
-//                 Modified subString(Int32 start, String& dest) to simmply
-//                 call subString(Int32 start, Int32 end, String& dest).  This
-//                 helps with code reuse.
-//
-//                 Made ConvetInt a protected member function so it is
-//                 available to classes derrived from String.  This is possible
-//                 since the implementation of ConvertInt only uses the public
-//                 interface of String
-//
-//                 Made UnicodeLength a protected member function since it
-//                 only calculates the length of a null terminated UNICODE_CHAR
-//                 array.
-// TK  12/17/1999  To support non-null terminated UNICODE_CHAR* arrays, an
-//                 additional insert function has been added that accepts a
-//                 length parameter.
-//
-//                 Modified append(const UNICODE_CHAR* source) to simply
-//                 calculate the length of the UNICODE_CHAR array, and then
-//                 defer its processing to
-//                 append(const UNICODE_CHAR* source, Int32 sourceLength)
-// TK  12/22/1999  Enhanced Trim() to to remove additional "white space"
-//                 characters (added \n, \t, and \r).
-//
-// TK  02/14/2000  Added a constructon  which accepts a UNICODE_CHAR* array, and
-//                 its associated length.
-//
-// TK  03/10/2000  Fixed a bug found by Bobbi Guarino where 
-//                 String::indexOf(const String& string...) was not RETURNing
-//                 a value.
-//
-// TK  03/30/2000  Changed toChar to toCharArray and provided an overloaded
-//                 version which will instantiate its own character buffer.
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/extensions/transformiix/source/base/TxString.h b/extensions/transformiix/source/base/TxString.h
index 38cebfccdb1c..de056d27142b 100644
--- a/extensions/transformiix/source/base/TxString.h
+++ b/extensions/transformiix/source/base/TxString.h
@@ -15,106 +15,20 @@
  * lost profits even if the Copyright owner has been advised of the
  * possibility of their occurrence.
  *
- * Please see release.txt distributed with this file for more information.
+ * Contributor(s):
+ *
+ * Tom Kneeland
+ *    -- original author.
+ *
+ * Keith Visco <kvisco@ziplink.net>
+ * Larry Fitzpatrick
  *
  */
-// Tom Kneeland (3/17/99)
-//
-//  Implementation of a simple string class
-//
-// Modification History:
-// Who  When      What
-// TK   03/17/99  Created
-// TK   03/23/99  Released without "lastIndexOf" functions
-// TK   04/02/99  Added support for 'const' strings, and added
-//                'operator=' for constant char*.
-// TK   04/09/99  Overloaded the output operator (<<).  Currently it only
-//                supports outputing the String to a C sytle character based
-//                stream.
-// TK   04/09/99  Provided support for the extraction of the DOM_CHAR
-//                representation of the string.  The new method, "toDomChar()"
-//                returns a constant pointer to the internal DOM_CHAR string
-//                buffer.
-// TK   04/10/99  Added the implementation for appending an array of DOM_CHARs
-//                to a string.  It should be noted that a length needs to be
-//                provided in order to determine the length of the source
-//                array.
-// TK   04/22/99  Fixed a bug where setting a string equal to NULL would cause
-//                a core dump.  Also added support for constructing a string
-//                using the NULL identifier.
-//                Modified the output operator (<<) to accept a const String
-//                reference.  This eliminates a wasteful copy constructor call.
-// TK   04/28/99  Modified the clear() method to leave the DOM_CHAR array
-//                in place.
-// TK   04/28/99  Added 3 new member functions: insert, deleteChars, and
-//                replace.
-// TK   05/05/99  Added support for implicit integer conversion.  This allows
-//                integers to be appended, inserted, and used as replacements
-//                for DOM_CHARs. To support this feature, ConvertInt has been
-//                added which converts the given integer to a string and stores
-//                it in the target.
-// TK   05/05/99  Converted the typedef DOM_CHAR to UNICODE_CHAR.
-//
-// KV   07/29/99  Added lastIndexOf methods
-// KV   07/29/99  Changed indexOf methods with no offset, to call the
-//                indexOf methods with offset of 0. This allows re-use of
-//                code, makes it easier to debug, and minimizes the size of
-//                the implementation
-// LF  08/06/1999   In method #operator=,
-//                  added line: return *this
-// KV  08/11/1999  changed charAt to return -1, if index is out of bounds, instead of 0,
-//                 since 0, is a valid character, and this makes my code more compatible
-//                 with Java
-// KV  08/11/1999  removed PRBool, uses baseutils.h (MBool)
-// TK  12/03/1999  Made some of the interface functions virtual, to support
-//                 wrapping Mozilla nsStrings in a String interface
-// TK  12/09/1999  Since "String" can be extended, we can not be certin of its
-//                 implementation, therefore any function accepting a String
-//                 object as an argument must only deal with its public
-//                 interface.  The following member functions have been
-//                 modified: append, insert, replace, indexOf, isEqual,
-//                           lastIndexOf, and subString
-//
-//                 Modified subString(Int32 start, String& dest) to simmply
-//                 call subString(Int32 start, Int32 end, String& dest).  This
-//                 helps with code reuse.
-//
-//                 Made ConvetInt a protected member function so it is
-//                 available to classes derrived from String.  This is possible
-//                 since the implementation of ConvertInt only uses the public
-//                 interface of String
-//
-//                 Made UnicodeLength a protected member function since it
-//                 only calculates the length of a null terminated UNICODE_CHAR
-//                 array.
-// TK  12/17/1999  To support non-null terminated UNICODE_CHAR* arrays, an
-//                 additional insert function has been added that accepts a
-//                 length parameter.
-//
-//                 Modified append(const UNICODE_CHAR* source) to simply
-//                 calculate the length of the UNICODE_CHAR array, and then
-//                 defer its processing to
-//                 append(const UNICODE_CHAR* source, Int32 sourceLength)
-// TK  12/21/1999  To support non-null terminated UNICODE_CHAR* arrays, an
-//                 additional replace function has been added that accepts a
-//                 length parameter.
-//
-//                 Modified replace(Int32 offset, const UNICODE_CHAR* source)
-//                 to simply call the new replace function passing the computed
-//                 length of the null terminated UNICODE_CHAR array.
-// TK  12/22/1999  Enhanced Trim() to to remove additional "white space"
-//                 characters (added \n, \t, and \r).
-//
-// TK  02/14/2000  Added a constructon  which accepts a UNICODE_CHAR* array, and
-//                 its associated length.
-//
-// TK  03/30/2000  Changed toChar to toCharArray and provided an overloaded
-//                 version which will instantiate its own character buffer.
 
 #ifndef MITRE_STRING
 #define MITRE_STRING
 
-#include "MITREObject.h"
+#include "TxObject.h"
 #include "baseutils.h"
 #include <iostream.h>
 
@@ -131,7 +45,7 @@ typedef unsigned short UNICODE_CHAR;
 
 #define NOT_FOUND -1
 
-class String : public MITREObject
+class String : public TxObject
 {
   //Translate UNICODE_CHARs to Chars and output to the provided stream
   friend ostream& operator<<(ostream& output, const String& source);
diff --git a/extensions/transformiix/source/base/makefile.win b/extensions/transformiix/source/base/makefile.win
index 440f5c235c42..41ca6646f0db 100644
--- a/extensions/transformiix/source/base/makefile.win
+++ b/extensions/transformiix/source/base/makefile.win
@@ -31,7 +31,7 @@ CPPSRCS=				\
 	Double.cpp			\
 	Integer.cpp			\
 	List.cpp			\
-	MITREObjectWrapper.cpp		\
+	TxObjectWrapper.cpp		\
 	NamedMap.cpp			\
 	SimpleErrorObserver.cpp		\
 	Stack.cpp			\
@@ -57,7 +57,7 @@ CPP_OBJS=                                       \
 	.\$(OBJDIR)\Double.obj			\
 	.\$(OBJDIR)\Integer.obj			\
 	.\$(OBJDIR)\List.obj			\
-	.\$(OBJDIR)\MITREObjectWrapper.obj	\
+	.\$(OBJDIR)\TxObjectWrapper.obj	\
 	.\$(OBJDIR)\NamedMap.obj		\
 	.\$(OBJDIR)\SimpleErrorObserver.obj	\
 	.\$(OBJDIR)\Stack.obj			\
diff --git a/extensions/transformiix/source/base/primitives.h b/extensions/transformiix/source/base/primitives.h
index 2515cc2d6cec..a08b71589346 100644
--- a/extensions/transformiix/source/base/primitives.h
+++ b/extensions/transformiix/source/base/primitives.h
@@ -28,26 +28,16 @@
  * Eric Du, duxy@leyou.com.cn
  *   -- added fix for FreeBSD
  *
- * $Id: primitives.h,v 1.5 2000/04/12 22:31:09 nisheeth%netscape.com Exp $
+ * $Id: primitives.h,v 1.6 2001/04/08 14:37:07 peterv%netscape.com Exp $
  */
 
 
 #ifndef MITRE_PRIMITIVES_H
 #define MITRE_PRIMITIVES_H
 
-#include "MITREObject.h"
+#include "TxObject.h"
 #include "baseutils.h"
 #include "TxString.h"
-#include  <math.h>
-
-#ifdef WIN32
-#include <float.h>
-#endif
-
-//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
-#ifdef __FreeBSD__
-#include <floatingpoint.h>
-#endif
 
 /**
  * A wrapper for the primitive double type, and provides some simple
@@ -55,7 +45,7 @@
  * @author <a href="mailto:lef@opentext.com">Larry Fitzpatrick</a>
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
 **/
-class Double : public MITREObject {
+class Double : public TxObject {
 
 public:
 
@@ -142,7 +132,7 @@ private:
  * integer related routines
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
 **/
-class Integer : public MITREObject {
+class Integer : public TxObject {
 public:
 
     /**
diff --git a/extensions/transformiix/source/main/Makefile.in b/extensions/transformiix/source/main/Makefile.in
index ac22f35a3fd9..92c658d95230 100644
--- a/extensions/transformiix/source/main/Makefile.in
+++ b/extensions/transformiix/source/main/Makefile.in
@@ -34,7 +34,7 @@ OBJS =../base/ArrayList.o \
   ../base/Double.o \
   ../base/Integer.o \
   ../base/List.o \
-  ../base/MITREObjectWrapper.o \
+  ../base/TxObjectWrapper.o \
   ../base/Map.o \
   ../base/NamedMap.o \
   ../base/SimpleErrorObserver.o \
diff --git a/extensions/transformiix/source/main/makefile.win b/extensions/transformiix/source/main/makefile.win
index 478f3417705e..e3276a4b2a2f 100644
--- a/extensions/transformiix/source/main/makefile.win
+++ b/extensions/transformiix/source/main/makefile.win
@@ -31,7 +31,7 @@ CPP_OBJS=                                       \
   ../base/$(OBJDIR)/Double.obj \
   ../base/$(OBJDIR)/Integer.obj \
   ../base/$(OBJDIR)/List.obj \
-  ../base/$(OBJDIR)/MITREObjectWrapper.obj \
+  ../base/$(OBJDIR)/TxObjectWrapper.obj \
   ../base/$(OBJDIR)/Map.obj \
   ../base/$(OBJDIR)/NamedMap.obj \
   ../base/$(OBJDIR)/SimpleErrorObserver.obj \
diff --git a/extensions/transformiix/source/main/transformiix.cpp b/extensions/transformiix/source/main/transformiix.cpp
index 998f0aa41143..795510ef5c69 100644
--- a/extensions/transformiix/source/main/transformiix.cpp
+++ b/extensions/transformiix/source/main/transformiix.cpp
@@ -31,11 +31,12 @@
  *    -- read XML from stdin when -i is omitted
  *    -- accept '-' to specify stdin/stdout on command line
  *
- * $Id: transformiix.cpp,v 1.8 2001/03/06 00:12:37 Peter.VanderBeken%pandora.be Exp $
+ * $Id: transformiix.cpp,v 1.9 2001/04/08 14:34:43 peterv%netscape.com Exp $
  */
 
 
 #include "XSLTProcessor.h"
+#include "CommandLineUtils.h"
 
   //--------------/
  //- Prototypes -/
diff --git a/extensions/transformiix/source/net/URIUtils.cpp b/extensions/transformiix/source/net/URIUtils.cpp
index 514c92f3fee3..6a01fc84d1b8 100644
--- a/extensions/transformiix/source/net/URIUtils.cpp
+++ b/extensions/transformiix/source/net/URIUtils.cpp
@@ -29,7 +29,7 @@
  *   -- 20000326
  *     -- added Mozilla integration code
  *
- * $Id: URIUtils.cpp,v 1.9 2001/04/03 12:37:49 peterv%netscape.com Exp $
+ * $Id: URIUtils.cpp,v 1.10 2001/04/08 14:34:16 peterv%netscape.com Exp $
  */
 
 #include "URIUtils.h"
@@ -38,7 +38,7 @@
  * URIUtils
  * A set of utilities for handling URIs
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.9 $ $Date: 2001/04/03 12:37:49 $
+ * @version $Revision: 1.10 $ $Date: 2001/04/08 14:34:16 $
 **/
 
 #ifndef MOZ_XSL
@@ -377,4 +377,4 @@ void main(int argc, char** argv) {
 
 }
 */
-#endif
\ No newline at end of file
+#endif
diff --git a/extensions/transformiix/source/net/URIUtils.h b/extensions/transformiix/source/net/URIUtils.h
index 9fdae38aaa98..44756affb2c2 100644
--- a/extensions/transformiix/source/net/URIUtils.h
+++ b/extensions/transformiix/source/net/URIUtils.h
@@ -31,9 +31,12 @@
  *   -- 20000326
  *     -- added Mozilla integration code
  *
- * $Id: URIUtils.h,v 1.11 2001/03/06 00:12:31 Peter.VanderBeken%pandora.be Exp $
+ * $Id: URIUtils.h,v 1.12 2001/04/08 14:33:35 peterv%netscape.com Exp $
  */
 
+#ifndef TRANSFRMX_URIUTILS_H
+#define TRANSFRMX_URIUTILS_H
+
 #include "TxString.h"
 #include "baseutils.h"
 #ifndef MOZ_XSL
@@ -49,14 +52,11 @@ static NS_DEFINE_CID(kIOServiceCID,              NS_IOSERVICE_CID);
 #endif
 
 
-#ifndef TRANSFRMX_URIUTILS_H
-#define TRANSFRMX_URIUTILS_H
-
 /**
  * A utility class for URI handling
  * Not yet finished, only handles file URI at this point
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.11 $ $Date: 2001/03/06 00:12:31 $
+ * @version $Revision: 1.12 $ $Date: 2001/04/08 14:33:35 $
  *
 **/
 
diff --git a/extensions/transformiix/source/xml/NamespaceResolver.h b/extensions/transformiix/source/xml/NamespaceResolver.h
index b3c248bdb39c..72b5ae26c7be 100644
--- a/extensions/transformiix/source/xml/NamespaceResolver.h
+++ b/extensions/transformiix/source/xml/NamespaceResolver.h
@@ -16,15 +16,15 @@
  * Peter Van der Beken, Peter.VanderBeken@pandora.be
  *   -- original author.
  *
- * $Id: NamespaceResolver.h,v 1.5 2001/01/24 14:44:01 axel%pike.org Exp $
+ * $Id: NamespaceResolver.h,v 1.6 2001/04/08 14:37:03 peterv%netscape.com Exp $
  */
 
 
-#include "TxString.h"
-
 #ifndef TRANSFRMX_NAMESPACE_RESOLVER_H
 #define TRANSFRMX_NAMESPACE_RESOLVER_H
 
+#include "TxString.h"
+
 /**
  * A class that returns the relevant namespace URI for a node.
 **/
diff --git a/extensions/transformiix/source/xml/XMLDOMUtils.h b/extensions/transformiix/source/xml/XMLDOMUtils.h
index 8f6a3c86a7e8..f2e8cf6181f4 100644
--- a/extensions/transformiix/source/xml/XMLDOMUtils.h
+++ b/extensions/transformiix/source/xml/XMLDOMUtils.h
@@ -21,17 +21,17 @@
  * Keith Visco 
  *    -- original author.
  *
- * $Id: XMLDOMUtils.h,v 1.8 2001/01/22 09:32:40 kvisco%ziplink.net Exp $
+ * $Id: XMLDOMUtils.h,v 1.9 2001/04/08 14:34:48 peterv%netscape.com Exp $
  */
 
 
+#ifndef TRANSFRMX_XMLDOMUTILS_H
+#define TRANSFRMX_XMLDOMUTILS_H
+
 #include "dom.h"
 #include "NamespaceResolver.h"
 #include "baseutils.h"
 
-#ifndef TRANSFRMX_XMLDOMUTILS_H
-#define TRANSFRMX_XMLDOMUTILS_H
-
 
 /**
  * A utility class for use with XML DOM implementations
diff --git a/extensions/transformiix/source/xml/XMLUtils.h b/extensions/transformiix/source/xml/XMLUtils.h
index be6ca7194162..47a928af3a20 100644
--- a/extensions/transformiix/source/xml/XMLUtils.h
+++ b/extensions/transformiix/source/xml/XMLUtils.h
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: XMLUtils.h,v 1.4 2001/01/10 11:48:45 axel%pike.org Exp $
+ * $Id: XMLUtils.h,v 1.5 2001/04/08 14:37:51 peterv%netscape.com Exp $
  */
 
 /**
@@ -29,12 +29,12 @@
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
 **/
 
-#include "TxString.h"
-#include "baseutils.h"
-
 #ifndef MITRE_XMLUTILS_H
 #define MITRE_XMLUTILS_H
 
+#include "TxString.h"
+#include "baseutils.h"
+
 class XMLUtils {
 
 public:
diff --git a/extensions/transformiix/source/xml/dom/dom.h b/extensions/transformiix/source/xml/dom/dom.h
index 1fc5b143f489..e849fdf6af0a 100644
--- a/extensions/transformiix/source/xml/dom/dom.h
+++ b/extensions/transformiix/source/xml/dom/dom.h
@@ -16,13 +16,16 @@
  * Peter Van der Beken
  *    -- original author
  *
- * $Id: dom.h,v 1.8 2000/07/06 12:35:38 axel%pike.org Exp $
+ * $Id: dom.h,v 1.9 2001/04/08 14:34:22 peterv%netscape.com Exp $
  */
 
+#ifndef __TX_DOM_WRAPPER__
+#define __TX_DOM_WRAPPER__
+
 #ifndef MOZ_XSL
 #include "standalone/dom.h"
 #else
 #include "mozImpl/mozilladom.h"
 #endif
 
-
+#endif
diff --git a/extensions/transformiix/source/xml/dom/mozImpl/MozillaDocument.cpp b/extensions/transformiix/source/xml/dom/mozImpl/MozillaDocument.cpp
index f637a3a3cba5..48ecb97f7c68 100644
--- a/extensions/transformiix/source/xml/dom/mozImpl/MozillaDocument.cpp
+++ b/extensions/transformiix/source/xml/dom/mozImpl/MozillaDocument.cpp
@@ -592,7 +592,7 @@ Node* Document::createWrapper(nsIDOMNode* aNode)
 /**
  * Add a wrapper to the document's hash table using the specified hash value.
  *
- * @param aObj the MITREObject you want to add
+ * @param aObj the TxObject you want to add
  * @param aHashValue the key for the object in the hash table
  */
 void Document::addWrapper(MozillaObjectWrapper* aObject)
@@ -606,12 +606,12 @@ void Document::addWrapper(MozillaObjectWrapper* aObject)
  *
  * @param aHashValue the key for the object you want to remove
  *
- * @return the wrapper as a MITREObject
+ * @return the wrapper as a TxObject
  */
-MITREObject* Document::removeWrapper(nsISupports* aMozillaObject)
+TxObject* Document::removeWrapper(nsISupports* aMozillaObject)
 {
     nsISupportsKey key(aMozillaObject);
-    return (MITREObject*)wrapperHashTable->Remove(&key);
+    return (TxObject*)wrapperHashTable->Remove(&key);
 }
 
 /**
@@ -619,12 +619,12 @@ MITREObject* Document::removeWrapper(nsISupports* aMozillaObject)
  *
  * @param aHashValue the key for the object you want to remove
  *
- * @return the wrapper as a MITREObject
+ * @return the wrapper as a TxObject
  */
-MITREObject* Document::removeWrapper(MozillaObjectWrapper* aObject)
+TxObject* Document::removeWrapper(MozillaObjectWrapper* aObject)
 {
     nsISupportsKey key(aObject->getNSObj());
-    return (MITREObject*)wrapperHashTable->Remove(&key);
+    return (TxObject*)wrapperHashTable->Remove(&key);
 }
 
 
diff --git a/extensions/transformiix/source/xml/dom/mozImpl/makedom b/extensions/transformiix/source/xml/dom/mozImpl/makedom
index 374086208124..599a07c73338 100644
--- a/extensions/transformiix/source/xml/dom/mozImpl/makedom
+++ b/extensions/transformiix/source/xml/dom/mozImpl/makedom
@@ -1,7 +1,7 @@
 target: TestMozDOM
 
 TestMozDOM: MozillaDOMImplementation.o MozillaNotation.o MozillaDocumentFragment.o MozillaDocumentType.o MozillaProcInstruction.o MozillaEntity.o MozillaEntityReference.o MozillaCDATASection.o MozillaComment.o MozillaText.o MozillaCharacterData.o MozillaNamedNodeMap.o MozillaNodeList.o MozillaElement.o MozillaAttr.o MozillaDocument.o MozillaNode.o testMozDOM.o
-	g++ -Xlinker ../../../../../../xpcom/build/libxpcom.so ../../../../../../layout/build/libraptorhtml.so ../../../base/String.o ../../../base/MITREObjectWrapper.o ../../../base/MozillaString.o ../../../base/HashTable.o MozillaNode.o MozillaDocument.o MozillaElement.o MozillaAttr.o MozillaNodeList.o MozillaNamedNodeMap.o MozillaCharacterData.o MozillaText.o MozillaComment.o MozillaCDATASection.o MozillaEntityReference.o MozillaEntity.o MozillaProcInstruction.o MozillaDocumentType.o MozillaDocumentFragment.o MozillaDOMImplementation.o MozillaNotation.o testMozDOM.o -o testdom
+	g++ -Xlinker ../../../../../../xpcom/build/libxpcom.so ../../../../../../layout/build/libraptorhtml.so ../../../base/String.o ../../../base/TxObjectWrapper.o ../../../base/MozillaString.o ../../../base/HashTable.o MozillaNode.o MozillaDocument.o MozillaElement.o MozillaAttr.o MozillaNodeList.o MozillaNamedNodeMap.o MozillaCharacterData.o MozillaText.o MozillaComment.o MozillaCDATASection.o MozillaEntityReference.o MozillaEntity.o MozillaProcInstruction.o MozillaDocumentType.o MozillaDocumentFragment.o MozillaDOMImplementation.o MozillaNotation.o testMozDOM.o -o testdom
 
 testMozDOM.o: testMozDOM.cpp mozilladom.h
 	g++ -c -fno-rtti -fno-exceptions -I../../../../../../dist/include -I../../../../../../layout/xml/document/src -I../../../../../../layout/html/document/src -I../../../../../../layout/base/src -I../../../base testMozDOM.cpp
diff --git a/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h b/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h
index ec9ae737fefd..2b24e2615bdd 100644
--- a/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h
+++ b/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h
@@ -148,7 +148,7 @@ _txClass* Document::_function(nsIDOM##_txClass* aNsObject) \
  * Base wrapper class for a Mozilla object. Owns the Mozilla object through an
  * nsCOMPtr<nsISupports>.
  */
-class MozillaObjectWrapper : public MITREObject
+class MozillaObjectWrapper : public TxObject
 {
     public:
         MozillaObjectWrapper(nsISupports* aNsObject, Document* aOwner);
@@ -301,8 +301,8 @@ class Document : public Node
         // wrapper for it.
         Node* createWrapper(nsIDOMNode* node);
         void addWrapper(MozillaObjectWrapper* aObject);
-        MITREObject* removeWrapper(nsISupports* aMozillaObject);
-        MITREObject* removeWrapper(MozillaObjectWrapper* aObject);
+        TxObject* removeWrapper(nsISupports* aMozillaObject);
+        TxObject* removeWrapper(MozillaObjectWrapper* aObject);
 
         // Factory functions for various node types.  These functions
         // are responsible for storing the wrapper classes they create in 
diff --git a/extensions/transformiix/source/xml/dom/standalone/dom.h b/extensions/transformiix/source/xml/dom/standalone/dom.h
index 9fd62336e545..45068c73385c 100644
--- a/extensions/transformiix/source/xml/dom/standalone/dom.h
+++ b/extensions/transformiix/source/xml/dom/standalone/dom.h
@@ -77,7 +77,7 @@ class DOMImplementation
 // Abstract Class defining the interface for a Node.  See NodeDefinition below
 // for the actual implementation of the WC3 node.
 //
-class Node : public MITREObject
+class Node : public TxObject
 {
   public:
     //Node type constants
diff --git a/extensions/transformiix/source/xml/parser/XMLParser.h b/extensions/transformiix/source/xml/parser/XMLParser.h
index 581fef2dc1c3..453f6553ca6c 100644
--- a/extensions/transformiix/source/xml/parser/XMLParser.h
+++ b/extensions/transformiix/source/xml/parser/XMLParser.h
@@ -23,9 +23,12 @@
  * Keith Visco 
  *    -- finished implementation
  *
- * $Id: XMLParser.h,v 1.8 2001/03/06 00:12:43 Peter.VanderBeken%pandora.be Exp $
+ * $Id: XMLParser.h,v 1.9 2001/04/08 14:34:53 peterv%netscape.com Exp $
  */
 
+#ifndef MITRE_XMLPARSER_H
+#define MITRE_XMLPARSER_H
+
 #include <iostream.h>
 #ifndef XML_UNICODE
 #define XML_UNICODE
@@ -46,7 +49,7 @@ typedef struct  {
  * parsing is provided by EXPAT.
  * @author <a href="tomk@mitre.org">Tom Kneeland</a>
  * @author <a href="kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.8 $ $Date: 2001/03/06 00:12:43 $
+ * @version $Revision: 1.9 $ $Date: 2001/04/08 14:34:53 $
 **/
 class XMLParser
 {
@@ -91,3 +94,5 @@ void endElement(void *userData, const XML_Char* name);
 void piHandler(void *userData, const XML_Char *target, const XML_Char *data);
 void piHandler(void *userData, const XML_Char *s);
 #endif
+
+#endif
diff --git a/extensions/transformiix/source/xml/printer/HTMLPrinter.cpp b/extensions/transformiix/source/xml/printer/HTMLPrinter.cpp
index 55a5dd427929..c440592a5186 100644
--- a/extensions/transformiix/source/xml/printer/HTMLPrinter.cpp
+++ b/extensions/transformiix/source/xml/printer/HTMLPrinter.cpp
@@ -21,7 +21,7 @@
  *
  * Michel Casabianca, casa@sdv.fr
  *    -- added additional empty elements to the HTML tag list
- * $Id: HTMLPrinter.cpp,v 1.4 2000/06/11 12:21:04 Peter.VanderBeken%pandora.be Exp $
+ * $Id: HTMLPrinter.cpp,v 1.5 2001/04/08 14:37:24 peterv%netscape.com Exp $
  */
 
 #include "printers.h"
@@ -34,7 +34,7 @@
  * A class for printing XML nodes.
  * This class was ported from XSL:P Java source
  * @author <a href="kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.4 $ $Date: 2000/06/11 12:21:04 $
+ * @version $Revision: 1.5 $ $Date: 2001/04/08 14:37:24 $
 **/
   //---------------/
  //- Contructors -/
@@ -70,7 +70,7 @@ void HTMLPrinter::initialize(ostream& os, int indentSize) {
     XMLPrinter::setUseEmptyElementShorthand(MB_FALSE);
     setUseFormat(MB_TRUE);
 
-    MITREObject* nonNull = &htmlEmptyTags;
+    TxObject* nonNull = &htmlEmptyTags;
     htmlEmptyTags.put("AREA",       nonNull);
     htmlEmptyTags.put("BASE",       nonNull);
     htmlEmptyTags.put("BASEFONT",   nonNull);
diff --git a/extensions/transformiix/source/xml/printer/printers.h b/extensions/transformiix/source/xml/printer/printers.h
index 2d31bce443c6..42c61a3cfbe1 100755
--- a/extensions/transformiix/source/xml/printer/printers.h
+++ b/extensions/transformiix/source/xml/printer/printers.h
@@ -23,25 +23,25 @@
  * Bob Miller, kbob@oblix.com
  *    -- plugged core leak.
  *
- * $Id: printers.h,v 1.6 2000/11/16 22:08:56 axel%pike.org Exp $
+ * $Id: printers.h,v 1.7 2001/04/08 14:36:18 peterv%netscape.com Exp $
  */
 
 
+#ifndef TRANSFRMX_PRINTERS_H
+#define TRANSFRMX_PRINTERS_H
+
 #include "dom.h"
 #include "TxString.h"
 #include "baseutils.h"
 #include "NamedMap.h"
 #include <iostream.h>
 
-#ifndef TRANSFRMX_PRINTERS_H
-#define TRANSFRMX_PRINTERS_H
-
 
 /**
  * A class for printing XML nodes.
  * This class was ported from XSL:P Java source
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.6 $ $Date: 2000/11/16 22:08:56 $
+ * @version $Revision: 1.7 $ $Date: 2001/04/08 14:36:18 $
 **/
 class XMLPrinter {
 
@@ -244,7 +244,7 @@ private:
  * A class for printing an XML node as non-well-formed HTML
  * This class was ported from XSL:P Java source
  * @author Keith Visco (kvisco@ziplink.net)
- * @version $Revision: 1.6 $ $Date: 2000/11/16 22:08:56 $
+ * @version $Revision: 1.7 $ $Date: 2001/04/08 14:36:18 $
 **/
 class HTMLPrinter : public XMLPrinter {
 
diff --git a/extensions/transformiix/source/xml/util/DOMHelper.cpp b/extensions/transformiix/source/xml/util/DOMHelper.cpp
index 3d5f8d7d6b4f..fed10b0310cf 100644
--- a/extensions/transformiix/source/xml/util/DOMHelper.cpp
+++ b/extensions/transformiix/source/xml/util/DOMHelper.cpp
@@ -19,17 +19,17 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: DOMHelper.cpp,v 1.7 2001/04/03 12:30:26 peterv%netscape.com Exp $
+ * $Id: DOMHelper.cpp,v 1.8 2001/04/08 14:35:00 peterv%netscape.com Exp $
  */
 
 /**
  * A class used to overcome DOM 1.0 deficiencies
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.7 $ $Date: 2001/04/03 12:30:26 $
+ * @version $Revision: 1.8 $ $Date: 2001/04/08 14:35:00 $
 **/
 
 #include "DOMHelper.h"
-
+#include "primitives.h"
 
 /**
  * Creates a new DOMHelper
@@ -115,12 +115,12 @@ Node* DOMHelper::getParentNode(Node* node) {
     if (node->getNodeType() != Node::ATTRIBUTE_NODE)
         return node->getParentNode();
 
-    MITREObjectWrapper* wrapper = 0;
+    TxObjectWrapper* wrapper = 0;
 
-    wrapper = (MITREObjectWrapper*) parents.get(node);
+    wrapper = (TxObjectWrapper*) parents.get(node);
     if (!wrapper) {
         continueIndexing(node);
-        wrapper = (MITREObjectWrapper*) parents.get(node);
+        wrapper = (TxObjectWrapper*) parents.get(node);
     }
 
     if (wrapper) return (Node*)wrapper->object;
@@ -137,9 +137,9 @@ Node* DOMHelper::getParentNode(Node* node) {
  * Adds the given child/parent mapping
 **/
 void DOMHelper::addParentReference(Node* child, Node* parent) {
-    MITREObjectWrapper* wrapper = (MITREObjectWrapper*) parents.get(child);
+    TxObjectWrapper* wrapper = (TxObjectWrapper*) parents.get(child);
     if (!wrapper) {
-        wrapper = new MITREObjectWrapper();
+        wrapper = new TxObjectWrapper();
         parents.put(wrapper, child);
     } 
     wrapper->object = parent;
@@ -153,7 +153,7 @@ void DOMHelper::addParentReference(Node* child, Node* parent) {
 void DOMHelper::continueIndexing(Node* node) {
     if (!node) return;
 
-    MITREObjectWrapper* wrapper = 0;
+    TxObjectWrapper* wrapper = 0;
 
     //-- get indexing information
     Document* doc = 0;
@@ -322,7 +322,7 @@ IndexState::~IndexState() {};
 /**
  * Creates a new OrderInfo
 **/
-OrderInfo::OrderInfo() : MITREObject() {
+OrderInfo::OrderInfo() : TxObject() {
    order = 0;
    size  = 0;
 } //-- OrderInfo
diff --git a/extensions/transformiix/source/xml/util/DOMHelper.h b/extensions/transformiix/source/xml/util/DOMHelper.h
index 376ce6137753..ffcd13333bd9 100644
--- a/extensions/transformiix/source/xml/util/DOMHelper.h
+++ b/extensions/transformiix/source/xml/util/DOMHelper.h
@@ -19,7 +19,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: DOMHelper.h,v 1.5 2001/04/03 12:30:43 peterv%netscape.com Exp $
+ * $Id: DOMHelper.h,v 1.6 2001/04/08 14:36:43 peterv%netscape.com Exp $
  */
 
 #ifndef TRANSFRMX_DOMHELPER_H
@@ -27,11 +27,9 @@
 
 #include "baseutils.h"
 #include "TxString.h"
-#include "List.h"
 #include "dom.h"
 #include "Map.h"
-#include "MITREObject.h"
-#include "primitives.h"
+#include "TxObject.h"
 
 
 //----------------------/
@@ -42,7 +40,7 @@
  * A class used by DOMHelper to hold document order information
  * for DOM Nodes
 **/
-class OrderInfo : public MITREObject {
+class OrderInfo : public TxObject {
 
  public:
 
@@ -59,7 +57,7 @@ class OrderInfo : public MITREObject {
 /**
  * A class used to overcome DOM 1.0 deficiencies
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.5 $ $Date: 2001/04/03 12:30:43 $
+ * @version $Revision: 1.6 $ $Date: 2001/04/08 14:36:43 $
 **/
 class DOMHelper {
 
diff --git a/extensions/transformiix/source/xpath/AttributeExpr.cpp b/extensions/transformiix/source/xpath/AttributeExpr.cpp
index 43660d9c3460..7dc47b8b9af4 100644
--- a/extensions/transformiix/source/xpath/AttributeExpr.cpp
+++ b/extensions/transformiix/source/xpath/AttributeExpr.cpp
@@ -21,10 +21,11 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: AttributeExpr.cpp,v 1.3 2001/01/22 09:36:12 kvisco%ziplink.net Exp $
+ * $Id: AttributeExpr.cpp,v 1.4 2001/04/08 14:37:57 peterv%netscape.com Exp $
  */
 
 #include "Expr.h"
+#include "XMLDOMUtils.h"
 
 /*
   This class represents a Attribute Expression as defined by the XPath
diff --git a/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp b/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp
index 2d1d8794c98c..2f5e5a1c07dd 100644
--- a/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp
+++ b/extensions/transformiix/source/xpath/BooleanFunctionCall.cpp
@@ -24,15 +24,16 @@
  * Marina Mechtcheriakova, mmarina@mindspring.com
  *   -- added lang() implementation
  *
- * $Id: BooleanFunctionCall.cpp,v 1.6 2001/01/22 09:36:13 kvisco%ziplink.net Exp $
+ * $Id: BooleanFunctionCall.cpp,v 1.7 2001/04/08 14:35:34 peterv%netscape.com Exp $
  */
 
 #include "FunctionLib.h"
+#include "Names.h"
 
 /**
  * Creates a default BooleanFunctionCall, which always evaluates to False
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
- * @version $Revision: 1.6 $ $Date: 2001/01/22 09:36:13 $
+ * @version $Revision: 1.7 $ $Date: 2001/04/08 14:35:34 $
 **/
 BooleanFunctionCall::BooleanFunctionCall() : FunctionCall(XPathNames::FALSE_FN) {
     this->type = TX_FALSE;
diff --git a/extensions/transformiix/source/xpath/ElementExpr.cpp b/extensions/transformiix/source/xpath/ElementExpr.cpp
index aa8fe96fbda4..629eb6e45097 100644
--- a/extensions/transformiix/source/xpath/ElementExpr.cpp
+++ b/extensions/transformiix/source/xpath/ElementExpr.cpp
@@ -21,10 +21,11 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: ElementExpr.cpp,v 1.4 2001/01/22 09:36:14 kvisco%ziplink.net Exp $
+ * $Id: ElementExpr.cpp,v 1.5 2001/04/08 14:37:18 peterv%netscape.com Exp $
  */
 
 #include "Expr.h"
+#include "XMLDOMUtils.h"
 
 /*
  This class represents a ElementExpr as defined by XPath 1.0
diff --git a/extensions/transformiix/source/xpath/Expr.h b/extensions/transformiix/source/xpath/Expr.h
index 950d8a1f47d9..f0340d1ea86a 100644
--- a/extensions/transformiix/source/xpath/Expr.h
+++ b/extensions/transformiix/source/xpath/Expr.h
@@ -25,37 +25,32 @@
  *     - changed constant short declarations in many of the classes
  *       with enumerations, commented with //--LF
  *
- * $Id: Expr.h,v 1.9 2001/01/22 09:36:14 kvisco%ziplink.net Exp $
+ * $Id: Expr.h,v 1.10 2001/04/08 14:33:45 peterv%netscape.com Exp $
  */
 
 
-#include <math.h>
-#include "TxString.h"
-#include "ErrorObserver.h"
-#include "NodeSet.h"
-#include "List.h"
-#include "Stack.h"
-#include "dom.h"
-#include "ExprResult.h"
-#include "baseutils.h"
-#include "MITREObject.h"
-#include "primitives.h"
-#include "NamespaceResolver.h"
-#include "XMLDOMUtils.h"
-
-/*
-  XPath class definitions.
-  Much of this code was ported from XSL:P.
-  @version $Revision: 1.9 $ $Date: 2001/01/22 09:36:14 $
-*/
-
 #ifndef TRANSFRMX_EXPR_H
 #define TRANSFRMX_EXPR_H
 
 
+#include "TxString.h"
+#include "ErrorObserver.h"
+#include "NodeSet.h"
+#include "Stack.h"
+#include "ExprResult.h"
+#include "baseutils.h"
+#include "TxObject.h"
+#include "primitives.h"
+#include "NamespaceResolver.h"
+
+/*
+  XPath class definitions.
+  Much of this code was ported from XSL:P.
+  @version $Revision: 1.10 $ $Date: 2001/04/08 14:33:45 $
+*/
+
 //necessary prototypes
 class FunctionCall;
-class NodeSet;
 
 /**
  * The expression context and state class used when evaluating XPath Expressions.
@@ -113,7 +108,7 @@ public:
 /**
  * A Base Class for all XSL Expressions
 **/
-class Expr : public MITREObject {
+class Expr : public TxObject {
 
 public:
 
diff --git a/extensions/transformiix/source/xpath/ExprLexer.h b/extensions/transformiix/source/xpath/ExprLexer.h
index 89b60ba2e79e..1d749edf1dc6 100644
--- a/extensions/transformiix/source/xpath/ExprLexer.h
+++ b/extensions/transformiix/source/xpath/ExprLexer.h
@@ -25,7 +25,7 @@
  *    -- changed constant short declarations in Token and ExprLexer to
  *       enumerations, commented with //--LF
  * 
- * $Id: ExprLexer.h,v 1.5 2001/01/22 09:36:16 kvisco%ziplink.net Exp $
+ * $Id: ExprLexer.h,v 1.6 2001/04/08 14:36:50 peterv%netscape.com Exp $
  */
 
 
@@ -34,9 +34,6 @@
 
 #include "TxString.h"
 #include "baseutils.h"
-#ifndef MOZ_XSL
-#include <iostream.h>
-#endif
 
 /**
  * A Token class for the ExprLexer.
@@ -44,7 +41,7 @@
  * This class was ported from XSL:P, an open source Java based 
  * XSLT processor, written by yours truly.
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.5 $ $Date: 2001/01/22 09:36:16 $
+ * @version $Revision: 1.6 $ $Date: 2001/04/08 14:36:50 $
 **/
 class Token {
 
diff --git a/extensions/transformiix/source/xpath/ExprParser.cpp b/extensions/transformiix/source/xpath/ExprParser.cpp
index 69fdfa8babc8..42e5226c7577 100644
--- a/extensions/transformiix/source/xpath/ExprParser.cpp
+++ b/extensions/transformiix/source/xpath/ExprParser.cpp
@@ -30,7 +30,7 @@
  *   -- fixed bug in ::parsePredicates,
  *      made sure we continue looking for more predicates.
  *
- * $Id: ExprParser.cpp,v 1.9 2001/01/22 21:54:22 axel%pike.org Exp $
+ * $Id: ExprParser.cpp,v 1.10 2001/04/08 14:33:57 peterv%netscape.com Exp $
  */
 
 /**
@@ -38,10 +38,12 @@
  * This class is used to parse XSL Expressions
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
  * @see ExprLexer
- * @version $Revision: 1.9 $ $Date: 2001/01/22 21:54:22 $
+ * @version $Revision: 1.10 $ $Date: 2001/04/08 14:33:57 $
 **/
 
 #include "ExprParser.h"
+#include "FunctionLib.h"
+#include "Names.h"
 
 const String ExprParser::L_CURLY_BRACE = "{";
 const String ExprParser::R_CURLY_BRACE = "}";
diff --git a/extensions/transformiix/source/xpath/ExprParser.h b/extensions/transformiix/source/xpath/ExprParser.h
index b6fba806cf95..ee3d7929904c 100644
--- a/extensions/transformiix/source/xpath/ExprParser.h
+++ b/extensions/transformiix/source/xpath/ExprParser.h
@@ -21,14 +21,14 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: ExprParser.h,v 1.3 2001/01/12 20:06:33 axel%pike.org Exp $
+ * $Id: ExprParser.h,v 1.4 2001/04/08 14:38:23 peterv%netscape.com Exp $
  */
 
 /**
  * ExprParser
  * This class is used to parse XSL Expressions
  * @author <A href="mailto:kvisco@ziplink.net">Keith Visco</A>
- * @version $Revision: 1.3 $ $Date: 2001/01/12 20:06:33 $
+ * @version $Revision: 1.4 $ $Date: 2001/04/08 14:38:23 $
  * @see ExprLexer
 **/
 
@@ -38,12 +38,7 @@
 #include "TxString.h"
 #include "ExprLexer.h"
 #include "Expr.h"
-#include "FunctionLib.h"
 #include "List.h"
-#include "Stack.h"
-#ifndef MOZ_XSL
-#include <iostream.h>
-#endif
 
 class ExprParser {
 
diff --git a/extensions/transformiix/source/xpath/ExprResult.h b/extensions/transformiix/source/xpath/ExprResult.h
index d4a7485a1d7b..103c6cf3becf 100644
--- a/extensions/transformiix/source/xpath/ExprResult.h
+++ b/extensions/transformiix/source/xpath/ExprResult.h
@@ -23,16 +23,14 @@
  * Larry Fitzpatrick, OpenText, lef@opentext.com
  *   -- changed constant short result types to enum
  *
- * $Id: ExprResult.h,v 1.8 2001/01/22 09:36:17 kvisco%ziplink.net Exp $
+ * $Id: ExprResult.h,v 1.9 2001/04/08 14:34:27 peterv%netscape.com Exp $
  */
 
-#include "TxObject.h"
-#include "dom.h"
-#include "primitives.h"
-
 #ifndef TRANSFRMX_EXPRRESULT_H
 #define TRANSFRMX_EXPRRESULT_H
 
+#include "TxObject.h"
+#include "primitives.h"
 
 /*
  * ExprResult
diff --git a/extensions/transformiix/source/xpath/FunctionLib.h b/extensions/transformiix/source/xpath/FunctionLib.h
index 8641292fd755..ebf390db9f2b 100644
--- a/extensions/transformiix/source/xpath/FunctionLib.h
+++ b/extensions/transformiix/source/xpath/FunctionLib.h
@@ -27,27 +27,20 @@
  * Marina Mechtcheriakova
  *   -- added support for lang function
  *
- * $Id: FunctionLib.h,v 1.9 2001/01/12 20:06:33 axel%pike.org Exp $
+ * $Id: FunctionLib.h,v 1.10 2001/04/08 14:34:04 peterv%netscape.com Exp $
  */
 
-#include "TxString.h"
-#include "primitives.h"
-#include "NodeSet.h"
-#include "List.h"
-#include "dom.h"
-#include "ExprResult.h"
-#include "baseutils.h"
-#include "Expr.h"
-#include "XMLDOMUtils.h"
-#include "Names.h"
-#include "XMLUtils.h"
-#include <math.h>
-
-
 #ifndef TRANSFRMX_FUNCTIONLIB_H
 #define TRANSFRMX_FUNCTIONLIB_H
 
 
+#include "TxString.h"
+#include "primitives.h"
+#include "ExprResult.h"
+#include "baseutils.h"
+#include "Expr.h"
+
+
 class XPathNames {
 
 public:
diff --git a/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp b/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp
index 400b4354bb94..92ccbe96aafb 100644
--- a/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp
+++ b/extensions/transformiix/source/xpath/MultiplicativeExpr.cpp
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *    
- * $Id: MultiplicativeExpr.cpp,v 1.1 2000/04/06 07:45:32 kvisco%ziplink.net Exp $
+ * $Id: MultiplicativeExpr.cpp,v 1.2 2001/04/08 14:39:37 peterv%netscape.com Exp $
  */
 
 /**
@@ -31,10 +31,11 @@
  * mod  : modulus
  * div  : divide
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.1 $ $Date: 2000/04/06 07:45:32 $
+ * @version $Revision: 1.2 $ $Date: 2001/04/08 14:39:37 $
 **/
 
 #include "Expr.h"
+#include <math.h>
 
 /**
  * Creates a new MultiplicativeExpr using the default operator (MULTIPLY)
diff --git a/extensions/transformiix/source/xpath/NodeSet.h b/extensions/transformiix/source/xpath/NodeSet.h
index 4167d42d8497..e4a2a88c696a 100644
--- a/extensions/transformiix/source/xpath/NodeSet.h
+++ b/extensions/transformiix/source/xpath/NodeSet.h
@@ -24,19 +24,18 @@
  * Larry Fitzpatrick, OpenText, lef@opentext.com
  *   -- moved initialization of DEFAULT_SIZE to NodeSet.cpp
  *
- * $Id: NodeSet.h,v 1.6 2001/02/15 09:21:01 axel%pike.org Exp $
+ * $Id: NodeSet.h,v 1.7 2001/04/08 14:36:12 peterv%netscape.com Exp $
  */
 
 /**
  * NodeSet
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.6 $ $Date: 2001/02/15 09:21:01 $
+ * @version $Revision: 1.7 $ $Date: 2001/04/08 14:36:12 $
 **/
 
 #ifndef TRANSFRMX_NODESET_H
 #define TRANSFRMX_NODESET_H
 
-#include "MITREObject.h"
 #include "dom.h"
 #include "ExprResult.h"
 
diff --git a/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp b/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp
index f9900af173d7..85ba2b5bcaa8 100644
--- a/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp
+++ b/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp
@@ -24,17 +24,20 @@
  * Marina Mechtcheriakova, mmarina@mindspring.com
  *   -- changed some behavoir to be more compliant with spec
  *    
- * $Id: NodeSetFunctionCall.cpp,v 1.4 2001/03/19 21:48:19 axel%pike.org Exp $
+ * $Id: NodeSetFunctionCall.cpp,v 1.5 2001/04/08 14:37:39 peterv%netscape.com Exp $
  */
 
 /**
  * NodeSetFunctionCall
  * A representation of the XPath NodeSet funtions
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.4 $ $Date: 2001/03/19 21:48:19 $
+ * @version $Revision: 1.5 $ $Date: 2001/04/08 14:37:39 $
 **/
 
 #include "FunctionLib.h"
+#include "XMLUtils.h"
+#include "XMLDOMUtils.h"
+#include <math.h>
 
 /**
  * Creates a default NodeSetFunctionCall. The Position function
diff --git a/extensions/transformiix/source/xpath/NumberFunctionCall.cpp b/extensions/transformiix/source/xpath/NumberFunctionCall.cpp
index 6bc4fefde9d5..c5a74c258d29 100644
--- a/extensions/transformiix/source/xpath/NumberFunctionCall.cpp
+++ b/extensions/transformiix/source/xpath/NumberFunctionCall.cpp
@@ -25,7 +25,7 @@
  * Nisheeth Ranjan, nisheeth@netscape.com
  *   -- implemented rint function, which was not available on Windows.
  *
- * $Id: NumberFunctionCall.cpp,v 1.11 2001/01/22 09:36:18 kvisco%ziplink.net Exp $
+ * $Id: NumberFunctionCall.cpp,v 1.12 2001/04/08 14:33:21 peterv%netscape.com Exp $
  */
 
 /*
@@ -34,6 +34,9 @@
 */
 
 #include "FunctionLib.h"
+#include "XMLUtils.h"
+#include "XMLDOMUtils.h"
+#include <math.h>
 
 /**
  * Creates a default NumberFunctionCall. The number() function
diff --git a/extensions/transformiix/source/xpath/StringFunctionCall.cpp b/extensions/transformiix/source/xpath/StringFunctionCall.cpp
index 34a988eee121..cfe83c8f64d1 100644
--- a/extensions/transformiix/source/xpath/StringFunctionCall.cpp
+++ b/extensions/transformiix/source/xpath/StringFunctionCall.cpp
@@ -21,17 +21,20 @@
  * Keith Visco, kvisco@ziplink.net
  *   -- original author.
  *
- * $Id: StringFunctionCall.cpp,v 1.8 2001/04/03 12:35:57 peterv%netscape.com Exp $
+ * $Id: StringFunctionCall.cpp,v 1.9 2001/04/08 14:34:32 peterv%netscape.com Exp $
  */
 
 /**
  * StringFunctionCall
  * A representation of the XPath String funtions
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
- * @version $Revision: 1.8 $ $Date: 2001/04/03 12:35:57 $
+ * @version $Revision: 1.9 $ $Date: 2001/04/08 14:34:32 $
 **/
 
 #include "FunctionLib.h"
+#include "XMLUtils.h"
+#include "XMLDOMUtils.h"
+#include <math.h>
 
 /**
  * Creates a default StringFunctionCall. The string() function
diff --git a/extensions/transformiix/source/xslt/Names.h b/extensions/transformiix/source/xslt/Names.h
index b6b19bab2bfc..fffef24ea872 100644
--- a/extensions/transformiix/source/xslt/Names.h
+++ b/extensions/transformiix/source/xslt/Names.h
@@ -27,14 +27,14 @@
  *       W3C XPath 1.0 Recommendation
  *    -- Added lang attr declaration
 
- * $Id: Names.h,v 1.7 2001/01/12 20:06:42 axel%pike.org Exp $
+ * $Id: Names.h,v 1.8 2001/04/08 14:35:15 peterv%netscape.com Exp $
  */
 
-#include "TxString.h"
-
 #ifndef TRANSFRMX_NAMES_H
 #define TRANSFRMX_NAMES_H
 
+#include "TxString.h"
+
 //-- Global Strings
 extern const String HTML;
 extern const String HTML_NS;
diff --git a/extensions/transformiix/source/xslt/Numbering.cpp b/extensions/transformiix/source/xslt/Numbering.cpp
index 35ed1987a73c..459e0a34e12e 100644
--- a/extensions/transformiix/source/xslt/Numbering.cpp
+++ b/extensions/transformiix/source/xslt/Numbering.cpp
@@ -21,16 +21,17 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: Numbering.cpp,v 1.1 2000/04/06 07:46:33 kvisco%ziplink.net Exp $
+ * $Id: Numbering.cpp,v 1.2 2001/04/08 14:40:02 peterv%netscape.com Exp $
  */
 
 /**
  * Numbering methods
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.1 $ $Date: 2000/04/06 07:46:33 $
+ * @version $Revision: 1.2 $ $Date: 2001/04/08 14:40:02 $
 **/
 
 #include "Numbering.h"
+#include "Names.h"
 
 void Numbering::doNumbering
     (Element* xslNumber, String& dest, Node* context, ProcessorState* ps)
diff --git a/extensions/transformiix/source/xslt/Numbering.h b/extensions/transformiix/source/xslt/Numbering.h
index 4446557cbcf8..b8c20c5952f6 100644
--- a/extensions/transformiix/source/xslt/Numbering.h
+++ b/extensions/transformiix/source/xslt/Numbering.h
@@ -21,13 +21,13 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: Numbering.h,v 1.2 2000/04/12 22:33:34 nisheeth%netscape.com Exp $
+ * $Id: Numbering.h,v 1.3 2001/04/08 14:39:02 peterv%netscape.com Exp $
  */
 
 /**
  * Numbering methods
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.2 $ $Date: 2000/04/12 22:33:34 $
+ * @version $Revision: 1.3 $ $Date: 2001/04/08 14:39:02 $
 **/
 
 #ifndef MITREXSL_NUMBERING_H
@@ -35,12 +35,10 @@
 
 #include "baseutils.h"
 #include "TxString.h"
-#include "dom.h"
 #include "ProcessorState.h"
 #include "Expr.h"
 #include "primitives.h"
 #include "ExprResult.h"
-#include "Names.h"
 
 class Numbering {
 
diff --git a/extensions/transformiix/source/xslt/ProcessorState.cpp b/extensions/transformiix/source/xslt/ProcessorState.cpp
index 5d1ec42809df..c6940c3e9edd 100644
--- a/extensions/transformiix/source/xslt/ProcessorState.cpp
+++ b/extensions/transformiix/source/xslt/ProcessorState.cpp
@@ -25,18 +25,25 @@
  *   -- added code in ::resolveFunctionCall to support the
  *      document() function.
  *
- * $Id: ProcessorState.cpp,v 1.22 2001/04/03 12:21:49 peterv%netscape.com Exp $
+ * $Id: ProcessorState.cpp,v 1.23 2001/04/08 14:32:37 peterv%netscape.com Exp $
  */
 
 /**
  * Implementation of ProcessorState
  * Much of this code was ported from XSL:P
- * @version $Revision: 1.22 $ $Date: 2001/04/03 12:21:49 $
+ * @version $Revision: 1.23 $ $Date: 2001/04/08 14:32:37 $
 **/
 
 #include "ProcessorState.h"
 #include "XSLTFunctions.h"
+#include "FunctionLib.h"
 #include "URIUtils.h"
+#include "XMLUtils.h"
+#include "XMLDOMUtils.h"
+#include "Tokenizer.h"
+#include "VariableBinding.h"
+#include "ExprResult.h"
+#include "Names.h"
 #ifdef MOZ_XSL
 //  #include "nslog.h"
 //  #define PRINTF NS_LOG_PRINTF(XPATH)
@@ -93,8 +100,8 @@ ProcessorState::~ProcessorState() {
   StringListIterator* iter = keys->iterator();
   while (iter->hasNext()) {
       String* key = iter->next();
-      MITREObjectWrapper* objWrapper
-          = (MITREObjectWrapper*)includes.remove(*key);
+      TxObjectWrapper* objWrapper
+          = (TxObjectWrapper*)includes.remove(*key);
       delete (Document*)objWrapper->object;
       delete objWrapper;
   }
@@ -160,7 +167,7 @@ void ProcessorState::addErrorObserver(ErrorObserver& errorObserver) {
  * including the same document more than once
 **/
 void ProcessorState::addInclude(const String& href, Document* xslDocument) {
-  MITREObjectWrapper* objWrapper = new MITREObjectWrapper();
+  TxObjectWrapper* objWrapper = new TxObjectWrapper();
   objWrapper->object = xslDocument;
   includes.put(href, objWrapper);
 } //-- addInclude
@@ -176,7 +183,7 @@ void ProcessorState::addTemplate(Element* xslTemplate) {
     String name = xslTemplate->getAttribute(NAME_ATTR);
     if ( name.length() > 0 ) {
         //-- check for duplicates
-        MITREObjectWrapper* mObj = (MITREObjectWrapper*)namedTemplates.get(name);
+        TxObjectWrapper* mObj = (TxObjectWrapper*)namedTemplates.get(name);
         if ( mObj ) {
             String warn("error duplicate template name: ");
             warn.append(name);
@@ -184,8 +191,8 @@ void ProcessorState::addTemplate(Element* xslTemplate) {
             recieveError(warn,ErrorObserver::WARNING);
             delete mObj;
         }
-        MITREObjectWrapper* oldObj = mObj;
-        mObj= new MITREObjectWrapper();
+        TxObjectWrapper* oldObj = mObj;
+        mObj= new TxObjectWrapper();
         mObj->object = xslTemplate;
         namedTemplates.put(name,mObj);
         if ( oldObj ) delete oldObj;
@@ -415,8 +422,8 @@ void ProcessorState::getDocumentHref
   StringListIterator* iter = keys->iterator();
   while (iter->hasNext()) {
       String* key = iter->next();
-      MITREObjectWrapper* objWrapper
-          = (MITREObjectWrapper*)includes.get(*key);
+      TxObjectWrapper* objWrapper
+          = (TxObjectWrapper*)includes.get(*key);
       if (xslDocument == objWrapper->object) {
           documentBase.append(*key);
           break;
@@ -431,7 +438,7 @@ void ProcessorState::getDocumentHref
  * given href, or null if no document is found
 **/
 Document* ProcessorState::getInclude(const String& href) {
-  MITREObjectWrapper* objWrapper = (MITREObjectWrapper*)includes.get(href);
+  TxObjectWrapper* objWrapper = (TxObjectWrapper*)includes.get(href);
   Document* doc = 0;
   if (objWrapper) {
     doc = (Document*) objWrapper->object;
@@ -461,7 +468,7 @@ Expr* ProcessorState::getExpr(const String& pattern) {
  * null if not template is found
 **/
 Element* ProcessorState::getNamedTemplate(String& name) {
-    MITREObjectWrapper* mObj = (MITREObjectWrapper*)namedTemplates.get(name);
+    TxObjectWrapper* mObj = (TxObjectWrapper*)namedTemplates.get(name);
     if ( mObj ) {
         return (Element*)mObj->object;
     }
diff --git a/extensions/transformiix/source/xslt/ProcessorState.h b/extensions/transformiix/source/xslt/ProcessorState.h
index c95be3cb40c7..e3db9666d41a 100644
--- a/extensions/transformiix/source/xslt/ProcessorState.h
+++ b/extensions/transformiix/source/xslt/ProcessorState.h
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: ProcessorState.h,v 1.11 2001/03/06 00:12:28 Peter.VanderBeken%pandora.be Exp $
+ * $Id: ProcessorState.h,v 1.12 2001/04/08 14:33:28 peterv%netscape.com Exp $
  */
 
 
@@ -29,27 +29,21 @@
 #ifndef TRANSFRMX_PROCESSORSTATE_H
 #define TRANSFRMX_PROCESSORSTATE_H
 
-#include "dom.h"
 #include "DOMHelper.h"
-#include "XMLUtils.h"
-#include "Names.h"
 #include "NodeSet.h"
 #include "NodeStack.h"
 #include "Stack.h"
 #include "ErrorObserver.h"
-#include "List.h"
 #include "NamedMap.h"
 #include "ExprParser.h"
 #include "Expr.h"
 #include "StringList.h"
-#include "Tokenizer.h"
-#include "VariableBinding.h"
 #include "OutputFormat.h"
 
 /**
  * Class used for keeping the current state of the XSL Processor
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.11 $ $Date: 2001/03/06 00:12:28 $
+ * @version $Revision: 1.12 $ $Date: 2001/04/08 14:33:28 $
 **/
 class ProcessorState : public ContextState {
 
diff --git a/extensions/transformiix/source/xslt/VariableBinding.h b/extensions/transformiix/source/xslt/VariableBinding.h
index 4b6d0d543cdd..4475f4cb9bab 100644
--- a/extensions/transformiix/source/xslt/VariableBinding.h
+++ b/extensions/transformiix/source/xslt/VariableBinding.h
@@ -21,22 +21,21 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: VariableBinding.h,v 1.2 2000/04/12 22:33:34 nisheeth%netscape.com Exp $
+ * $Id: VariableBinding.h,v 1.3 2001/04/08 14:39:21 peterv%netscape.com Exp $
  */
 
 #ifndef MITREXSL_VARIABLE_H
 #define MITREXSL_VARIABLE_H
 
-#include "MITREObject.h"
+#include "TxObject.h"
 #include "TxString.h"
-#include "baseutils.h"
 #include "ExprResult.h"
 
 /**
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.2 $ $Date: 2000/04/12 22:33:34 $
+ * @version $Revision: 1.3 $ $Date: 2001/04/08 14:39:21 $
 **/
-class VariableBinding : public MITREObject {
+class VariableBinding : public TxObject {
 
 public:
 
diff --git a/extensions/transformiix/source/xslt/XSLTProcessor.cpp b/extensions/transformiix/source/xslt/XSLTProcessor.cpp
index d0f35b70999b..c778355c0d48 100644
--- a/extensions/transformiix/source/xslt/XSLTProcessor.cpp
+++ b/extensions/transformiix/source/xslt/XSLTProcessor.cpp
@@ -38,14 +38,24 @@
  * Olivier Gerardin
  *    -- Changed behavior of passing parameters to templates
  *
- * $Id: XSLTProcessor.cpp,v 1.38 2001/04/03 12:21:45 peterv%netscape.com Exp $
+ * $Id: XSLTProcessor.cpp,v 1.39 2001/04/08 14:32:16 peterv%netscape.com Exp $
  */
 
 #include "XSLTProcessor.h"
+#include "Names.h"
+#include "XMLParser.h"
+#include "VariableBinding.h"
+#include "XMLUtils.h"
+#include "XMLDOMUtils.h"
+#include "NodeSorter.h"
+#include "Numbering.h"
+#include "Tokenizer.h"
+#include "URIUtils.h"
 #ifdef MOZ_XSL
 #include "nsIObserverService.h"
 //#include "nslog.h"
 #else
+#include "printers.h"
 #include "TxLog.h"
 #endif
 
@@ -56,7 +66,7 @@
 /**
  * XSLTProcessor is a class for Processing XSL stylesheets
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.38 $ $Date: 2001/04/03 12:21:45 $
+ * @version $Revision: 1.39 $ $Date: 2001/04/08 14:32:16 $
 **/
 
 /**
diff --git a/extensions/transformiix/source/xslt/XSLTProcessor.h b/extensions/transformiix/source/xslt/XSLTProcessor.h
index af3e67955d35..badbe8089695 100644
--- a/extensions/transformiix/source/xslt/XSLTProcessor.h
+++ b/extensions/transformiix/source/xslt/XSLTProcessor.h
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: XSLTProcessor.h,v 1.14 2001/03/06 00:12:21 Peter.VanderBeken%pandora.be Exp $
+ * $Id: XSLTProcessor.h,v 1.15 2001/04/08 14:32:59 peterv%netscape.com Exp $
  */
 
 
@@ -38,28 +38,16 @@
 
 #ifdef MOZ_XSL
 #include "nsIDocumentTransformer.h"
-#else
-#include "CommandLineUtils.h"
-#include "printers.h"
-#include "XMLDOMUtils.h"
 #endif
 
-#include "URIUtils.h"
-#include "XMLParser.h"
 #include "dom.h"
 #include "ExprParser.h"
-#include "MITREObject.h"
+#include "TxObject.h"
 #include "NamedMap.h"
-#include "Names.h"
-#include "NodeSet.h"
 #include "ProcessorState.h"
 #include "TxString.h"
-#include "Tokenizer.h"
 #include "ErrorObserver.h"
 #include "List.h"
-#include "VariableBinding.h"
-#include "Numbering.h"
-#include "NodeSorter.h"
 
 #ifdef MOZ_XSL
 /* bacd8ad0-552f-11d3-a9f7-000064657374 */
@@ -75,7 +63,7 @@
 /**
  * A class for Processing XSL Stylesheets
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.14 $ $Date: 2001/03/06 00:12:21 $
+ * @version $Revision: 1.15 $ $Date: 2001/04/08 14:32:59 $
 **/
 class XSLTProcessor
 #ifdef MOZ_XSL
@@ -358,7 +346,7 @@ private:
 
 }; //-- XSLTProcessor
 
-class XSLType : public MITREObject {
+class XSLType : public TxObject {
 
 public:
     enum types {
diff --git a/extensions/transformiix/source/xslt/functions/CurrentFunctionCall.cpp b/extensions/transformiix/source/xslt/functions/CurrentFunctionCall.cpp
index e32c0ea1214a..5a8a906d7a32 100644
--- a/extensions/transformiix/source/xslt/functions/CurrentFunctionCall.cpp
+++ b/extensions/transformiix/source/xslt/functions/CurrentFunctionCall.cpp
@@ -1,4 +1,5 @@
 #include "XSLTFunctions.h"
+#include "Names.h"
 
 /*
   Implementation of XSLT 1.0 extension function: current
diff --git a/extensions/transformiix/source/xslt/functions/DocumentFunctionCall.cpp b/extensions/transformiix/source/xslt/functions/DocumentFunctionCall.cpp
index 949d6860d2ec..4979f5157ecb 100644
--- a/extensions/transformiix/source/xslt/functions/DocumentFunctionCall.cpp
+++ b/extensions/transformiix/source/xslt/functions/DocumentFunctionCall.cpp
@@ -40,6 +40,7 @@
 #include "XMLParser.h"
 #include "XMLDOMUtils.h"
 #include "URIUtils.h"
+#include "Names.h"
 
 /**
  * Creates a new DocumentFunctionCall.
diff --git a/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp b/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp
index b6046da819c2..d3c876a5127f 100644
--- a/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp
+++ b/extensions/transformiix/source/xslt/functions/ElementAvailableFnCall.cpp
@@ -25,6 +25,7 @@
 
 #include "XSLTFunctions.h"
 #include "XMLUtils.h"
+#include "Names.h"
 
 /*
   Implementation of XSLT 1.0 extension function: element-available
diff --git a/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp b/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp
index 8e0a7dd864f3..c3d3e854492d 100644
--- a/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp
+++ b/extensions/transformiix/source/xslt/functions/FunctionAvailableFnCall.cpp
@@ -26,6 +26,7 @@
 #include "XSLTFunctions.h"
 #include "FunctionLib.h"
 #include "XMLUtils.h"
+#include "Names.h"
 
 /*
   Implementation of XSLT 1.0 extension function: function-available
diff --git a/extensions/transformiix/source/xslt/functions/GenerateIdFunctionCall.cpp b/extensions/transformiix/source/xslt/functions/GenerateIdFunctionCall.cpp
index 5614aaaf7772..c8a50b36f97f 100644
--- a/extensions/transformiix/source/xslt/functions/GenerateIdFunctionCall.cpp
+++ b/extensions/transformiix/source/xslt/functions/GenerateIdFunctionCall.cpp
@@ -20,10 +20,11 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: GenerateIdFunctionCall.cpp,v 1.3 2000/04/19 23:07:31 nisheeth%netscape.com Exp $
+ * $Id: GenerateIdFunctionCall.cpp,v 1.4 2001/04/08 14:38:29 peterv%netscape.com Exp $
  */
 
 #include "XSLTFunctions.h"
+#include "Names.h"
 
 /*
   Implementation of XSLT 1.0 extension function: generate-id
diff --git a/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp b/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp
index 3a03cbed6dc1..a7f1c6388ce0 100644
--- a/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp
+++ b/extensions/transformiix/source/xslt/functions/SystemPropertyFunctionCall.cpp
@@ -1,5 +1,6 @@
 #include "XSLTFunctions.h"
 #include "XMLUtils.h"
+#include "Names.h"
 
 const String XSL_VERSION_PROPERTY    = "version";
 const String XSL_VENDOR_PROPERTY     = "vendor";
diff --git a/extensions/transformiix/source/xslt/functions/XSLTFunctions.h b/extensions/transformiix/source/xslt/functions/XSLTFunctions.h
index 2a4d0264b959..640eb4060dd2 100644
--- a/extensions/transformiix/source/xslt/functions/XSLTFunctions.h
+++ b/extensions/transformiix/source/xslt/functions/XSLTFunctions.h
@@ -23,20 +23,18 @@
  * Olivier Gerardin,
  *    -- added document() function definition
  *
- * $Id: XSLTFunctions.h,v 1.5 2001/03/06 00:14:45 Peter.VanderBeken%pandora.be Exp $
+ * $Id: XSLTFunctions.h,v 1.6 2001/04/08 14:37:13 peterv%netscape.com Exp $
  */
 
-#include "dom.h"
-#include "Expr.h"
-#include "ExprResult.h"
-#include "Names.h"
-#include "DOMHelper.h"
-#include "TxString.h"
-#include "ProcessorState.h"
-
 #ifndef TRANSFRMX_XSLT_FUNCTIONS_H
 #define TRANSFRMX_XSLT_FUNCTIONS_H
 
+#include "Expr.h"
+#include "ExprResult.h"
+#include "DOMHelper.h"
+#include "TxString.h"
+#include "ProcessorState.h"
+
 /**
  * The definition for the XSLT document() function
 **/
diff --git a/extensions/transformiix/source/xslt/util/NodeSorter.cpp b/extensions/transformiix/source/xslt/util/NodeSorter.cpp
index fa5bab13ac81..989d43f1ad64 100644
--- a/extensions/transformiix/source/xslt/util/NodeSorter.cpp
+++ b/extensions/transformiix/source/xslt/util/NodeSorter.cpp
@@ -20,12 +20,15 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: NodeSorter.cpp,v 1.4 2000/06/11 12:22:57 Peter.VanderBeken%pandora.be Exp $
+ * $Id: NodeSorter.cpp,v 1.5 2001/04/08 14:37:45 peterv%netscape.com Exp $
  */
 
 
 
 #include "NodeSorter.h"
+#include "StringComparator.h"
+#include "Names.h"
+#include "XMLDOMUtils.h"
 
 /*
  * Sorts Nodes as specified by the W3C XSLT 1.0 Recommendation
diff --git a/extensions/transformiix/source/xslt/util/NodeSorter.h b/extensions/transformiix/source/xslt/util/NodeSorter.h
index ad1a5215c02a..cbffd82b8a4b 100644
--- a/extensions/transformiix/source/xslt/util/NodeSorter.h
+++ b/extensions/transformiix/source/xslt/util/NodeSorter.h
@@ -20,24 +20,22 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: NodeSorter.h,v 1.2 2000/04/12 22:33:55 nisheeth%netscape.com Exp $
+ * $Id: NodeSorter.h,v 1.3 2001/04/08 14:38:57 peterv%netscape.com Exp $
  */
 
 
-#include "TxString.h"
-#include "StringComparator.h"
-#include "NamedMap.h"
-#include "dom.h"
-#include "NodeSet.h"
-#include "ProcessorState.h"
-#include "Names.h"
-/*
- * Sorts Nodes as specified by the W3C XSLT 1.0 Recommendation
- */
-
 #ifndef TRANSFRMX_NODESORTER_H
 #define TRANSFRMX_NODESORTER_H
 
+#include "TxString.h"
+#include "dom.h"
+#include "NodeSet.h"
+#include "ProcessorState.h"
+
+/*
+ * Sorts Nodes as specified by the W3C XSLT 1.0 Recommendation
+ */
+
 class NodeSorter {
 
 public:
diff --git a/extensions/transformiix/source/xslt/util/NodeStack.h b/extensions/transformiix/source/xslt/util/NodeStack.h
index e16f61ad55d9..419fc39619be 100644
--- a/extensions/transformiix/source/xslt/util/NodeStack.h
+++ b/extensions/transformiix/source/xslt/util/NodeStack.h
@@ -24,21 +24,16 @@
  *
  * Larry Fitzpatrick, OpenText, lef@opentext.com
  *    -- moved initialization of DEFAULT_SIZE to NodeStack.cpp
- * $Id: NodeStack.h,v 1.1 2000/04/06 07:47:42 kvisco%ziplink.net Exp $
+ * $Id: NodeStack.h,v 1.2 2001/04/08 14:39:46 peterv%netscape.com Exp $
  */
 
 
-/**
- * NodeStack
- * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.1 $ $Date: 2000/04/06 07:47:42 $
-**/
-#include "dom.h"
-#include "baseutils.h"
-
 #ifndef NODESTACK_H
 #define NODESTACK_H
 
+#include "dom.h"
+#include "baseutils.h"
+
 class NodeStack {