diff --git a/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl b/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl
index 1b04f84a9..0fdb04157 100644
--- a/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl	
+++ b/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl	
@@ -1,4 +1,4 @@
-#include "../Common/Color.hlsl"
+#include "../Common/Color.hlsli"
 
 TextureCube<float4> EnvCaptureTexture : register(t0);
 TextureCube<float4> ReflectionsTexture : register(t1);
diff --git a/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/UpdateCubemapCS.hlsl b/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/UpdateCubemapCS.hlsl
index 56e97206c..e47cf9e78 100644
--- a/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/UpdateCubemapCS.hlsl	
+++ b/features/Dynamic Cubemaps/Shaders/DynamicCubemaps/UpdateCubemapCS.hlsl	
@@ -1,6 +1,6 @@
 #include "../Common/Constants.hlsli"
 #include "../Common/DeferredShared.hlsli"
-#include "../Common/FrameBuffer.hlsl"
+#include "../Common/FrameBuffer.hlsli"
 #include "../Common/VR.hlsli"
 
 RWTexture2DArray<float4> DynamicCubemap : register(u0);
diff --git a/features/Grass Lighting/Shaders/RunGrass.hlsl b/features/Grass Lighting/Shaders/RunGrass.hlsl
index b03aeec35..d0b6f9018 100644
--- a/features/Grass Lighting/Shaders/RunGrass.hlsl	
+++ b/features/Grass Lighting/Shaders/RunGrass.hlsl	
@@ -1,7 +1,7 @@
-#include "Common/Color.hlsl"
-#include "Common/FrameBuffer.hlsl"
+#include "Common/Color.hlsli"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/GBuffer.hlsli"
-#include "Common/MotionBlur.hlsl"
+#include "Common/MotionBlur.hlsli"
 #include "Common/SharedData.hlsli"
 
 #define GRASS
diff --git a/features/Screen Space GI/Shaders/ScreenSpaceGI/gi.cs.hlsl b/features/Screen Space GI/Shaders/ScreenSpaceGI/gi.cs.hlsl
index 979ea3b67..b43d82985 100644
--- a/features/Screen Space GI/Shaders/ScreenSpaceGI/gi.cs.hlsl	
+++ b/features/Screen Space GI/Shaders/ScreenSpaceGI/gi.cs.hlsl	
@@ -23,7 +23,7 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 #include "../Common/FastMath.hlsli"
-#include "../Common/FrameBuffer.hlsl"
+#include "../Common/FrameBuffer.hlsli"
 #include "../Common/GBuffer.hlsli"
 #include "../Common/VR.hlsli"
 #include "common.hlsli"
diff --git a/features/Screen Space GI/Shaders/ScreenSpaceGI/radianceDisocc.cs.hlsl b/features/Screen Space GI/Shaders/ScreenSpaceGI/radianceDisocc.cs.hlsl
index 13850f6ef..5a68532e6 100644
--- a/features/Screen Space GI/Shaders/ScreenSpaceGI/radianceDisocc.cs.hlsl	
+++ b/features/Screen Space GI/Shaders/ScreenSpaceGI/radianceDisocc.cs.hlsl	
@@ -1,5 +1,5 @@
-#include "../Common/Color.hlsl"
-#include "../Common/FrameBuffer.hlsl"
+#include "../Common/Color.hlsli"
+#include "../Common/FrameBuffer.hlsli"
 #include "../Common/GBuffer.hlsli"
 #include "../Common/VR.hlsli"
 #include "common.hlsli"
diff --git a/features/Skylighting/Shaders/Skylighting/updateProbes.cs.hlsl b/features/Skylighting/Shaders/Skylighting/updateProbes.cs.hlsl
index ecca40eaf..527e076a9 100644
--- a/features/Skylighting/Shaders/Skylighting/updateProbes.cs.hlsl
+++ b/features/Skylighting/Shaders/Skylighting/updateProbes.cs.hlsl
@@ -2,7 +2,7 @@
 #include "Skylighting.hlsli"
 
 #include "../Common/DeferredShared.hlsli"
-#include "../Common/FrameBuffer.hlsl"
+#include "../Common/FrameBuffer.hlsli"
 #include "../Common/Spherical Harmonics/SphericalHarmonics.hlsli"
 
 cbuffer SkylightingCB : register(b1)
diff --git a/features/Subsurface Scattering/Shaders/SubsurfaceScattering/SeparableSSSCS.hlsl b/features/Subsurface Scattering/Shaders/SubsurfaceScattering/SeparableSSSCS.hlsl
index 5217dd9a1..7fc2ada85 100644
--- a/features/Subsurface Scattering/Shaders/SubsurfaceScattering/SeparableSSSCS.hlsl	
+++ b/features/Subsurface Scattering/Shaders/SubsurfaceScattering/SeparableSSSCS.hlsl	
@@ -14,7 +14,7 @@ cbuffer PerFrameSSS : register(b1)
 	float SSSS_FOVY;
 };
 
-#include "../Common/Color.hlsl"
+#include "../Common/Color.hlsli"
 #include "../Common/Constants.hlsli"
 #include "../Common/DeferredShared.hlsli"
 
diff --git a/features/Wetness Effects/Shaders/WetnessEffects/WetnessEffects.hlsli b/features/Wetness Effects/Shaders/WetnessEffects/WetnessEffects.hlsli
index 7aa63b8a0..8d0665c62 100644
--- a/features/Wetness Effects/Shaders/WetnessEffects/WetnessEffects.hlsli	
+++ b/features/Wetness Effects/Shaders/WetnessEffects/WetnessEffects.hlsli	
@@ -1,4 +1,4 @@
-#include "WetnessEffects/optimized-ggx.hlsl"
+#include "WetnessEffects/optimized-ggx.hlsli"
 
 // https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile
 float2 EnvBRDFApproxWater(float3 F0, float Roughness, float NoV)
diff --git a/features/Wetness Effects/Shaders/WetnessEffects/optimized-ggx.hlsl b/features/Wetness Effects/Shaders/WetnessEffects/optimized-ggx.hlsli
similarity index 99%
rename from features/Wetness Effects/Shaders/WetnessEffects/optimized-ggx.hlsl
rename to features/Wetness Effects/Shaders/WetnessEffects/optimized-ggx.hlsli
index 744750dfc..c14ab6014 100644
--- a/features/Wetness Effects/Shaders/WetnessEffects/optimized-ggx.hlsl	
+++ b/features/Wetness Effects/Shaders/WetnessEffects/optimized-ggx.hlsli	
@@ -1,5 +1,5 @@
 /*
-optimized-ggx.hlsl
+optimized-ggx.hlsli
 This file describes several optimizations you can make when creating a GGX shader.
 
 AUTHOR: John Hable
diff --git a/package/Shaders/AmbientCompositeCS.hlsl b/package/Shaders/AmbientCompositeCS.hlsl
index aa92f7c69..c4b894544 100644
--- a/package/Shaders/AmbientCompositeCS.hlsl
+++ b/package/Shaders/AmbientCompositeCS.hlsl
@@ -1,6 +1,6 @@
-#include "Common/Color.hlsl"
+#include "Common/Color.hlsli"
 #include "Common/DeferredShared.hlsli"
-#include "Common/FrameBuffer.hlsl"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/GBuffer.hlsli"
 #include "Common/VR.hlsli"
 
diff --git a/package/Shaders/Common/Color.hlsl b/package/Shaders/Common/Color.hlsli
similarity index 100%
rename from package/Shaders/Common/Color.hlsl
rename to package/Shaders/Common/Color.hlsli
diff --git a/package/Shaders/Common/FrameBuffer.hlsl b/package/Shaders/Common/FrameBuffer.hlsli
similarity index 100%
rename from package/Shaders/Common/FrameBuffer.hlsl
rename to package/Shaders/Common/FrameBuffer.hlsli
diff --git a/package/Shaders/Common/MotionBlur.hlsl b/package/Shaders/Common/MotionBlur.hlsli
similarity index 100%
rename from package/Shaders/Common/MotionBlur.hlsl
rename to package/Shaders/Common/MotionBlur.hlsli
diff --git a/package/Shaders/Common/Permutation.hlsl b/package/Shaders/Common/Permutation.hlsli
similarity index 100%
rename from package/Shaders/Common/Permutation.hlsl
rename to package/Shaders/Common/Permutation.hlsli
diff --git a/package/Shaders/DeferredCompositeCS.hlsl b/package/Shaders/DeferredCompositeCS.hlsl
index 98a203791..b95b68058 100644
--- a/package/Shaders/DeferredCompositeCS.hlsl
+++ b/package/Shaders/DeferredCompositeCS.hlsl
@@ -1,7 +1,7 @@
 
-#include "Common/Color.hlsl"
+#include "Common/Color.hlsli"
 #include "Common/DeferredShared.hlsli"
-#include "Common/FrameBuffer.hlsl"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/GBuffer.hlsli"
 #include "Common/VR.hlsli"
 
diff --git a/package/Shaders/DistantTree.hlsl b/package/Shaders/DistantTree.hlsl
index 22f86e6b4..c3a67d832 100644
--- a/package/Shaders/DistantTree.hlsl
+++ b/package/Shaders/DistantTree.hlsl
@@ -1,7 +1,7 @@
 #include "Common/Constants.hlsli"
-#include "Common/FrameBuffer.hlsl"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/GBuffer.hlsli"
-#include "Common/MotionBlur.hlsl"
+#include "Common/MotionBlur.hlsli"
 #include "Common/SharedData.hlsli"
 #include "Common/VR.hlsli"
 
diff --git a/package/Shaders/Effect.hlsl b/package/Shaders/Effect.hlsl
index 4a7082c6a..534c05db3 100644
--- a/package/Shaders/Effect.hlsl
+++ b/package/Shaders/Effect.hlsl
@@ -1,8 +1,8 @@
-#include "Common/Color.hlsl"
-#include "Common/FrameBuffer.hlsl"
+#include "Common/Color.hlsli"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/GBuffer.hlsli"
-#include "Common/MotionBlur.hlsl"
-#include "Common/Permutation.hlsl"
+#include "Common/MotionBlur.hlsli"
+#include "Common/Permutation.hlsli"
 #include "Common/SharedData.hlsli"
 #include "Common/Skinned.hlsli"
 #include "Common/VR.hlsli"
diff --git a/package/Shaders/Lighting.hlsl b/package/Shaders/Lighting.hlsl
index 6bb5998ce..bf40ebdf4 100644
--- a/package/Shaders/Lighting.hlsl
+++ b/package/Shaders/Lighting.hlsl
@@ -1,9 +1,9 @@
-#include "Common/Color.hlsl"
-#include "Common/FrameBuffer.hlsl"
+#include "Common/Color.hlsli"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/GBuffer.hlsli"
 #include "Common/LodLandscape.hlsli"
-#include "Common/MotionBlur.hlsl"
-#include "Common/Permutation.hlsl"
+#include "Common/MotionBlur.hlsli"
+#include "Common/Permutation.hlsli"
 #include "Common/SharedData.hlsli"
 #include "Common/Skinned.hlsli"
 
diff --git a/package/Shaders/Particle.hlsl b/package/Shaders/Particle.hlsl
index 45be05a3d..55ba9424b 100644
--- a/package/Shaders/Particle.hlsl
+++ b/package/Shaders/Particle.hlsl
@@ -1,5 +1,5 @@
 #include "Common/Constants.hlsli"
-#include "Common/FrameBuffer.hlsl"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/VR.hlsli"
 
 struct VS_INPUT
diff --git a/package/Shaders/RunGrass.hlsl b/package/Shaders/RunGrass.hlsl
index 3e7a9de92..3d91b158e 100644
--- a/package/Shaders/RunGrass.hlsl
+++ b/package/Shaders/RunGrass.hlsl
@@ -152,11 +152,11 @@ struct PS_OUTPUT
 
 #ifdef PSHADER
 
-#	include "Common/Color.hlsl"
-#	include "Common/FrameBuffer.hlsl"
+#	include "Common/Color.hlsli"
+#	include "Common/FrameBuffer.hlsli"
 #	include "Common/SharedData.hlsli"
-#	include "Common/MotionBlur.hlsl"
-#	include "Common/Permutation.hlsl"
+#	include "Common/MotionBlur.hlsli"
+#	include "Common/Permutation.hlsli"
 
 SamplerState SampBaseSampler : register(s0);
 SamplerState SampShadowMaskSampler : register(s1);
diff --git a/package/Shaders/Sky.hlsl b/package/Shaders/Sky.hlsl
index 1cd314463..8e0c607f0 100644
--- a/package/Shaders/Sky.hlsl
+++ b/package/Shaders/Sky.hlsl
@@ -1,5 +1,5 @@
 #include "Common/Constants.hlsli"
-#include "Common/FrameBuffer.hlsl"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/VR.hlsli"
 
 struct VS_INPUT
@@ -181,7 +181,7 @@ cbuffer AlphaTestRefCB : register(b11)
 }
 #	endif
 
-#	include "Common/MotionBlur.hlsl"
+#	include "Common/MotionBlur.hlsli"
 #	include "Common/SharedData.hlsli"
 
 #	if defined(CLOUD_SHADOWS)
diff --git a/package/Shaders/Utility.hlsl b/package/Shaders/Utility.hlsl
index 8f183db05..7a09b04b1 100644
--- a/package/Shaders/Utility.hlsl
+++ b/package/Shaders/Utility.hlsl
@@ -1,5 +1,5 @@
 #include "Common/Constants.hlsli"
-#include "Common/FrameBuffer.hlsl"
+#include "Common/FrameBuffer.hlsli"
 #include "Common/LodLandscape.hlsli"
 #include "Common/SharedData.hlsli"
 #include "Common/Skinned.hlsli"
diff --git a/package/Shaders/Water.hlsl b/package/Shaders/Water.hlsl
index 955245fc8..1a18cee6f 100644
--- a/package/Shaders/Water.hlsl
+++ b/package/Shaders/Water.hlsl
@@ -1,6 +1,6 @@
-#include "Common/FrameBuffer.hlsl"
-#include "Common/MotionBlur.hlsl"
-#include "Common/Permutation.hlsl"
+#include "Common/FrameBuffer.hlsli"
+#include "Common/MotionBlur.hlsli"
+#include "Common/Permutation.hlsli"
 
 #define WATER