diff --git a/src/osg/Image.cpp b/src/osg/Image.cpp
index 164b4fceb..e519de38c 100644
--- a/src/osg/Image.cpp
+++ b/src/osg/Image.cpp
@@ -798,7 +798,7 @@ unsigned int Image::getTotalSizeInBytesIncludingMipmaps() const
 void Image::setRowLength(int length) 
 { 
     _rowLength = length;
-    #if defined(OSG_GLES1_FEATURES) || defined(OSG_GLES2_FEATURES)
+    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
     if (length > 0) 
     {
         OSG_WARN << "Image::setRowLength is not supported on this platform, ignoring" << std::endl;
diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp
index 5f5a0e65f..6f997d7a2 100644
--- a/src/osg/Texture.cpp
+++ b/src/osg/Texture.cpp
@@ -1922,7 +1922,7 @@ void Texture::applyTexImage2D_load(State& state, GLenum target, const Image* ima
     {
         pbo = 0;
     }
-#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
+#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     glPixelStorei(GL_UNPACK_ROW_LENGTH,rowLength);
 #endif
     if( !mipmappingRequired || useHardwareMipMapGeneration)
@@ -2177,7 +2177,7 @@ void Texture::applyTexImage2D_subload(State& state, GLenum target, const Image*
     {
         pbo = 0;
     }
-#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
+#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     glPixelStorei(GL_UNPACK_ROW_LENGTH,rowLength);
 #endif
     if( !mipmappingRequired || useHardwareMipMapGeneration)
diff --git a/src/osg/Texture2DArray.cpp b/src/osg/Texture2DArray.cpp
index e65600bf2..92c8c3a9b 100644
--- a/src/osg/Texture2DArray.cpp
+++ b/src/osg/Texture2DArray.cpp
@@ -455,7 +455,7 @@ void Texture2DArray::applyTexImage2DArray_subload(State& state, Image* image, GL
     }    
     
     glPixelStorei(GL_UNPACK_ALIGNMENT,image->getPacking());
-#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
+#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     glPixelStorei(GL_UNPACK_ROW_LENGTH,image->getRowLength());
 #endif
 
diff --git a/src/osg/Texture3D.cpp b/src/osg/Texture3D.cpp
index 83e7dc4f6..2fa04367d 100644
--- a/src/osg/Texture3D.cpp
+++ b/src/osg/Texture3D.cpp
@@ -380,7 +380,7 @@ void Texture3D::applyTexImage3D(GLenum target, Image* image, State& state, GLsiz
         image->ensureValidSizeForTexturing(extensions->maxTexture3DSize());
 
     glPixelStorei(GL_UNPACK_ALIGNMENT,image->getPacking());
-#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
+#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     glPixelStorei(GL_UNPACK_ROW_LENGTH,image->getRowLength());
 #endif
 
diff --git a/src/osg/TextureRectangle.cpp b/src/osg/TextureRectangle.cpp
index 76f90d095..9fcac1deb 100644
--- a/src/osg/TextureRectangle.cpp
+++ b/src/osg/TextureRectangle.cpp
@@ -312,7 +312,7 @@ void TextureRectangle::applyTexImage_load(GLenum target, Image* image, State& st
     computeInternalFormat();
 
     glPixelStorei(GL_UNPACK_ALIGNMENT, image->getPacking());
-#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
+#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     glPixelStorei(GL_UNPACK_ROW_LENGTH,image->getRowLength());
 #endif
 
@@ -395,8 +395,7 @@ void TextureRectangle::applyTexImage_subload(GLenum target, Image* image, State&
     computeInternalFormat();
 
     glPixelStorei(GL_UNPACK_ALIGNMENT, image->getPacking());
-    unsigned int rowLength = image->getRowLength();
-    
+    unsigned int rowLength = image->getRowLength();    
 
 #ifdef DO_TIMING
     osg::Timer_t start_tick = osg::Timer::instance()->tick();
@@ -414,7 +413,7 @@ void TextureRectangle::applyTexImage_subload(GLenum target, Image* image, State&
 #endif
     }
 
-#if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
+#if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     glPixelStorei(GL_UNPACK_ROW_LENGTH,rowLength);
 #endif
 
diff --git a/src/osgText/Glyph.cpp b/src/osgText/Glyph.cpp
index 4cbcc7fc6..a896c15e4 100644
--- a/src/osgText/Glyph.cpp
+++ b/src/osgText/Glyph.cpp
@@ -475,7 +475,7 @@ void Glyph::subload() const
 
     glPixelStorei(GL_UNPACK_ALIGNMENT,getPacking());
     
-    #if !defined(OSG_GLES1_FEATURES) && !defined(OSG_GLES2_FEATURES)
+    #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
     glPixelStorei(GL_UNPACK_ROW_LENGTH,getRowLength());
     #endif