diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
index 945a1e71a52d0137fd265d4b203a82846decd480..9a3b2e3e8a52e0735761aa037f8ade84d5cc3b4f 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
index 463c61090f1e1abaec1cfd55f8790e48a208742a..6cc5f23acaf43f64103b221b15949ba91dd25616 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/bumpF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
  
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
index 73e726fe15fb1da3bb9c6a282351e7189f055a5a..db272cf601efe783fc0f3a280d07824ab1f29e6a 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/cloudsF.glsl
@@ -24,7 +24,7 @@
  */
  
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl
index f3351c08bf87e6c55824d3ed2cbd8c5002c6c38e..14b79c37fd25120eea29f384c94ce7901ac4ce40 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl
index 7d83b9a72c20e1faa6d255ee8acafbafb819286f..381fba8813e99ea4fbea82c555408d21676e5ffa 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl
index a24623d7b5e307a5d28e1b43937aca3f67975091..b582ba7f9c5309fd9a13f34391baea94faf031e5 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl
@@ -24,7 +24,7 @@
  */
  
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
index a8e5ae4a622c2330f796a77f71b42b1f04871910..7bde49eb86b9b647af9631f3f076ff7ab3283143 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
  
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl
index 9a0e511bef8a3c52826f9cbd15619211ca9f2f5e..75b45111e0e40247ab1abdde7f93eded58f45c98 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
index a929c0e4f595eab33cbe67a6e53206ee614a8db4..5decddebbbde7f87bf3e5ab1ff6ddd9d331c65c9 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
index dac1ee1294f406075baa243cad7db59fbd332412..96ad0aa93a374f2564840ea123677797f22c9a07 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
  
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
index 7986320c38dab2b6cb6f1d5b3cc3361b1b4304e5..03fccd276614c2bd3393bc2f2d6d725a7335f079 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
index 3112a1ea7f86a534a311d3db2aa167cb9f494d70..e014e53d25921ee201c581ef49be9bde90fc884e 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
  
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl b/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl
index 06071056ac14025eb981e520502976a3fbffe394..b934bc6991913b278ffb56f365789f5ea657c96f 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/treeF.glsl
@@ -23,7 +23,7 @@
  * $/LicenseInfo$
  */
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
index 43cd4c2eed87eba55e2fd35e4ba685eaccc192a7..4c9ea24a249c076f1f62404fd68c4ed14229182e 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/waterF.glsl
@@ -25,7 +25,7 @@
  
 #extension GL_ARB_texture_rectangle : enable
 
-#ifndef gl_FragData
+#ifdef DEFINE_GL_FRAGCOLOR
 out vec4 gl_FragData[3];
 #endif
 
diff --git a/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
index 0fab5e5001007ad0bebf5ce122484ea23206a53d..d2de1980a60658b9ebc868ec6501ce5337619db7 100644
--- a/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/fullbrightF.glsl
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  * 
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
+ * $/LicenseInfo$F
  */
  
 
@@ -28,6 +28,6 @@
 void fullbright_lighting();
 
 void main() 
-{
+{F
 	fullbright_lighting();
 }