diff --git a/mozilla/extensions/transformiix/source/xpath/makefile.win b/mozilla/extensions/transformiix/source/xpath/makefile.win
index f1beb1c18b8..e29aa68d5f6 100644
--- a/mozilla/extensions/transformiix/source/xpath/makefile.win
+++ b/mozilla/extensions/transformiix/source/xpath/makefile.win
@@ -30,12 +30,14 @@ CPPSRCS=				\
 	AttributeExpr.cpp		\
 	AttributeValueTemplate.cpp	\
 	BasicNodeExpr.cpp		\
+	BooleanExpr.cpp		        \
 	BooleanFunctionCall.cpp		\
 	BooleanResult.cpp		\
 	ElementExpr.cpp			\
 	ErrorFunctionCall.cpp		\
 	ExprLexer.cpp			\
 	ExprParser.cpp			\
+	ExtensionFunctionCall.cpp	\
 	FilterExpr.cpp			\
 	FunctionCall.cpp		\
 	IdentityExpr.cpp		\
@@ -58,6 +60,7 @@ CPPSRCS=				\
 	UnionExpr.cpp			\
 	VariableRefExpr.cpp		\
 	WildCardExpr.cpp		\
+	XPathNames.cpp			\
 	$(NULL)
 
 CPP_OBJS=						\
@@ -65,12 +68,14 @@ CPP_OBJS=						\
 	.\$(OBJDIR)\AttributeExpr.obj			\
 	.\$(OBJDIR)\AttributeValueTemplate.obj		\
 	.\$(OBJDIR)\BasicNodeExpr.obj			\
+	.\$(OBJDIR)\BooleanExpr.obj			\
 	.\$(OBJDIR)\BooleanFunctionCall.obj		\
 	.\$(OBJDIR)\BooleanResult.obj			\
 	.\$(OBJDIR)\ElementExpr.obj			\
 	.\$(OBJDIR)\ErrorFunctionCall.obj		\
 	.\$(OBJDIR)\ExprLexer.obj			\
 	.\$(OBJDIR)\ExprParser.obj			\
+	.\$(OBJDIR)\ExtensionFunctionCall.obj		\
 	.\$(OBJDIR)\FilterExpr.obj			\
 	.\$(OBJDIR)\FunctionCall.obj			\
 	.\$(OBJDIR)\IdentityExpr.obj			\
@@ -93,6 +98,7 @@ CPP_OBJS=						\
 	.\$(OBJDIR)\UnionExpr.obj			\
 	.\$(OBJDIR)\VariableRefExpr.obj			\
 	.\$(OBJDIR)\WildCardExpr.obj			\
+	.\$(OBJDIR)\XPathNames.obj			\
 	$(NULL)
 
 EXPORTS = \
diff --git a/mozilla/extensions/transformiix/source/xslt/functions/GenerateIdFunctionCall.cpp b/mozilla/extensions/transformiix/source/xslt/functions/GenerateIdFunctionCall.cpp
index 1fe3f27616c..30a1b3b557d 100644
--- a/mozilla/extensions/transformiix/source/xslt/functions/GenerateIdFunctionCall.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/functions/GenerateIdFunctionCall.cpp
@@ -20,7 +20,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: GenerateIdFunctionCall.cpp,v 1.2 2000-04-19 11:06:09 kvisco%ziplink.net Exp $
+ * $Id: GenerateIdFunctionCall.cpp,v 1.3 2000-04-19 23:07:31 nisheeth%netscape.com Exp $
  */
 
 #include "XSLTFunctions.h"
@@ -55,7 +55,7 @@ ExprResult* GenerateIdFunctionCall::evaluate(Node* context, ContextState* cs) {
 
     if (argc > 0) {
         ListIterator* iter = params.iterator();
-        Expr* param = iter->next();
+        Expr* param = (Expr*) iter->next();
         delete iter;
         ExprResult* exprResult = param->evaluate(context, cs);
         if (!exprResult) return new StringResult("");
diff --git a/mozilla/extensions/transformiix/source/xslt/makefile.win b/mozilla/extensions/transformiix/source/xslt/makefile.win
index 9df8da369ee..6e1e031a5fb 100644
--- a/mozilla/extensions/transformiix/source/xslt/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/makefile.win
@@ -21,7 +21,7 @@
 
 DEPTH=..\..\..\..
 
-DIRS=util
+DIRS=util functions
 
 LIBRARY_NAME=transformix_xsl
 MODULE=transformix
@@ -29,24 +29,30 @@ REQUIRES=xpcom raptor
 
 DEFINES=-DMOZILLA
 
-CPPSRCS=						\
-	XSLTProcessor.cpp			\
+CPPSRCS=					\
+	Names.cpp				\
+	Numbering.cpp				\
+	OutputFormat.cpp			\
 	ProcessorState.cpp			\
-	Names.cpp					\
+	VariableBinding.cpp			\
+	XSLTProcessor.cpp			\
 	$(NULL)
 
 CPP_OBJS=					\
-	.\$(OBJDIR)\XSLTProcessor.obj	\
-	.\$(OBJDIR)\ProcessorState.obj	\
-	.\$(OBJDIR)\Names.obj	\
+	.\$(OBJDIR)\Names.obj			\
+	.\$(OBJDIR)\Numbering.obj		\
+	.\$(OBJDIR)\OutputFormat.obj		\
+	.\$(OBJDIR)\ProcessorState.obj		\
+	.\$(OBJDIR)\VariableBinding.obj		\
+	.\$(OBJDIR)\XSLTProcessor.obj		\
 	$(NULL)
 
 EXPORTS = 					\
-	XSLTProcessor.h			\
+	XSLTProcessor.h				\
 	$(NULL)
 
-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
+LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\xpath -I..\xml\dom -I..\xml\dom\mozImpl \
+      -I..\base -I ..\xml -I ..\xml\util -I .\util -I ..\net -I..\xml\parser -I.\functions
 
 LCFLAGS = \
         $(LCFLAGS) \
diff --git a/mozilla/extensions/transformiix/source/xslt/util/makefile.win b/mozilla/extensions/transformiix/source/xslt/util/makefile.win
index 313bc535333..2762db1f79c 100644
--- a/mozilla/extensions/transformiix/source/xslt/util/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/util/makefile.win
@@ -39,7 +39,7 @@ EXPORTS =	\
 	$(NULL)
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\..\base -I..\..\xml\dom \
-      -I..\..\xpath -I..\..\xml -I..\ -I..\..\xml\util
+      -I..\..\xpath -I..\..\xml -I..\ -I..\..\xml\util -I..\functions
 
 LCFLAGS = \
         $(LCFLAGS) \