Clean up includes

Get rid of unnecessary includes in most public, and some private
headers. Forward declare what we have to, and include headers where
needed in the implementation and test files.

Pick-to: 6.2
Change-Id: I7924e865b9d4ad9f8c8670605b59d5530346106e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

21 files changed, 65 insertions, 1 deletions

diff --git a/tests/auto/geotestplugin/qgeotiledmap_test.cpp b/tests/auto/geotestplugin/qgeotiledmap_test.cpp
index c3d466ea..aa0810eb 100644
--- a/tests/auto/geotestplugin/qgeotiledmap_test.cpp
+++ b/tests/auto/geotestplugin/qgeotiledmap_test.cpp
@@ -27,6 +27,7 @@
 ****************************************************************************/
 
 #include "qgeotiledmap_test.h"
+#include <QtPositioning/QGeoCoordinate>
 #include <QtLocation/private/qgeotiledmap_p_p.h>
 #include <QtLocation/private/qgeomapparameter_p.h>
 
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index 5f35fb37..cd7d1ddd 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -38,6 +38,7 @@
 #include <QtPositioning/QGeoCoordinate>
 #include <QtPositioning/QGeoLocation>
 #include <QtLocation/QPlaceContentReply>
+#include <QtLocation/QPlaceContentRequest>
 #include <QtLocation/QPlaceManager>
 #include <QtLocation/QPlaceManagerEngine>
 #include <QtLocation/QPlaceReply>
@@ -47,6 +48,7 @@
 #include <QtLocation/QPlaceImage>
 #include <QtLocation/QPlaceSearchSuggestionReply>
 #include <QtLocation/QPlaceSearchReply>
+#include <QtLocation/QPlaceSearchRequest>
 #include <QtLocation/QPlaceResult>
 #include <QtLocation/QPlaceCategory>
 #include <QtLocation/QPlace>
diff --git a/tests/auto/maptype/tst_maptype.cpp b/tests/auto/maptype/tst_maptype.cpp
index f571158e..9ae183ac 100644
--- a/tests/auto/maptype/tst_maptype.cpp
+++ b/tests/auto/maptype/tst_maptype.cpp
@@ -31,6 +31,7 @@
 #include <QVariantMap>
 
 #include <QtLocation/private/qgeomaptype_p.h>
+#include <QtLocation/private/qgeocameracapabilities_p.h>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/nokia_services/places_semiauto/tst_places.cpp b/tests/auto/nokia_services/places_semiauto/tst_places.cpp
index 072d4bf4..7b9fd160 100644
--- a/tests/auto/nokia_services/places_semiauto/tst_places.cpp
+++ b/tests/auto/nokia_services/places_semiauto/tst_places.cpp
@@ -33,14 +33,25 @@
 #if QT_CONFIG(process)
 #include <QtCore/QProcessEnvironment>
 #endif
+#include <QtPositioning/QGeoAddress>
 #include <QtPositioning/QGeoCircle>
+#include <QtPositioning/QGeoLocation>
 #include <QtLocation/QGeoServiceProvider>
+#include <QtLocation/QPlace>
+#include <QtLocation/QPlaceAttribute>
+#include <QtLocation/QPlaceCategory>
+#include <QtLocation/QPlaceContactDetail>
+#include <QtLocation/QPlaceContentReply>
+#include <QtLocation/QPlaceContentRequest>
 #include <QtLocation/QPlaceEditorial>
+#include <QtLocation/QPlaceIcon>
 #include <QtLocation/QPlaceImage>
 #include <QtLocation/QPlaceManager>
+#include <QtLocation/QPlaceRatings>
 #include <QtLocation/QPlaceResult>
 #include <QtLocation/QPlaceReview>
 #include <QtLocation/QPlaceSearchReply>
+#include <QtLocation/QPlaceSearchRequest>
 #include "../../placemanager_utils/placemanager_utils.h"
 
 QT_USE_NAMESPACE
diff --git a/tests/auto/placemanager_utils/placemanager_utils.cpp b/tests/auto/placemanager_utils/placemanager_utils.cpp
index 33cbab9e..1714d5c2 100644
--- a/tests/auto/placemanager_utils/placemanager_utils.cpp
+++ b/tests/auto/placemanager_utils/placemanager_utils.cpp
@@ -30,8 +30,14 @@
 
 #include <QtCore/QDebug>
 #include <QtLocation/QPlace>
+#include <QtLocation/QPlaceCategory>
+#include <QtLocation/QPlaceContentReply>
+#include <QtLocation/QPlaceDetailsReply>
+#include <QtLocation/QPlaceIdReply>
 #include <QtLocation/QPlaceManager>
+#include <QtLocation/QPlaceMatchReply>
 #include <QtLocation/QPlaceSearchReply>
+#include <QtLocation/QPlaceSearchSuggestionReply>
 #include <QtLocation/QPlaceResult>
 #include <QtTest/QSignalSpy>
 #include <QtTest/QTest>
