Updated include test to reference all headers relative to the Engine root

96 files changed, 96 insertions, 96 deletions

diff --git a/Tests/IncludeTest/CMakeLists.txt b/Tests/IncludeTest/CMakeLists.txt
index 4086b78..34ec85d 100644
--- a/Tests/IncludeTest/CMakeLists.txt
+++ b/Tests/IncludeTest/CMakeLists.txt
@@ -27,7 +27,7 @@ if(GL_SUPPORTED OR GLES_SUPPORTED)
     source_group("src\\GraphicsEngineOpenGL" FILES ${GRAPHICS_ENGINE_GL_INC_TEST})
 endif()
 
-target_include_directories(IncludeTest PRIVATE ../../DiligentCore ../..)
+target_include_directories(IncludeTest PRIVATE ../..)
 target_link_libraries(IncludeTest PRIVATE BuildSettings)
 set_common_target_properties(IncludeTest)
 
diff --git a/Tests/IncludeTest/src/Common/AdaptiveFixedBlockAllocatorH_test.cpp b/Tests/IncludeTest/src/Common/AdaptiveFixedBlockAllocatorH_test.cpp
index 0001f36..e9114a7 100644
--- a/Tests/IncludeTest/src/Common/AdaptiveFixedBlockAllocatorH_test.cpp
+++ b/Tests/IncludeTest/src/Common/AdaptiveFixedBlockAllocatorH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/AdaptiveFixedBlockAllocator.h"
+#include "DiligentCore/Common/interface/AdaptiveFixedBlockAllocator.h"
diff --git a/Tests/IncludeTest/src/Common/AdvancedMathH_test.cpp b/Tests/IncludeTest/src/Common/AdvancedMathH_test.cpp
index 32ecfc7..168ebb4 100644
--- a/Tests/IncludeTest/src/Common/AdvancedMathH_test.cpp
+++ b/Tests/IncludeTest/src/Common/AdvancedMathH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/AdvancedMath.h"
+#include "DiligentCore/Common/interface/AdvancedMath.h"
diff --git a/Tests/IncludeTest/src/Common/BasicFileStreamH_test.cpp b/Tests/IncludeTest/src/Common/BasicFileStreamH_test.cpp
index a384d84..252a25d 100644
--- a/Tests/IncludeTest/src/Common/BasicFileStreamH_test.cpp
+++ b/Tests/IncludeTest/src/Common/BasicFileStreamH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/BasicFileStream.h"
+#include "DiligentCore/Common/interface/BasicFileStream.h"
diff --git a/Tests/IncludeTest/src/Common/BasicMathH_test.cpp b/Tests/IncludeTest/src/Common/BasicMathH_test.cpp
index 5b0640d..8846a5a 100644
--- a/Tests/IncludeTest/src/Common/BasicMathH_test.cpp
+++ b/Tests/IncludeTest/src/Common/BasicMathH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/BasicMath.h"
+#include "DiligentCore/Common/interface/BasicMath.h"
diff --git a/Tests/IncludeTest/src/Common/DataBlobImplH_test.cpp b/Tests/IncludeTest/src/Common/DataBlobImplH_test.cpp
index 5913777..f43a1c6 100644
--- a/Tests/IncludeTest/src/Common/DataBlobImplH_test.cpp
+++ b/Tests/IncludeTest/src/Common/DataBlobImplH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/DataBlobImpl.h"
+#include "DiligentCore/Common/interface/DataBlobImpl.h"
diff --git a/Tests/IncludeTest/src/Common/DefaultRawMemoryAllocatorH_test.cpp b/Tests/IncludeTest/src/Common/DefaultRawMemoryAllocatorH_test.cpp
index d3738a2..b07b218 100644
--- a/Tests/IncludeTest/src/Common/DefaultRawMemoryAllocatorH_test.cpp
+++ b/Tests/IncludeTest/src/Common/DefaultRawMemoryAllocatorH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/DefaultRawMemoryAllocator.h"
+#include "DiligentCore/Common/interface/DefaultRawMemoryAllocator.h"
diff --git a/Tests/IncludeTest/src/Common/FileWrapperH_test.cpp b/Tests/IncludeTest/src/Common/FileWrapperH_test.cpp
index c433710..3e67b09 100644
--- a/Tests/IncludeTest/src/Common/FileWrapperH_test.cpp
+++ b/Tests/IncludeTest/src/Common/FileWrapperH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/FileWrapper.h"
+#include "DiligentCore/Common/interface/FileWrapper.h"
diff --git a/Tests/IncludeTest/src/Common/FixedBlockMemoryAllocatorH_test.cpp b/Tests/IncludeTest/src/Common/FixedBlockMemoryAllocatorH_test.cpp
index f6975f2..8cd5482 100644
--- a/Tests/IncludeTest/src/Common/FixedBlockMemoryAllocatorH_test.cpp
+++ b/Tests/IncludeTest/src/Common/FixedBlockMemoryAllocatorH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/FixedBlockMemoryAllocator.h"
+#include "DiligentCore/Common/interface/FixedBlockMemoryAllocator.h"
diff --git a/Tests/IncludeTest/src/Common/HashUtilsH_test.cpp b/Tests/IncludeTest/src/Common/HashUtilsH_test.cpp
index a9a261d..0123479 100644
--- a/Tests/IncludeTest/src/Common/HashUtilsH_test.cpp
+++ b/Tests/IncludeTest/src/Common/HashUtilsH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/HashUtils.h"
+#include "DiligentCore/Common/interface/HashUtils.h"
diff --git a/Tests/IncludeTest/src/Common/LockHelperH_test.cpp b/Tests/IncludeTest/src/Common/LockHelperH_test.cpp
index 76db2d6..22952cf 100644
--- a/Tests/IncludeTest/src/Common/LockHelperH_test.cpp
+++ b/Tests/IncludeTest/src/Common/LockHelperH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/LockHelper.h"
+#include "DiligentCore/Common/interface/LockHelper.h"
diff --git a/Tests/IncludeTest/src/Common/ObjectBaseH_test.cpp b/Tests/IncludeTest/src/Common/ObjectBaseH_test.cpp
index 4e9bc26..80fded4 100644
--- a/Tests/IncludeTest/src/Common/ObjectBaseH_test.cpp
+++ b/Tests/IncludeTest/src/Common/ObjectBaseH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/ObjectBase.h"
+#include "DiligentCore/Common/interface/ObjectBase.h"
diff --git a/Tests/IncludeTest/src/Common/RefCntAutoPtrH_test.cpp b/Tests/IncludeTest/src/Common/RefCntAutoPtrH_test.cpp
index f3f2097..dce3b3f 100644
--- a/Tests/IncludeTest/src/Common/RefCntAutoPtrH_test.cpp
+++ b/Tests/IncludeTest/src/Common/RefCntAutoPtrH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/RefCntAutoPtr.h"
+#include "DiligentCore/Common/interface/RefCntAutoPtr.h"
diff --git a/Tests/IncludeTest/src/Common/RefCountedObjectImplH_test.cpp b/Tests/IncludeTest/src/Common/RefCountedObjectImplH_test.cpp
index 6562bc7..bb21250 100644
--- a/Tests/IncludeTest/src/Common/RefCountedObjectImplH_test.cpp
+++ b/Tests/IncludeTest/src/Common/RefCountedObjectImplH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/RefCountedObjectImpl.h"
+#include "DiligentCore/Common/interface/RefCountedObjectImpl.h"
diff --git a/Tests/IncludeTest/src/Common/STDAllocatorH_test.cpp b/Tests/IncludeTest/src/Common/STDAllocatorH_test.cpp
index 35cc148..1d861db 100644
--- a/Tests/IncludeTest/src/Common/STDAllocatorH_test.cpp
+++ b/Tests/IncludeTest/src/Common/STDAllocatorH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/STDAllocator.h"
+#include "DiligentCore/Common/interface/STDAllocator.h"
diff --git a/Tests/IncludeTest/src/Common/StringDataBlobImplH_test.cpp b/Tests/IncludeTest/src/Common/StringDataBlobImplH_test.cpp
index 119c201..2e7233a 100644
--- a/Tests/IncludeTest/src/Common/StringDataBlobImplH_test.cpp
+++ b/Tests/IncludeTest/src/Common/StringDataBlobImplH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/StringDataBlobImpl.h"
+#include "DiligentCore/Common/interface/StringDataBlobImpl.h"
diff --git a/Tests/IncludeTest/src/Common/StringToolsH_test.cpp b/Tests/IncludeTest/src/Common/StringToolsH_test.cpp
index c5acecf..4205ce1 100644
--- a/Tests/IncludeTest/src/Common/StringToolsH_test.cpp
+++ b/Tests/IncludeTest/src/Common/StringToolsH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/StringTools.h"
+#include "DiligentCore/Common/interface/StringTools.h"
diff --git a/Tests/IncludeTest/src/Common/TimerH_test.cpp b/Tests/IncludeTest/src/Common/TimerH_test.cpp
index 74394c5..1f43a36 100644
--- a/Tests/IncludeTest/src/Common/TimerH_test.cpp
+++ b/Tests/IncludeTest/src/Common/TimerH_test.cpp
@@ -21,5 +21,5 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/Timer.h"
+#include "DiligentCore/Common/interface/Timer.h"
 
