More include cleanup

Remove includes of private headers from other modules where possible.
Get rid of some duplicate includes, and try to group includes by module,
with private includes in a separate block for better visibility where we
have dependencies to private APIs.

Pick-to: 6.2
Change-Id: Ia6419bee2a2c50463dcc515f3f1590a749dfabc1
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

31 files changed, 125 insertions, 112 deletions

diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
index 4a44e3ea..92d38a22 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
@@ -39,23 +39,20 @@
 
 #include "qdeclarativecirclemapitem_p.h"
 #include "qdeclarativepolygonmapitem_p.h"
-
-#include <QtPositioning/private/qwebmercator_p.h>
-#include <QtLocation/private/qgeomap_p.h>
-
-#include <qmath.h>
-#include <algorithm>
+#include "qdeclarativecirclemapitem_p_p.h"
 
 #include <QtCore/QScopedValueRollback>
 #include <QPen>
 #include <QPainter>
-#include <QtGui/private/qtriangulator_p.h>
-
-#include <QtPositioning/private/qlocationutils_p.h>
 #include <qgeocircle.h>
 
+#include <QtGui/private/qtriangulator_p.h>
+#include <QtLocation/private/qgeomap_p.h>
+#include <QtPositioning/private/qlocationutils_p.h>
 #include <QtPositioning/private/qclipperutils_p.h>
-#include "qdeclarativecirclemapitem_p_p.h"
+
+#include <qmath.h>
+#include <algorithm>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
index e6d170cc..1109fde2 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
@@ -39,8 +39,10 @@
 
 #include "qdeclarativegeomapitembase_p.h"
 #include "qgeocameradata_p.h"
+
 #include <QtQml/QQmlInfo>
 #include <QtQuick/QSGOpacityNode>
+
 #include <QtQuick/private/qquickmousearea_p.h>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtPositioning/private/qdoublevector2d_p.h>
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp b/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp
index 119dee3f..6bb70aa8 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp
@@ -39,11 +39,13 @@
 ****************************************************************************/
 
 #include "qdeclarativegeomapitemutils_p.h"
-#include <QtPositioning/QGeoCoordinate>
+
 #include <QPointF>
 #include <QMatrix4x4>
 #include <QPainterPath>
 #include <QPainterPathStroker>
+#include <QtPositioning/QGeoCoordinate>
+
 #include <QtPositioning/private/qclipperutils_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
index 69f7b4b9..735a7105 100644
--- a/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
@@ -51,21 +51,19 @@
 // We mean it.
 //
 
-#include <QtLocation/private/qlocationglobal_p.h>
-#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
-
+#include <QObject>
+#include <QAbstractListModel>
 #include <QtPositioning/QGeoCoordinate>
 #include <QtPositioning/QGeoRectangle>
-#include <QtPositioning/private/qgeocoordinateobject_p.h>
-
 #include <qgeorouterequest.h>
 #include <qgeoroutereply.h>
-
 #include <QtQml/qqml.h>
 #include <QtQml/QQmlParserStatus>
-#include <QAbstractListModel>
 
-#include <QObject>
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
+
+#include <QtPositioning/private/qgeocoordinateobject_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
index 4d5c350c..1a09a518 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
@@ -42,25 +42,23 @@
 #include "qdeclarativepolylinemapitem_p_p.h"
 #include "qdeclarativepolygonmapitem_p_p.h"
 #include "qdeclarativerectanglemapitem_p_p.h"
-#include <QtPositioning/private/qlocationutils_p.h>
 #include "error_messages_p.h"
 #include "locationvaluetypehelper_p.h"
-#include <QtLocation/private/qgeomap_p.h>
 
 #include <QtCore/QScopedValueRollback>
-#include <QtQml/QQmlInfo>
-#include <QtQml/private/qqmlengine_p.h>
+#include <qnumeric.h>
 #include <QPainter>
 #include <QPainterPath>
