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>

1 files changed, 13 insertions, 12 deletions

diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index 90e2884d..d8802e2b 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -40,28 +40,29 @@
 #ifndef QPLACEMANAGER_H
 #define QPLACEMANAGER_H
 
-#include <QtLocation/QPlaceContentReply>
-#include <QtLocation/QPlaceContentRequest>
-#include <QtLocation/QPlaceIdReply>
 #include <QtLocation/QPlaceReply>
-#include <QtLocation/QPlaceDetailsReply>
-#include <QtLocation/QPlaceMatchReply>
-#include <QtLocation/QPlaceMatchRequest>
-#include <QtLocation/QPlaceSearchSuggestionReply>
-#include <QtLocation/QPlaceSearchRequest>
-#include <QtLocation/QPlaceSearchResult>
-
-#include <QtCore/QLocale>
+
 #include <QtCore/QList>
 #include <QtCore/QString>
 #include <QtCore/QObject>
-#include <QtLocation/QPlaceIcon>
 
 QT_BEGIN_NAMESPACE
 
+class QLocale;
+class QPlace;
+class QPlaceCategory;
+class QPlaceContentReply;
+class QPlaceContentRequest;
+class QPlaceDetailsReply;
+class QPlaceIcon;
+class QPlaceIdReply;
 class QPlaceManagerEngine;
+class QPlaceMatchReply;
+class QPlaceMatchRequest;
 class QPlaceSearchRequest;
 class QPlaceSearchReply;
+class QPlaceSearchResult;
+class QPlaceSearchSuggestionReply;
 
 class Q_LOCATION_EXPORT QPlaceManager : public QObject
 {