diff --git a/Common/Gfx/CanvasD2D.cpp b/Common/Gfx/CanvasD2D.cpp
index f0009359..52903fba 100644
--- a/Common/Gfx/CanvasD2D.cpp
+++ b/Common/Gfx/CanvasD2D.cpp
@@ -44,8 +44,8 @@ D2D1_RECT_F ToRectF(const Gdiplus::RectF& rect)
 namespace Gfx {
 
 UINT CanvasD2D::c_Instances = 0;
-Microsoft::WRL::ComPtr<ID2D1Factory> CanvasD2D::c_D2DFactory;
-Microsoft::WRL::ComPtr<IDWriteFactory> CanvasD2D::c_DWFactory;
+Microsoft::WRL::ComPtr<ID2D1Factory1> CanvasD2D::c_D2DFactory;
+Microsoft::WRL::ComPtr<IDWriteFactory1> CanvasD2D::c_DWFactory;
 Microsoft::WRL::ComPtr<IDWriteGdiInterop> CanvasD2D::c_DWGDIInterop;
 Microsoft::WRL::ComPtr<IWICImagingFactory> CanvasD2D::c_WICFactory;
 
@@ -110,8 +110,11 @@ void CanvasD2D::Finalize()
 		c_WICFactory.Reset();
 		c_DWGDIInterop.Reset();
 
-		c_DWFactory->UnregisterFontCollectionLoader(Util::DWriteFontCollectionLoader::GetInstance());
-		c_DWFactory.Reset();
+		if (c_DWFactory)
+		{
+			c_DWFactory->UnregisterFontCollectionLoader(Util::DWriteFontCollectionLoader::GetInstance());
+			c_DWFactory.Reset();
+		}
 	}
 }
 
diff --git a/Common/Gfx/CanvasD2D.h b/Common/Gfx/CanvasD2D.h
index a4841d59..1c889355 100644
--- a/Common/Gfx/CanvasD2D.h
+++ b/Common/Gfx/CanvasD2D.h
@@ -26,7 +26,7 @@
 #include <memory>
 #include <string>
 #include <GdiPlus.h>
-#include <d2d1.h>
+#include <d2d1_1.h>
 #include <d2d1helper.h>
 #include <dwrite_1.h>
 #include <wincodec.h>
@@ -99,8 +99,8 @@ private:
 	bool m_TextAntiAliasing;
 
 	static UINT c_Instances;
-	static Microsoft::WRL::ComPtr<ID2D1Factory> c_D2DFactory;
-	static Microsoft::WRL::ComPtr<IDWriteFactory> c_DWFactory;
+	static Microsoft::WRL::ComPtr<ID2D1Factory1> c_D2DFactory;
+	static Microsoft::WRL::ComPtr<IDWriteFactory1> c_DWFactory;
 	static Microsoft::WRL::ComPtr<IDWriteGdiInterop> c_DWGDIInterop;
 	static Microsoft::WRL::ComPtr<IWICImagingFactory> c_WICFactory;
 };
diff --git a/Common/Gfx/FontCollectionD2D.h b/Common/Gfx/FontCollectionD2D.h
index c434fa10..e59cca94 100644
--- a/Common/Gfx/FontCollectionD2D.h
+++ b/Common/Gfx/FontCollectionD2D.h
@@ -21,7 +21,7 @@
 
 #include "FontCollection.h"
 #include <vector>
-#include <dwrite.h>
+#include <dwrite_1.h>
 
 namespace Gfx {
 
diff --git a/Common/Gfx/TextFormatD2D.h b/Common/Gfx/TextFormatD2D.h
index 86fd791a..d37e55b1 100644
--- a/Common/Gfx/TextFormatD2D.h
+++ b/Common/Gfx/TextFormatD2D.h
@@ -21,7 +21,7 @@
 
 #include "TextFormat.h"
 #include <string>
-#include <dwrite.h>
+#include <dwrite_1.h>
 #include <wrl/client.h>
 
 namespace Gfx {
diff --git a/Common/Gfx/Util/DWriteFontCollectionLoader.h b/Common/Gfx/Util/DWriteFontCollectionLoader.h
index 0889a85f..16ab2b36 100644
--- a/Common/Gfx/Util/DWriteFontCollectionLoader.h
+++ b/Common/Gfx/Util/DWriteFontCollectionLoader.h
@@ -19,7 +19,7 @@
 #ifndef RM_GFX_UTIL_DWRITEFONTCOLLECTIONLOADER_H_
 #define RM_GFX_UTIL_DWRITEFONTCOLLECTIONLOADER_H_
 
-#include <dwrite.h>
+#include <dwrite_1.h>
 
 namespace Gfx {
 namespace Util {
diff --git a/Common/Gfx/Util/DWriteFontFileEnumerator.h b/Common/Gfx/Util/DWriteFontFileEnumerator.h
index 77d2d494..d01c9187 100644
--- a/Common/Gfx/Util/DWriteFontFileEnumerator.h
+++ b/Common/Gfx/Util/DWriteFontFileEnumerator.h
@@ -20,7 +20,7 @@
 #define RM_GFX_UTIL_DWRITEFONTFILEENUMERATOR_H_
 
 #include <vector>
-#include <dwrite.h>
+#include <dwrite_1.h>
 
 namespace Gfx {
 namespace Util {
diff --git a/Common/Gfx/Util/DWriteHelpers.h b/Common/Gfx/Util/DWriteHelpers.h
index 4ff00413..1140e2a5 100644
--- a/Common/Gfx/Util/DWriteHelpers.h
+++ b/Common/Gfx/Util/DWriteHelpers.h
@@ -19,7 +19,7 @@
 #ifndef RM_GFX_UTIL_DWRITEHELPERS_H_
 #define RM_GFX_UTIL_DWRITEHELPERS_H_
 
-#include <dwrite.h>
+#include <dwrite_1.h>
 
 namespace Gfx {
 namespace Util {