-#include <qnumeric.h>
+#include <QtQml/QQmlInfo>
+#include <QtQuick/qsgnode.h>
 
+#include <QtQuick/private/qsgmaterialshader_p.h>
+#include <QtLocation/private/qgeomap_p.h>
+#include <QtPositioning/private/qlocationutils_p.h>
 #include <QtPositioning/private/qdoublevector2d_p.h>
 #include <QtPositioning/private/qclipperutils_p.h>
 #include <QtPositioning/private/qgeopolygon_p.h>
 #include <QtPositioning/private/qwebmercator_p.h>
-#include <QtQuick/private/qsgmaterialshader_p.h>
-#include <QtQuick/private/qquickitem_p.h>
-#include <QtQuick/qsgnode.h>
 
 /* poly2tri triangulator includes */
 #include <earcut.hpp>
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
index 3f6513f4..cc9d01a6 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
@@ -52,6 +52,18 @@
 // We mean it.
 //
 
+#include <QList>
+#include <QtCore/QScopedValueRollback>
+#include <QtGui/QMatrix4x4>
+#include <QColor>
+
+#include <QSGGeometryNode>
+#include <QSGFlatColorMaterial>
+
+#include <QtPositioning/QGeoPath>
+#include <QtPositioning/QGeoRectangle>
+#include <QtPositioning/QGeoPolygon>
+
 #include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapitemgeometry_p.h>
 #include <QtLocation/private/qdeclarativegeomapitembase_p.h>
@@ -59,18 +71,7 @@
 #include <QtLocation/private/qdeclarativegeomapitemutils_p.h>
 #include <QtLocation/private/qdeclarativepolygonmapitem_p.h>
 #include <QtLocation/private/qdeclarativepolylinemapitem_p_p.h>
-#include <QSGGeometryNode>
-#include <QSGFlatColorMaterial>
-#include <QtPositioning/QGeoPath>
-#include <QtPositioning/QGeoRectangle>
-#include <QtPositioning/QGeoPolygon>
 #include <QtPositioning/private/qdoublevector2d_p.h>
-#include <QSGFlatColorMaterial>
-#include <QtGui/QMatrix4x4>
-#include <QColor>
-#include <QList>
-#include <QList>
-#include <QtCore/QScopedValueRollback>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
index 21913e1f..649a9ef4 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
@@ -41,33 +41,31 @@
 #include "qdeclarativepolylinemapitem_p_p.h"
 #include "qdeclarativerectanglemapitem_p_p.h"
 #include "qdeclarativecirclemapitem_p_p.h"
-#include <QtPositioning/private/qlocationutils_p.h>
 #include "qdeclarativegeomapitemutils_p.h"
 #include "error_messages_p.h"
 #include "locationvaluetypehelper_p.h"
-#include <QtPositioning/private/qdoublevector2d_p.h>
-#include <QtLocation/private/qgeomap_p.h>
-#include <QtPositioning/private/qwebmercator_p.h>
+#include "qgeosimplify_p.h"
 
 #include <QtCore/QScopedValueRollback>
-#include <QtQml/QQmlInfo>
-#include <QtQml/private/qqmlengine_p.h>
+#include <qnumeric.h>
+#include <QThreadPool>
+#include <QRunnable>
 #include <QPainter>
 #include <QPainterPath>
-#include <QPainterPathStroker>
-#include <qnumeric.h>
+#include <QtQml/QQmlInfo>
 
 #include <QtGui/private/qtriangulatingstroker_p.h>
 #include <QtGui/private/qtriangulator_p.h>
-
+#include <QtQuick/private/qsgmaterialshader_p.h>
+#include <QtPositioning/private/qlocationutils_p.h>
+#include <QtPositioning/private/qdoublevector2d_p.h>
+#include <QtPositioning/private/qwebmercator_p.h>
 #include <QtPositioning/private/qclipperutils_p.h>
 #include <QtPositioning/private/qgeopath_p.h>
