D3D12 backend: more header organizing

35 files changed, 72 insertions, 42 deletions

diff --git a/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp
index 4ab720e7..1c59a56a 100644
--- a/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp
@@ -32,7 +32,6 @@
 
 #include "EngineD3D12ImplTraits.hpp"
 #include "BottomLevelASD3D12.h"
-#include "RenderDeviceD3D12.h"
 #include "BottomLevelASBase.hpp"
 #include "D3D12ResourceBase.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
index c2053c03..12f3d1b8 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
@@ -32,11 +32,11 @@
 
 #include "EngineD3D12ImplTraits.hpp"
 #include "BufferD3D12.h"
-#include "RenderDeviceD3D12.h"
 #include "BufferBase.hpp"
+#include "BufferViewD3D12Impl.hpp" // Required by BufferBase
 #include "D3D12ResourceBase.hpp"
 #include "D3D12DynamicHeap.hpp"
-#include "BufferViewD3D12Impl.hpp"
+#include "DescriptorHeap.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
index d9bdc9b1..775d3f69 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
@@ -32,7 +32,6 @@
 
 #include "EngineD3D12ImplTraits.hpp"
 #include "BufferViewD3D12.h"
-#include "RenderDeviceD3D12.h"
 #include "BufferViewBase.hpp"
 #include "DescriptorHeap.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
index 06d2e117..2edf7677 100644
--- a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
@@ -35,16 +35,18 @@
 
 #include "DeviceContextD3D12.h"
 #include "DeviceContextNextGenBase.hpp"
+
+// D3D12 object implementations are required by DeviceContextBase
 #include "BufferD3D12Impl.hpp"
 #include "TextureD3D12Impl.hpp"
 #include "QueryD3D12Impl.hpp"
 #include "FramebufferD3D12Impl.hpp"
 #include "RenderPassD3D12Impl.hpp"
 #include "PipelineStateD3D12Impl.hpp"
-#include "D3D12DynamicHeap.hpp"
 #include "BottomLevelASD3D12Impl.hpp"
 #include "TopLevelASD3D12Impl.hpp"
 
+#include "D3D12DynamicHeap.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
index 28a9c1f3..eb47973d 100644
--- a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
@@ -32,7 +32,6 @@
 
 #include "EngineD3D12ImplTraits.hpp"
 #include "FenceD3D12.h"
-#include "RenderDeviceD3D12.h"
 #include "FenceBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/include/FramebufferD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/FramebufferD3D12Impl.hpp
index 43be86ff..3500311b 100644
--- a/Graphics/GraphicsEngineD3D12/include/FramebufferD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/FramebufferD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::FramebufferD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "RenderDeviceD3D12.h"
 #include "FramebufferBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
index 8f8ee1cc..76d6e73a 100644
--- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
@@ -33,11 +33,10 @@
 #include <vector>
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "RenderDeviceD3D12.h"
 #include "PipelineStateD3D12.h"
 #include "PipelineStateBase.hpp"
-#include "RootSignature.hpp"
 #include "PipelineResourceSignatureD3D12Impl.hpp" // Requiured by PipelineStateBase
+#include "RootSignature.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/RenderPassD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/RenderPassD3D12Impl.hpp
index e8967046..2af535cf 100644
--- a/Graphics/GraphicsEngineD3D12/include/RenderPassD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/RenderPassD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::RenderPassD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "RenderDeviceD3D12.h"
 #include "RenderPassBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
index 46940a78..d8cc4def 100644
--- a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
@@ -32,7 +32,6 @@
 
 #include "EngineD3D12ImplTraits.hpp"
 #include "SamplerD3D12.h"
-#include "RenderDeviceD3D12.h"
 #include "SamplerBase.hpp"
 #include "DescriptorHeap.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
index 711b1543..80f05b21 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::ShaderD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "RenderDeviceD3D12.h"
 #include "ShaderD3D12.h"
 #include "ShaderBase.hpp"
 #include "ShaderD3DBase.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp
index 8c45e87f..4b21090b 100644
--- a/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp
@@ -34,8 +34,8 @@
 #include "TopLevelASD3D12.h"
 #include "TopLevelASBase.hpp"
 #include "D3D12ResourceBase.hpp"
