5 files changed, 5 insertions, 8 deletions
diff --git a/src/extras/defaults/qabstractspritesheet.h b/src/extras/defaults/qabstractspritesheet.h
index ec72473f9..d52d801fd 100644
--- a/src/extras/defaults/qabstractspritesheet.h
+++ b/src/extras/defaults/qabstractspritesheet.h
@@ -42,17 +42,12 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DCore/QNode>
+#include <Qt3DRender/qabstracttexture.h>
 #include <QtGui/QVector2D>
 #include <QtGui/QMatrix3x3>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DRender {
-
-class QAbstractTexture;
-
-} // namespace Qt3DRender
-
 namespace Qt3DExtras {
 
 class QAbstractSpriteSheetPrivate;
diff --git a/src/extras/defaults/qforwardrenderer.h b/src/extras/defaults/qforwardrenderer.h
index 22334373c..165b17a41 100644
--- a/src/extras/defaults/qforwardrenderer.h
+++ b/src/extras/defaults/qforwardrenderer.h
@@ -42,6 +42,7 @@
 
 #include <Qt3DExtras/qt3dextras_global.h>
 #include <Qt3DRender/qtechniquefilter.h>
+#include <Qt3DCore/qentity.h>
 #include <QtCore/QRectF>
 #include <QtGui/QColor>
 #include <Qt3DRender/QClearBuffers>
diff --git a/src/extras/defaults/qspritesheet.h b/src/extras/defaults/qspritesheet.h
index d1faeb825..93c4262b0 100644
--- a/src/extras/defaults/qspritesheet.h
+++ b/src/extras/defaults/qspritesheet.h
@@ -41,6 +41,7 @@
 #define QT3DEXTRAS_QSPRITESHEET_H
 
 #include <Qt3DExtras/qabstractspritesheet.h>
+#include <Qt3DExtras/qspritesheetitem.h>
 #include <QtCore/QRect>
 #include <QtCore/QVector>
 
@@ -48,7 +49,6 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DExtras {
 
-class QSpriteSheetItem;
 class QSpriteSheetPrivate;
 
 class Q_3DEXTRASSHARED_EXPORT QSpriteSheet : public QAbstractSpriteSheet
diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp
index 8fcc77a29..34264a89f 100644
--- a/src/extras/defaults/qt3dwindow.cpp
+++ b/src/extras/defaults/qt3dwindow.cpp
@@ -298,7 +298,7 @@ void setupWindowSurface(QWindow *window, Qt3DRender::API api) noexcept
         break;
     }
     QSurfaceFormat format = QSurfaceFormat::defaultFormat();
-#ifdef QT_OPENGL_ES_2
+#if QT_CONFIG(opengles2)
     format.setRenderableType(QSurfaceFormat::OpenGLES);
 #else
     if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
diff --git a/src/extras/text/qdistancefieldglyphcache.cpp b/src/extras/text/qdistancefieldglyphcache.cpp
index 66d2c0495..63621848c 100644
--- a/src/extras/text/qdistancefieldglyphcache.cpp
+++ b/src/extras/text/qdistancefieldglyphcache.cpp
@@ -44,6 +44,7 @@
 #include "qdistancefieldglyphcache_p.h"
 #include "qtextureatlas_p.h"
 
+#include <QtGui/qpainterpath.h>
 #include <QtGui/qfont.h>
 #include <QtGui/qpainterpath.h>
 #include <QtGui/private/qdistancefield_p.h>