diff --git a/Tests/IncludeTest/src/Common/UniqueIdentifierH_test.cpp b/Tests/IncludeTest/src/Common/UniqueIdentifierH_test.cpp
index 6747481..2a9503b 100644
--- a/Tests/IncludeTest/src/Common/UniqueIdentifierH_test.cpp
+++ b/Tests/IncludeTest/src/Common/UniqueIdentifierH_test.cpp
@@ -21,5 +21,5 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/UniqueIdentifier.h"
+#include "DiligentCore/Common/interface/UniqueIdentifier.h"
 
diff --git a/Tests/IncludeTest/src/Common/ValidatedCastH_test.cpp b/Tests/IncludeTest/src/Common/ValidatedCastH_test.cpp
index e7008c2..7a0d2ad 100644
--- a/Tests/IncludeTest/src/Common/ValidatedCastH_test.cpp
+++ b/Tests/IncludeTest/src/Common/ValidatedCastH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Common/interface/ValidatedCast.h"
+#include "DiligentCore/Common/interface/ValidatedCast.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/BlendStateH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/BlendStateH_test.cpp
index dc57d4c..32f0cec 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/BlendStateH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/BlendStateH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/BlendState.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/BlendState.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/BufferH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/BufferH_test.cpp
index a25a455..fff4653 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/BufferH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/BufferH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/Buffer.h"
\ No newline at end of file
+#include "DiligentCore/Graphics/GraphicsEngine/interface/Buffer.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsEngine/BufferViewH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/BufferViewH_test.cpp
index a5fa612..3d4dfc9 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/BufferViewH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/BufferViewH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/BufferView.h"
\ No newline at end of file
+#include "DiligentCore/Graphics/GraphicsEngine/interface/BufferView.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsEngine/CommandListH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/CommandListH_test.cpp
index 0a0d132..33a1366 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/CommandListH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/CommandListH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/CommandList.h"
\ No newline at end of file
+#include "DiligentCore/Graphics/GraphicsEngine/interface/CommandList.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsEngine/ConstantsH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/ConstantsH_test.cpp
index 3cc396d..ea8bdfd 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/ConstantsH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/ConstantsH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/Constants.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/Constants.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/DepthStencilStateH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/DepthStencilStateH_test.cpp
index 488ea53..7716c01 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/DepthStencilStateH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/DepthStencilStateH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/DepthStencilState.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/DepthStencilState.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/DeviceCapsH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/DeviceCapsH_test.cpp
index 07687a9..1153d3b 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/DeviceCapsH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/DeviceCapsH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/DeviceCaps.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceCaps.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/DeviceContextH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/DeviceContextH_test.cpp
index de49ec3..ff2f690 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/DeviceContextH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/DeviceContextH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/DeviceContext.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/DeviceObjectH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/DeviceObjectH_test.cpp
index bb902e5..602dc0c 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/DeviceObjectH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/DeviceObjectH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/DeviceObject.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceObject.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/GraphicsTypesH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/GraphicsTypesH_test.cpp
index 6332a34..b978c4c 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/GraphicsTypesH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/GraphicsTypesH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/GraphicsTypes.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/GraphicsTypes.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/InputLayoutH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/InputLayoutH_test.cpp
index d3f2301..d04f074 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/InputLayoutH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/InputLayoutH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/InputLayout.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/InputLayout.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/MapHelperH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/MapHelperH_test.cpp
index b5e4c17..7e48048 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/MapHelperH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/MapHelperH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/MapHelper.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/MapHelper.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/PipelineStateH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/PipelineStateH_test.cpp
index 54228dd..84190f9 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/PipelineStateH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/PipelineStateH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/PipelineState.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/PipelineState.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/RasterizerStateH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/RasterizerStateH_test.cpp
index 1f8d765..72d141f 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/RasterizerStateH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/RasterizerStateH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/RasterizerState.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/RasterizerState.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/RenderDeviceH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/RenderDeviceH_test.cpp
index cd65f5e..ddd4bc6 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/RenderDeviceH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/RenderDeviceH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/RenderDevice.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/ResourceMappingH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/ResourceMappingH_test.cpp
index 6f85cbd..f18701b 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/ResourceMappingH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/ResourceMappingH_test.cpp
@@ -21,5 +21,5 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/ResourceMapping.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/ResourceMapping.h"
 
