summaryrefslogtreecommitdiffstats
path: root/UnitTests/IncludeTest
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2019-12-20 02:51:54 +0000
committerassiduous <assiduous@diligentgraphics.com>2019-12-20 02:51:54 +0000
commitc376f42b73fe548cbd6fa0fb529df8dc7020be76 (patch)
tree20e50ee93f62c4fb2ef6f21a67befbacf29c0b55 /UnitTests/IncludeTest
parentAdded ClearRenderTarget test; fixed issue with bound render targets in D3D12 ... (diff)
downloadDiligentCore-c376f42b73fe548cbd6fa0fb529df8dc7020be76.tar.gz
DiligentCore-c376f42b73fe548cbd6fa0fb529df8dc7020be76.zip
Renamed UnitTests folder to Tests
Diffstat (limited to 'UnitTests/IncludeTest')
-rw-r--r--UnitTests/IncludeTest/CMakeLists.txt48
-rw-r--r--UnitTests/IncludeTest/Common/AdvancedMathH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/BasicFileStreamH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/BasicMathH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/DataBlobImplH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/DefaultRawMemoryAllocatorH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/FileWrapperH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/FixedBlockMemoryAllocatorH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/HashUtilsH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/LockHelperH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/ObjectBaseH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/RefCntAutoPtrH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/RefCountedObjectImplH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/STDAllocatorH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/StringDataBlobImplH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/StringPool_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/StringToolsH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/ThreadSignalH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/TimerH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/UniqueIdentifierH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Common/ValidatedCastH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsAccessories/ColorConversionH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsAccessories/GraphicsAccessoriesH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsAccessories/ResourceReleaseQueueH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsAccessories/RingBufferH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsAccessories/SRBMemortAllocatorH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsAccessories/VariableSizeAllocationsManagerH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsAccessories/VariableSizeGPUAllocationsManagerH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/BlendStateH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/BufferH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/BufferViewH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/CommandListH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/ConstantsH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/DefaultShaderSourceStreamFactoryH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/DepthStencilStateH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/DeviceCapsH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/DeviceContextH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/DeviceObjectH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/EngineFactoryH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/FenceH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/GraphicsTypesH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/InputLayoutH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/MapHelperH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/PipelineStateH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/RasterizerStateH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/RenderDeviceH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/ResourceMappingH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/SamplerH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/ShaderH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/ShaderResourceBindingH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/ShaderResourceVaraibleH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/SwapChainH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/TextureH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngine/TextureViewH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/BufferD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/EngineFactoryD3D11H_test.cpp33
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/FenceD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/SamplerD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/ShaderD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/TextureD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/BufferD3D12H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/EngineFactoryD3D12H_test.cpp33
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/FenceD3D12H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/SamplerD3D12H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/ShaderD3D12H_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/TextureD3D12H_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3DBase/ShaderD3DH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineD3DBase/ShaderResourceVariableD3DH_test.cpp23
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/BufferGLH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/BufferViewGLH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.cpp35
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/FenceGLH_test .cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/SamplerGLH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/ShaderGLH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp23
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/SwapChainGLH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/TextureGLH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineOpenGL/TextureViewGLH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/BufferViewVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/BufferVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/CommandQueueVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/DeviceContextVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/EngineFactoryVkH_test.cpp35
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/FenceVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/PipelineStateVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/RenderDeviceVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/SamplerVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/ShaderResourceBindingVkH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/ShaderVkH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/SwapChainVkH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/TextureViewVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsEngineVk/TextureVkH_test.cpp25
-rw-r--r--UnitTests/IncludeTest/GraphicsTools/CommonlyUsedStatesH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsTools/GraphicsUtilitiesH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsTools/ShaderMacroHelperH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsTools/TextureUploaderBaseH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/GraphicsTools/TextureUploaderD3D11H_test.cpp26
-rw-r--r--UnitTests/IncludeTest/GraphicsTools/TextureUploaderD3D12_VkH_test.cpp26
-rw-r--r--UnitTests/IncludeTest/GraphicsTools/TextureUploaderGLH_test.cpp26
-rw-r--r--UnitTests/IncludeTest/GraphicsTools/TextureUploaderH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Platforms/AtomicsH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Platforms/FileSystemH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Platforms/PlatformDebugH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Platforms/PlatformDefinitionsH_test.cpp24
-rw-r--r--UnitTests/IncludeTest/Platforms/PlatformMiscH_test.cpp24
124 files changed, 0 insertions, 3077 deletions
diff --git a/UnitTests/IncludeTest/CMakeLists.txt b/UnitTests/IncludeTest/CMakeLists.txt
deleted file mode 100644
index 3208c23f..00000000
--- a/UnitTests/IncludeTest/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-cmake_minimum_required (VERSION 3.6)
-
-project(DiligentCore-IncludeTest)
-
-file(GLOB_RECURSE SOURCE LIST_DIRECTORIES false *.cpp)
-
-if(NOT D3D11_SUPPORTED)
- file(GLOB GRAPHICS_ENGINE_D3D11_INC_TEST LIST_DIRECTORIES false GraphicsEngineD3D11/*.cpp)
- list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_D3D11_INC_TEST})
-endif()
-
-if(NOT D3D12_SUPPORTED)
- file(GLOB GRAPHICS_ENGINE_D3D12_INC_TEST LIST_DIRECTORIES false GraphicsEngineD3D12/*.cpp)
- list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_D3D12_INC_TEST})
-endif()
-
-if(NOT D3D11_SUPPORTED AND NOT D3D12_SUPPORTED)
- file(GLOB GRAPHICS_ENGINE_D3DBASE_INC_TEST LIST_DIRECTORIES false GraphicsEngineD3DBase/*.cpp)
- list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_D3DBASE_INC_TEST})
-endif()
-
-if(NOT GL_SUPPORTED AND NOT GLES_SUPPORTED)
- file(GLOB GRAPHICS_ENGINE_GL_INC_TEST LIST_DIRECTORIES false GraphicsEngineOpenGL/*.cpp)
- list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_GL_INC_TEST})
-endif()
-
-if(NOT VULKAN_SUPPORTED)
- file(GLOB GRAPHICS_ENGINE_VK_INC_TEST LIST_DIRECTORIES false GraphicsEngineVk/*.cpp)
- list(REMOVE_ITEM SOURCE ${GRAPHICS_ENGINE_VK_INC_TEST})
-endif()
-
-add_library(DiligentCore-IncludeTest ${SOURCE})
-
-target_include_directories(DiligentCore-IncludeTest PRIVATE ../../..)
-target_link_libraries(DiligentCore-IncludeTest PRIVATE Diligent-BuildSettings)
-set_common_target_properties(DiligentCore-IncludeTest)
-
-if(MSVC)
- set_target_properties(DiligentCore-IncludeTest PROPERTIES
- STATIC_LIBRARY_FLAGS "/IGNORE:4221"
- )
-endif()
-
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCE})
-
-set_target_properties(DiligentCore-IncludeTest PROPERTIES
- FOLDER "DiligentCore/Tests"
-)
diff --git a/UnitTests/IncludeTest/Common/AdvancedMathH_test.cpp b/UnitTests/IncludeTest/Common/AdvancedMathH_test.cpp
deleted file mode 100644
index df8cc14f..00000000
--- a/UnitTests/IncludeTest/Common/AdvancedMathH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/AdvancedMath.h"
diff --git a/UnitTests/IncludeTest/Common/BasicFileStreamH_test.cpp b/UnitTests/IncludeTest/Common/BasicFileStreamH_test.cpp
deleted file mode 100644
index aa08514c..00000000
--- a/UnitTests/IncludeTest/Common/BasicFileStreamH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/BasicFileStream.h"
diff --git a/UnitTests/IncludeTest/Common/BasicMathH_test.cpp b/UnitTests/IncludeTest/Common/BasicMathH_test.cpp
deleted file mode 100644
index 09576d34..00000000
--- a/UnitTests/IncludeTest/Common/BasicMathH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/BasicMath.h"
diff --git a/UnitTests/IncludeTest/Common/DataBlobImplH_test.cpp b/UnitTests/IncludeTest/Common/DataBlobImplH_test.cpp
deleted file mode 100644
index f72994d6..00000000
--- a/UnitTests/IncludeTest/Common/DataBlobImplH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/DataBlobImpl.h"
diff --git a/UnitTests/IncludeTest/Common/DefaultRawMemoryAllocatorH_test.cpp b/UnitTests/IncludeTest/Common/DefaultRawMemoryAllocatorH_test.cpp
deleted file mode 100644
index fa3990d4..00000000
--- a/UnitTests/IncludeTest/Common/DefaultRawMemoryAllocatorH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/DefaultRawMemoryAllocator.h"
diff --git a/UnitTests/IncludeTest/Common/FileWrapperH_test.cpp b/UnitTests/IncludeTest/Common/FileWrapperH_test.cpp
deleted file mode 100644
index ac8375b3..00000000
--- a/UnitTests/IncludeTest/Common/FileWrapperH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/FileWrapper.h"
diff --git a/UnitTests/IncludeTest/Common/FixedBlockMemoryAllocatorH_test.cpp b/UnitTests/IncludeTest/Common/FixedBlockMemoryAllocatorH_test.cpp
deleted file mode 100644
index 0d719caa..00000000
--- a/UnitTests/IncludeTest/Common/FixedBlockMemoryAllocatorH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/FixedBlockMemoryAllocator.h"
diff --git a/UnitTests/IncludeTest/Common/HashUtilsH_test.cpp b/UnitTests/IncludeTest/Common/HashUtilsH_test.cpp
deleted file mode 100644
index 79bfaeed..00000000
--- a/UnitTests/IncludeTest/Common/HashUtilsH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/HashUtils.h"
diff --git a/UnitTests/IncludeTest/Common/LockHelperH_test.cpp b/UnitTests/IncludeTest/Common/LockHelperH_test.cpp
deleted file mode 100644
index 19cb7ef9..00000000
--- a/UnitTests/IncludeTest/Common/LockHelperH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/LockHelper.h"
diff --git a/UnitTests/IncludeTest/Common/ObjectBaseH_test.cpp b/UnitTests/IncludeTest/Common/ObjectBaseH_test.cpp
deleted file mode 100644
index 7b1e26dc..00000000
--- a/UnitTests/IncludeTest/Common/ObjectBaseH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/ObjectBase.h"
diff --git a/UnitTests/IncludeTest/Common/RefCntAutoPtrH_test.cpp b/UnitTests/IncludeTest/Common/RefCntAutoPtrH_test.cpp
deleted file mode 100644
index 79c52c90..00000000
--- a/UnitTests/IncludeTest/Common/RefCntAutoPtrH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/RefCntAutoPtr.h"
diff --git a/UnitTests/IncludeTest/Common/RefCountedObjectImplH_test.cpp b/UnitTests/IncludeTest/Common/RefCountedObjectImplH_test.cpp
deleted file mode 100644
index 33df39c0..00000000
--- a/UnitTests/IncludeTest/Common/RefCountedObjectImplH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/RefCountedObjectImpl.h"
diff --git a/UnitTests/IncludeTest/Common/STDAllocatorH_test.cpp b/UnitTests/IncludeTest/Common/STDAllocatorH_test.cpp
deleted file mode 100644
index c2ca54f3..00000000
--- a/UnitTests/IncludeTest/Common/STDAllocatorH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/STDAllocator.h"
diff --git a/UnitTests/IncludeTest/Common/StringDataBlobImplH_test.cpp b/UnitTests/IncludeTest/Common/StringDataBlobImplH_test.cpp
deleted file mode 100644
index 889cca6d..00000000
--- a/UnitTests/IncludeTest/Common/StringDataBlobImplH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/StringDataBlobImpl.h"
diff --git a/UnitTests/IncludeTest/Common/StringPool_test.cpp b/UnitTests/IncludeTest/Common/StringPool_test.cpp
deleted file mode 100644
index 0fe38252..00000000
--- a/UnitTests/IncludeTest/Common/StringPool_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/StringPool.h"
diff --git a/UnitTests/IncludeTest/Common/StringToolsH_test.cpp b/UnitTests/IncludeTest/Common/StringToolsH_test.cpp
deleted file mode 100644
index f4ea9c43..00000000
--- a/UnitTests/IncludeTest/Common/StringToolsH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/StringTools.h"
diff --git a/UnitTests/IncludeTest/Common/ThreadSignalH_test.cpp b/UnitTests/IncludeTest/Common/ThreadSignalH_test.cpp
deleted file mode 100644
index d3e9803b..00000000
--- a/UnitTests/IncludeTest/Common/ThreadSignalH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/ThreadSignal.h"
diff --git a/UnitTests/IncludeTest/Common/TimerH_test.cpp b/UnitTests/IncludeTest/Common/TimerH_test.cpp
deleted file mode 100644
index 9884c09b..00000000
--- a/UnitTests/IncludeTest/Common/TimerH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/Timer.h"
diff --git a/UnitTests/IncludeTest/Common/UniqueIdentifierH_test.cpp b/UnitTests/IncludeTest/Common/UniqueIdentifierH_test.cpp
deleted file mode 100644
index 2c3bb79e..00000000
--- a/UnitTests/IncludeTest/Common/UniqueIdentifierH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/UniqueIdentifier.h"
diff --git a/UnitTests/IncludeTest/Common/ValidatedCastH_test.cpp b/UnitTests/IncludeTest/Common/ValidatedCastH_test.cpp
deleted file mode 100644
index 66aa9ce3..00000000
--- a/UnitTests/IncludeTest/Common/ValidatedCastH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Common/interface/ValidatedCast.h"
diff --git a/UnitTests/IncludeTest/GraphicsAccessories/ColorConversionH_test.cpp b/UnitTests/IncludeTest/GraphicsAccessories/ColorConversionH_test.cpp
deleted file mode 100644
index cf160a97..00000000
--- a/UnitTests/IncludeTest/GraphicsAccessories/ColorConversionH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsAccessories/interface/ColorConversion.h"
diff --git a/UnitTests/IncludeTest/GraphicsAccessories/GraphicsAccessoriesH_test.cpp b/UnitTests/IncludeTest/GraphicsAccessories/GraphicsAccessoriesH_test.cpp
deleted file mode 100644
index dc95f655..00000000
--- a/UnitTests/IncludeTest/GraphicsAccessories/GraphicsAccessoriesH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsAccessories/interface/GraphicsAccessories.h"
diff --git a/UnitTests/IncludeTest/GraphicsAccessories/ResourceReleaseQueueH_test.cpp b/UnitTests/IncludeTest/GraphicsAccessories/ResourceReleaseQueueH_test.cpp
deleted file mode 100644
index 459711c7..00000000
--- a/UnitTests/IncludeTest/GraphicsAccessories/ResourceReleaseQueueH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsAccessories/interface/ResourceReleaseQueue.h"
diff --git a/UnitTests/IncludeTest/GraphicsAccessories/RingBufferH_test.cpp b/UnitTests/IncludeTest/GraphicsAccessories/RingBufferH_test.cpp
deleted file mode 100644
index ebe47e97..00000000
--- a/UnitTests/IncludeTest/GraphicsAccessories/RingBufferH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsAccessories/interface/RingBuffer.h"
diff --git a/UnitTests/IncludeTest/GraphicsAccessories/SRBMemortAllocatorH_test.cpp b/UnitTests/IncludeTest/GraphicsAccessories/SRBMemortAllocatorH_test.cpp
deleted file mode 100644
index 94317363..00000000
--- a/UnitTests/IncludeTest/GraphicsAccessories/SRBMemortAllocatorH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsAccessories/interface/SRBMemoryAllocator.h"
diff --git a/UnitTests/IncludeTest/GraphicsAccessories/VariableSizeAllocationsManagerH_test.cpp b/UnitTests/IncludeTest/GraphicsAccessories/VariableSizeAllocationsManagerH_test.cpp
deleted file mode 100644
index d0cfefe6..00000000
--- a/UnitTests/IncludeTest/GraphicsAccessories/VariableSizeAllocationsManagerH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsAccessories/interface/VariableSizeAllocationsManager.h"
diff --git a/UnitTests/IncludeTest/GraphicsAccessories/VariableSizeGPUAllocationsManagerH_test.cpp b/UnitTests/IncludeTest/GraphicsAccessories/VariableSizeGPUAllocationsManagerH_test.cpp
deleted file mode 100644
index 324f1914..00000000
--- a/UnitTests/IncludeTest/GraphicsAccessories/VariableSizeGPUAllocationsManagerH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsAccessories/interface/VariableSizeGPUAllocationsManager.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/BlendStateH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/BlendStateH_test.cpp
deleted file mode 100644
index 8fe22738..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/BlendStateH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/BlendState.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/BufferH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/BufferH_test.cpp
deleted file mode 100644
index 175494a7..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/BufferH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/Buffer.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngine/BufferViewH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/BufferViewH_test.cpp
deleted file mode 100644
index 3cc88c4e..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/BufferViewH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/BufferView.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngine/CommandListH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/CommandListH_test.cpp
deleted file mode 100644
index abe39f27..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/CommandListH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/CommandList.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngine/ConstantsH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/ConstantsH_test.cpp
deleted file mode 100644
index d5312411..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/ConstantsH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/Constants.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/DefaultShaderSourceStreamFactoryH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/DefaultShaderSourceStreamFactoryH_test.cpp
deleted file mode 100644
index 5cdbc81d..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/DefaultShaderSourceStreamFactoryH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/include/DefaultShaderSourceStreamFactory.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/DepthStencilStateH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/DepthStencilStateH_test.cpp
deleted file mode 100644
index 12502b60..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/DepthStencilStateH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/DepthStencilState.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/DeviceCapsH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/DeviceCapsH_test.cpp
deleted file mode 100644
index 1a2c324c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/DeviceCapsH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceCaps.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/DeviceContextH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/DeviceContextH_test.cpp
deleted file mode 100644
index 1161f611..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/DeviceContextH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/DeviceObjectH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/DeviceObjectH_test.cpp
deleted file mode 100644
index 30f3c828..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/DeviceObjectH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceObject.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/EngineFactoryH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/EngineFactoryH_test.cpp
deleted file mode 100644
index 66a6d061..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/EngineFactoryH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/EngineFactory.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngine/FenceH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/FenceH_test.cpp
deleted file mode 100644
index ec683990..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/FenceH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/Fence.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngine/GraphicsTypesH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/GraphicsTypesH_test.cpp
deleted file mode 100644
index 480e4a16..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/GraphicsTypesH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/GraphicsTypes.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/InputLayoutH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/InputLayoutH_test.cpp
deleted file mode 100644
index 9b3581fa..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/InputLayoutH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/InputLayout.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/MapHelperH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/MapHelperH_test.cpp
deleted file mode 100644
index b3b7a6d0..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/MapHelperH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/MapHelper.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/PipelineStateH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/PipelineStateH_test.cpp
deleted file mode 100644
index b3b19163..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/PipelineStateH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/PipelineState.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/RasterizerStateH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/RasterizerStateH_test.cpp
deleted file mode 100644
index 598e2f5e..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/RasterizerStateH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/RasterizerState.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/RenderDeviceH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/RenderDeviceH_test.cpp
deleted file mode 100644
index 2eaf3641..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/RenderDeviceH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/ResourceMappingH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/ResourceMappingH_test.cpp
deleted file mode 100644
index db76165c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/ResourceMappingH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/ResourceMapping.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/SamplerH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/SamplerH_test.cpp
deleted file mode 100644
index aa02c1f9..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/SamplerH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/Sampler.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/ShaderH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/ShaderH_test.cpp
deleted file mode 100644
index 0e68007c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/ShaderH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/Shader.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/ShaderResourceBindingH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/ShaderResourceBindingH_test.cpp
deleted file mode 100644
index d91f48bf..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/ShaderResourceBindingH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/ShaderResourceVaraibleH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/ShaderResourceVaraibleH_test.cpp
deleted file mode 100644
index 3e0ad249..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/ShaderResourceVaraibleH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/ShaderResourceVariable.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/SwapChainH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/SwapChainH_test.cpp
deleted file mode 100644
index 67be654c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/SwapChainH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/SwapChain.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngine/TextureH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/TextureH_test.cpp
deleted file mode 100644
index 0252cb1c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/TextureH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/Texture.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngine/TextureViewH_test.cpp b/UnitTests/IncludeTest/GraphicsEngine/TextureViewH_test.cpp
deleted file mode 100644
index acafd3c7..00000000
--- a/UnitTests/IncludeTest/GraphicsEngine/TextureViewH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngine/interface/TextureView.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/BufferD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/BufferD3D11H_test.cpp
deleted file mode 100644
index 30ecdc00..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/BufferD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d11.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp
deleted file mode 100644
index 23a5aa37..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/BufferViewD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d11.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp
deleted file mode 100644
index 4b654bc2..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/DeviceContextD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d11.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/EngineFactoryD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/EngineFactoryD3D11H_test.cpp
deleted file mode 100644
index f7a1c6f1..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/EngineFactoryD3D11H_test.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#ifndef NOMINMAX
-# define NOMINMAX
-#endif
-#include <Windows.h>
-
-#ifndef ENGINE_DLL
-# define ENGINE_DLL 1
-#endif
-
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/EngineFactoryD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/FenceD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/FenceD3D11H_test.cpp
deleted file mode 100644
index e568e924..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/FenceD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d11.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/FenceD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp
deleted file mode 100644
index 8fb95d90..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/PipelineStateD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d11.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp
deleted file mode 100644
index abf6da80..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/RenderDeviceD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d11.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/SamplerD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/SamplerD3D11H_test.cpp
deleted file mode 100644
index 00961e95..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/SamplerD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d11.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/ShaderD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/ShaderD3D11H_test.cpp
deleted file mode 100644
index 77ca1a69..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/ShaderD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include <d3d11.h>
-
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp
deleted file mode 100644
index 9409f3f6..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/ShaderResourceBindingD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include <d3d11.h>
-
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp
deleted file mode 100644
index 59f23387..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/SwapChainD3D11H_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include <d3d11.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/TextureD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/TextureD3D11H_test.cpp
deleted file mode 100644
index 4cd32017..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/TextureD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include <d3d11.h>
-
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp
deleted file mode 100644
index 144b72da..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D11/TextureViewD3D11H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include <d3d11.h>
-
-#include "DiligentCore/Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/BufferD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/BufferD3D12H_test.cpp
deleted file mode 100644
index 13945d1c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/BufferD3D12H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp
deleted file mode 100644
index f341419c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/BufferViewD3D12H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp
deleted file mode 100644
index f341419c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/CommandQueueD3D12H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp
deleted file mode 100644
index eafb4881..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/DeviceContextD3D12H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/EngineFactoryD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/EngineFactoryD3D12H_test.cpp
deleted file mode 100644
index a0351d94..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/EngineFactoryD3D12H_test.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#ifndef NOMINMAX
-# define NOMINMAX
-#endif
-#include <Windows.h>
-
-#ifndef ENGINE_DLL
-# define ENGINE_DLL 1
-#endif
-
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/FenceD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/FenceD3D12H_test.cpp
deleted file mode 100644
index 12e265ba..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/FenceD3D12H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/FenceD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp
deleted file mode 100644
index 05aead58..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/PipelineStateD3D12H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp
deleted file mode 100644
index e8d2d2f6..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/RenderDeviceD3D12H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/SamplerD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/SamplerD3D12H_test.cpp
deleted file mode 100644
index 3694cd74..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/SamplerD3D12H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/ShaderD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/ShaderD3D12H_test.cpp
deleted file mode 100644
index 206058ff..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/ShaderD3D12H_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp
deleted file mode 100644
index 5ffcafe3..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/ShaderResourceBindingD3D12H_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp
deleted file mode 100644
index 9ca8bdb5..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/SwapChainD3D12H_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/TextureD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/TextureD3D12H_test.cpp
deleted file mode 100644
index fa9b50ea..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/TextureD3D12H_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp
deleted file mode 100644
index bda08196..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3D12/TextureViewD3D12H_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include <d3d12.h>
-#include "DiligentCore/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3DBase/ShaderD3DH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3DBase/ShaderD3DH_test.cpp
deleted file mode 100644
index d8deb96c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3DBase/ShaderD3DH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngineD3DBase/ShaderResourceVariableD3DH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineD3DBase/ShaderResourceVariableD3DH_test.cpp
deleted file mode 100644
index 32c06851..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineD3DBase/ShaderResourceVariableD3DH_test.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include "DiligentCore/Graphics/GraphicsEngineD3DBase/interface/ShaderResourceVariableD3D.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp
deleted file mode 100644
index b7213875..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/BaseInterfacesGLH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BaseInterfacesGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/BufferGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/BufferGLH_test.cpp
deleted file mode 100644
index f91a96e4..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/BufferGLH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-typedef unsigned int GLuint;
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/BufferViewGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/BufferViewGLH_test.cpp
deleted file mode 100644
index 5d7e5ebf..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/BufferViewGLH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp
deleted file mode 100644
index 59204d79..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/DeviceContextGLH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.cpp
deleted file mode 100644
index 671fe4fe..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/EngineFactoryOpenGLH_test.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS
-# ifndef NOMINMAX
-# define NOMINMAX
-# endif
-# include <Windows.h>
-#endif
-
-#ifndef ENGINE_DLL
-# define ENGINE_DLL 1
-#endif
-
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/EngineFactoryOpenGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/FenceGLH_test .cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/FenceGLH_test .cpp
deleted file mode 100644
index 5c412e64..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/FenceGLH_test .cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-typedef unsigned int GLuint;
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/FenceGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp
deleted file mode 100644
index 6a49ef62..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/PipelineStateGLH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp
deleted file mode 100644
index 2c7388b0..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/RenderDeviceGL_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/SamplerGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/SamplerGLH_test.cpp
deleted file mode 100644
index 18aa01fc..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/SamplerGLH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/ShaderGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/ShaderGLH_test.cpp
deleted file mode 100644
index 108d261b..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/ShaderGLH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp
deleted file mode 100644
index 6bc1f230..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/ShaderResourceBindingGLH_test.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/SwapChainGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/SwapChainGLH_test.cpp
deleted file mode 100644
index b8d338b0..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/SwapChainGLH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-typedef unsigned int GLuint;
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/TextureGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/TextureGLH_test.cpp
deleted file mode 100644
index 2c4670bc..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/TextureGLH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-typedef unsigned int GLuint;
-typedef unsigned int GLenum;
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineOpenGL/TextureViewGLH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineOpenGL/TextureViewGLH_test.cpp
deleted file mode 100644
index dc7bcd2c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineOpenGL/TextureViewGLH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/BufferViewVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/BufferViewVkH_test.cpp
deleted file mode 100644
index 1e419e60..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/BufferViewVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/BufferViewVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/BufferVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/BufferVkH_test.cpp
deleted file mode 100644
index cc0668a2..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/BufferVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/BufferVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/CommandQueueVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/CommandQueueVkH_test.cpp
deleted file mode 100644
index 092d564a..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/CommandQueueVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/CommandQueueVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/DeviceContextVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/DeviceContextVkH_test.cpp
deleted file mode 100644
index b1f66961..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/DeviceContextVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/DeviceContextVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/EngineFactoryVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/EngineFactoryVkH_test.cpp
deleted file mode 100644
index 9d34cb47..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/EngineFactoryVkH_test.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#if PLATFORM_WIN32
-# ifndef NOMINMAX
-# define NOMINMAX
-# endif
-# include <Windows.h>
-#endif
-
-#ifndef ENGINE_DLL
-# define ENGINE_DLL 1
-#endif
-
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/EngineFactoryVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/FenceVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/FenceVkH_test.cpp
deleted file mode 100644
index 7b943c2a..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/FenceVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/FenceVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/PipelineStateVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/PipelineStateVkH_test.cpp
deleted file mode 100644
index 19d45e6e..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/PipelineStateVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/PipelineStateVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/RenderDeviceVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/RenderDeviceVkH_test.cpp
deleted file mode 100644
index c4faac67..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/RenderDeviceVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/RenderDeviceVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/SamplerVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/SamplerVkH_test.cpp
deleted file mode 100644
index 60640a34..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/SamplerVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/SamplerVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/ShaderResourceBindingVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/ShaderResourceBindingVkH_test.cpp
deleted file mode 100644
index 0d38447c..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/ShaderResourceBindingVkH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/ShaderResourceBindingVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/ShaderVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/ShaderVkH_test.cpp
deleted file mode 100644
index 10a06cb0..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/ShaderVkH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/ShaderVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/SwapChainVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/SwapChainVkH_test.cpp
deleted file mode 100644
index b42adc73..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/SwapChainVkH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/SwapChainVk.h" \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/TextureViewVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/TextureViewVkH_test.cpp
deleted file mode 100644
index cf611200..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/TextureViewVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/TextureViewVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsEngineVk/TextureVkH_test.cpp b/UnitTests/IncludeTest/GraphicsEngineVk/TextureVkH_test.cpp
deleted file mode 100644
index 2ac5dffc..00000000
--- a/UnitTests/IncludeTest/GraphicsEngineVk/TextureVkH_test.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/ThirdParty/vulkan/vulkan.h"
-#include "DiligentCore/Graphics/GraphicsEngineVulkan/interface/TextureVk.h"
diff --git a/UnitTests/IncludeTest/GraphicsTools/CommonlyUsedStatesH_test.cpp b/UnitTests/IncludeTest/GraphicsTools/CommonlyUsedStatesH_test.cpp
deleted file mode 100644
index da1ecbd5..00000000
--- a/UnitTests/IncludeTest/GraphicsTools/CommonlyUsedStatesH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsTools/include/CommonlyUsedStates.h"
diff --git a/UnitTests/IncludeTest/GraphicsTools/GraphicsUtilitiesH_test.cpp b/UnitTests/IncludeTest/GraphicsTools/GraphicsUtilitiesH_test.cpp
deleted file mode 100644
index de3396e2..00000000
--- a/UnitTests/IncludeTest/GraphicsTools/GraphicsUtilitiesH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsTools/include/GraphicsUtilities.h"
diff --git a/UnitTests/IncludeTest/GraphicsTools/ShaderMacroHelperH_test.cpp b/UnitTests/IncludeTest/GraphicsTools/ShaderMacroHelperH_test.cpp
deleted file mode 100644
index acfeed8d..00000000
--- a/UnitTests/IncludeTest/GraphicsTools/ShaderMacroHelperH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsTools/include/ShaderMacroHelper.h"
diff --git a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderBaseH_test.cpp b/UnitTests/IncludeTest/GraphicsTools/TextureUploaderBaseH_test.cpp
deleted file mode 100644
index 82e1df06..00000000
--- a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderBaseH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderBase.h"
diff --git a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderD3D11H_test.cpp b/UnitTests/IncludeTest/GraphicsTools/TextureUploaderD3D11H_test.cpp
deleted file mode 100644
index b2b8e97b..00000000
--- a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderD3D11H_test.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#if D3D11_SUPPORTED
-# include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderD3D11.h"
-#endif
diff --git a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderD3D12_VkH_test.cpp b/UnitTests/IncludeTest/GraphicsTools/TextureUploaderD3D12_VkH_test.cpp
deleted file mode 100644
index b218d340..00000000
--- a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderD3D12_VkH_test.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#if D3D12_SUPPORTED
-# include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderD3D12_Vk.h"
-#endif \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderGLH_test.cpp b/UnitTests/IncludeTest/GraphicsTools/TextureUploaderGLH_test.cpp
deleted file mode 100644
index 943609ca..00000000
--- a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderGLH_test.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#if GL_SUPPORTED || GLES_SUPPORTED
-# include "DiligentCore/Graphics/GraphicsTools/include/TextureUploaderGL.h"
-#endif \ No newline at end of file
diff --git a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderH_test.cpp b/UnitTests/IncludeTest/GraphicsTools/TextureUploaderH_test.cpp
deleted file mode 100644
index dfc192be..00000000
--- a/UnitTests/IncludeTest/GraphicsTools/TextureUploaderH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Graphics/GraphicsTools/include/TextureUploader.h"
diff --git a/UnitTests/IncludeTest/Platforms/AtomicsH_test.cpp b/UnitTests/IncludeTest/Platforms/AtomicsH_test.cpp
deleted file mode 100644
index 03493fce..00000000
--- a/UnitTests/IncludeTest/Platforms/AtomicsH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Platforms/interface/Atomics.h"
diff --git a/UnitTests/IncludeTest/Platforms/FileSystemH_test.cpp b/UnitTests/IncludeTest/Platforms/FileSystemH_test.cpp
deleted file mode 100644
index 4c615712..00000000
--- a/UnitTests/IncludeTest/Platforms/FileSystemH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Platforms/interface/FileSystem.h"
diff --git a/UnitTests/IncludeTest/Platforms/PlatformDebugH_test.cpp b/UnitTests/IncludeTest/Platforms/PlatformDebugH_test.cpp
deleted file mode 100644
index 6a561070..00000000
--- a/UnitTests/IncludeTest/Platforms/PlatformDebugH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Platforms/interface/PlatformDebug.h"
diff --git a/UnitTests/IncludeTest/Platforms/PlatformDefinitionsH_test.cpp b/UnitTests/IncludeTest/Platforms/PlatformDefinitionsH_test.cpp
deleted file mode 100644
index 148fa5e3..00000000
--- a/UnitTests/IncludeTest/Platforms/PlatformDefinitionsH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Platforms/interface/PlatformDefinitions.h"
diff --git a/UnitTests/IncludeTest/Platforms/PlatformMiscH_test.cpp b/UnitTests/IncludeTest/Platforms/PlatformMiscH_test.cpp
deleted file mode 100644
index 654b5e88..00000000
--- a/UnitTests/IncludeTest/Platforms/PlatformMiscH_test.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2019 Diligent Graphics LLC
- *
- * 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
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF ANY PROPRIETARY RIGHTS.
- *
- * 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.
- */
-
-#include "DiligentCore/Platforms/interface/PlatformMisc.h"