diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in
index 822ed0e78a4..ac7ec282dd4 100644
--- a/mozilla/extensions/transformiix/build/Makefile.in
+++ b/mozilla/extensions/transformiix/build/Makefile.in
@@ -124,8 +124,6 @@ OBJS =../source/base/ArrayList.o \
 
 include $(topsrcdir)/config/rules.mk
 
-DEFINES += -DMOZILLA
-
 INCLUDES += -I$(srcdir)/../source/xslt -I$(srcdir)/../source/base \
   -I$(srcdir)/../source/net \
   -I$(srcdir)/../source/xml -I$(srcdir)/../source/xml/dom \
diff --git a/mozilla/extensions/transformiix/build/makefile.win b/mozilla/extensions/transformiix/build/makefile.win
index bdab3131903..286e5fe340b 100644
--- a/mozilla/extensions/transformiix/build/makefile.win
+++ b/mozilla/extensions/transformiix/build/makefile.win
@@ -22,7 +22,7 @@
 DEPTH=..\..\..
 include <$(DEPTH)/config/config.mak>
 
-DEFINES=-DMOZILLA
+DEFINES=-DMOZ_XSL
 
 MODULE=transformix
 IS_COMPONENT = 1
diff --git a/mozilla/extensions/transformiix/macbuild/transformiixPrefix.h b/mozilla/extensions/transformiix/macbuild/transformiixPrefix.h
index dab7c53b6e6..0c02937f525 100755
--- a/mozilla/extensions/transformiix/macbuild/transformiixPrefix.h
+++ b/mozilla/extensions/transformiix/macbuild/transformiixPrefix.h
@@ -24,6 +24,6 @@
  *
  */
 
-#define MOZILLA
+#define MOZ_XSL
 
 #include "MacSharedPrefix.h"
diff --git a/mozilla/extensions/transformiix/macbuild/transformiixPrefix_debug.h b/mozilla/extensions/transformiix/macbuild/transformiixPrefix_debug.h
index 9d7c251a6e9..94643bcc633 100755
--- a/mozilla/extensions/transformiix/macbuild/transformiixPrefix_debug.h
+++ b/mozilla/extensions/transformiix/macbuild/transformiixPrefix_debug.h
@@ -24,6 +24,6 @@
  *
  */
 
-#define MOZILLA
+#define MOZ_XSL
 
 #include "MacSharedPrefix_debug.h"
diff --git a/mozilla/extensions/transformiix/source/net/Makefile.in b/mozilla/extensions/transformiix/source/net/Makefile.in
index d9d8fae76db..44cac8fc69b 100644
--- a/mozilla/extensions/transformiix/source/net/Makefile.in
+++ b/mozilla/extensions/transformiix/source/net/Makefile.in
@@ -31,9 +31,5 @@ CPPSRCS = URIUtils.cpp
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../base
-ifdef MOZ_XSL
-DEFINES += -DMOZILLA
-endif
-
 
 install:: $(OBJS)
\ No newline at end of file
diff --git a/mozilla/extensions/transformiix/source/net/URIUtils.cpp b/mozilla/extensions/transformiix/source/net/URIUtils.cpp
index 4eef1073c4f..333d68a691b 100644
--- a/mozilla/extensions/transformiix/source/net/URIUtils.cpp
+++ b/mozilla/extensions/transformiix/source/net/URIUtils.cpp
@@ -29,7 +29,7 @@
  *   -- 20000326
  *     -- added Mozilla integration code
  *
- * $Id: URIUtils.cpp,v 1.5 2000-05-25 22:52:23 Peter.VanderBeken%pandora.be Exp $
+ * $Id: URIUtils.cpp,v 1.6 2000-07-06 12:35:35 axel%pike.org Exp $
  */
 
 #include "URIUtils.h"
@@ -38,7 +38,7 @@
  * URIUtils
  * A set of utilities for handling URIs
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.5 $ $Date: 2000-05-25 22:52:23 $
+ * @version $Revision: 1.6 $ $Date: 2000-07-06 12:35:35 $
 **/
 
 //- Constants -/
@@ -119,7 +119,7 @@ istream* URIUtils::getInputStream
 **/
 void URIUtils::getDocumentBase(String& href, String& dest) {
 
-#ifdef MOZILLA
+#ifdef MOZ_XSL
     String docBase("");
     nsCOMPtr<nsIURI> pURL;
     nsresult result = NS_OK;
@@ -176,7 +176,7 @@ void URIUtils::getDocumentBase(String& href, String& dest) {
 void URIUtils::resolveHref(String& href, String& documentBase, String& dest) {
 
 
-#ifdef MOZILLA
+#ifdef MOZ_XSL
     nsCOMPtr<nsIURI> pURL;
     nsresult result = NS_OK;
 
diff --git a/mozilla/extensions/transformiix/source/net/URIUtils.h b/mozilla/extensions/transformiix/source/net/URIUtils.h
index 65daa52d1aa..273a93b60a6 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.6 2000-06-11 12:28:05 Peter.VanderBeken%pandora.be Exp $
+ * $Id: URIUtils.h,v 1.7 2000-07-06 12:35:36 axel%pike.org Exp $
  */
 
 #include "TxString.h"
@@ -39,7 +39,7 @@
 #include <iostream.h>
 #include <fstream.h>
 
-#ifdef MOZILLA
+#ifdef MOZ_XSL
 #include "nsIServiceManager.h"
 #include "nsIIOService.h"
 #include "nsIURL.h"
@@ -52,7 +52,7 @@ static NS_DEFINE_CID(kIOServiceCID,              NS_IOSERVICE_CID);
  * 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.6 $ $Date: 2000-06-11 12:28:05 $
+ * @version $Revision: 1.7 $ $Date: 2000-07-06 12:35:36 $
  *
 **/
 
diff --git a/mozilla/extensions/transformiix/source/xml/Makefile.in b/mozilla/extensions/transformiix/source/xml/Makefile.in
index edcb5b8d743..2fc57f148e9 100644
--- a/mozilla/extensions/transformiix/source/xml/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/Makefile.in
@@ -36,8 +36,5 @@ CPPSRCS	= XMLDOMUtils.cpp XMLUtils.cpp
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../base -I$(srcdir)/dom
-ifdef MOZ_XSL
-DEFINES += -DMOZILLA
-endif
 
 install:: $(OBJS)
\ No newline at end of file
diff --git a/mozilla/extensions/transformiix/source/xml/dom/dom.h b/mozilla/extensions/transformiix/source/xml/dom/dom.h
index 8c755fcc33d..1d1572ec577 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/dom.h
+++ b/mozilla/extensions/transformiix/source/xml/dom/dom.h
@@ -16,10 +16,10 @@
  * Peter Van der Beken
  *    -- original author
  *
- * $Id: dom.h,v 1.7 2000-05-25 01:03:20 axel%pike.org Exp $
+ * $Id: dom.h,v 1.8 2000-07-06 12:35:38 axel%pike.org Exp $
  */
 
-#ifndef MOZILLA
+#ifndef MOZ_XSL
 #include "standalone/dom.h"
 #else
 #include "mozImpl/mozilladom.h"
diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in
index a3f26c23c2a..f51f6f6cc53 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/Makefile.in
@@ -47,6 +47,5 @@ CPPSRCS = MozillaAttr.cpp \
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../../../base -I$(srcdir)/../../
-DEFINES += -DMOZILLA
 
 install:: $(OBJS)
diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
index a73caf1f509..a8408ccfc90 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
@@ -23,6 +23,7 @@ DEPTH=..\..\..\..\..\..
 
 LIBRARY_NAME=transformix_xml_dom_mozImpl
 MODULE=transformix
+DEFINES=-DMOZ_XSL
 CPPSRCS=						\
 	MozillaAttr.cpp					\
 	MozillaCDATASection.cpp			\
diff --git a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in
index 248bcbdc86e..821039c82b2 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/parser/Makefile.in
@@ -33,8 +33,5 @@ include $(topsrcdir)/config/rules.mk
 
 COMPILE_CFLAGS += -DXML_UNICODE -I$(srcdir)/xmltok
 INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../dom -I$(srcdir)/xmlparse
-ifdef MOZ_XSL
-DEFINES += -DMOZILLA
-endif
 
 install:: $(OBJS)
\ No newline at end of file
diff --git a/mozilla/extensions/transformiix/source/xml/parser/xmltok/xmldef.h b/mozilla/extensions/transformiix/source/xml/parser/xmltok/xmldef.h
index 48ba359ca04..26ddf042547 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/xmltok/xmldef.h
+++ b/mozilla/extensions/transformiix/source/xml/parser/xmltok/xmldef.h
@@ -21,7 +21,7 @@ Contributor(s):
 /* This file can be used for any definitions needed in
 particular environments. */
 
-#ifdef MOZILLA
+#ifdef MOZ_XSL
 
 #include "nspr.h"
 #define malloc(x) PR_Calloc(1,(x))
diff --git a/mozilla/extensions/transformiix/source/xml/util/Makefile.in b/mozilla/extensions/transformiix/source/xml/util/Makefile.in
index 63bbafa51ea..974ef1d95ae 100644
--- a/mozilla/extensions/transformiix/source/xml/util/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xml/util/Makefile.in
@@ -31,8 +31,5 @@ CPPSRCS = DOMHelper.cpp
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../dom
-ifdef MOZ_XSL
-DEFINES += -DMOZILLA
-endif
 
 install:: $(OBJS)
diff --git a/mozilla/extensions/transformiix/source/xpath/Makefile.in b/mozilla/extensions/transformiix/source/xpath/Makefile.in
index f88d1bb9f0d..3037ab7d601 100644
--- a/mozilla/extensions/transformiix/source/xpath/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xpath/Makefile.in
@@ -67,8 +67,5 @@ include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I$(srcdir)/../base -I$(srcdir)/../xml \
         -I$(srcdir)/../xml/dom -I$(srcdir)/../xslt
-ifdef MOZ_XSL
-DEFINES += -DMOZILLA
-endif
 
 install:: $(OBJS)
\ No newline at end of file
diff --git a/mozilla/extensions/transformiix/source/xslt/Makefile.in b/mozilla/extensions/transformiix/source/xslt/Makefile.in
index 82de4013766..c5e75467a72 100644
--- a/mozilla/extensions/transformiix/source/xslt/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xslt/Makefile.in
@@ -42,8 +42,5 @@ INCLUDES += -I$(srcdir) -I$(srcdir)/../base -I$(srcdir)/../net \
   -I$(srcdir)/../xml/parser -I$(srcdir)/../xml/parser/xmlparse \
   -I$(srcdir)/../xml/printer -I$(srcdir)/../xpath -I$(srcdir)/../xslt/util \
   -I$(srcdir)/../xslt/functions
-ifdef MOZ_XSL
-DEFINES += -DMOZILLA
-endif
 
 install:: $(OBJS)
\ No newline at end of file
diff --git a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp
index ca168ed0d8f..c5fb6a6b154 100644
--- a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp
@@ -38,11 +38,11 @@
  * Olivier Gerardin
  *    -- Changed behavior of passing parameters to templates
  *
- * $Id: XSLTProcessor.cpp,v 1.17 2000-06-19 07:16:37 kvisco%ziplink.net Exp $
+ * $Id: XSLTProcessor.cpp,v 1.18 2000-07-06 12:35:42 axel%pike.org Exp $
  */
 
 #include "XSLTProcessor.h"
-#ifdef MOZILLA
+#ifdef MOZ_XSL
 #include "nsIObserverService.h"
 #endif
 
@@ -53,7 +53,7 @@
 /**
  * XSLTProcessor is a class for Processing XSL styelsheets
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.17 $ $Date: 2000-06-19 07:16:37 $
+ * @version $Revision: 1.18 $ $Date: 2000-07-06 12:35:42 $
 **/
 
 /**
@@ -68,7 +68,7 @@ const String XSLTProcessor::NON_TEXT_TEMPLATE_WARNING =
 **/
 XSLTProcessor::XSLTProcessor() {
 
-#ifdef MOZILLA
+#ifdef MOZ_XSL
     NS_INIT_ISUPPORTS();
 #endif
 
@@ -118,7 +118,7 @@ XSLTProcessor::~XSLTProcessor() {
     //-- currently does nothing, but added for future use
 } //-- ~XSLTProcessor
 
-#ifdef MOZILLA
+#ifdef MOZ_XSL
 NS_IMPL_ISUPPORTS1(XSLTProcessor, nsIDocumentTransformer)
 #endif
 
@@ -129,7 +129,7 @@ void XSLTProcessor::addErrorObserver(ErrorObserver& errorObserver) {
     errorObservers.add(&errorObserver);
 } //-- addErrorObserver
 
-#ifndef MOZILLA
+#ifndef MOZ_XSL
 void XSLTProcessor::print
     (Document& document, OutputFormat* format, ostream& out)
 {
@@ -177,7 +177,7 @@ String& XSLTProcessor::getAppVersion() {
     return appVersion;
 } //-- getAppVersion
 
-#ifndef MOZILLA
+#ifndef MOZ_XSL
 /**
  * Parses all XML Stylesheet PIs associated with the
  * given XML document. If any stylesheet PIs are found with
@@ -568,7 +568,7 @@ Document* XSLTProcessor::process
     return result;
 } //-- process
 
-#ifndef MOZILLA
+#ifndef MOZ_XSL
 /**
  * Processes the given XML Document using the given XSL document
  * and prints the results to the given ostream argument
@@ -686,7 +686,7 @@ void XSLTProcessor::process
     delete xslDoc;
 } //-- process
 
-#endif // ifndef MOZILLA
+#endif // ifndef MOZ_XSL
 
   //-------------------/
  //- Private Methods -/
@@ -1065,7 +1065,7 @@ void XSLTProcessor::processAction
                     Element* element = 0;
                     //-- check name validity
                     if ( XMLUtils::isValidQName(name)) {
-#ifdef MOZILLA
+#ifdef MOZ_XSL
                         // XXX (pvdb) Check if we need to set a new default namespace?
                         String nameSpaceURI;
                         ps->getNameSpaceURI(name, nameSpaceURI);
@@ -1303,7 +1303,7 @@ void XSLTProcessor::processAction
             }
             //-- literal
             default:
-#ifdef MOZILLA
+#ifdef MOZ_XSL
                 // Find out if we have a new default namespace
                 MBool newDefaultNS = MB_FALSE;
                 String nsURI = actionElement->getAttribute(XMLUtils::XMLNS);
@@ -1363,7 +1363,7 @@ void XSLTProcessor::processAction
                     processAction(node, nl->item(i),ps);
                 }
                 ps->getNodeStack()->pop();
-#ifdef MOZILLA
+#ifdef MOZ_XSL
                 if ( newDefaultNS ) {
                     ps->getDefaultNSURIStack()->pop();
                 }
@@ -1621,7 +1621,7 @@ void XSLTProcessor::xslCopy(Node* node, Element* action, ProcessorState* ps) {
         {
             Element* element = (Element*)node;
             String nodeName = element->getNodeName();
-#ifdef MOZILLA
+#ifdef MOZ_XSL
             // Find out if we have a new default namespace
             MBool newDefaultNS = MB_FALSE;
             String nsURI = element->getAttribute(XMLUtils::XMLNS);
@@ -1649,7 +1649,7 @@ void XSLTProcessor::xslCopy(Node* node, Element* action, ProcessorState* ps) {
             //-- process template
             processTemplate(node, action, ps);
             ps->getNodeStack()->pop();
-#ifdef MOZILLA
+#ifdef MOZ_XSL
             if ( newDefaultNS ) {
                 ps->getDefaultNSURIStack()->pop();
             }
@@ -1704,7 +1704,7 @@ void XSLTProcessor::xslCopyOf(ExprResult* exprResult, ProcessorState* ps) {
     }
 } //-- xslCopyOf
 
-#ifdef MOZILLA
+#ifdef MOZ_XSL
 NS_IMETHODIMP
 XSLTProcessor::TransformDocument(nsIDOMElement* aSourceDOM,
                                nsIDOMElement* aStyleDOM,
diff --git a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h
index 21bb0b365aa..ca9721e23b7 100644
--- a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h
+++ b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.h
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: XSLTProcessor.h,v 1.10 2000-06-19 07:09:02 kvisco%ziplink.net Exp $
+ * $Id: XSLTProcessor.h,v 1.11 2000-07-06 12:35:42 axel%pike.org Exp $
  */
 
 
@@ -29,14 +29,14 @@
 #define TRANSFRMX_XSLTPROCESSOR_H
 
 #ifndef __BORLANDC__
-#ifndef MOZILLA
+#ifndef MOZ_XSL
 #include <iostream.h>
 #include <fstream.h>
 #endif
 #endif
 
 
-#ifdef MOZILLA
+#ifdef MOZ_XSL
 #include "nsIDocumentTransformer.h"
 #else
 #include "CommandLineUtils.h"
@@ -61,7 +61,7 @@
 #include "Numbering.h"
 #include "NodeSorter.h"
 
-#ifdef MOZILLA
+#ifdef MOZ_XSL
 /* bacd8ad0-552f-11d3-a9f7-000064657374 */
 #define TRANSFORMIIX_XSLT_PROCESSOR_CID   \
 { 0xbacd8ad0, 0x552f, 0x11d3, {0xa9, 0xf7, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74} }
@@ -75,16 +75,16 @@
 /**
  * A class for Processing XSL Stylesheets
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.10 $ $Date: 2000-06-19 07:09:02 $
+ * @version $Revision: 1.11 $ $Date: 2000-07-06 12:35:42 $
 **/
 class XSLTProcessor
-#ifdef MOZILLA
+#ifdef MOZ_XSL
 : public nsIDocumentTransformer
 #endif
 {
 
 public:
-#ifdef MOZILLA
+#ifdef MOZ_XSL
     // nsISupports interface
     NS_DECL_ISUPPORTS
     // nsIDocumentTransformer interface
@@ -125,7 +125,7 @@ public:
       //--------------------------------------------/
      //-- Methods that return the Result Document -/
     //--------------------------------------------/
-#ifndef MOZILLA
+#ifndef MOZ_XSL
     /**
      * Parses all XML Stylesheet PIs associated with the
      * given XML document. If any stylesheet PIs are found with
@@ -166,7 +166,7 @@ public:
     Document* process(istream& xmlInput, istream& xslInput,
            String& documentBase);
 
-#ifndef MOZILLA
+#ifndef MOZ_XSL
     /**
      * Reads an XML document from the given XML input stream. The
      * XML document is processed using the associated XSL document
@@ -258,7 +258,7 @@ private:
                       MBool allowShadowing,
                       ProcessorState* ps);
 
-#ifndef MOZILLA
+#ifndef MOZ_XSL
 
     /**
      * Prints the given XML document to the given ostream and uses
@@ -312,7 +312,7 @@ private:
     **/
     void notifyError(String& errorMessage, ErrorObserver::ErrorLevel level);
 
-#ifndef MOZILLA
+#ifndef MOZ_XSL
     /**
      * Parses the contents of data, and returns the type and href psuedo attributes
     **/
diff --git a/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in b/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in
index 4b5b8b9f2b3..d8f73e1c4d5 100644
--- a/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xslt/functions/Makefile.in
@@ -38,6 +38,3 @@ INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../../net \
   -I$(srcdir)/../../xslt
 
 install:: $(OBJS)
-ifdef MOZ_XSL
-DEFINES += -DMOZILLA
-endif
diff --git a/mozilla/extensions/transformiix/source/xslt/makefile.win b/mozilla/extensions/transformiix/source/xslt/makefile.win
index 5f0b5b941ed..1ce77daacc7 100644
--- a/mozilla/extensions/transformiix/source/xslt/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/makefile.win
@@ -26,7 +26,7 @@ DIRS=util functions
 LIBRARY_NAME=transformix_xslt
 MODULE=transformix
 
-DEFINES=-DMOZILLA
+DEFINES=-DMOZ_XSL
 
 CPPSRCS=					\
 	Names.cpp				\
diff --git a/mozilla/extensions/transformiix/source/xslt/util/Makefile.in b/mozilla/extensions/transformiix/source/xslt/util/Makefile.in
index 1b29241cfbb..dd3028a2661 100644
--- a/mozilla/extensions/transformiix/source/xslt/util/Makefile.in
+++ b/mozilla/extensions/transformiix/source/xslt/util/Makefile.in
@@ -33,8 +33,5 @@ include $(topsrcdir)/config/rules.mk
 INCLUDES += -I$(srcdir) -I$(srcdir)/../../base -I$(srcdir)/../../xpath \
   -I$(srcdir)/../../xml -I$(srcdir)/../../xml/util -I$(srcdir)/../../xml/dom \
   -I$(srcdir)/../../xslt -I$(srcdir)/../../xslt/functions
-ifdef MOZ_XSL
-DEFINES += -DMOZILLA
-endif
 
 install:: $(OBJS)