diff --git a/Tests/IncludeTest/src/GraphicsEngine/SamplerH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/SamplerH_test.cpp
index 8ea0c59..6a0b2f7 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/SamplerH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/SamplerH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/Sampler.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/Sampler.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/ShaderH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/ShaderH_test.cpp
index 6a45e50..8449f02 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/ShaderH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/ShaderH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/Shader.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/Shader.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/ShaderResourceBindingH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/ShaderResourceBindingH_test.cpp
index 4f80d26..63a665b 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/ShaderResourceBindingH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/ShaderResourceBindingH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/ShaderResourceBinding.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/SwapChainH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/SwapChainH_test.cpp
index ffdab80..fda88ea 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/SwapChainH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/SwapChainH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/SwapChain.h"
\ No newline at end of file
+#include "DiligentCore/Graphics/GraphicsEngine/interface/SwapChain.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsEngine/TextureH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/TextureH_test.cpp
index 2fdefc3..2e47134 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/TextureH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/TextureH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/Texture.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/Texture.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngine/TextureViewH_test.cpp b/Tests/IncludeTest/src/GraphicsEngine/TextureViewH_test.cpp
index ddc8c40..444d091 100644
--- a/Tests/IncludeTest/src/GraphicsEngine/TextureViewH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngine/TextureViewH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngine/interface/TextureView.h"
+#include "DiligentCore/Graphics/GraphicsEngine/interface/TextureView.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferD3D11H_test.cpp
index fa35235..9336f24 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d11.h>
-#include "Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp
index d9e6f28..79c60fe 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d11.h>
-#include "Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp
index d60c175..fc360ce 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d11.h>
-#include "Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp
index 6e487ca..81881e6 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/EngineD3D11AttribsH_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d11.h>
-#include "Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp
index 8dd71be..565cc5f 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d11.h>
-#include "Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp
index ec2602a..fa55f84 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d11.h>
-#include "Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp
index 24ad3a3..6f7b0e2 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/RenderDeviceFactoryD3D11H_test.cpp
@@ -30,4 +30,4 @@
 #   define ENGINE_DLL 1
 #endif
 
