diff --git a/mozilla/Makefile.in b/mozilla/Makefile.in
index 16fdc748ce8..c40429cf06a 100644
--- a/mozilla/Makefile.in
+++ b/mozilla/Makefile.in
@@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/build/unix/modules.mk
 
-ifeq ($(BUILD_MODULES),all)
+ifeq (,$(filter-out all,$(BUILD_MODULES))$(MOZ_XSLT_STANDALONE))
 #
 # And now for something completely different...
 # Divide the default build into tiers. 
@@ -420,10 +420,20 @@ tier_99_dirs += \
 	$(NULL)
 endif
 
-else
+else # BUILD_MODULES
 
 # Standalone build
 
+ifdef MOZ_XSLT_STANDALONE
+DIRS = \
+	xpcom/typelib \
+	xpcom \
+	parser/expat \
+	content/xslt/src \
+	$(NULL)
+
+SUBMAKEFILES = xpcom/typelib/Makefile
+else
 DIRS		= $(BUILD_MODULE_DIRS)
 
 # Hack to generate xpidl Makefile
@@ -433,12 +443,13 @@ DIRS		:= xpcom/typelib $(DIRS)
 SUBMAKEFILES	:= xpcom/typelib/Makefile
 endif
 endif
+endif
 
 default:: $(SUBMAKEFILES)
 	$(MAKE) export
 	$(MAKE) libs
 
-endif # BUILD_MODULES == all
+endif # BUILD_MODULES == all or MOZ_XSLT_STANDALONE
 
 STATIC_MAKEFILES := nsprpub directory/c-sdk security/nss
 
diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in
index 695d045f142..15fdcd2cef5 100644
--- a/mozilla/config/autoconf.mk.in
+++ b/mozilla/config/autoconf.mk.in
@@ -196,7 +196,7 @@ MOZ_SVG_RENDERER_CAIRO = @MOZ_SVG_RENDERER_CAIRO@
 MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@
 MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@
 MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@
-TX_EXE = @TX_EXE@
+MOZ_XSLT_STANDALONE = @MOZ_XSLT_STANDALONE@
 
 # Mac's don't like / in a #include, so we include the libart
 # headers locally if we're using the external library
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 67d32454fc4..ed666e85fd4 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -4041,12 +4041,13 @@ MOZ_BRANDING_DIRECTORY=
 MOZ_CALENDAR=
 MOZ_DBGRINFO_MODULES=
 MOZ_ENABLE_LIBXUL=
-MOZ_EXTENSIONS_ALL=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming xmlterm datetime finger cview layout-debug tasks sql xforms permissions schema-validation reporter"
+MOZ_EXTENSIONS_ALL=" cookie wallet content-packs xml-rpc xmlextras help p3p pref venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming xmlterm datetime finger cview layout-debug tasks sql xforms permissions schema-validation reporter"
 MOZ_IMG_DECODERS_DEFAULT="png gif jpeg bmp xbm"
 MOZ_IMG_ENCODERS_DEFAULT="png"
 MOZ_IPCD=
 MOZ_JSDEBUGGER=1
 MOZ_JSLOADER=1
+MOZ_LDAP_XPCOM=
 MOZ_LIBART_CFLAGS=
 MOZ_LIBART_LIBS=
 MOZ_MAIL_NEWS=
@@ -4078,6 +4079,7 @@ MOZ_V1_STRING_ABI=1
 MOZ_VIEW_SOURCE=1
 MOZ_XPFE_COMPONENTS=1
 MOZ_XPINSTALL=1
+MOZ_XSLT_STANDALONE=
 MOZ_XTF=1
 MOZ_XUL=1
 NS_PRINTING=1
@@ -4107,6 +4109,7 @@ MOZ_ARG_ENABLE_STRING(application,
                             calendar
                             xulrunner
                             macbrowser (Camino)
+                            content/xslt (Standalone Transformiix XSLT)
                             standalone (use this for standalone
                               xpcom/xpconnect or to manually drive a build)],
 [ MOZ_BUILD_APP=$enableval ] )
@@ -4121,7 +4124,7 @@ suite)
   MOZ_SUITE=1
   MOZ_PROFILESHARING=
   MOZ_APP_VERSION=$SEAMONKEY_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
+  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
   AC_DEFINE(MOZ_SUITE)
   ;;
 
@@ -4132,7 +4135,7 @@ browser)
   MOZ_UPDATER=1
   MOZ_PHOENIX=1
   MOZ_APP_VERSION=$FIREFOX_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref transformiix universalchardet webservices inspector gnomevfs auth permissions reporter"
+  MOZ_EXTENSIONS_DEFAULT=" cookie xml-rpc xmlextras pref universalchardet webservices inspector gnomevfs auth permissions reporter"
   AC_DEFINE(MOZ_PHOENIX)
   ;;
 
@@ -4147,7 +4150,7 @@ minimo)
   MOZ_APP_VERSION=`cat $topsrcdir/minimo/config/version.txt`
   MOZ_COMPOSER=
   MOZ_ENABLE_POSTSCRIPT=
-  MOZ_EXTENSIONS_DEFAULT="xml-rpc xmlextras transformiix webservices spatialnavigation"
+  MOZ_EXTENSIONS_DEFAULT="xml-rpc xmlextras webservices spatialnavigation"
   MOZ_IMG_DECODERS_DEFAULT="png gif jpeg"
   MOZ_IMG_ENCODERS_DEFAULT=
   MOZ_IMG_ENCODERS=
@@ -4220,7 +4223,7 @@ calendar)
   MOZ_SUNBIRD=1
   MOZ_CALENDAR=1
   MOZ_APP_VERSION=`cat $topsrcdir/calendar/sunbird/config/version.txt`
-  MOZ_EXTENSIONS_DEFAULT=" pref xmlextras transformiix"
+  MOZ_EXTENSIONS_DEFAULT=" pref xmlextras"
   AC_DEFINE(MOZ_SUNBIRD)
   ;;
 
@@ -4232,7 +4235,7 @@ xulrunner)
   MOZ_XULRUNNER=1
   MOZ_ENABLE_LIBXUL=1
   MOZ_APP_VERSION=$MOZILLA_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" xml-rpc xmlextras pref transformiix universalchardet webservices gnomevfs auth"
+  MOZ_EXTENSIONS_DEFAULT=" xml-rpc xmlextras pref universalchardet webservices gnomevfs auth"
   AC_DEFINE(MOZ_XULRUNNER)
   ;;
 
@@ -4240,10 +4243,18 @@ macbrowser)
   MOZ_APP_NAME=mozilla
   MOZ_APP_DISPLAYNAME=Mozilla
   MOZ_APP_VERSION=$MOZILLA_VERSION
-  MOZ_EXTENSIONS_DEFAULT=" cookie xmlextras universalchardet typeaheadfind transformiix permissions"
+  MOZ_EXTENSIONS_DEFAULT=" cookie xmlextras universalchardet typeaheadfind permissions"
   AC_DEFINE(MOZ_MACBROWSER)
   ;;
 
+content/xslt)
+  MOZ_APP_NAME=mozilla
+  MOZ_EXTENSIONS_DEFAULT=""
+  AC_DEFINE(TX_EXE)
+  MOZ_XSLT_STANDALONE=1
+  MOZ_APP_VERSION=$MOZILLA_VERSION
+  ;;
+
 standalone) 
   MOZ_APP_NAME=mozilla
   MOZ_APP_DISPLAYNAME=Mozilla
@@ -5109,15 +5120,6 @@ dnl if test -n "$MOZ_SVG_FOREIGNOBJECT"; then
 dnl   AC_DEFINE(MOZ_SVG_FOREIGNOBJECT)
 dnl fi
 
-dnl ========================================================
-dnl Transformiix
-dnl ========================================================
-
-dnl To build transformiix standalone, set TX_EXE while configuring
-if test "$TX_EXE"; then
-  AC_DEFINE(TX_EXE)
-fi
-
 dnl ========================================================
 dnl Installer
 dnl ========================================================
@@ -6718,7 +6720,7 @@ AC_SUBST(MOZ_SVG_FOREIGNOBJECT)
 AC_SUBST(MOZ_SVG_RENDERER_GDIPLUS)
 AC_SUBST(MOZ_SVG_RENDERER_LIBART)
 AC_SUBST(MOZ_SVG_RENDERER_CAIRO)
-AC_SUBST(TX_EXE)
+AC_SUBST(MOZ_XSLT_STANDALONE)
 AC_SUBST(MOZ_JS_LIBS)
 AC_SUBST(MOZ_PSM)
 AC_SUBST(BUILD_MODULES)
diff --git a/mozilla/content/Makefile.in b/mozilla/content/Makefile.in
index 569bc3d3523..3bf86857605 100644
--- a/mozilla/content/Makefile.in
+++ b/mozilla/content/Makefile.in
@@ -43,7 +43,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= content
-DIRS		= base canvas html xml xul xbl xsl
+DIRS		= base canvas html xml xul xbl xslt
 
 ifdef MOZ_SVG
 DIRS		+= svg
diff --git a/mozilla/content/xslt/Makefile.in b/mozilla/content/xslt/Makefile.in
index 8b7c0fe5e54..5809bd07c60 100755
--- a/mozilla/content/xslt/Makefile.in
+++ b/mozilla/content/xslt/Makefile.in
@@ -42,8 +42,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public
-
-include $(topsrcdir)/config/config.mk
+DIRS = public src
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/content/xslt/src/Makefile.in b/mozilla/content/xslt/src/Makefile.in
index 36cf10eb355..7eceb5fac62 100644
--- a/mozilla/content/xslt/src/Makefile.in
+++ b/mozilla/content/xslt/src/Makefile.in
@@ -44,8 +44,8 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS            = base xml xpath xslt 
 
-ifdef TX_EXE
-DIRS += lib main
+ifdef MOZ_XSLT_STANDALONE
+DIRS += main
 endif
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/content/xslt/src/base/Makefile.in b/mozilla/content/xslt/src/base/Makefile.in
index 703aaed0508..cf9529f9aff 100644
--- a/mozilla/content/xslt/src/base/Makefile.in
+++ b/mozilla/content/xslt/src/base/Makefile.in
@@ -50,11 +50,12 @@ REQUIRES	= string \
 		  xpcom \
 		  $(NULL)
 
-ifndef TX_EXE
+ifndef MOZ_XSLT_STANDALONE
 REQUIRES	+= unicharutil \
 		  dom \
 		  content \
 		  layout \
+		  pref \
 		  widget \
 		  necko \
 		  caps \
@@ -64,15 +65,15 @@ REQUIRES	+= unicharutil \
 		  $(NULL)
 endif
 
-CPPSRCS	= Double.cpp \
-	List.cpp \
+CPPSRCS	= txDouble.cpp \
+	txList.cpp \
 	txAtoms.cpp \
 	txExpandedNameMap.cpp \
 	txNamespaceMap.cpp \
 	txURIUtils.cpp
 
-ifdef TX_EXE
-CPPSRCS += SimpleErrorObserver.cpp \
+ifdef MOZ_XSLT_STANDALONE
+CPPSRCS += txSimpleErrorObserver.cpp \
 	txStringUtils.cpp
 endif
 
@@ -82,5 +83,9 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(srcdir)/../xpath -I$(srcdir)/../xslt -I$(srcdir)/../xml   \
-  -I$(srcdir)/../xml/dom -I$(srcdir)
+INCLUDES += \
+	-I$(srcdir) \
+	-I$(srcdir)/../xml \
+	-I$(srcdir)/../xpath \
+	-I$(srcdir)/../xslt \
+	$(NULL)
diff --git a/mozilla/content/xslt/src/base/txDouble.cpp b/mozilla/content/xslt/src/base/txDouble.cpp
index 8fd9e0c4cd4..b20cba5be73 100644
--- a/mozilla/content/xslt/src/base/txDouble.cpp
+++ b/mozilla/content/xslt/src/base/txDouble.cpp
@@ -37,7 +37,7 @@
 
 #include "nsString.h"
 #include "txCore.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 #include <math.h>
 #include <stdlib.h>
 #ifdef WIN32
diff --git a/mozilla/content/xslt/src/base/txExpandedNameMap.h b/mozilla/content/xslt/src/base/txExpandedNameMap.h
index 497c6bf4c92..c68b1a21708 100644
--- a/mozilla/content/xslt/src/base/txExpandedNameMap.h
+++ b/mozilla/content/xslt/src/base/txExpandedNameMap.h
@@ -40,7 +40,7 @@
 #define TRANSFRMX_EXPANDEDNAMEMAP_H
 
 #include "txError.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 class TxObject;
 
diff --git a/mozilla/content/xslt/src/base/txList.cpp b/mozilla/content/xslt/src/base/txList.cpp
index f4952e38d29..fb965582945 100644
--- a/mozilla/content/xslt/src/base/txList.cpp
+++ b/mozilla/content/xslt/src/base/txList.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "List.h"
+#include "txList.h"
 
   //----------------------------/
  //- Implementation of txList -/
