diff --git a/libkwineffects/kwinglcolorcorrection.cpp b/libkwineffects/kwinglcolorcorrection.cpp
index fd62a2c0c9..f8c24f6344 100644
--- a/libkwineffects/kwinglcolorcorrection.cpp
+++ b/libkwineffects/kwinglcolorcorrection.cpp
@@ -290,7 +290,7 @@ bool ColorCorrection::setEnabled(bool enabled)
 
 #ifdef KWIN_HAVE_OPENGLES
     const GLPlatform *gl = GLPlatform::instance();
-    if (enabled && gl->isGLES() && !m_haveTexture3D) {
+    if (enabled && gl->isGLES() && !d->m_haveTexture3D) {
         qCritical() << "color correction is not supported on OpenGL ES without OES_texture_3D";
         d->m_hasError = true;
         return false;
diff --git a/libkwineffects/kwinglutils_funcs.h b/libkwineffects/kwinglutils_funcs.h
index 65f69789b5..eea28c5ae4 100644
--- a/libkwineffects/kwinglutils_funcs.h
+++ b/libkwineffects/kwinglutils_funcs.h
@@ -37,6 +37,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <epoxy/gl.h>
 
+// qopengl.h declares GLdouble as a typedef of float when Qt is built
+// with GLES support.  This conflicts with the epoxy/gl_generated.h
+// declaration, so we have to prevent the Qt header from being #included.
+#define QOPENGL_H
+
+#ifndef QOPENGLF_APIENTRY
+#define QOPENGLF_APIENTRY GLAPIENTRY
+#endif
+
+#ifndef QOPENGLF_APIENTRYP
+#define QOPENGLF_APIENTRYP GLAPIENTRYP
+#endif
+
 namespace KWin
 {