diff --git a/qglview/glframebuffer.h b/qglview/glframebuffer.h
index d960f5d..a1d2e8f 100644
--- a/qglview/glframebuffer.h
+++ b/qglview/glframebuffer.h
@@ -20,6 +20,8 @@
 #define GLFRAMEBUFFER_H
 
 #include "gltypes.h"
+#include <QOpenGLExtraFunctions>
+
 
 class GLFramebuffer : protected QOpenGLExtraFunctions
 {
diff --git a/qglview/gltypes.h b/qglview/gltypes.h
index fe389df..27658ec 100644
--- a/qglview/gltypes.h
+++ b/qglview/gltypes.h
@@ -54,7 +54,7 @@
 #    include <GL/glu.h>
 #  endif
 #endif
-#include <QOpenGLExtraFunctions>
+#include <QOpenGLFunctions>
 #include <QOpenGLWidget>
 #include <QOpenGLShader>
 #include <QOpenGLShaderProgram>
@@ -162,7 +162,7 @@ void glDrawQuad(QOpenGLShaderProgram * prog = nullptr, QVector4D * corner_dirs =
 QMatrix4x4 getGLMatrix(GLenum matrix);
 void setGLMatrix(QMatrix4x4 matrix);
 inline void deleteGLTexture(GLuint & tex) {if (tex != 0) glDeleteTextures(1, &tex); tex = 0;}
-//#  define QGLCI if (!QOpenGLContext::currentContext()) return; QOpenGLExtraFunctions gf(QOpenGLContext::currentContext());
+//#  define QGLCI if (!QOpenGLContext::currentContext()) return; QOpenGLFunctions gf(QOpenGLContext::currentContext());
 //#  define QGLC gf.
 //inline void glActiveTextureChannel(int channel) {QGLCI gf.glActiveTexture(GL_TEXTURE0 + channel);}
 //inline void glDisableTextures(int channels = 8) {QGLCI for (int i = channels - 1; i >= 0; --i) {glActiveTextureChannel(i); glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_CUBE_MAP);}}
diff --git a/qglview/glvbo.h b/qglview/glvbo.h
index 37024e3..2f5ed06 100644
--- a/qglview/glvbo.h
+++ b/qglview/glvbo.h
@@ -22,7 +22,7 @@
 #include "gltypes.h"
 #include "chunkstream.h"
 
-class GLVBO : protected QOpenGLExtraFunctions
+class GLVBO : protected QOpenGLFunctions
 {
 	friend class GLObjectBase;
 	friend QDataStream & operator <<(QDataStream & s, const GLVBO & m);
diff --git a/qglview/renderer_deferred_shading.h b/qglview/renderer_deferred_shading.h
index e3fbf8f..19c567d 100644
--- a/qglview/renderer_deferred_shading.h
+++ b/qglview/renderer_deferred_shading.h
@@ -22,6 +22,7 @@
 #include "qglview.h"
 #include <QLabel>
 
+
 class RendererDeferredShading: public GLRendererBase
 {
 public: