diff --git a/base/renderprogs/bink.pixel b/base/renderprogs/bink.pixel
index f270fcaa..1fee8654 100644
--- a/base/renderprogs/bink.pixel
+++ b/base/renderprogs/bink.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0); // Y
 uniform sampler2D samp1 : register(s1); // Cr
diff --git a/base/renderprogs/bink.vertex b/base/renderprogs/bink.vertex
index 292dde2d..0b3d1b48 100644
--- a/base/renderprogs/bink.vertex
+++ b/base/renderprogs/bink.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/bink_gui.pixel b/base/renderprogs/bink_gui.pixel
index c98c0ccb..35419a41 100644
--- a/base/renderprogs/bink_gui.pixel
+++ b/base/renderprogs/bink_gui.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0); // Y
 uniform sampler2D samp1 : register(s1); // Cr
diff --git a/base/renderprogs/bink_gui.vertex b/base/renderprogs/bink_gui.vertex
index 63bc3c23..1d25d253 100644
--- a/base/renderprogs/bink_gui.vertex
+++ b/base/renderprogs/bink_gui.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/blendLight.pixel b/base/renderprogs/blendLight.pixel
index 3a066615..187fcddd 100644
--- a/base/renderprogs/blendLight.pixel
+++ b/base/renderprogs/blendLight.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 uniform sampler2D samp1 : register(s1);
diff --git a/base/renderprogs/blendLight.vertex b/base/renderprogs/blendLight.vertex
index b024f18e..1e1c343d 100644
--- a/base/renderprogs/blendLight.vertex
+++ b/base/renderprogs/blendLight.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/bumpyenvironment.pixel b/base/renderprogs/bumpyenvironment.pixel
index 6afc0261..8bfb4fbf 100644
--- a/base/renderprogs/bumpyenvironment.pixel
+++ b/base/renderprogs/bumpyenvironment.pixel
@@ -3,6 +3,7 @@
 
 Doom 3 BFG Edition GPL Source Code
 Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. 
+Copyright (C) 2013 Robert Beckebans
 
 This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").  
 
@@ -26,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform samplerCUBE	samp0 : register(s0); // texture 0 is the cube map
 uniform sampler2D	samp1 : register(s1); // normal map