diff --git a/tests/auto/qgeocameradata/tst_qgeocameradata.cpp b/tests/auto/qgeocameradata/tst_qgeocameradata.cpp
index 1ad3637c..4a5dcbfa 100644
--- a/tests/auto/qgeocameradata/tst_qgeocameradata.cpp
+++ b/tests/auto/qgeocameradata/tst_qgeocameradata.cpp
@@ -30,6 +30,7 @@
 #include <QtTest/QtTest>
 
 #include <QtLocation/private/qgeocameradata_p.h>
+#include <QGeoCoordinate>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
index 49c4657e..08820b62 100644
--- a/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
+++ b/tests/auto/qgeocameratiles/tst_qgeocameratiles.cpp
@@ -31,8 +31,10 @@
 #include <QtLocation/private/qgeotilespec_p.h>
 #include <QtLocation/private/qgeocameratiles_p.h>
 #include <QtLocation/private/qgeocameradata_p.h>
+#include <QtLocation/private/qgeocameracapabilities_p.h>
 #include <QtLocation/private/qgeomaptype_p.h>
 
+#include <QtPositioning/QGeoCoordinate>
 #include <QtPositioning/private/qwebmercator_p.h>
 #include <QtPositioning/private/qdoublevector2d_p.h>
 #include <QtTest/QtTest>
diff --git a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
index 9c5f8f00..a466887f 100644
--- a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
+++ b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp
@@ -32,10 +32,13 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 #include <QtTest/QSignalSpy>
+#include <QtPositioning/QGeoCoordinate>
 #include <QtPositioning/private/qwebmercator_p.h>
+#include <QtPositioning/private/qdoublevector2d_p.h>
 #include <QtLocation/QGeoServiceProvider>
 #include <QtLocation/private/qgeotiledmap_p.h>
 #include <QtLocation/private/qgeomappingmanager_p.h>
+#include <QtLocation/private/qgeocameradata_p.h>
 #include <QtLocation/private/qgeocameracapabilities_p.h>
 
 QT_USE_NAMESPACE
diff --git a/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
index 86c800ca..6f352998 100644
--- a/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
+++ b/tests/auto/qgeotiledmapscene/tst_qgeotiledmapscene.cpp
@@ -34,6 +34,7 @@
 #include <QtLocation/private/qgeocameradata_p.h>
 #include <QtLocation/private/qabstractgeotilecache_p.h>
 #include <QtLocation/private/qgeoprojection_p.h>
+#include <QtPositioning/QGeoCoordinate>
 #include <QtPositioning/private/qwebmercator_p.h>
 #include <QtPositioning/private/qdoublevector2d_p.h>
 
diff --git a/tests/auto/qplace/tst_qplace.cpp b/tests/auto/qplace/tst_qplace.cpp
index 419328a1..8ef1e55c 100644
--- a/tests/auto/qplace/tst_qplace.cpp
+++ b/tests/auto/qplace/tst_qplace.cpp
@@ -29,10 +29,19 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
+#include <QtPositioning/QGeoLocation>
+#include <QtPositioning/QGeoCoordinate>
+
 #include <qplace.h>
 #include <qplaceimage.h>
 #include <qplaceattribute.h>
-#include <QtLocation/QPlaceEditorial>
+#include <qplacecategory.h>
+#include <qplacecontactdetail.h>
+#include <qplaceicon.h>
+#include <qplaceratings.h>
+#include <qplacereview.h>
+#include <qplacesupplier.h>
+#include <qplaceeditorial.h>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qplacedetailsreply/tst_qplacedetailsreply.cpp b/tests/auto/qplacedetailsreply/tst_qplacedetailsreply.cpp
index 5ea509b9..d692bbfb 100644
--- a/tests/auto/qplacedetailsreply/tst_qplacedetailsreply.cpp
+++ b/tests/auto/qplacedetailsreply/tst_qplacedetailsreply.cpp
@@ -29,6 +29,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
+#include <QtLocation/QPlace>
 #include <QtLocation/QPlaceDetailsReply>
 
 QT_USE_NAMESPACE
diff --git a/tests/auto/qplaceimage/tst_qplaceimage.cpp b/tests/auto/qplaceimage/tst_qplaceimage.cpp
index aa3f9df2..1e5396fe 100644
--- a/tests/auto/qplaceimage/tst_qplaceimage.cpp
+++ b/tests/auto/qplaceimage/tst_qplaceimage.cpp
@@ -29,6 +29,7 @@
 #include <QtCore/QString>
 #include <QtLocation/QPlaceImage>
 #include <QtLocation/QPlaceUser>
+#include <QtLocation/QPlaceSupplier>
 #include <QtTest/QtTest>
 
 #include "../utils/qlocationtestutils_p.h"
diff --git a/tests/auto/qplacemanager/tst_qplacemanager.cpp b/tests/auto/qplacemanager/tst_qplacemanager.cpp
index 919be2d9..3371ffdc 100644
--- a/tests/auto/qplacemanager/tst_qplacemanager.cpp
+++ b/tests/auto/qplacemanager/tst_qplacemanager.cpp
@@ -31,7 +31,10 @@
 #include <QtTest/QtTest>
 
 #include <qgeoserviceprovider.h>
+#include <qplace.h>
 #include <qplacemanager.h>
