--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -195,23 +195,23 @@ FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/xbl/src',
     '/content/xml/content/src',
     '/content/xml/document/src',
-    '/content/xslt/src/xpath',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/docshell/base',
     '/dom/base',
     '/dom/ipc',
     '/dom/workers',
+    '/dom/xslt/xpath',
     '/image/src',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/base',
     '/layout/generic',
     '/layout/style',
     '/layout/svg',

--- a/content/moz.build
+++ b/content/moz.build
@@ -11,13 +11,12 @@ PARALLEL_DIRS += [
     'html',
     'mathml/content/src',
     'media',
     'smil',
     'svg',
     'xml',
     'xul',
     'xbl',
-    'xslt',
 ]
 
 TEST_TOOL_DIRS += ['test']
 

deleted file mode 100644
--- a/content/xslt/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-PARALLEL_DIRS += ['public', 'src']
-TEST_DIRS += ['tests/buster', 'tests/mochitest']

deleted file mode 100644
--- a/content/xslt/src/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-PARALLEL_DIRS += ['base', 'xml', 'xpath', 'xslt']

--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -43,28 +43,28 @@ LOCAL_INCLUDES += [
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
     '/content/svg/content/src',
     '/content/xbl/src',
     '/content/xml/content/src',
-    '/content/xslt/src/base',
-    '/content/xslt/src/xpath',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
     '/dom/file',
     '/dom/indexedDB',
     '/dom/src/geolocation',
     '/dom/workers',
+    '/dom/xslt/base',
+    '/dom/xslt/xpath',
     '/js/ipc',
     '/js/xpconnect/src',
     '/js/xpconnect/wrappers',
     '/layout/style',
     '/layout/xul/tree',
     '/media/mtransport',
     '/media/webrtc/signaling/src/common/time_profiling',
     '/media/webrtc/signaling/src/peerconnection',

--- a/dom/moz.build
+++ b/dom/moz.build
@@ -71,16 +71,17 @@ PARALLEL_DIRS += [
     'identity',
     'workers',
     'camera',
     'audiochannel',
     'promise',
     'telephony',
     'inputmethod',
     'webidl',
+    'xslt',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     PARALLEL_DIRS += ['plugins/ipc/hangui']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     PARALLEL_DIRS += [
         'speakermanager',

rename from content/xslt/src/base/moz.build
rename to dom/xslt/base/moz.build
--- a/content/xslt/src/base/moz.build
+++ b/dom/xslt/base/moz.build
@@ -10,15 +10,15 @@ UNIFIED_SOURCES += [
     'txList.cpp',
     'txNamespaceMap.cpp',
     'txURIUtils.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '../../public',
+    '..',
     '../xml',
     '../xpath',
     '../xslt',
 ]
 
 FINAL_LIBRARY = 'gklayout'

rename from content/xslt/src/base/txCore.h
rename to dom/xslt/base/txCore.h

rename from content/xslt/src/base/txDouble.cpp
rename to dom/xslt/base/txDouble.cpp

rename from content/xslt/src/base/txErrorObserver.h
rename to dom/xslt/base/txErrorObserver.h

rename from content/xslt/src/base/txExpandedNameMap.cpp
rename to dom/xslt/base/txExpandedNameMap.cpp

rename from content/xslt/src/base/txExpandedNameMap.h
rename to dom/xslt/base/txExpandedNameMap.h

rename from content/xslt/src/base/txList.cpp
rename to dom/xslt/base/txList.cpp

rename from content/xslt/src/base/txList.h
rename to dom/xslt/base/txList.h

rename from content/xslt/src/base/txLog.h
rename to dom/xslt/base/txLog.h

rename from content/xslt/src/base/txNamespaceMap.cpp
rename to dom/xslt/base/txNamespaceMap.cpp

rename from content/xslt/src/base/txNamespaceMap.h
rename to dom/xslt/base/txNamespaceMap.h

rename from content/xslt/src/base/txOwningArray.h
rename to dom/xslt/base/txOwningArray.h

rename from content/xslt/src/base/txStack.h
rename to dom/xslt/base/txStack.h

rename from content/xslt/src/base/txStringUtils.h
rename to dom/xslt/base/txStringUtils.h

rename from content/xslt/src/base/txURIUtils.cpp
rename to dom/xslt/base/txURIUtils.cpp

rename from content/xslt/src/base/txURIUtils.h
rename to dom/xslt/base/txURIUtils.h

rename from content/xslt/crashtests/111994.xml
rename to dom/xslt/crashtests/111994.xml

rename from content/xslt/crashtests/111994.xsl
rename to dom/xslt/crashtests/111994.xsl

rename from content/xslt/crashtests/182460-select.xml
rename to dom/xslt/crashtests/182460-select.xml

rename from content/xslt/crashtests/182460-selects.xsl
rename to dom/xslt/crashtests/182460-selects.xsl

rename from content/xslt/crashtests/182460-table.xhtml
rename to dom/xslt/crashtests/182460-table.xhtml

rename from content/xslt/crashtests/226425.xml
rename to dom/xslt/crashtests/226425.xml

rename from content/xslt/crashtests/226425.xsl
rename to dom/xslt/crashtests/226425.xsl

rename from content/xslt/crashtests/406106-1.html
rename to dom/xslt/crashtests/406106-1.html

rename from content/xslt/crashtests/483444.xml
rename to dom/xslt/crashtests/483444.xml

rename from content/xslt/crashtests/485217.xml
rename to dom/xslt/crashtests/485217.xml

rename from content/xslt/crashtests/485217.xsl
rename to dom/xslt/crashtests/485217.xsl

rename from content/xslt/crashtests/485286.xml
rename to dom/xslt/crashtests/485286.xml

rename from content/xslt/crashtests/528300.xml
rename to dom/xslt/crashtests/528300.xml

rename from content/xslt/crashtests/528488.xml
rename to dom/xslt/crashtests/528488.xml

rename from content/xslt/crashtests/528963.xml
rename to dom/xslt/crashtests/528963.xml

rename from content/xslt/crashtests/545927.html
rename to dom/xslt/crashtests/545927.html

rename from content/xslt/crashtests/601543.html
rename to dom/xslt/crashtests/601543.html

rename from content/xslt/crashtests/602115.html
rename to dom/xslt/crashtests/602115.html

rename from content/xslt/crashtests/603844.html
rename to dom/xslt/crashtests/603844.html

rename from content/xslt/crashtests/667315.xml
rename to dom/xslt/crashtests/667315.xml

rename from content/xslt/crashtests/91332.xml
rename to dom/xslt/crashtests/91332.xml

rename from content/xslt/crashtests/91332.xsl
rename to dom/xslt/crashtests/91332.xsl

rename from content/xslt/crashtests/crashtests.list
rename to dom/xslt/crashtests/crashtests.list

rename from content/xslt/public/moz.build
rename to dom/xslt/moz.build
--- a/content/xslt/public/moz.build
+++ b/dom/xslt/moz.build
@@ -15,8 +15,19 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'content_xslt'
 
 EXPORTS += [
     'nsIDocumentTransformer.h',
 ]
 
+PARALLEL_DIRS += [
+    'base',
+    'xml',
+    'xpath',
+    'xslt',
+]
+
+TEST_DIRS += [
+    'tests/buster',
+    'tests/mochitest',
+]

rename from content/xslt/public/nsIDocumentTransformer.h
rename to dom/xslt/nsIDocumentTransformer.h

rename from content/xslt/public/nsIXSLTException.idl
rename to dom/xslt/nsIXSLTException.idl

rename from content/xslt/public/nsIXSLTProcessor.idl
rename to dom/xslt/nsIXSLTProcessor.idl

rename from content/xslt/public/nsIXSLTProcessorPrivate.idl
rename to dom/xslt/nsIXSLTProcessorPrivate.idl

rename from content/xslt/tests/XSLTMark/XSLTMark-static.js
rename to dom/xslt/tests/XSLTMark/XSLTMark-static.js

rename from content/xslt/tests/XSLTMark/XSLTMark-test.js
rename to dom/xslt/tests/XSLTMark/XSLTMark-test.js

rename from content/xslt/tests/XSLTMark/XSLTMark-view.js
rename to dom/xslt/tests/XSLTMark/XSLTMark-view.js

rename from content/xslt/tests/XSLTMark/XSLTMark.css
rename to dom/xslt/tests/XSLTMark/XSLTMark.css

rename from content/xslt/tests/XSLTMark/XSLTMark.xul
rename to dom/xslt/tests/XSLTMark/XSLTMark.xul

rename from content/xslt/tests/buster/DiffDOM.js
rename to dom/xslt/tests/buster/DiffDOM.js

rename from content/xslt/tests/buster/DumpDOM.js
rename to dom/xslt/tests/buster/DumpDOM.js

rename from content/xslt/tests/buster/ReadMe
rename to dom/xslt/tests/buster/ReadMe

rename from content/xslt/tests/buster/buster-files.js
rename to dom/xslt/tests/buster/buster-files.js

rename from content/xslt/tests/buster/buster-handlers.js
rename to dom/xslt/tests/buster/buster-handlers.js

rename from content/xslt/tests/buster/buster-statics.js
rename to dom/xslt/tests/buster/buster-statics.js

rename from content/xslt/tests/buster/buster-test.js
rename to dom/xslt/tests/buster/buster-test.js

rename from content/xslt/tests/buster/buster-view.js
rename to dom/xslt/tests/buster/buster-view.js

rename from content/xslt/tests/buster/buster.css
rename to dom/xslt/tests/buster/buster.css

rename from content/xslt/tests/buster/buster.xul
rename to dom/xslt/tests/buster/buster.xul

rename from content/xslt/tests/buster/helper/generate-rdf.pl
rename to dom/xslt/tests/buster/helper/generate-rdf.pl

rename from content/xslt/tests/buster/install.js
rename to dom/xslt/tests/buster/install.js

rename from content/xslt/tests/buster/jar.mn
rename to dom/xslt/tests/buster/jar.mn

rename from content/xslt/tests/buster/moz.build
rename to dom/xslt/tests/buster/moz.build

rename from content/xslt/tests/buster/result-inspector.xul
rename to dom/xslt/tests/buster/result-inspector.xul

rename from content/xslt/tests/buster/result-view.css
rename to dom/xslt/tests/buster/result-view.css

rename from content/xslt/tests/buster/result-view.js
rename to dom/xslt/tests/buster/result-view.js

rename from content/xslt/tests/buster/result-view.xul
rename to dom/xslt/tests/buster/result-view.xul

rename from content/xslt/tests/buster/xslt-qa-overlay.js
rename to dom/xslt/tests/buster/xslt-qa-overlay.js

rename from content/xslt/tests/buster/xslt-qa-overlay.xul
rename to dom/xslt/tests/buster/xslt-qa-overlay.xul

rename from content/xslt/tests/mochitest/mochitest.ini
rename to dom/xslt/tests/mochitest/mochitest.ini

rename from content/xslt/tests/mochitest/moz.build
rename to dom/xslt/tests/mochitest/moz.build

rename from content/xslt/tests/mochitest/test_bug319374.xhtml
rename to dom/xslt/tests/mochitest/test_bug319374.xhtml

rename from content/xslt/tests/mochitest/test_bug427060.html
rename to dom/xslt/tests/mochitest/test_bug427060.html

rename from content/xslt/tests/mochitest/test_bug440974.html
rename to dom/xslt/tests/mochitest/test_bug440974.html

rename from content/xslt/tests/mochitest/test_bug453441.html
rename to dom/xslt/tests/mochitest/test_bug453441.html

rename from content/xslt/tests/mochitest/test_bug468208.html
rename to dom/xslt/tests/mochitest/test_bug468208.html

rename from content/xslt/tests/mochitest/test_bug511487.html
rename to dom/xslt/tests/mochitest/test_bug511487.html

rename from content/xslt/tests/mochitest/test_bug551412.html
rename to dom/xslt/tests/mochitest/test_bug551412.html

rename from content/xslt/tests/mochitest/test_bug551654.html
rename to dom/xslt/tests/mochitest/test_bug551654.html

rename from content/xslt/tests/mochitest/test_bug566629.html
rename to dom/xslt/tests/mochitest/test_bug566629.html

rename from content/xslt/tests/mochitest/test_bug566629.xhtml
rename to dom/xslt/tests/mochitest/test_bug566629.xhtml

rename from content/xslt/tests/mochitest/test_bug603159.html
rename to dom/xslt/tests/mochitest/test_bug603159.html

rename from content/xslt/tests/mochitest/test_bug616774.html
rename to dom/xslt/tests/mochitest/test_bug616774.html

rename from content/xslt/tests/mochitest/test_bug667315.html
rename to dom/xslt/tests/mochitest/test_bug667315.html

rename from content/xslt/tests/mochitest/test_exslt_regex.html
rename to dom/xslt/tests/mochitest/test_exslt_regex.html

rename from content/xslt/public/txIEXSLTRegExFunctions.idl
rename to dom/xslt/txIEXSLTRegExFunctions.idl

rename from content/xslt/public/txIFunctionEvaluationContext.idl
rename to dom/xslt/txIFunctionEvaluationContext.idl

rename from content/xslt/public/txINodeSet.idl
rename to dom/xslt/txINodeSet.idl

rename from content/xslt/public/txIXPathObject.idl
rename to dom/xslt/txIXPathObject.idl

rename from content/xslt/src/xml/moz.build
rename to dom/xslt/xml/moz.build

rename from content/xslt/src/xml/txXMLParser.cpp
rename to dom/xslt/xml/txXMLParser.cpp

rename from content/xslt/src/xml/txXMLParser.h
rename to dom/xslt/xml/txXMLParser.h

rename from content/xslt/src/xml/txXMLUtils.cpp
rename to dom/xslt/xml/txXMLUtils.cpp

rename from content/xslt/src/xml/txXMLUtils.h
rename to dom/xslt/xml/txXMLUtils.h

rename from content/xslt/src/xpath/XPathEvaluator.cpp
rename to dom/xslt/xpath/XPathEvaluator.cpp

rename from content/xslt/src/xpath/XPathEvaluator.h
rename to dom/xslt/xpath/XPathEvaluator.h

rename from content/xslt/src/xpath/moz.build
rename to dom/xslt/xpath/moz.build

rename from content/xslt/src/xpath/nsXPathExpression.cpp
rename to dom/xslt/xpath/nsXPathExpression.cpp

rename from content/xslt/src/xpath/nsXPathExpression.h
rename to dom/xslt/xpath/nsXPathExpression.h

rename from content/xslt/src/xpath/nsXPathNSResolver.cpp
rename to dom/xslt/xpath/nsXPathNSResolver.cpp

rename from content/xslt/src/xpath/nsXPathNSResolver.h
rename to dom/xslt/xpath/nsXPathNSResolver.h

rename from content/xslt/src/xpath/nsXPathResult.cpp
rename to dom/xslt/xpath/nsXPathResult.cpp

rename from content/xslt/src/xpath/nsXPathResult.h
rename to dom/xslt/xpath/nsXPathResult.h

rename from content/xslt/src/xpath/txBooleanExpr.cpp
rename to dom/xslt/xpath/txBooleanExpr.cpp

rename from content/xslt/src/xpath/txBooleanResult.cpp
rename to dom/xslt/xpath/txBooleanResult.cpp

rename from content/xslt/src/xpath/txCoreFunctionCall.cpp
rename to dom/xslt/xpath/txCoreFunctionCall.cpp

rename from content/xslt/src/xpath/txErrorExpr.cpp
rename to dom/xslt/xpath/txErrorExpr.cpp

rename from content/xslt/src/xpath/txExpr.cpp
rename to dom/xslt/xpath/txExpr.cpp

rename from content/xslt/src/xpath/txExpr.h
rename to dom/xslt/xpath/txExpr.h

rename from content/xslt/src/xpath/txExprLexer.cpp
rename to dom/xslt/xpath/txExprLexer.cpp

rename from content/xslt/src/xpath/txExprLexer.h
rename to dom/xslt/xpath/txExprLexer.h

rename from content/xslt/src/xpath/txExprParser.cpp
rename to dom/xslt/xpath/txExprParser.cpp

rename from content/xslt/src/xpath/txExprParser.h
rename to dom/xslt/xpath/txExprParser.h

rename from content/xslt/src/xpath/txExprResult.h
rename to dom/xslt/xpath/txExprResult.h

rename from content/xslt/src/xpath/txFilterExpr.cpp
rename to dom/xslt/xpath/txFilterExpr.cpp

rename from content/xslt/src/xpath/txForwardContext.cpp
rename to dom/xslt/xpath/txForwardContext.cpp

rename from content/xslt/src/xpath/txForwardContext.h
rename to dom/xslt/xpath/txForwardContext.h

rename from content/xslt/src/xpath/txFunctionCall.cpp
rename to dom/xslt/xpath/txFunctionCall.cpp

rename from content/xslt/src/xpath/txIXPathContext.h
rename to dom/xslt/xpath/txIXPathContext.h

rename from content/xslt/src/xpath/txLiteralExpr.cpp
rename to dom/xslt/xpath/txLiteralExpr.cpp

rename from content/xslt/src/xpath/txLocationStep.cpp
rename to dom/xslt/xpath/txLocationStep.cpp

rename from content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
rename to dom/xslt/xpath/txMozillaXPathTreeWalker.cpp

rename from content/xslt/src/xpath/txNameTest.cpp
rename to dom/xslt/xpath/txNameTest.cpp

rename from content/xslt/src/xpath/txNamedAttributeStep.cpp
rename to dom/xslt/xpath/txNamedAttributeStep.cpp

rename from content/xslt/src/xpath/txNodeSet.cpp
rename to dom/xslt/xpath/txNodeSet.cpp

rename from content/xslt/src/xpath/txNodeSet.h
rename to dom/xslt/xpath/txNodeSet.h

rename from content/xslt/src/xpath/txNodeSetAdaptor.cpp
rename to dom/xslt/xpath/txNodeSetAdaptor.cpp

rename from content/xslt/src/xpath/txNodeSetAdaptor.h
rename to dom/xslt/xpath/txNodeSetAdaptor.h

rename from content/xslt/src/xpath/txNodeSetContext.cpp
rename to dom/xslt/xpath/txNodeSetContext.cpp

rename from content/xslt/src/xpath/txNodeSetContext.h
rename to dom/xslt/xpath/txNodeSetContext.h

rename from content/xslt/src/xpath/txNodeTypeTest.cpp
rename to dom/xslt/xpath/txNodeTypeTest.cpp

rename from content/xslt/src/xpath/txNumberExpr.cpp
rename to dom/xslt/xpath/txNumberExpr.cpp

rename from content/xslt/src/xpath/txNumberResult.cpp
rename to dom/xslt/xpath/txNumberResult.cpp

rename from content/xslt/src/xpath/txPathExpr.cpp
rename to dom/xslt/xpath/txPathExpr.cpp

rename from content/xslt/src/xpath/txPredicateList.cpp
rename to dom/xslt/xpath/txPredicateList.cpp

rename from content/xslt/src/xpath/txPredicatedNodeTest.cpp
rename to dom/xslt/xpath/txPredicatedNodeTest.cpp

rename from content/xslt/src/xpath/txRelationalExpr.cpp
rename to dom/xslt/xpath/txRelationalExpr.cpp

rename from content/xslt/src/xpath/txResultRecycler.cpp
rename to dom/xslt/xpath/txResultRecycler.cpp

rename from content/xslt/src/xpath/txResultRecycler.h
rename to dom/xslt/xpath/txResultRecycler.h

rename from content/xslt/src/xpath/txRootExpr.cpp
rename to dom/xslt/xpath/txRootExpr.cpp

rename from content/xslt/src/xpath/txSingleNodeContext.h
rename to dom/xslt/xpath/txSingleNodeContext.h

rename from content/xslt/src/xpath/txStringResult.cpp
rename to dom/xslt/xpath/txStringResult.cpp

rename from content/xslt/src/xpath/txUnaryExpr.cpp
rename to dom/xslt/xpath/txUnaryExpr.cpp

rename from content/xslt/src/xpath/txUnionExpr.cpp
rename to dom/xslt/xpath/txUnionExpr.cpp

rename from content/xslt/src/xpath/txUnionNodeTest.cpp
rename to dom/xslt/xpath/txUnionNodeTest.cpp

rename from content/xslt/src/xpath/txVariableRefExpr.cpp
rename to dom/xslt/xpath/txVariableRefExpr.cpp

rename from content/xslt/src/xpath/txXPCOMExtensionFunction.cpp
rename to dom/xslt/xpath/txXPCOMExtensionFunction.cpp

rename from content/xslt/src/xpath/txXPathNode.h
rename to dom/xslt/xpath/txXPathNode.h

rename from content/xslt/src/xpath/txXPathObjectAdaptor.h
rename to dom/xslt/xpath/txXPathObjectAdaptor.h

rename from content/xslt/src/xpath/txXPathOptimizer.cpp
rename to dom/xslt/xpath/txXPathOptimizer.cpp

rename from content/xslt/src/xpath/txXPathOptimizer.h
rename to dom/xslt/xpath/txXPathOptimizer.h

rename from content/xslt/src/xpath/txXPathTreeWalker.h
rename to dom/xslt/xpath/txXPathTreeWalker.h

rename from content/xslt/src/xslt/moz.build
rename to dom/xslt/xslt/moz.build

rename from content/xslt/src/xslt/txBufferingHandler.cpp
rename to dom/xslt/xslt/txBufferingHandler.cpp

rename from content/xslt/src/xslt/txBufferingHandler.h
rename to dom/xslt/xslt/txBufferingHandler.h

rename from content/xslt/src/xslt/txCurrentFunctionCall.cpp
rename to dom/xslt/xslt/txCurrentFunctionCall.cpp

rename from content/xslt/src/xslt/txDocumentFunctionCall.cpp
rename to dom/xslt/xslt/txDocumentFunctionCall.cpp

rename from content/xslt/src/xslt/txEXSLTFunctions.cpp
rename to dom/xslt/xslt/txEXSLTFunctions.cpp

rename from content/xslt/src/xslt/txEXSLTRegExFunctions.js
rename to dom/xslt/xslt/txEXSLTRegExFunctions.js

rename from content/xslt/src/xslt/txEXSLTRegExFunctions.manifest
rename to dom/xslt/xslt/txEXSLTRegExFunctions.manifest

rename from content/xslt/src/xslt/txExecutionState.cpp
rename to dom/xslt/xslt/txExecutionState.cpp

rename from content/xslt/src/xslt/txExecutionState.h
rename to dom/xslt/xslt/txExecutionState.h

rename from content/xslt/src/xslt/txFormatNumberFunctionCall.cpp
rename to dom/xslt/xslt/txFormatNumberFunctionCall.cpp

rename from content/xslt/src/xslt/txGenerateIdFunctionCall.cpp
rename to dom/xslt/xslt/txGenerateIdFunctionCall.cpp

rename from content/xslt/src/xslt/txInstructions.cpp
rename to dom/xslt/xslt/txInstructions.cpp

rename from content/xslt/src/xslt/txInstructions.h
rename to dom/xslt/xslt/txInstructions.h

rename from content/xslt/src/xslt/txKey.h
rename to dom/xslt/xslt/txKey.h

rename from content/xslt/src/xslt/txKeyFunctionCall.cpp
rename to dom/xslt/xslt/txKeyFunctionCall.cpp

rename from content/xslt/src/xslt/txMozillaStylesheetCompiler.cpp
rename to dom/xslt/xslt/txMozillaStylesheetCompiler.cpp

rename from content/xslt/src/xslt/txMozillaTextOutput.cpp
rename to dom/xslt/xslt/txMozillaTextOutput.cpp

rename from content/xslt/src/xslt/txMozillaTextOutput.h
rename to dom/xslt/xslt/txMozillaTextOutput.h

rename from content/xslt/src/xslt/txMozillaXMLOutput.cpp
rename to dom/xslt/xslt/txMozillaXMLOutput.cpp

rename from content/xslt/src/xslt/txMozillaXMLOutput.h
rename to dom/xslt/xslt/txMozillaXMLOutput.h

rename from content/xslt/src/xslt/txMozillaXSLTProcessor.cpp
rename to dom/xslt/xslt/txMozillaXSLTProcessor.cpp

rename from content/xslt/src/xslt/txMozillaXSLTProcessor.h
rename to dom/xslt/xslt/txMozillaXSLTProcessor.h

rename from content/xslt/src/xslt/txNodeSorter.cpp
rename to dom/xslt/xslt/txNodeSorter.cpp

rename from content/xslt/src/xslt/txNodeSorter.h
rename to dom/xslt/xslt/txNodeSorter.h

rename from content/xslt/src/xslt/txOutputFormat.cpp
rename to dom/xslt/xslt/txOutputFormat.cpp

rename from content/xslt/src/xslt/txOutputFormat.h
rename to dom/xslt/xslt/txOutputFormat.h

rename from content/xslt/src/xslt/txPatternOptimizer.cpp
rename to dom/xslt/xslt/txPatternOptimizer.cpp

rename from content/xslt/src/xslt/txPatternOptimizer.h
rename to dom/xslt/xslt/txPatternOptimizer.h

rename from content/xslt/src/xslt/txPatternParser.cpp
rename to dom/xslt/xslt/txPatternParser.cpp

rename from content/xslt/src/xslt/txPatternParser.h
rename to dom/xslt/xslt/txPatternParser.h

rename from content/xslt/src/xslt/txRtfHandler.cpp
rename to dom/xslt/xslt/txRtfHandler.cpp

rename from content/xslt/src/xslt/txRtfHandler.h
rename to dom/xslt/xslt/txRtfHandler.h

rename from content/xslt/src/xslt/txStylesheet.cpp
rename to dom/xslt/xslt/txStylesheet.cpp

rename from content/xslt/src/xslt/txStylesheet.h
rename to dom/xslt/xslt/txStylesheet.h

rename from content/xslt/src/xslt/txStylesheetCompileHandlers.cpp
rename to dom/xslt/xslt/txStylesheetCompileHandlers.cpp

rename from content/xslt/src/xslt/txStylesheetCompileHandlers.h
rename to dom/xslt/xslt/txStylesheetCompileHandlers.h

rename from content/xslt/src/xslt/txStylesheetCompiler.cpp
rename to dom/xslt/xslt/txStylesheetCompiler.cpp

rename from content/xslt/src/xslt/txStylesheetCompiler.h
rename to dom/xslt/xslt/txStylesheetCompiler.h

rename from content/xslt/src/xslt/txTextHandler.cpp
rename to dom/xslt/xslt/txTextHandler.cpp

rename from content/xslt/src/xslt/txTextHandler.h
rename to dom/xslt/xslt/txTextHandler.h

rename from content/xslt/src/xslt/txToplevelItems.cpp
rename to dom/xslt/xslt/txToplevelItems.cpp

rename from content/xslt/src/xslt/txToplevelItems.h
rename to dom/xslt/xslt/txToplevelItems.h

rename from content/xslt/src/xslt/txUnknownHandler.cpp
rename to dom/xslt/xslt/txUnknownHandler.cpp

rename from content/xslt/src/xslt/txUnknownHandler.h
rename to dom/xslt/xslt/txUnknownHandler.h

rename from content/xslt/src/xslt/txVariableMap.h
rename to dom/xslt/xslt/txVariableMap.h

rename from content/xslt/src/xslt/txXMLEventHandler.h
rename to dom/xslt/xslt/txXMLEventHandler.h

rename from content/xslt/src/xslt/txXPathResultComparator.cpp
rename to dom/xslt/xslt/txXPathResultComparator.cpp

rename from content/xslt/src/xslt/txXPathResultComparator.h
rename to dom/xslt/xslt/txXPathResultComparator.h

rename from content/xslt/src/xslt/txXSLTEnvironmentFunctionCall.cpp
rename to dom/xslt/xslt/txXSLTEnvironmentFunctionCall.cpp

rename from content/xslt/src/xslt/txXSLTFunctions.h
rename to dom/xslt/xslt/txXSLTFunctions.h

rename from content/xslt/src/xslt/txXSLTNumber.cpp
rename to dom/xslt/xslt/txXSLTNumber.cpp

rename from content/xslt/src/xslt/txXSLTNumber.h
rename to dom/xslt/xslt/txXSLTNumber.h

rename from content/xslt/src/xslt/txXSLTNumberCounters.cpp
rename to dom/xslt/xslt/txXSLTNumberCounters.cpp

rename from content/xslt/src/xslt/txXSLTPatterns.cpp
rename to dom/xslt/xslt/txXSLTPatterns.cpp

rename from content/xslt/src/xslt/txXSLTPatterns.h
rename to dom/xslt/xslt/txXSLTPatterns.h

rename from content/xslt/src/xslt/txXSLTProcessor.cpp
rename to dom/xslt/xslt/txXSLTProcessor.cpp

rename from content/xslt/src/xslt/txXSLTProcessor.h
rename to dom/xslt/xslt/txXSLTProcessor.h

--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -41,36 +41,36 @@ LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
     '/content/canvas/src',
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/svg/content/src',
     '/content/xbl/src',
-    '/content/xslt/src/base',
-    '/content/xslt/src/xml',
-    '/content/xslt/src/xpath',
-    '/content/xslt/src/xslt',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/content/xul/templates/src',
     '/docshell/base',
     '/dom/audiochannel',
     '/dom/base',
     '/dom/camera',
     '/dom/file',
     '/dom/media',
     '/dom/speakermanager',
     '/dom/src/geolocation',
     '/dom/src/json',
     '/dom/src/jsurl',
     '/dom/src/offline',
     '/dom/src/storage',
     '/dom/telephony',
+    '/dom/xslt/base',
+    '/dom/xslt/xml',
+    '/dom/xslt/xpath',
+    '/dom/xslt/xslt',
     '/editor/composer/src',
     '/editor/libeditor/base',
     '/editor/libeditor/html',
     '/editor/libeditor/text',
     '/editor/txmgr/src',
     '/editor/txtsvc/src',
     '/extensions/cookie',
     '/js/xpconnect/loader',

--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -10,30 +10,30 @@ include ../../content/canvas/crashtests/
 include ../../content/events/crashtests/crashtests.list
 include ../../content/html/document/crashtests/crashtests.list
 include ../../content/html/content/crashtests/crashtests.list
 include ../../content/smil/crashtests/crashtests.list
 include ../../content/svg/content/src/crashtests/crashtests.list
 include ../../content/xml/content/crashtest/crashtests.list
 include ../../content/xml/document/crashtests/crashtests.list
 include ../../content/xbl/crashtests/crashtests.list
-include ../../content/xslt/crashtests/crashtests.list
 include ../../content/xul/content/crashtests/crashtests.list
 include ../../content/xul/document/crashtests/crashtests.list
 include ../../content/xul/templates/src/crashtests/crashtests.list
 include ../../content/mathml/content/crashtests/crashtests.list
 
 # Bug 868152 - webaudio crash on tegra platform
 skip-if(Android) include ../../content/media/test/crashtests/crashtests.list
 
 include ../../docshell/base/crashtests/crashtests.list
 
 include ../../dom/base/crashtests/crashtests.list
 include ../../dom/bindings/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
+include ../../dom/xslt/crashtests/crashtests.list
 
 # Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
 skip-if(B2G||browserIsRemote) include ../../dom/media/tests/crashtests/crashtests.list
 
 include ../../dom/src/offline/crashtests/crashtests.list
 include ../../dom/src/jsurl/crashtests/crashtests.list
 
 include ../../editor/crashtests.list