@@ -48,7 +49,14 @@ struct PS_OUT {
 void main( PS_IN fragment, out PS_OUT result ) {
 
 	float4 bump = tex2D( samp1, fragment.texcoord0 ) * 2.0f - 1.0f;
-	float3 localNormal = float3( bump.wy, 0.0f );
+	// RB begin
+	float3 localNormal;
+#if defined(USE_NORMAL_FMT_RGB8)
+	localNormal = float3( bump.rg, 0.0f );
+#else
+	localNormal = float3( bump.wy, 0.0f );
+#endif
+	// RB end
 	localNormal.z = sqrt( 1.0f - dot3( localNormal, localNormal ) );
 
 	float3 globalNormal;
diff --git a/base/renderprogs/bumpyenvironment.vertex b/base/renderprogs/bumpyenvironment.vertex
index 59ab069f..4d02b662 100644
--- a/base/renderprogs/bumpyenvironment.vertex
+++ b/base/renderprogs/bumpyenvironment.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/bumpyenvironment_skinned.pixel b/base/renderprogs/bumpyenvironment_skinned.pixel
index 6afc0261..afe7e4c5 100644
--- a/base/renderprogs/bumpyenvironment_skinned.pixel
+++ b/base/renderprogs/bumpyenvironment_skinned.pixel
@@ -3,6 +3,7 @@
 
 Doom 3 BFG Edition GPL Source Code
 Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. 
+Copyright (C) 2013 Robert Beckebans
 
 This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").  
 
@@ -26,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform samplerCUBE	samp0 : register(s0); // texture 0 is the cube map
 uniform sampler2D	samp1 : register(s1); // normal map
@@ -48,7 +49,15 @@ struct PS_OUT {
 void main( PS_IN fragment, out PS_OUT result ) {
 
 	float4 bump = tex2D( samp1, fragment.texcoord0 ) * 2.0f - 1.0f;
-	float3 localNormal = float3( bump.wy, 0.0f );
+	
+	// RB begin
+	float3 localNormal;
+#if defined(GLES2)
+	localNormal = float3( bump.rg, 0.0f );
+#else
+	localNormal = float3( bump.wy, 0.0f );
+#endif
+	// RB end
 	localNormal.z = sqrt( 1.0f - dot3( localNormal, localNormal ) );
 
 	float3 globalNormal;
diff --git a/base/renderprogs/bumpyenvironment_skinned.vertex b/base/renderprogs/bumpyenvironment_skinned.vertex
index e5aa793e..1b6fe4f7 100644
--- a/base/renderprogs/bumpyenvironment_skinned.vertex
+++ b/base/renderprogs/bumpyenvironment_skinned.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform matrices_ubo { float4 matrices[408]; };
 
diff --git a/base/renderprogs/color.pixel b/base/renderprogs/color.pixel
index 2726f008..f924a931 100644
--- a/base/renderprogs/color.pixel
+++ b/base/renderprogs/color.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 
diff --git a/base/renderprogs/color.vertex b/base/renderprogs/color.vertex
index f1666b6d..22b6f655 100644
--- a/base/renderprogs/color.vertex
+++ b/base/renderprogs/color.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 #if defined(USE_GPU_SKINNING)
 uniform matrices_ubo { float4 matrices[408]; };
@@ -60,22 +60,22 @@ void main( VS_IN vertex, out VS_OUT result )
 	const float w3 = vertex.color2.w;
 
 	float4 matX, matY, matZ;	// must be float4 for vec4
-	float joint = vertex.color.x * 255.1 * 3;
+	int joint = int(vertex.color.x * 255.1 * 3.0);
 	matX = matrices[int(joint+0)] * w0;
 	matY = matrices[int(joint+1)] * w0;
 	matZ = matrices[int(joint+2)] * w0;
 
-	joint = vertex.color.y * 255.1 * 3;
+	joint = int(vertex.color.y * 255.1 * 3.0);
 	matX += matrices[int(joint+0)] * w1;
 	matY += matrices[int(joint+1)] * w1;
 	matZ += matrices[int(joint+2)] * w1;
 
-	joint = vertex.color.z * 255.1 * 3;
+	joint = int(vertex.color.z * 255.1 * 3.0);
 	matX += matrices[int(joint+0)] * w2;
 	matY += matrices[int(joint+1)] * w2;
 	matZ += matrices[int(joint+2)] * w2;
 
-	joint = vertex.color.w * 255.1 * 3;
+	joint = int(vertex.color.w * 255.1 * 3.0);
 	matX += matrices[int(joint+0)] * w3;
 	matY += matrices[int(joint+1)] * w3;
 	matZ += matrices[int(joint+2)] * w3;
diff --git a/base/renderprogs/depth.pixel b/base/renderprogs/depth.pixel
index 8b486789..0b7e3858 100644
--- a/base/renderprogs/depth.pixel
+++ b/base/renderprogs/depth.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 struct PS_OUT {
diff --git a/base/renderprogs/depth.vertex b/base/renderprogs/depth.vertex
index ed5588d0..b528b343 100644
--- a/base/renderprogs/depth.vertex
+++ b/base/renderprogs/depth.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/depth_skinned.pixel b/base/renderprogs/depth_skinned.pixel
index 8b486789..0b7e3858 100644
--- a/base/renderprogs/depth_skinned.pixel
+++ b/base/renderprogs/depth_skinned.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 struct PS_OUT {
diff --git a/base/renderprogs/depth_skinned.vertex b/base/renderprogs/depth_skinned.vertex
index a039400b..7250a845 100644
--- a/base/renderprogs/depth_skinned.vertex
+++ b/base/renderprogs/depth_skinned.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform matrices_ubo { float4 matrices[408]; };
 
diff --git a/base/renderprogs/environment.pixel b/base/renderprogs/environment.pixel
index 589ffed9..2952f4ce 100644
--- a/base/renderprogs/environment.pixel
+++ b/base/renderprogs/environment.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform samplerCUBE	samp0 : register(s0); // texture 0 is the cube map
 
diff --git a/base/renderprogs/environment.vertex b/base/renderprogs/environment.vertex
index bcd3667d..f08cfd22 100644
--- a/base/renderprogs/environment.vertex
+++ b/base/renderprogs/environment.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/environment_skinned.pixel b/base/renderprogs/environment_skinned.pixel
index 589ffed9..2952f4ce 100644
--- a/base/renderprogs/environment_skinned.pixel
+++ b/base/renderprogs/environment_skinned.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform samplerCUBE	samp0 : register(s0); // texture 0 is the cube map
 
diff --git a/base/renderprogs/environment_skinned.vertex b/base/renderprogs/environment_skinned.vertex
index 5ae5b384..63110f1b 100644
--- a/base/renderprogs/environment_skinned.vertex
+++ b/base/renderprogs/environment_skinned.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform matrices_ubo { float4 matrices[408]; };
 
diff --git a/base/renderprogs/fog.pixel b/base/renderprogs/fog.pixel
index 9782b322..bbbe6ffb 100644
--- a/base/renderprogs/fog.pixel
+++ b/base/renderprogs/fog.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 uniform sampler2D samp1 : register(s1);
diff --git a/base/renderprogs/fog.vertex b/base/renderprogs/fog.vertex
index b0f341d7..41341142 100644
--- a/base/renderprogs/fog.vertex
+++ b/base/renderprogs/fog.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/fog_skinned.pixel b/base/renderprogs/fog_skinned.pixel
index 9782b322..bbbe6ffb 100644
--- a/base/renderprogs/fog_skinned.pixel
+++ b/base/renderprogs/fog_skinned.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 uniform sampler2D samp1 : register(s1);
diff --git a/base/renderprogs/fog_skinned.vertex b/base/renderprogs/fog_skinned.vertex
index 36421df8..7a3558db 100644
--- a/base/renderprogs/fog_skinned.vertex
+++ b/base/renderprogs/fog_skinned.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform matrices_ubo { float4 matrices[408]; };
 
diff --git a/base/renderprogs/fxaa.pixel b/base/renderprogs/fxaa.pixel
index fd4d866d..d8110d56 100644
--- a/base/renderprogs/fxaa.pixel
+++ b/base/renderprogs/fxaa.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 #define FXAA_GREEN_AS_LUMA 1
 #define FXAA_EARLY_EXIT 0
 #include "Fxaa3_11.h"
diff --git a/base/renderprogs/fxaa.vertex b/base/renderprogs/fxaa.vertex
index 9a2b7db4..ec9b40f8 100644
--- a/base/renderprogs/fxaa.vertex
+++ b/base/renderprogs/fxaa.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/gui.pixel b/base/renderprogs/gui.pixel
index 22fa81a8..33bbbeff 100644
--- a/base/renderprogs/gui.pixel
+++ b/base/renderprogs/gui.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 
diff --git a/base/renderprogs/gui.vertex b/base/renderprogs/gui.vertex
index 63bc3c23..1d25d253 100644
--- a/base/renderprogs/gui.vertex
+++ b/base/renderprogs/gui.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/heathaze.pixel b/base/renderprogs/heathaze.pixel
index c349be37..47191d3a 100644
--- a/base/renderprogs/heathaze.pixel
+++ b/base/renderprogs/heathaze.pixel
@@ -2,7 +2,8 @@
 ===========================================================================
 
 Doom 3 BFG Edition GPL Source Code
-Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. 
+Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company.
+Copyright (C) 2013-2014 Robert Beckebans 
 
 This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").  
 
diff --git a/base/renderprogs/interactionAmbient.pixel b/base/renderprogs/interactionAmbient.pixel
index e7e05972..5c10c8f6 100644
--- a/base/renderprogs/interactionAmbient.pixel
+++ b/base/renderprogs/interactionAmbient.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D	samp0 : register(s0); // texture 1 is the per-surface bump map
 uniform sampler2D	samp1 : register(s1); // texture 2 is the light falloff texture
@@ -61,13 +61,20 @@ void main( PS_IN fragment, out PS_OUT result ) {
 	half3 diffuseMap = ConvertYCoCgToRGB( YCoCG );
 
 	half3 localNormal;
+	// RB begin
+#if defined(USE_NORMAL_FMT_RGB8)
+	localNormal.xy = bumpMap.rg - 0.5;
+#else
 	localNormal.xy = bumpMap.wy - 0.5;
+#endif
+	// RB end
 	localNormal.z = sqrt( abs( dot( localNormal.xy, localNormal.xy ) - 0.25 ) );
 	localNormal = normalize( localNormal );
 
 	const half specularPower = 10.0f;
 	half hDotN = dot3( normalize( fragment.texcoord6.xyz ), localNormal );
-	half3 specularContribution = _half3( pow( hDotN, specularPower ) );
+	// RB: added abs
+	half3 specularContribution = _half3( pow( abs( hDotN ), specularPower ) );
 
 	half3 diffuseColor = diffuseMap * rpDiffuseModifier.xyz;
 	half3 specularColor = specMap.xyz * specularContribution * rpSpecularModifier.xyz;
diff --git a/base/renderprogs/interactionAmbient.vertex b/base/renderprogs/interactionAmbient.vertex
index a4e5f416..630b847e 100644
--- a/base/renderprogs/interactionAmbient.vertex
+++ b/base/renderprogs/interactionAmbient.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/interactionAmbient_skinned.pixel b/base/renderprogs/interactionAmbient_skinned.pixel
index e7e05972..7e06b48e 100644
--- a/base/renderprogs/interactionAmbient_skinned.pixel
+++ b/base/renderprogs/interactionAmbient_skinned.pixel
@@ -3,6 +3,7 @@
 
 Doom 3 BFG Edition GPL Source Code
 Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. 
+Copyright (C) 2013 Robert Beckebans
 
 This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code").  
 
@@ -26,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D	samp0 : register(s0); // texture 1 is the per-surface bump map
 uniform sampler2D	samp1 : register(s1); // texture 2 is the light falloff texture
@@ -61,7 +62,13 @@ void main( PS_IN fragment, out PS_OUT result ) {
 	half3 diffuseMap = ConvertYCoCgToRGB( YCoCG );
 
 	half3 localNormal;
+	// RB begin
+#if defined(USE_NORMAL_FMT_RGB8)
+	localNormal.xy = bumpMap.rg - 0.5;
+#else
 	localNormal.xy = bumpMap.wy - 0.5;
+#endif
+	// RB end
 	localNormal.z = sqrt( abs( dot( localNormal.xy, localNormal.xy ) - 0.25 ) );
 	localNormal = normalize( localNormal );
 
diff --git a/base/renderprogs/interactionAmbient_skinned.vertex b/base/renderprogs/interactionAmbient_skinned.vertex
index 9fbcd05c..6bbdd991 100644
--- a/base/renderprogs/interactionAmbient_skinned.vertex
+++ b/base/renderprogs/interactionAmbient_skinned.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform matrices_ubo { float4 matrices[408]; };
 
diff --git a/base/renderprogs/motionBlur.pixel b/base/renderprogs/motionBlur.pixel
index f6704855..08d0d274 100644
--- a/base/renderprogs/motionBlur.pixel
+++ b/base/renderprogs/motionBlur.pixel
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);   // view color
 uniform sampler2D samp1 : register(s1);   // view depth
diff --git a/base/renderprogs/motionBlur.vertex b/base/renderprogs/motionBlur.vertex
index 752a938e..9e288a62 100644
--- a/base/renderprogs/motionBlur.vertex
+++ b/base/renderprogs/motionBlur.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/postprocess.pixel b/base/renderprogs/postprocess.pixel
index 5a0b3ebe..ec5c809b 100644
--- a/base/renderprogs/postprocess.pixel
+++ b/base/renderprogs/postprocess.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0		: register(s0);
 
diff --git a/base/renderprogs/postprocess.vertex b/base/renderprogs/postprocess.vertex
index 87df0f08..8f52424a 100644
--- a/base/renderprogs/postprocess.vertex
+++ b/base/renderprogs/postprocess.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/shadow.pixel b/base/renderprogs/shadow.pixel
index d967be78..29ef165b 100644
--- a/base/renderprogs/shadow.pixel
+++ b/base/renderprogs/shadow.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 struct PS_OUT {
diff --git a/base/renderprogs/shadow.vertex b/base/renderprogs/shadow.vertex
index 91a7f63d..98d47891 100644
--- a/base/renderprogs/shadow.vertex
+++ b/base/renderprogs/shadow.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/shadowDebug.pixel b/base/renderprogs/shadowDebug.pixel
index d967be78..29ef165b 100644
--- a/base/renderprogs/shadowDebug.pixel
+++ b/base/renderprogs/shadowDebug.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 struct PS_OUT {
diff --git a/base/renderprogs/shadowDebug.vertex b/base/renderprogs/shadowDebug.vertex
index 91a7f63d..98d47891 100644
--- a/base/renderprogs/shadowDebug.vertex
+++ b/base/renderprogs/shadowDebug.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/shadowDebug_skinned.pixel b/base/renderprogs/shadowDebug_skinned.pixel
index d967be78..29ef165b 100644
--- a/base/renderprogs/shadowDebug_skinned.pixel
+++ b/base/renderprogs/shadowDebug_skinned.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 struct PS_OUT {
diff --git a/base/renderprogs/shadowDebug_skinned.vertex b/base/renderprogs/shadowDebug_skinned.vertex
index 616bd984..789f5afc 100644
--- a/base/renderprogs/shadowDebug_skinned.vertex
+++ b/base/renderprogs/shadowDebug_skinned.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform matrices_ubo { float4 matrices[408]; };
 
diff --git a/base/renderprogs/shadow_skinned.pixel b/base/renderprogs/shadow_skinned.pixel
index d967be78..29ef165b 100644
--- a/base/renderprogs/shadow_skinned.pixel
+++ b/base/renderprogs/shadow_skinned.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 struct PS_OUT {
diff --git a/base/renderprogs/shadow_skinned.vertex b/base/renderprogs/shadow_skinned.vertex
index 57797295..e76d41fd 100644
--- a/base/renderprogs/shadow_skinned.vertex
+++ b/base/renderprogs/shadow_skinned.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform matrices_ubo { float4 matrices[408]; };
 
diff --git a/base/renderprogs/simpleshade.pixel b/base/renderprogs/simpleshade.pixel
index c7c0aea5..37b26be3 100644
--- a/base/renderprogs/simpleshade.pixel
+++ b/base/renderprogs/simpleshade.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct PS_IN {
 	float4 position		: VPOS;
diff --git a/base/renderprogs/simpleshade.vertex b/base/renderprogs/simpleshade.vertex
index 22c89124..1cfd5bcf 100644
--- a/base/renderprogs/simpleshade.vertex
+++ b/base/renderprogs/simpleshade.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/skybox.pixel b/base/renderprogs/skybox.pixel
index 1cc25073..c52765c2 100644
--- a/base/renderprogs/skybox.pixel
+++ b/base/renderprogs/skybox.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform samplerCUBE samp0 : register(s0);
 
diff --git a/base/renderprogs/skybox.vertex b/base/renderprogs/skybox.vertex
index e6b711a9..f624e2d2 100644
--- a/base/renderprogs/skybox.vertex
+++ b/base/renderprogs/skybox.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/stereoDeGhost.pixel b/base/renderprogs/stereoDeGhost.pixel
index 2726f008..f924a931 100644
--- a/base/renderprogs/stereoDeGhost.pixel
+++ b/base/renderprogs/stereoDeGhost.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 
diff --git a/base/renderprogs/stereoDeGhost.vertex b/base/renderprogs/stereoDeGhost.vertex
index e330f16a..5514b539 100644
--- a/base/renderprogs/stereoDeGhost.vertex
+++ b/base/renderprogs/stereoDeGhost.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/stereoInterlace.pixel b/base/renderprogs/stereoInterlace.pixel
index 6049d375..4a5cc165 100644
--- a/base/renderprogs/stereoInterlace.pixel
+++ b/base/renderprogs/stereoInterlace.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 uniform sampler2D samp1 : register(s1);
diff --git a/base/renderprogs/stereoInterlace.vertex b/base/renderprogs/stereoInterlace.vertex
index 85831d10..9b6704ef 100644
--- a/base/renderprogs/stereoInterlace.vertex
+++ b/base/renderprogs/stereoInterlace.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/stereoWarp.pixel b/base/renderprogs/stereoWarp.pixel
index 17319e30..6022fed3 100644
--- a/base/renderprogs/stereoWarp.pixel
+++ b/base/renderprogs/stereoWarp.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 /*
 
diff --git a/base/renderprogs/stereoWarp.vertex b/base/renderprogs/stereoWarp.vertex
index dcf8fcc0..f33786a4 100644
--- a/base/renderprogs/stereoWarp.vertex
+++ b/base/renderprogs/stereoWarp.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/texture.pixel b/base/renderprogs/texture.pixel
index 88fa8202..4e1b3733 100644
--- a/base/renderprogs/texture.pixel
+++ b/base/renderprogs/texture.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 
diff --git a/base/renderprogs/texture.vertex b/base/renderprogs/texture.vertex
index 4c77d408..6cad9776 100644
--- a/base/renderprogs/texture.vertex
+++ b/base/renderprogs/texture.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/texture_color.pixel b/base/renderprogs/texture_color.pixel
index 590f8516..e2e8316e 100644
--- a/base/renderprogs/texture_color.pixel
+++ b/base/renderprogs/texture_color.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 
diff --git a/base/renderprogs/texture_color.vertex b/base/renderprogs/texture_color.vertex
index 7879d5fd..a2c636cd 100644
--- a/base/renderprogs/texture_color.vertex
+++ b/base/renderprogs/texture_color.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/texture_color_skinned.pixel b/base/renderprogs/texture_color_skinned.pixel
index 590f8516..e2e8316e 100644
--- a/base/renderprogs/texture_color_skinned.pixel
+++ b/base/renderprogs/texture_color_skinned.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 
diff --git a/base/renderprogs/texture_color_skinned.vertex b/base/renderprogs/texture_color_skinned.vertex
index 30a91ac6..7c27e7bb 100644
--- a/base/renderprogs/texture_color_skinned.vertex
+++ b/base/renderprogs/texture_color_skinned.vertex
@@ -27,7 +27,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform matrices_ubo { float4 matrices[408]; };
 
diff --git a/base/renderprogs/texture_color_texgen.pixel b/base/renderprogs/texture_color_texgen.pixel
index 1c222a21..90967ba9 100644
--- a/base/renderprogs/texture_color_texgen.pixel
+++ b/base/renderprogs/texture_color_texgen.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform sampler2D samp0 : register(s0);
 
diff --git a/base/renderprogs/texture_color_texgen.vertex b/base/renderprogs/texture_color_texgen.vertex
index 0e9f8816..35d43b33 100644
--- a/base/renderprogs/texture_color_texgen.vertex
+++ b/base/renderprogs/texture_color_texgen.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/wobblesky.pixel b/base/renderprogs/wobblesky.pixel
index 1cc25073..c52765c2 100644
--- a/base/renderprogs/wobblesky.pixel
+++ b/base/renderprogs/wobblesky.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 uniform samplerCUBE samp0 : register(s0);
 
diff --git a/base/renderprogs/wobblesky.vertex b/base/renderprogs/wobblesky.vertex
index b85c7328..aa8725b9 100644
--- a/base/renderprogs/wobblesky.vertex
+++ b/base/renderprogs/wobblesky.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;
diff --git a/base/renderprogs/zcullReconstruct.pixel b/base/renderprogs/zcullReconstruct.pixel
index df1a2b00..061929a2 100644
--- a/base/renderprogs/zcullReconstruct.pixel
+++ b/base/renderprogs/zcullReconstruct.pixel
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct PS_OUT {	
 	float depth : DEPTH;
diff --git a/base/renderprogs/zcullReconstruct.vertex b/base/renderprogs/zcullReconstruct.vertex
index 12e7cd51..9a4d30e9 100644
--- a/base/renderprogs/zcullReconstruct.vertex
+++ b/base/renderprogs/zcullReconstruct.vertex
@@ -26,7 +26,7 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "global.inc"
+#include "renderprogs/global.inc"
 
 struct VS_IN {
 	float4 position : POSITION;