diff --git a/Makefile.common b/Makefile.common
index a132ebad74..8f2cda482c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -749,9 +749,11 @@ endif
 
    ifeq ($(HAVE_GLES), 1)
       LIBS += $(GLES_LIBS)
-      DEFINES += $(GLES_CFLAGS) -DHAVE_OPENGLES -DHAVE_OPENGLES2
+      DEFINES += $(GLES_CFLAGS) -DHAVE_OPENGLES
       ifeq ($(HAVE_GLES3), 1)
          DEFINES += -DHAVE_OPENGLES3
+      else
+         DEFINES += -DHAVE_OPENGLES2
       endif
       OBJ += libretro-common/glsym/glsym_es2.o
    else
diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h
index 9254cf4ee0..be9cb25f34 100644
--- a/gfx/common/gl_common.h
+++ b/gfx/common/gl_common.h
@@ -58,7 +58,11 @@
 
 #if defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1) || defined(HAVE_OPENGLES_3_2)
 #define RARCH_GL_RENDERBUFFER GL_RENDERBUFFER
+#if defined(HAVE_OPENGLES2)
 #define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES
+#else
+#define RARCH_GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8
+#endif
 #define RARCH_GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT
 #define RARCH_GL_STENCIL_ATTACHMENT GL_STENCIL_ATTACHMENT
 #elif defined(OSX_PPC)
diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index 6b37883efa..4d5b872e3a 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -520,7 +520,9 @@ static void *gfx_ctx_wl_init(void *video_driver)
          else
 #endif
 #endif
+#ifdef HAVE_OPENGLES2
             attrib_ptr = egl_attribs_gles;
+#endif
 #endif
          break;
       case GFX_CTX_OPENVG_API: