diff --git a/DirectXTex/DirectXTexConvert.cpp b/DirectXTex/DirectXTexConvert.cpp
index 37dbf47..c9f9b81 100644
--- a/DirectXTex/DirectXTexConvert.cpp
+++ b/DirectXTex/DirectXTexConvert.cpp
@@ -4531,7 +4531,7 @@ namespace
         assert(srcImage.height == destImage.height);
 
         bool iswic2 = false;
-        IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+        auto pWIC = GetWICFactory(iswic2);
         if (!pWIC)
             return E_NOINTERFACE;
 
diff --git a/DirectXTex/DirectXTexFlipRotate.cpp b/DirectXTex/DirectXTexFlipRotate.cpp
index 25eeeb5..f2b1ff3 100644
--- a/DirectXTex/DirectXTexFlipRotate.cpp
+++ b/DirectXTex/DirectXTexFlipRotate.cpp
@@ -31,7 +31,7 @@ namespace
         assert(srcImage.format == destImage.format);
 
         bool iswic2 = false;
-        IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+        auto pWIC = GetWICFactory(iswic2);
         if (!pWIC)
             return E_NOINTERFACE;
 
diff --git a/DirectXTex/DirectXTexMipmaps.cpp b/DirectXTex/DirectXTexMipmaps.cpp
index 5e68d4c..1fc3785 100644
--- a/DirectXTex/DirectXTexMipmaps.cpp
+++ b/DirectXTex/DirectXTexMipmaps.cpp
@@ -700,7 +700,7 @@ namespace
             return E_POINTER;
 
         bool iswic2 = false;
-        IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+        auto pWIC = GetWICFactory(iswic2);
         if (!pWIC)
             return E_NOINTERFACE;
 
diff --git a/DirectXTex/DirectXTexResize.cpp b/DirectXTex/DirectXTexResize.cpp
index c3208d4..0a0d5dc 100644
--- a/DirectXTex/DirectXTexResize.cpp
+++ b/DirectXTex/DirectXTexResize.cpp
@@ -37,7 +37,7 @@ namespace
         assert(srcImage.format == destImage.format);
 
         bool iswic2 = false;
-        IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+        auto pWIC = GetWICFactory(iswic2);
         if (!pWIC)
             return E_NOINTERFACE;
 
diff --git a/DirectXTex/DirectXTexWIC.cpp b/DirectXTex/DirectXTexWIC.cpp
index 4d38d12..ff231b1 100644
--- a/DirectXTex/DirectXTexWIC.cpp
+++ b/DirectXTex/DirectXTexWIC.cpp
@@ -395,7 +395,7 @@ namespace
             return E_POINTER;
 
         bool iswic2 = false;
-        IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+        auto pWIC = GetWICFactory(iswic2);
         if (!pWIC)
             return E_NOINTERFACE;
 
@@ -457,7 +457,7 @@ namespace
             return hr;
 
         bool iswic2 = false;
-        IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+        auto pWIC = GetWICFactory(iswic2);
         if (!pWIC)
             return E_NOINTERFACE;
 
@@ -733,7 +733,7 @@ namespace
         {
             // Conversion required to write
             bool iswic2 = false;
-            IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+            auto pWIC = GetWICFactory(iswic2);
             if (!pWIC)
                 return E_NOINTERFACE;
 
@@ -794,7 +794,7 @@ namespace
 
         // Initialize WIC
         bool iswic2 = false;
-        IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+        auto pWIC = GetWICFactory(iswic2);
         if (!pWIC)
             return E_NOINTERFACE;
 
@@ -862,7 +862,7 @@ namespace
 
         // Initialize WIC
         bool iswic2 = false;
-        IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+        auto pWIC = GetWICFactory(iswic2);
         if (!pWIC)
             return E_NOINTERFACE;
 
@@ -937,7 +937,7 @@ HRESULT DirectX::GetMetadataFromWICMemory(
         return HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE);
 
     bool iswic2 = false;
-    IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+    auto pWIC = GetWICFactory(iswic2);
     if (!pWIC)
         return E_NOINTERFACE;
 
@@ -986,7 +986,7 @@ HRESULT DirectX::GetMetadataFromWICFile(
         return E_INVALIDARG;
 
     bool iswic2 = false;
-    IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+    auto pWIC = GetWICFactory(iswic2);
     if (!pWIC)
         return E_NOINTERFACE;
 
@@ -1029,7 +1029,7 @@ HRESULT DirectX::LoadFromWICMemory(
         return HRESULT_FROM_WIN32(ERROR_FILE_TOO_LARGE);
 
     bool iswic2 = false;
-    IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+    auto pWIC = GetWICFactory(iswic2);
     if (!pWIC)
         return E_NOINTERFACE;
 
@@ -1100,7 +1100,7 @@ HRESULT DirectX::LoadFromWICFile(
         return E_INVALIDARG;
 
     bool iswic2 = false;
-    IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+    auto pWIC = GetWICFactory(iswic2);
     if (!pWIC)
         return E_NOINTERFACE;
 
@@ -1278,7 +1278,7 @@ HRESULT DirectX::SaveToWICFile(
         return E_POINTER;
 
     bool iswic2 = false;
-    IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+    auto pWIC = GetWICFactory(iswic2);
     if (!pWIC)
         return E_NOINTERFACE;
 
@@ -1316,7 +1316,7 @@ HRESULT DirectX::SaveToWICFile(
         return E_INVALIDARG;
 
     bool iswic2 = false;
-    IWICImagingFactory* pWIC = GetWICFactory(iswic2);
+    auto pWIC = GetWICFactory(iswic2);
     if (!pWIC)
         return E_NOINTERFACE;