diff --git a/mozilla/content/xml/document/src/Makefile.in b/mozilla/content/xml/document/src/Makefile.in
index 457cd62c44c..0b14ab904d3 100644
--- a/mozilla/content/xml/document/src/Makefile.in
+++ b/mozilla/content/xml/document/src/Makefile.in
@@ -44,6 +44,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
+ifdef MOZ_XSL
+DEFINES		+= -DXSL
+endif
+
+
 INCLUDES	+= \
 		-I$(srcdir)/../../../html/base/src \
 		-I$(srcdir)/../../../html/document/src \
diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
index 603a9439d56..d065b269a2f 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
@@ -68,7 +68,9 @@
 #include "nsXSLContentSink.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
+#ifdef XP_PC
 #include <windows.h>
+#endif
 #include "nsISupports.h"
 #include "nsParserCIID.h"
 #include "nsIIOService.h"
diff --git a/mozilla/layout/Makefile.in b/mozilla/layout/Makefile.in
index d99ebede421..bce09667ffa 100644
--- a/mozilla/layout/Makefile.in
+++ b/mozilla/layout/Makefile.in
@@ -36,6 +36,10 @@ ifdef MOZ_SVG
 DIRS           += svg
 endif
 
+ifdef MOZ_XSL
+DIRS           += xsl
+endif
+
 DIRS           += events build
 
 ifdef ENABLE_TESTS
diff --git a/mozilla/layout/xml/document/src/Makefile.in b/mozilla/layout/xml/document/src/Makefile.in
index 457cd62c44c..0b14ab904d3 100644
--- a/mozilla/layout/xml/document/src/Makefile.in
+++ b/mozilla/layout/xml/document/src/Makefile.in
@@ -44,6 +44,11 @@ include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_HTML
 
+ifdef MOZ_XSL
+DEFINES		+= -DXSL
+endif
+
+
 INCLUDES	+= \
 		-I$(srcdir)/../../../html/base/src \
 		-I$(srcdir)/../../../html/document/src \
diff --git a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
index 603a9439d56..d065b269a2f 100644
--- a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
@@ -68,7 +68,9 @@
 #include "nsXSLContentSink.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMElement.h"
+#ifdef XP_PC
 #include <windows.h>
+#endif
 #include "nsISupports.h"
 #include "nsParserCIID.h"
 #include "nsIIOService.h"