diff --git a/mozilla/content/xslt/src/base/txLog.h b/mozilla/content/xslt/src/base/txLog.h
index a9b2c2491af..e6b4233b977 100644
--- a/mozilla/content/xslt/src/base/txLog.h
+++ b/mozilla/content/xslt/src/base/txLog.h
@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef TxLog_h__
-#define TxLog_h__
+#ifndef txLog_h__
+#define txLog_h__
 
 #include "prlog.h"
 #include "prmem.h"
diff --git a/mozilla/content/xslt/src/base/txSimpleErrorObserver.cpp b/mozilla/content/xslt/src/base/txSimpleErrorObserver.cpp
index d12daecf5db..190bc1b4f88 100644
--- a/mozilla/content/xslt/src/base/txSimpleErrorObserver.cpp
+++ b/mozilla/content/xslt/src/base/txSimpleErrorObserver.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "ErrorObserver.h"
+#include "txErrorObserver.h"
 #include "nsString.h"
 
 /**
diff --git a/mozilla/content/xslt/src/base/txTokenizer.h b/mozilla/content/xslt/src/base/txTokenizer.h
index 287516037a1..07859f3ce57 100644
--- a/mozilla/content/xslt/src/base/txTokenizer.h
+++ b/mozilla/content/xslt/src/base/txTokenizer.h
@@ -40,7 +40,7 @@
 #define txTokenizer_h___
 
 #include "nsDependentSubstring.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 class txTokenizer
 {
diff --git a/mozilla/content/xslt/src/base/txURIUtils.cpp b/mozilla/content/xslt/src/base/txURIUtils.cpp
index 83342470a4f..cd9e0b7335d 100644
--- a/mozilla/content/xslt/src/base/txURIUtils.cpp
+++ b/mozilla/content/xslt/src/base/txURIUtils.cpp
@@ -202,113 +202,6 @@ void URIUtils::resolveHref(const nsAString& href, const nsAString& base,
 
 #ifndef TX_EXE
 
-nsIScriptSecurityManager *gTxSecurityManager = 0;
-
-// static
-PRBool URIUtils::CanCallerAccess(nsIDOMNode *aNode)
-{
-    if (!gTxSecurityManager) {
-        // No security manager available, let any calls go through...
-
-        return PR_TRUE;
-    }
-
-    nsCOMPtr<nsIPrincipal> subjectPrincipal;
-    gTxSecurityManager->GetSubjectPrincipal(getter_AddRefs(subjectPrincipal));
-
-    if (!subjectPrincipal) {
-        // we're running as system, grant access to the node.
-
-        return PR_TRUE;
-    }
-
-    // Check whether the subject principal is the system principal.
-    // For performance, we will avoid calling SubjectPrincipalIsChrome()
-    // since it calls GetSubjectPrincipal() which causes us to walk
-    // the JS frame stack.  We already did that above, so just get the
-    // system principal from the security manager, and do a raw comparison.
-    nsCOMPtr<nsIPrincipal> systemPrincipal;
-    gTxSecurityManager->GetSystemPrincipal(getter_AddRefs(systemPrincipal));
-
-    if (subjectPrincipal == systemPrincipal) {
-        // we're running as system, grant access to the node.
-
-        return PR_TRUE;
-    }
-
-    // Ask the securitymanager if we have "UniversalBrowserRead"
-    PRBool caps = PR_FALSE;
-    nsresult rv =
-        gTxSecurityManager->IsCapabilityEnabled("UniversalBrowserRead",
-                                                &caps);
-    NS_ENSURE_SUCCESS(rv, PR_FALSE);
-    if (caps) {
-        return PR_TRUE;
-    }
-
-    // Make sure that this is a real node. We do this by first QI'ing to
-    // nsIContent (which is important performance wise) and if that QI
-    // fails we QI to nsIDocument. If both those QI's fail we won't let
-    // the caller access this unknown node.
-    nsIPrincipal *principal = nsnull;
-    nsCOMPtr<nsIContent> content = do_QueryInterface(aNode);
-    nsCOMPtr<nsIAttribute> attr;
-    nsCOMPtr<nsIDocument> doc;
-
-    if (!content) {
-        doc = do_QueryInterface(aNode);
-
-        if (!doc) {
-            attr = do_QueryInterface(aNode);
-            if (!attr) {
-                // aNode is not a nsIContent, a nsIAttribute or a nsIDocument,
-                // something weird is going on...
-
-                NS_ERROR("aNode is not a nsIContent, a nsIAttribute or a nsIDocument!");
-
-                return PR_FALSE;
-            }
-        }
-    }
-
-    if (!doc) {
-        nsCOMPtr<nsIDOMDocument> domDoc;
-        aNode->GetOwnerDocument(getter_AddRefs(domDoc));
-        if (!domDoc) {
-            nsINodeInfo *ni = content ? content->NodeInfo() : attr->NodeInfo();
-
-            principal = ni->GetDocumentPrincipal();
-            if (!principal) {
-              // we can't get to the principal so we'll give up and give the
-              // caller access
-
-              return PR_TRUE;
-            }
-        }
-        else {
-            doc = do_QueryInterface(domDoc);
-            NS_ASSERTION(doc, "QI to nsIDocument failed");
-        }
-    }
-
-    if (!principal) {
-        principal = doc->GetPrincipal();
-    }
-
-    if (!principal) {
-        // We can't get hold of the principal for this node. This should happen
-        // very rarely, like for textnodes out of the tree and <option>s created
-        // using 'new Option'.
-
-        return PR_TRUE;
-    }
-
-    rv = gTxSecurityManager->CheckSameOriginPrincipal(subjectPrincipal,
-                                                      principal);
-
-    return NS_SUCCEEDED(rv);
-}
-
 // static
 void
 URIUtils::ResetWithSource(nsIDocument *aNewDoc, nsIDOMNode *aSourceNode)
diff --git a/mozilla/content/xslt/src/base/txURIUtils.h b/mozilla/content/xslt/src/base/txURIUtils.h
index f9795b5b97e..37f5d57bef6 100644
--- a/mozilla/content/xslt/src/base/txURIUtils.h
+++ b/mozilla/content/xslt/src/base/txURIUtils.h
@@ -46,8 +46,6 @@
 #else
 class nsIDocument;
 class nsIDOMNode;
-class nsIScriptSecurityManager;
-extern nsIScriptSecurityManager *gTxSecurityManager;
 
 #endif
 
@@ -90,11 +88,6 @@ public:
 
 #else /* TX_EXE */
 
-    /*
-     * Checks if a caller is allowed to access a given node
-     */
-    static PRBool CanCallerAccess(nsIDOMNode *aNode);
-
     /**
      * Reset the given document with the document of the source node
      */
diff --git a/mozilla/content/xslt/src/main/Makefile.in b/mozilla/content/xslt/src/main/Makefile.in
index 14c40655b86..8d060909e87 100644
--- a/mozilla/content/xslt/src/main/Makefile.in
+++ b/mozilla/content/xslt/src/main/Makefile.in
@@ -57,14 +57,18 @@ REQUIRES = string \
 
 CPP_PROG_LINK          = 1
 
-EXTRA_DEPS = \
-             $(DIST)/lib/$(LIB_PREFIX)tx.$(LIB_SUFFIX) \
-             $(NULL)
+TX_LIBS = \
+	txxslt_s \
+	txxpath_s \
+	txxml_s \
+	txbase_s \
+	expat_s \
+	$(NULL)
 
-EXTRA_LIBS = \
-             $(DIST)/lib/$(LIB_PREFIX)tx.$(LIB_SUFFIX) \
-             $(MOZ_COMPONENT_LIBS) \
-             $(NULL)
+LIBS = \
+	$(addprefix $(DIST)/lib/$(LIB_PREFIX),$(addsuffix .$(LIB_SUFFIX),$(TX_LIBS))) \
+	$(MOZ_COMPONENT_LIBS) \
+	$(NULL)
 
 ifdef MOZ_JPROF
 LIBS         += -ljprof
@@ -72,8 +76,10 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(srcdir)/../xslt -I$(srcdir)/../base -I$(srcdir)/../net \
-  -I$(srcdir)/../xml -I$(srcdir)/../xml/dom \
-  -I$(srcdir)/../xml/parser \
-  -I$(srcdir)/../xpath -I$(srcdir)/../xslt/util \
-  -I$(srcdir)/../xslt/functions $(MARK_INC)
+INCLUDES += \
+	-I$(srcdir)/../base \
+	-I$(srcdir)/../xml \
+  -I$(srcdir)/../xpath \
+	-I$(srcdir)/../xslt \
+	$(MARK_INC) \
+	$(NULL)
diff --git a/mozilla/content/xslt/src/main/txTestExpr.cpp b/mozilla/content/xslt/src/main/txTestExpr.cpp
index 946c442a964..8da3559c898 100644
--- a/mozilla/content/xslt/src/main/txTestExpr.cpp
+++ b/mozilla/content/xslt/src/main/txTestExpr.cpp
@@ -39,7 +39,7 @@
 #include "nsXPCOM.h"
 #include "txStandaloneXSLTProcessor.h"
 #include "nsString.h"
-#include "ExprParser.h"
+#include "txExprParser.h"
 #include "txIXPathContext.h"
 
 /**
diff --git a/mozilla/content/xslt/src/xml/Makefile.in b/mozilla/content/xslt/src/xml/Makefile.in
index 71dbe0966a8..c61babe6902 100644
--- a/mozilla/content/xslt/src/xml/Makefile.in
+++ b/mozilla/content/xslt/src/xml/Makefile.in
@@ -46,24 +46,42 @@ MODULE = transformiix
 LIBRARY_NAME = txxml_s
 MOZILLA_INTERNAL_API = 1
 
-REQUIRES	= string \
+REQUIRES	= \
+		  string \
 		  xpcom \
 		  $(NULL)
 
-ifndef TX_EXE
-REQUIRES += 	  dom \
+ifndef MOZ_XSLT_STANDALONE
+REQUIRES += \
+		  js \
+		  xpconnect \
+		  dom \
 		  content \
 		  layout \
+		  pref \
 		  widget \
 		  unicharutil \
 		  necko \
 		  htmlparser \
 		  $(NULL)
+else
+REQUIRES += expat
 endif
 
-DIRS            = dom parser
+CPPSRCS	= \
+	txXMLUtils.cpp \
+	txXMLParser.cpp \
+	$(NULL)
 
-CPPSRCS	= XMLUtils.cpp
+ifdef MOZ_XSLT_STANDALONE
+CPPSRCS += \
+	txAttr.cpp \
+	txDocument.cpp \
+	txElement.cpp \
+	txNodeDefinition.cpp \
+	txProcessingInstruction.cpp \
+	$(NULL)
+endif
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
@@ -71,5 +89,9 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(srcdir)/../base -I$(srcdir)/dom -I$(srcdir)/../xpath \
-            -I$(srcdir)/../xslt
+INCLUDES += \
+	-I$(srcdir)/../base \
+	-I$(srcdir) \
+	-I$(srcdir)/../xpath \
+	-I$(srcdir)/../xslt \
+	$(NULL)
diff --git a/mozilla/content/xslt/src/xml/txAttr.cpp b/mozilla/content/xslt/src/xml/txAttr.cpp
index 577157b4c74..ff71b25358d 100644
--- a/mozilla/content/xslt/src/xml/txAttr.cpp
+++ b/mozilla/content/xslt/src/xml/txAttr.cpp
@@ -41,9 +41,9 @@
 //    Implementation of the Attr class
 //
 
-#include "dom.h"
+#include "txDOM.h"
 #include "txAtoms.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 Attr::Attr(nsIAtom *aPrefix, nsIAtom *aLocalName, PRInt32 aNamespaceID,
            Element *aOwnerElement, const nsAString &aValue) :
diff --git a/mozilla/content/xslt/src/xml/txDOM.h b/mozilla/content/xslt/src/xml/txDOM.h
index 84d046240f1..b34cdc60ca6 100644
--- a/mozilla/content/xslt/src/xml/txDOM.h
+++ b/mozilla/content/xslt/src/xml/txDOM.h
@@ -53,7 +53,7 @@
 #include <stdlib.h>
 #endif
 
-#include "List.h"
+#include "txList.h"
 #include "nsIAtom.h"
 #include "nsDoubleHashtable.h"
 #include "nsString.h"
diff --git a/mozilla/content/xslt/src/xml/txDocument.cpp b/mozilla/content/xslt/src/xml/txDocument.cpp
index 5867b20cdfb..47cfba712f8 100644
--- a/mozilla/content/xslt/src/xml/txDocument.cpp
+++ b/mozilla/content/xslt/src/xml/txDocument.cpp
@@ -48,7 +48,7 @@
 // LF   08/06/1999  fixed typo: defalut to default
 //
 
-#include "dom.h"
+#include "txDOM.h"
 #include "txAtoms.h"
 
 //
diff --git a/mozilla/content/xslt/src/xml/txElement.cpp b/mozilla/content/xslt/src/xml/txElement.cpp
index 27f56a29f2c..11619c98772 100644
--- a/mozilla/content/xslt/src/xml/txElement.cpp
+++ b/mozilla/content/xslt/src/xml/txElement.cpp
@@ -41,9 +41,9 @@
 //    Implementation of the Element class
 //
 
-#include "dom.h"
+#include "txDOM.h"
 #include "txAtoms.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 Element::Element(nsIAtom *aPrefix, nsIAtom *aLocalName, PRInt32 aNamespaceID,
                  Document* aOwner) :
diff --git a/mozilla/content/xslt/src/xml/txNodeDefinition.cpp b/mozilla/content/xslt/src/xml/txNodeDefinition.cpp
index f63da7939bb..5e7271f8c6b 100644
--- a/mozilla/content/xslt/src/xml/txNodeDefinition.cpp
+++ b/mozilla/content/xslt/src/xml/txNodeDefinition.cpp
@@ -45,7 +45,7 @@
 // TK   03/29/99  Created
 //
 
-#include "dom.h"
+#include "txDOM.h"
 #include "nsVoidArray.h"
 #include "txURIUtils.h"
 #include "txAtoms.h"
diff --git a/mozilla/content/xslt/src/xml/txProcessingInstruction.cpp b/mozilla/content/xslt/src/xml/txProcessingInstruction.cpp
index 958005c1921..c7ad0e8ff2c 100644
--- a/mozilla/content/xslt/src/xml/txProcessingInstruction.cpp
+++ b/mozilla/content/xslt/src/xml/txProcessingInstruction.cpp
@@ -45,7 +45,7 @@
 // TK   03/29/99  Created
 //
 
-#include "dom.h"
+#include "txDOM.h"
 #include "nsIAtom.h"
 
 //
diff --git a/mozilla/content/xslt/src/xml/txXMLParser.cpp b/mozilla/content/xslt/src/xml/txXMLParser.cpp
index 4bface5f3e9..96d516ff287 100644
--- a/mozilla/content/xslt/src/xml/txXMLParser.cpp
+++ b/mozilla/content/xslt/src/xml/txXMLParser.cpp
@@ -48,7 +48,7 @@
 #else
 #include "expat_config.h"
 #include "expat.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 #endif
 
 #ifdef TX_EXE
diff --git a/mozilla/content/xslt/src/xml/txXMLUtils.cpp b/mozilla/content/xslt/src/xml/txXMLUtils.cpp
index 23572ea9b67..d8acfdce844 100644
--- a/mozilla/content/xslt/src/xml/txXMLUtils.cpp
+++ b/mozilla/content/xslt/src/xml/txXMLUtils.cpp
@@ -41,7 +41,7 @@
  * XML utility classes
  */
 
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 #include "nsString.h"
 #include "nsReadableUtils.h"
 #include "txAtoms.h"