+#include <qplacematchrequest.h>
+#include <qplacematchreply.h>
 
 
 #ifndef WAIT_UNTIL
diff --git a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
index 46dbc615..ec3e7b86 100644
--- a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
+++ b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
@@ -31,7 +31,11 @@
 #include <QtTest/QtTest>
 
 #include <QtLocation/QGeoServiceProvider>
+#include <QtLocation/QPlace>
+#include <QtLocation/QPlaceCategory>
 #include <QtLocation/QPlaceManager>
+#include <QtLocation/QPlaceIdReply>
+#include <QtLocation/QPlaceReply>
 
 #ifndef WAIT_UNTIL
 #define WAIT_UNTIL(__expr) \
diff --git a/tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp b/tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp
index 58300904..d3f0e28e 100644
--- a/tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp
+++ b/tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp
@@ -31,9 +31,20 @@
 #include <QtCore/QString>
 #include <QtLocation/QGeoServiceProviderFactory>
 #include <QtLocation/QGeoServiceProvider>
+#include <QtLocation/QPlace>
+#include <QtLocation/QPlaceCategory>
+#include <QtLocation/QPlaceContentReply>
+#include <QtLocation/QPlaceContentRequest>
+#include <QtLocation/QPlaceMatchRequest>
 #include <QtLocation/QPlaceManager>
 #include <QtLocation/QPlaceManagerEngine>
+#include <QtLocation/QPlaceReply>
+#include <QtLocation/QPlaceDetailsReply>
+#include <QtLocation/QPlaceIdReply>
+#include <QtLocation/QPlaceMatchReply>
 #include <QtLocation/QPlaceSearchReply>
+#include <QtLocation/QPlaceSearchRequest>
+#include <QtLocation/QPlaceSearchSuggestionReply>
 #include <QtTest/QtTest>
 
 QT_USE_NAMESPACE
diff --git a/tests/auto/qplacematchreply/tst_qplacematchreply.cpp b/tests/auto/qplacematchreply/tst_qplacematchreply.cpp
index 34ee7ba2..41894f22 100644
--- a/tests/auto/qplacematchreply/tst_qplacematchreply.cpp
+++ b/tests/auto/qplacematchreply/tst_qplacematchreply.cpp
@@ -29,7 +29,9 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
+#include <QtLocation/QPlace>
 #include <QtLocation/QPlaceMatchReply>
+#include <QtLocation/QPlaceMatchRequest>
 
 QT_USE_NAMESPACE
 
diff --git a/tests/auto/qplacematchrequest/tst_qplacematchrequest.cpp b/tests/auto/qplacematchrequest/tst_qplacematchrequest.cpp
index 03ba59a7..7a81931f 100644
--- a/tests/auto/qplacematchrequest/tst_qplacematchrequest.cpp
+++ b/tests/auto/qplacematchrequest/tst_qplacematchrequest.cpp
@@ -29,6 +29,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
+#include <QtLocation/QPlace>
 #include <QtLocation/QPlaceMatchRequest>
 #include <QtLocation/QPlaceResult>
 
diff --git a/tests/auto/qplaceresult/tst_qplaceresult.cpp b/tests/auto/qplaceresult/tst_qplaceresult.cpp
index 4074d0d5..2a7a094e 100644
--- a/tests/auto/qplaceresult/tst_qplaceresult.cpp
+++ b/tests/auto/qplaceresult/tst_qplaceresult.cpp
@@ -27,6 +27,7 @@
 ****************************************************************************/
 
 #include <QtCore/QString>
+#include <QtLocation/QPlace>
 #include <QtLocation/QPlaceResult>
 #include <QtLocation/QPlaceIcon>
 #include <QtTest/QtTest>
diff --git a/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp b/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp
index 14c951ee..1efc111d 100644
--- a/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp
+++ b/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp
@@ -30,6 +30,7 @@
 #include <QtTest/QtTest>
 
 #include <QtPositioning/QGeoCircle>
+#include <QtLocation/QPlace>
 #include <QtLocation/QPlaceSearchRequest>
 #include <QtLocation/QPlaceSearchReply>
 #include <QtLocation/QPlaceResult>
diff --git a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp
index 959fedeb..94d95e24 100644
--- a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp
+++ b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp
@@ -28,6 +28,7 @@
 
 #include <QtCore/QString>
 #include <QtTest/QtTest>
+#include <QtLocation/QPlaceCategory>
 #include <QtLocation/QPlaceSearchRequest>
 #include <QtPositioning/QGeoCircle>
 #include <QtPositioning/QGeoRectangle>
diff --git a/tests/auto/qplacesupplier/tst_qplacesupplier.cpp b/tests/auto/qplacesupplier/tst_qplacesupplier.cpp
index 6d6bdf88..58a45f3a 100644
--- a/tests/auto/qplacesupplier/tst_qplacesupplier.cpp
+++ b/tests/auto/qplacesupplier/tst_qplacesupplier.cpp
@@ -29,6 +29,7 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
+#include <qplaceicon.h>
 #include <qplacesupplier.h>
 
 QT_USE_NAMESPACE