diff --git a/dom/xslt/base/txExpandedNameMap.h b/dom/xslt/base/txExpandedNameMap.h
index a925192078aa..38e3731863c1 100644
--- a/dom/xslt/base/txExpandedNameMap.h
+++ b/dom/xslt/base/txExpandedNameMap.h
@@ -6,7 +6,7 @@
 #ifndef TRANSFRMX_EXPANDEDNAMEMAP_H
 #define TRANSFRMX_EXPANDEDNAMEMAP_H
 
-#include "nsAutoPtr.h"
+#include "mozilla/UniquePtr.h"
 #include "nsError.h"
 #include "txExpandedName.h"
 #include "nsTArray.h"
diff --git a/dom/xslt/xpath/XPathExpression.h b/dom/xslt/xpath/XPathExpression.h
index e9ad29f2c9d1..e2f55c8b1276 100644
--- a/dom/xslt/xpath/XPathExpression.h
+++ b/dom/xslt/xpath/XPathExpression.h
@@ -6,12 +6,12 @@
 #ifndef mozilla_dom_XPathExpression_h
 #define mozilla_dom_XPathExpression_h
 
-#include "nsAutoPtr.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsIWeakReferenceUtils.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/NonRefcountedDOMObject.h"
 #include "mozilla/dom/XPathExpressionBinding.h"
+#include "mozilla/UniquePtr.h"
 
 class Expr;
 
diff --git a/dom/xslt/xpath/txExpr.h b/dom/xslt/xpath/txExpr.h
index b4c4efcf330c..57d773cf2a44 100644
--- a/dom/xslt/xpath/txExpr.h
+++ b/dom/xslt/xpath/txExpr.h
@@ -7,7 +7,7 @@
 #define TRANSFRMX_EXPR_H
 
 #include "mozilla/Attributes.h"
-#include "nsAutoPtr.h"
+#include "mozilla/UniquePtr.h"
 #include "txExprResult.h"
 #include "txCore.h"
 #include "nsString.h"
diff --git a/dom/xslt/xpath/txExprParser.h b/dom/xslt/xpath/txExprParser.h
index 33692df62b49..a8f843e3bfab 100644
--- a/dom/xslt/xpath/txExprParser.h
+++ b/dom/xslt/xpath/txExprParser.h
@@ -13,7 +13,7 @@
 #define MITREXSL_EXPRPARSER_H
 
 #include "txCore.h"
-#include "nsAutoPtr.h"
+#include "mozilla/UniquePtr.h"
 #include "nsString.h"
 
 class Expr;
diff --git a/dom/xslt/xslt/txBufferingHandler.h b/dom/xslt/xslt/txBufferingHandler.h
index f4c788152686..e8a74ed9b874 100644
--- a/dom/xslt/xslt/txBufferingHandler.h
+++ b/dom/xslt/xslt/txBufferingHandler.h
@@ -6,10 +6,10 @@
 #ifndef txBufferingHandler_h__
 #define txBufferingHandler_h__
 
+#include "mozilla/UniquePtr.h"
 #include "txXMLEventHandler.h"
 #include "nsString.h"
 #include "nsTArray.h"
-#include "nsAutoPtr.h"
 
 class txOutputTransaction;
 
diff --git a/dom/xslt/xslt/txInstructions.h b/dom/xslt/xslt/txInstructions.h
index 06eda7249dd5..7cff43ffe303 100644
--- a/dom/xslt/xslt/txInstructions.h
+++ b/dom/xslt/xslt/txInstructions.h
@@ -6,13 +6,13 @@
 #ifndef TRANSFRMX_TXINSTRUCTIONS_H
 #define TRANSFRMX_TXINSTRUCTIONS_H
 
+#include "mozilla/UniquePtr.h"
 #include "nsCOMPtr.h"
 #include "txCore.h"
 #include "nsString.h"
 #include "txXMLUtils.h"
 #include "txExpandedName.h"
 #include "txNamespaceMap.h"
-#include "nsAutoPtr.h"
 #include "txXSLTNumber.h"
 #include "nsTArray.h"
 
diff --git a/dom/xslt/xslt/txStylesheetCompiler.h b/dom/xslt/xslt/txStylesheetCompiler.h
index af0e8c05855d..02cafd0567c2 100644
--- a/dom/xslt/xslt/txStylesheetCompiler.h
+++ b/dom/xslt/xslt/txStylesheetCompiler.h
@@ -7,11 +7,11 @@
 #define TRANSFRMX_TXSTYLESHEETCOMPILER_H
 
 #include "mozilla/Attributes.h"
+#include "mozilla/UniquePtr.h"
 #include "txStack.h"
 #include "txXSLTPatterns.h"
 #include "txExpr.h"
 #include "txIXPathContext.h"
-#include "nsAutoPtr.h"
 #include "txStylesheet.h"
 #include "nsTArray.h"
 
diff --git a/dom/xslt/xslt/txXSLTFunctions.h b/dom/xslt/xslt/txXSLTFunctions.h
index c2042e52770a..4b7401eb8369 100644
--- a/dom/xslt/xslt/txXSLTFunctions.h
+++ b/dom/xslt/xslt/txXSLTFunctions.h
@@ -6,9 +6,9 @@
 #ifndef TRANSFRMX_XSLT_FUNCTIONS_H
 #define TRANSFRMX_XSLT_FUNCTIONS_H
 
+#include "mozilla/UniquePtr.h"
 #include "txExpr.h"
 #include "txXMLUtils.h"
-#include "nsAutoPtr.h"
 #include "txNamespaceMap.h"
 
 class txStylesheet;