diff --git a/mozilla/content/xslt/src/xml/txXMLUtils.h b/mozilla/content/xslt/src/xml/txXMLUtils.h
index 90f8b392ca6..097f8c8df9c 100644
--- a/mozilla/content/xslt/src/xml/txXMLUtils.h
+++ b/mozilla/content/xslt/src/xml/txXMLUtils.h
@@ -51,6 +51,7 @@
 
 #ifndef TX_EXE
 #include "nsIParserService.h"
+#include "nsContentUtils.h"
 #endif
 
 #define kExpatSeparatorChar 0xFFFF
@@ -122,8 +123,6 @@ extern "C" int MOZ_XMLCheckQName(const char* ptr, const char* end,
                                  int ns_aware, const char** colon);
 extern "C" int MOZ_XMLIsLetter(const char* ptr);
 extern "C" int MOZ_XMLIsNCNameChar(const char* ptr);
-#else
-extern nsIParserService *gTxParserService;
 #endif
 
 class XMLUtils {
@@ -175,7 +174,8 @@ public:
         *aColon = NS_REINTERPRET_CAST(const PRUnichar*, colonPtr);
         return result == 0;
 #else
-        return NS_SUCCEEDED(gTxParserService->CheckQName(aQName, PR_TRUE, aColon));
+        nsIParserService* ps = nsContentUtils::GetParserService();
+        return ps && NS_SUCCEEDED(ps->CheckQName(aQName, PR_TRUE, aColon));
 #endif
     }
 
@@ -187,7 +187,8 @@ public:
 #ifdef TX_EXE
         return MOZ_XMLIsLetter(NS_REINTERPRET_CAST(const char*, &aChar));
 #else
-        return gTxParserService->IsXMLLetter(aChar);
+        nsIParserService* ps = nsContentUtils::GetParserService();
+        return ps && ps->IsXMLLetter(aChar);
 #endif
     }
 
@@ -199,7 +200,8 @@ public:
 #ifdef TX_EXE
         return MOZ_XMLIsNCNameChar(NS_REINTERPRET_CAST(const char*, &aChar));
 #else
-        return gTxParserService->IsXMLNCNameChar(aChar);
+        nsIParserService* ps = nsContentUtils::GetParserService();
+        return ps && ps->IsXMLNCNameChar(aChar);
 #endif
     }
 
diff --git a/mozilla/content/xslt/src/xpath/Makefile.in b/mozilla/content/xslt/src/xpath/Makefile.in
index 691290980ad..8ff7a441364 100644
--- a/mozilla/content/xslt/src/xpath/Makefile.in
+++ b/mozilla/content/xslt/src/xpath/Makefile.in
@@ -50,7 +50,7 @@ REQUIRES	= string \
 		  xpcom \
 		  $(NULL)
 
-ifndef TX_EXE
+ifndef MOZ_XSLT_STANDALONE
 REQUIRES +=	  dom \
 		  content \
 		  widget \
@@ -60,29 +60,30 @@ REQUIRES +=	  dom \
 		  layout \
 		  necko \
 		  htmlparser \
+		  pref \
 		  $(NULL)
 endif
 
-CPPSRCS = AdditiveExpr.cpp \
-        AttributeValueTemplate.cpp \
-        BooleanExpr.cpp \
-        BooleanFunctionCall.cpp \
-        BooleanResult.cpp \
-        ExprLexer.cpp \
-        ExprParser.cpp \
-        FilterExpr.cpp \
-        FunctionCall.cpp \
-        LocationStep.cpp \
-        MultiplicativeExpr.cpp \
-        NodeSetFunctionCall.cpp \
-        NumberFunctionCall.cpp \
-        NumberResult.cpp \
-        PathExpr.cpp \
-        PredicateList.cpp \
-        RelationalExpr.cpp \
-        RootExpr.cpp \
-        StringFunctionCall.cpp \
-        StringResult.cpp \
+CPPSRCS = txAdditiveExpr.cpp \
+        txAttributeValueTemplate.cpp \
+        txBooleanExpr.cpp \
+        txBooleanFunctionCall.cpp \
+        txBooleanResult.cpp \
+        txExprLexer.cpp \
+        txExprParser.cpp \
+        txFilterExpr.cpp \
+        txFunctionCall.cpp \
+        txLocationStep.cpp \
+        txMultiplicativeExpr.cpp \
+        txNodeSetFunctionCall.cpp \
+        txNumberFunctionCall.cpp \
+        txNumberResult.cpp \
+        txPathExpr.cpp \
+        txPredicateList.cpp \
+        txRelationalExpr.cpp \
+        txRootExpr.cpp \
+        txStringFunctionCall.cpp \
+        txStringResult.cpp \
         txErrorExpr.cpp \
         txLiteralExpr.cpp \
         txNameTest.cpp \
@@ -91,10 +92,10 @@ CPPSRCS = AdditiveExpr.cpp \
         txForwardContext.cpp \
         txNodeSetContext.cpp \
         txResultRecycler.cpp \
-        UnionExpr.cpp \
-        UnaryExpr.cpp \
-        VariableRefExpr.cpp
-ifndef TX_EXE
+        txUnionExpr.cpp \
+        txUnaryExpr.cpp \
+        txVariableRefExpr.cpp
+ifndef MOZ_XSLT_STANDALONE
 CPPSRCS += nsXPathEvaluator.cpp \
            nsXPathException.cpp \
            nsXPathExpression.cpp \
@@ -106,13 +107,13 @@ else
 CPPSRCS += txStandaloneXPathTreeWalker.cpp
 endif
 
-ifndef TX_EXE
-ifndef DISABLE_XFORMS_HOOKS
+ifndef DISABLE_XFORMS_HOOKS # Dummy var, nobody sets it!
+ifndef MOZ_XSLT_STANDALONE
 EXPORTS = nsIXFormsUtilityService.h \
           nsIXFormsXPathEvaluator.h
 
 CPPSRCS += nsXFormsXPathEvaluator.cpp \
-           XFormsFunctionCall.cpp
+           txXFormsFunctionCall.cpp
 endif
 endif
 
@@ -122,6 +123,9 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(srcdir) -I$(srcdir)/../base \
-        -I$(srcdir)/../xml -I$(srcdir)/../xml/dom \
-        -I$(srcdir)/../xslt
+INCLUDES += \
+	-I$(srcdir)/../base \
+	-I$(srcdir)/../xml \
+	-I$(srcdir) \
+	-I$(srcdir)/../xslt \
+	$(NULL)
diff --git a/mozilla/content/xslt/src/xpath/nsXFormsXPathEvaluator.cpp b/mozilla/content/xslt/src/xpath/nsXFormsXPathEvaluator.cpp
index 915bfaf6801..302701088cf 100644
--- a/mozilla/content/xslt/src/xpath/nsXFormsXPathEvaluator.cpp
+++ b/mozilla/content/xslt/src/xpath/nsXFormsXPathEvaluator.cpp
@@ -45,8 +45,8 @@
 #include "nsXPathNSResolver.h"
 #include "nsXPathResult.h"
 #include "nsContentCID.h"
-#include "Expr.h"
-#include "ExprParser.h"
+#include "txExpr.h"
+#include "txExprParser.h"
 #include "nsDOMError.h"
 #include "txURIUtils.h"
 #include "nsIDocument.h"
@@ -55,10 +55,9 @@
 #include "nsINameSpaceManager.h"
 #include "txError.h"
 #include "txAtoms.h"
-#include "XFormsFunctions.h"
+#include "txXFormsFunctions.h"
 #include "nsIDOM3Node.h"
-
-extern nsINameSpaceManager* gTxNameSpaceManager;
+#include "nsContentUtils.h"
 
 NS_IMPL_ADDREF(nsXFormsXPathEvaluator)
 NS_IMPL_RELEASE(nsXFormsXPathEvaluator)
@@ -186,7 +185,7 @@ nsresult nsXFormsXPathEvaluator::XFormsParseContextImpl::resolveNamespacePrefix
   }
 
   // get the namespaceID for the URI
-  return gTxNameSpaceManager->RegisterNameSpace(ns, aID);
+  return nsContentUtils::NameSpaceManager()->RegisterNameSpace(ns, aID);
 }
 
 nsresult
diff --git a/mozilla/content/xslt/src/xpath/nsXPathEvaluator.cpp b/mozilla/content/xslt/src/xpath/nsXPathEvaluator.cpp
index 71012a59221..785fcfcd86b 100644
--- a/mozilla/content/xslt/src/xpath/nsXPathEvaluator.cpp
+++ b/mozilla/content/xslt/src/xpath/nsXPathEvaluator.cpp
@@ -45,8 +45,8 @@
 #include "nsXPathNSResolver.h"
 #include "nsXPathResult.h"
 #include "nsContentCID.h"
-#include "Expr.h"
-#include "ExprParser.h"
+#include "txExpr.h"
+#include "txExprParser.h"
 #include "nsDOMError.h"
 #include "txURIUtils.h"
 #include "nsIDocument.h"
@@ -54,8 +54,7 @@
 #include "nsDOMString.h"
 #include "nsINameSpaceManager.h"
 #include "txError.h"
-
-extern nsINameSpaceManager* gTxNameSpaceManager;
+#include "nsContentUtils.h"
 
 NS_IMPL_AGGREGATED(nsXPathEvaluator)
 NS_INTERFACE_MAP_BEGIN_AGGREGATED(nsXPathEvaluator)
@@ -120,7 +119,7 @@ nsXPathEvaluator::CreateNSResolver(nsIDOMNode *aNodeResolver,
                                    nsIDOMXPathNSResolver **aResult)
 {
     NS_ENSURE_ARG(aNodeResolver);
-    if (!URIUtils::CanCallerAccess(aNodeResolver))
+    if (!nsContentUtils::CanCallerAccess(aNodeResolver))
         return NS_ERROR_DOM_SECURITY_ERR;
 
     *aResult = new nsXPathNSResolver(aNodeResolver);
@@ -191,7 +190,7 @@ nsresult nsXPathEvaluator::ParseContextImpl::resolveNamespacePrefix
     }
 
     // get the namespaceID for the URI
-    return gTxNameSpaceManager->RegisterNameSpace(ns, aID);
+    return nsContentUtils::NameSpaceManager()->RegisterNameSpace(ns, aID);
 }
 
 nsresult
