diff --git a/extensions/transformiix/build/makefile.win b/extensions/transformiix/build/makefile.win
index 286e5fe340ba..0c2c94e0fbbb 100644
--- a/extensions/transformiix/build/makefile.win
+++ b/extensions/transformiix/build/makefile.win
@@ -24,15 +24,98 @@ include <$(DEPTH)/config/config.mak>
 
 DEFINES=-DMOZ_XSL
 
-MODULE=transformix
+MODULE=transformiix
 IS_COMPONENT = 1
 
 CPPSRCS=						\
 	XSLTProcessorModule.cpp		\
 	$(NULL)
 
-CPP_OBJS=									\
-	.\$(OBJDIR)\XSLTProcessorModule.obj		\
+CPP_OBJS=							\
+	..\source\base\$(OBJDIR)\ArrayList.obj \
+	..\source\base\$(OBJDIR)\CommandLineUtils.obj \
+	..\source\base\$(OBJDIR)\DefaultStringComparator.obj \
+	..\source\base\$(OBJDIR)\Double.obj \
+	..\source\base\$(OBJDIR)\HashTable.obj \
+	..\source\base\$(OBJDIR)\Integer.obj \
+	..\source\base\$(OBJDIR)\List.obj \
+	..\source\base\$(OBJDIR)\MITREObjectWrapper.obj \
+	..\source\base\$(OBJDIR)\Map.obj \
+	..\source\base\$(OBJDIR)\NamedMap.obj \
+	..\source\base\$(OBJDIR)\SimpleErrorObserver.obj \
+	..\source\base\$(OBJDIR)\Stack.obj \
+	..\source\base\$(OBJDIR)\StringComparator.obj \
+	..\source\base\$(OBJDIR)\StringList.obj \
+	..\source\base\$(OBJDIR)\Tokenizer.obj \
+	..\source\base\$(OBJDIR)\MozillaString.obj \
+	..\source\net\$(OBJDIR)\URIUtils.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaAttr.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaCDATASection.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaCharacterData.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaComment.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaDOMImplementation.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaDocument.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaDocumentFragment.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaDocumentType.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaElement.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaEntity.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaEntityReference.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaNamedNodeMap.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaNode.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaNodeList.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaNotation.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaProcInstruction.obj \
+	..\source\xml\dom\mozImpl\$(OBJDIR)\MozillaText.obj \
+	..\source\xpath\$(OBJDIR)\AdditiveExpr.obj \
+	..\source\xpath\$(OBJDIR)\AttributeExpr.obj \
+	..\source\xpath\$(OBJDIR)\AttributeValueTemplate.obj \
+	..\source\xpath\$(OBJDIR)\BasicNodeExpr.obj \
+	..\source\xpath\$(OBJDIR)\BooleanExpr.obj \
+	..\source\xpath\$(OBJDIR)\BooleanFunctionCall.obj \
+	..\source\xpath\$(OBJDIR)\BooleanResult.obj \
+	..\source\xpath\$(OBJDIR)\ElementExpr.obj \
+	..\source\xpath\$(OBJDIR)\ErrorFunctionCall.obj \
+	..\source\xpath\$(OBJDIR)\ExprLexer.obj \
+	..\source\xpath\$(OBJDIR)\ExprParser.obj \
+	..\source\xpath\$(OBJDIR)\ExtensionFunctionCall.obj \
+	..\source\xpath\$(OBJDIR)\FilterExpr.obj \
+	..\source\xpath\$(OBJDIR)\FunctionCall.obj \
+	..\source\xpath\$(OBJDIR)\IdentityExpr.obj \
+	..\source\xpath\$(OBJDIR)\LocationStep.obj \
+	..\source\xpath\$(OBJDIR)\MultiplicativeExpr.obj \
+	..\source\xpath\$(OBJDIR)\NodeSet.obj \
+	..\source\xpath\$(OBJDIR)\NodeSetFunctionCall.obj \
+	..\source\xpath\$(OBJDIR)\NumberExpr.obj \
+	..\source\xpath\$(OBJDIR)\NumberFunctionCall.obj \
+	..\source\xpath\$(OBJDIR)\NumberResult.obj \
+	..\source\xpath\$(OBJDIR)\ParentExpr.obj \
+	..\source\xpath\$(OBJDIR)\PathExpr.obj \
+	..\source\xpath\$(OBJDIR)\PredicateList.obj \
+	..\source\xpath\$(OBJDIR)\RelationalExpr.obj \
+	..\source\xpath\$(OBJDIR)\RootExpr.obj \
+	..\source\xpath\$(OBJDIR)\StringExpr.obj \
+	..\source\xpath\$(OBJDIR)\StringFunctionCall.obj \
+	..\source\xpath\$(OBJDIR)\StringResult.obj \
+	..\source\xpath\$(OBJDIR)\TextExpr.obj \
+	..\source\xpath\$(OBJDIR)\UnionExpr.obj \
+	..\source\xpath\$(OBJDIR)\VariableRefExpr.obj \
+	..\source\xpath\$(OBJDIR)\WildCardExpr.obj \
+	..\source\xpath\$(OBJDIR)\XPathNames.obj \
+	..\source\xml\$(OBJDIR)\XMLUtils.obj \
+	..\source\xml\$(OBJDIR)\XMLDOMUtils.obj \
+	..\source\xml\util\$(OBJDIR)\DOMHelper.obj \
+	..\source\xml\parser\$(OBJDIR)\XMLParser.obj \
+	..\source\xslt\$(OBJDIR)\OutputFormat.obj \
+	..\source\xslt\$(OBJDIR)\Names.obj \
+	..\source\xslt\$(OBJDIR)\Numbering.obj \
+	..\source\xslt\$(OBJDIR)\ProcessorState.obj \
+	..\source\xslt\$(OBJDIR)\VariableBinding.obj \
+	..\source\xslt\$(OBJDIR)\XSLTProcessor.obj \
+	..\source\xslt\functions\$(OBJDIR)\DocumentFunctionCall.obj \
+	..\source\xslt\functions\$(OBJDIR)\GenerateIdFunctionCall.obj \
+	..\source\xslt\util\$(OBJDIR)\NodeSorter.obj \
+	..\source\xslt\util\$(OBJDIR)\NodeStack.obj \
+	.\$(OBJDIR)\XSLTProcessorModule.obj \
 	$(NULL)
 
 MAKE_OBJ_TYPE = DLL