-#include <QtQuick/private/qsgmaterialshader_p.h>
-#include <array>
-#include <QThreadPool>
-#include <QRunnable>
 #include <QtLocation/private/qgeomapparameter_p.h>
-#include "qgeosimplify_p.h"
+#include <QtLocation/private/qgeomap_p.h>
+
+#include <array>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
index 8f52c17a..01895873 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
@@ -51,14 +51,15 @@
 // We mean it.
 //
 
+#include <QSGGeometryNode>
+#include <QSGFlatColorMaterial>
+#include <QtPositioning/QGeoPath>
+
 #include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qdeclarativegeomapitembase_p.h>
 #include <QtLocation/private/qgeomapitemgeometry_p.h>
 
-#include <QtPositioning/QGeoPath>
 #include <QtPositioning/private/qdoublevector2d_p.h>
-#include <QSGGeometryNode>
-#include <QSGFlatColorMaterial>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h
index 0cad6682..ca2fabce 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h
@@ -52,11 +52,8 @@
 // We mean it.
 //
 
-#include <QtLocation/private/qlocationglobal_p.h>
-#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
-#include <QtLocation/private/qdeclarativegeomapitemutils_p.h>
-#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
-#include <QtLocation/private/qgeomapitemgeometry_p.h>
+#include <QSharedPointer>
+#include <QtCore/QScopedValueRollback>
 #include <QSGGeometryNode>
 #include <QSGFlatColorMaterial>
 #include <QSGMaterialShader>
@@ -64,9 +61,15 @@
 #include <QtPositioning/QGeoPolygon>
 #include <QtPositioning/QGeoRectangle>
 #include <QtPositioning/QGeoCircle>
+
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
+#include <QtLocation/private/qdeclarativegeomapitemutils_p.h>
+#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
+#include <QtLocation/private/qgeomapitemgeometry_p.h>
+
 #include <QtPositioning/private/qdoublevector2d_p.h>
-#include <QtCore/QScopedValueRollback>
-#include <QSharedPointer>
+
 #include <array>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
index 2e24a112..d4e5ce38 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
@@ -40,15 +40,17 @@
 #include "qdeclarativerectanglemapitem_p.h"
 #include "qdeclarativerectanglemapitem_p_p.h"
 #include "qdeclarativepolygonmapitem_p.h"
-#include <QtPositioning/private/qlocationutils_p.h>
+
+#include <QtCore/QScopedValueRollback>
 #include <QPainterPath>
 #include <qnumeric.h>
 #include <QRectF>
 #include <QPointF>
-#include <QtPositioning/private/qwebmercator_p.h>
+
 #include <QtLocation/private/qgeomap_p.h>
+#include <QtPositioning/private/qlocationutils_p.h>
+#include <QtPositioning/private/qwebmercator_p.h>
 #include <QtPositioning/private/qdoublevector2d_p.h>
-#include <QtCore/QScopedValueRollback>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/declarativemaps/qgeomapitemgeometry.cpp b/src/location/declarativemaps/qgeomapitemgeometry.cpp
index 40bdcd12..08094b6c 100644
--- a/src/location/declarativemaps/qgeomapitemgeometry.cpp
+++ b/src/location/declarativemaps/qgeomapitemgeometry.cpp
@@ -39,8 +39,9 @@
 
 #include "qgeomapitemgeometry_p.h"
 #include "qdeclarativegeomap_p.h"
-#include <QtPositioning/private/qlocationutils_p.h>
 #include <QtQuick/QSGGeometry>
+
+#include <QtPositioning/private/qlocationutils_p.h>
 #include <QtPositioning/private/qdoublevector2d_p.h>
 #include <QtLocation/private/qgeomap_p.h>
 #include <QtLocation/private/qgeoprojection_p.h>
diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
index e46e5b26..c750d7d6 100644
--- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp
+++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
@@ -38,27 +38,27 @@
 ****************************************************************************/
 
 #include "qquickgeomapgesturearea_p.h"
-#include <QtPositioningQuick/private/qquickgeocoordinateanimation_p.h>
 #include "qdeclarativegeomap_p.h"
 #include "error_messages_p.h"
 
+#include <QDebug>
+#include <QPropertyAnimation>
 #include <QtGui/QGuiApplication>
 #include <QtGui/qevent.h>
 #if QT_CONFIG(wheelevent)
 #include <QtGui/QWheelEvent>
 #endif
+#include <QtGui/QMatrix4x4>
 #include <QtGui/QStyleHints>
 #include <QtQml/qqmlinfo.h>
 #include <QtQuick/QQuickWindow>
-#include <QPropertyAnimation>
-#include <QDebug>
-#include "math.h"
-#include <cmath>
 #include "qgeomap_p.h"
 #include <QtPositioning/private/qdoublevector2d_p.h>
 #include <QtPositioning/private/qlocationutils_p.h>
-#include <QtGui/QMatrix4x4>
+#include <QtPositioningQuick/private/qquickgeocoordinateanimation_p.h>
 
+#include "math.h"
+#include <cmath>
 
 #define QML_MAP_FLICK_DEFAULTMAXVELOCITY 2500
 #define QML_MAP_FLICK_MINIMUMDECELERATION 500
diff --git a/src/location/labs/qmappolygonobject_p.h b/src/location/labs/qmappolygonobject_p.h
index 3afc1214..5ef4f381 100644
--- a/src/location/labs/qmappolygonobject_p.h
+++ b/src/location/labs/qmappolygonobject_p.h
@@ -55,8 +55,6 @@
 #include <QtLocation/private/qgeomapobject_p.h>
 #include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
 
-#include <QJSValue>
-
 QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_PRIVATE_EXPORT QMapPolygonObject : public QGeoMapObject
diff --git a/src/location/labs/qmappolylineobject_p.h b/src/location/labs/qmappolylineobject_p.h
index 8dfeae39..26057e90 100644
--- a/src/location/labs/qmappolylineobject_p.h
+++ b/src/location/labs/qmappolylineobject_p.h
@@ -55,8 +55,6 @@
 #include <QtLocation/private/qgeomapobject_p.h>
 #include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
 
-#include <QJSValue>
-
 QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_PRIVATE_EXPORT QMapPolylineObject : public QGeoMapObject
diff --git a/src/location/labs/qsg/qmapiconobjectqsg.cpp b/src/location/labs/qsg/qmapiconobjectqsg.cpp
index 32924bf7..9996866b 100644
--- a/src/location/labs/qsg/qmapiconobjectqsg.cpp
+++ b/src/location/labs/qsg/qmapiconobjectqsg.cpp
@@ -40,7 +40,6 @@
 #include "qmapiconobjectqsg_p_p.h"
 #include <QtQuick/qsgimagenode.h>
 #include <QtQuick/qsgnode.h>
-#include <QtQuick/private/qquickimage_p.h>
 #include <QtQuick/qquickimageprovider.h>
 #include <QtQuick/qquickwindow.h>
 #include <QtQml/qqmlengine.h>
diff --git a/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h b/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h
index efe1d436..ead1dd24 100644
--- a/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h
+++ b/src/location/labs/qsg/qmappolylineobjectqsg_p_p.h
@@ -51,12 +51,13 @@
 // We mean it.
 //
 
+#include <QtCore/qscopedvaluerollback.h>
+
 #include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qmappolylineobject_p_p.h>
 #include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
 #include <QtLocation/private/qmappolylineobject_p.h>
 #include <QtLocation/private/qqsgmapobject_p.h>
-#include <QtCore/qscopedvaluerollback.h>
 #include <QtPositioning/private/qgeopath_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/maps/qgeocameradata.cpp b/src/location/maps/qgeocameradata.cpp
