diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39ae044..1b97650 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,6 +144,7 @@ if ((NOT WIN32) OR VCPKG_TOOLCHAIN)
     find_package(directx-headers CONFIG REQUIRED)
     find_package(directxmath CONFIG REQUIRED)
     target_link_libraries(${PROJECT_NAME} PRIVATE Microsoft::DirectX-Headers Microsoft::DirectXMath)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE USING_DIRECTX_HEADERS)
 endif()
 
 #--- Package
diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h
index e66383f..ff5e92e 100644
--- a/DirectXTex/DirectXTex.h
+++ b/DirectXTex/DirectXTex.h
@@ -29,7 +29,7 @@
 #include <d3d11_1.h>
 #endif
 #endif
-#else
+#else // !WIN32
 #include <directx/dxgiformat.h>
 #include <wsl/winadapter.h>
 #endif
diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h
index 529a759..bb5a223 100644
--- a/DirectXTex/DirectXTexP.h
+++ b/DirectXTex/DirectXTexP.h
@@ -100,7 +100,12 @@
 #include <d3d12_x.h>
 #include <d3d11_x.h>
 #elif (_WIN32_WINNT >= _WIN32_WINNT_WIN10)
+#ifdef USING_DIRECTX_HEADERS
+#include <directx/dxgiformat.h>
+#include <directx/d3d12.h>
+#else
 #include <d3d12.h>
+#endif
 #include <d3d11_4.h>
 #else
 #include <d3d11_1.h>