@@ -50,15 +133,16 @@ LINCS= -I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\source\xslt\functions \
       -I..\source\base -I..\source\net -I..\source\xml\parser
       
 # These are the libraries we need to link with to create the dll
-LLIBS=												\
- $(DIST)\lib\xpcom.lib					\
- $(DIST)\lib\transformix_base.lib			\
- $(DIST)\lib\transformix_xml.lib			\
- $(DIST)\lib\transformix_xml_dom_mozImpl.lib		\
- $(DIST)\lib\transformix_xslt.lib			\
- $(DIST)\lib\transformix_xpath.lib			\
- $(DIST)\lib\transformix_xslt_util.lib			\
- $(DIST)\lib\transformix_xslt_functions.lib			
+LLIBS=$(LLIBS)  $(LIBNSPR)		\
+ $(DIST)\lib\xpcom.lib	\
+!ifndef NECKO
+	$(DIST)\lib\netlib.lib \
+!endif
+ $(DIST)\lib\expat.lib
+
+WIN_LIBS =                            \
+        shell32.lib                    \
+	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/extensions/transformiix/source/base/Makefile.in b/extensions/transformiix/source/base/Makefile.in
index e1cf8360d3f2..980a9aed740f 100644
--- a/extensions/transformiix/source/base/Makefile.in
+++ b/extensions/transformiix/source/base/Makefile.in
@@ -49,8 +49,4 @@ else
 endif
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_XSL
-DEFINES += -DMOZILLA
-endif
-
 install:: $(OBJS)
\ No newline at end of file
diff --git a/extensions/transformiix/source/base/makefile.win b/extensions/transformiix/source/base/makefile.win
index 256bd84b4799..61d4b01ba643 100644
--- a/extensions/transformiix/source/base/makefile.win
+++ b/extensions/transformiix/source/base/makefile.win
@@ -21,46 +21,46 @@
 
 DEPTH=..\..\..\..
 
