diff --git a/mozilla/extensions/transformiix/source/Makefile.in b/mozilla/extensions/transformiix/source/Makefile.in
index c25ebeab737..7e4af069c47 100644
--- a/mozilla/extensions/transformiix/source/Makefile.in
+++ b/mozilla/extensions/transformiix/source/Makefile.in
@@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS            = base net xml xpath xslt 
 
-ifdef TX_EXE
+ifndef MOZ_XSL
 DIRS += main
 endif
 
diff --git a/mozilla/extensions/transformiix/source/base/List.cpp b/mozilla/extensions/transformiix/source/base/List.cpp
index a87de5a4f2f..0fc5798bd4f 100644
--- a/mozilla/extensions/transformiix/source/base/List.cpp
+++ b/mozilla/extensions/transformiix/source/base/List.cpp
@@ -23,11 +23,11 @@
  * Bob Miller, kbob@oblix.com
  *    -- plugged core leak.
  *
- * $Id: List.cpp,v 1.7 2001-06-10 11:30:24 axel%pike.org Exp $
+ * $Id: List.cpp,v 1.8 2001-06-10 13:50:46 axel%pike.org Exp $
  */
 
 #include "List.h"
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 #include <iostream.h>
 #endif
 
@@ -38,7 +38,7 @@
 /**
  * Default constructor for a List;
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.7 $ $Date: 2001-06-10 11:30:24 $
+ * @version $Revision: 1.8 $ $Date: 2001-06-10 13:50:46 $
 **/
 
 List::List() {
diff --git a/mozilla/extensions/transformiix/source/base/Makefile.in b/mozilla/extensions/transformiix/source/base/Makefile.in
index 3030278d8c9..deddf70cd93 100644
--- a/mozilla/extensions/transformiix/source/base/Makefile.in
+++ b/mozilla/extensions/transformiix/source/base/Makefile.in
@@ -26,7 +26,7 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef TX_EXE
+ifdef MOZ_XSL
 MODULE = transformiix
 REQUIRES = string xpcom
 endif
@@ -45,11 +45,11 @@ CPPSRCS	= ArrayList.cpp             \
 	StringList.cpp \
 	Tokenizer.cpp
 
-ifdef TX_EXE
+ifdef MOZ_XSL
+	CPPSRCS	+= MozillaString.cpp
+else
 	CPPSRCS	+= CommandLineUtils.cpp	\
 		TxString.cpp
-else
-	CPPSRCS	+= MozillaString.cpp
 endif
 include $(topsrcdir)/config/rules.mk
 
diff --git a/mozilla/extensions/transformiix/source/base/MozillaString.cpp b/mozilla/extensions/transformiix/source/base/MozillaString.cpp
index 18ad4218db6..a63ffd11ace 100644
--- a/mozilla/extensions/transformiix/source/base/MozillaString.cpp
+++ b/mozilla/extensions/transformiix/source/base/MozillaString.cpp
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "TxString.h"
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 #include <iostream.h>
 #endif
 
diff --git a/mozilla/extensions/transformiix/source/base/StringList.cpp b/mozilla/extensions/transformiix/source/base/StringList.cpp
index 8cc99dabb01..9b5cbe44607 100644
--- a/mozilla/extensions/transformiix/source/base/StringList.cpp
+++ b/mozilla/extensions/transformiix/source/base/StringList.cpp
@@ -23,16 +23,16 @@
  * Bob Miller, kbob@oblix.com
  *    -- plugged core leak.
  *
- * $Id: StringList.cpp,v 1.7 2001-06-10 11:30:25 axel%pike.org Exp $
+ * $Id: StringList.cpp,v 1.8 2001-06-10 13:50:46 axel%pike.org Exp $
  */
 
 /**
  * StringList
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.7 $ $Date: 2001-06-10 11:30:25 $
+ * @version $Revision: 1.8 $ $Date: 2001-06-10 13:50:46 $
 **/
 
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 #include <iostream.h>
 #endif
 #include "StringList.h"
diff --git a/mozilla/extensions/transformiix/source/base/TxString.h b/mozilla/extensions/transformiix/source/base/TxString.h
index 5e1d9faaf0f..de056d27142 100644
--- a/mozilla/extensions/transformiix/source/base/TxString.h
+++ b/mozilla/extensions/transformiix/source/base/TxString.h
@@ -32,11 +32,11 @@
 #include "baseutils.h"
 #include <iostream.h>
 
-#ifdef TX_EXE
-typedef unsigned short UNICODE_CHAR;
-#else
+#ifdef MOZ_XSL
 #include "nsString.h"
 typedef PRUnichar UNICODE_CHAR;
+#else
+typedef unsigned short UNICODE_CHAR;
 #endif
 
 #ifndef NULL
@@ -57,7 +57,7 @@ class String : public TxObject
     String(const char* source);   //Create a string from the characters
     String(const UNICODE_CHAR* source);
     String(const UNICODE_CHAR* source, Int32 length);
-#ifndef TX_EXE
+#ifdef MOZ_XSL
     String(nsString* theNSString);
 #endif
 
@@ -121,7 +121,7 @@ class String : public TxObject
 
     virtual MBool isEqual(const String& data) const; //Check equality between
                                                      //strings
-#ifndef TX_EXE
+#ifdef MOZ_XSL
     virtual MBool isEqualIgnoreCase(const String& data) const;
 #endif
 
@@ -173,7 +173,7 @@ class String : public TxObject
 
     virtual void reverse();               //Reverse the string
 
-#ifndef TX_EXE
+#ifdef MOZ_XSL
     virtual nsString& getNSString();
     virtual const nsString& getConstNSString() const;
 #endif
@@ -187,7 +187,7 @@ class String : public TxObject
     Int32 UnicodeLength(const UNICODE_CHAR* data);
 
   private:
-#ifndef TX_EXE
+#ifdef MOZ_XSL
     nsString* ptrNSString;
 #else
     Int32     strLength;
diff --git a/mozilla/extensions/transformiix/source/base/makefile.win b/mozilla/extensions/transformiix/source/base/makefile.win
index 0bb121264c1..951ac094faf 100644
--- a/mozilla/extensions/transformiix/source/base/makefile.win
+++ b/mozilla/extensions/transformiix/source/base/makefile.win
@@ -22,8 +22,8 @@
 DEPTH=..\..\..\..
 include <$(DEPTH)/config/config.mak>
 
-!if defined(TX_EXE)
-DEFINES= $(DEFINES) -DTX_EXE
+!if defined(MOZ_XSL)
+DEFINES= $(DEFINES) -DMOZ_XSL
 !endif
 
 CPPSRCS=				\
@@ -41,7 +41,7 @@ CPPSRCS=				\
 	StringList.cpp			\
 	Tokenizer.cpp			
 
-!ifndef TX_EXE
+!ifdef MOZ_XSL
 CPPSRCS = $(CPPSRCS)			\
 	MozillaString.cpp		\
 	$(NULL)
@@ -67,7 +67,7 @@ CPP_OBJS=                                       \
 	.\$(OBJDIR)\StringList.obj		\
 	.\$(OBJDIR)\Tokenizer.obj		
 
-!ifndef TX_EXE
+!ifdef MOZ_XSL
 CPP_OBJS = $(CPP_OBJS)			\
 	.\$(OBJDIR)\MozillaString.obj	\
 	$(NULL)
diff --git a/mozilla/extensions/transformiix/source/makefile.win b/mozilla/extensions/transformiix/source/makefile.win
index 1d60ce1a5a9..fcdab4c8d4a 100644
--- a/mozilla/extensions/transformiix/source/makefile.win
+++ b/mozilla/extensions/transformiix/source/makefile.win
@@ -24,7 +24,7 @@ include <$(DEPTH)/config/config.mak>
 
 DIRS=base net xml xpath xslt
 
-!ifdef TX_EXE
+!ifndef MOZ_XSL
 DIRS = $(DIRS) main
 !endif
 
diff --git a/mozilla/extensions/transformiix/source/net/Makefile.in b/mozilla/extensions/transformiix/source/net/Makefile.in
index 410dedfa55c..72531c4c66b 100644
--- a/mozilla/extensions/transformiix/source/net/Makefile.in
+++ b/mozilla/extensions/transformiix/source/net/Makefile.in
@@ -26,7 +26,7 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef TX_EXE
+ifdef MOZ_XSL
 MODULE = transformiix
 REQUIRES = string xpcom necko
 endif
diff --git a/mozilla/extensions/transformiix/source/net/URIUtils.cpp b/mozilla/extensions/transformiix/source/net/URIUtils.cpp
index 213fbe9bc58..b9a6714ca84 100644
--- a/mozilla/extensions/transformiix/source/net/URIUtils.cpp
+++ b/mozilla/extensions/transformiix/source/net/URIUtils.cpp
@@ -29,12 +29,12 @@
  *   -- 20000326
  *     -- added Mozilla integration code
  *
- * $Id: URIUtils.cpp,v 1.12 2001-06-10 11:30:28 axel%pike.org Exp $
+ * $Id: URIUtils.cpp,v 1.13 2001-06-10 13:50:48 axel%pike.org Exp $
  */
 
 #include "URIUtils.h"
 
-#ifndef TX_EXE
+#ifdef MOZ_XSL
 #include "nsIServiceManager.h"
 #include "nsIIOService.h"
 #include "nsIURL.h"
@@ -46,10 +46,10 @@
  * URIUtils
  * A set of utilities for handling URIs
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.12 $ $Date: 2001-06-10 11:30:28 $
+ * @version $Revision: 1.13 $ $Date: 2001-06-10 13:50:48 $
 **/
 
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 //- Constants -/
 
 const String URIUtils::HTTP_PROTOCOL  = "http";
@@ -100,7 +100,7 @@ istream* URIUtils::getInputStream
     * @return the document base of the given href
 **/
 void URIUtils::getDocumentBase(const String& href, String& dest) {
-#ifndef TX_EXE
+#ifdef MOZ_XSL
     String docBase("");
     nsCOMPtr<nsIURI> pURL;
     nsresult result = NS_OK;
@@ -155,7 +155,7 @@ void URIUtils::getDocumentBase(const String& href, String& dest) {
  * The new resolved href will be appended to the given dest String
 **/
 void URIUtils::resolveHref(const String& href, const String& base, String& dest) {
-#ifndef TX_EXE
+#ifdef MOZ_XSL
     nsCOMPtr<nsIURI> pURL;
     nsresult result = NS_OK;
 
@@ -238,7 +238,7 @@ void URIUtils::getDocumentURI(const String& href, String& docUri) {
         docUri = href;
 } //-- getFragmentIdentifier
 
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 istream* URIUtils::openStream(ParsedURI* uri) {
     if ( !uri ) return 0;
     // check protocol
diff --git a/mozilla/extensions/transformiix/source/net/URIUtils.h b/mozilla/extensions/transformiix/source/net/URIUtils.h
index 460058d6ad2..a7c86b9e096 100644
--- a/mozilla/extensions/transformiix/source/net/URIUtils.h
+++ b/mozilla/extensions/transformiix/source/net/URIUtils.h
@@ -31,7 +31,7 @@
  *   -- 20000326
  *     -- added Mozilla integration code
  *
- * $Id: URIUtils.h,v 1.14 2001-06-10 11:30:29 axel%pike.org Exp $
+ * $Id: URIUtils.h,v 1.15 2001-06-10 13:50:49 axel%pike.org Exp $
  */
 
 #ifndef TRANSFRMX_URIUTILS_H
@@ -39,7 +39,7 @@
 
 #include "TxString.h"
 #include "baseutils.h"
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 #include <fstream.h>
 #endif
 
@@ -48,7 +48,7 @@
  * 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.14 $ $Date: 2001-06-10 11:30:29 $
+ * @version $Revision: 1.15 $ $Date: 2001-06-10 13:50:49 $
  *
 **/
 
diff --git a/mozilla/extensions/transformiix/source/net/makefile.win b/mozilla/extensions/transformiix/source/net/makefile.win
index 4ea75cc7c02..fd0c04eeab7 100644
--- a/mozilla/extensions/transformiix/source/net/makefile.win
+++ b/mozilla/extensions/transformiix/source/net/makefile.win
@@ -22,8 +22,8 @@
 DEPTH=..\..\..\..
 include <$(DEPTH)/config/config.mak>
 
-!if defined(TX_EXE)
-DEFINES= $(DEFINES) -DTX_EXE
+!if defined(MOZ_XSL)
+DEFINES= $(DEFINES) -DMOZ_XSL
 !endif
 
 CPPSRCS=		\
diff --git a/mozilla/extensions/transformiix/source/xml/Makefile.in b/mozilla/extensions/transformiix/source/xml/Makefile.in
index 9d060a78174..7c7383f8fd8 100644
--- a/mozilla/extensions/transformiix/source/xml/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/Makefile.in
@@ -26,13 +26,13 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef TX_EXE
+ifdef MOZ_XSL
 MODULE = transformiix
 REQUIRES = string xpcom dom layout widget
 endif
 
 DIRS            = dom parser util
-ifdef TX_EXE
+ifndef MOZ_XSL
 DIRS +=		printer
 endif
 
diff --git a/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp b/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp
index b97f6adac72..34061ed00c6 100644
--- a/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp
+++ b/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp
@@ -21,13 +21,13 @@
  * Keith Visco 
  *    -- original author.
  *
- * $Id: XMLDOMUtils.cpp,v 1.14 2001-06-10 11:30:30 axel%pike.org Exp $
+ * $Id: XMLDOMUtils.cpp,v 1.15 2001-06-10 13:50:50 axel%pike.org Exp $
  */
 
 /**
  * XMLDOMUtils
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.14 $ $Date: 2001-06-10 11:30:30 $
+ * @version $Revision: 1.15 $ $Date: 2001-06-10 13:50:50 $
 **/
 
 #include "XMLDOMUtils.h"
@@ -63,7 +63,7 @@ Node* XMLDOMUtils::copyNode(Node* node, Document* owner, NamespaceResolver* reso
             Document* newDoc = new Document();
             if (!newDoc)
                 break;
-#ifndef TX_EXE
+#ifdef MOZ_XSL
             owner->addWrapper(newDoc);
 #endif
             NodeList* nl = doc->getChildNodes();
@@ -86,7 +86,7 @@ Node* XMLDOMUtils::copyNode(Node* node, Document* owner, NamespaceResolver* reso
         case Node::ELEMENT_NODE :
         {
             Element* element = (Element*)node;
-#ifndef TX_EXE
+#ifdef MOZ_XSL
             String name, nameSpaceURI;
             name = element->getNodeName();
             resolver->getResultNameSpaceURI(name, nameSpaceURI);
@@ -100,7 +100,7 @@ Node* XMLDOMUtils::copyNode(Node* node, Document* owner, NamespaceResolver* reso
             if ( attList ) {
                 for ( i = 0; i < attList->getLength(); i++ ) {
                     Attr* attr = (Attr*) attList->item(i);
-#ifndef TX_EXE
+#ifdef MOZ_XSL
                     resolver->getResultNameSpaceURI(attr->getName(), nameSpaceURI);
                     newElement->setAttributeNS(nameSpaceURI, attr->getName(), attr->getValue());
 #else
diff --git a/mozilla/extensions/transformiix/source/xml/dom/Makefile.in b/mozilla/extensions/transformiix/source/xml/dom/Makefile.in
index ce6fa015f1f..b8d04d8a6c1 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/dom/Makefile.in
@@ -26,7 +26,7 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef TX_EXE
+ifdef MOZ_XSL
 DIRS		= mozImpl
 else
 DIRS            = standalone
diff --git a/mozilla/extensions/transformiix/source/xml/dom/dom.h b/mozilla/extensions/transformiix/source/xml/dom/dom.h
index 4246608cafc..4fea1d3cf9a 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/dom.h
+++ b/mozilla/extensions/transformiix/source/xml/dom/dom.h
@@ -16,13 +16,13 @@
  * Peter Van der Beken
  *    -- original author
  *
- * $Id: dom.h,v 1.10 2001-06-10 11:30:32 axel%pike.org Exp $
+ * $Id: dom.h,v 1.11 2001-06-10 13:50:52 axel%pike.org Exp $
  */
 
 #ifndef __TX_DOM_WRAPPER__
 #define __TX_DOM_WRAPPER__
 
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 #include "standalone/dom.h"
 #else
 #include "mozImpl/mozilladom.h"
diff --git a/mozilla/extensions/transformiix/source/xml/dom/makefile.win b/mozilla/extensions/transformiix/source/xml/dom/makefile.win
index 10da86e2aca..849ac8eb0fa 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/dom/makefile.win
@@ -22,7 +22,7 @@
 DEPTH=..\..\..\..\..
 include <$(DEPTH)/config/config.mak>
 
-!ifndef TX_EXE
+!ifdef MOZ_XSL
 DIRS = mozImpl
 !else
 DIRS = standalone
diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in
index dafcc02b8e5..e8d12b9719c 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in
@@ -26,8 +26,10 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+ifdef MOZ_XSL
 MODULE = transformiix
 REQUIRES = string xpcom dom layout widget necko
+endif
 
 CPPSRCS = MozillaAttr.cpp \
         MozillaCDATASection.cpp \
diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
index b57b83275e2..0c6d78d2ebd 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
@@ -22,6 +22,10 @@
 DEPTH=..\..\..\..\..\..
 include <$(DEPTH)/config/config.mak>
 
+!ifdef MOZ_XSL
+DEFINES=$(DEFINES) -DMOZ_XSL
+!endif
+
 CPPSRCS=				\
 	MozillaAttr.cpp			\
 	MozillaCDATASection.cpp		\
diff --git a/mozilla/extensions/transformiix/source/xml/dom/standalone/makefile.win b/mozilla/extensions/transformiix/source/xml/dom/standalone/makefile.win
index 3d4792e4afd..b861916b723 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/standalone/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/dom/standalone/makefile.win
@@ -22,7 +22,9 @@
 DEPTH=..\..\..\..\..\..
 include <$(DEPTH)/config/config.mak>
 
-DEFINES=$(DEFINES) -DTX_EXE
+!ifdef MOZ_XSL
+DEFINES=$(DEFINES) -DMOZ_XSL
+!endif
 
 CPPSRCS=Attr.cpp \
         CDATASection.cpp \
diff --git a/mozilla/extensions/transformiix/source/xml/makefile.win b/mozilla/extensions/transformiix/source/xml/makefile.win
index d4d4a733034..bc12f79e8c8 100644
--- a/mozilla/extensions/transformiix/source/xml/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/makefile.win
@@ -24,10 +24,10 @@ include <$(DEPTH)/config/config.mak>
 
 DIRS=dom parser util
 
-!if defined(TX_EXE)
-DIRS = $(DIRS) printer
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
 !else
-DEFINES=$(DEFINES) -DTX_EXE
+DIRS = $(DIRS) printer
 !endif
 
 CPPSRCS=				\
diff --git a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in
index 4f083c09198..2da4d7e61e9 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in
@@ -26,13 +26,13 @@ VPATH           = @srcdir@ @srcdir@/xmltok @srcdir@/xmlparse
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef TX_EXE
+ifdef MOZ_XSL
 MODULE = transformiix
 REQUIRES = string xpcom necko dom layout widget webbrwsr js docshell webshell gfx2 uriloader locale appshell xpconnect
 endif
 
 CPPSRCS = XMLParser.cpp
-ifndef TX_EXE
+ifdef MOZ_XSL
 CPPSRCS += nsSyncLoader.cpp
 else
 CSRCS = xmltok.c xmlrole.c xmlparse.c hashtable.c
@@ -41,7 +41,7 @@ endif
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../../net -I$(srcdir)/../dom
-ifdef TX_EXE
+ifndef MOZ_XSL
 INCLUDES += -I$(srcdir)/xmlparse
 COMPILE_CFLAGS += -DXML_UNICODE -I$(srcdir)/xmltok
 endif
diff --git a/mozilla/extensions/transformiix/source/xml/parser/XMLParser.cpp b/mozilla/extensions/transformiix/source/xml/parser/XMLParser.cpp
index cba2b0c147c..05edc8062ba 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/XMLParser.cpp
+++ b/mozilla/extensions/transformiix/source/xml/parser/XMLParser.cpp
@@ -34,11 +34,11 @@
  *    -- Removed a number of castings of XML_Char to DOM_CHAR since they
  *       were not working on Windows properly
  *
- * $Id: XMLParser.cpp,v 1.16 2001-06-10 11:30:37 axel%pike.org Exp $
+ * $Id: XMLParser.cpp,v 1.17 2001-06-10 13:50:55 axel%pike.org Exp $
  */
 
 #include "XMLParser.h"
-#ifndef TX_EXE
+#ifdef MOZ_XSL
 #include "nsSyncLoader.h"
 #include "URIUtils.h"
 #include "nsIIOService.h"
@@ -69,7 +69,7 @@
 **/
 XMLParser::XMLParser()
 {
-#ifdef TX_EXE
+#ifndef MOZ_XSL
   errorState = MB_FALSE;
 #endif
 } //-- XMLParser
@@ -87,7 +87,7 @@ Document* XMLParser::getDocumentFromURI
     String documentURL;
     URIUtils::resolveHref(href, baseUri, documentURL);
 
-#ifndef TX_EXE
+#ifdef MOZ_XSL
     nsresult rv = NS_OK;
     nsCOMPtr<nsIURI> documentURI;
     nsCOMPtr<nsIIOService> pService(do_GetService(NS_IOSERVICE_CONTRACTID,
@@ -123,7 +123,7 @@ Document* XMLParser::getDocumentFromURI
 
 }
 
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 /**
  *  Parses the given input stream and returns a DOM Document.
  *  A NULL pointer will be returned if errors occurred
diff --git a/mozilla/extensions/transformiix/source/xml/parser/XMLParser.h b/mozilla/extensions/transformiix/source/xml/parser/XMLParser.h
index 6a2ca7c276c..e17b22826ac 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/XMLParser.h
+++ b/mozilla/extensions/transformiix/source/xml/parser/XMLParser.h
@@ -23,7 +23,7 @@
  * Keith Visco 
  *    -- finished implementation
  *
- * $Id: XMLParser.h,v 1.10 2001-06-10 11:30:37 axel%pike.org Exp $
+ * $Id: XMLParser.h,v 1.11 2001-06-10 13:50:56 axel%pike.org Exp $
  */
 
 #ifndef MITRE_XMLPARSER_H
@@ -33,7 +33,7 @@
 #ifndef XML_UNICODE
 #define XML_UNICODE
 #endif
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 #include "xmlparse.h"
 #include "URIUtils.h"
 #endif
@@ -49,11 +49,11 @@ 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.10 $ $Date: 2001-06-10 11:30:37 $
+ * @version $Revision: 1.11 $ $Date: 2001-06-10 13:50:56 $
 **/
 class XMLParser
 {
-#ifdef TX_EXE
+#ifndef MOZ_XSL
   /*-----------------6/18/99 12:43PM------------------
    * Sax related methods for XML parsers
    * --------------------------------------------------*/
@@ -71,7 +71,7 @@ class XMLParser
    ~XMLParser();
 
     Document* getDocumentFromURI(const String& href, const String& baseUri, String& errMsg);
-#ifdef TX_EXE
+#ifndef MOZ_XSL
     Document* parse(istream& inputStream, const String& uri);
     const String& getErrorString();
 
@@ -84,7 +84,7 @@ class XMLParser
 #endif
 };
 
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 /*-----------------6/18/99 12:43PM------------------
  * Sax related methods for XML parsers
  * --------------------------------------------------*/
diff --git a/mozilla/extensions/transformiix/source/xml/parser/makefile.win b/mozilla/extensions/transformiix/source/xml/parser/makefile.win
index 338740cfa56..2682c51485f 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/parser/makefile.win
@@ -22,7 +22,9 @@
 DEPTH=..\..\..\..\..
 include <$(DEPTH)/config/config.mak>
 
-!ifndef TX_EXE
+!ifdef MOZ_XSL
+DEFINES=$(DEFINES) -DMOZ_XSL
+
 CPPSRCS= 			\
 	nsSyncLoader.cpp	\
 	XMLParser.cpp	\
@@ -33,8 +35,6 @@ CPP_OBJS= 					\
 	.\$(OBJDIR)\XMLParser.obj	\
 	$(NULL)
 !else
-DEFINES=$(DEFINES) -DTX_EXE
-
 CPPSRCS= 			\
 	XMLParser.cpp	\
 	$(NULL)
@@ -48,7 +48,7 @@ EXPORTS =	\
 	$(NULL)
 
 LINCS=-I..\..\base -I..\dom -I..\..\net
-!ifndef TX_EXE
+!ifdef MOZ_XSL
 LINCS=$(LINCS) -I$(PUBLIC)\expat
 !else
 LINCS=$(LINCS) -Ixmlparse
diff --git a/mozilla/extensions/transformiix/source/xml/printer/makefile.win b/mozilla/extensions/transformiix/source/xml/printer/makefile.win
index 20f683d12d3..6bc6240819c 100644
--- a/mozilla/extensions/transformiix/source/xml/printer/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/printer/makefile.win
@@ -22,8 +22,8 @@
 DEPTH=..\..\..\..\..
 include <$(DEPTH)/config/config.mak>
 
-!if defined(TX_EXE)
-DEFINES=$(DEFINES) -DTX_EXE
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
 !endif
 
 CPPSRCS=			\
diff --git a/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp b/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
index bbe67684106..143cc5e1457 100644
--- a/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
+++ b/mozilla/extensions/transformiix/source/xml/util/DOMHelper.cpp
@@ -19,13 +19,13 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: DOMHelper.cpp,v 1.10 2001-06-10 11:30:40 axel%pike.org Exp $
+ * $Id: DOMHelper.cpp,v 1.11 2001-06-10 13:50:58 axel%pike.org Exp $
  */
 
 /**
  * A class used to overcome DOM 1.0 deficiencies
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.10 $ $Date: 2001-06-10 11:30:40 $
+ * @version $Revision: 1.11 $ $Date: 2001-06-10 13:50:58 $
 **/
 
 #include "DOMHelper.h"
@@ -116,7 +116,7 @@ Node* DOMHelper::getParentNode(Node* node) {
     if (node->getNodeType() != Node::ATTRIBUTE_NODE)
         return node->getParentNode();
 
-#ifndef TX_EXE
+#ifdef MOZ_XSL
     // XXX temporary fix for 70979
     nsCOMPtr<nsIDOMAttr> attr(do_QueryInterface(node->getNSObj()));
     nsCOMPtr<nsIDOMElement> tmpParent;
diff --git a/mozilla/extensions/transformiix/source/xml/util/Makefile.in b/mozilla/extensions/transformiix/source/xml/util/Makefile.in
index d5d5bb77077..7426cd3552c 100644
--- a/mozilla/extensions/transformiix/source/xml/util/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/util/Makefile.in
@@ -26,7 +26,7 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef TX_EXE
+ifdef MOZ_XSL
 MODULE = transformiix
 REQUIRES = string xpcom dom layout widget
 endif
diff --git a/mozilla/extensions/transformiix/source/xml/util/makefile.win b/mozilla/extensions/transformiix/source/xml/util/makefile.win
index 2807411e7f4..25fd3423aea 100644
--- a/mozilla/extensions/transformiix/source/xml/util/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/util/makefile.win
@@ -22,8 +22,8 @@
 DEPTH=..\..\..\..\..
 include <$(DEPTH)/config/config.mak>
 
-!if defined(TX_EXE)
-DEFINES=$(DEFINES) -DTX_EXE
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
 !endif
 
 CPPSRCS=			\
diff --git a/mozilla/extensions/transformiix/source/xpath/Makefile.in b/mozilla/extensions/transformiix/source/xpath/Makefile.in
index 888ed63362b..ad328f2d744 100644
--- a/mozilla/extensions/transformiix/source/xpath/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xpath/Makefile.in
@@ -26,7 +26,7 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifndef TX_EXE
+ifdef MOZ_XSL
 MODULE = transformiix
 REQUIRES = string xpcom dom layout widget caps js
 endif
@@ -65,7 +65,7 @@ CPPSRCS = AdditiveExpr.cpp \
         UnionExpr.cpp \
         VariableRefExpr.cpp \
         XPathNames.cpp
-ifndef TX_EXE
+ifdef MOZ_XSL
 CPPSRCS += XPathProcessor.cpp \
            nsNodeSet.cpp
 endif
@@ -76,7 +76,7 @@ INCLUDES += -I$(srcdir)/../base -I$(srcdir)/../xml \
         -I$(srcdir)/../xml/dom -I$(srcdir)/../xml/util \
         -I$(srcdir)/../xslt -I$(srcdir)/../xslt/util \
         -I$(srcdir)/../xslt/functions
-ifndef TX_EXE
+ifdef MOZ_XSL
 INCLUDES += -I$(srcdir)
 endif
 
diff --git a/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp b/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp
index 559b7e0c397..59bd9c0ca30 100644
--- a/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/NodeSet.cpp
@@ -27,12 +27,12 @@
  * Olivier Gerardin, ogerardin@vo.lu
  *    -- fixed numberValue()
  *
- * $Id: NodeSet.cpp,v 1.7 2001-06-10 11:30:42 axel%pike.org Exp $
+ * $Id: NodeSet.cpp,v 1.8 2001-06-10 13:50:59 axel%pike.org Exp $
  */
 
 #include "NodeSet.h"
 #include "XMLDOMUtils.h"
-#ifdef TX_EXE
+#ifndef MOZ_XSL
 #include <iostream.h>
 #endif
 
@@ -40,7 +40,7 @@
  * NodeSet <BR />
  * This class was ported from XSL:P. <BR />
  * @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
- * @version $Revision: 1.7 $ $Date: 2001-06-10 11:30:42 $
+ * @version $Revision: 1.8 $ $Date: 2001-06-10 13:50:59 $
 **/