diff --git a/mozilla/content/xslt/src/xpath/nsXPathExpression.cpp b/mozilla/content/xslt/src/xpath/nsXPathExpression.cpp
index 16454e6f4e9..86cd1d94e2f 100644
--- a/mozilla/content/xslt/src/xpath/nsXPathExpression.cpp
+++ b/mozilla/content/xslt/src/xpath/nsXPathExpression.cpp
@@ -37,8 +37,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsXPathExpression.h"
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 #include "nsDOMError.h"
 #include "nsIDOMCharacterData.h"
 #include "nsIDOMClassInfo.h"
@@ -91,7 +91,7 @@ nsXPathExpression::EvaluateWithContext(nsIDOMNode *aContextNode,
     if (aContextPosition > aContextSize)
         return NS_ERROR_FAILURE;
 
-    if (!URIUtils::CanCallerAccess(aContextNode))
+    if (!nsContentUtils::CanCallerAccess(aContextNode))
         return NS_ERROR_DOM_SECURITY_ERR;
 
     nsresult rv;
diff --git a/mozilla/content/xslt/src/xpath/nsXPathResult.cpp b/mozilla/content/xslt/src/xpath/nsXPathResult.cpp
index 2d3971c8c2b..a6f646c5c5a 100644
--- a/mozilla/content/xslt/src/xpath/nsXPathResult.cpp
+++ b/mozilla/content/xslt/src/xpath/nsXPathResult.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsXPathResult.h"
-#include "ExprResult.h"
+#include "txExprResult.h"
 #include "txNodeSet.h"
 #include "nsDOMError.h"
 #include "nsIContent.h"
diff --git a/mozilla/content/xslt/src/xpath/nsXPathResult.h b/mozilla/content/xslt/src/xpath/nsXPathResult.h
index ca58e6566a2..a5c347226aa 100644
--- a/mozilla/content/xslt/src/xpath/nsXPathResult.h
+++ b/mozilla/content/xslt/src/xpath/nsXPathResult.h
@@ -39,7 +39,7 @@
 #ifndef nsXPathResult_h__
 #define nsXPathResult_h__
 
-#include "ExprResult.h"
+#include "txExprResult.h"
 #include "nsIDOMXPathResult.h"
 #include "nsIDocument.h"
 #include "nsIDocumentObserver.h"
diff --git a/mozilla/content/xslt/src/xpath/txAdditiveExpr.cpp b/mozilla/content/xslt/src/xpath/txAdditiveExpr.cpp
index acf5b01d732..0000579d404 100644
--- a/mozilla/content/xslt/src/xpath/txAdditiveExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txAdditiveExpr.cpp
@@ -43,8 +43,8 @@
  *  -   : subtraction
 **/
 
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 #include "txIXPathContext.h"
 
 /**
diff --git a/mozilla/content/xslt/src/xpath/txAttributeValueTemplate.cpp b/mozilla/content/xslt/src/xpath/txAttributeValueTemplate.cpp
index 8234baf8ab2..aaaf67d0626 100644
--- a/mozilla/content/xslt/src/xpath/txAttributeValueTemplate.cpp
+++ b/mozilla/content/xslt/src/xpath/txAttributeValueTemplate.cpp
@@ -40,8 +40,8 @@
  * AttributeValueTemplate
 **/
 
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 #include "txIXPathContext.h"
 
 /**
diff --git a/mozilla/content/xslt/src/xpath/txBooleanExpr.cpp b/mozilla/content/xslt/src/xpath/txBooleanExpr.cpp
index 841250bcb7c..ea6908a6bde 100644
--- a/mozilla/content/xslt/src/xpath/txBooleanExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txBooleanExpr.cpp
@@ -42,8 +42,8 @@
  * performs a boolean operation between it's lvalue and rvalue.
 **/
 
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 #include "txIXPathContext.h"
 
 /**
diff --git a/mozilla/content/xslt/src/xpath/txBooleanFunctionCall.cpp b/mozilla/content/xslt/src/xpath/txBooleanFunctionCall.cpp
index 855261202cf..33ea13df6de 100644
--- a/mozilla/content/xslt/src/xpath/txBooleanFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xpath/txBooleanFunctionCall.cpp
@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "ExprResult.h"
-#include "FunctionLib.h"
+#include "txExprResult.h"
+#include "txFunctionLib.h"
 #include "nsReadableUtils.h"
 #include "txAtoms.h"
 #include "txError.h"
diff --git a/mozilla/content/xslt/src/xpath/txBooleanResult.cpp b/mozilla/content/xslt/src/xpath/txBooleanResult.cpp
index c61df5d73db..c3f77647f4d 100644
--- a/mozilla/content/xslt/src/xpath/txBooleanResult.cpp
+++ b/mozilla/content/xslt/src/xpath/txBooleanResult.cpp
@@ -40,7 +40,7 @@
  * Boolean Expression result
 */
 
-#include "ExprResult.h"
+#include "txExprResult.h"
 
 /**
  * Creates a new BooleanResult with the value of the given MBool parameter
diff --git a/mozilla/content/xslt/src/xpath/txErrorExpr.cpp b/mozilla/content/xslt/src/xpath/txErrorExpr.cpp
index b506a578dd6..54a5f593361 100755
--- a/mozilla/content/xslt/src/xpath/txErrorExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txErrorExpr.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txError.h"
-#include "Expr.h"
+#include "txExpr.h"
 #include "nsString.h"
 #include "txIXPathContext.h"
 
diff --git a/mozilla/content/xslt/src/xpath/txExpr.h b/mozilla/content/xslt/src/xpath/txExpr.h
index 76b3a2540d7..7aea1524c3f 100644
--- a/mozilla/content/xslt/src/xpath/txExpr.h
+++ b/mozilla/content/xslt/src/xpath/txExpr.h
@@ -41,7 +41,7 @@
 #ifndef TRANSFRMX_EXPR_H
 #define TRANSFRMX_EXPR_H
 
-#include "List.h"
+#include "txList.h"
 #include "nsAutoPtr.h"
 #include "txCore.h"
 #include "nsString.h"
diff --git a/mozilla/content/xslt/src/xpath/txExprLexer.cpp b/mozilla/content/xslt/src/xpath/txExprLexer.cpp
index ccb5584a105..828e8558e67 100644
--- a/mozilla/content/xslt/src/xpath/txExprLexer.cpp
+++ b/mozilla/content/xslt/src/xpath/txExprLexer.cpp
@@ -40,11 +40,11 @@
  * Lexical analyzer for XPath expressions
  */
 
-#include "ExprLexer.h"
+#include "txExprLexer.h"
 #include "txAtoms.h"
 #include "nsString.h"
 #include "txError.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 /**
  * Creates a new ExprLexer
@@ -113,7 +113,7 @@ txExprLexer::nextIsOperatorToken(Token* aToken)
   if (!aToken || aToken->mType == Token::NULL_TOKEN) {
     return PR_FALSE;
   }
-  /* This relies on the tokens having the right order in ExprLexer.h */
+  /* This relies on the tokens having the right order in txExprLexer.h */
   return aToken->mType < Token::COMMA ||
     aToken->mType > Token::UNION_OP;
 
diff --git a/mozilla/content/xslt/src/xpath/txExprParser.cpp b/mozilla/content/xslt/src/xpath/txExprParser.cpp
index dfb681e71b2..b543698b137 100644
--- a/mozilla/content/xslt/src/xpath/txExprParser.cpp
+++ b/mozilla/content/xslt/src/xpath/txExprParser.cpp
@@ -42,9 +42,9 @@
  * @see ExprLexer
 **/
 
-#include "ExprParser.h"
-#include "ExprLexer.h"
-#include "FunctionLib.h"
+#include "txExprParser.h"
+#include "txExprLexer.h"
+#include "txFunctionLib.h"
 #include "txStack.h"
 #include "txAtoms.h"
 #include "txError.h"
diff --git a/mozilla/content/xslt/src/xpath/txFilterExpr.cpp b/mozilla/content/xslt/src/xpath/txFilterExpr.cpp
index 109057fc5fd..3dd213ac280 100644
--- a/mozilla/content/xslt/src/xpath/txFilterExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txFilterExpr.cpp
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "txNodeSet.h"
 #include "txIXPathContext.h"
 
diff --git a/mozilla/content/xslt/src/xpath/txFunctionCall.cpp b/mozilla/content/xslt/src/xpath/txFunctionCall.cpp
index bf0cb92d1d6..94ffd0841da 100644
--- a/mozilla/content/xslt/src/xpath/txFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xpath/txFunctionCall.cpp
@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "FunctionLib.h"
-#include "ExprResult.h"
+#include "txFunctionLib.h"
+#include "txExprResult.h"
 #include "nsIAtom.h"
 #include "txIXPathContext.h"
 #include "txNodeSet.h"
diff --git a/mozilla/content/xslt/src/xpath/txFunctionLib.h b/mozilla/content/xslt/src/xpath/txFunctionLib.h
index b865b0ed568..44dbcf20553 100644
--- a/mozilla/content/xslt/src/xpath/txFunctionLib.h
+++ b/mozilla/content/xslt/src/xpath/txFunctionLib.h
@@ -39,7 +39,7 @@
 #ifndef TRANSFRMX_FUNCTIONLIB_H
 #define TRANSFRMX_FUNCTIONLIB_H
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "nsIAtom.h"
 
 /**
diff --git a/mozilla/content/xslt/src/xpath/txLiteralExpr.cpp b/mozilla/content/xslt/src/xpath/txLiteralExpr.cpp
index 7a608bd0428..e444ff2d1e6 100644
--- a/mozilla/content/xslt/src/xpath/txLiteralExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txLiteralExpr.cpp
@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 
 txLiteralExpr::txLiteralExpr(double aDbl)
     : mValue(new NumberResult(aDbl, nsnull))
diff --git a/mozilla/content/xslt/src/xpath/txLocationStep.cpp b/mozilla/content/xslt/src/xpath/txLocationStep.cpp
index 2d0bd46958e..a5f5bb6450f 100644
--- a/mozilla/content/xslt/src/xpath/txLocationStep.cpp
+++ b/mozilla/content/xslt/src/xpath/txLocationStep.cpp
@@ -40,7 +40,7 @@
   Implementation of an XPath LocationStep
 */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "txIXPathContext.h"
 #include "txNodeSet.h"
 
diff --git a/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp b/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
index 112741e5d8b..01ea24c8248 100644
--- a/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
+++ b/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
@@ -51,8 +51,8 @@
 #include "nsReadableUtils.h"
 #include "nsString.h"
 #include "nsTextFragment.h"
-#include "XMLUtils.h"
-#include "TxLog.h"
+#include "txXMLUtils.h"
+#include "txLog.h"
 #include "nsUnicharUtils.h"
 
 const PRUint32 kUnknownIndex = PRUint32(-1);
@@ -529,7 +529,7 @@ txXPathNodeUtils::getNamespaceID(const txXPathNode& aNode)
 void
 txXPathNodeUtils::getNamespaceURI(const txXPathNode& aNode, nsAString& aURI)
 {
-    gTxNameSpaceManager->GetNameSpaceURI(getNamespaceID(aNode), aURI);
+    nsContentUtils::NameSpaceManager()->GetNameSpaceURI(getNamespaceID(aNode), aURI);
 }
 
 /* static */
@@ -938,7 +938,7 @@ txXPathNativeNode::getNode(const txXPathNode& aNode, nsIDOMNode** aResult)
                                   getter_AddRefs(prefix));
 
     nsAutoString namespaceURI, localname;
-    gTxNameSpaceManager->GetNameSpaceURI(namespaceID, namespaceURI);
+    nsContentUtils::NameSpaceManager()->GetNameSpaceURI(namespaceID, namespaceURI);
     name->ToString(localname);
 
     nsCOMPtr<nsIDOMElement> element = do_QueryInterface(aNode.mContent);
diff --git a/mozilla/content/xslt/src/xpath/txMultiplicativeExpr.cpp b/mozilla/content/xslt/src/xpath/txMultiplicativeExpr.cpp
index 570a89385d1..ae89b1ed270 100644
--- a/mozilla/content/xslt/src/xpath/txMultiplicativeExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txMultiplicativeExpr.cpp
@@ -44,8 +44,8 @@
  * div  : divide
 **/
 
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 #include <math.h>
 #include "txIXPathContext.h"
 
diff --git a/mozilla/content/xslt/src/xpath/txNameTest.cpp b/mozilla/content/xslt/src/xpath/txNameTest.cpp
index 297f4d2f6a8..baa3c24c39a 100644
--- a/mozilla/content/xslt/src/xpath/txNameTest.cpp
+++ b/mozilla/content/xslt/src/xpath/txNameTest.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "nsIAtom.h"
 #include "txAtoms.h"
 #include "txXPathTreeWalker.h"