-LIBRARY_NAME=transformix_base
-MODULE=transformix
-DEFINES=-DMOZILLA
+!if defined(MOZ_XSL)
+DEFINES=-DMOZ_XSL
+!endif
 
-CPPSRCS=								\
-	ArrayList.cpp \
-	CommandLineUtils.cpp				\
-	DefaultStringComparator.cpp				\
-	Double.cpp							\
-	HashTable.cpp \
-	Integer.cpp							\
-	List.cpp							\
-	MITREObjectWrapper.cpp				\
-	MozillaString.cpp				\
-	NamedMap.cpp						\
-	SimpleErrorObserver.cpp				\
-	Stack.cpp							\
-	TxString.cpp							\
-	StringComparator.cpp							\
-	StringList.cpp						\
-	Tokenizer.cpp						\
+CPPSRCS=				\
+	ArrayList.cpp 			\
+	CommandLineUtils.cpp		\
+	DefaultStringComparator.cpp	\
+	Double.cpp			\
+	HashTable.cpp 			\
+	Integer.cpp			\
+	List.cpp			\
+	MITREObjectWrapper.cpp		\
+	MozillaString.cpp		\
+	NamedMap.cpp			\
+	SimpleErrorObserver.cpp		\
+	Stack.cpp			\
+	Map.cpp				\
+	StringComparator.cpp		\
+	StringList.cpp			\
+	Tokenizer.cpp			\
 	$(NULL)
 
-CPP_OBJS=							        \
-	.\$(OBJDIR)\ArrayList.obj \
-	.\$(OBJDIR)\CommandLineUtils.obj		\
-	.\$(OBJDIR)\DefaultStringComparator.obj					\
-	.\$(OBJDIR)\Double.obj					\
-	.\$(OBJDIR)\HashTable.obj					\
-	.\$(OBJDIR)\Integer.obj					\
-	.\$(OBJDIR)\List.obj					\
-	.\$(OBJDIR)\MITREObjectWrapper.obj		\
+CPP_OBJS=					\
+	.\$(OBJDIR)\ArrayList.obj 		\
+	.\$(OBJDIR)\CommandLineUtils.obj	\
+	.\$(OBJDIR)\DefaultStringComparator.obj	\
+	.\$(OBJDIR)\Double.obj			\
+	.\$(OBJDIR)\HashTable.obj		\
+	.\$(OBJDIR)\Integer.obj			\
+	.\$(OBJDIR)\List.obj			\
+	.\$(OBJDIR)\MITREObjectWrapper.obj	\
 	.\$(OBJDIR)\MozillaString.obj		\
-	.\$(OBJDIR)\NamedMap.obj				\
-    .\$(OBJDIR)\SimpleErrorObserver.obj		\
-	.\$(OBJDIR)\Stack.obj					\
-	.\$(OBJDIR)\TxString.obj					\
-	.\$(OBJDIR)\StringComparator.obj					\
-	.\$(OBJDIR)\StringList.obj				\
-	.\$(OBJDIR)\Tokenizer.obj				\
+	.\$(OBJDIR)\NamedMap.obj		\
+	.\$(OBJDIR)\SimpleErrorObserver.obj	\
+	.\$(OBJDIR)\Stack.obj			\
+	.\$(OBJDIR)\Map.obj			\
+	.\$(OBJDIR)\StringComparator.obj	\
+	.\$(OBJDIR)\StringList.obj		\
+	.\$(OBJDIR)\Tokenizer.obj		\
 	$(NULL)
 
 EXPORTS = 					\
@@ -75,8 +75,4 @@ LCFLAGS = \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+install:: $(CPP_OBJS)
diff --git a/extensions/transformiix/source/makefile.win b/extensions/transformiix/source/makefile.win
index 98800def9a0c..b5c7454c6e04 100644
--- a/extensions/transformiix/source/makefile.win
+++ b/extensions/transformiix/source/makefile.win
@@ -21,6 +21,6 @@
 
 DEPTH=..\..\..
 