-#include "Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/SamplerD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/SamplerD3D11H_test.cpp
index 7046d27..39b72b8 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/SamplerD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/SamplerD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d11.h>
-#include "Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderD3D11H_test.cpp
index 0192848..12acfc9 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 #include <d3d11.h>
 
-#include "Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp
index f9485b1..ca91da0 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 #include <d3d11.h>
 
-#include "Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp
index bb0d1df..e60708b 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 #include <d3d11.h>
-#include "Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h"
\ No newline at end of file
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureD3D11H_test.cpp
index 451359e..9655d2b 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 #include <d3d11.h>
 
-#include "Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp
index 443d204..775dc89 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp
@@ -22,4 +22,4 @@
  */
 #include <d3d11.h>
 
-#include "Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferD3D12H_test.cpp
index 3db8cdc..0fca3db 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferD3D12H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp
index 0086aa7..674284e 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp
index 0086aa7..674284e 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp
index bdcef33..b82e29c 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp
index 936145d..ccfef4a 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp
index 0595fea..d0c0559 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp
index 3169a9a..a7cf1c4 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/RenderDeviceFactoryD3D12H_test.cpp
@@ -30,4 +30,4 @@
 #   define ENGINE_DLL 1
 #endif
 
-#include "Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/SamplerD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/SamplerD3D12H_test.cpp
index 404f38a..76eb398 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/SamplerD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/SamplerD3D12H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderD3D12H_test.cpp
index 21d706d..3bcacdf 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderD3D12H_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp
index 95efd7f..8ffdd2e 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp
index 70908be..7819ce4 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h"
\ No newline at end of file
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureD3D12H_test.cpp
index 125097e..8d0f5eb 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureD3D12H_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp
index f5f3a43..f124c62 100644
--- a/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp
@@ -22,4 +22,4 @@
  */
 
 #include <d3d12.h>