diff --git a/mozilla/content/xslt/src/xpath/txNodeSet.cpp b/mozilla/content/xslt/src/xpath/txNodeSet.cpp
index e7b56de4639..280dd640828 100644
--- a/mozilla/content/xslt/src/xpath/txNodeSet.cpp
+++ b/mozilla/content/xslt/src/xpath/txNodeSet.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txNodeSet.h"
-#include "TxLog.h"
+#include "txLog.h"
 #include "nsMemory.h"
 
 /**
diff --git a/mozilla/content/xslt/src/xpath/txNodeSet.h b/mozilla/content/xslt/src/xpath/txNodeSet.h
index 43d6ac4182c..cfb0b95429c 100644
--- a/mozilla/content/xslt/src/xpath/txNodeSet.h
+++ b/mozilla/content/xslt/src/xpath/txNodeSet.h
@@ -43,7 +43,7 @@
 #ifndef txNodeSet_h__
 #define txNodeSet_h__
 
-#include "ExprResult.h"
+#include "txExprResult.h"
 #include "nsVoidArray.h"
 #include "txError.h"
 #include "txXPathTreeWalker.h"
diff --git a/mozilla/content/xslt/src/xpath/txNodeSetFunctionCall.cpp b/mozilla/content/xslt/src/xpath/txNodeSetFunctionCall.cpp
index a6788bb7672..498a164948b 100644
--- a/mozilla/content/xslt/src/xpath/txNodeSetFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xpath/txNodeSetFunctionCall.cpp
@@ -41,7 +41,7 @@
  * A representation of the XPath NodeSet funtions
  */
 
-#include "FunctionLib.h"
+#include "txFunctionLib.h"
 #include "nsAutoPtr.h"
 #include "txNodeSet.h"
 #include "txAtoms.h"
diff --git a/mozilla/content/xslt/src/xpath/txNodeTypeTest.cpp b/mozilla/content/xslt/src/xpath/txNodeTypeTest.cpp
index 2a8738cb135..a50e6ee90cd 100644
--- a/mozilla/content/xslt/src/xpath/txNodeTypeTest.cpp
+++ b/mozilla/content/xslt/src/xpath/txNodeTypeTest.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "nsIAtom.h"
 #include "txIXPathContext.h"
 #include "txXPathTreeWalker.h"
diff --git a/mozilla/content/xslt/src/xpath/txNumberFunctionCall.cpp b/mozilla/content/xslt/src/xpath/txNumberFunctionCall.cpp
index 2fdd011e40f..be9ef7806fc 100644
--- a/mozilla/content/xslt/src/xpath/txNumberFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xpath/txNumberFunctionCall.cpp
@@ -40,7 +40,7 @@
  * A representation of the XPath Number funtions
  */
 
-#include "FunctionLib.h"
+#include "txFunctionLib.h"
 #include <math.h>
 #include "txNodeSet.h"
 #include "txAtoms.h"
diff --git a/mozilla/content/xslt/src/xpath/txNumberResult.cpp b/mozilla/content/xslt/src/xpath/txNumberResult.cpp
index 52a72288081..c103105d193 100644
--- a/mozilla/content/xslt/src/xpath/txNumberResult.cpp
+++ b/mozilla/content/xslt/src/xpath/txNumberResult.cpp
@@ -41,7 +41,7 @@
  * Represents the a number as the result of evaluating an Expr
 **/
 
-#include "ExprResult.h"
+#include "txExprResult.h"
 
 /**
  * Default Constructor
diff --git a/mozilla/content/xslt/src/xpath/txPathExpr.cpp b/mozilla/content/xslt/src/xpath/txPathExpr.cpp
index 16f23dfdf47..b124ce7fd42 100644
--- a/mozilla/content/xslt/src/xpath/txPathExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txPathExpr.cpp
@@ -36,11 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "txNodeSet.h"
 #include "txNodeSetContext.h"
 #include "txSingleNodeContext.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
   //------------/
  //- PathExpr -/
diff --git a/mozilla/content/xslt/src/xpath/txPredicateList.cpp b/mozilla/content/xslt/src/xpath/txPredicateList.cpp
index 9aeff275b92..419faefad87 100644
--- a/mozilla/content/xslt/src/xpath/txPredicateList.cpp
+++ b/mozilla/content/xslt/src/xpath/txPredicateList.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "txNodeSet.h"
 #include "txNodeSetContext.h"
 
diff --git a/mozilla/content/xslt/src/xpath/txRelationalExpr.cpp b/mozilla/content/xslt/src/xpath/txRelationalExpr.cpp
index e4fc1b96b33..5f280c468b8 100644
--- a/mozilla/content/xslt/src/xpath/txRelationalExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txRelationalExpr.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "txNodeSet.h"
 #include "txIXPathContext.h"
 
diff --git a/mozilla/content/xslt/src/xpath/txResultRecycler.cpp b/mozilla/content/xslt/src/xpath/txResultRecycler.cpp
index fb608e745f8..dd88a650ebd 100644
--- a/mozilla/content/xslt/src/xpath/txResultRecycler.cpp
+++ b/mozilla/content/xslt/src/xpath/txResultRecycler.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txResultRecycler.h"
-#include "ExprResult.h"
+#include "txExprResult.h"
 #include "txNodeSet.h"
 
 txResultRecycler::txResultRecycler()
diff --git a/mozilla/content/xslt/src/xpath/txRootExpr.cpp b/mozilla/content/xslt/src/xpath/txRootExpr.cpp
index a62f000e214..0b233b43bf1 100644
--- a/mozilla/content/xslt/src/xpath/txRootExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txRootExpr.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "txNodeSet.h"
 #include "txIXPathContext.h"
 
diff --git a/mozilla/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp b/mozilla/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp
index 291c173a5e8..e01ea53f56c 100644
--- a/mozilla/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp
+++ b/mozilla/content/xslt/src/xpath/txStandaloneXPathTreeWalker.cpp
@@ -41,7 +41,7 @@
 #include "nsPrintfCString.h"
 #include "nsReadableUtils.h"
 #include "nsString.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 txXPathTreeWalker::txXPathTreeWalker(const txXPathTreeWalker& aOther)
     : mPosition(aOther.mPosition)
diff --git a/mozilla/content/xslt/src/xpath/txStringFunctionCall.cpp b/mozilla/content/xslt/src/xpath/txStringFunctionCall.cpp
index f9b66d2b830..b39b33b43df 100644
--- a/mozilla/content/xslt/src/xpath/txStringFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xpath/txStringFunctionCall.cpp
@@ -41,12 +41,12 @@
  * A representation of the XPath String funtions
 **/
 
-#include "ExprResult.h"
-#include "FunctionLib.h"
+#include "txExprResult.h"
+#include "txFunctionLib.h"
 #include "txAtoms.h"
 #include "txError.h"
 #include "txIXPathContext.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 #include "txXPathTreeWalker.h"
 #include <math.h>
 #include "nsReadableUtils.h"
diff --git a/mozilla/content/xslt/src/xpath/txStringResult.cpp b/mozilla/content/xslt/src/xpath/txStringResult.cpp
index a220e17c749..1de94862656 100644
--- a/mozilla/content/xslt/src/xpath/txStringResult.cpp
+++ b/mozilla/content/xslt/src/xpath/txStringResult.cpp
@@ -40,7 +40,7 @@
  * StringResult
  * Represents a String as a Result of evaluating an Expr
 **/
-#include "ExprResult.h"
+#include "txExprResult.h"
 
 /**
  * Default Constructor
diff --git a/mozilla/content/xslt/src/xpath/txUnaryExpr.cpp b/mozilla/content/xslt/src/xpath/txUnaryExpr.cpp
index 563af4926ca..44853a3f594 100644
--- a/mozilla/content/xslt/src/xpath/txUnaryExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txUnaryExpr.cpp
@@ -36,8 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 #include "txIXPathContext.h"
 
 /*
diff --git a/mozilla/content/xslt/src/xpath/txUnionExpr.cpp b/mozilla/content/xslt/src/xpath/txUnionExpr.cpp
index 7029e1a0c5f..bf6a51f5167 100644
--- a/mozilla/content/xslt/src/xpath/txUnionExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txUnionExpr.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "txIXPathContext.h"
 #include "txNodeSet.h"
 
diff --git a/mozilla/content/xslt/src/xpath/txVariableRefExpr.cpp b/mozilla/content/xslt/src/xpath/txVariableRefExpr.cpp
index 8da7da34132..7617705c705 100644
--- a/mozilla/content/xslt/src/xpath/txVariableRefExpr.cpp
+++ b/mozilla/content/xslt/src/xpath/txVariableRefExpr.cpp
@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "nsIAtom.h"
 #include "txNodeSet.h"
 #include "txAtoms.h"
diff --git a/mozilla/content/xslt/src/xpath/txXFormsFunctionCall.cpp b/mozilla/content/xslt/src/xpath/txXFormsFunctionCall.cpp
index 7fe1d53fc58..f213efb5f62 100644
--- a/mozilla/content/xslt/src/xpath/txXFormsFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xpath/txXFormsFunctionCall.cpp
@@ -41,13 +41,13 @@
  * A representation of the XPath NodeSet funtions
  */
 
-#include "FunctionLib.h"
+#include "txFunctionLib.h"
 #include "nsAutoPtr.h"
 #include "txNodeSet.h"
 #include "txAtoms.h"
 #include "txIXPathContext.h"
 #include "txTokenizer.h"
-#include "XFormsFunctions.h"
+#include "txXFormsFunctions.h"
 #include <math.h>
 #include "nsIDOMDocument.h"
 #include "nsIDOMDocumentEvent.h"
diff --git a/mozilla/content/xslt/src/xpath/txXFormsFunctions.h b/mozilla/content/xslt/src/xpath/txXFormsFunctions.h
index 6c05a910c00..668d3835c39 100644
--- a/mozilla/content/xslt/src/xpath/txXFormsFunctions.h
+++ b/mozilla/content/xslt/src/xpath/txXFormsFunctions.h
@@ -39,7 +39,7 @@
 #ifndef TRANSFRMX_XFORMS_FUNCTIONS_H
 #define TRANSFRMX_XFORMS_FUNCTIONS_H
 
-#include "Expr.h"
+#include "txExpr.h"
 #include "nsIDOMNode.h"
 
 #define NS_NAMESPACE_XFORMS              "http://www.w3.org/2002/xforms"
diff --git a/mozilla/content/xslt/src/xpath/txXPathAtomList.h b/mozilla/content/xslt/src/xpath/txXPathAtomList.h
index 3b76c640db4..f72bc6d1738 100644
--- a/mozilla/content/xslt/src/xpath/txXPathAtomList.h
+++ b/mozilla/content/xslt/src/xpath/txXPathAtomList.h
@@ -91,7 +91,8 @@ TX_ATOM(preceding, "preceding")
 TX_ATOM(precedingSibling, "preceding-sibling")
 TX_ATOM(self, "self")
 
-#ifndef DISABLE_XFORMS_HOOKS
+
+#ifndef DISABLE_XFORMS_HOOKS // Dummy variable, nobody sets me!
 // XForms XPath Extensions
 TX_ATOM(avg, "avg")
 TX_ATOM(booleanFromString, "boolean-from-string")
diff --git a/mozilla/content/xslt/src/xpath/txXPathNode.h b/mozilla/content/xslt/src/xpath/txXPathNode.h
index cbc7e214102..de5a8233934 100644
--- a/mozilla/content/xslt/src/xpath/txXPathNode.h
+++ b/mozilla/content/xslt/src/xpath/txXPathNode.h
@@ -40,15 +40,14 @@
 #define txXPathNode_h__
 
 #ifdef TX_EXE
-#include "dom.h"
+#include "txDOM.h"
 #else
 #include "nsAutoPtr.h"
 #include "nsIContent.h"
 #include "nsIDocument.h"
 #include "nsIDOMNode.h"
 #include "nsINameSpaceManager.h"
-
-extern nsINameSpaceManager* gTxNameSpaceManager;
+#include "nsContentUtils.h"
 #endif
 
 #ifdef TX_EXE
@@ -131,10 +130,9 @@ txNamespaceManager::getNamespaceID(const nsAString& aNamespaceURI)
 #ifdef TX_EXE
     return txStandaloneNamespaceManager::getNamespaceID(aNamespaceURI);
 #else
-    NS_ASSERTION(gTxNameSpaceManager, "No namespace manager");
-
     PRInt32 namespaceID = kNameSpaceID_Unknown;
-    gTxNameSpaceManager->RegisterNameSpace(aNamespaceURI, namespaceID);
+    nsContentUtils::NameSpaceManager()->
+        RegisterNameSpace(aNamespaceURI, namespaceID);
     return namespaceID;
 #endif
 }
@@ -146,9 +144,8 @@ txNamespaceManager::getNamespaceURI(const PRInt32 aID, nsAString& aResult)
 #ifdef TX_EXE
     return txStandaloneNamespaceManager::getNamespaceURI(aID, aResult);
 #else
-    NS_ASSERTION(gTxNameSpaceManager, "No namespace manager");
-
-    return gTxNameSpaceManager->GetNameSpaceURI(aID, aResult);
+    return nsContentUtils::NameSpaceManager()->
+        GetNameSpaceURI(aID, aResult);
 #endif
 }
 
