3 files changed, 4 insertions, 13 deletions
diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index c2b16f91e0..b03214aed8 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -66,6 +66,7 @@
 #include "qglpaintdevice_p.h"
 
 #include <QtGui/QOpenGLContext>
+#include <QtOpenGL/private/qglextensions_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -73,10 +74,6 @@ class QGLContext;
 class QGLOverlayWidget;
 class QPixmap;
 
-QT_BEGIN_INCLUDE_NAMESPACE
-#include <QtOpenGL/private/qglextensions_p.h>
-QT_END_INCLUDE_NAMESPACE
-
 class QGLFormatPrivate
 {
 public:
diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h
index 37d786cf60..bab84916ea 100644
--- a/src/opengl/qglframebufferobject_p.h
+++ b/src/opengl/qglframebufferobject_p.h
@@ -53,15 +53,11 @@
 // We mean it.
 //
 
-QT_BEGIN_NAMESPACE
-
-QT_BEGIN_INCLUDE_NAMESPACE
-
 #include <qglframebufferobject.h>
 #include <private/qglpaintdevice_p.h>
 #include <private/qgl_p.h>
 
-QT_END_INCLUDE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 #ifndef QT_OPENGL_ES
 #define DEFAULT_FORMAT GL_RGBA8
diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h
index 227d35aabc..105fc5f957 100644
--- a/src/opengl/qglpixelbuffer_p.h
+++ b/src/opengl/qglpixelbuffer_p.h
@@ -53,13 +53,11 @@
 // We mean it.
 //
 
-QT_BEGIN_NAMESPACE
-
-QT_BEGIN_INCLUDE_NAMESPACE
 #include "QtOpenGL/qglpixelbuffer.h"
 #include <private/qgl_p.h>
 #include <private/qglpaintdevice_p.h>
-QT_END_INCLUDE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QEglContext;