-DIRS=base xml xpath xslt
+DIRS=base net xml xpath xslt
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/extensions/transformiix/source/net/makefile.win b/extensions/transformiix/source/net/makefile.win
new file mode 100644
index 000000000000..f7fcdf916b20
--- /dev/null
+++ b/extensions/transformiix/source/net/makefile.win
@@ -0,0 +1,48 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..
+
+!if defined(MOZ_XSL)
+DEFINES=-DMOZ_XSL
+!endif
+
+CPPSRCS=		\
+	URIUtils.cpp 	\
+	$(NULL)
+
+CPP_OBJS=			\
+	.\$(OBJDIR)\URIUtils.obj \
+	$(NULL)
+
+EXPORTS = 			\
+	$(NULL)
+
+LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\base
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(CPP_OBJS)
diff --git a/extensions/transformiix/source/xml/dom/makefile.win b/extensions/transformiix/source/xml/dom/makefile.win
new file mode 100644
index 000000000000..5d58efe70208
--- /dev/null
+++ b/extensions/transformiix/source/xml/dom/makefile.win
@@ -0,0 +1,26 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..\..
+
+DIRS=mozImpl
+
+include <$(DEPTH)\config\rules.mak>
diff --git a/extensions/transformiix/source/xml/dom/mozImpl/makefile.win b/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
index a8408ccfc90d..6b196a58fd7b 100644
--- a/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
+++ b/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
@@ -21,53 +21,53 @@
 
 DEPTH=..\..\..\..\..\..
 
-LIBRARY_NAME=transformix_xml_dom_mozImpl
-MODULE=transformix
 DEFINES=-DMOZ_XSL
-CPPSRCS=						\
-	MozillaAttr.cpp					\
-	MozillaCDATASection.cpp			\
-	MozillaCharacterData.cpp			\
-	MozillaComment.cpp					\
-	MozillaDocument.cpp				\
-	MozillaDocumentFragment.cpp		\
-	MozillaDocumentType.cpp			\
-	MozillaDOMImplementation.cpp		\
-	MozillaElement.cpp					\
-	MozillaEntity.cpp					\
-	MozillaEntityReference.cpp			\
-	MozillaNamedNodeMap.cpp			\
+
+CPPSRCS=				\
+	MozillaAttr.cpp			\
+	MozillaCDATASection.cpp		\
+	MozillaCharacterData.cpp	\
+	MozillaComment.cpp		\
+	MozillaDocument.cpp		\
+	MozillaDocumentFragment.cpp	\
+	MozillaDocumentType.cpp		\
+	MozillaDOMImplementation.cpp	\
+	MozillaElement.cpp		\
+	MozillaEntity.cpp		\
+	MozillaEntityReference.cpp	\
+	MozillaNamedNodeMap.cpp		\
 	MozillaNode.cpp			\
 	MozillaNodeList.cpp		\
-	MozillaNotation.cpp				\
+	MozillaNotation.cpp		\
 	MozillaProcInstruction.cpp	\
-	MozillaText.cpp					\
+	MozillaText.cpp			\
 	$(NULL)
 
-CPP_OBJS=									\
-	.\$(OBJDIR)\MozillaAttr.obj					\
-	.\$(OBJDIR)\MozillaCDATASection.obj			\
-	.\$(OBJDIR)\MozillaCharacterData.obj			\
-	.\$(OBJDIR)\MozillaComment.obj					\
-	.\$(OBJDIR)\MozillaDocument.obj				\
-	.\$(OBJDIR)\MozillaDocumentFragment.obj		\
-	.\$(OBJDIR)\MozillaDocumentType.obj			\
-	.\$(OBJDIR)\MozillaDOMImplementation.obj		\
-	.\$(OBJDIR)\MozillaElement.obj					\
-	.\$(OBJDIR)\MozillaEntity.obj					\
-	.\$(OBJDIR)\MozillaEntityReference.obj			\
-	.\$(OBJDIR)\MozillaNamedNodeMap.obj			\
-	.\$(OBJDIR)\MozillaNode.obj			\
+CPP_OBJS=					\
+	.\$(OBJDIR)\MozillaAttr.obj		\
+	.\$(OBJDIR)\MozillaCDATASection.obj	\
+	.\$(OBJDIR)\MozillaCharacterData.obj	\
+	.\$(OBJDIR)\MozillaComment.obj		\
+	.\$(OBJDIR)\MozillaDocument.obj		\
+	.\$(OBJDIR)\MozillaDocumentFragment.obj	\
+	.\$(OBJDIR)\MozillaDocumentType.obj	\
+	.\$(OBJDIR)\MozillaDOMImplementation.obj\
+	.\$(OBJDIR)\MozillaElement.obj		\
+	.\$(OBJDIR)\MozillaEntity.obj		\
+	.\$(OBJDIR)\MozillaEntityReference.obj	\
+	.\$(OBJDIR)\MozillaNamedNodeMap.obj	\
+	.\$(OBJDIR)\MozillaNode.obj		\
 	.\$(OBJDIR)\MozillaNodeList.obj		\