diff --git a/mozilla/content/xslt/src/xslt/Makefile.in b/mozilla/content/xslt/src/xslt/Makefile.in
index 677cff56db4..f42d7e030c5 100644
--- a/mozilla/content/xslt/src/xslt/Makefile.in
+++ b/mozilla/content/xslt/src/xslt/Makefile.in
@@ -42,18 +42,18 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS            = functions util
-
 MODULE = transformiix
 LIBRARY_NAME = txxslt_s
 MOZILLA_INTERNAL_API = 1
 
-REQUIRES	= string \
+REQUIRES = \
+		  string \
 		  xpcom \
 		  $(NULL)
 
-ifndef TX_EXE
-REQUIRES +=	  dom \
+ifndef MOZ_XSLT_STANDALONE
+REQUIRES += \
+		  dom \
 		  content \
 		  widget \
 		  necko \
@@ -69,14 +69,19 @@ REQUIRES +=	  dom \
 		  windowwatcher \
 		  mimetype \
 		  intl \
+		  locale \
 		  htmlparser \
+		  pref \
 		  $(NULL)
 else
-REQUIRES +=	  expat \
+REQUIRES += \
+		  expat \
 		  $(NULL)
 endif
 
 CPPSRCS = \
+        txNodeSorter.cpp \
+        txXPathResultComparator.cpp \
         txBufferingHandler.cpp \
         txExecutionState.cpp \
         txInstructions.cpp \
@@ -92,9 +97,17 @@ CPPSRCS = \
         txXSLTPatterns.cpp \
         txXSLTProcessor.cpp \
         txPatternParser.cpp \
-        txUnknownHandler.cpp
+        txUnknownHandler.cpp \
+        txCurrentFunctionCall.cpp \
+        txDocumentFunctionCall.cpp \
+        txElementAvailableFnCall.cpp \
+        txFormatNumberFunctionCall.cpp \
+        txFunctionAvailableFnCall.cpp \
+        txGenerateIdFunctionCall.cpp \
+        txKeyFunctionCall.cpp \
+        txSystemPropertyFunctionCall.cpp
 
-ifdef TX_EXE
+ifdef MOZ_XSLT_STANDALONE
 CPPSRCS += txHTMLOutput.cpp	\
            txStandaloneXSLTProcessor.cpp \
            txStandaloneStylesheetCompiler.cpp \
@@ -113,10 +126,13 @@ FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES += -I$(srcdir) -I$(srcdir)/../base \
-  -I$(srcdir)/../xml -I$(srcdir)/../xml/dom \
-  -I$(srcdir)/../xml/parser \
-  -I$(srcdir)/../xpath -I$(srcdir)/util -I$(srcdir)/functions
-ifdef TX_EXE
+INCLUDES += \
+	-I$(srcdir) \
+	-I$(srcdir)/../base \
+	-I$(srcdir)/../xml \
+	-I$(srcdir)/../xpath \
+	$(NULL)
+
+ifdef MOZ_XSLT_STANDALONE
 DEFINES	 += -DXML_DTD -DXML_UNICODE
 endif
diff --git a/mozilla/content/xslt/src/xslt/txCurrentFunctionCall.cpp b/mozilla/content/xslt/src/xslt/txCurrentFunctionCall.cpp
index ae6778a0bc6..d3aca6defe1 100644
--- a/mozilla/content/xslt/src/xslt/txCurrentFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txCurrentFunctionCall.cpp
@@ -1,5 +1,5 @@
 #include "txAtoms.h"