-#include "DescriptorHeap.hpp"
 #include "BottomLevelASD3D12Impl.hpp" // Required by TopLevelASBase
+#include "DescriptorHeap.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp
index 8f23a7e9..bdc959a0 100644
--- a/Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp
@@ -28,6 +28,7 @@
 #include "pch.h"
 
 #include "BottomLevelASD3D12Impl.hpp"
+
 #include "RenderDeviceD3D12Impl.hpp"
 #include "D3D12TypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
index 1ac066fc..ec04acb9 100644
--- a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
@@ -28,8 +28,10 @@
 #include "pch.h"
 
 #include "BufferD3D12Impl.hpp"
+
 #include "RenderDeviceD3D12Impl.hpp"
 #include "DeviceContextD3D12Impl.hpp"
+
 #include "D3D12TypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 #include "DXGITypeConversions.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp
index 51edfbc3..f49e1f2e 100644
--- a/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/BufferViewD3D12Impl.cpp
@@ -26,7 +26,9 @@
  */
 
 #include "pch.h"
+
 #include "BufferViewD3D12Impl.hpp"
+
 #include "BufferD3D12Impl.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp
index 8104bcd8..653f0890 100644
--- a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp
@@ -27,14 +27,16 @@
 
 #include "pch.h"
 
+#include "CommandContext.hpp"
+
 #include "d3dx12_win.h"
 
-#include "CommandContext.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
 #include "TextureD3D12Impl.hpp"
 #include "BufferD3D12Impl.hpp"
 #include "BottomLevelASD3D12Impl.hpp"
 #include "TopLevelASD3D12Impl.hpp"
+
 #include "CommandListManager.hpp"
 #include "D3D12TypeConversions.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
index a11b6339..b9df6e0a 100644
--- a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
@@ -27,11 +27,11 @@
 
 #include "pch.h"
 
+#include "D3D12TypeConversions.hpp"
+
 #include <array>
 
-#include "D3D12TypeConversions.hpp"
 #include "DXGITypeConversions.hpp"
-
 #include "D3D12TypeDefinitions.h"
 #include "D3DTypeConversionImpl.hpp"
 #include "D3DViewDescConversionImpl.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12Utils.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12Utils.cpp
index a4c1e99b..9c144ef8 100644
--- a/Graphics/GraphicsEngineD3D12/src/D3D12Utils.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/D3D12Utils.cpp
@@ -26,6 +26,7 @@
  */
 
 #include "pch.h"
+
 #include "D3D12Utils.h"
 
 #include <cstring>
diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
index 864919d2..78f00768 100644
--- a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
@@ -27,23 +27,24 @@
 
 #include "pch.h"
 
+#include "DeviceContextD3D12Impl.hpp"
+
 #include <sstream>
-#include <vector>
 
 #include "RenderDeviceD3D12Impl.hpp"
-#include "DeviceContextD3D12Impl.hpp"
 #include "PipelineStateD3D12Impl.hpp"
-#include "CommandContext.hpp"
 #include "TextureD3D12Impl.hpp"
 #include "BufferD3D12Impl.hpp"
 #include "FenceD3D12Impl.hpp"
+#include "ShaderBindingTableD3D12Impl.hpp"
+#include "ShaderResourceBindingD3D12Impl.hpp"
+#include "CommandListD3D12Impl.hpp"
+
+#include "CommandContext.hpp"
 #include "D3D12TypeConversions.hpp"
 #include "d3dx12_win.h"
 #include "D3D12DynamicHeap.hpp"
-#include "CommandListD3D12Impl.hpp"
 #include "DXGITypeConversions.hpp"
-#include "ShaderBindingTableD3D12Impl.hpp"
-#include "ShaderResourceBindingD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
index 6c32d54c..4ec54c00 100644
--- a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
@@ -30,10 +30,11 @@
 
 #include "pch.h"
 
+#include "EngineFactoryD3D12.h"
+
 #include <array>
 #include <string>
 
-#include "EngineFactoryD3D12.h"
 #include "RenderDeviceD3D12Impl.hpp"
 #include "DeviceContextD3D12Impl.hpp"
 #include "SwapChainD3D12Impl.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp
index 7c23a734..ff3a8945 100644
--- a/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/FenceD3D12Impl.cpp
@@ -26,10 +26,12 @@
  */
 
 #include "pch.h"
+
+#include "FenceD3D12Impl.hpp"
+
 #include <thread>
 #include <atlbase.h>
 
-#include "FenceD3D12Impl.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp b/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp
index b92339fd..85b63442 100644
--- a/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/GenerateMips.cpp
@@ -43,10 +43,12 @@
 
 
 #include "pch.h"
+
+#include "GenerateMips.hpp"
+
 #include "d3dx12_win.h"
 
 #include "RenderDeviceD3D12Impl.hpp"
-#include "GenerateMips.hpp"
 #include "CommandContext.hpp"
 #include "TextureViewD3D12Impl.hpp"
 #include "TextureD3D12Impl.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp
index 79e82979..698151d4 100644
--- a/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp
@@ -27,12 +27,11 @@
 
 #include "pch.h"
 
+#include "PipelineResourceSignatureD3D12Impl.hpp"
+
 #include <unordered_map>
 
-#include "PipelineResourceSignatureD3D12Impl.hpp"
-#include "ShaderResourceCacheD3D12.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
-#include "ShaderResourceBindingD3D12Impl.hpp"
 #include "BufferD3D12Impl.hpp"
 #include "BufferViewD3D12Impl.hpp"
 #include "SamplerD3D12Impl.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
index 2a23c89e..efd4b4e6 100644
--- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
@@ -27,6 +27,8 @@
 
 #include "pch.h"
 
+#include "PipelineStateD3D12Impl.hpp"
+
 #include <array>
 #include <sstream>
 #include <unordered_map>
@@ -37,10 +39,10 @@
 #    undef FindResource
 #endif
 
-#include "PipelineStateD3D12Impl.hpp"
-#include "ShaderD3D12Impl.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
+#include "ShaderD3D12Impl.hpp"
 #include "ShaderResourceBindingD3D12Impl.hpp"
+
 #include "D3D12TypeConversions.hpp"
 #include "DXGITypeConversions.hpp"
 #include "CommandContext.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp
index 236a2026..510aa185 100644
--- a/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/QueryD3D12Impl.cpp
@@ -26,9 +26,11 @@
  */
 
 #include "pch.h"
-#include <atlbase.h>
 
 #include "QueryD3D12Impl.hpp"
+
+#include <atlbase.h>
+
 #include "RenderDeviceD3D12Impl.hpp"
 #include "GraphicsAccessories.hpp"
 #include "DeviceContextD3D12Impl.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp
index 00fd448b..8495287f 100644
--- a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp
@@ -26,9 +26,11 @@
  */
 
 #include "pch.h"
-#include <algorithm>
 
 #include "QueryManagerD3D12.hpp"
+
+#include <algorithm>
+
 #include "D3D12TypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 #include "CommandContext.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
index 0de19a77..25ce0695 100644
--- a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
@@ -27,14 +27,14 @@
 
 #include "pch.h"
 
+#include "RenderDeviceD3D12Impl.hpp"
+
 #include <dxgi1_4.h>
 #include <vector>
 
-#include "RenderDeviceD3D12Impl.hpp"
 #include "PipelineStateD3D12Impl.hpp"
 #include "ShaderD3D12Impl.hpp"
 #include "TextureD3D12Impl.hpp"
-#include "DXGITypeConversions.hpp"
 #include "SamplerD3D12Impl.hpp"
 #include "BufferD3D12Impl.hpp"
 #include "ShaderResourceBindingD3D12Impl.hpp"
@@ -47,7 +47,10 @@
 #include "TopLevelASD3D12Impl.hpp"
 #include "ShaderBindingTableD3D12Impl.hpp"
 #include "PipelineResourceSignatureD3D12Impl.hpp"
+
 #include "EngineMemory.h"
+#include "DXGITypeConversions.hpp"
+
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp
index 3f8ce2b6..c351d7d2 100644
--- a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp
@@ -28,11 +28,12 @@
 #include "pch.h"
 
 #include "RootSignature.hpp"
-#include "CommandContext.hpp"
+
 #include "RenderDeviceD3D12Impl.hpp"
+#include "PipelineResourceSignatureD3D12Impl.hpp"
+#include "CommandContext.hpp"
 #include "D3D12TypeConversions.hpp"
 #include "HashUtils.hpp"
-#include "PipelineResourceSignatureD3D12Impl.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp
index 8be5fa28..89793016 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderD3D12Impl.cpp
@@ -27,9 +27,10 @@
 
 #include "pch.h"
 
+#include "ShaderD3D12Impl.hpp"
+
 #include <D3Dcompiler.h>
 
-#include "ShaderD3D12Impl.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
 #include "DataBlobImpl.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp
index 69d95100..2d10f17d 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceBindingD3D12Impl.cpp
@@ -28,9 +28,10 @@
 #include "pch.h"
 
 #include "ShaderResourceBindingD3D12Impl.hpp"
+
 #include "RenderDeviceD3D12Impl.hpp"
-#include "FixedLinearAllocator.hpp"
 #include "PipelineResourceSignatureD3D12Impl.hpp"
+#include "FixedLinearAllocator.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp
index 30c10b54..5914ad6b 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourceCacheD3D12.cpp
@@ -28,12 +28,14 @@
 #include "pch.h"
 
 #include "ShaderResourceCacheD3D12.hpp"
+
 #include "RenderDeviceD3D12Impl.hpp"
 #include "BufferD3D12Impl.hpp"
 #include "BufferViewD3D12Impl.hpp"
 #include "TextureD3D12Impl.hpp"
 #include "TextureViewD3D12Impl.hpp"
 #include "TopLevelASD3D12Impl.hpp"
+
 #include "CommandContext.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp
index 8092e9d5..c62b0197 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderResourcesD3D12.cpp
@@ -27,8 +27,10 @@
 
 #include "pch.h"
 
-#include <d3dcompiler.h>
 #include "ShaderResourcesD3D12.hpp"
+
+#include <d3dcompiler.h>
+
 #include "ShaderD3DBase.hpp"
 #include "ShaderBase.hpp"
 #include "DXCompiler.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/ShaderVariableManagerD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/ShaderVariableManagerD3D12.cpp
index 1e201a4a..9078debb 100644
--- a/Graphics/GraphicsEngineD3D12/src/ShaderVariableManagerD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/ShaderVariableManagerD3D12.cpp
@@ -28,9 +28,10 @@
 #include "pch.h"
 
 #include "ShaderVariableManagerD3D12.hpp"
+
 #include "RenderDeviceD3D12Impl.hpp"
-#include "ShaderResourceCacheD3D12.hpp"
 #include "PipelineResourceSignatureD3D12Impl.hpp"
+#include "ShaderResourceCacheD3D12.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
index 279acf70..a7c18c5f 100644
--- a/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
@@ -26,11 +26,14 @@
  */
 
 #include "pch.h"
+
 #include "SwapChainD3D12Impl.hpp"
+
 #include "RenderDeviceD3D12Impl.hpp"
 #include "DeviceContextD3D12Impl.hpp"
-#include "DXGITypeConversions.hpp"
 #include "TextureD3D12Impl.hpp"
+
+#include "DXGITypeConversions.hpp"
 #include "EngineMemory.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp
index f01eb476..f92967ef 100644
--- a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp
@@ -28,10 +28,12 @@
 #include "pch.h"
 
 #include "TextureD3D12Impl.hpp"
+
 #include "RenderDeviceD3D12Impl.hpp"
 #include "DeviceContextD3D12Impl.hpp"
-#include "D3D12TypeConversions.hpp"
 #include "TextureViewD3D12Impl.hpp"
+
+#include "D3D12TypeConversions.hpp"
 #include "DXGITypeConversions.hpp"
 #include "d3dx12_win.h"
 #include "EngineMemory.h"
diff --git a/Graphics/GraphicsEngineD3D12/src/TopLevelASD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TopLevelASD3D12Impl.cpp
index 3c7ab4e2..c4a0547a 100644
--- a/Graphics/GraphicsEngineD3D12/src/TopLevelASD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/TopLevelASD3D12Impl.cpp
@@ -28,6 +28,7 @@
 #include "pch.h"
 
 #include "TopLevelASD3D12Impl.hpp"
+
 #include "RenderDeviceD3D12Impl.hpp"
 #include "D3D12TypeConversions.hpp"
 #include "GraphicsAccessories.hpp"