-	.\$(OBJDIR)\MozillaNotation.obj				\
+	.\$(OBJDIR)\MozillaNotation.obj		\
 	.\$(OBJDIR)\MozillaProcInstruction.obj	\
-	.\$(OBJDIR)\MozillaText.obj					\
+	.\$(OBJDIR)\MozillaText.obj		\
 	$(NULL)
 
 EXPORTS = 					\
 	$(NULL)
 
-LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\..\..\base -I..\..\dom
+LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\..\..\base -I..\..\dom \
+	-I..\..
 
 LCFLAGS = \
         $(LCFLAGS) \
@@ -76,8 +76,4 @@ LCFLAGS = \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+install:: $(CPP_OBJS)
diff --git a/extensions/transformiix/source/xml/makefile.win b/extensions/transformiix/source/xml/makefile.win
index 810d99ebb68a..8b2c69e1e252 100644
--- a/extensions/transformiix/source/xml/makefile.win
+++ b/extensions/transformiix/source/xml/makefile.win
@@ -21,16 +21,18 @@
 
 DEPTH=..\..\..\..
 
-DIRS=dom
+DIRS=dom parser util
 
-LIBRARY_NAME=transformix_xml
-MODULE=transformix
-CPPSRCS=						\
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
+!endif
+
+CPPSRCS=				\
 	XMLDOMUtils.cpp			\
 	XMLUtils.cpp			\
 	$(NULL)
 
-CPP_OBJS=					\
+CPP_OBJS=				\
 	.\$(OBJDIR)\XMLDOMUtils.obj	\
 	.\$(OBJDIR)\XMLUtils.obj	\
 	$(NULL)
@@ -47,8 +49,4 @@ LCFLAGS = \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+install:: $(CPP_OBJS)
diff --git a/extensions/transformiix/source/xml/parser/makefile.win b/extensions/transformiix/source/xml/parser/makefile.win
new file mode 100644
index 000000000000..d9685bedf5a7
--- /dev/null
+++ b/extensions/transformiix/source/xml/parser/makefile.win
@@ -0,0 +1,50 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..\..
+
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
+!endif
+
+CPPSRCS=			\
+	XMLParser.cpp		\
+	$(NULL)
+
+CPP_OBJS=				\
+	.\$(OBJDIR)\XMLParser.obj	\
+	$(NULL)
+
+EXPORTS =	\
+	$(NULL)
+
+LINCS=-I..\..\base -I..\dom -I$(PUBLIC)\expat
+
+LCFLAGS = \
+	-DXML_UNICODE \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(CPP_OBJS)
+
diff --git a/extensions/transformiix/source/xml/printer/makefile.win b/extensions/transformiix/source/xml/printer/makefile.win
new file mode 100644
index 000000000000..6afefa014563
--- /dev/null
+++ b/extensions/transformiix/source/xml/printer/makefile.win
@@ -0,0 +1,51 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..\..
+
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
+!endif
+
+CPPSRCS=			\
+	XMLPrinter.cpp		\
+	HTMLPrinter.cpp		\
+	$(NULL)
+
+CPP_OBJS=				\
+	.\$(OBJDIR)\XMLPrinter.obj	\
+	.\$(OBJDIR)\HTMLPrinter.obj	\
+	$(NULL)
+
+EXPORTS =	\
+	$(NULL)
+
+LINCS=-I..\..\base -I..\dom
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(CPP_OBJS)
+
diff --git a/extensions/transformiix/source/xml/util/makefile.win b/extensions/transformiix/source/xml/util/makefile.win
new file mode 100644
index 000000000000..571795ba8282
--- /dev/null
+++ b/extensions/transformiix/source/xml/util/makefile.win
@@ -0,0 +1,49 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..\..
+
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
+!endif
+
+CPPSRCS=			\
+	DOMHelper.cpp		\
+	$(NULL)
+
+CPP_OBJS=				\
+	.\$(OBJDIR)\DOMHelper.obj	\
+	$(NULL)
+
+EXPORTS =	\
+	$(NULL)
+
+LINCS=-I..\..\base -I..\..\xml\dom
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(CPP_OBJS)
+
diff --git a/extensions/transformiix/source/xpath/makefile.win b/extensions/transformiix/source/xpath/makefile.win
index a5c1fd58fee9..d244c00754e4 100644
--- a/extensions/transformiix/source/xpath/makefile.win
+++ b/extensions/transformiix/source/xpath/makefile.win
@@ -21,8 +21,9 @@
 
 DEPTH=..\..\..\..
 