-#include "Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h"
+#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp
index 7a51c2c..3249b87 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/BaseInterfacesGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BaseInterfacesGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp
index c6d2a67..c731193 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferGLH_test.cpp
@@ -22,4 +22,4 @@
  */
 
 typedef unsigned int GLuint;
-#include "Graphics/GraphicsEngineOpenGL/interface/BufferGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp
index aea4f3e..93cd469 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/BufferViewGLH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp
index 897f832..f883fca 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp
index 897f832..f883fca 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/EngineGLAttribsH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp
index 7afefd0..75e94de 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp
index 7065767..bce6a7b 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceFactoryOpenGLH_test.cpp
@@ -32,4 +32,4 @@
 #   define ENGINE_DLL 1
 #endif
 
-#include "Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp
index 8020a62..119bb87 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp
index a430d32..071c03e 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SamplerGLH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp
index a9621af..b812f30 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderGLH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp
index dc0c659..f2fec06 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp
@@ -20,4 +20,4 @@
  *  all other commercial damages or losses), even if such Contributor has been advised 
  *  of the possibility of such damages.
  */
-#include "Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp
index 2b3cc6e..57da8f7 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/SwapChainGLH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 typedef unsigned int GLuint;
-#include "Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h"
\ No newline at end of file
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h"
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp
index d6b752c..0c57f2c 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureGLH_test.cpp
@@ -22,4 +22,4 @@
  */
 typedef unsigned int GLuint;
 typedef unsigned int GLenum;
-#include "Graphics/GraphicsEngineOpenGL/interface/TextureGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp
index ef52115..74398ef 100644
--- a/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsEngineOpenGL/TextureViewGLH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h"
+#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h"
diff --git a/Tests/IncludeTest/src/GraphicsTools/BasicShaderSourceStreamFactoryH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/BasicShaderSourceStreamFactoryH_test.cpp
index 2c9ed1f..ebca682 100644
--- a/Tests/IncludeTest/src/GraphicsTools/BasicShaderSourceStreamFactoryH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsTools/BasicShaderSourceStreamFactoryH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h"
+#include "DiligentCore/Graphics/GraphicsTools/include/BasicShaderSourceStreamFactory.h"
diff --git a/Tests/IncludeTest/src/GraphicsTools/CommonlyUsedStatesH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/CommonlyUsedStatesH_test.cpp
index e668400..45b7319 100644
--- a/Tests/IncludeTest/src/GraphicsTools/CommonlyUsedStatesH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsTools/CommonlyUsedStatesH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsTools/include/CommonlyUsedStates.h"
+#include "DiligentCore/Graphics/GraphicsTools/include/CommonlyUsedStates.h"
diff --git a/Tests/IncludeTest/src/GraphicsTools/GraphicsUtilitiesH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/GraphicsUtilitiesH_test.cpp
index 1b634cd..a75edab 100644
--- a/Tests/IncludeTest/src/GraphicsTools/GraphicsUtilitiesH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsTools/GraphicsUtilitiesH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsTools/include/GraphicsUtilities.h"
+#include "DiligentCore/Graphics/GraphicsTools/include/GraphicsUtilities.h"
diff --git a/Tests/IncludeTest/src/GraphicsTools/ShaderMacroHelperH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/ShaderMacroHelperH_test.cpp
index fa9935a..e7c5496 100644
--- a/Tests/IncludeTest/src/GraphicsTools/ShaderMacroHelperH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsTools/ShaderMacroHelperH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsTools/include/ShaderMacroHelper.h"
+#include "DiligentCore/Graphics/GraphicsTools/include/ShaderMacroHelper.h"
diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderBaseH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderBaseH_test.cpp
index 0134154..4b0f26a 100644
--- a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderBaseH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderBaseH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsTools/include/TextureUploaderBase.h"
+#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderBase.h"
diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D11H_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D11H_test.cpp
index 86e1b0d..b6abc9b 100644
--- a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D11H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D11H_test.cpp
@@ -22,5 +22,5 @@
  */
 
 #if D3D11_SUPPORTED
