diff --git a/mozilla/extensions/transformiix/build/makefile.win b/mozilla/extensions/transformiix/build/makefile.win
index 96570c0d897..80255345809 100644
--- a/mozilla/extensions/transformiix/build/makefile.win
+++ b/mozilla/extensions/transformiix/build/makefile.win
@@ -46,7 +46,7 @@ LCFLAGS = \
         $(NULL)
 
 LINCS= -I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \
-      -I..\source\xml\dom \
+      -I..\source\xml\dom -I..\source\xml\util \
       -I..\source\xpath -I..\source\xslt\util -I..\source\xml -I..\source\xslt \
       -I..\source\base -I..\source\net -I..\source\xml\parser
       
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp b/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp
index 351850d68a2..734aff2e842 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/ExprLexer.cpp
@@ -29,13 +29,13 @@
  *   -- Fixed bug in parse method so that we make sure we check for
  *      axis identifier wild cards, such as ancestor::*
  *
- * $Id: ExprLexer.cpp,v 1.2 2000-04-13 09:13:14 kvisco%ziplink.net Exp $
+ * $Id: ExprLexer.cpp,v 1.3 2000-04-13 18:29:56 nisheeth%netscape.com Exp $
  */
 
 /**
  * Lexical analyzer for XPath expressions
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.2 $ $Date: 2000-04-13 09:13:14 $
+ * @version $Revision: 1.3 $ $Date: 2000-04-13 18:29:56 $
 **/
 
 #include <iostream.h>
@@ -559,9 +559,9 @@ void ExprLexer::parse(const String& pattern) {
             switch (ch) {
                 //-- ignore whitespace
                 case SPACE:
-                case TAB:
-                case CR:
-                case LF:
+                case TX_TAB:
+                case TX_CR:
+                case TX_LF:
                     break;
                 case S_QUOTE :
 	        case D_QUOTE :
@@ -679,9 +679,9 @@ void ExprLexer::parse(const String& pattern) {
                 default:
                     switch (prevCh) {
                         case SPACE :
-                        case TAB :
-                        case CR :
-                        case LF :
+                        case TX_TAB :
+                        case TX_CR :
+                        case TX_LF :
                             matchToken(tokenBuffer, ch);
                             tokenBuffer.append(ch);
                             break;
diff --git a/mozilla/extensions/transformiix/source/xpath/ExprLexer.h b/mozilla/extensions/transformiix/source/xpath/ExprLexer.h
index d969e014c0c..2c6b57d8021 100644
--- a/mozilla/extensions/transformiix/source/xpath/ExprLexer.h
+++ b/mozilla/extensions/transformiix/source/xpath/ExprLexer.h
@@ -25,7 +25,7 @@
  *    -- changed constant short declarations in Token and ExprLexer to
  *       enumerations, commented with //--LF
  * 
- * $Id: ExprLexer.h,v 1.2 2000-04-12 22:32:45 nisheeth%netscape.com Exp $
+ * $Id: ExprLexer.h,v 1.3 2000-04-13 18:30:00 nisheeth%netscape.com Exp $
  */
 
 
@@ -42,7 +42,7 @@
  * This class was ported from XSL:P, an open source Java based 
  * XSLT processor, written by yours truly.
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.2 $ $Date: 2000-04-12 22:32:45 $
+ * @version $Revision: 1.3 $ $Date: 2000-04-13 18:30:00 $
 **/
 class Token {
 
@@ -163,9 +163,9 @@ public:
         COLON          = ':',
         //-- whitespace tokens
         SPACE          = ' ',
-        TAB            = '\t',
-        CR             = '\n',
-        LF             = '\r'
+        TX_TAB            = '\t',
+        TX_CR             = '\n',
+        TX_LF             = '\r'
     };
 
 
diff --git a/mozilla/extensions/transformiix/source/xslt/makefile.win b/mozilla/extensions/transformiix/source/xslt/makefile.win
index 6ca287f15dd..9df8da369ee 100644
--- a/mozilla/extensions/transformiix/source/xslt/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/makefile.win
@@ -36,7 +36,7 @@ CPPSRCS=						\
 	$(NULL)
 
 CPP_OBJS=					\
-	.\$(OBJDIR)\XSLProcessor.obj	\
+	.\$(OBJDIR)\XSLTProcessor.obj	\
 	.\$(OBJDIR)\ProcessorState.obj	\
 	.\$(OBJDIR)\Names.obj	\
 	$(NULL)
@@ -45,8 +45,8 @@ EXPORTS = 					\
 	XSLTProcessor.h			\
 	$(NULL)
 
-LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I.\expr -I.\util -I..\xml\dom \
-      -I..\base -I ..\xml
+LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\xpath -I..\xml\dom \
+      -I..\base -I ..\xml -I ..\xml\util -I .\util -I ..\net -I ..\xml\parser
 
 LCFLAGS = \
         $(LCFLAGS) \