More .h -> .hpp renamings

64 files changed, 84 insertions, 76 deletions

diff --git a/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp b/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp
index a93f0f98..539d998f 100644
--- a/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp
+++ b/Graphics/GLSLTools/src/GLSLSourceBuilder.cpp
@@ -30,7 +30,7 @@
 
 #include "GLSLSourceBuilder.hpp"
 #include "DebugUtilities.h"
-#include "HLSL2GLSLConverterImpl.h"
+#include "HLSL2GLSLConverterImpl.hpp"
 #include "RefCntAutoPtr.hpp"
 #include "DataBlobImpl.hpp"
 
diff --git a/Graphics/GraphicsAccessories/interface/ColorConversion.h b/Graphics/GraphicsAccessories/interface/ColorConversion.h
index 97fae201..ee064a78 100644
--- a/Graphics/GraphicsAccessories/interface/ColorConversion.h
+++ b/Graphics/GraphicsAccessories/interface/ColorConversion.h
@@ -30,8 +30,7 @@
 #include <cmath>
 #include "../../../Primitives/interface/BasicTypes.h"
 
-namespace Diligent
-{
+DILIGENT_BEGIN_NAMESPACE(Diligent)
 
 // https://en.wikipedia.org/wiki/SRGB
 inline float LinearToSRGB(float x)
@@ -58,4 +57,4 @@ inline float FastSRGBToLinear(float x)
     return x * (x * (x * 0.305306011f + 0.682171111f) + 0.012522878f);
 }
 
-} // namespace Diligent
+DILIGENT_END_NAMESPACE // namespace Diligent
diff --git a/Graphics/GraphicsEngine/include/EngineMemory.h b/Graphics/GraphicsEngine/include/EngineMemory.h
index b3197aed..8211bf35 100644
--- a/Graphics/GraphicsEngine/include/EngineMemory.h
+++ b/Graphics/GraphicsEngine/include/EngineMemory.h
@@ -32,8 +32,8 @@
 
 #include "MemoryAllocator.h"
 
-namespace Diligent
-{
+DILIGENT_BEGIN_NAMESPACE(Diligent)
+
 /// Sets raw memory allocator. This function must be called before any memory allocation/deallocation function
 /// is called.
 void SetRawAllocator(IMemoryAllocator* pRawAllocator);
@@ -47,7 +47,7 @@ IMemoryAllocator& GetStringAllocator();
 #define ALLOCATE(Allocator, Desc, Type, Count) reinterpret_cast<Type*>(ALLOCATE_RAW(Allocator, Desc, sizeof(Type) * (Count)))
 #define FREE(Allocator, Ptr)                   Allocator.Free(Ptr)
 
-} // namespace Diligent
+DILIGENT_END_NAMESPACE // namespace Diligent
 
 
 #if 0
diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
index 614f6264..91b61477 100644
--- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt
@@ -7,7 +7,7 @@ set(INCLUDE
     include/BufferD3D11Impl.hpp
     include/BufferViewD3D11Impl.hpp
     include/CommandListD3D11Impl.hpp
-    include/D3D11TypeConversions.h
+    include/D3D11TypeConversions.hpp
     include/D3D11TypeDefinitions.h
     include/DeviceContextD3D11Impl.hpp
     include/DisjointQueryPool.hpp
diff --git a/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h b/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.hpp
index a2126492..5a87cfd7 100644
--- a/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.h
+++ b/Graphics/GraphicsEngineD3D11/include/D3D11TypeConversions.hpp
@@ -31,7 +31,7 @@
 /// Type conversion routines
 
 #include "GraphicsTypes.h"
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/include/pch.h b/Graphics/GraphicsEngineD3D11/include/pch.h
index 47017eda..6018b4b8 100644
--- a/Graphics/GraphicsEngineD3D11/include/pch.h
+++ b/Graphics/GraphicsEngineD3D11/include/pch.h
@@ -76,6 +76,6 @@
 #include "DebugUtilities.h"
 #include "D3DErrors.hpp"
 #include "RenderDeviceBase.hpp"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 #include "ValidatedCast.hpp"
 #include <atlcomcli.h>
diff --git a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp
index 2d2d10b5..bd0eaaf1 100644
--- a/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/BufferD3D11Impl.cpp
@@ -31,7 +31,7 @@
 #include "BufferD3D11Impl.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
 #include "DeviceContextD3D11Impl.hpp"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 #include "BufferViewD3D11Impl.hpp"
 #include "GraphicsAccessories.hpp"
 #include "EngineMemory.h"
diff --git a/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp b/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp
index 0d76db58..e717f09d 100644
--- a/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/D3D11TypeConversions.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "pch.h"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 
 #include "D3D11TypeDefinitions.h"
 #include "D3DTypeConversionImpl.hpp"
diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
index 0c19756c..f7e8c886 100755
--- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
@@ -33,7 +33,7 @@
 #include "Texture2D_D3D11.hpp"

 #include "Texture3D_D3D11.hpp"

 #include "SamplerD3D11Impl.hpp"

-#include "D3D11TypeConversions.h"

+#include "D3D11TypeConversions.hpp"

 #include "TextureViewD3D11Impl.hpp"

 #include "PipelineStateD3D11Impl.hpp"

 #include "ShaderResourceBindingD3D11Impl.hpp"

diff --git a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp
index 252697bd..5b11cf12 100644
--- a/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/EngineFactoryD3D11.cpp
@@ -33,7 +33,7 @@
 #include "RenderDeviceD3D11Impl.hpp"
 #include "DeviceContextD3D11Impl.hpp"
 #include "SwapChainD3D11Impl.hpp"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 #include "EngineMemory.h"
 #include "EngineFactoryD3DBase.hpp"
 #include <Windows.h>
diff --git a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp
index bcd9bec6..1046f6ff 100644
--- a/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/RenderDeviceD3D11Impl.cpp
@@ -34,7 +34,7 @@
 #include "Texture2D_D3D11.hpp"
 #include "Texture3D_D3D11.hpp"
 #include "SamplerD3D11Impl.hpp"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 #include "TextureViewD3D11Impl.hpp"
 #include "PipelineStateD3D11Impl.hpp"
 #include "ShaderResourceBindingD3D11Impl.hpp"
diff --git a/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp
index 6d23f951..8ffe8939 100644
--- a/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/SamplerD3D11Impl.cpp
@@ -28,7 +28,7 @@
 #include "pch.h"
 #include "SamplerD3D11Impl.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp
index 89104a55..8980db2a 100644
--- a/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/Texture1D_D3D11.cpp
@@ -28,7 +28,7 @@
 #include "pch.h"
 #include "Texture1D_D3D11.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp
index cc36b713..42041ec6 100644
--- a/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/Texture2D_D3D11.cpp
@@ -28,7 +28,7 @@
 #include "pch.h"
 #include "Texture2D_D3D11.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp
index 322043e8..6756f957 100644
--- a/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/Texture3D_D3D11.cpp
@@ -28,7 +28,7 @@
 #include "pch.h"
 #include "Texture3D_D3D11.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp
index 39918856..7a744b57 100644
--- a/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/TextureBaseD3D11.cpp
@@ -29,7 +29,7 @@
 #include "TextureBaseD3D11.hpp"
 #include "RenderDeviceD3D11Impl.hpp"
 #include "DeviceContextD3D11Impl.hpp"
-#include "D3D11TypeConversions.h"
+#include "D3D11TypeConversions.hpp"
 #include "TextureViewD3D11Impl.hpp"
 #include "EngineMemory.h"
 
diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
index fa3b4b70..6ea2fc22 100644
--- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt
@@ -10,7 +10,7 @@ set(INCLUDE
     include/CommandListManager.hpp
     include/CommandQueueD3D12Impl.hpp
     include/D3D12ResourceBase.hpp
-    include/D3D12TypeConversions.h
+    include/D3D12TypeConversions.hpp
     include/D3D12TypeDefinitions.h
     include/D3D12Utils.h
     include/d3dx12_win.h
diff --git a/Graphics/GraphicsEngineD3D12/include/D3D12TypeConversions.h b/Graphics/GraphicsEngineD3D12/include/D3D12TypeConversions.hpp
index bdaa3f5e..bdaa3f5e 100644
--- a/Graphics/GraphicsEngineD3D12/include/D3D12TypeConversions.h
+++ b/Graphics/GraphicsEngineD3D12/include/D3D12TypeConversions.hpp
diff --git a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
index 71d4ebce..b1c4c8e8 100644
--- a/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/BufferD3D12Impl.cpp
@@ -29,10 +29,10 @@
 #include "BufferD3D12Impl.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
 #include "DeviceContextD3D12Impl.hpp"
-#include "D3D12TypeConversions.h"
+#include "D3D12TypeConversions.hpp"
 #include "BufferViewD3D12Impl.hpp"
 #include "GraphicsAccessories.hpp"
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 #include "EngineMemory.h"
 #include "StringTools.hpp"
 
diff --git a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp
index ebc46582..253d2822 100644
--- a/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/CommandContext.cpp
@@ -31,7 +31,7 @@
 #include "TextureD3D12Impl.hpp"
 #include "BufferD3D12Impl.hpp"
 #include "CommandListManager.hpp"
-#include "D3D12TypeConversions.h"
+#include "D3D12TypeConversions.hpp"
 
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
index dfb01d88..e1da052f 100644
--- a/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/D3D12TypeConversions.cpp
@@ -29,8 +29,8 @@
 
 #include <array>
 
-#include "D3D12TypeConversions.h"
-#include "DXGITypeConversions.h"
+#include "D3D12TypeConversions.hpp"
+#include "DXGITypeConversions.hpp"
 
 #include "D3D12TypeDefinitions.h"
 #include "D3DTypeConversionImpl.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
index ba509cd5..582b8cad 100644
--- a/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp
@@ -34,11 +34,11 @@
 #include "TextureD3D12Impl.hpp"
 #include "BufferD3D12Impl.hpp"
 #include "FenceD3D12Impl.hpp"
-#include "D3D12TypeConversions.h"
+#include "D3D12TypeConversions.hpp"
 #include "d3dx12_win.h"
 #include "D3D12DynamicHeap.hpp"
 #include "CommandListD3D12Impl.hpp"
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
index ad68183d..bed9a84b 100644
--- a/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/EngineFactoryD3D12.cpp
@@ -37,7 +37,7 @@
 #include "RenderDeviceD3D12Impl.hpp"
 #include "DeviceContextD3D12Impl.hpp"
 #include "SwapChainD3D12Impl.hpp"
-#include "D3D12TypeConversions.h"
+#include "D3D12TypeConversions.hpp"
 #include "EngineFactoryD3DBase.hpp"
 #include "StringTools.hpp"
 #include "EngineMemory.h"
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
index 3534c891..6cfe1b1e 100644
--- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
@@ -29,9 +29,9 @@
 #include <array>
 #include "PipelineStateD3D12Impl.hpp"
 #include "ShaderD3D12Impl.hpp"
-#include "D3D12TypeConversions.h"
+#include "D3D12TypeConversions.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 #include "ShaderResourceBindingD3D12Impl.hpp"
 #include "CommandContext.hpp"
 #include "EngineMemory.h"
diff --git a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp
index bf99bdcc..e27d6be6 100644
--- a/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/QueryManagerD3D12.cpp
@@ -29,7 +29,7 @@
 #include <algorithm>
 
 #include "QueryManagerD3D12.hpp"
-#include "D3D12TypeConversions.h"
+#include "D3D12TypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 #include "CommandContext.hpp"
 #include "Align.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
index 73be3632..781a711d 100644
--- a/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/RenderDeviceD3D12Impl.cpp
@@ -31,7 +31,7 @@
 #include "PipelineStateD3D12Impl.hpp"
 #include "ShaderD3D12Impl.hpp"
 #include "TextureD3D12Impl.hpp"
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 #include "SamplerD3D12Impl.hpp"
 #include "BufferD3D12Impl.hpp"
 #include "ShaderResourceBindingD3D12Impl.hpp"
diff --git a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp
index 26c02d7d..33978eaf 100644
--- a/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/RootSignature.cpp
@@ -33,7 +33,7 @@
 #include "CommandContext.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
 #include "TextureD3D12Impl.hpp"
-#include "D3D12TypeConversions.h"
+#include "D3D12TypeConversions.hpp"
 #include "HashUtils.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp
index e53fa1b5..1002dc37 100644
--- a/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/SamplerD3D12Impl.cpp
@@ -28,7 +28,7 @@
 #include "pch.h"
 #include "SamplerD3D12Impl.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
-#include "D3D12TypeConversions.h"
+#include "D3D12TypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
index ac24533c..ef133c48 100644
--- a/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/SwapChainD3D12Impl.cpp
@@ -29,7 +29,7 @@
 #include "SwapChainD3D12Impl.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
 #include "DeviceContextD3D12Impl.hpp"
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 #include "TextureD3D12Impl.hpp"
 #include "EngineMemory.h"
 
diff --git a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp
index 7155863d..a4033f51 100644
--- a/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/TextureD3D12Impl.cpp
@@ -29,9 +29,9 @@
 #include "TextureD3D12Impl.hpp"
 #include "RenderDeviceD3D12Impl.hpp"
 #include "DeviceContextD3D12Impl.hpp"
-#include "D3D12TypeConversions.h"
+#include "D3D12TypeConversions.hpp"
 #include "TextureViewD3D12Impl.hpp"
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 #include "d3dx12_win.h"
 #include "EngineMemory.h"
 #include "StringTools.hpp"
diff --git a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
index a60f000f..0f208b6d 100644
--- a/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
+++ b/Graphics/GraphicsEngineD3DBase/CMakeLists.txt
@@ -7,7 +7,7 @@ set(INCLUDE
     include/D3DShaderResourceLoader.hpp
     include/D3DTypeConversionImpl.hpp
     include/D3DViewDescConversionImpl.hpp
-    include/DXGITypeConversions.h
+    include/DXGITypeConversions.hpp
     include/EngineFactoryD3DBase.hpp
     include/HLSLDefinitions.fxh
     include/RenderDeviceD3DBase.hpp
diff --git a/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp b/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp
index 5f6939a8..02f72d86 100644
--- a/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp
+++ b/Graphics/GraphicsEngineD3DBase/include/D3DViewDescConversionImpl.hpp
@@ -32,7 +32,7 @@
 
 /// This file must be included after D3D11TypeDefinitions.h or D3D12TypeDefinitions.h
 
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.h b/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.hpp
index 91808f8f..91808f8f 100644
--- a/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.h
+++ b/Graphics/GraphicsEngineD3DBase/include/DXGITypeConversions.hpp
diff --git a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp
index 1e610f62..88680ff5 100644
--- a/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp
+++ b/Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 #include "EngineFactoryBase.hpp"
 
 /// \file
diff --git a/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp b/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp
index 32f3e60e..a181d534 100644
--- a/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp
+++ b/Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp
@@ -25,7 +25,7 @@
  *  of the possibility of such damages.
  */
 
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 #include "BasicTypes.h"
 #include "DebugUtilities.h"
 
diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
index c0d3bd36..2ee218be 100644
--- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
+++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt
@@ -15,7 +15,7 @@ set(INCLUDE
     include/GLProgramResourceCache.hpp
     include/GLPipelineResourceLayout.hpp
     include/GLProgramResources.hpp
-    include/GLTypeConversions.h
+    include/GLTypeConversions.hpp
     include/pch.h
     include/PipelineStateGLImpl.hpp
     include/QueryGLImpl.hpp
diff --git a/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h b/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.hpp
index 4f149399..4f149399 100644
--- a/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.h
+++ b/Graphics/GraphicsEngineOpenGL/include/GLTypeConversions.hpp
diff --git a/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp
index f4bff6a0..bce00b60 100644
--- a/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/BufferGLImpl.cpp
@@ -29,7 +29,7 @@
 
 #include "BufferGLImpl.hpp"
 #include "RenderDeviceGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "BufferViewGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
 #include "EngineMemory.h"
diff --git a/Graphics/GraphicsEngineOpenGL/src/BufferViewGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/BufferViewGLImpl.cpp
index 024c2dae..8133df48 100644
--- a/Graphics/GraphicsEngineOpenGL/src/BufferViewGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/BufferViewGLImpl.cpp
@@ -31,7 +31,7 @@
 #include "DeviceContextGLImpl.hpp"
 #include "BufferViewGLImpl.hpp"
 #include "BufferGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
index eca2ccfe..8b13486d 100644
--- a/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp
@@ -33,7 +33,7 @@
 #include "SwapChainGL.h"
 #include "DeviceContextGLImpl.hpp"
 #include "RenderDeviceGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 
 #include "BufferGLImpl.hpp"
 #include "ShaderGLImpl.hpp"
diff --git a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp
index 2a35bd28..d81620a4 100644
--- a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp
@@ -33,7 +33,7 @@
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
 #include "EngineMemory.h"
-#include "HLSL2GLSLConverterObject.h"
+#include "HLSL2GLSLConverterObject.hpp"
 #include "EngineFactoryBase.hpp"
 
 #if PLATFORM_IOS
diff --git a/Graphics/GraphicsEngineOpenGL/src/GLContextState.cpp b/Graphics/GraphicsEngineOpenGL/src/GLContextState.cpp
index da7a2847..9980d69f 100644
--- a/Graphics/GraphicsEngineOpenGL/src/GLContextState.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/GLContextState.cpp
@@ -31,7 +31,7 @@
 #include "TextureBaseGL.hpp"
 #include "SamplerGLImpl.hpp"
 #include "AsyncWritableResource.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "BufferViewGLImpl.hpp"
 #include "RenderDeviceGLImpl.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/GLContextWindows.cpp b/Graphics/GraphicsEngineOpenGL/src/GLContextWindows.cpp
index 71c23a13..2bfd7d9d 100644
--- a/Graphics/GraphicsEngineOpenGL/src/GLContextWindows.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/GLContextWindows.cpp
@@ -29,7 +29,7 @@
 
 #include "GLContextWindows.hpp"
 #include "DeviceCaps.h"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp b/Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp
index e534f64d..dde10533 100644
--- a/Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp
@@ -26,7 +26,7 @@
  */
 
 #include "pch.h"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp
index 3f254d5c..c2e6a576 100644
--- a/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp
@@ -41,7 +41,7 @@
 #include "TextureCubeArray_OGL.hpp"
 #include "SamplerGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "PipelineStateGLImpl.hpp"
 #include "ShaderResourceBindingGLImpl.hpp"
 #include "FenceGLImpl.hpp"
diff --git a/Graphics/GraphicsEngineOpenGL/src/SamplerGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/SamplerGLImpl.cpp
index 2b34841c..ddf73df4 100644
--- a/Graphics/GraphicsEngineOpenGL/src/SamplerGLImpl.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/SamplerGLImpl.cpp
@@ -28,7 +28,7 @@
 #include "pch.h"
 #include "SamplerGLImpl.hpp"
 #include "RenderDeviceGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 
 namespace Diligent
 {
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture1DArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture1DArray_OGL.cpp
index 4cbfa8e0..2dd93b6c 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture1DArray_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture1DArray_OGL.cpp
@@ -30,7 +30,7 @@
 #include "Texture1DArray_OGL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "BufferGLImpl.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture1D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture1D_OGL.cpp
index 40cea68d..8f385238 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture1D_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture1D_OGL.cpp
@@ -30,7 +30,7 @@
 #include "Texture1D_OGL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "BufferGLImpl.hpp"
 
 namespace Diligent
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp
index 39e65b03..4c9c0e19 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture2DArray_OGL.cpp
@@ -30,7 +30,7 @@
 #include "Texture2DArray_OGL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 #include "BufferGLImpl.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp
index 4bdaf683..e854960f 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture2D_OGL.cpp
@@ -30,7 +30,7 @@
 #include "Texture2D_OGL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 #include "BufferGLImpl.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp
index e915a3ed..7b4d19a0 100644
--- a/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/Texture3D_OGL.cpp
@@ -30,7 +30,7 @@
 #include "Texture3D_OGL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 #include "BufferGLImpl.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp
index dc463a24..72733d70 100644
--- a/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp
@@ -29,7 +29,7 @@
 
 #include "TextureBaseGL.hpp"
 #include "RenderDeviceGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "TextureViewGLImpl.hpp"
 #include "GLContextState.hpp"
 #include "DeviceContextGLImpl.hpp"
diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp
index e58863ed..646e78f2 100644
--- a/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/TextureCubeArray_OGL.cpp
@@ -30,7 +30,7 @@
 #include "TextureCubeArray_OGL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 #include "BufferGLImpl.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp b/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp
index 27a296e1..8193aca5 100644
--- a/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/TextureCube_OGL.cpp
@@ -30,7 +30,7 @@
 #include "TextureCube_OGL.hpp"
 #include "RenderDeviceGLImpl.hpp"
 #include "DeviceContextGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "GraphicsAccessories.hpp"
 #include "BufferGLImpl.hpp"
 
diff --git a/Graphics/GraphicsEngineOpenGL/src/VAOCache.cpp b/Graphics/GraphicsEngineOpenGL/src/VAOCache.cpp
index a3388293..cecadcba 100644
--- a/Graphics/GraphicsEngineOpenGL/src/VAOCache.cpp
+++ b/Graphics/GraphicsEngineOpenGL/src/VAOCache.cpp
@@ -31,7 +31,7 @@
 #include "RenderDeviceGLImpl.hpp"
 #include "GLObjectWrapper.hpp"
 #include "BufferGLImpl.hpp"
-#include "GLTypeConversions.h"
+#include "GLTypeConversions.hpp"
 #include "GLContextState.hpp"
 #include "PipelineStateGLImpl.hpp"
 
diff --git a/Graphics/GraphicsTools/interface/CommonlyUsedStates.h b/Graphics/GraphicsTools/interface/CommonlyUsedStates.h
index 34c58b19..3b18d6ae 100644
--- a/Graphics/GraphicsTools/interface/CommonlyUsedStates.h
+++ b/Graphics/GraphicsTools/interface/CommonlyUsedStates.h
@@ -36,8 +36,7 @@
 #include "../../GraphicsEngine/interface/RasterizerState.h"
 #include "../../GraphicsEngine/interface/Sampler.h"
 
-namespace Diligent
-{
+DILIGENT_BEGIN_NAMESPACE(Diligent)
 
 // clang-format off
 
@@ -224,4 +223,4 @@ static const SamplerDesc Sam_Aniso8xWrap
     8     // MaxAnisotropy
 };
 
-}
+DILIGENT_END_NAMESPACE // namespace Diligent
diff --git a/Graphics/GraphicsTools/interface/GraphicsUtilities.h b/Graphics/GraphicsTools/interface/GraphicsUtilities.h
index 03dcd829..0ca5ad54 100644
--- a/Graphics/GraphicsTools/interface/GraphicsUtilities.h
+++ b/Graphics/GraphicsTools/interface/GraphicsUtilities.h
@@ -34,8 +34,7 @@
 #include "../../GraphicsEngine/interface/Buffer.h"
 #include "../../GraphicsEngine/interface/RenderDevice.h"
 
-namespace Diligent
-{
+DILIGENT_BEGIN_NAMESPACE(Diligent)
 
 void CreateUniformBuffer(IRenderDevice*   pDevice,
                          Uint32           Size,
@@ -54,4 +53,4 @@ void GenerateCheckerBoardPattern(Uint32         Width,
                                  Uint8*         pData,
                                  Uint32         StrideInBytes);
 
-} // namespace Diligent
+DILIGENT_END_NAMESPACE // namespace Diligent
diff --git a/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp b/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp
index 14fe131a..624a615a 100644
--- a/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp
+++ b/Graphics/GraphicsTools/src/TextureUploaderD3D11.cpp
@@ -38,7 +38,7 @@
 #include "RenderDeviceD3D11.h"
 #include "DeviceContextD3D11.h"
 #include "TextureD3D11.h"
-#include "DXGITypeConversions.h"
+#include "DXGITypeConversions.hpp"
 #include "ThreadSignal.hpp"
 #include "GraphicsAccessories.hpp"
 
diff --git a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt
index 90730324..109687df 100644
--- a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt
+++ b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt
@@ -4,8 +4,8 @@ project(Diligent-HLSL2GLSLConverterLib CXX)
 
 set(INCLUDE 
     include/GLSLDefinitions.h
-    include/HLSL2GLSLConverterImpl.h
-    include/HLSL2GLSLConverterObject.h
+    include/HLSL2GLSLConverterImpl.hpp
+    include/HLSL2GLSLConverterObject.hpp
     include/HLSLKeywords.h
 )
 
diff --git a/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterImpl.h b/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterImpl.hpp
index 0777dbdd..0777dbdd 100644
--- a/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterImpl.h
+++ b/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterImpl.hpp
diff --git a/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterObject.h b/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterObject.hpp
index 8603ced8..8603ced8 100644
--- a/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterObject.h
+++ b/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterObject.hpp
diff --git a/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h b/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h
index f9b0f503..3633e356 100644
--- a/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h
+++ b/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h
@@ -33,13 +33,14 @@
 #include "../../GraphicsEngine/interface/Shader.h"
 #include "../../../Primitives/interface/DataBlob.h"
 
-namespace Diligent
-{
+DILIGENT_BEGIN_NAMESPACE(Diligent)
 
 // {1FDE020A-9C73-4A76-8AEF-C2C6C2CF0EA5}
 static constexpr INTERFACE_ID IID_HLSL2GLSLConversionStream =
     {0x1fde020a, 0x9c73, 0x4a76, {0x8a, 0xef, 0xc2, 0xc6, 0xc2, 0xcf, 0xe, 0xa5}};
 
+#if DILIGENT_CPP_INTERFACE
+
 class IHLSL2GLSLConversionStream : public IObject
 {
 public:
@@ -51,11 +52,17 @@ public:
                          IDataBlob** ppGLSLSource) = 0;
 };
 
+#else
+
+#endif
+
 
 // {44A21160-77E0-4DDC-A57E-B8B8B65B5342}
 static constexpr INTERFACE_ID IID_HLSL2GLSLConverter =
     {0x44a21160, 0x77e0, 0x4ddc, {0xa5, 0x7e, 0xb8, 0xb8, 0xb6, 0x5b, 0x53, 0x42}};
 
+#if DILIGENT_CPP_INTERFACE
+
 /// Interface to the buffer object implemented in OpenGL
 class IHLSL2GLSLConverter : public IObject
 {
@@ -67,4 +74,8 @@ public:
                               IHLSL2GLSLConversionStream**     ppStream) const = 0;
 };
 
-} // namespace Diligent
+#else
+
+#endif
+
+DILIGENT_END_NAMESPACE // namespace Diligent
diff --git a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp
index ed4e617a..0d3755c1 100644
--- a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp
+++ b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp
@@ -357,7 +357,7 @@
 #include <unordered_set>
 #include <string>
 
-#include "HLSL2GLSLConverterImpl.h"
+#include "HLSL2GLSLConverterImpl.hpp"
 #include "ShaderBase.hpp"
 #include "DataBlobImpl.hpp"
 #include "StringDataBlobImpl.hpp"
diff --git a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterObject.cpp b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterObject.cpp
index 622df3de..e2d8a69d 100644
--- a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterObject.cpp
+++ b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterObject.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "HLSL2GLSLConverterObject.h"
-#include "HLSL2GLSLConverterImpl.h"
+#include "HLSL2GLSLConverterObject.hpp"
+#include "HLSL2GLSLConverterImpl.hpp"
 #include "StringDataBlobImpl.hpp"
 
 namespace Diligent