-#include "Graphics/GraphicsTools/include/TextureUploaderD3D11.h"
+#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderD3D11.h"
 #endif
diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D12H_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D12H_test.cpp
index c4885ff..80f6c01 100644
--- a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D12H_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderD3D12H_test.cpp
@@ -22,5 +22,5 @@
  */
 
 #if D3D12_SUPPORTED
-#include "Graphics/GraphicsTools/include/TextureUploaderD3D12.h"
+#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderD3D12.h"
 #endif
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderGLH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderGLH_test.cpp
index 51e6682..62947d6 100644
--- a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderGLH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderGLH_test.cpp
@@ -22,5 +22,5 @@
  */
 
 #if GL_SUPPORTED || GLES_SUPPORTED
-#include "Graphics/GraphicsTools/include/TextureUploaderGL.h"
+#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderGL.h"
 #endif
\ No newline at end of file
diff --git a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderH_test.cpp b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderH_test.cpp
index 7934358..4716de2 100644
--- a/Tests/IncludeTest/src/GraphicsTools/TextureUploaderH_test.cpp
+++ b/Tests/IncludeTest/src/GraphicsTools/TextureUploaderH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Graphics/GraphicsTools/include/TextureUploader.h"
+#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploader.h"
diff --git a/Tests/IncludeTest/src/Platforms/AtomicsH_test.cpp b/Tests/IncludeTest/src/Platforms/AtomicsH_test.cpp
index 540d29b..d006d34 100644
--- a/Tests/IncludeTest/src/Platforms/AtomicsH_test.cpp
+++ b/Tests/IncludeTest/src/Platforms/AtomicsH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Platforms/interface/Atomics.h"
+#include "DiligentCore/Platforms/interface/Atomics.h"
diff --git a/Tests/IncludeTest/src/Platforms/FileSystemH_test.cpp b/Tests/IncludeTest/src/Platforms/FileSystemH_test.cpp
index e7e3cd6..c95560f 100644
--- a/Tests/IncludeTest/src/Platforms/FileSystemH_test.cpp
+++ b/Tests/IncludeTest/src/Platforms/FileSystemH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Platforms/interface/FileSystem.h"
+#include "DiligentCore/Platforms/interface/FileSystem.h"
diff --git a/Tests/IncludeTest/src/Platforms/PlatformDebugH_test.cpp b/Tests/IncludeTest/src/Platforms/PlatformDebugH_test.cpp
index a229307..00211df 100644
--- a/Tests/IncludeTest/src/Platforms/PlatformDebugH_test.cpp
+++ b/Tests/IncludeTest/src/Platforms/PlatformDebugH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Platforms/interface/PlatformDebug.h"
+#include "DiligentCore/Platforms/interface/PlatformDebug.h"
diff --git a/Tests/IncludeTest/src/Platforms/PlatformDefinitionsH_test.cpp b/Tests/IncludeTest/src/Platforms/PlatformDefinitionsH_test.cpp
index 8086db4..5e0f1fa 100644
--- a/Tests/IncludeTest/src/Platforms/PlatformDefinitionsH_test.cpp
+++ b/Tests/IncludeTest/src/Platforms/PlatformDefinitionsH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Platforms/interface/PlatformDefinitions.h"
+#include "DiligentCore/Platforms/interface/PlatformDefinitions.h"
diff --git a/Tests/IncludeTest/src/Platforms/PlatformMiscH_test.cpp b/Tests/IncludeTest/src/Platforms/PlatformMiscH_test.cpp
index a0d0c3c..001e272 100644
--- a/Tests/IncludeTest/src/Platforms/PlatformMiscH_test.cpp
+++ b/Tests/IncludeTest/src/Platforms/PlatformMiscH_test.cpp
@@ -21,4 +21,4 @@
  *  of the possibility of such damages.
  */
 
-#include "Platforms/interface/PlatformMisc.h"
+#include "DiligentCore/Platforms/interface/PlatformMisc.h"