diff --git a/content/xslt/src/Makefile.in b/content/xslt/src/Makefile.in
index c25ebeab7373..7e4af069c47a 100644
--- a/content/xslt/src/Makefile.in
+++ b/content/xslt/src/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/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in
index 3030278d8c91..deddf70cd93e 100644
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/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/content/xslt/src/base/txList.cpp b/content/xslt/src/base/txList.cpp
index 6b3e1b2e5384..82de49028b93 100644
--- a/content/xslt/src/base/txList.cpp
+++ b/content/xslt/src/base/txList.cpp
@@ -23,11 +23,11 @@
  * Bob Miller, kbob@oblix.com
  *    -- plugged core leak.
  *
- * $Id: txList.cpp,v 1.7 2005/11/02 07:33:48 axel%pike.org Exp $
+ * $Id: txList.cpp,v 1.8 2005/11/02 07:33:49 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: 2005/11/02 07:33:48 $
+ * @version $Revision: 1.8 $ $Date: 2005/11/02 07:33:49 $
 **/
 
 List::List() {
diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in
index 9d060a78174e..7c7383f8fd8f 100644
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/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/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in
index 888ed63362b8..ad328f2d744b 100644
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/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