index 18ee95cc..6fcdcf38 100644
--- a/src/location/maps/qgeocameradata.cpp
+++ b/src/location/maps/qgeocameradata.cpp
@@ -36,12 +36,15 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include "qgeocameradata_p.h"
-#include <QtPositioning/private/qgeocoordinate_p.h>
-#include <QtPositioning/private/qwebmercator_p.h>
+
 #include <QtCore/QVariant>
 #include <QtCore/QVariantAnimation>
 
+#include <QtPositioning/private/qgeocoordinate_p.h>
+#include <QtPositioning/private/qwebmercator_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QGeoCameraDataPrivate : public QSharedData
diff --git a/src/location/maps/qgeocameratiles.cpp b/src/location/maps/qgeocameratiles.cpp
index 21b45cc6..92d3b183 100644
--- a/src/location/maps/qgeocameratiles.cpp
+++ b/src/location/maps/qgeocameratiles.cpp
@@ -42,16 +42,18 @@
 #include "qgeotilespec_p.h"
 #include "qgeomaptype_p.h"
 
-#include <QtPositioning/private/qwebmercator_p.h>
-#include <QtPositioning/private/qdoublevector2d_p.h>
-#include <QtPositioning/private/qdoublevector3d_p.h>
-#include <QtPositioning/private/qlocationutils_p.h>
 #include <QtGui/QMatrix4x4>
 #include <QList>
 #include <QMap>
 #include <QPair>
 #include <QSet>
 #include <QSize>
+
+#include <QtPositioning/private/qwebmercator_p.h>
+#include <QtPositioning/private/qdoublevector2d_p.h>
+#include <QtPositioning/private/qdoublevector3d_p.h>
+#include <QtPositioning/private/qlocationutils_p.h>
+
 #include <cmath>
 #include <limits>
 
diff --git a/src/location/maps/qgeocameratiles_p_p.h b/src/location/maps/qgeocameratiles_p_p.h
index 348f0b7a..a00fa54a 100644
--- a/src/location/maps/qgeocameratiles_p_p.h
+++ b/src/location/maps/qgeocameratiles_p_p.h
@@ -51,9 +51,6 @@
 //
 
 #include "qgeocameratiles_p.h"
-#include <QtPositioning/private/qwebmercator_p.h>
-#include <QtPositioning/private/qdoublevector2d_p.h>
-#include <QtPositioning/private/qdoublevector3d_p.h>
 #include "qgeomaptype_p.h"
 #include "qgeocameradata_p.h"
 #include "qgeotilespec_p.h"
@@ -61,6 +58,10 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qset.h>
 
+#include <QtPositioning/private/qwebmercator_p.h>
+#include <QtPositioning/private/qdoublevector2d_p.h>
+#include <QtPositioning/private/qdoublevector3d_p.h>
+
 QT_BEGIN_NAMESPACE
 
 struct Q_LOCATION_PRIVATE_EXPORT Frustum
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index f6b3edca..88c160ea 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -44,7 +44,6 @@
 #include "qdeclarativegeomapitembase_p.h"
 #include "qgeomapobject_p.h"
 #include "qgeomapobject_p_p.h"
-#include <QtQuick/private/qquickitem_p.h>
 #include <QDebug>
 #include <QRectF>
 
diff --git a/src/location/maps/qgeoprojection.cpp b/src/location/maps/qgeoprojection.cpp
index 80e11d3e..47b7ad01 100644
--- a/src/location/maps/qgeoprojection.cpp
+++ b/src/location/maps/qgeoprojection.cpp
@@ -38,13 +38,16 @@
 ****************************************************************************/
 
 #include "qgeoprojection_p.h"
+
+#include <QSize>
+#include <QtGui/QMatrix4x4>
+#include <QtPositioning/QGeoPolygon>
+#include <QtPositioning/QGeoRectangle>
+
 #include <QtPositioning/private/qwebmercator_p.h>
 #include <QtPositioning/private/qlocationutils_p.h>
 #include <QtPositioning/private/qclipperutils_p.h>