-LIBRARY_NAME=transformix_xpath
-MODULE=transformix
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
+!endif
 
 CPPSRCS=				\
 	AdditiveExpr.cpp		\
@@ -113,8 +114,4 @@ LCFLAGS = \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+install:: $(CPP_OBJS)
diff --git a/extensions/transformiix/source/xslt/functions/makefile.win b/extensions/transformiix/source/xslt/functions/makefile.win
index 32ab1a15be8f..4446cf2e6d63 100644
--- a/extensions/transformiix/source/xslt/functions/makefile.win
+++ b/extensions/transformiix/source/xslt/functions/makefile.win
@@ -21,22 +21,26 @@
 
 DEPTH=..\..\..\..\..
 
-LIBRARY_NAME=transformix_xslt_functions
-MODULE=transformix
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
+!endif
 
 CPPSRCS=					\
 	GenerateIDFunctionCall.cpp		\
+	DocumentFunctionCall.cpp		\
 	$(NULL)
 
 CPP_OBJS=						\
 	.\$(OBJDIR)\GenerateIDFunctionCall.obj		\
+	.\$(OBJDIR)\DocumentFunctionCall.obj		\
 	$(NULL)
 
 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..\..\net -I..\..\xml\parser
 
 LCFLAGS = \
         $(LCFLAGS) \
@@ -45,8 +49,4 @@ LCFLAGS = \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+install:: $(CPP_OBJS)
diff --git a/extensions/transformiix/source/xslt/makefile.win b/extensions/transformiix/source/xslt/makefile.win
index 1ce77daacc71..5b58cc895f90 100644
--- a/extensions/transformiix/source/xslt/makefile.win
+++ b/extensions/transformiix/source/xslt/makefile.win
@@ -23,10 +23,9 @@ DEPTH=..\..\..\..
 
 DIRS=util functions
 
-LIBRARY_NAME=transformix_xslt
-MODULE=transformix
-
+!if defined(MOZ_XSL)
 DEFINES=-DMOZ_XSL
+!endif
 
 CPPSRCS=					\
 	Names.cpp				\
@@ -47,7 +46,6 @@ CPP_OBJS=					\
 	$(NULL)
 
 EXPORTS = 					\
-	XSLTProcessor.h				\
 	$(NULL)
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I..\xpath -I..\xml\dom -I..\xml\dom\mozImpl \
@@ -60,8 +58,4 @@ LCFLAGS = \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+install:: $(CPP_OBJS)
diff --git a/extensions/transformiix/source/xslt/util/makefile.win b/extensions/transformiix/source/xslt/util/makefile.win
index f00f8f69118e..36ed1a8c807e 100644
--- a/extensions/transformiix/source/xslt/util/makefile.win
+++ b/extensions/transformiix/source/xslt/util/makefile.win
@@ -21,8 +21,9 @@
 
 DEPTH=..\..\..\..\..
 
-LIBRARY_NAME=transformix_xslt_util
-MODULE=transformix
+!if defined(MOZ_XSL)
+DEFINES=$(DEFINES) -DMOZ_XSL
+!endif
 
 CPPSRCS=			\
 	NodeStack.cpp		\
@@ -47,8 +48,5 @@ LCFLAGS = \
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+install:: $(CPP_OBJS)
 
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib