code cleanup

65 files changed, 9 insertions, 136 deletions

diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
index 197aa86b..ed36f4f4 100644
--- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INCLUDE
     include/D3D11TypeDefinitions.h
     include/DeviceContextD3D11Impl.hpp
     include/DisjointQueryPool.hpp
-    include/EngineD3D11Defines.h
     include/EngineD3D11ImplTraits.hpp
     include/pch.h
 	include/FenceD3D11Impl.hpp
diff --git a/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp
index bd2985c6..172d4f9c 100644
--- a/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/BufferD3D11Impl.hpp
@@ -33,7 +33,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "BufferD3D11.h"
 #include "BufferBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp
index c02e509a..be721684 100644
--- a/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/BufferViewD3D11Impl.hpp
@@ -33,7 +33,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "BufferViewD3D11.h"
 #include "BufferViewBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp
index 6af1390d..9345eacb 100644
--- a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.hpp
@@ -32,7 +32,7 @@
 
 #include <vector>
 
-#include "DeviceContextD3D11.h"
+#include "EngineD3D11ImplTraits.hpp"
 #include "DeviceContextBase.hpp"
 #include "BufferD3D11Impl.hpp"
 #include "TextureBaseD3D11.hpp"
diff --git a/Graphics/GraphicsEngineD3D11/include/EngineD3D11Defines.h b/Graphics/GraphicsEngineD3D11/include/EngineD3D11Defines.h
deleted file mode 100644
index 4766aff2..00000000
--- a/Graphics/GraphicsEngineD3D11/include/EngineD3D11Defines.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  Copyright 2019-2021 Diligent Graphics LLC
- *  Copyright 2015-2019 Egor Yusov
- *  
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  
- *      http://www.apache.org/licenses/LICENSE-2.0
- *  
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- *  In no event and under no legal theory, whether in tort (including negligence), 
- *  contract, or otherwise, unless required by applicable law (such as deliberate 
- *  and grossly negligent acts) or agreed to in writing, shall any Contributor be
- *  liable for any damages, including any direct, indirect, special, incidental, 
- *  or consequential damages of any character arising as a result of this License or 
- *  out of the use or inability to use the software (including but not limited to damages 
- *  for loss of goodwill, work stoppage, computer failure or malfunction, or any and 
- *  all other commercial damages or losses), even if such Contributor has been advised 
- *  of the possibility of such damages.
- */
-
-#pragma once
-
-#ifdef DILIGENT_DEBUG
-#    define VERIFY_SHADER_BINDINGS
-#endif
diff --git a/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp
index 4e1ef18a..3578d878 100644
--- a/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/FenceD3D11Impl.hpp
@@ -34,7 +34,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "FenceD3D11.h"
 #include "FenceBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp
index d2617cad..7aaa4f2b 100644
--- a/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/PipelineStateD3D11Impl.hpp
@@ -30,8 +30,7 @@
 /// \file
 /// Declaration of Diligent::PipelineStateD3D11Impl class
 
-#include "PipelineStateD3D11.h"
-#include "RenderDeviceD3D11.h"
+#include "EngineD3D11ImplTraits.hpp"
 #include "PipelineStateBase.hpp"
 
 #include "PipelineResourceSignatureD3D11Impl.hpp" // Required by PipelineStateBase
diff --git a/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp
index 6af07f43..c2135fb3 100644
--- a/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/QueryD3D11Impl.hpp
@@ -34,7 +34,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "QueryD3D11.h"
 #include "QueryBase.hpp"
 #include "DisjointQueryPool.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D11/include/RenderPassD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/RenderPassD3D11Impl.hpp
index 66294bb4..007f92de 100644
--- a/Graphics/GraphicsEngineD3D11/include/RenderPassD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/RenderPassD3D11Impl.hpp
@@ -31,14 +31,11 @@
 /// Declaration of Diligent::RenderPassD3D11Impl class
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "RenderDeviceD3D11.h"
 #include "RenderPassBase.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Render pass implementation in Direct3D11 backend.
 class RenderPassD3D11Impl final : public RenderPassBase<EngineD3D11ImplTraits>
 {
diff --git a/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp
index 07c6f682..2d8852e5 100644
--- a/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/SamplerD3D11Impl.hpp
@@ -33,7 +33,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "SamplerD3D11.h"
 #include "SamplerBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp
index 6b87ce6c..2541bf4d 100644
--- a/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/ShaderD3D11Impl.hpp
@@ -33,10 +33,8 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "ShaderD3D11.h"
 #include "ShaderBase.hpp"
 #include "ShaderD3DBase.hpp"
-#include "EngineD3D11Defines.h"
 #include "ShaderResourcesD3D11.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp
index 13226d95..c6d4026f 100644
--- a/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/ShaderResourceBindingD3D11Impl.hpp
@@ -31,9 +31,6 @@
 /// Declaration of Diligent::ShaderResourceBindingD3D11Impl class
 
 #include "EngineD3D11ImplTraits.hpp"
-
-#include "ShaderResourceBindingD3D11.h"
-#include "RenderDeviceD3D11.h"
 #include "ShaderResourceBindingBase.hpp"
 
 // ShaderResourceCacheD3D11 and ShaderVariableManagerD3D11 are required by ShaderResourceBindingBase
diff --git a/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp b/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp
index 54cc7031..85de56bc 100644
--- a/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/TextureBaseD3D11.hpp
@@ -30,8 +30,7 @@
 /// \file
 /// Declaration of Diligent::TextureBaseD3D11 class
 
-#include "TextureD3D11.h"
-#include "RenderDeviceD3D11.h"
+#include "EngineD3D11ImplTraits.hpp"
 #include "TextureBase.hpp"
 #include "TextureViewD3D11Impl.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
diff --git a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp
index 639feeb7..6fe9a6f7 100644
--- a/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp
+++ b/Graphics/GraphicsEngineD3D11/include/TextureViewD3D11Impl.hpp
@@ -33,7 +33,6 @@
 #include <atlbase.h>
 
 #include "EngineD3D11ImplTraits.hpp"
-#include "TextureViewD3D11.h"
 #include "TextureViewBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D11/include/pch.h b/Graphics/GraphicsEngineD3D11/include/pch.h
index 9d2f3c68..49275af3 100644
--- a/Graphics/GraphicsEngineD3D11/include/pch.h
+++ b/Graphics/GraphicsEngineD3D11/include/pch.h
@@ -70,7 +70,6 @@
 #    include <d3d11_4.h>
 #endif
 
-#include "EngineD3D11Defines.h"
 #include "Errors.hpp"
 #include "RefCntAutoPtr.hpp"
 #include "DebugUtilities.hpp"
diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
index 4ad09035..a601da70 100755
--- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
@@ -37,7 +37,6 @@
 #include "TextureViewD3D11Impl.hpp"
 #include "PipelineStateD3D11Impl.hpp"
 #include "ShaderResourceBindingD3D11Impl.hpp"
-#include "EngineD3D11Defines.h"
 #include "CommandListD3D11Impl.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
 #include "FenceD3D11Impl.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp
index 1c59a56a..af66ad3a 100644
--- a/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BottomLevelASD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::BottomLevelASD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "BottomLevelASD3D12.h"
 #include "BottomLevelASBase.hpp"
 #include "D3D12ResourceBase.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
index 12f3d1b8..dddac7a8 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BufferD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::BufferD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "BufferD3D12.h"
 #include "BufferBase.hpp"
 #include "BufferViewD3D12Impl.hpp" // Required by BufferBase
 #include "D3D12ResourceBase.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
index 775d3f69..c3064466 100644
--- a/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/BufferViewD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::BufferViewD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "BufferViewD3D12.h"
 #include "BufferViewBase.hpp"
 #include "DescriptorHeap.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
index a502b748..a862ff0d 100644
--- a/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/DeviceContextD3D12Impl.hpp
@@ -33,7 +33,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "DeviceContextD3D12.h"
+#include "EngineD3D12ImplTraits.hpp"
 #include "DeviceContextNextGenBase.hpp"
 
 // D3D12 object implementations are required by DeviceContextBase
diff --git a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
index eb47973d..ad357896 100644
--- a/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/FenceD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::FenceD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "FenceD3D12.h"
 #include "FenceBase.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
index 76d6e73a..72d45a46 100644
--- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
@@ -33,7 +33,6 @@
 #include <vector>
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "PipelineStateD3D12.h"
 #include "PipelineStateBase.hpp"
 #include "PipelineResourceSignatureD3D12Impl.hpp" // Requiured by PipelineStateBase
 #include "RootSignature.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
index 2be65eaf..b6dbfc4b 100644
--- a/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/QueryD3D12Impl.hpp
@@ -33,7 +33,6 @@
 #include <array>
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "QueryD3D12.h"
 #include "QueryBase.hpp"
 #include "QueryManagerD3D12.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
index d8cc4def..5f27a129 100644
--- a/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/SamplerD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::SamplerD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "SamplerD3D12.h"
 #include "SamplerBase.hpp"
 #include "DescriptorHeap.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderBindingTableD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderBindingTableD3D12Impl.hpp
index 960e69e7..4db038c2 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderBindingTableD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderBindingTableD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::ShaderBindingTableD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "ShaderBindingTableD3D12.h"
 #include "ShaderBindingTableBase.hpp"
 #include "TopLevelASD3D12Impl.hpp"
 #include "D3D12ResourceBase.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderD3D12Impl.hpp
index 80f05b21..8527acc4 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 "ShaderD3D12.h"
 #include "ShaderBase.hpp"
 #include "ShaderD3DBase.hpp"
 #include "ShaderResourcesD3D12.hpp"
@@ -39,8 +38,6 @@
 namespace Diligent
 {
 
-class ResourceMapping;
-
 /// Implementation of a shader object in Direct3D12 backend.
 class ShaderD3D12Impl final : public ShaderBase<EngineD3D12ImplTraits>, public ShaderD3DBase
 {
diff --git a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
index 3749145f..9d4ed290 100644
--- a/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/ShaderResourceBindingD3D12Impl.hpp
@@ -32,7 +32,6 @@
 
 #include "EngineD3D12ImplTraits.hpp"
 #include "ShaderResourceBindingBase.hpp"
-#include "ShaderResourceBindingD3D12.h"
 
 // ShaderVariableManagerD3D12 and ShaderResourceCacheD3D12 are required by ShaderResourceBindingBase
 #include "ShaderVariableManagerD3D12.hpp"
@@ -41,8 +40,6 @@
 namespace Diligent
 {
 
-class PipelineResourceSignatureD3D12Impl;
-
 /// Implementation of the Diligent::IShaderResourceBindingD3D12 interface
 // sizeof(ShaderResourceBindingD3D12Impl) == 96 (x64, msvc, Release)
 class ShaderResourceBindingD3D12Impl final : public ShaderResourceBindingBase<EngineD3D12ImplTraits>
diff --git a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
index 526a7610..141473d3 100644
--- a/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TextureD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::TextureD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "TextureD3D12.h"
 #include "TextureBase.hpp"
 #include "TextureViewD3D12Impl.hpp"
 #include "D3D12ResourceBase.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
index 08a48045..460c2177 100644
--- a/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TextureViewD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::TextureViewD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "TextureViewD3D12.h"
 #include "TextureViewBase.hpp"
 #include "DescriptorHeap.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp
index 4b21090b..1c9df86e 100644
--- a/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/TopLevelASD3D12Impl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::TopLevelASD3D12Impl class
 
 #include "EngineD3D12ImplTraits.hpp"
-#include "TopLevelASD3D12.h"
 #include "TopLevelASBase.hpp"
 #include "D3D12ResourceBase.hpp"
 #include "BottomLevelASD3D12Impl.hpp" // Required by TopLevelASBase
diff --git a/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.hpp
index 8620c28a..1dcede16 100644
--- a/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/BufferGLImpl.hpp
@@ -28,7 +28,6 @@
 #pragma once
 
 #include "EngineGLImplTraits.hpp"
-#include "BufferGL.h"
 #include "BufferBase.hpp"
 #include "BufferViewGLImpl.hpp" // Required by BufferBase
 #include "GLObjectWrapper.hpp"
diff --git a/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.hpp
index 1080a268..a67235de 100644
--- a/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/BufferViewGLImpl.hpp
@@ -28,7 +28,6 @@
 #pragma once
 
 #include "EngineGLImplTraits.hpp"
-#include "BufferViewGL.h"
 #include "BufferViewBase.hpp"
 #include "GLObjectWrapper.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp
index 0f0206c1..b5f79325 100644
--- a/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/DeviceContextGLImpl.hpp
@@ -30,7 +30,6 @@
 #include <vector>
 
 #include "EngineGLImplTraits.hpp"
-#include "DeviceContextGL.h"
 #include "DeviceContextBase.hpp"
 
 // GL object implementations are required by DeviceContextBase
diff --git a/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.hpp
index 727886cb..85e443f2 100644
--- a/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/FenceGLImpl.hpp
@@ -34,7 +34,6 @@
 #include <atomic>
 
 #include "EngineGLImplTraits.hpp"
-#include "FenceGL.h"
 #include "FenceBase.hpp"
 #include "GLObjectWrapper.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp
index bd45ab08..31bd3eaf 100644
--- a/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/PipelineResourceSignatureGLImpl.hpp
@@ -46,8 +46,6 @@
 namespace Diligent
 {
 
-class RenderDeviceGLImpl;
-
 enum BINDING_RANGE : Uint32
 {
     BINDING_RANGE_UNIFORM_BUFFER = 0,
diff --git a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp
index 08b98d6e..22a06e32 100644
--- a/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/PipelineStateGLImpl.hpp
@@ -30,7 +30,6 @@
 #include <vector>
 
 #include "EngineGLImplTraits.hpp"
-#include "PipelineStateGL.h"
 #include "PipelineStateBase.hpp"
 
 #include "PipelineResourceSignatureGLImpl.hpp" // Requiured by PipelineStateBase
diff --git a/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.hpp
index a4b8959b..f2b2373f 100644
--- a/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/QueryGLImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::QueryGLImpl class
 
 #include "EngineGLImplTraits.hpp"
-#include "QueryGL.h"
 #include "QueryBase.hpp"
 #include "GLObjectWrapper.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.hpp
index 02d3ce8a..d81d8d4d 100644
--- a/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/SamplerGLImpl.hpp
@@ -28,7 +28,6 @@
 #pragma once
 
 #include "EngineGLImplTraits.hpp"
-#include "SamplerGL.h"
 #include "SamplerBase.hpp"
 #include "GLObjectWrapper.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.hpp
index 487bf2d8..bbc1f677 100644
--- a/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/ShaderGLImpl.hpp
@@ -28,7 +28,6 @@
 #pragma once
 
 #include "EngineGLImplTraits.hpp"
-#include "ShaderGL.h"
 #include "ShaderBase.hpp"
 #include "GLObjectWrapper.hpp"
 #include "ShaderResourcesGL.hpp"
diff --git a/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.hpp
index 40fae9a4..b8f978ec 100644
--- a/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/ShaderResourceBindingGLImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::ShaderResourceBindingGLImpl class
 
 #include "EngineGLImplTraits.hpp"
-#include "ShaderResourceBindingGL.h"
 #include "ShaderResourceBindingBase.hpp"
 #include "ShaderResourcesGL.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.hpp b/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.hpp
index 48320bcf..fa2078db 100644
--- a/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/TextureBaseGL.hpp
@@ -28,7 +28,6 @@
 #pragma once
 
 #include "EngineGLImplTraits.hpp"
-#include "TextureGL.h"
 #include "TextureBase.hpp"
 #include "TextureViewGLImpl.hpp" // Required by TextureBase
 #include "GLObjectWrapper.hpp"
diff --git a/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.hpp b/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.hpp
index 92e41ffe..e25122dd 100644
--- a/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.hpp
+++ b/Graphics/GraphicsEngineOpenGL/include/TextureViewGLImpl.hpp
@@ -28,7 +28,6 @@
 #pragma once
 
 #include "EngineGLImplTraits.hpp"
-#include "TextureViewGL.h"
 #include "TextureViewBase.hpp"
 #include "GLObjectWrapper.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp
index 3f421920..a38bc849 100644
--- a/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/BottomLevelASVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Definition of the Diligent::BottomLevelASVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "BottomLevelASVk.h"
 #include "BottomLevelASBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 #include "VulkanUtilities/VulkanMemoryManager.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp
index 09d4b6dc..9283f6bd 100644
--- a/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/BufferViewVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::BufferViewVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "BufferViewVk.h"
 #include "BufferViewBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp
index 2144fafc..e9a16e54 100644
--- a/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/BufferVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::BufferVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "BufferVk.h"
 #include "BufferBase.hpp"
 #include "BufferViewVkImpl.hpp" // Required by BufferBase
 
diff --git a/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp
index a9a61dee..d07ce349 100644
--- a/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/CommandQueueVkImpl.hpp
@@ -35,7 +35,6 @@
 #include <atomic>
 
 #include "EngineVkImplTraits.hpp"
-#include "CommandQueueVk.h"
 #include "ObjectBase.hpp"
 #include "FenceVkImpl.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp
index 2d37aa1e..b3d1e1b2 100644
--- a/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/DeviceContextVkImpl.hpp
@@ -34,8 +34,6 @@
 #include <bitset>
 
 #include "EngineVkImplTraits.hpp"
-
-#include "DeviceContextVk.h"
 #include "DeviceContextNextGenBase.hpp"
 
 // Vk object implementations are required by DeviceContextBase
diff --git a/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp
index 21b2a7b9..d7b8f6ff 100644
--- a/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/FenceVkImpl.hpp
@@ -34,7 +34,6 @@
 #include <atomic>
 
 #include "EngineVkImplTraits.hpp"
-#include "FenceVk.h"
 #include "FenceBase.hpp"
 #include "VulkanUtilities/VulkanFencePool.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/FramebufferVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/FramebufferVkImpl.hpp
index 19d4fd2a..94d37835 100644
--- a/Graphics/GraphicsEngineVulkan/include/FramebufferVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/FramebufferVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::FramebufferVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "FramebufferVk.h"
 #include "FramebufferBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp b/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp
index 18f1cf65..cb2c0ae7 100644
--- a/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/ManagedVulkanObject.hpp
@@ -34,8 +34,6 @@
 namespace Diligent
 {
 
-class RenderDeviceVkImpl;
-
 template <typename VulkanObjectWrapperType>
 class ManagedVulkanObject : public DeviceObjectBase<IDeviceObject, RenderDeviceVkImpl, DeviceObjectAttribs>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp
index 5823f884..bd27267a 100644
--- a/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/PipelineResourceSignatureVkImpl.hpp
@@ -48,8 +48,6 @@
 namespace Diligent
 {
 
-class RenderDeviceVkImpl;
-class ShaderVariableManagerVk;
 struct SPIRVShaderResourceAttribs;
 
 /// Implementation of the Diligent::PipelineResourceSignatureVkImpl class
diff --git a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp
index 9f336fe5..8cd27ea3 100644
--- a/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/PipelineStateVkImpl.hpp
@@ -34,7 +34,6 @@
 #include <memory>
 
 #include "EngineVkImplTraits.hpp"
-#include "PipelineStateVk.h"
 #include "PipelineStateBase.hpp"
 #include "PipelineResourceSignatureVkImpl.hpp" // Required by PipelineStateBase
 
@@ -48,11 +47,6 @@
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-class ShaderVariableManagerVk;
-class ShaderVkImpl;
-class ShaderResourceBindingVkImpl;
-
 /// Pipeline state object implementation in Vulkan backend.
 class PipelineStateVkImpl final : public PipelineStateBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp
index 76f94f85..45e089dc 100644
--- a/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/QueryVkImpl.hpp
@@ -33,15 +33,12 @@
 #include <array>
 
 #include "EngineVkImplTraits.hpp"
-#include "QueryVk.h"
 #include "QueryBase.hpp"
 #include "QueryManagerVk.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Query implementation in Vulkan backend.
 class QueryVkImpl final : public QueryBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
index d9145764..9fd7e8c3 100644
--- a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.hpp
@@ -33,8 +33,6 @@
 
 #include "EngineVkImplTraits.hpp"
 
-#include "CommandQueueVk.h"
-
 #include "RenderDeviceBase.hpp"
 #include "RenderDeviceNextGenBase.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/RenderPassVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/RenderPassVkImpl.hpp
index d155a0cd..8cca21e8 100644
--- a/Graphics/GraphicsEngineVulkan/include/RenderPassVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/RenderPassVkImpl.hpp
@@ -30,17 +30,13 @@
 /// \file
 /// Declaration of Diligent::RenderPassVkImpl class
 
-#include "RenderDeviceVk.h"
-#include "RenderPassVk.h"
+#include "EngineVkImplTraits.hpp"
 #include "RenderPassBase.hpp"
-#include "RenderDeviceVkImpl.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Render pass implementation in Vulkan backend.
 class RenderPassVkImpl final : public RenderPassBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp
index 5a74d660..2ba83141 100644
--- a/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/SamplerVkImpl.hpp
@@ -31,15 +31,12 @@
 /// Declaration of Diligent::SamplerVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "SamplerVk.h"
 #include "SamplerBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Sampler object object implementation in Vulkan backend.
 class SamplerVkImpl final : public SamplerBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderBindingTableVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderBindingTableVkImpl.hpp
index d8533118..33a26e8f 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderBindingTableVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderBindingTableVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Definition of the Diligent::ShaderBindingTableVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "ShaderBindingTableVk.h"
 #include "ShaderBindingTableBase.hpp"
 #include "TopLevelASVkImpl.hpp"
 #include "PipelineStateVkImpl.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
index 23c9e513..bccd55f9 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderResourceBindingVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::ShaderResourceBindingVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "ShaderResourceBindingVk.h"
 #include "ShaderResourceBindingBase.hpp"
 #include "ShaderBase.hpp"
 
diff --git a/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp
index 60c464d6..2ade8389 100644
--- a/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/ShaderVkImpl.hpp
@@ -31,16 +31,12 @@
 /// Declaration of Diligent::ShaderVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "ShaderVk.h"
 #include "ShaderBase.hpp"
 #include "SPIRVShaderResources.hpp"
 
 namespace Diligent
 {
 
-class ResourceMapping;
-class FixedBlockMemoryAllocator;
-
 /// Shader object object implementation in Vulkan backend.
 class ShaderVkImpl final : public ShaderBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp
index 271fee6c..d8601aff 100644
--- a/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/TextureViewVkImpl.hpp
@@ -31,15 +31,12 @@
 /// Declaration of Diligent::TextureViewVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "TextureViewVk.h"
 #include "TextureViewBase.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
 
 namespace Diligent
 {
 
-class FixedBlockMemoryAllocator;
-
 /// Texture view implementation in Vulkan backend.
 class TextureViewVkImpl final : public TextureViewBase<EngineVkImplTraits>
 {
diff --git a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp
index 7b20f577..cdecd177 100644
--- a/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/TextureVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Declaration of Diligent::TextureVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "TextureVk.h"
 #include "TextureBase.hpp"
 #include "TextureViewVkImpl.hpp"
 #include "VulkanUtilities/VulkanMemoryManager.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp b/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp
index c8525039..03dd9560 100644
--- a/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp
+++ b/Graphics/GraphicsEngineVulkan/include/TopLevelASVkImpl.hpp
@@ -31,7 +31,6 @@
 /// Definition of the Diligent::TopLevelASVkImpl class
 
 #include "EngineVkImplTraits.hpp"
-#include "TopLevelASVk.h"
 #include "TopLevelASBase.hpp"
 #include "BottomLevelASVkImpl.hpp"
 #include "VulkanUtilities/VulkanObjectWrappers.hpp"
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h
index f8b6398a..ba573fc9 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanUtilities/VulkanHeaders.h
@@ -31,13 +31,13 @@
 #    define VK_NO_PROTOTYPES
 #endif
 
+#define VK_ENABLE_BETA_EXTENSIONS
+#include "vulkan/vulkan.h"
+
 #define VK_FORMAT_RANGE_SIZE (VK_FORMAT_ASTC_12x12_SRGB_BLOCK - VK_FORMAT_UNDEFINED + 1)
 
 #if DILIGENT_USE_VOLK
-#    define VK_ENABLE_BETA_EXTENSIONS
 #    include "volk/volk.h"
-#else
-#    include "vulkan/vulkan.h"
 #endif
 
 #if defined(VK_USE_PLATFORM_XLIB_KHR) || defined(_X11_XLIB_H_)
diff --git a/Graphics/GraphicsEngineVulkan/src/RenderPassVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/RenderPassVkImpl.cpp
index d9ac8d03..0fc7ace9 100644
--- a/Graphics/GraphicsEngineVulkan/src/RenderPassVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/RenderPassVkImpl.cpp
@@ -29,6 +29,7 @@
 #include <vector>
 
 #include "RenderPassVkImpl.hpp"
+#include "RenderDeviceVkImpl.hpp"
 #include "VulkanTypeConversions.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
index 1cba1686..5135067b 100644
--- a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
@@ -33,12 +33,6 @@
 #include "VulkanTypeConversions.hpp"
 #include "EngineMemory.h"
 
-#ifdef VK_USE_PLATFORM_WIN32_KHR
-#    define WIN32_LEAN_AND_MEAN
-#    include <Windows.h>
-#    undef CreateSemaphore
-#endif
-
 namespace Diligent
 {