Renamed .h -> .hpp in GraphicsEngine, GraphicsEngineD3DBase, GraphicsEningeD3D11, and GraphicsEningeD3D12 projects

58 files changed, 197 insertions, 197 deletions

diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
index a8b744e8..fa3b4b70 100644
--- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
@@ -3,38 +3,38 @@ cmake_minimum_required (VERSION 3.10)
 project(Diligent-GraphicsEngineD3D12 CXX)
 
 set(INCLUDE 
-    include/BufferD3D12Impl.h
-    include/BufferViewD3D12Impl.h
-    include/CommandContext.h
-    include/CommandListD3D12Impl.h
-    include/CommandListManager.h
-    include/CommandQueueD3D12Impl.h
-    include/D3D12ResourceBase.h
+    include/BufferD3D12Impl.hpp
+    include/BufferViewD3D12Impl.hpp
+    include/CommandContext.hpp
+    include/CommandListD3D12Impl.hpp
+    include/CommandListManager.hpp
+    include/CommandQueueD3D12Impl.hpp
+    include/D3D12ResourceBase.hpp
     include/D3D12TypeConversions.h
     include/D3D12TypeDefinitions.h
     include/D3D12Utils.h
     include/d3dx12_win.h
-    include/DescriptorHeap.h
-    include/DeviceContextD3D12Impl.h
-    include/D3D12DynamicHeap.h
-    include/FenceD3D12Impl.h
-    include/GenerateMips.h
+    include/DescriptorHeap.hpp
+    include/DeviceContextD3D12Impl.hpp
+    include/D3D12DynamicHeap.hpp
+    include/FenceD3D12Impl.hpp
+    include/GenerateMips.hpp
     include/pch.h
-    include/PipelineStateD3D12Impl.h
-    include/QueryD3D12Impl.h
-    include/QueryManagerD3D12.h
-    include/RenderDeviceD3D12Impl.h
-    include/RootSignature.h
-    include/SamplerD3D12Impl.h
-    include/ShaderD3D12Impl.h
-    include/ShaderResourceBindingD3D12Impl.h
-    include/ShaderResourceCacheD3D12.h
-    include/ShaderResourceLayoutD3D12.h
-    include/ShaderResourcesD3D12.h
-    include/ShaderVariableD3D12.h
-    include/SwapChainD3D12Impl.h
-    include/TextureD3D12Impl.h
-    include/TextureViewD3D12Impl.h
+    include/PipelineStateD3D12Impl.hpp
+    include/QueryD3D12Impl.hpp
+    include/QueryManagerD3D12.hpp
+    include/RenderDeviceD3D12Impl.hpp
+    include/RootSignature.hpp
+    include/SamplerD3D12Impl.hpp
+    include/ShaderD3D12Impl.hpp
+    include/ShaderResourceBindingD3D12Impl.hpp
+    include/ShaderResourceCacheD3D12.hpp
+    include/ShaderResourceLayoutD3D12.hpp
+    include/ShaderResourcesD3D12.hpp
+    include/ShaderVariableD3D12.hpp
+    include/SwapChainD3D12Impl.hpp
+    include/TextureD3D12Impl.hpp
+    include/TextureViewD3D12Impl.hpp
 )
 
 set(INTERFACE 
@@ -88,7 +88,7 @@ set(SRC
 )
 
 if(PLATFORM_WIN32)
-    list(APPEND INCLUDE include/D3D12Loader.h)
+    list(APPEND INCLUDE include/D3D12Loader.hpp)
     list(APPEND SRC src/D3D12Loader.cpp)
 	set(USE_D3D12_LOADER 1)
 else()
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
index adb24766..70513071 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
@@ -32,11 +32,11 @@
 
 #include "BufferD3D12.h"
 #include "RenderDeviceD3D12.h"
-#include "BufferBase.h"
-#include "BufferViewD3D12Impl.h"
-#include "D3D12ResourceBase.h"
-#include "D3D12DynamicHeap.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "BufferBase.hpp"
+#include "BufferViewD3D12Impl.hpp"
+#include "D3D12ResourceBase.hpp"
+#include "D3D12DynamicHeap.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
index abf715eb..62cb6294 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
@@ -32,9 +32,9 @@
 
 #include "BufferViewD3D12.h"
 #include "RenderDeviceD3D12.h"
-#include "BufferViewBase.h"
-#include "DescriptorHeap.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "BufferViewBase.hpp"
+#include "DescriptorHeap.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/CommandContext.h b/Graphics/GraphicsEngineD3D12/include/CommandContext.hpp
index ed8824c5..30134445 100644
--- a/Graphics/GraphicsEngineD3D12/include/CommandContext.h
+++ b/Graphics/GraphicsEngineD3D12/include/CommandContext.hpp
@@ -30,11 +30,11 @@
 
 #include <vector>
 
-#include "D3D12ResourceBase.h"
+#include "D3D12ResourceBase.hpp"
 #include "TextureViewD3D12.h"
 #include "TextureD3D12.h"
 #include "BufferD3D12.h"
-#include "DescriptorHeap.h"
+#include "DescriptorHeap.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.hpp
index 4066dc63..47319ded 100644
--- a/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/CommandListD3D12Impl.hpp
@@ -30,8 +30,8 @@
 /// \file
 /// Declaration of Diligent::CommandListD3D12Impl class
 
-#include "CommandListBase.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "CommandListBase.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/CommandListManager.h b/Graphics/GraphicsEngineD3D12/include/CommandListManager.hpp
index 6548a637..6548a637 100644
--- a/Graphics/GraphicsEngineD3D12/include/CommandListManager.h
+++ b/Graphics/GraphicsEngineD3D12/include/CommandListManager.hpp
diff --git a/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.hpp
index 478f5139..478f5139 100644
--- a/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/CommandQueueD3D12Impl.hpp
diff --git a/Graphics/GraphicsEngineD3D12/include/D3D12DynamicHeap.h b/Graphics/GraphicsEngineD3D12/include/D3D12DynamicHeap.hpp
index cc0b1a9e..cc0b1a9e 100644
--- a/Graphics/GraphicsEngineD3D12/include/D3D12DynamicHeap.h
+++ b/Graphics/GraphicsEngineD3D12/include/D3D12DynamicHeap.hpp
diff --git a/Graphics/GraphicsEngineD3D12/include/D3D12Loader.h b/Graphics/GraphicsEngineD3D12/include/D3D12Loader.hpp
index 8e5b346d..8e5b346d 100644
--- a/Graphics/GraphicsEngineD3D12/include/D3D12Loader.h
+++ b/Graphics/GraphicsEngineD3D12/include/D3D12Loader.hpp
diff --git a/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.h b/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.hpp
index 240ea165..240ea165 100644
--- a/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.h
+++ b/Graphics/GraphicsEngineD3D12/include/D3D12ResourceBase.hpp
diff --git a/Graphics/GraphicsEngineD3D12/include/DescriptorHeap.h b/Graphics/GraphicsEngineD3D12/include/DescriptorHeap.hpp
index d8108c06..d8108c06 100644
--- a/Graphics/GraphicsEngineD3D12/include/DescriptorHeap.h
+++ b/Graphics/GraphicsEngineD3D12/include/DescriptorHeap.hpp
diff --git a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
index 2253dbc2..6971d8a8 100644
--- a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
@@ -34,11 +34,11 @@
 
 #include "DeviceContextD3D12.h"
 #include "DeviceContextNextGenBase.h"
-#include "BufferD3D12Impl.h"
-#include "TextureD3D12Impl.h"
-#include "QueryD3D12Impl.h"
-#include "PipelineStateD3D12Impl.h"
-#include "D3D12DynamicHeap.h"
+#include "BufferD3D12Impl.hpp"
+#include "TextureD3D12Impl.hpp"
+#include "QueryD3D12Impl.hpp"
+#include "PipelineStateD3D12Impl.hpp"
+#include "D3D12DynamicHeap.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
index cacc1e11..1549e584 100644
--- a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
@@ -32,8 +32,8 @@
 
 #include "FenceD3D12.h"
 #include "RenderDeviceD3D12.h"
-#include "FenceBase.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "FenceBase.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/GenerateMips.h b/Graphics/GraphicsEngineD3D12/include/GenerateMips.hpp
index a62f9665..a62f9665 100644
--- a/Graphics/GraphicsEngineD3D12/include/GenerateMips.h
+++ b/Graphics/GraphicsEngineD3D12/include/GenerateMips.hpp
diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
index d23d54e1..9431d2f4 100644
--- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
@@ -32,12 +32,12 @@
 
 #include "RenderDeviceD3D12.h"
 #include "PipelineStateD3D12.h"
-#include "PipelineStateBase.h"
-#include "RootSignature.h"
-#include "ShaderResourceLayoutD3D12.h"
+#include "PipelineStateBase.hpp"
+#include "RootSignature.hpp"
+#include "ShaderResourceLayoutD3D12.hpp"
 #include "SRBMemoryAllocator.hpp"
-#include "RenderDeviceD3D12Impl.h"
-#include "ShaderVariableD3D12.h"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "ShaderVariableD3D12.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
index 0c47565e..129e0307 100644
--- a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
@@ -31,8 +31,8 @@
 /// Declaration of Diligent::QueryD3D12Impl class
 
 #include "QueryD3D12.h"
-#include "QueryBase.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "QueryBase.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/QueryManagerD3D12.h b/Graphics/GraphicsEngineD3D12/include/QueryManagerD3D12.hpp
index 13337696..13337696 100644
--- a/Graphics/GraphicsEngineD3D12/include/QueryManagerD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/include/QueryManagerD3D12.hpp
diff --git a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp
index 922a4c22..3c4746c8 100644
--- a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp
@@ -30,16 +30,16 @@
 /// \file
 /// Declaration of Diligent::RenderDeviceD3D12Impl class
 #include "RenderDeviceD3D12.h"
-#include "RenderDeviceD3DBase.h"
+#include "RenderDeviceD3DBase.hpp"
 #include "RenderDeviceNextGenBase.h"
-#include "DescriptorHeap.h"
-#include "CommandListManager.h"
-#include "CommandContext.h"
-#include "D3D12DynamicHeap.h"
+#include "DescriptorHeap.hpp"
+#include "CommandListManager.hpp"
+#include "CommandContext.hpp"
+#include "D3D12DynamicHeap.hpp"
 #include "Atomics.h"
 #include "CommandQueueD3D12.h"
-#include "GenerateMips.h"
-#include "QueryManagerD3D12.h"
+#include "GenerateMips.hpp"
+#include "QueryManagerD3D12.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/RootSignature.h b/Graphics/GraphicsEngineD3D12/include/RootSignature.hpp
index fd2aff02..e723896a 100644
--- a/Graphics/GraphicsEngineD3D12/include/RootSignature.h
+++ b/Graphics/GraphicsEngineD3D12/include/RootSignature.hpp
@@ -30,9 +30,9 @@
 /// \file
 /// Declaration of Diligent::RootSignature class
 #include <array>
-#include "ShaderD3DBase.h"
-#include "ShaderResourceLayoutD3D12.h"
-#include "BufferD3D12Impl.h"
+#include "ShaderD3DBase.hpp"
+#include "ShaderResourceLayoutD3D12.hpp"
+#include "BufferD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
index c52f7c17..5633b5dc 100644
--- a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
@@ -32,9 +32,9 @@
 
 #include "SamplerD3D12.h"
 #include "RenderDeviceD3D12.h"
-#include "SamplerBase.h"
-#include "DescriptorHeap.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "SamplerBase.hpp"
+#include "DescriptorHeap.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
index a5be1a03..6eb8e5d8 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
@@ -32,11 +32,11 @@
 
 #include "RenderDeviceD3D12.h"
 #include "ShaderD3D12.h"
-#include "ShaderBase.h"
-#include "ShaderD3DBase.h"
-#include "ShaderResourceLayoutD3D12.h"
-#include "RenderDeviceD3D12Impl.h"
-#include "ShaderVariableD3D12.h"
+#include "ShaderBase.hpp"
+#include "ShaderD3DBase.hpp"
+#include "ShaderResourceLayoutD3D12.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "ShaderVariableD3D12.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
index c89a31e7..2fde8ed1 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
@@ -32,11 +32,11 @@
 
 #include "ShaderResourceBindingD3D12.h"
 #include "RenderDeviceD3D12.h"
-#include "ShaderResourceBindingBase.h"
-#include "ShaderBase.h"
-#include "ShaderResourceCacheD3D12.h"
-#include "ShaderResourceLayoutD3D12.h"
-#include "ShaderVariableD3D12.h"
+#include "ShaderResourceBindingBase.hpp"
+#include "ShaderBase.hpp"
+#include "ShaderResourceCacheD3D12.hpp"
+#include "ShaderResourceLayoutD3D12.hpp"
+#include "ShaderVariableD3D12.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp
index 692214dc..9f24d2d4 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceCacheD3D12.hpp
@@ -83,7 +83,7 @@
 //                 .....       |   DescrptHndl[0]  ...  DescrptHndl[n-1]   |    ....
 //
 
-#include "DescriptorHeap.h"
+#include "DescriptorHeap.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.hpp
index 75c2837f..56889271 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceLayoutD3D12.hpp
@@ -100,9 +100,9 @@
 
 #include <array>
 
-#include "ShaderBase.h"
-#include "ShaderResourcesD3D12.h"
-#include "ShaderResourceCacheD3D12.h"
+#include "ShaderBase.hpp"
+#include "ShaderResourcesD3D12.hpp"
+#include "ShaderResourceCacheD3D12.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourcesD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderResourcesD3D12.hpp
index e9672d10..23f9882b 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderResourcesD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourcesD3D12.hpp
@@ -82,7 +82,7 @@
 // |____________________________|       |___________________________|
 //
 
-#include "ShaderResources.h"
+#include "ShaderResources.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.h b/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.hpp
index f7a1f8c8..749de7f2 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderVariableD3D12.hpp
@@ -64,8 +64,8 @@
 #include <memory>
 
 #include "ShaderResourceVariableD3D.h"
-#include "ShaderResourceLayoutD3D12.h"
-#include "ShaderResourceVariableBase.h"
+#include "ShaderResourceLayoutD3D12.hpp"
+#include "ShaderResourceVariableBase.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp
index 1b833029..0c45d915 100644
--- a/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/SwapChainD3D12Impl.hpp
@@ -32,7 +32,7 @@
 
 #include <dxgi1_4.h>
 #include "SwapChainD3D12.h"
-#include "SwapChainD3DBase.h"
+#include "SwapChainD3DBase.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
index a4ab0b08..7c1c041b 100644
--- a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
@@ -32,10 +32,10 @@
 
 #include "TextureD3D12.h"
 #include "RenderDeviceD3D12.h"
-#include "TextureBase.h"
-#include "TextureViewD3D12Impl.h"
-#include "D3D12ResourceBase.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "TextureBase.hpp"
+#include "TextureViewD3D12Impl.hpp"
+#include "D3D12ResourceBase.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.h b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
index fb8b7499..2c2529ae 100644
--- a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.h
+++ b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
@@ -32,9 +32,9 @@
 
 #include "TextureViewD3D12.h"
 #include "RenderDeviceD3D12.h"
-#include "TextureViewBase.h"
-#include "DescriptorHeap.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "TextureViewBase.hpp"
+#include "DescriptorHeap.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/pch.h b/Graphics/GraphicsEngineD3D12/include/pch.h
index 101ffbdf..1554e6f6 100644
--- a/Graphics/GraphicsEngineD3D12/include/pch.h
+++ b/Graphics/GraphicsEngineD3D12/include/pch.h
@@ -50,13 +50,13 @@
 #include "Errors.h"
 #include "RefCntAutoPtr.h"
 #include "DebugUtilities.h"
-#include "D3DErrors.h"
-#include "RenderDeviceBase.h"
+#include "D3DErrors.hpp"
+#include "RenderDeviceBase.hpp"
 #include "ValidatedCast.h"
 #include <atlcomcli.h>
 
 #if USE_D3D12_LOADER
 // On Win32 we manually load d3d12.dll and get entry points,
 // but UWP does not support that, so we link with d3d12.lib
-#    include "D3D12Loader.h"
+#    include "D3D12Loader.hpp"
 #endif
diff --git a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
index dc23ff41..876a8bac 100644
--- a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
@@ -26,11 +26,11 @@
  */
 
 #include "pch.h"
-#include "BufferD3D12Impl.h"
-#include "RenderDeviceD3D12Impl.h"
-#include "DeviceContextD3D12Impl.h"
+#include "BufferD3D12Impl.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "DeviceContextD3D12Impl.hpp"
 #include "D3D12TypeConversions.h"
-#include "BufferViewD3D12Impl.h"
+#include "BufferViewD3D12Impl.hpp"
 #include "GraphicsAccessories.hpp"
 #include "DXGITypeConversions.h"
 #include "EngineMemory.h"
diff --git a/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp
index 1b394931..731d4da2 100644
--- a/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "pch.h"
-#include "BufferViewD3D12Impl.h"
+#include "BufferViewD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp
index 2dbb5190..ebc46582 100644
--- a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp
@@ -27,10 +27,10 @@
 
 #include "pch.h"
 #include "d3dx12_win.h"
-#include "CommandContext.h"
-#include "TextureD3D12Impl.h"
-#include "BufferD3D12Impl.h"
-#include "CommandListManager.h"
+#include "CommandContext.hpp"
+#include "TextureD3D12Impl.hpp"
+#include "BufferD3D12Impl.hpp"
+#include "CommandListManager.hpp"
 #include "D3D12TypeConversions.h"
 
 
diff --git a/Graphics/GraphicsEngineD3D12/src/CommandListManager.cpp b/Graphics/GraphicsEngineD3D12/src/CommandListManager.cpp
index d1dadddc..53827add 100644
--- a/Graphics/GraphicsEngineD3D12/src/CommandListManager.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/CommandListManager.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "CommandListManager.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "CommandListManager.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/CommandQueueD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/CommandQueueD3D12Impl.cpp
index 68a7d257..74e65559 100644
--- a/Graphics/GraphicsEngineD3D12/src/CommandQueueD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/CommandQueueD3D12Impl.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "pch.h"
-#include "CommandQueueD3D12Impl.h"
+#include "CommandQueueD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp
index 0c27214a..2c010f84 100644
--- a/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/D3D12DynamicHeap.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "D3D12DynamicHeap.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "D3D12DynamicHeap.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12Loader.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12Loader.cpp
index f4f56281..f0cf9e3b 100644
--- a/Graphics/GraphicsEngineD3D12/src/D3D12Loader.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/D3D12Loader.cpp
@@ -26,7 +26,7 @@
  */
 
 
-#include "D3D12Loader.h"
+#include "D3D12Loader.hpp"
 #include "Errors.h"
 
 #ifndef NOMINMAX
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
index e0e8d3f7..dfb01d88 100644
--- a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
@@ -33,8 +33,8 @@
 #include "DXGITypeConversions.h"
 
 #include "D3D12TypeDefinitions.h"
-#include "D3DTypeConversionImpl.h"
-#include "D3DViewDescConversionImpl.h"
+#include "D3DTypeConversionImpl.hpp"
+#include "D3DViewDescConversionImpl.hpp"
 #include "PlatformMisc.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp b/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp
index 39d9d119..be598856 100644
--- a/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/DescriptorHeap.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "DescriptorHeap.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "DescriptorHeap.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 #include "D3D12Utils.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
index 51d4c945..ba509cd5 100644
--- a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
@@ -27,17 +27,17 @@
 
 #include "pch.h"
 #include <sstream>
-#include "RenderDeviceD3D12Impl.h"
-#include "DeviceContextD3D12Impl.h"
-#include "PipelineStateD3D12Impl.h"
-#include "CommandContext.h"
-#include "TextureD3D12Impl.h"
-#include "BufferD3D12Impl.h"
-#include "FenceD3D12Impl.h"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "DeviceContextD3D12Impl.hpp"
+#include "PipelineStateD3D12Impl.hpp"
+#include "CommandContext.hpp"
+#include "TextureD3D12Impl.hpp"
+#include "BufferD3D12Impl.hpp"
+#include "FenceD3D12Impl.hpp"
 #include "D3D12TypeConversions.h"
 #include "d3dx12_win.h"
-#include "D3D12DynamicHeap.h"
-#include "CommandListD3D12Impl.h"
+#include "D3D12DynamicHeap.hpp"
+#include "CommandListD3D12Impl.hpp"
 #include "DXGITypeConversions.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
index 5b7a555e..77f2805e 100644
--- a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
@@ -34,14 +34,14 @@
 #include <string>
 
 #include "EngineFactoryD3D12.h"
-#include "RenderDeviceD3D12Impl.h"
-#include "DeviceContextD3D12Impl.h"
-#include "SwapChainD3D12Impl.h"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "DeviceContextD3D12Impl.hpp"
+#include "SwapChainD3D12Impl.hpp"
 #include "D3D12TypeConversions.h"
-#include "EngineFactoryD3DBase.h"
+#include "EngineFactoryD3DBase.hpp"
 #include "StringTools.h"
 #include "EngineMemory.h"
-#include "CommandQueueD3D12Impl.h"
+#include "CommandQueueD3D12Impl.hpp"
 
 #ifndef NOMINMAX
 #    define NOMINMAX
diff --git a/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp
index bf7703cd..a9e1c7d8 100644
--- a/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp
@@ -29,9 +29,9 @@
 #include <thread>
 #include <atlbase.h>
 
-#include "FenceD3D12Impl.h"
+#include "FenceD3D12Impl.hpp"
 #include "EngineMemory.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "RenderDeviceD3D12Impl.hpp"
 namespace Diligent
 {
 
diff --git a/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp b/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp
index 8518da94..be5c68eb 100644
--- a/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp
@@ -45,11 +45,11 @@
 #include "pch.h"
 #include "d3dx12_win.h"
 
-#include "RenderDeviceD3D12Impl.h"
-#include "GenerateMips.h"
-#include "CommandContext.h"
-#include "TextureViewD3D12Impl.h"
-#include "TextureD3D12Impl.h"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "GenerateMips.hpp"
+#include "CommandContext.hpp"
+#include "TextureViewD3D12Impl.hpp"
+#include "TextureD3D12Impl.hpp"
 
 #include "GenerateMips/GenerateMipsLinearCS.h"
 #include "GenerateMips/GenerateMipsLinearOddCS.h"
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
index 5d3c022b..ce1e2dc6 100644
--- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
@@ -27,16 +27,16 @@
 
 #include "pch.h"
 #include <array>
-#include "PipelineStateD3D12Impl.h"
-#include "ShaderD3D12Impl.h"
+#include "PipelineStateD3D12Impl.hpp"
+#include "ShaderD3D12Impl.hpp"
 #include "D3D12TypeConversions.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "RenderDeviceD3D12Impl.hpp"
 #include "DXGITypeConversions.h"
-#include "ShaderResourceBindingD3D12Impl.h"
-#include "CommandContext.h"
+#include "ShaderResourceBindingD3D12Impl.hpp"
+#include "CommandContext.hpp"
 #include "EngineMemory.h"
 #include "StringTools.h"
-#include "ShaderVariableD3D12.h"
+#include "ShaderVariableD3D12.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp
index 2dd1a299..e7b5c1ee 100644
--- a/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp
@@ -28,10 +28,10 @@
 #include "pch.h"
 #include <atlbase.h>
 
-#include "QueryD3D12Impl.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "QueryD3D12Impl.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 #include "GraphicsAccessories.hpp"
-#include "DeviceContextD3D12Impl.h"
+#include "DeviceContextD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp
index 4f542448..c8fd5110 100644
--- a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp
@@ -28,10 +28,10 @@
 #include "pch.h"
 #include <algorithm>
 
-#include "QueryManagerD3D12.h"
+#include "QueryManagerD3D12.hpp"
 #include "D3D12TypeConversions.h"
 #include "GraphicsAccessories.hpp"
-#include "CommandContext.h"
+#include "CommandContext.hpp"
 #include "Align.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
index 4b1474d7..73be3632 100644
--- a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
@@ -27,17 +27,17 @@
 
 #include "pch.h"
 #include <dxgi1_4.h>
-#include "RenderDeviceD3D12Impl.h"
-#include "PipelineStateD3D12Impl.h"
-#include "ShaderD3D12Impl.h"
-#include "TextureD3D12Impl.h"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "PipelineStateD3D12Impl.hpp"
+#include "ShaderD3D12Impl.hpp"
+#include "TextureD3D12Impl.hpp"
 #include "DXGITypeConversions.h"
-#include "SamplerD3D12Impl.h"
-#include "BufferD3D12Impl.h"
-#include "ShaderResourceBindingD3D12Impl.h"
-#include "DeviceContextD3D12Impl.h"
-#include "FenceD3D12Impl.h"
-#include "QueryD3D12Impl.h"
+#include "SamplerD3D12Impl.hpp"
+#include "BufferD3D12Impl.hpp"
+#include "ShaderResourceBindingD3D12Impl.hpp"
+#include "DeviceContextD3D12Impl.hpp"
+#include "FenceD3D12Impl.hpp"
+#include "QueryD3D12Impl.hpp"
 #include "EngineMemory.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp
index d80983cc..201a5354 100644
--- a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp
@@ -27,12 +27,12 @@
 
 #include "pch.h"
 
-#include "RootSignature.h"
-#include "ShaderResourceLayoutD3D12.h"
-#include "ShaderD3D12Impl.h"
-#include "CommandContext.h"
-#include "RenderDeviceD3D12Impl.h"
-#include "TextureD3D12Impl.h"
+#include "RootSignature.hpp"
+#include "ShaderResourceLayoutD3D12.hpp"
+#include "ShaderD3D12Impl.hpp"
+#include "CommandContext.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "TextureD3D12Impl.hpp"
 #include "D3D12TypeConversions.h"
 #include "HashUtils.h"
 
diff --git a/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp
index 0c654cc7..e53fa1b5 100644
--- a/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "SamplerD3D12Impl.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "SamplerD3D12Impl.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 #include "D3D12TypeConversions.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp
index 89850809..e9729b80 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp
@@ -29,8 +29,8 @@
 
 #include <D3Dcompiler.h>
 
-#include "ShaderD3D12Impl.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "ShaderD3D12Impl.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 #include "DataBlobImpl.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp
index 5ac1f492..93d444d7 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp
@@ -26,10 +26,10 @@
  */
 
 #include "pch.h"
-#include "ShaderResourceBindingD3D12Impl.h"
-#include "PipelineStateD3D12Impl.h"
-#include "ShaderD3D12Impl.h"
-#include "RenderDeviceD3D12Impl.h"
+#include "ShaderResourceBindingD3D12Impl.hpp"
+#include "PipelineStateD3D12Impl.hpp"
+#include "ShaderD3D12Impl.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp
index a6679231..482443a7 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp
@@ -27,8 +27,8 @@
 
 #include "pch.h"
 
-#include "ShaderResourceCacheD3D12.h"
-#include "BufferD3D12Impl.h"
+#include "ShaderResourceCacheD3D12.hpp"
+#include "BufferD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp
index 8316ff5e..ce7c81f8 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceLayoutD3D12.cpp
@@ -27,17 +27,17 @@
 
 #include "pch.h"
 
-#include "ShaderResourceLayoutD3D12.h"
-#include "ShaderResourceCacheD3D12.h"
-#include "BufferD3D12Impl.h"
+#include "ShaderResourceLayoutD3D12.hpp"
+#include "ShaderResourceCacheD3D12.hpp"
+#include "BufferD3D12Impl.hpp"
 #include "BufferViewD3D12.h"
-#include "TextureD3D12Impl.h"
-#include "TextureViewD3D12Impl.h"
-#include "SamplerD3D12Impl.h"
-#include "ShaderD3D12Impl.h"
-#include "RootSignature.h"
-#include "PipelineStateD3D12Impl.h"
-#include "ShaderResourceVariableBase.h"
+#include "TextureD3D12Impl.hpp"
+#include "TextureViewD3D12Impl.hpp"
+#include "SamplerD3D12Impl.hpp"
+#include "ShaderD3D12Impl.hpp"
+#include "RootSignature.hpp"
+#include "PipelineStateD3D12Impl.hpp"
+#include "ShaderResourceVariableBase.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp
index f9a67288..edf818cc 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp
@@ -28,9 +28,9 @@
 #include "pch.h"
 
 #include <d3dcompiler.h>
-#include "ShaderResourcesD3D12.h"
-#include "ShaderD3DBase.h"
-#include "ShaderBase.h"
+#include "ShaderResourcesD3D12.hpp"
+#include "ShaderD3DBase.hpp"
+#include "ShaderBase.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderVariableD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderVariableD3D12.cpp
index ecdf2bc7..1c825a15 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderVariableD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderVariableD3D12.cpp
@@ -27,8 +27,8 @@
 
 #include "pch.h"
 
-#include "ShaderVariableD3D12.h"
-#include "ShaderResourceVariableBase.h"
+#include "ShaderVariableD3D12.hpp"
+#include "ShaderResourceVariableBase.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
index 531bf4c1..ac24533c 100644
--- a/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
@@ -26,11 +26,11 @@
  */
 
 #include "pch.h"
-#include "SwapChainD3D12Impl.h"
-#include "RenderDeviceD3D12Impl.h"
-#include "DeviceContextD3D12Impl.h"
+#include "SwapChainD3D12Impl.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "DeviceContextD3D12Impl.hpp"
 #include "DXGITypeConversions.h"
-#include "TextureD3D12Impl.h"
+#include "TextureD3D12Impl.hpp"
 #include "EngineMemory.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp
index be64e1db..90a583cc 100644
--- a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp
@@ -26,11 +26,11 @@
  */
 
 #include "pch.h"
-#include "TextureD3D12Impl.h"
-#include "RenderDeviceD3D12Impl.h"
-#include "DeviceContextD3D12Impl.h"
+#include "TextureD3D12Impl.hpp"
+#include "RenderDeviceD3D12Impl.hpp"
+#include "DeviceContextD3D12Impl.hpp"
 #include "D3D12TypeConversions.h"
-#include "TextureViewD3D12Impl.h"
+#include "TextureViewD3D12Impl.hpp"
 #include "DXGITypeConversions.h"
 #include "d3dx12_win.h"
 #include "EngineMemory.h"
diff --git a/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp
index dc871bf6..d1287c57 100644
--- a/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/TextureViewD3D12Impl.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "TextureViewD3D12Impl.h"
-#include "DeviceContextD3D12Impl.h"
+#include "TextureViewD3D12Impl.hpp"
+#include "DeviceContextD3D12Impl.hpp"
 
 namespace Diligent
 {