Fixed interface headers to use relative paths in #include

86 files changed, 155 insertions, 137 deletions

diff --git a/Common/interface/LockHelper.h b/Common/interface/LockHelper.h
index 85f69082..bcb644df 100644
--- a/Common/interface/LockHelper.h
+++ b/Common/interface/LockHelper.h
@@ -28,7 +28,7 @@
 #include <condition_variable>
 #include <atomic>
 
-#include "Atomics.h"
+#include "../../../Platforms/interface/Atomics.h"
 
 namespace ThreadingTools
 {
diff --git a/Common/interface/RefCntAutoPtr.h b/Common/interface/RefCntAutoPtr.h
index 496ee28e..f5d1a437 100644
--- a/Common/interface/RefCntAutoPtr.h
+++ b/Common/interface/RefCntAutoPtr.h
@@ -23,12 +23,13 @@
 
 #pragma once
 
-#include "DebugUtilities.h"
+#include "../../../Primitives/interface/Object.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Platforms/interface/Atomics.h"
 #include "LockHelper.h"
-#include "Atomics.h"
 #include "ValidatedCast.h"
 #include "RefCountedObjectImpl.h"
-#include "Object.h"
+
 
 namespace Diligent
 {
diff --git a/Common/interface/RefCountedObjectImpl.h b/Common/interface/RefCountedObjectImpl.h
index 0f4a41c9..617eef59 100644
--- a/Common/interface/RefCountedObjectImpl.h
+++ b/Common/interface/RefCountedObjectImpl.h
@@ -26,12 +26,12 @@
 /// \file
 /// Implementation of the template base class for reference counting objects
 
-#include "Object.h"
-#include "Atomics.h"
-#include "DebugUtilities.h"
+#include "../../../Primitives/interface/Object.h"
+#include "../../../Primitives/interface/MemoryAllocator.h"
+#include "../../../Platforms/interface/Atomics.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 #include "LockHelper.h"
 #include "ValidatedCast.h"
-#include "MemoryAllocator.h"
 
 namespace Diligent
 {
diff --git a/Common/interface/StringTools.h b/Common/interface/StringTools.h
index 0a43f1c8..5921411b 100644
--- a/Common/interface/StringTools.h
+++ b/Common/interface/StringTools.h
@@ -29,7 +29,8 @@
 #include <algorithm>
 #include <cctype>
 #include <string.h>
-#include "DebugUtilities.h"
+
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 
 namespace Diligent
 {
diff --git a/Common/interface/ValidatedCast.h b/Common/interface/ValidatedCast.h
index 786f90a5..8848b920 100644
--- a/Common/interface/ValidatedCast.h
+++ b/Common/interface/ValidatedCast.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "DebugUtilities.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 
 template<typename DstType, typename SrcType>
 DstType* ValidatedCast( SrcType *Ptr )
diff --git a/Graphics/GraphicsEngine/interface/BlendState.h b/Graphics/GraphicsEngine/interface/BlendState.h
index b1cf1a97..b2c79a0c 100644
--- a/Graphics/GraphicsEngine/interface/BlendState.h
+++ b/Graphics/GraphicsEngine/interface/BlendState.h
@@ -26,7 +26,7 @@
 /// \file
 /// Blend state description
 
-#include "BasicTypes.h"
+#include "../../../Primitives/interface/BasicTypes.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngine/interface/BufferView.h b/Graphics/GraphicsEngine/interface/BufferView.h
index c137d264..767c8e4a 100644
--- a/Graphics/GraphicsEngine/interface/BufferView.h
+++ b/Graphics/GraphicsEngine/interface/BufferView.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferView interface and related data structures
 
-#include "DeviceObject.h"
+#include "Buffer.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngine/interface/Constants.h b/Graphics/GraphicsEngine/interface/Constants.h
index e8d3c4c0..a04140d5 100644
--- a/Graphics/GraphicsEngine/interface/Constants.h
+++ b/Graphics/GraphicsEngine/interface/Constants.h
@@ -26,6 +26,8 @@
 /// \file
 /// Definition of the engine constants
 
+#include "../../../Primitives/interface/BasicTypes.h"
+
 namespace Diligent
 {
     /// Maximum number of input buffer slots.
diff --git a/Graphics/GraphicsEngine/interface/DepthStencilState.h b/Graphics/GraphicsEngine/interface/DepthStencilState.h
index cf49d4e9..ec4b75ba 100644
--- a/Graphics/GraphicsEngine/interface/DepthStencilState.h
+++ b/Graphics/GraphicsEngine/interface/DepthStencilState.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of data types that describe depth-stencil state
 
-#include "BasicTypes.h"
+#include "GraphicsTypes.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngine/interface/DeviceContext.h b/Graphics/GraphicsEngine/interface/DeviceContext.h
index deb856fb..d0656418 100644
--- a/Graphics/GraphicsEngine/interface/DeviceContext.h
+++ b/Graphics/GraphicsEngine/interface/DeviceContext.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IDeviceContext interface and related data structures
 
-#include "Object.h"
+#include "../../../Primitives/interface/Object.h"
 #include "DeviceCaps.h"
 #include "Constants.h"
 #include "Buffer.h"
diff --git a/Graphics/GraphicsEngine/interface/DeviceObject.h b/Graphics/GraphicsEngine/interface/DeviceObject.h
index ba1e472c..9b82a683 100644
--- a/Graphics/GraphicsEngine/interface/DeviceObject.h
+++ b/Graphics/GraphicsEngine/interface/DeviceObject.h
@@ -26,7 +26,7 @@
 /// \file
 /// Defines Diligent::IDeviceObject interface
 
-#include "Object.h"
+#include "../../../Primitives/interface/Object.h"
 #include "GraphicsTypes.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h
index 35c2a27a..e742f927 100644
--- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h
+++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h
@@ -26,7 +26,7 @@
 /// \file
 /// Contains basic graphics engine type defintions
 
-#include "BasicTypes.h"
+#include "../../../Primitives/interface/BasicTypes.h"
 
 /// Graphics engine namespace
 namespace Diligent
diff --git a/Graphics/GraphicsEngine/interface/InputLayout.h b/Graphics/GraphicsEngine/interface/InputLayout.h
index 483e1c52..598cedd4 100644
--- a/Graphics/GraphicsEngine/interface/InputLayout.h
+++ b/Graphics/GraphicsEngine/interface/InputLayout.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition input layout
 
-#include "BasicTypes.h"
+#include "GraphicsTypes.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngine/interface/MapHelper.h b/Graphics/GraphicsEngine/interface/MapHelper.h
index 527421de..4032952f 100644
--- a/Graphics/GraphicsEngine/interface/MapHelper.h
+++ b/Graphics/GraphicsEngine/interface/MapHelper.h
@@ -26,7 +26,10 @@
 /// \file
 /// Definition of the Diligent::MapHelper helper template class
 
-#include "DebugUtilities.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
+#include "../../../Common/interface/RefCntAutoPtr.h"
+#include "DeviceContext.h"
+#include "Buffer.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngine/interface/PipelineState.h b/Graphics/GraphicsEngine/interface/PipelineState.h
index 0fa55d1e..7e31b49a 100644
--- a/Graphics/GraphicsEngine/interface/PipelineState.h
+++ b/Graphics/GraphicsEngine/interface/PipelineState.h
@@ -26,14 +26,14 @@
 /// \file
 /// Definition of the Diligent::IRenderDevice interface and related data structures
 
+#include "../../../Primitives/interface/Object.h"
+#include "../../../Platforms/interface/PlatformDefinitions.h"
 #include "GraphicsTypes.h"
-#include "Object.h"
 #include "BlendState.h"
 #include "RasterizerState.h"
 #include "DepthStencilState.h"
 #include "InputLayout.h"
 #include "ShaderResourceBinding.h"
-#include "PlatformDefinitions.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngine/interface/RasterizerState.h b/Graphics/GraphicsEngine/interface/RasterizerState.h
index 9d46ba41..0e8d5299 100644
--- a/Graphics/GraphicsEngine/interface/RasterizerState.h
+++ b/Graphics/GraphicsEngine/interface/RasterizerState.h
@@ -26,7 +26,7 @@
 /// \file
 /// Rasterizer state description
 
-#include "BasicTypes.h"
+#include "GraphicsTypes.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngine/interface/RenderDevice.h b/Graphics/GraphicsEngine/interface/RenderDevice.h
index 07582031..f99a885a 100644
--- a/Graphics/GraphicsEngine/interface/RenderDevice.h
+++ b/Graphics/GraphicsEngine/interface/RenderDevice.h
@@ -26,8 +26,8 @@
 /// \file
 /// Definition of the Diligent::IRenderDevice interface and related data structures
 
+#include "../../../Primitives/interface/Object.h"
 #include "GraphicsTypes.h"
-#include "Object.h"
 #include "DeviceCaps.h"
 #include "Constants.h"
 #include "Buffer.h"
diff --git a/Graphics/GraphicsEngine/interface/Shader.h b/Graphics/GraphicsEngine/interface/Shader.h
index 956e14a6..15df194d 100644
--- a/Graphics/GraphicsEngine/interface/Shader.h
+++ b/Graphics/GraphicsEngine/interface/Shader.h
@@ -26,9 +26,9 @@
 /// \file
 /// Definition of the Diligent::IShader interface and related data structures
 
+#include "../../../Primitives/interface/FileStream.h"
 #include "DeviceObject.h"
 #include "ResourceMapping.h"
-#include "FileStream.h"
 #include "Sampler.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h b/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h
index 1b35bbb1..6e024311 100644
--- a/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h
+++ b/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h
@@ -26,11 +26,14 @@
 /// \file
 /// Definition of the Diligent::IShaderResourceBinding interface and related data structures
 
-#include "Object.h"
+#include "../../../Primitives/interface/Object.h"
+#include "Shader.h"
 
 namespace Diligent
 {
 
+class IPipelineState;
+
 // {061F8774-9A09-48E8-8411-B5BD20560104}
 static constexpr INTERFACE_ID IID_ShaderResourceBinding =
 { 0x61f8774, 0x9a09, 0x48e8, { 0x84, 0x11, 0xb5, 0xbd, 0x20, 0x56, 0x1, 0x4 } };
@@ -47,7 +50,7 @@ public:
 
     /// The method calls AddRef() on the returned interface, 
     /// so Release() must be called to avoid memory leaks.
-    virtual class IPipelineState* GetPipelineState() = 0;
+    virtual IPipelineState* GetPipelineState() = 0;
 
     /// Binds all resource using the resource mapping
 
diff --git a/Graphics/GraphicsEngine/interface/SwapChain.h b/Graphics/GraphicsEngine/interface/SwapChain.h
index 5e14c63b..0cdde1ef 100644
--- a/Graphics/GraphicsEngine/interface/SwapChain.h
+++ b/Graphics/GraphicsEngine/interface/SwapChain.h
@@ -26,7 +26,8 @@
 /// \file
 /// Definition of the Diligent::ISwapChain interface and related data structures
 
-#include "Object.h"
+#include "../../../Primitives/interface/Object.h"
+#include "GraphicsTypes.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngine/interface/TextureView.h b/Graphics/GraphicsEngine/interface/TextureView.h
index dc383b1e..d85b4750 100644
--- a/Graphics/GraphicsEngine/interface/TextureView.h
+++ b/Graphics/GraphicsEngine/interface/TextureView.h
@@ -31,6 +31,8 @@
 namespace Diligent
 {
 
+class IDeviceContext;
+
 // {5B2EA04E-8128-45E4-AA4D-6DC7E70DC424}
 static constexpr INTERFACE_ID IID_TextureView =
 { 0x5b2ea04e, 0x8128, 0x45e4, { 0xaa, 0x4d, 0x6d, 0xc7, 0xe7, 0xd, 0xc4, 0x24 } };
diff --git a/Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h b/Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h
index 26189c78..78baed0c 100644
--- a/Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/BufferD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferD3D11 interface
 
-#include "Buffer.h"
+#include "../../GraphicsEngine/interface/Buffer.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h b/Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h
index e4df92c7..c78d6c5e 100644
--- a/Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/BufferViewD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferViewD3D11 interface
 
-#include "BufferView.h"
+#include "../../GraphicsEngine/interface/BufferView.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h b/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h
index f6d4d74c..9c217693 100644
--- a/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/DeviceContextD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IDeviceContextD3D11 interface
 
-#include "DeviceContext.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h b/Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h
index 9cc4ce8b..912cb474 100644
--- a/Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h
+++ b/Graphics/GraphicsEngineD3D11/interface/EngineD3D11Attribs.h
@@ -26,8 +26,7 @@
 /// \file
 /// Definition of the Engine D3D11 attribs
 
-#include "BasicTypes.h"
-#include "GraphicsTypes.h"
+#include "../../GraphicsEngine/interface/GraphicsTypes.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h b/Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h
index 0c76a0f5..3d9406b1 100644
--- a/Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/PipelineStateD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IPipeplineStateD3D11 interface
 
-#include "PipelineState.h"
+#include "../../GraphicsEngine/interface/PipelineState.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h
index 25ed6de0..7998f6fd 100644
--- a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IRenderDeviceD3D11 interface
 
-#include "RenderDevice.h"
+#include "../../GraphicsEngine/interface/RenderDevice.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h
index 2f3cd4bf..3806ca1a 100644
--- a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceFactoryD3D11.h
@@ -26,16 +26,18 @@
 /// \file
 /// Declaration of functions that initialize Direct3D11-based engine implementation
 
-#include "Errors.h"
-#include "EngineD3D11Attribs.h"
-#include "RenderDevice.h"
-#include "DeviceContext.h"
-#include "SwapChain.h"
+#include "../../../Platforms/Basic/interface/Errors.h"
+
+#include "../../GraphicsEngine/interface/RenderDevice.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
+#include "../../GraphicsEngine/interface/SwapChain.h"
 
 #if PLATFORM_UNIVERSAL_WINDOWS && defined(ENGINE_DLL)
-#   include "StringTools.h"
+#   include "../../../Common/interface/StringTools.h"
 #endif
 
+#include "EngineD3D11Attribs.h"
+
 namespace Diligent
 {
 
diff --git a/Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h b/Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h
index 8ccb14d4..b4534910 100644
--- a/Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/SamplerD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ISamplerD3D11 interface
 
-#include "Sampler.h"
+#include "../../GraphicsEngine/interface/Sampler.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h b/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h
index 0017dc27..b75cdabf 100644
--- a/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IShaderD3D11 interface
 
-#include "Shader.h"
+#include "../../GraphicsEngine/interface/Shader.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h b/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h
index 1d224546..85f2778f 100644
--- a/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IShaderResourceBindingD3D11 interface and related data structures
 
-#include "ShaderResourceBinding.h"
+#include "../../GraphicsEngine/interface/ShaderResourceBinding.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h b/Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h
index e49a6357..3d903ec0 100644
--- a/Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/SwapChainD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ISwapChainD3D11 interface
 
-#include "SwapChain.h"
+#include "../../GraphicsEngine/interface/SwapChain.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h b/Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h
index a5cb3b46..204774be 100644
--- a/Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/TextureD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureD3D11 interface
 
-#include "Texture.h"
+#include "../../GraphicsEngine/interface/Texture.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h b/Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h
index 69b1b921..5f2085f7 100644
--- a/Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/TextureViewD3D11.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureViewD3D11 interface
 
-#include "TextureView.h"
+#include "../../GraphicsEngine/interface/TextureView.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h b/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
index 3439923d..7ed44894 100644
--- a/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferD3D12 interface
 
-#include "Buffer.h"
+#include "../../GraphicsEngine/interface/Buffer.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h b/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
index a82136d4..21cf3518 100644
--- a/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferViewD3D12 interface
 
-#include "BufferView.h"
+#include "../../GraphicsEngine/interface/BufferView.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h b/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
index 833c2693..87c8c057 100644
--- a/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IDeviceContextD3D11 interface
 
-#include "DeviceContext.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h b/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h
index e3e385b7..bbbc9636 100644
--- a/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IPipeplineStateD3D12 interface
 
-#include "PipelineState.h"
+#include "../../GraphicsEngine/interface/PipelineState.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h
index 9f109af9..d4fb6513 100644
--- a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IRenderDeviceD3D12 interface
 
-#include "RenderDevice.h"
+#include "../../GraphicsEngine/interface/RenderDevice.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h
index 6f68bda0..a223060e 100644
--- a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceFactoryD3D12.h
@@ -26,13 +26,14 @@
 /// \file
 /// Declaration of functions that initialize Direct3D12-based engine implementation
 
-#include "Errors.h"
-#include "RenderDevice.h"
-#include "DeviceContext.h"
-#include "SwapChain.h"
+#include "../../../Platforms/Basic/interface/Errors.h"
+
+#include "../../GraphicsEngine/interface/RenderDevice.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
+#include "../../GraphicsEngine/interface/SwapChain.h"
 
 #if PLATFORM_UNIVERSAL_WINDOWS && defined(ENGINE_DLL)
-#   include "StringTools.h"
+#   include "../../../Common/interface/StringTools.h"
 #endif
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h b/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h
index 3e4e1de7..3c16b375 100644
--- a/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ISamplerD3D12 interface
 
-#include "Sampler.h"
+#include "../../GraphicsEngine/interface/Sampler.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h b/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h
index 439ee2a5..27841c89 100644
--- a/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IShaderD3D12 interface
 
-#include "Shader.h"
+#include "../../GraphicsEngine/interface/Shader.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h b/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h
index ef559921..0a3043d4 100644
--- a/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IShaderResourceBindingD3D12 interface and related data structures
 
-#include "ShaderResourceBinding.h"
+#include "../../GraphicsEngine/interface/ShaderResourceBinding.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h b/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h
index 3ac97989..d65478ef 100644
--- a/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h
@@ -27,7 +27,8 @@
 /// Definition of the Diligent::ISwapChainD3D12 interface
 
 #include <dxgi1_4.h>
-#include "SwapChain.h"
+
+#include "../../GraphicsEngine/interface/SwapChain.h"
 #include "TextureViewD3D12.h"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h b/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h
index 7f769c43..e569cc04 100644
--- a/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureD3D12 interface
 
-#include "Texture.h"
+#include "../../GraphicsEngine/interface/Texture.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h b/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h
index e34676f6..f259862c 100644
--- a/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureViewD3D12 interface
 
-#include "TextureView.h"
+#include "../../GraphicsEngine/interface/TextureView.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h b/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h
index ab47d940..4e179012 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/BufferGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferGL interface
 
-#include "Buffer.h"
+#include "../../GraphicsEngine/interface/Buffer.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h b/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h
index 1b3a246d..9c4ca28a 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/BufferViewGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IBufferViewGL interface
 
-#include "BufferView.h"
+#include "../../GraphicsEngine/interface/BufferView.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h b/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h
index 4cedfd59..38089444 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/DeviceContextGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IDeviceContextGL interface
 
-#include "DeviceContext.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/EngineGLAttribs.h b/Graphics/GraphicsEngineOpenGL/interface/EngineGLAttribs.h
index bbb998bd..2c05adbf 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/EngineGLAttribs.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/EngineGLAttribs.h
@@ -26,8 +26,7 @@
 /// \file
 /// Definition of the Engine OpenGL/GLES attribs
 
-#include "BasicTypes.h"
-#include "GraphicsTypes.h"
+#include "../../GraphicsEngine/interface/GraphicsTypes.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h b/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h
index 191fc6c9..0cff97df 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/PipelineStateGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IPipelineStateGL interface
 
-#include "PipelineState.h"
+#include "../../GraphicsEngine/interface/PipelineState.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h
index 77173bb3..32e5987e 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceFactoryOpenGL.h
@@ -26,10 +26,14 @@
 /// \file
 /// Declaration of functions that create OpenGL-based engine implementation
 
-#include "RenderDevice.h"
-#include "DeviceContext.h"
-#include "SwapChain.h"
-#include "HLSL2GLSLConverter.h"
+#include "../../../Platforms/Basic/interface/Errors.h"
+
+#include "../../GraphicsEngine/interface/RenderDevice.h"
+#include "../../GraphicsEngine/interface/DeviceContext.h"
+#include "../../GraphicsEngine/interface/SwapChain.h"
+
+#include "../../HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h"
+
 #include "EngineGLAttribs.h"
 
 #if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS
diff --git a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h
index e3fd08ea..605d866f 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/RenderDeviceGL.h
@@ -26,8 +26,7 @@
 /// \file
 /// Definition of the Diligent::IRenderDeviceGL interface
 
-#include "RenderDevice.h"
-#include "HLSL2GLSLConverter.h"
+#include "../../GraphicsEngine/interface/RenderDevice.h"
 
 /// Namespace for the OpenGL implementation of the graphics engine
 namespace Diligent
diff --git a/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h b/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h
index 0ca9929f..485dc050 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/SamplerGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ISamplerGL interface
 
-#include "Sampler.h"
+#include "../../GraphicsEngine/interface/Sampler.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h b/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h
index c2f7a072..d01c1f09 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/ShaderGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IShaderGL interface
 
-#include "Shader.h"
+#include "../../GraphicsEngine/interface/Shader.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h b/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h
index ef7c251d..7903d47c 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/ShaderResourceBindingGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::IShaderResourceBindingD3D11 interface and related data structures
 
-#include "ShaderResourceBinding.h"
+#include "../../GraphicsEngine/interface/ShaderResourceBinding.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h b/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h
index e9405899..4646b6f9 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/SwapChainGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ISwapChainGL interface
 
-#include "SwapChain.h"
+#include "../../GraphicsEngine/interface/SwapChain.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h b/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h
index 2e62f577..d769b62f 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/TextureGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureGL interface
 
-#include "Texture.h"
+#include "../../GraphicsEngine/interface/Texture.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h b/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h
index ecd6a3f8..1805617c 100644
--- a/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h
+++ b/Graphics/GraphicsEngineOpenGL/interface/TextureViewGL.h
@@ -26,7 +26,7 @@
 /// \file
 /// Definition of the Diligent::ITextureViewGL interface
 
-#include "TextureView.h"
+#include "../../GraphicsEngine/interface/TextureView.h"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
index f30b43b3..cd691f1f 100644
--- a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
@@ -304,7 +304,7 @@ namespace Diligent
             NumRenderTargets = std::min(NumRenderTargets, MaxRenderTargets);
 
             const auto& CtxCaps = m_ContextState.GetContextCaps();
-            VERIFY(NumRenderTargets < CtxCaps.m_iMaxDrawBuffers, "This device only supports ", CtxCaps.m_iMaxDrawBuffers, " draw buffers, but ", NumRenderTargets, " are being set");
+            VERIFY(NumRenderTargets < static_cast<Uint32>(CtxCaps.m_iMaxDrawBuffers), "This device only supports ", CtxCaps.m_iMaxDrawBuffers, " draw buffers, but ", NumRenderTargets, " are being set");
             NumRenderTargets = std::min(NumRenderTargets, static_cast<Uint32>(CtxCaps.m_iMaxDrawBuffers));
 
             ITextureView *pBoundRTVs[MaxRenderTargets] = {};
diff --git a/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h b/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h
index 0a0c532f..3b4d64c0 100644
--- a/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h
+++ b/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h
@@ -26,8 +26,8 @@
 /// \file
 /// Definition of the Diligent::IHLSL2GLSLConverter interface
 
-#include "Shader.h"
-#include "DataBlob.h"
+#include "../../GraphicsEngine/interface/Shader.h"
+#include "../../../Primitives/interface/DataBlob.h"
 
 namespace Diligent
 {
diff --git a/Platforms/Android/include/AndroidDebug.h b/Platforms/Android/include/AndroidDebug.h
index 498e9d97..981ff767 100644
--- a/Platforms/Android/include/AndroidDebug.h
+++ b/Platforms/Android/include/AndroidDebug.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "BasicPlatformDebug.h"
+#include "../../Basic/interface/BasicPlatformDebug.h"
 
 struct AndroidDebug : public BasicPlatformDebug
 {
diff --git a/Platforms/Android/include/AndroidFileSystem.h b/Platforms/Android/include/AndroidFileSystem.h
index 98a1aba9..61173d6d 100644
--- a/Platforms/Android/include/AndroidFileSystem.h
+++ b/Platforms/Android/include/AndroidFileSystem.h
@@ -23,12 +23,12 @@
 
 #pragma once
 
-#include "BasicFileSystem.h"
-#include "DataBlob.h"
-
 #include <memory>
 #include <vector>
 
+#include "../../Basic/interface/BasicFileSystem.h"
+#include "../../../Primitives/interface/DataBlob.h"
+
 class AndroidFile : public BasicFile
 {
 public:
diff --git a/Platforms/Android/include/AndroidPlatformMisc.h b/Platforms/Android/include/AndroidPlatformMisc.h
index 328af681..1be455c8 100644
--- a/Platforms/Android/include/AndroidPlatformMisc.h
+++ b/Platforms/Android/include/AndroidPlatformMisc.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include "BasicPlatformMisc.h"
-#include "DebugUtilities.h"
+#include "../../Basic/interface/BasicPlatformMisc.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 
 struct AndroidMisc : public BasicPlatformMisc
 {
diff --git a/Platforms/Apple/include/AppleDebug.h b/Platforms/Apple/include/AppleDebug.h
index d7506eb8..0843ae85 100644
--- a/Platforms/Apple/include/AppleDebug.h
+++ b/Platforms/Apple/include/AppleDebug.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "BasicPlatformDebug.h"
+#include "../../Basic/interface/BasicPlatformDebug.h"
 
 struct AppleDebug : public BasicPlatformDebug
 {
diff --git a/Platforms/Apple/include/AppleFileSystem.h b/Platforms/Apple/include/AppleFileSystem.h
index ff7f6d94..d398d690 100644
--- a/Platforms/Apple/include/AppleFileSystem.h
+++ b/Platforms/Apple/include/AppleFileSystem.h
@@ -23,12 +23,12 @@
 
 #pragma once
 
-#include "BasicFileSystem.h"
-#include "StandardFile.h"
-
 #include <memory>
 #include <vector>
 
+#include "../../Basic/interface/BasicFileSystem.h"
+#include "../../Basic/interface/StandardFile.h"
+
 using AppleFile = StandardFile;
 
 struct AppleFileSystem : public BasicFileSystem
diff --git a/Platforms/Apple/include/ApplePlatformMisc.h b/Platforms/Apple/include/ApplePlatformMisc.h
index 6e243906..b1b22556 100644
--- a/Platforms/Apple/include/ApplePlatformMisc.h
+++ b/Platforms/Apple/include/ApplePlatformMisc.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include "BasicPlatformMisc.h"
-#include "DebugUtilities.h"
+#include "../../Basic/interface/BasicPlatformMisc.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 
 struct AppleMisc : public BasicPlatformMisc
 {
diff --git a/Platforms/Basic/interface/BasicFileSystem.h b/Platforms/Basic/interface/BasicFileSystem.h
index ae438e37..734dd013 100644
--- a/Platforms/Basic/interface/BasicFileSystem.h
+++ b/Platforms/Basic/interface/BasicFileSystem.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <vector>
-#include "BasicTypes.h"
+#include "../../../Primitives/interface/BasicTypes.h"
 
 enum class EFileAccessMode
 {
diff --git a/Platforms/Basic/interface/BasicPlatformDebug.h b/Platforms/Basic/interface/BasicPlatformDebug.h
index 6ae117be..09e36cf4 100644
--- a/Platforms/Basic/interface/BasicPlatformDebug.h
+++ b/Platforms/Basic/interface/BasicPlatformDebug.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "BasicTypes.h"
+#include "../../../Primitives/interface/BasicTypes.h"
 
 struct BasicPlatformDebug
 {
diff --git a/Platforms/Basic/interface/BasicPlatformMisc.h b/Platforms/Basic/interface/BasicPlatformMisc.h
index 40c6db2a..023ec65d 100644
--- a/Platforms/Basic/interface/BasicPlatformMisc.h
+++ b/Platforms/Basic/interface/BasicPlatformMisc.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "BasicTypes.h"
+#include "../../../Primitives/interface/BasicTypes.h"
 
 struct BasicPlatformMisc
 {
diff --git a/Platforms/Basic/interface/DebugUtilities.h b/Platforms/Basic/interface/DebugUtilities.h
index 91a5d7db..29a9d162 100644
--- a/Platforms/Basic/interface/DebugUtilities.h
+++ b/Platforms/Basic/interface/DebugUtilities.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "FormatMessage.h"
+#include "../../../Primitives/interface/FormatMessage.h"
 #include "BasicPlatformDebug.h"
 
 #ifdef _DEBUG
diff --git a/Platforms/Basic/interface/Errors.h b/Platforms/Basic/interface/Errors.h
index 826ed40b..e48916b6 100644
--- a/Platforms/Basic/interface/Errors.h
+++ b/Platforms/Basic/interface/Errors.h
@@ -25,8 +25,8 @@
 
 #include <stdexcept>
 
+#include "../../../Primitives/interface/FormatMessage.h"
 #include "BasicPlatformDebug.h"
-#include "FormatMessage.h"
 #include "BasicFileSystem.h"
 
 template<bool>
diff --git a/Platforms/Basic/interface/StandardFile.h b/Platforms/Basic/interface/StandardFile.h
index 7d23cc42..f28552df 100644
--- a/Platforms/Basic/interface/StandardFile.h
+++ b/Platforms/Basic/interface/StandardFile.h
@@ -25,8 +25,8 @@
 
 #include <stdio.h>
 
+#include "../../../Primitives/interface/DataBlob.h"
 #include "BasicFileSystem.h"
-#include "DataBlob.h"
 
 class StandardFile : public BasicFile
 {
diff --git a/Platforms/Linux/include/LinuxDebug.h b/Platforms/Linux/include/LinuxDebug.h
index c8f9131d..6c271fd7 100644
--- a/Platforms/Linux/include/LinuxDebug.h
+++ b/Platforms/Linux/include/LinuxDebug.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "BasicPlatformDebug.h"
+#include "../../Basic/interface/BasicPlatformDebug.h"
 
 struct LinuxDebug : public BasicPlatformDebug
 {
diff --git a/Platforms/Linux/include/LinuxFileSystem.h b/Platforms/Linux/include/LinuxFileSystem.h
index 5842029f..2e7c8428 100644
--- a/Platforms/Linux/include/LinuxFileSystem.h
+++ b/Platforms/Linux/include/LinuxFileSystem.h
@@ -23,12 +23,12 @@
 
 #pragma once
 
-#include "BasicFileSystem.h"
-#include "StandardFile.h"
-
 #include <memory>
 #include <vector>
 
+#include "../../Basic/interface/BasicFileSystem.h"
+#include "../../Basic/interface/StandardFile.h"
+
 using LinuxFile = StandardFile;
 
 struct LinuxFileSystem : public BasicFileSystem
diff --git a/Platforms/Linux/include/LinuxPlatformMisc.h b/Platforms/Linux/include/LinuxPlatformMisc.h
index f6a94dbe..40cbc849 100644
--- a/Platforms/Linux/include/LinuxPlatformMisc.h
+++ b/Platforms/Linux/include/LinuxPlatformMisc.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include "BasicPlatformMisc.h"
-#include "DebugUtilities.h"
+#include "../../Basic/interface/BasicPlatformMisc.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 
 struct LinuxMisc : public BasicPlatformMisc
 {
diff --git a/Platforms/UWP/include/UWPDebug.h b/Platforms/UWP/include/UWPDebug.h
index cb97e3f7..b193968e 100644
--- a/Platforms/UWP/include/UWPDebug.h
+++ b/Platforms/UWP/include/UWPDebug.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "BasicPlatformDebug.h"
+#include "../../Basic/interface/BasicPlatformDebug.h"
 
 struct WindowsStoreDebug : public BasicPlatformDebug
 {
diff --git a/Platforms/UWP/include/UWPFileSystem.h b/Platforms/UWP/include/UWPFileSystem.h
index b2535d74..04b5b179 100644
--- a/Platforms/UWP/include/UWPFileSystem.h
+++ b/Platforms/UWP/include/UWPFileSystem.h
@@ -23,10 +23,11 @@
 
 #pragma once
 
-#include "BasicFileSystem.h"
-#include "DataBlob.h"
 #include <memory>
 
+#include "../../Basic/interface/BasicFileSystem.h"
+#include "../../../Primitives/interface/DataBlob.h"
+
 // Do not include windows headers here as they will mess up CreateDirectory()
 // and DeleteFile() functions!
 //#define NOMINMAX
diff --git a/Platforms/Win32/include/Win32Debug.h b/Platforms/Win32/include/Win32Debug.h
index ead77508..de8fff31 100644
--- a/Platforms/Win32/include/Win32Debug.h
+++ b/Platforms/Win32/include/Win32Debug.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "BasicPlatformDebug.h"
+#include "../../Basic/interface/BasicPlatformDebug.h"
 
 struct WindowsDebug : public BasicPlatformDebug
 {
diff --git a/Platforms/Win32/include/Win32FileSystem.h b/Platforms/Win32/include/Win32FileSystem.h
index da99bdb8..9dcad71e 100644
--- a/Platforms/Win32/include/Win32FileSystem.h
+++ b/Platforms/Win32/include/Win32FileSystem.h
@@ -24,9 +24,8 @@
 #pragma once
 
 #include <memory>
-#include "BasicFileSystem.h"
-#include "StandardFile.h"
-
+#include "../../Basic/interface/BasicFileSystem.h"
+#include "../../Basic/interface/StandardFile.h"
 
 class WindowsFile : public StandardFile
 {
diff --git a/Platforms/Win32/include/Win32PlatformMisc.h b/Platforms/Win32/include/Win32PlatformMisc.h
index 700a5fd3..8e354097 100644
--- a/Platforms/Win32/include/Win32PlatformMisc.h
+++ b/Platforms/Win32/include/Win32PlatformMisc.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include "BasicPlatformMisc.h"
-#include "DebugUtilities.h"
+#include "../../Basic/interface/BasicPlatformMisc.h"
+#include "../../../Platforms/Basic/interface/DebugUtilities.h"
 
 #include <intrin.h>
 
diff --git a/Platforms/interface/Atomics.h b/Platforms/interface/Atomics.h
index b0659485..746fd62e 100644
--- a/Platforms/interface/Atomics.h
+++ b/Platforms/interface/Atomics.h
@@ -27,13 +27,13 @@
 
 #if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS
 
-    #include "Win32Atomics.h"
+    #include "../Win32/include/Win32Atomics.h"
     typedef WindowsAtomics Atomics;
 
 #else
 
     // Use c++11 standard atomics
-    #include "BasicAtomics.h"
+    #include "../Basic/interface/BasicAtomics.h"
     typedef BasicAtomics Atomics;
 
 #endif
diff --git a/Platforms/interface/FileSystem.h b/Platforms/interface/FileSystem.h
index cced22b5..76b564f6 100644
--- a/Platforms/interface/FileSystem.h
+++ b/Platforms/interface/FileSystem.h
@@ -27,31 +27,31 @@
 
 #if PLATFORM_WIN32
 
-    #include "Win32FileSystem.h"
+    #include "../Win32/include/Win32FileSystem.h"
     typedef WindowsFileSystem FileSystem;
     typedef WindowsFile       CFile;
 
 #elif PLATFORM_UNIVERSAL_WINDOWS
 
-    #include "UWPFileSystem.h"
+    #include "../UWP/include/UWPFileSystem.h"
     typedef WindowsStoreFileSystem FileSystem;
     typedef WindowsStoreFile       CFile;
 
 #elif PLATFORM_ANDROID
 
-    #include "AndroidFileSystem.h"
+    #include "../Android/include/AndroidFileSystem.h"
     typedef AndroidFileSystem FileSystem;
     typedef AndroidFile       CFile;
 
 #elif PLATFORM_LINUX
 
-    #include "LinuxFileSystem.h"
+    #include "../Linux/include/LinuxFileSystem.h"
     typedef LinuxFileSystem FileSystem;
     typedef LinuxFile       CFile;
 
 #elif PLATFORM_MACOS || PLATFORM_IOS
 
-    #include "AppleFileSystem.h"
+    #include "../Apple/include/AppleFileSystem.h"
     typedef AppleFileSystem FileSystem;
     typedef AppleFile       CFile;
 
diff --git a/Platforms/interface/PlatformDebug.h b/Platforms/interface/PlatformDebug.h
index c71b75bf..04391151 100644
--- a/Platforms/interface/PlatformDebug.h
+++ b/Platforms/interface/PlatformDebug.h
@@ -26,23 +26,23 @@
 #include "PlatformDefinitions.h"
 
 #if PLATFORM_WIN32
-    #include "Win32Debug.h"
+    #include "../Win32/include/Win32Debug.h"
     typedef WindowsDebug PlatformDebug;
 
 #elif PLATFORM_UNIVERSAL_WINDOWS
-    #include "UWPDebug.h"
+    #include "../UWP/include/UWPDebug.h"
     typedef WindowsStoreDebug PlatformDebug;
 
 #elif PLATFORM_ANDROID
-    #include "AndroidDebug.h"
+    #include "../Android/include/AndroidDebug.h"
     typedef AndroidDebug PlatformDebug;
 
 #elif PLATFORM_LINUX
-    #include "LinuxDebug.h"
+    #include "../Linux/include/LinuxDebug.h"
     typedef LinuxDebug PlatformDebug;
 
 #elif PLATFORM_MACOS || PLATFORM_IOS
-    #include "AppleDebug.h"
+    #include "../Apple/include/AppleDebug.h"
     typedef AppleDebug PlatformDebug;
 
 #else
diff --git a/Platforms/interface/PlatformDefinitions.h b/Platforms/interface/PlatformDefinitions.h
index 8c02ddfc..4ca799aa 100644
--- a/Platforms/interface/PlatformDefinitions.h
+++ b/Platforms/interface/PlatformDefinitions.h
@@ -39,7 +39,7 @@
 #       error Conflicting platform macros
 #   endif
 
-#   include "Win32PlatformDefinitions.h"
+#   include "../Win32/include/Win32PlatformDefinitions.h"
 
 #   define OPENGL_SUPPORTED 1
 #   define D3D11_SUPPORTED 1
@@ -51,7 +51,7 @@
 #       error Conflicting platform macros
 #   endif
 
-#   include "UWPDefinitions.h"
+#   include "../UWP/include/UWPDefinitions.h"
 
 #   define OPENGL_SUPPORTED 0
 #   define D3D11_SUPPORTED 1
@@ -63,7 +63,7 @@
 #       error Conflicting platform macros
 #   endif
 
-#   include "AndroidPlatformDefinitions.h"
+#   include "../Android/include/AndroidPlatformDefinitions.h"
 
 #   define OPENGL_SUPPORTED 1
 #   define D3D11_SUPPORTED 0
@@ -75,7 +75,7 @@
 #       error Conflicting platform macros
 #   endif
 
-#   include "LinuxPlatformDefinitions.h"
+#   include "../Linux/include/LinuxPlatformDefinitions.h"
 
 #   define OPENGL_SUPPORTED 1
 #   define D3D11_SUPPORTED 0
@@ -87,7 +87,7 @@
 #       error Conflicting platform macros
 #   endif
 
-#   include "ApplePlatformDefinitions.h"
+#   include "../Apple/include/ApplePlatformDefinitions.h"
 
 #   define OPENGL_SUPPORTED 1
 #   define D3D11_SUPPORTED 0
@@ -99,7 +99,7 @@
 #       error Conflicting platform macros
 #   endif
 
-#   include "ApplePlatformDefinitions.h"
+#   include "../Apple/include/ApplePlatformDefinitions.h"
 
 #   define OPENGL_SUPPORTED 1
 #   define D3D11_SUPPORTED 0
diff --git a/Platforms/interface/PlatformMisc.h b/Platforms/interface/PlatformMisc.h
index 9a658677..76b0512c 100644
--- a/Platforms/interface/PlatformMisc.h
+++ b/Platforms/interface/PlatformMisc.h
@@ -26,19 +26,19 @@
 #include "PlatformDefinitions.h"
 
 #if PLATFORM_WIN32 || PLATFORM_UNIVERSAL_WINDOWS
-    #include "Win32PlatformMisc.h"
+    #include "../Win32/include/Win32PlatformMisc.h"
     typedef WindowsMisc PlatformMisc;
 
 #elif PLATFORM_ANDROID
-    #include "AndroidPlatformMisc.h"
+    #include "../Android/include/AndroidPlatformMisc.h"
     typedef AndroidMisc PlatformMisc;
 
 #elif PLATFORM_LINUX
-    #include "LinuxPlatformMisc.h"
+    #include "../Linux/include/LinuxPlatformMisc.h"
     typedef LinuxMisc PlatformMisc;
 
 #elif PLATFORM_MACOS || PLATFORM_IOS
-    #include "ApplePlatformMisc.h"
+    #include "../Apple/include/ApplePlatformMisc.h"
     typedef AppleMisc PlatformMisc;
 
 #else