-#include "XSLTFunctions.h"
+#include "txXSLTFunctions.h"
 #include "txExecutionState.h"
 
 /*
diff --git a/mozilla/content/xslt/src/xslt/txDocumentFunctionCall.cpp b/mozilla/content/xslt/src/xslt/txDocumentFunctionCall.cpp
index 673214d84fb..f35015ffdb8 100644
--- a/mozilla/content/xslt/src/xslt/txDocumentFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txDocumentFunctionCall.cpp
@@ -43,7 +43,7 @@
 
 #include "txAtoms.h"
 #include "txIXPathContext.h"
-#include "XSLTFunctions.h"
+#include "txXSLTFunctions.h"
 #include "txExecutionState.h"
 #include "txURIUtils.h"
 
diff --git a/mozilla/content/xslt/src/xslt/txElementAvailableFnCall.cpp b/mozilla/content/xslt/src/xslt/txElementAvailableFnCall.cpp
index c27d7033022..7d94c463b06 100644
--- a/mozilla/content/xslt/src/xslt/txElementAvailableFnCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txElementAvailableFnCall.cpp
@@ -39,9 +39,9 @@
 #include "txIXPathContext.h"
 #include "txAtoms.h"
 #include "txError.h"
-#include "XMLUtils.h"
-#include "XSLTFunctions.h"
-#include "ExprResult.h"
+#include "txXMLUtils.h"
+#include "txXSLTFunctions.h"
+#include "txExprResult.h"
 #include "txNamespaceMap.h"
 
 /*
diff --git a/mozilla/content/xslt/src/xslt/txExecutionState.cpp b/mozilla/content/xslt/src/xslt/txExecutionState.cpp
index b8f5d62c17e..5e0454d3b0c 100644
--- a/mozilla/content/xslt/src/xslt/txExecutionState.cpp
+++ b/mozilla/content/xslt/src/xslt/txExecutionState.cpp
@@ -43,7 +43,7 @@
 #include "txVariableMap.h"
 #include "txRtfHandler.h"
 #include "txXSLTProcessor.h"
-#include "TxLog.h"
+#include "txLog.h"
 #include "txURIUtils.h"
 #include "txXMLParser.h"
 
diff --git a/mozilla/content/xslt/src/xslt/txExecutionState.h b/mozilla/content/xslt/src/xslt/txExecutionState.h
index abe7d6d10d2..d497c50997f 100644
--- a/mozilla/content/xslt/src/xslt/txExecutionState.h
+++ b/mozilla/content/xslt/src/xslt/txExecutionState.h
@@ -41,7 +41,7 @@
 
 #include "txCore.h"
 #include "txStack.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 #include "nsVoidArray.h"
 #include "txIXPathContext.h"
 #include "txVariableMap.h"
diff --git a/mozilla/content/xslt/src/xslt/txFormatNumberFunctionCall.cpp b/mozilla/content/xslt/src/xslt/txFormatNumberFunctionCall.cpp
index 83d12c65e64..f8faabc7ba2 100644
--- a/mozilla/content/xslt/src/xslt/txFormatNumberFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txFormatNumberFunctionCall.cpp
@@ -36,12 +36,12 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "XSLTFunctions.h"
+#include "txXSLTFunctions.h"
 #include "txAtoms.h"
 #include "txIXPathContext.h"
 #include "txStylesheet.h"
 #include <math.h>
-#include "ExprResult.h"
+#include "txExprResult.h"
 #include "txNamespaceMap.h"
 
 #include "prdtoa.h"
diff --git a/mozilla/content/xslt/src/xslt/txFunctionAvailableFnCall.cpp b/mozilla/content/xslt/src/xslt/txFunctionAvailableFnCall.cpp
index 2187c461b08..27596b43245 100644
--- a/mozilla/content/xslt/src/xslt/txFunctionAvailableFnCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txFunctionAvailableFnCall.cpp
@@ -37,11 +37,11 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txIXPathContext.h"
-#include "ExprResult.h"
+#include "txExprResult.h"
 #include "txAtoms.h"
 #include "txError.h"
-#include "XMLUtils.h"
-#include "XSLTFunctions.h"
+#include "txXMLUtils.h"
+#include "txXSLTFunctions.h"
 #include "txNamespaceMap.h"
 
 /*
diff --git a/mozilla/content/xslt/src/xslt/txGenerateIdFunctionCall.cpp b/mozilla/content/xslt/src/xslt/txGenerateIdFunctionCall.cpp
index d2dac47182f..ea8d1f91c89 100644
--- a/mozilla/content/xslt/src/xslt/txGenerateIdFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txGenerateIdFunctionCall.cpp
@@ -35,11 +35,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "ExprResult.h"
+#include "txExprResult.h"
 #include "txAtoms.h"
 #include "txIXPathContext.h"
 #include "txNodeSet.h"
-#include "XSLTFunctions.h"
+#include "txXSLTFunctions.h"
 
 /*
   Implementation of XSLT 1.0 extension function: generate-id
diff --git a/mozilla/content/xslt/src/xslt/txHTMLOutput.cpp b/mozilla/content/xslt/src/xslt/txHTMLOutput.cpp
index f2396256bf2..cacc955e68c 100644
--- a/mozilla/content/xslt/src/xslt/txHTMLOutput.cpp
+++ b/mozilla/content/xslt/src/xslt/txHTMLOutput.cpp
@@ -42,7 +42,7 @@
 #include "txAtoms.h"
 #include "txOutputFormat.h"
 #include "txStringUtils.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 #define EMPTY_ELEMENTS_COUNT 13
 const char* const kHTMLEmptyTags[] =
diff --git a/mozilla/content/xslt/src/xslt/txInstructions.cpp b/mozilla/content/xslt/src/xslt/txInstructions.cpp
index 2412f0f3147..c2119150815 100644
--- a/mozilla/content/xslt/src/xslt/txInstructions.cpp
+++ b/mozilla/content/xslt/src/xslt/txInstructions.cpp
@@ -38,8 +38,8 @@
 
 #include "txInstructions.h"
 #include "txError.h"
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 #include "txStylesheet.h"
 #include "txNodeSetContext.h"
 #include "txTextHandler.h"
diff --git a/mozilla/content/xslt/src/xslt/txInstructions.h b/mozilla/content/xslt/src/xslt/txInstructions.h
index a82f7dcb250..2bf27e97de2 100644
--- a/mozilla/content/xslt/src/xslt/txInstructions.h
+++ b/mozilla/content/xslt/src/xslt/txInstructions.h
@@ -42,7 +42,7 @@
 #include "nsCOMPtr.h"
 #include "txCore.h"
 #include "nsString.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 #include "txNamespaceMap.h"
 #include "nsAutoPtr.h"
 #include "txXSLTNumber.h"
diff --git a/mozilla/content/xslt/src/xslt/txKey.h b/mozilla/content/xslt/src/xslt/txKey.h
index 340cf5a4647..a1408106368 100644
--- a/mozilla/content/xslt/src/xslt/txKey.h
+++ b/mozilla/content/xslt/src/xslt/txKey.h
@@ -41,9 +41,9 @@
 
 #include "nsDoubleHashtable.h"
 #include "txNodeSet.h"
-#include "List.h"
+#include "txList.h"
 #include "txXSLTPatterns.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 class txPattern;
 class Expr;
diff --git a/mozilla/content/xslt/src/xslt/txKeyFunctionCall.cpp b/mozilla/content/xslt/src/xslt/txKeyFunctionCall.cpp
index 2a0b114535d..00044383a90 100644
--- a/mozilla/content/xslt/src/xslt/txKeyFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txKeyFunctionCall.cpp
@@ -39,7 +39,7 @@
 #include "txExecutionState.h"
 #include "txAtoms.h"
 #include "txSingleNodeContext.h"
-#include "XSLTFunctions.h"
+#include "txXSLTFunctions.h"
 #include "nsReadableUtils.h"
 #include "txKey.h"
 #include "txXSLTPatterns.h"
diff --git a/mozilla/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp b/mozilla/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
index 8b931cabe4c..7a8ff5397d1 100644
--- a/mozilla/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
+++ b/mozilla/content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
@@ -62,10 +62,10 @@
 #include "nsNetUtil.h"
 #include "nsParserCIID.h"
 #include "txAtoms.h"
-#include "TxLog.h"
+#include "txLog.h"
 #include "txMozillaXSLTProcessor.h"
 #include "txStylesheetCompiler.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 static const char kLoadAsData[] = "loadAsData";
 static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
diff --git a/mozilla/content/xslt/src/xslt/txMozillaXMLOutput.cpp b/mozilla/content/xslt/src/xslt/txMozillaXMLOutput.cpp
index 9028ee693d4..7ec942bfbf6 100644
--- a/mozilla/content/xslt/src/xslt/txMozillaXMLOutput.cpp
+++ b/mozilla/content/xslt/src/xslt/txMozillaXMLOutput.cpp
@@ -60,7 +60,7 @@
 #include "nsNetUtil.h"
 #include "nsUnicharUtils.h"
 #include "txAtoms.h"
-#include "TxLog.h"
+#include "txLog.h"
 #include "nsIConsoleService.h"
 #include "nsIDOMDocumentFragment.h"
 #include "nsINameSpaceManager.h"
@@ -73,8 +73,7 @@
 #include "nsICSSLoader.h"
 #include "nsICharsetAlias.h"
 #include "nsIHTMLContentSink.h"
-
-extern nsINameSpaceManager* gTxNameSpaceManager;
+#include "nsContentUtils.h"
 
 static NS_DEFINE_CID(kXMLDocumentCID, NS_XMLDOCUMENT_CID);
 static NS_DEFINE_CID(kHTMLDocumentCID, NS_HTMLDOCUMENT_CID);
@@ -164,7 +163,7 @@ void txMozillaXMLOutput::attribute(const nsAString& aName,
     }
     else {
         nsAutoString nsURI;
-        gTxNameSpaceManager->GetNameSpaceURI(aNsID, nsURI);
+        nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNsID, nsURI);
         element->SetAttributeNS(nsURI, aName, aValue);
     }
 }
@@ -438,7 +437,7 @@ void txMozillaXMLOutput::startElement(const nsAString& aName,
     }
     else {
         nsAutoString nsURI;
-        gTxNameSpaceManager->GetNameSpaceURI(aNsID, nsURI);
+        nsContentUtils::NameSpaceManager()->GetNameSpaceURI(aNsID, nsURI);
         rv = mDocument->CreateElementNS(nsURI, aName,
                                         getter_AddRefs(element));
         NS_ASSERTION(NS_SUCCEEDED(rv), "Can't create element");
diff --git a/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp b/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
index 778262620a7..1702f590dff 100644
--- a/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
+++ b/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
@@ -59,7 +59,7 @@
 #include "txMozillaTextOutput.h"
 #include "txMozillaXMLOutput.h"
 #include "txURIUtils.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 #include "txUnknownHandler.h"
 #include "txXSLTProcessor.h"
 #include "nsIPrincipal.h"
@@ -279,9 +279,9 @@ txMozillaXSLTProcessor::TransformDocument(nsIDOMNode* aSourceDOM,
     NS_ENSURE_ARG(aOutputDoc);
     NS_ENSURE_FALSE(aObserver, NS_ERROR_NOT_IMPLEMENTED);
 
-    if (!URIUtils::CanCallerAccess(aSourceDOM) ||
-        !URIUtils::CanCallerAccess(aStyleDOM) ||
-        !URIUtils::CanCallerAccess(aOutputDoc)) {
+    if (!nsContentUtils::CanCallerAccess(aSourceDOM) ||
+        !nsContentUtils::CanCallerAccess(aStyleDOM) ||
+        !nsContentUtils::CanCallerAccess(aOutputDoc)) {
         return NS_ERROR_DOM_SECURITY_ERR;
     }
 
@@ -401,7 +401,7 @@ txMozillaXSLTProcessor::ImportStylesheet(nsIDOMNode *aStyle)
     NS_ENSURE_TRUE(!mStylesheetDocument && !mStylesheet,
                    NS_ERROR_NOT_IMPLEMENTED);
 
-    if (!URIUtils::CanCallerAccess(aStyle)) {
+    if (!nsContentUtils::CanCallerAccess(aStyle)) {
         return NS_ERROR_DOM_SECURITY_ERR;
     }
     
@@ -442,7 +442,7 @@ txMozillaXSLTProcessor::TransformToDocument(nsIDOMNode *aSource,
     NS_ENSURE_ARG_POINTER(aResult);
     NS_ENSURE_SUCCESS(mCompileResult, mCompileResult);
 
-    if (!URIUtils::CanCallerAccess(aSource)) {
+    if (!nsContentUtils::CanCallerAccess(aSource)) {
         return NS_ERROR_DOM_SECURITY_ERR;
     }
 
@@ -507,8 +507,8 @@ txMozillaXSLTProcessor::TransformToFragment(nsIDOMNode *aSource,
     NS_ENSURE_ARG_POINTER(aResult);
     NS_ENSURE_SUCCESS(mCompileResult, mCompileResult);
 
-    if (!URIUtils::CanCallerAccess(aSource) ||
-        !URIUtils::CanCallerAccess(aOutput)) {
+    if (!nsContentUtils::CanCallerAccess(aSource) ||
+        !nsContentUtils::CanCallerAccess(aOutput)) {
         return NS_ERROR_DOM_SECURITY_ERR;
     }
 
@@ -591,7 +591,7 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI,
 
             nsCOMPtr<nsIDOMNode> node = do_QueryInterface(supports);
             if (node) {
-                if (!URIUtils::CanCallerAccess(node)) {
+                if (!nsContentUtils::CanCallerAccess(node)) {
                     return NS_ERROR_DOM_SECURITY_ERR;
                 }
 
@@ -616,7 +616,7 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI,
                                                         getter_AddRefs(node));
                         NS_ENSURE_SUCCESS(rv, rv);
 
-                        if (!URIUtils::CanCallerAccess(node)) {
+                        if (!nsContentUtils::CanCallerAccess(node)) {
                             return NS_ERROR_DOM_SECURITY_ERR;
                         }
                     }
@@ -650,7 +650,7 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI,
                 for (i = 0; i < length; ++i) {
                     nodeList->Item(i, getter_AddRefs(node));
 
-                    if (!URIUtils::CanCallerAccess(node)) {
+                    if (!nsContentUtils::CanCallerAccess(node)) {
                         return NS_ERROR_DOM_SECURITY_ERR;
                     }
                 }
@@ -694,7 +694,7 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI,
                 nsCOMPtr<nsIDOMNode> node = do_QueryInterface(supports);
 
                 if (node) {
-                    rv = URIUtils::CanCallerAccess(node) ? NS_OK :
+                    rv = nsContentUtils::CanCallerAccess(node) ? NS_OK :
                          NS_ERROR_DOM_SECURITY_ERR;
                 }
                 else {
@@ -726,7 +726,8 @@ txMozillaXSLTProcessor::SetParameter(const nsAString & aNamespaceURI,
     }
 
     PRInt32 nsId = kNameSpaceID_Unknown;
-    nsresult rv = gTxNameSpaceManager->RegisterNameSpace(aNamespaceURI, nsId);
+    nsresult rv = nsContentUtils::NameSpaceManager()->
+        RegisterNameSpace(aNamespaceURI, nsId);
     NS_ENSURE_SUCCESS(rv, rv);
     nsCOMPtr<nsIAtom> localName = do_GetAtom(aLocalName);
     txExpandedName varName(nsId, localName);
@@ -749,7 +750,8 @@ txMozillaXSLTProcessor::GetParameter(const nsAString& aNamespaceURI,
                                      nsIVariant **aResult)
 {
     PRInt32 nsId = kNameSpaceID_Unknown;
-    nsresult rv = gTxNameSpaceManager->RegisterNameSpace(aNamespaceURI, nsId);
+    nsresult rv = nsContentUtils::NameSpaceManager()->
+        RegisterNameSpace(aNamespaceURI, nsId);
     NS_ENSURE_SUCCESS(rv, rv);
     nsCOMPtr<nsIAtom> localName = do_GetAtom(aLocalName);
     txExpandedName varName(nsId, localName);
@@ -766,7 +768,8 @@ txMozillaXSLTProcessor::RemoveParameter(const nsAString& aNamespaceURI,
                                         const nsAString& aLocalName)
 {
     PRInt32 nsId = kNameSpaceID_Unknown;
-    nsresult rv = gTxNameSpaceManager->RegisterNameSpace(aNamespaceURI, nsId);
+    nsresult rv = nsContentUtils::NameSpaceManager()->
+        RegisterNameSpace(aNamespaceURI, nsId);
     NS_ENSURE_SUCCESS(rv, rv);
     nsCOMPtr<nsIAtom> localName = do_GetAtom(aLocalName);
     txExpandedName varName(nsId, localName);
diff --git a/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h b/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h
index 4c1f3e309db..ed425afa5a8 100644
--- a/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h
+++ b/mozilla/content/xslt/src/xslt/txMozillaXSLTProcessor.h
@@ -39,7 +39,7 @@
 #ifndef TRANSFRMX_TXMOZILLAXSLTPROCESSOR_H
 #define TRANSFRMX_TXMOZILLAXSLTPROCESSOR_H
 
-#include "ExprResult.h"
+#include "txExprResult.h"
 #include "nsIDocumentTransformer.h"
 #include "nsIVariant.h"
 #include "nsIXSLTProcessor.h"
diff --git a/mozilla/content/xslt/src/xslt/txNodeSorter.cpp b/mozilla/content/xslt/src/xslt/txNodeSorter.cpp
index be6b73886ea..39f7c1603ed 100644
--- a/mozilla/content/xslt/src/xslt/txNodeSorter.cpp
+++ b/mozilla/content/xslt/src/xslt/txNodeSorter.cpp
@@ -42,8 +42,8 @@
 #include "txXPathResultComparator.h"
 #include "txAtoms.h"
 #include "txNodeSetContext.h"
-#include "ExprResult.h"
-#include "Expr.h"
+#include "txExprResult.h"
+#include "txExpr.h"
 #include "txStringUtils.h"
 #include "prmem.h"
 #include "nsQuickSort.h"
diff --git a/mozilla/content/xslt/src/xslt/txNodeSorter.h b/mozilla/content/xslt/src/xslt/txNodeSorter.h
index 6b4eea79624..5bdb86ca472 100644
--- a/mozilla/content/xslt/src/xslt/txNodeSorter.h
+++ b/mozilla/content/xslt/src/xslt/txNodeSorter.h
@@ -41,7 +41,7 @@
 #define TRANSFRMX_NODESORTER_H
 
 #include "txCore.h"
-#include "List.h"
+#include "txList.h"
 
 class Expr;
 class txExecutionState;
diff --git a/mozilla/content/xslt/src/xslt/txOutputFormat.cpp b/mozilla/content/xslt/src/xslt/txOutputFormat.cpp
index afedacf6bb5..f8674034405 100644
--- a/mozilla/content/xslt/src/xslt/txOutputFormat.cpp
+++ b/mozilla/content/xslt/src/xslt/txOutputFormat.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txOutputFormat.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 txOutputFormat::txOutputFormat() : mMethod(eMethodNotSet),
                                    mOmitXMLDeclaration(eNotSet),
diff --git a/mozilla/content/xslt/src/xslt/txOutputFormat.h b/mozilla/content/xslt/src/xslt/txOutputFormat.h
index 4d6f35c5340..221e54fa9ca 100644
--- a/mozilla/content/xslt/src/xslt/txOutputFormat.h
+++ b/mozilla/content/xslt/src/xslt/txOutputFormat.h
@@ -39,7 +39,7 @@
 #ifndef TRANSFRMX_OUTPUTFORMAT_H
 #define TRANSFRMX_OUTPUTFORMAT_H
 
-#include "List.h"
+#include "txList.h"
 #include "nsString.h"
 
 enum txOutputMethod {
diff --git a/mozilla/content/xslt/src/xslt/txPatternParser.cpp b/mozilla/content/xslt/src/xslt/txPatternParser.cpp
index fd465d05aa8..6bf169e5289 100644
--- a/mozilla/content/xslt/src/xslt/txPatternParser.cpp
+++ b/mozilla/content/xslt/src/xslt/txPatternParser.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txPatternParser.h"
-#include "ExprLexer.h"
+#include "txExprLexer.h"
 #include "txAtoms.h"
 #include "txError.h"
 #include "txStringUtils.h"
diff --git a/mozilla/content/xslt/src/xslt/txPatternParser.h b/mozilla/content/xslt/src/xslt/txPatternParser.h
index 75753b1871a..ec6e9dae6d0 100644
--- a/mozilla/content/xslt/src/xslt/txPatternParser.h
+++ b/mozilla/content/xslt/src/xslt/txPatternParser.h
@@ -40,7 +40,7 @@
 #define TX_PATTERNPARSER_H
 
 #include "txXSLTPatterns.h"
-#include "ExprParser.h"
+#include "txExprParser.h"
 
 class txPatternParser : public txExprParser
 {
diff --git a/mozilla/content/xslt/src/xslt/txRtfHandler.h b/mozilla/content/xslt/src/xslt/txRtfHandler.h
index 44a1bf3994e..5c9ad761299 100644
--- a/mozilla/content/xslt/src/xslt/txRtfHandler.h
+++ b/mozilla/content/xslt/src/xslt/txRtfHandler.h
@@ -41,7 +41,7 @@
 #define txRtfHandler_h___
 
 #include "txBufferingHandler.h"
-#include "ExprResult.h"
+#include "txExprResult.h"
 
 class txResultTreeFragment : public txAExprResult
 {
diff --git a/mozilla/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp b/mozilla/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp
index b9d7a1c9f68..4b46e936db5 100644
--- a/mozilla/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp
+++ b/mozilla/content/xslt/src/xslt/txStandaloneStylesheetCompiler.cpp
@@ -37,7 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txStandaloneStylesheetCompiler.h"
-#include "TxLog.h"
+#include "txLog.h"
 #include "txStylesheetCompiler.h"
 #include "txURIUtils.h"
 #include "expat_config.h"
diff --git a/mozilla/content/xslt/src/xslt/txStandaloneXSLTProcessor.cpp b/mozilla/content/xslt/src/xslt/txStandaloneXSLTProcessor.cpp
index fce4330673b..15e46434b14 100644
--- a/mozilla/content/xslt/src/xslt/txStandaloneXSLTProcessor.cpp
+++ b/mozilla/content/xslt/src/xslt/txStandaloneXSLTProcessor.cpp
@@ -63,9 +63,9 @@ public:
 
     virtual ~txStandaloneHandlerFactory()
     {
-    };
+    }
 
-    TX_DECL_TXAOUTPUTHANDLERFACTORY;
+    TX_DECL_TXAOUTPUTHANDLERFACTORY
 
 private:
     txExecutionState* mEs;
diff --git a/mozilla/content/xslt/src/xslt/txStandaloneXSLTProcessor.h b/mozilla/content/xslt/src/xslt/txStandaloneXSLTProcessor.h
index e70baa7d941..4c1264b1699 100644
--- a/mozilla/content/xslt/src/xslt/txStandaloneXSLTProcessor.h
+++ b/mozilla/content/xslt/src/xslt/txStandaloneXSLTProcessor.h
@@ -42,7 +42,7 @@
 
 #include "txStylesheet.h"
 #include "txXSLTProcessor.h"
-#include "ErrorObserver.h"
+#include "txErrorObserver.h"
 
 #ifndef __BORLANDC__
 #include <iostream.h>
diff --git a/mozilla/content/xslt/src/xslt/txStylesheet.cpp b/mozilla/content/xslt/src/xslt/txStylesheet.cpp
index 94401df7286..2475f1e2dd9 100644
--- a/mozilla/content/xslt/src/xslt/txStylesheet.cpp
+++ b/mozilla/content/xslt/src/xslt/txStylesheet.cpp
@@ -37,12 +37,12 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txStylesheet.h"
-#include "Expr.h"
+#include "txExpr.h"
 #include "txXSLTPatterns.h"
 #include "txToplevelItems.h"
 #include "txInstructions.h"
-#include "XSLTFunctions.h"
-#include "TxLog.h"
+#include "txXSLTFunctions.h"
+#include "txLog.h"
 #include "txKey.h"
 
 txStylesheet::txStylesheet()
diff --git a/mozilla/content/xslt/src/xslt/txStylesheet.h b/mozilla/content/xslt/src/xslt/txStylesheet.h
index b790cc09555..89e19b5ba98 100644
--- a/mozilla/content/xslt/src/xslt/txStylesheet.h
+++ b/mozilla/content/xslt/src/xslt/txStylesheet.h
@@ -41,9 +41,9 @@
 
 #include "txOutputFormat.h"
 #include "txExpandedNameMap.h"
-#include "List.h"
+#include "txList.h"
 #include "txXSLTPatterns.h"
-#include "XSLTFunctions.h"
+#include "txXSLTFunctions.h"
 #include "nsVoidArray.h"
 
 class txInstruction;
diff --git a/mozilla/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp b/mozilla/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp
index 0b251ee84b4..d174d40ffe6 100644
--- a/mozilla/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp
+++ b/mozilla/content/xslt/src/xslt/txStylesheetCompileHandlers.cpp
@@ -48,7 +48,7 @@
 #include "txPatternParser.h"
 #include "txNamespaceMap.h"
 #include "txURIUtils.h"
-#include "XSLTFunctions.h"
+#include "txXSLTFunctions.h"
 
 txHandlerTable* gTxIgnoreHandler = 0;
 txHandlerTable* gTxRootHandler = 0;
diff --git a/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp b/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp
index be9a049c38e..e700ea495e4 100644
--- a/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp
+++ b/mozilla/content/xslt/src/xslt/txStylesheetCompiler.cpp
@@ -44,11 +44,11 @@
 #include "txStylesheet.h"
 #include "txInstructions.h"
 #include "txToplevelItems.h"
-#include "ExprParser.h"
-#include "TxLog.h"
+#include "txExprParser.h"
+#include "txLog.h"
 #include "txPatternParser.h"
 #include "txStringUtils.h"
-#include "XSLTFunctions.h"
+#include "txXSLTFunctions.h"
 
 txStylesheetCompiler::txStylesheetCompiler(const nsAString& aBaseURI,
                                            txACompileObserver* aObserver)
diff --git a/mozilla/content/xslt/src/xslt/txStylesheetCompiler.h b/mozilla/content/xslt/src/xslt/txStylesheetCompiler.h
index c411095c7b4..ce69e31e6ce 100644
--- a/mozilla/content/xslt/src/xslt/txStylesheetCompiler.h
+++ b/mozilla/content/xslt/src/xslt/txStylesheetCompiler.h
@@ -41,7 +41,7 @@
 
 #include "txStack.h"
 #include "txXSLTPatterns.h"
-#include "Expr.h"
+#include "txExpr.h"
 #include "txIXPathContext.h"
 #include "nsAutoPtr.h"
 #include "txStylesheet.h"
diff --git a/mozilla/content/xslt/src/xslt/txSystemPropertyFunctionCall.cpp b/mozilla/content/xslt/src/xslt/txSystemPropertyFunctionCall.cpp
index 2542f9b0d70..0f7f15a9025 100644
--- a/mozilla/content/xslt/src/xslt/txSystemPropertyFunctionCall.cpp
+++ b/mozilla/content/xslt/src/xslt/txSystemPropertyFunctionCall.cpp
@@ -40,9 +40,9 @@
 #include "txIXPathContext.h"
 #include "txAtoms.h"
 #include "txError.h"
-#include "XMLUtils.h"
-#include "XSLTFunctions.h"
-#include "ExprResult.h"
+#include "txXMLUtils.h"
+#include "txXSLTFunctions.h"
+#include "txExprResult.h"
 #include "txNamespaceMap.h"
 
 /*
diff --git a/mozilla/content/xslt/src/xslt/txToplevelItems.h b/mozilla/content/xslt/src/xslt/txToplevelItems.h
index 8fedaac1cb3..19518bee1b7 100644
--- a/mozilla/content/xslt/src/xslt/txToplevelItems.h
+++ b/mozilla/content/xslt/src/xslt/txToplevelItems.h
@@ -41,7 +41,7 @@
 
 #include "txError.h"
 #include "txOutputFormat.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 #include "txStylesheet.h"
 #include "txInstructions.h"
 
diff --git a/mozilla/content/xslt/src/xslt/txVariableMap.h b/mozilla/content/xslt/src/xslt/txVariableMap.h
index 29964a80a1d..ecdd671516c 100644
--- a/mozilla/content/xslt/src/xslt/txVariableMap.h
+++ b/mozilla/content/xslt/src/xslt/txVariableMap.h
@@ -40,8 +40,8 @@
 #define TRANSFRMX_VARIABLEMAP_H
 
 #include "txError.h"
-#include "XMLUtils.h"
-#include "ExprResult.h"
+#include "txXMLUtils.h"
+#include "txExprResult.h"
 #include "txExpandedNameMap.h"
 
 class txVariableMap {
diff --git a/mozilla/content/xslt/src/xslt/txXMLOutput.cpp b/mozilla/content/xslt/src/xslt/txXMLOutput.cpp
index c4baf685ae6..956088b5763 100644
--- a/mozilla/content/xslt/src/xslt/txXMLOutput.cpp
+++ b/mozilla/content/xslt/src/xslt/txXMLOutput.cpp
@@ -186,7 +186,7 @@ void txXMLOutput::endElement(const nsAString& aName,
     if (mOutputFormat.mIndent == eTrue)
         *mOut << endl;
     mAfterEndTag = MB_TRUE;
-    mInCDATASection = (MBool)mCDATASections.pop();
+    mInCDATASection = mCDATASections.pop() != 0;
 }
 
 void txXMLOutput::processingInstruction(const nsAString& aTarget,
diff --git a/mozilla/content/xslt/src/xslt/txXMLOutput.h b/mozilla/content/xslt/src/xslt/txXMLOutput.h
index 7a514c21237..f8041ef484e 100644
--- a/mozilla/content/xslt/src/xslt/txXMLOutput.h
+++ b/mozilla/content/xslt/src/xslt/txXMLOutput.h
@@ -40,10 +40,10 @@
 #define TRANSFRMX_XML_OUTPUT_H
 
 #include "txXMLEventHandler.h"
-#include "List.h"
+#include "txList.h"
 #include "txStack.h"
 #include "txOutputFormat.h"
-#include "XMLUtils.h"
+#include "txXMLUtils.h"
 
 #define DASH            '-'
 #define TX_CR           '\r'
diff --git a/mozilla/content/xslt/src/xslt/txXPathResultComparator.cpp b/mozilla/content/xslt/src/xslt/txXPathResultComparator.cpp
index b4fcc3f6146..67a74a564cf 100644
--- a/mozilla/content/xslt/src/xslt/txXPathResultComparator.cpp
+++ b/mozilla/content/xslt/src/xslt/txXPathResultComparator.cpp
@@ -38,8 +38,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "txXPathResultComparator.h"
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 #include "txCore.h"
 #ifndef TX_EXE
 #include "nsCollationCID.h"
diff --git a/mozilla/content/xslt/src/xslt/txXSLTFunctions.h b/mozilla/content/xslt/src/xslt/txXSLTFunctions.h
index 0e6f0f3583a..bc690bf82b8 100644
--- a/mozilla/content/xslt/src/xslt/txXSLTFunctions.h
+++ b/mozilla/content/xslt/src/xslt/txXSLTFunctions.h
@@ -38,8 +38,8 @@
 #ifndef TRANSFRMX_XSLT_FUNCTIONS_H
 #define TRANSFRMX_XSLT_FUNCTIONS_H
 
-#include "Expr.h"
-#include "XMLUtils.h"
+#include "txExpr.h"
+#include "txXMLUtils.h"
 #include "nsAutoPtr.h"
 
 class txPattern;
diff --git a/mozilla/content/xslt/src/xslt/txXSLTNumber.cpp b/mozilla/content/xslt/src/xslt/txXSLTNumber.cpp
index e8bb5510d62..65294f6ffec 100644
--- a/mozilla/content/xslt/src/xslt/txXSLTNumber.cpp
+++ b/mozilla/content/xslt/src/xslt/txXSLTNumber.cpp
@@ -40,8 +40,8 @@
 #include "txAtoms.h"
 #include "txCore.h"
 #include <math.h>
-#include "Expr.h"
-#include "ExprResult.h"
+#include "txExpr.h"
+#include "txExprResult.h"
 #include "txXSLTPatterns.h"
 #include "txIXPathContext.h"
 #include "txXPathTreeWalker.h"
diff --git a/mozilla/content/xslt/src/xslt/txXSLTNumber.h b/mozilla/content/xslt/src/xslt/txXSLTNumber.h
index f7e249f63ba..f3278c4a0f3 100644
--- a/mozilla/content/xslt/src/xslt/txXSLTNumber.h
+++ b/mozilla/content/xslt/src/xslt/txXSLTNumber.h
@@ -40,7 +40,7 @@
 #define TRANSFRMX_TXXSLTNUMBER_H
 
 #include "txError.h"
-#include "List.h"
+#include "txList.h"
 #include "nsString.h"
 
 class Expr;
diff --git a/mozilla/content/xslt/src/xslt/txXSLTPatterns.cpp b/mozilla/content/xslt/src/xslt/txXSLTPatterns.cpp
index 518f8afbf4f..cabcdb9c2a2 100644
--- a/mozilla/content/xslt/src/xslt/txXSLTPatterns.cpp
+++ b/mozilla/content/xslt/src/xslt/txXSLTPatterns.cpp
@@ -41,8 +41,8 @@
 #include "txXSLTPatterns.h"
 #include "txNodeSetContext.h"
 #include "txForwardContext.h"
-#include "XMLUtils.h"
-#include "XSLTFunctions.h"
+#include "txXMLUtils.h"
+#include "txXSLTFunctions.h"
 #ifndef TX_EXE
 #include "nsIContent.h"
 #endif
diff --git a/mozilla/content/xslt/src/xslt/txXSLTPatterns.h b/mozilla/content/xslt/src/xslt/txXSLTPatterns.h
index 0a59a3de9ee..043ec6782e0 100644
--- a/mozilla/content/xslt/src/xslt/txXSLTPatterns.h
+++ b/mozilla/content/xslt/src/xslt/txXSLTPatterns.h
@@ -39,8 +39,8 @@
 #ifndef TX_XSLT_PATTERNS_H
 #define TX_XSLT_PATTERNS_H
 
-#include "Expr.h"
-#include "XMLUtils.h"
+#include "txExpr.h"
+#include "txXMLUtils.h"
 #include "nsVoidArray.h"
 
 class ProcessorState;
diff --git a/mozilla/content/xslt/src/xslt/txXSLTProcessor.cpp b/mozilla/content/xslt/src/xslt/txXSLTProcessor.cpp
index 3885a55d5d9..fa739a5558e 100644
--- a/mozilla/content/xslt/src/xslt/txXSLTProcessor.cpp
+++ b/mozilla/content/xslt/src/xslt/txXSLTProcessor.cpp
@@ -39,10 +39,10 @@
 #include "txXSLTProcessor.h"
 #include "txInstructions.h"
 #include "txAtoms.h"
-#include "TxLog.h"
+#include "txLog.h"
 #include "txStylesheetCompileHandlers.h"
 #include "txExecutionState.h"
-#include "ExprResult.h"
+#include "txExprResult.h"
 #ifdef TX_EXE
 #include "txHTMLOutput.h"
 #endif