diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h
index c8bd361..150e49e 100644
--- a/DirectXTex/DirectXTex.h
+++ b/DirectXTex/DirectXTex.h
@@ -25,8 +25,11 @@
 #include <algorithm>
 #include <functional>
 
-#include <dxgiformat.h>
+#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
+#include <d3d11_1.h>
+#else
 #include <d3d11.h>
+#endif
 
 #include <ocidl.h>
 
diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h
index 2b898bb..0a7b623 100644
--- a/DirectXTex/DirectXTexP.h
+++ b/DirectXTex/DirectXTexP.h
@@ -43,6 +43,8 @@
 
 #include <ole2.h>
 
+#include "directxtex.h"
+
 #if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) || defined(_WIN7_PLATFORM_UPDATE)
 #include <d2d1.h>
 #endif
@@ -56,8 +58,6 @@
 #define DXGI_1_2_FORMATS
 #endif
 
-#include "directxtex.h"
-
 #include "scoped.h"
 
 struct IWICImagingFactory;