-#include <QtPositioning/QGeoPolygon>
-#include <QtPositioning/QGeoRectangle>
-#include <QSize>
-#include <QtGui/QMatrix4x4>
+
 #include <cmath>
 
 namespace {
diff --git a/src/location/maps/qgeoprojection_p.h b/src/location/maps/qgeoprojection_p.h
index 768de6ab..5a6962bc 100644
--- a/src/location/maps/qgeoprojection_p.h
+++ b/src/location/maps/qgeoprojection_p.h
@@ -51,11 +51,12 @@
 // We mean it.
 //
 
+#include <QMatrix4x4>
+#include <QTransform>
+
 #include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeocameradata_p.h>
 #include <QtPositioning/private/qdoublematrix4x4_p.h>
-#include <QMatrix4x4>
-#include <QTransform>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/maps/qgeorouteparser.cpp b/src/location/maps/qgeorouteparser.cpp
index 7d2f6459..3b34318a 100644
--- a/src/location/maps/qgeorouteparser.cpp
+++ b/src/location/maps/qgeorouteparser.cpp
@@ -42,10 +42,11 @@
 #include "qgeoroutesegment.h"
 #include "qgeomaneuver.h"
 
-#include <QtCore/private/qobject_p.h>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
+
+#include <QtCore/private/qobject_p.h>
 #include <QtPositioning/private/qlocationutils_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/location/maps/qgeorouteparserosrmv5.cpp b/src/location/maps/qgeorouteparserosrmv5.cpp
index 4225a1dd..2666f67a 100644
--- a/src/location/maps/qgeorouteparserosrmv5.cpp
+++ b/src/location/maps/qgeorouteparserosrmv5.cpp
@@ -45,14 +45,15 @@
 #include "qgeoroutesegment_p.h"
 #include "qgeomaneuver.h"
 
-#include <QtCore/private/qobject_p.h>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
 #include <QtCore/QUrlQuery>
-#include <QtPositioning/private/qlocationutils_p.h>
 #include <QtPositioning/qgeopath.h>
 
+#include <QtCore/private/qobject_p.h>
+#include <QtPositioning/private/qlocationutils_p.h>
+
 QT_BEGIN_NAMESPACE
 
 static QList<QGeoCoordinate> decodePolyline(const QString &polylineString)
diff --git a/src/location/maps/qgeotiledmap.cpp b/src/location/maps/qgeotiledmap.cpp
index 2e2911b1..273d60a9 100644
--- a/src/location/maps/qgeotiledmap.cpp
+++ b/src/location/maps/qgeotiledmap.cpp
@@ -38,7 +38,6 @@
 ****************************************************************************/
 #include "qgeotiledmap_p.h"
 #include "qgeotiledmap_p_p.h"
-#include <QtPositioning/private/qwebmercator_p.h>
 #include "qgeotiledmappingmanagerengine_p.h"
 #include "qabstractgeotilecache_p.h"
 #include "qgeotilespec_p.h"
diff --git a/src/location/maps/qgeotiledmap_p_p.h b/src/location/maps/qgeotiledmap_p_p.h
index 58e66ce5..ad32e889 100644
--- a/src/location/maps/qgeotiledmap_p_p.h
+++ b/src/location/maps/qgeotiledmap_p_p.h
@@ -50,13 +50,14 @@
 // We mean it.
 //
 
+#include <QtCore/QPointer>
+
 #include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomap_p_p.h>
 #include <QtLocation/private/qgeocameradata_p.h>
 #include <QtLocation/private/qgeomaptype_p.h>
-#include <QtPositioning/private/qdoublevector3d_p.h>
+
 #include <QtPositioning/private/qdoublevector2d_p.h>
-#include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/maps/qgeotiledmapscene.cpp b/src/location/maps/qgeotiledmapscene.cpp
index e7c02ece..8d4004a2 100644
--- a/src/location/maps/qgeotiledmapscene.cpp
+++ b/src/location/maps/qgeotiledmapscene.cpp
@@ -37,21 +37,24 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+
 #include "qgeotiledmapscene_p.h"
 #include "qgeotiledmapscene_p_p.h"
 #include "qgeocameradata_p.h"
 #include "qabstractgeotilecache_p.h"
 #include "qgeotilespec_p.h"
-#include <QtPositioning/private/qdoublevector3d_p.h>
-#include <QtPositioning/private/qwebmercator_p.h>
-#include <QtCore/private/qobject_p.h>
+
 #include <QtQuick/QQuickWindow>
 #include <QtGui/QVector3D>
-#include <cmath>
+
+#include <QtCore/private/qobject_p.h>
+#include <QtPositioning/private/qdoublevector3d_p.h>
 #include <QtPositioning/private/qlocationutils_p.h>
 #include <QtPositioning/private/qdoublematrix4x4_p.h>
 #include <QtPositioning/private/qwebmercator_p.h>
 
+#include <cmath>
+
 static QVector3D toVector3D(const QDoubleVector3D& in)
 {
     return QVector3D(in.x(), in.y(), in.z());
diff --git a/src/location/maps/qgeotiledmapscene_p_p.h b/src/location/maps/qgeotiledmapscene_p_p.h
index d1e735f2..2610e30a 100644
--- a/src/location/maps/qgeotiledmapscene_p_p.h
+++ b/src/location/maps/qgeotiledmapscene_p_p.h
@@ -51,14 +51,15 @@
 //
 
 #include "qgeotiledmapscene_p.h"
-#include <QtCore/private/qobject_p.h>
-#include <QtPositioning/private/qdoublevector3d_p.h>
-#include <QtQuick/QSGImageNode>
-#include <QtQuick/private/qsgdefaultimagenode_p.h>
-#include <QtQuick/QQuickWindow>
 #include "qgeocameradata_p.h"
 #include "qgeotilespec_p.h"
 
+#include <QtQuick/QSGImageNode>
+#include <QtQuick/QQuickWindow>
+
+#include <QtCore/private/qobject_p.h>
+#include <QtPositioning/private/qdoublevector3d_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_PRIVATE_EXPORT QGeoTiledMapTileContainerNode : public QSGTransformNode
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
index e2a56611..51450fd5 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
@@ -56,7 +56,6 @@
 #include <QtLocation/private/qgeoprojection_p.h>
 #include <QtQuick/QQuickWindow>
 #include <QtQuick/QSGImageNode>
-#include <QtQuick/private/qsgtexture_p.h>
 #include <QtQuick/private/qsgcontext_p.h> // for debugging the context name
 
 #include <QMapboxGL>
diff --git a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
index 02fae833..d0b69140 100644
--- a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
+++ b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
@@ -44,7 +44,6 @@
 #include <QtQuick/QQuickWindow>
 #include <QtQuick/QSGRenderNode>
 #include <QtQuick/QSGSimpleTextureNode>
-#include <QtQuick/private/qsgtexture_p.h>
 #include <QtOpenGL/QOpenGLFramebufferObject>
 
 #include <QMapboxGL>
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index 80fe533e..831aad02 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -37,7 +37,6 @@
 **
 ****************************************************************************/
 
-#include <QtPositioning/private/qwebmercator_p.h>
 #include "qgeocameracapabilities_p.h"
 #include "qgeotiledmappingmanagerengine_nokia.h"
 #include "qgeotiledmap_nokia.h"
@@ -54,6 +53,8 @@
 #include <QtCore/qmath.h>
 #include <QtCore/qstandardpaths.h>
 
+#include <QtPositioning/private/qwebmercator_p.h>
+
 QT_BEGIN_NAMESPACE
 
 QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(