diff --git a/src/DepthBuffer.cpp b/src/DepthBuffer.cpp
index 50b630a0..7d81c416 100644
--- a/src/DepthBuffer.cpp
+++ b/src/DepthBuffer.cpp
@@ -127,7 +127,7 @@ void DepthBuffer::_initDepthBufferTexture(FrameBuffer * _pBuffer, CachedTexture
 			glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, _pBuffer->m_pTexture->realWidth, _pBuffer->m_pTexture->realHeight, false);
 		else
 			glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, video().getWidth(), video().getHeight(), false);
-#elif defined(GLES3)
+#elif defined(GLES3_1)
 		if (_pBuffer != NULL)
 			glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, _pBuffer->m_pTexture->realWidth, _pBuffer->m_pTexture->realHeight, false);
 		else
diff --git a/src/DepthBuffer.h b/src/DepthBuffer.h
index 2df99937..a9fe965c 100644
--- a/src/DepthBuffer.h
+++ b/src/DepthBuffer.h
@@ -74,7 +74,7 @@ void DepthBuffer_Destroy();
 
 #ifdef GLES2
 #define DEPTH_COMPONENT_FORMAT GL_DEPTH_COMPONENT24_OES
-#elif defined (GLES3)
+#elif defined (GLES3_1)
 #define DEPTH_COMPONENT_FORMAT GL_DEPTH_COMPONENT32F
 #else
 #define DEPTH_COMPONENT_FORMAT GL_DEPTH_COMPONENT
diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp
index 2b517b55..a5768969 100644
--- a/src/FrameBuffer.cpp
+++ b/src/FrameBuffer.cpp
@@ -198,7 +198,7 @@ void FrameBuffer::init(u32 _address, u32 _endAddress, u16 _format, u16 _size, u1
 		else
 			glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, monohromeInternalformat, m_pTexture->realWidth, m_pTexture->realHeight, false);
 		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE, m_pTexture->glName, 0);
-#elif defined(GLES3)
+#elif defined(GLES3_1)
 		if (_size > G_IM_SIZ_8b)
 			glTexStorage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_RGBA8, m_pTexture->realWidth, m_pTexture->realHeight, false);
 		else
diff --git a/src/OpenGL.cpp b/src/OpenGL.cpp
index 37af091d..c0c11824 100644
--- a/src/OpenGL.cpp
+++ b/src/OpenGL.cpp
@@ -1186,7 +1186,7 @@ void OGLRender::_initExtensions()
 	glGetIntegerv(GL_MINOR_VERSION, &minorVersion);
 #ifndef GLESX
 	m_bImageTexture = (majorVersion >= 4) && (minorVersion >= 3) && (glBindImageTexture != NULL);
-#elif defined(GLES3)
+#elif defined(GLES3_1)
 	m_bImageTexture = (majorVersion >= 3) && (minorVersion >= 1) && (glBindImageTexture != NULL);
 #else
 	m_bImageTexture = false;
diff --git a/src/OpenGL.h b/src/OpenGL.h
index ec8572bb..3d907df1 100644
--- a/src/OpenGL.h
+++ b/src/OpenGL.h
@@ -16,7 +16,7 @@
 #define GL_DRAW_FRAMEBUFFER GL_FRAMEBUFFER
 #define GL_READ_FRAMEBUFFER GL_FRAMEBUFFER
 #define GLESX
-#elif defined(GLES3)
+#elif defined(GLES3_1)
 #include <GLES3/gl31.h>
 #include <GLES3/gl3ext.h>
 #define GLESX