diff --git a/src/graphics/gl_headers.hpp b/src/graphics/gl_headers.hpp
index 57899bf65..779d2ae47 100644
--- a/src/graphics/gl_headers.hpp
+++ b/src/graphics/gl_headers.hpp
@@ -58,21 +58,11 @@ extern "C" {
 #if defined(USE_GLES2)
 #define GL_BGRA 0x80E1
 #define GL_BGR 0x80E0
-
+#define GL_FRAMEBUFFER_SRGB 0x8DB9
 #define GL_FRAMEBUFFER_COMPLETE_EXT GL_FRAMEBUFFER_COMPLETE
-#define GL_TEXTURE_BUFFER GL_TEXTURE_BUFFER_EXT
-#define GL_FRAMEBUFFER_SRGB GL_FRAMEBUFFER_SRGB_EXT
-#define GL_SRGB_ALPHA GL_SRGB_ALPHA_EXT
 
-extern PFNGLUNIFORMHANDLEUI64NVPROC pglUniformHandleui64NV;
 extern PFNGLDEBUGMESSAGECALLBACKKHRPROC pglDebugMessageCallbackKHR;
-extern PFNGLTEXBUFFEROESPROC pglTexBufferOES;
-extern PFNGLTEXTUREVIEWOESPROC pglTextureViewOES;
-
-#define glUniformHandleui64ARB pglUniformHandleui64NV
 #define glDebugMessageCallbackARB pglDebugMessageCallbackKHR
-#define glTexBuffer pglTexBufferOES
-#define glTextureView pglTextureViewOES
 #endif
 
 struct DrawElementsIndirectCommand{
diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp
index f425e7bfd..4526162e3 100644
--- a/src/graphics/glwrap.cpp
+++ b/src/graphics/glwrap.cpp
@@ -34,10 +34,7 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
-PFNGLUNIFORMHANDLEUI64NVPROC pglUniformHandleui64NV = 0;
 PFNGLDEBUGMESSAGECALLBACKKHRPROC pglDebugMessageCallbackKHR = 0;
-PFNGLTEXBUFFEROESPROC pglTexBufferOES = 0;
-PFNGLTEXTUREVIEWOESPROC pglTextureViewOES = 0;
 #endif
 
 #ifndef GL_DEBUG_SEVERITY_HIGH_ARB
@@ -197,15 +194,12 @@ void initGL()
 #endif
 
 #if defined(USE_GLES2)
-    glUniformHandleui64ARB = (PFNGLUNIFORMHANDLEUI64NVPROC)eglGetProcAddress("pglUniformHandleui64NV");
     glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKKHRPROC)eglGetProcAddress("glDebugMessageCallbackKHR");
-    glTexBuffer = (PFNGLTEXBUFFEROESPROC)eglGetProcAddress("glTexBufferOES");
-    glTextureView = (PFNGLTEXTUREVIEWOESPROC)eglGetProcAddress("glTextureViewOES");
 #endif
 
 #ifdef ARB_DEBUG_OUTPUT
-#if !defined(USE_GLES2)
     if (glDebugMessageCallbackARB)
+#if !defined(USE_GLES2)
         glDebugMessageCallbackARB((GLDEBUGPROCARB)debugCallback, NULL);
 #else
         glDebugMessageCallbackARB((GLDEBUGPROCKHR)debugCallback, NULL);
diff --git a/src/graphics/gpu_particles.cpp b/src/graphics/gpu_particles.cpp
index 1ae73013e..ad9a2d6bd 100644
--- a/src/graphics/gpu_particles.cpp
+++ b/src/graphics/gpu_particles.cpp
@@ -475,10 +475,12 @@ void ParticleSystemProxy::simulate()
     glEnable(GL_RASTERIZER_DISCARD);
     if (has_height_map)
     {
+#if !defined(USE_GLES2)
         HeightmapSimulationShader::getInstance()->use();
         glActiveTexture(GL_TEXTURE0 + HeightmapSimulationShader::getInstance()->m_TU_heightmap);
         glBindTexture(GL_TEXTURE_BUFFER, heightmaptexture);
         HeightmapSimulationShader::getInstance()->setUniforms(matrix, timediff, active_count, size_increase_factor, track_x, track_x_len, track_z, track_z_len);
+#endif        
     }
     else
     {
diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp
index 385505407..e7e6e9ac4 100644
--- a/src/graphics/post_processing.cpp
+++ b/src/graphics/post_processing.cpp
@@ -1128,6 +1128,7 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
                                               size_t layer, float sigma_h,
                                               float sigma_v)
 {
+#if !defined(USE_GLES2)
     GLuint layer_tex;
     glGenTextures(1, &layer_tex);
     glTextureView(layer_tex, GL_TEXTURE_2D, in_fbo.getRTT()[0],
@@ -1146,7 +1147,6 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
                      UserConfigParams::m_shadows_resolution,
                      UserConfigParams::m_shadows_resolution, sigma_h);
     }
-#if !defined(USE_GLES2)
     else
     {
         const std::vector<float> &weightsV = getGaussianWeight(sigma_v, 7);
@@ -1181,8 +1181,8 @@ void PostProcessing::renderGaussian6BlurLayer(FrameBuffer &in_fbo,
                           (int)UserConfigParams::m_shadows_resolution / 8 + 1, 1);
         glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
     }
-#endif
     glDeleteTextures(1, &layer_tex);
+#endif
 }   // renderGaussian6BlurLayer
 
 // ----------------------------------------------------------------------------
diff --git a/src/graphics/skybox.cpp b/src/graphics/skybox.cpp
index d5d9251fb..7f45a808d 100644
--- a/src/graphics/skybox.cpp
+++ b/src/graphics/skybox.cpp
@@ -220,9 +220,8 @@ void Skybox::generateSpecularCubemap()
 
     if (!CVS->isDefferedEnabled())
         return;
-#if defined(USE_GLES2)
-    return;
-#endif
+
+#if !defined(USE_GLES2)
 
     GLuint fbo;
     glGenFramebuffers(1, &fbo);
@@ -303,6 +302,7 @@ void Skybox::generateSpecularCubemap()
     }
     glBindFramebuffer(GL_FRAMEBUFFER, 0);
     glDeleteFramebuffers(1, &fbo);
+#endif
 }   // generateSpecularCubemap
 
 
diff --git a/src/graphics/texture_shader.hpp b/src/graphics/texture_shader.hpp
index 16222fa7c..1a5969362 100644
--- a/src/graphics/texture_shader.hpp
+++ b/src/graphics/texture_shader.hpp
@@ -215,8 +215,10 @@ public:
     template<int N, typename... HandlesId>
     void setTextureHandlesImpl(uint64_t handle, HandlesId... args)
     {
+#if !defined(USE_GLES2)
         if (handle)
             glUniformHandleui64ARB(m_texture_location[N], handle);
+#endif
         setTextureHandlesImpl<N + 1>(args...);
     }   // setTextureHandlesImpl