Cleaned up in includes in Lighthouse headerfiles

6 files changed, 16 insertions, 6 deletions

diff --git a/src/gui/kernel/qplatformglcontext_qpa.cpp b/src/gui/kernel/qplatformglcontext_qpa.cpp
index 4fcd9b8..516bf24 100644
--- a/src/gui/kernel/qplatformglcontext_qpa.cpp
+++ b/src/gui/kernel/qplatformglcontext_qpa.cpp
@@ -51,7 +51,7 @@ QPlatformGLContext::~QPlatformGLContext()
     The default implementation returns 0, which denotes the default
     window-system provided frame buffer.
 */
-GLuint QPlatformGLContext::defaultFBO() const
+unsigned long QPlatformGLContext::defaultFBO() const
 {
     return 0;
 }
diff --git a/src/gui/kernel/qplatformglcontext_qpa.h b/src/gui/kernel/qplatformglcontext_qpa.h
index 9bfe676..3e7656b 100644
--- a/src/gui/kernel/qplatformglcontext_qpa.h
+++ b/src/gui/kernel/qplatformglcontext_qpa.h
@@ -42,7 +42,8 @@
 #ifndef QPLATFORM_GL_CONTEXT_H
 #define QPLATFORM_GL_CONTEXT_H
 
-#include <QtOpenGL/qgl.h>
+#include <QtCore/qnamespace.h>
+#include <QPlatformWindowFormat>
 
 QT_BEGIN_HEADER
 
@@ -57,7 +58,7 @@ public:
     virtual void doneCurrent() = 0;
     virtual void swapBuffers() = 0;
     virtual void* getProcAddress(const QString& procName) = 0;
-    virtual GLuint defaultFBO() const;
+    virtual unsigned long defaultFBO() const;
 
     virtual QPlatformWindowFormat platformWindowFormat() const = 0;
 
diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h
index 9f7367e..8cecbb4 100644
--- a/src/gui/kernel/qplatformintegration_qpa.h
+++ b/src/gui/kernel/qplatformintegration_qpa.h
@@ -43,6 +43,7 @@
 #define QPLATFORMINTEGRATION_H
 
 #include <QtGui/qwindowdefs.h>
+#include <QtGui/private/qwindowsurface_p.h>
 #include <QtGui/private/qpixmapdata_p.h>
 #include <QtGui/qplatformscreen_qpa.h>
 
diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen_qpa.h
index f603db5..1704f0f 100644
--- a/src/gui/kernel/qplatformscreen_qpa.h
+++ b/src/gui/kernel/qplatformscreen_qpa.h
@@ -42,10 +42,17 @@
 #ifndef QPLATFORMSCREEN_H
 #define QPLATFORMSCREEN_H
 
+#include <QtCore/qmetatype.h>
+#include <QtCore/qnamespace.h>
+#include <QtCore/qcoreevent.h>
+#include <QtCore/qvariant.h>
 #include <QtCore/qrect.h>
-#include <QtGui/qimage.h>
 #include <QtCore/qobject.h>
 
+#include <QtGui/qcursor.h>
+#include <QtGui/qimage.h>
+#include <QtGui/qwidget.h>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/platforms/eglconvenience/qeglconvenience.h b/src/plugins/platforms/eglconvenience/qeglconvenience.h
index 12731e1..484894b 100644
--- a/src/plugins/platforms/eglconvenience/qeglconvenience.h
+++ b/src/plugins/platforms/eglconvenience/qeglconvenience.h
@@ -41,11 +41,11 @@
 #ifndef QEGLCONVENIENCE_H
 #define QEGLCONVENIENCE_H
 
-#include <EGL/egl.h>
 
 #include <QtGui/QPlatformWindowFormat>
 #include <QtCore/QVector>
 
+#include <EGL/egl.h>
 QT_BEGIN_NAMESPACE
 
 QVector<EGLint> q_createConfigAttributesFromFormat(const QPlatformWindowFormat &format);
diff --git a/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp b/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp
index 87cd958..04720b5 100644
--- a/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp
+++ b/src/plugins/platforms/eglconvenience/qeglplatformcontext.cpp
@@ -41,12 +41,13 @@
 
 #include "qeglplatformcontext.h"
 
-#include <EGL/egl.h>
 
 #include <QtGui/QPlatformWindow>
 
 #include "qeglconvenience.h"
 
+#include <EGL/egl.h>
+
 QEGLPlatformContext::QEGLPlatformContext(EGLDisplay display, EGLConfig config, EGLint contextAttrs[], EGLSurface surface, EGLenum eglApi)
     : QPlatformGLContext()
     , m_eglDisplay(display)