Moving location qml implementation to location/declarative*

QtLocation quick classes and headers are moved out of the import directory.
The location quick classes are now in a subdirectory inside the main qtlocation
module.
This is necessary in order to privately export certain classes, such as
Map Items classes, and create an API to inject these objects into QGeoMap
to let plugins render the Map Items directly

Change-Id: Ia6ba5f07c4eddd3c4c2ce54bf34f1afcd42c2558
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

85 files changed, 325 insertions, 225 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index f9b3545f..f1494a04 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -34,37 +34,38 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativegeoserviceprovider_p.h"
-#include "qdeclarativegeomap_p.h"
-
-#include "qdeclarativegeoroute_p.h"
-#include "qdeclarativegeoroutemodel_p.h"
-#include "qdeclarativegeocodemodel_p.h"
-#include "qdeclarativegeomaneuver_p.h"
-#include "qdeclarativegeomapquickitem_p.h"
-#include "qdeclarativegeomapitemview_p.h"
-#include "qdeclarativegeomaptype_p.h"
-#include "qdeclarativerectanglemapitem_p.h"
-#include "qdeclarativecirclemapitem_p.h"
-#include "qdeclarativeroutemapitem_p.h"
-#include "qdeclarativepolylinemapitem_p.h"
-#include "qdeclarativepolygonmapitem_p.h"
-#include "qdeclarativegeomapparameter_p.h"
+#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
+#include <QtLocation/private/qdeclarativegeomap_p.h>
+
+#include <QtLocation/private/qdeclarativegeoroute_p.h>
+#include <QtLocation/private/qdeclarativegeoroutemodel_p.h>
+#include <QtLocation/private/qdeclarativegeocodemodel_p.h>
+#include <QtLocation/private/qdeclarativegeomaneuver_p.h>
+#include <QtLocation/private/qdeclarativegeomapitembase_p.h>
+#include <QtLocation/private/qdeclarativegeomapquickitem_p.h>
+#include <QtLocation/private/qdeclarativegeomapitemview_p.h>
+#include <QtLocation/private/qdeclarativegeomaptype_p.h>
+#include <QtLocation/private/qdeclarativerectanglemapitem_p.h>
+#include <QtLocation/private/qdeclarativecirclemapitem_p.h>
+#include <QtLocation/private/qdeclarativeroutemapitem_p.h>
+#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
+#include <QtLocation/private/qdeclarativepolygonmapitem_p.h>
+#include <QtLocation/private/qdeclarativegeomapparameter_p.h>
 
 //Place includes
-#include "qdeclarativecategory_p.h"
-#include "qdeclarativeplace_p.h"
-#include "qdeclarativeplaceattribute_p.h"
-#include "qdeclarativeplaceicon_p.h"
-#include "qdeclarativeratings_p.h"
-#include "qdeclarativesupplier_p.h"
-#include "qdeclarativeplaceuser_p.h"
-#include "qdeclarativecontactdetail_p.h"
-
-#include "qdeclarativesupportedcategoriesmodel_p.h"
-#include "qdeclarativesearchresultmodel_p.h"
-#include "qdeclarativesearchsuggestionmodel_p.h"
-#include "error_messages.h"
+#include <QtLocation/private/qdeclarativecategory_p.h>
+#include <QtLocation/private/qdeclarativeplace_p.h>
+#include <QtLocation/private/qdeclarativeplaceattribute_p.h>
+#include <QtLocation/private/qdeclarativeplaceicon_p.h>
+#include <QtLocation/private/qdeclarativeratings_p.h>
+#include <QtLocation/private/qdeclarativesupplier_p.h>
+#include <QtLocation/private/qdeclarativeplaceuser_p.h>
+#include <QtLocation/private/qdeclarativecontactdetail_p.h>
+
+#include <QtLocation/private/qdeclarativesupportedcategoriesmodel_p.h>
+#include <QtLocation/private/qdeclarativesearchresultmodel_p.h>
+#include <QtLocation/private/qdeclarativesearchsuggestionmodel_p.h>
+#include <QtLocation/error_messages.h>
 
 #include <QtQml/qqmlextensionplugin.h>
 
diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro
index 1f4f2822..dec1149b 100644
--- a/src/imports/location/location.pro
+++ b/src/imports/location/location.pro
@@ -1,74 +1,10 @@
 QT += quick-private network positioning-private location-private qml-private core-private gui-private
 
-INCLUDEPATH += ../../location
-INCLUDEPATH += ../../location/maps
-INCLUDEPATH += ../../positioning
-INCLUDEPATH += ../positioning
-INCLUDEPATH += ../../3rdparty/clip2tri
-INCLUDEPATH += ../../3rdparty/clipper
-INCLUDEPATH += ../../3rdparty/poly2tri
-INCLUDEPATH *= $$PWD
-
-HEADERS += \
-           qdeclarativegeomapitemview_p.h \
-           qdeclarativegeoserviceprovider_p.h \
-           qdeclarativegeocodemodel_p.h \
-           qdeclarativegeoroutemodel_p.h \
-           qdeclarativegeoroute_p.h \
-           qdeclarativegeoroutesegment_p.h \
-           qdeclarativegeomaneuver_p.h \
-           qdeclarativegeomap_p.h \
-           qdeclarativegeomaptype_p.h \
-           qdeclarativegeomapitembase_p.h \
-           qdeclarativegeomapquickitem_p.h \
-           qdeclarativecirclemapitem_p.h \
-           qdeclarativerectanglemapitem_p.h \
-           qdeclarativepolygonmapitem_p.h \
-           qdeclarativepolylinemapitem_p.h \
-           qdeclarativeroutemapitem_p.h \
-           qgeomapitemgeometry_p.h \
-           qdeclarativegeomapcopyrightsnotice_p.h \
-           error_messages.h \
-           locationvaluetypehelper_p.h\
-           qquickgeomapgesturearea_p.h\
-           ../positioning/qquickgeocoordinateanimation_p.h \
-           mapitemviewdelegateincubator.h \
-           qdeclarativegeomapitemview_p_p.h \
-           qdeclarativegeomapparameter_p.h
-
 SOURCES += \
-           location.cpp \
-           qdeclarativegeomapitemview.cpp \
-           qdeclarativegeoserviceprovider.cpp \
-           qdeclarativegeocodemodel.cpp \
-           qdeclarativegeoroutemodel.cpp \
-           qdeclarativegeoroute.cpp \
-           qdeclarativegeoroutesegment.cpp \
-           qdeclarativegeomaneuver.cpp \
-           qdeclarativegeomap.cpp \
-           qdeclarativegeomaptype.cpp \
-           qdeclarativegeomapitembase.cpp \
-           qdeclarativegeomapquickitem.cpp \
-           qdeclarativecirclemapitem.cpp \
-           qdeclarativerectanglemapitem.cpp \
-           qdeclarativepolygonmapitem.cpp \
-           qdeclarativepolylinemapitem.cpp \
-           qdeclarativeroutemapitem.cpp \
-           qgeomapitemgeometry.cpp \
-           qdeclarativegeomapcopyrightsnotice.cpp \
-           error_messages.cpp \
-           locationvaluetypehelper.cpp \
-           qquickgeomapgesturearea.cpp \
-           ../positioning/qquickgeocoordinateanimation.cpp \
-           mapitemviewdelegateincubator.cpp \
-           qdeclarativegeomapparameter.cpp
-
-include(declarativeplaces/declarativeplaces.pri)
+           location.cpp
 
 load(qml_plugin)
 
-LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix()
-
 OTHER_FILES += \
     plugin.json \
     qmldir
diff --git a/src/location/declarativemaps/declarativemaps.pri b/src/location/declarativemaps/declarativemaps.pri
new file mode 100644
index 00000000..52e61049
--- /dev/null
+++ b/src/location/declarativemaps/declarativemaps.pri
@@ -0,0 +1,62 @@
+QT += quick-private network positioning-private qml-private core-private gui-private
+
+INCLUDEPATH += declarativemaps
+
+PUBLIC_HEADERS += \
+           declarativemaps/error_messages.h
+
+PRIVATE_HEADERS += \
+           declarativemaps/qdeclarativegeomapitemview_p.h \
+           declarativemaps/qdeclarativegeomapitemview_p_p.h \
+           declarativemaps/qdeclarativegeoserviceprovider_p.h \
+           declarativemaps/qdeclarativegeocodemodel_p.h \
+           declarativemaps/qdeclarativegeoroutemodel_p.h \
+           declarativemaps/qdeclarativegeoroute_p.h \
+           declarativemaps/qdeclarativegeoroutesegment_p.h \
+           declarativemaps/qdeclarativegeomaneuver_p.h \
+           declarativemaps/qdeclarativegeomap_p.h \
+           declarativemaps/qdeclarativegeomaptype_p.h \
+           declarativemaps/qdeclarativegeomapitembase_p.h \
+           declarativemaps/qdeclarativegeomapquickitem_p.h \
+           declarativemaps/qdeclarativecirclemapitem_p.h \
+           declarativemaps/qdeclarativerectanglemapitem_p.h \
+           declarativemaps/qdeclarativepolygonmapitem_p.h \
+           declarativemaps/qdeclarativepolylinemapitem_p.h \
+           declarativemaps/qdeclarativeroutemapitem_p.h \
+           declarativemaps/qdeclarativegeomapparameter_p.h \
+           declarativemaps/qgeomapitemgeometry_p.h \
+           declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h \
+           declarativemaps/locationvaluetypehelper_p.h \
+           declarativemaps/qquickgeomapgesturearea_p.h \
+           declarativemaps/mapitemviewdelegateincubator_p.h \
+           ../imports/positioning/qquickgeocoordinateanimation_p.h
+
+SOURCES += \
+           declarativemaps/qdeclarativegeomapitemview.cpp \
+           declarativemaps/qdeclarativegeoserviceprovider.cpp \
+           declarativemaps/qdeclarativegeocodemodel.cpp \
+           declarativemaps/qdeclarativegeoroutemodel.cpp \
+           declarativemaps/qdeclarativegeoroute.cpp \
+           declarativemaps/qdeclarativegeoroutesegment.cpp \
+           declarativemaps/qdeclarativegeomaneuver.cpp \
+           declarativemaps/qdeclarativegeomap.cpp \
+           declarativemaps/qdeclarativegeomaptype.cpp \
+           declarativemaps/qdeclarativegeomapitembase.cpp \
+           declarativemaps/qdeclarativegeomapquickitem.cpp \
+           declarativemaps/qdeclarativecirclemapitem.cpp \
+           declarativemaps/qdeclarativerectanglemapitem.cpp \
+           declarativemaps/qdeclarativepolygonmapitem.cpp \
+           declarativemaps/qdeclarativepolylinemapitem.cpp \
+           declarativemaps/qdeclarativeroutemapitem.cpp \
+           declarativemaps/qdeclarativegeomapparameter.cpp \
+           declarativemaps/qgeomapitemgeometry.cpp \
+           declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp \
+           declarativemaps/error_messages.cpp \
+           declarativemaps/locationvaluetypehelper.cpp \
+           declarativemaps/qquickgeomapgesturearea.cpp \
+           ../imports/positioning/qquickgeocoordinateanimation.cpp \
+           declarativemaps/mapitemviewdelegateincubator.cpp
+
+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lpoly2tri$$qtPlatformTargetSuffix() -lclip2tri$$qtPlatformTargetSuffix()
+
+
diff --git a/src/imports/location/error_messages.cpp b/src/location/declarativemaps/error_messages.cpp
index a2557f79..a2557f79 100644
--- a/src/imports/location/error_messages.cpp
+++ b/src/location/declarativemaps/error_messages.cpp
diff --git a/src/imports/location/error_messages.h b/src/location/declarativemaps/error_messages.h
index 81c43b34..81c43b34 100644
--- a/src/imports/location/error_messages.h
+++ b/src/location/declarativemaps/error_messages.h
diff --git a/src/imports/location/locationvaluetypehelper.cpp b/src/location/declarativemaps/locationvaluetypehelper.cpp
index 4f39e0b4..4f39e0b4 100644
--- a/src/imports/location/locationvaluetypehelper.cpp
+++ b/src/location/declarativemaps/locationvaluetypehelper.cpp
diff --git a/src/imports/location/locationvaluetypehelper_p.h b/src/location/declarativemaps/locationvaluetypehelper_p.h
index 50038e88..50038e88 100644
--- a/src/imports/location/locationvaluetypehelper_p.h
+++ b/src/location/declarativemaps/locationvaluetypehelper_p.h
diff --git a/src/imports/location/mapitemviewdelegateincubator.cpp b/src/location/declarativemaps/mapitemviewdelegateincubator.cpp
index 06dee7ba..c8500e4b 100644
--- a/src/imports/location/mapitemviewdelegateincubator.cpp
+++ b/src/location/declarativemaps/mapitemviewdelegateincubator.cpp
@@ -35,7 +35,7 @@
 **
 ****************************************************************************/
 
-#include "mapitemviewdelegateincubator.h"
+#include "mapitemviewdelegateincubator_p.h"
 #include "qdeclarativegeomapitemview_p.h"
 #include "qdeclarativegeomapitemview_p_p.h"
 
diff --git a/src/imports/location/mapitemviewdelegateincubator.h b/src/location/declarativemaps/mapitemviewdelegateincubator_p.h
index 94c73252..b559c944 100644
--- a/src/imports/location/mapitemviewdelegateincubator.h
+++ b/src/location/declarativemaps/mapitemviewdelegateincubator_p.h
@@ -37,14 +37,15 @@
 #ifndef MAPITEMVIEWDELEGATEINCUBATOR_H
 #define MAPITEMVIEWDELEGATEINCUBATOR_H
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtQml/QQmlIncubator>
-#include "qdeclarativegeomapitemview_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoMapItemView;
+class QDeclarativeGeoMapItemViewItemData;
 
-class MapItemViewDelegateIncubator : public QQmlIncubator
+class Q_LOCATION_PRIVATE_EXPORT MapItemViewDelegateIncubator : public QQmlIncubator
 {
 public:
     MapItemViewDelegateIncubator(QDeclarativeGeoMapItemView *view, QDeclarativeGeoMapItemViewItemData *itemData, bool batched = true);
diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
index 8b1c0258..39581dce 100644
--- a/src/imports/location/qdeclarativecirclemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
@@ -37,7 +37,9 @@
 #include "qdeclarativecirclemapitem_p.h"
 #include "qdeclarativepolygonmapitem_p.h"
 #include "qgeocameracapabilities_p.h"
+
 #include "qwebmercator_p.h"
+#include <QtLocation/private/qgeomap_p.h>
 
 #include <cmath>
 #include <algorithm>
diff --git a/src/imports/location/qdeclarativecirclemapitem_p.h b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
index 08e5e21b..62bef6d3 100644
--- a/src/imports/location/qdeclarativecirclemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
@@ -48,9 +48,10 @@
 // We mean it.
 //
 
-#include "qdeclarativegeomapitembase_p.h"
-#include "qdeclarativepolylinemapitem_p.h"
-#include "qdeclarativepolygonmapitem_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeomapitembase_p.h>
+#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
+#include <QtLocation/private/qdeclarativepolygonmapitem_p.h>
 #include <QSGGeometryNode>
 #include <QSGFlatColorMaterial>
 #include <QtPositioning/QGeoCircle>
@@ -65,7 +66,7 @@ public:
     void updateScreenPointsInvert(const QList<QGeoCoordinate> &circlePath, const QGeoMap &map);
 };
 
-class QDeclarativeCircleMapItem : public QDeclarativeGeoMapItemBase
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCircleMapItem : public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
     Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter NOTIFY centerChanged)
diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp
index e92949ee..e92949ee 100644
--- a/src/imports/location/qdeclarativegeocodemodel.cpp
+++ b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp
diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h
index 2fbe9937..6c8f533b 100644
--- a/src/imports/location/qdeclarativegeocodemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeocodemodel_p.h
@@ -48,9 +48,10 @@
 // We mean it.
 //
 
-#include "qdeclarativegeoserviceprovider_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
 
-#include <qgeocodereply.h>
+#include <QtLocation/qgeocodereply.h>
 #include <QtPositioning/private/qdeclarativegeoaddress_p.h>
 #include <QtPositioning/private/qdeclarativegeolocation_p.h>
 
@@ -59,13 +60,14 @@
 #include <QAbstractListModel>
 #include <QPointer>
 
+
 QT_BEGIN_NAMESPACE
 
 class QGeoServiceProvider;
 class QGeoCodingManager;
 class QDeclarativeGeoLocation;
 
-class QDeclarativeGeocodeModel : public QAbstractListModel, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeocodeModel : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
     Q_ENUMS(Status)
diff --git a/src/imports/location/qdeclarativegeomaneuver.cpp b/src/location/declarativemaps/qdeclarativegeomaneuver.cpp
index 72c38865..72c38865 100644
--- a/src/imports/location/qdeclarativegeomaneuver.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomaneuver.cpp
diff --git a/src/imports/location/qdeclarativegeomaneuver_p.h b/src/location/declarativemaps/qdeclarativegeomaneuver_p.h
index b189d83f..0e957a1f 100644
--- a/src/imports/location/qdeclarativegeomaneuver_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomaneuver_p.h
@@ -48,15 +48,17 @@
 // We mean it.
 //
 
-#include <qgeomaneuver.h>
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/qgeomaneuver.h>
 
 #include <QtPositioning/QGeoCoordinate>
 
 #include <QObject>
 
+
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeGeoManeuver : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoManeuver : public QObject
 {
     Q_OBJECT
     Q_ENUMS(Direction)
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp
index 15d802e6..15d802e6 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp
diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/location/declarativemaps/qdeclarativegeomap_p.h
index c77c3338..ca2ec0a9 100644
--- a/src/imports/location/qdeclarativegeomap_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomap_p.h
@@ -48,10 +48,12 @@
 // We mean it.
 //
 
-#include "qgeoserviceprovider.h"
-#include "qdeclarativegeomapitemview_p.h"
-#include "qquickgeomapgesturearea_p.h"
-#include "qgeocameradata_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeomapitemview_p.h>
+#include <QtLocation/private/qquickgeomapgesturearea_p.h>
+
+#include <QtLocation/qgeoserviceprovider.h>
+#include <QtLocation/private/qgeocameradata_p.h>
 #include <QtQuick/QQuickItem>
 #include <QtCore/QPointer>
 #include <QtCore/QSet>
@@ -65,7 +67,7 @@ class QDeclarativeGeoMapType;
 class QDeclarativeGeoMapCopyrightNotice;
 class QDeclarativeGeoMapParameter;
 
-class QDeclarativeGeoMap : public QQuickItem
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMap : public QQuickItem
 {
     Q_OBJECT
     Q_ENUMS(QGeoServiceProvider::Error)
diff --git a/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
index 7b5a5765..7b5a5765 100644
--- a/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
diff --git a/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
index 771ced6c..1aeef7c1 100644
--- a/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
@@ -49,6 +49,8 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
+
 #include <QtGui/QImage>
 #include <QtQuick/QQuickPaintedItem>
 
@@ -56,7 +58,7 @@ QT_BEGIN_NAMESPACE
 
 class QTextDocument;
 
-class QDeclarativeGeoMapCopyrightNotice : public QQuickPaintedItem
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapCopyrightNotice : public QQuickPaintedItem
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
index d11902e9..93d07386 100644
--- a/src/imports/location/qdeclarativegeomapitembase.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
@@ -36,6 +36,7 @@
 
 #include "qdeclarativegeomapitembase_p.h"
 #include "qgeocameradata_p.h"
+#include <QtLocation/private/qgeomap_p.h>
 #include <QtQml/QQmlInfo>
 #include <QtQuick/QSGOpacityNode>
 #include <QtQuick/private/qquickmousearea_p.h>
diff --git a/src/imports/location/qdeclarativegeomapitembase_p.h b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
index 3a1728a2..82a24233 100644
--- a/src/imports/location/qdeclarativegeomapitembase_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
@@ -48,14 +48,17 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
+
 #include <QtQuick/QQuickItem>
 #include <QtPositioning/QGeoShape>
 
-#include "qdeclarativegeomap_p.h"
+#include <QtLocation/private/qdeclarativegeomap_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QGeoMapViewportChangeEvent
+class Q_LOCATION_PRIVATE_EXPORT QGeoMapViewportChangeEvent
 {
 public:
     explicit QGeoMapViewportChangeEvent();
@@ -73,7 +76,7 @@ public:
     bool rollChanged;
 };
 
-class QDeclarativeGeoMapItemBase : public QQuickItem
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapItemBase : public QQuickItem
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qdeclarativegeomapitemview.cpp b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
index 0a9128f3..cb1a4348 100644
--- a/src/imports/location/qdeclarativegeomapitemview.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
@@ -37,9 +37,10 @@
 ****************************************************************************/
 
 #include "qdeclarativegeomapitemview_p.h"
+#include "qdeclarativegeomapitemview_p_p.h"
 #include "qdeclarativegeomap_p.h"
 #include "qdeclarativegeomapitembase_p.h"
-#include "mapitemviewdelegateincubator.h"
+#include "mapitemviewdelegateincubator_p.h"
 
 #include <QtCore/QAbstractItemModel>
 #include <QtQml/QQmlContext>
diff --git a/src/imports/location/qdeclarativegeomapitemview_p.h b/src/location/declarativemaps/qdeclarativegeomapitemview_p.h
index fefc63ba..bd696d6e 100644
--- a/src/imports/location/qdeclarativegeomapitemview_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitemview_p.h
@@ -50,11 +50,12 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
+
 #include <QtCore/QModelIndex>
 #include <QtQml/QQmlParserStatus>
 #include <QtQml/QQmlIncubator>
 #include <QtQml/qqml.h>
-#include "qdeclarativegeomapitemview_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -66,8 +67,9 @@ class QDeclarativeGeoMapItemBase;
 class QQmlOpenMetaObject;
 class QQmlOpenMetaObjectType;
 class MapItemViewDelegateIncubator;
+class QDeclarativeGeoMapItemViewItemData;
 
-class QDeclarativeGeoMapItemView : public QObject, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapItemView : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qdeclarativegeomapitemview_p_p.h b/src/location/declarativemaps/qdeclarativegeomapitemview_p_p.h
index 3ad3ceb4..3ad3ceb4 100644
--- a/src/imports/location/qdeclarativegeomapitemview_p_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapitemview_p_p.h
diff --git a/src/imports/location/qdeclarativegeomapparameter.cpp b/src/location/declarativemaps/qdeclarativegeomapparameter.cpp
index 88d609f4..88d609f4 100644
--- a/src/imports/location/qdeclarativegeomapparameter.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapparameter.cpp
diff --git a/src/imports/location/qdeclarativegeomapparameter_p.h b/src/location/declarativemaps/qdeclarativegeomapparameter_p.h
index 31ea5b04..0f54e1b7 100644
--- a/src/imports/location/qdeclarativegeomapparameter_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapparameter_p.h
@@ -48,13 +48,14 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtLocation/private/qgeomapparameter_p.h>
 #include <QQmlParserStatus>
 #include <qqml.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeGeoMapParameter : public QGeoMapParameter, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapParameter : public QGeoMapParameter, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp
index fc710188..b3b8aa8a 100644
--- a/src/imports/location/qdeclarativegeomapquickitem.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp
@@ -39,8 +39,9 @@
 #include <QtCore/QScopedValueRollback>
 #include <QtQml/qqmlinfo.h>
 #include <QtQuick/QSGOpacityNode>
-#include "qdoublevector2d_p.h"
+#include <QtPositioning/private/qdoublevector2d_p.h>
 #include <QtQuick/private/qquickmousearea_p.h>
+#include <QtLocation/private/qgeomap_p.h>
 
 #include <QDebug>
 #include <cmath>
diff --git a/src/imports/location/qdeclarativegeomapquickitem_p.h b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
index 39d246df..2d910167 100644
--- a/src/imports/location/qdeclarativegeomapquickitem_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
@@ -48,16 +48,18 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
+
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QSGNode>
 
-#include "qdeclarativegeomap_p.h"
-#include "qdeclarativegeomapitembase_p.h"
+#include <QtLocation/private/qdeclarativegeomap_p.h>
+#include <QtLocation/private/qdeclarativegeomapitembase_p.h>
 #include <QtPositioning/qgeoshape.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeGeoMapQuickItem : public QDeclarativeGeoMapItemBase
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapQuickItem : public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
     Q_PROPERTY(QGeoCoordinate coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged)
diff --git a/src/imports/location/qdeclarativegeomaptype.cpp b/src/location/declarativemaps/qdeclarativegeomaptype.cpp
index 0b90ec3a..0b90ec3a 100644
--- a/src/imports/location/qdeclarativegeomaptype.cpp
+++ b/src/location/declarativemaps/qdeclarativegeomaptype.cpp
diff --git a/src/imports/location/qdeclarativegeomaptype_p.h b/src/location/declarativemaps/qdeclarativegeomaptype_p.h
index 980c594a..7b449aa0 100644
--- a/src/imports/location/qdeclarativegeomaptype_p.h
+++ b/src/location/declarativemaps/qdeclarativegeomaptype_p.h
@@ -48,13 +48,15 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
+
 #include <QtCore/QObject>
 #include <QtQml/qqml.h>
 #include <QtLocation/private/qgeomaptype_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeGeoMapType : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoMapType : public QObject
 {
     Q_OBJECT
     Q_ENUMS(MapStyle)
diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/location/declarativemaps/qdeclarativegeoroute.cpp
index 44c59ce2..fd6378da 100644
--- a/src/imports/location/qdeclarativegeoroute.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroute.cpp
@@ -36,6 +36,7 @@
 
 #include "qdeclarativegeoroute_p.h"
 #include "locationvaluetypehelper_p.h"
+#include <QtLocation/private/qgeomap_p.h>
 
 #include <QtQml/QQmlEngine>
 #include <QtQml/qqmlinfo.h>
diff --git a/src/imports/location/qdeclarativegeoroute_p.h b/src/location/declarativemaps/qdeclarativegeoroute_p.h
index 9bb46087..e4501770 100644
--- a/src/imports/location/qdeclarativegeoroute_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroute_p.h
@@ -48,7 +48,8 @@
 // We mean it.
 //
 
-#include "qdeclarativegeoroutesegment_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeoroutesegment_p.h>
 
 #include <QtCore/QObject>
 #include <QtQml/QQmlListProperty>
@@ -56,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeGeoRoute : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRoute : public QObject
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
index 90796412..90796412 100644
--- a/src/imports/location/qdeclarativegeoroutemodel.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
diff --git a/src/imports/location/qdeclarativegeoroutemodel_p.h b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
index 30fc1ecc..3dfd2ce6 100644
--- a/src/imports/location/qdeclarativegeoroutemodel_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroutemodel_p.h
@@ -48,7 +48,8 @@
 // We mean it.
 //
 
-#include "qdeclarativegeoserviceprovider_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
 
 #include <QtPositioning/QGeoCoordinate>
 #include <QtPositioning/QGeoRectangle>
@@ -70,7 +71,7 @@ class QGeoRoutingManager;
 class QDeclarativeGeoRoute;
 class QDeclarativeGeoRouteQuery;
 
-class QDeclarativeGeoRouteModel : public QAbstractListModel, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRouteModel : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
     Q_ENUMS(Status)
@@ -184,7 +185,7 @@ private:
     RouteError error_;
 };
 
-class QDeclarativeGeoRouteQuery : public QObject, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRouteQuery : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_ENUMS(TravelMode)
diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp
index acfe2441..acfe2441 100644
--- a/src/imports/location/qdeclarativegeoroutesegment.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoroutesegment.cpp
diff --git a/src/imports/location/qdeclarativegeoroutesegment_p.h b/src/location/declarativemaps/qdeclarativegeoroutesegment_p.h
index e6cf5aa5..c3203ef0 100644
--- a/src/imports/location/qdeclarativegeoroutesegment_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoroutesegment_p.h
@@ -48,7 +48,8 @@
 // We mean it.
 //
 
-#include "qdeclarativegeomaneuver_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeomaneuver_p.h>
 
 #include <QtCore/QObject>
 #include <QtQml/qjsvalue.h>
@@ -56,7 +57,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeGeoRouteSegment : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoRouteSegment : public QObject
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp
index 994b4913..994b4913 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider.cpp
+++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider.cpp
diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
index f7a2ee83..bcf67124 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider_p.h
+++ b/src/location/declarativemaps/qdeclarativegeoserviceprovider_p.h
@@ -48,6 +48,8 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
+
 #include <QtCore/QMap>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
@@ -59,7 +61,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeGeoServiceProviderParameter : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoServiceProviderParameter : public QObject
 {
     Q_OBJECT
 
@@ -87,7 +89,7 @@ private:
 
 class QDeclarativeGeoServiceProviderRequirements;
 
-class QDeclarativeGeoServiceProvider : public QObject, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoServiceProvider : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_ENUMS(RoutingFeature)
@@ -108,7 +110,7 @@ class QDeclarativeGeoServiceProvider : public QObject, public QQmlParserStatus
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    explicit QDeclarativeGeoServiceProvider(QObject *parent = 0);
+    explicit QDeclarativeGeoServiceProvider(QObject *parent = Q_NULLPTR);
     ~QDeclarativeGeoServiceProvider();
 
     enum RoutingFeature {
@@ -223,7 +225,7 @@ private:
     Q_DISABLE_COPY(QDeclarativeGeoServiceProvider)
 };
 
-class QDeclarativeGeoServiceProviderRequirements : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeGeoServiceProviderRequirements : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QDeclarativeGeoServiceProvider::MappingFeatures mapping
diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
index a966e165..3f05957a 100644
--- a/src/imports/location/qdeclarativepolygonmapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
@@ -39,6 +39,7 @@
 #include "qlocationutils_p.h"
 #include "error_messages.h"
 #include "locationvaluetypehelper_p.h"
+#include <QtLocation/private/qgeomap_p.h>
 
 #include <QtCore/QScopedValueRollback>
 #include <QtGui/private/qtriangulator_p.h>
@@ -738,4 +739,5 @@ void MapPolygonNode::update(const QColor &fillColor, const QColor &borderColor,
         markDirty(DirtyMaterial);
     }
 }
+
 QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
index 09c46af2..cb4de6b9 100644
--- a/src/imports/location/qdeclarativepolygonmapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
@@ -48,9 +48,10 @@
 // We mean it.
 //
 
-#include "qdeclarativegeomapitembase_p.h"
-#include "qdeclarativepolylinemapitem_p.h"
-#include "qgeomapitemgeometry_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeomapitembase_p.h>
+#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
+#include <QtLocation/private/qgeomapitemgeometry_p.h>
 
 #include <QSGGeometryNode>
 #include <QSGFlatColorMaterial>
@@ -76,7 +77,7 @@ protected:
     bool assumeSimple_;
 };
 
-class QDeclarativePolygonMapItem : public QDeclarativeGeoMapItemBase
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolygonMapItem : public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
index bc388e1c..601af6ee 100644
--- a/src/imports/location/qdeclarativepolylinemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
@@ -40,6 +40,7 @@
 #include "error_messages.h"
 #include "locationvaluetypehelper_p.h"
 #include "qdoublevector2d_p.h"
+#include <QtLocation/private/qgeomap_p.h>
 
 #include <QtCore/QScopedValueRollback>
 #include <QtQml/QQmlInfo>
diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
index 17d5ac34..abc1df2f 100644
--- a/src/imports/location/qdeclarativepolylinemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
@@ -48,10 +48,11 @@
 // We mean it.
 //
 
-#include "qdeclarativegeomapitembase_p.h"
-#include "qgeomapitemgeometry_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>
 
@@ -59,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class MapPolylineNode;
 
-class QDeclarativeMapLineProperties : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeMapLineProperties : public QObject
 {
     Q_OBJECT
 
@@ -114,7 +115,7 @@ private:
     friend class QDeclarativeRectangleMapItem;
 };
 
-class QDeclarativePolylineMapItem : public QDeclarativeGeoMapItemBase
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativePolylineMapItem : public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
index a467f4c6..8abd58dd 100644
--- a/src/imports/location/qdeclarativerectanglemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
@@ -42,6 +42,8 @@
 #include <qnumeric.h>
 #include <QRectF>
 #include <QPointF>
+#include <QtLocation/private/qgeomap_p.h>
+#include <QtPositioning/private/qdoublevector2d_p.h>
 #include <QtCore/QScopedValueRollback>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/imports/location/qdeclarativerectanglemapitem_p.h b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
index 97e92fa4..6e6ea5b1 100644
--- a/src/imports/location/qdeclarativerectanglemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
@@ -48,16 +48,18 @@
 // We mean it.
 //
 
-#include "qdeclarativegeomapitembase_p.h"
-#include "qgeomapitemgeometry_p.h"
-#include "qdeclarativepolylinemapitem_p.h"
-#include "qdeclarativepolygonmapitem_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeomapitembase_p.h>
+#include <QtLocation/private/qgeomapitemgeometry_p.h>
+#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
+#include <QtLocation/private/qdeclarativepolygonmapitem_p.h>
+
 #include <QSGGeometryNode>
 #include <QSGFlatColorMaterial>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeRectangleMapItem: public QDeclarativeGeoMapItemBase
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRectangleMapItem: public QDeclarativeGeoMapItemBase
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/location/declarativemaps/qdeclarativeroutemapitem.cpp
index 19930cc3..1fbeeeb7 100644
--- a/src/imports/location/qdeclarativeroutemapitem.cpp
+++ b/src/location/declarativemaps/qdeclarativeroutemapitem.cpp
@@ -43,6 +43,8 @@
 #include <QtQml/QQmlInfo>
 #include <QtGui/QPainter>
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \qmltype MapRoute
     \instantiates QDeclarativeRouteMapItem
@@ -143,3 +145,5 @@ void QDeclarativeRouteMapItem::setPath(const QJSValue &value)
     qWarning() << "Can not set the path on QDeclarativeRouteMapItem."
                << "Please use the route property instead.";
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/qdeclarativeroutemapitem_p.h b/src/location/declarativemaps/qdeclarativeroutemapitem_p.h
index 3acac3cc..ad959837 100644
--- a/src/imports/location/qdeclarativeroutemapitem_p.h
+++ b/src/location/declarativemaps/qdeclarativeroutemapitem_p.h
@@ -48,9 +48,10 @@
 // We mean it.
 //
 
-#include "qdeclarativegeomapitembase_p.h"
-#include "qdeclarativegeomap_p.h"
-#include "qdeclarativepolylinemapitem_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeomapitembase_p.h>
+#include <QtLocation/private/qdeclarativegeomap_p.h>
+#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
 #include <QPen>
 #include <QBrush>
 
@@ -58,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoRoute;
 
-class QDeclarativeRouteMapItem : public QDeclarativePolylineMapItem
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRouteMapItem : public QDeclarativePolylineMapItem
 {
     Q_OBJECT
 
diff --git a/src/imports/location/qgeomapitemgeometry.cpp b/src/location/declarativemaps/qgeomapitemgeometry.cpp
index 1b7e7d17..80f3e218 100644
--- a/src/imports/location/qgeomapitemgeometry.cpp
+++ b/src/location/declarativemaps/qgeomapitemgeometry.cpp
@@ -39,6 +39,7 @@
 #include "qlocationutils_p.h"
 #include <QtQuick/QSGGeometry>
 #include "qdoublevector2d_p.h"
+#include <QtLocation/private/qgeomap_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/imports/location/qgeomapitemgeometry_p.h b/src/location/declarativemaps/qgeomapitemgeometry_p.h
index 5ea658de..595107ae 100644
--- a/src/imports/location/qgeomapitemgeometry_p.h
+++ b/src/location/declarativemaps/qgeomapitemgeometry_p.h
@@ -48,6 +48,8 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
+
 #include <QPainterPath>
 #include <QPointF>
 #include <QRectF>
diff --git a/src/imports/location/qquickgeomapgesturearea.cpp b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
index 54c3019b..7b9a48f1 100644
--- a/src/imports/location/qquickgeomapgesturearea.cpp
+++ b/src/location/declarativemaps/qquickgeomapgesturearea.cpp
@@ -35,6 +35,7 @@
 ****************************************************************************/
 
 #include "qquickgeomapgesturearea_p.h"
+#include "qquickgeocoordinateanimation_p.h"
 #include "qdeclarativegeomap_p.h"
 #include "error_messages.h"
 
diff --git a/src/imports/location/qquickgeomapgesturearea_p.h b/src/location/declarativemaps/qquickgeomapgesturearea_p.h
index 41d7706a..5d3efc8d 100644
--- a/src/imports/location/qquickgeomapgesturearea_p.h
+++ b/src/location/declarativemaps/qquickgeomapgesturearea_p.h
@@ -48,23 +48,24 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
+
 #include <QtQuick/QQuickItem>
 #include <QTouchEvent>
 #include <QDebug>
 #include <QElapsedTimer>
-#include "qgeocoordinate.h"
-#include "qgeomap_p.h"
-#include "qquickgeocoordinateanimation_p.h"
+#include <QtPositioning/qgeocoordinate.h>
 
 QT_BEGIN_NAMESPACE
 
 class QGraphicsSceneMouseEvent;
+class QQuickGeoCoordinateAnimation;
 class QDeclarativeGeoMap;
 class QTouchEvent;
 class QWheelEvent;
 class QGeoMap;
 
-class QGeoMapPinchEvent : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QGeoMapPinchEvent : public QObject
 {
     Q_OBJECT
 
@@ -110,7 +111,7 @@ private:
     bool m_accepted;
 };
 
-class QQuickGeoMapGestureArea: public QQuickItem
+class Q_LOCATION_PRIVATE_EXPORT QQuickGeoMapGestureArea: public QQuickItem
 {
     Q_OBJECT
     Q_ENUMS(GeoMapGesture)
diff --git a/src/imports/location/declarativeplaces/declarativeplaces.pri b/src/location/declarativeplaces/declarativeplaces.pri
index b580ee4b..82f60c23 100644
--- a/src/imports/location/declarativeplaces/declarativeplaces.pri
+++ b/src/location/declarativeplaces/declarativeplaces.pri
@@ -1,4 +1,5 @@
-INCLUDEPATH *= $$PWD
+INCLUDEPATH += declarativeplaces
+
 SOURCES += \
 #models
     declarativeplaces/qdeclarativeplacecontentmodel.cpp \
@@ -19,15 +20,13 @@ SOURCES += \
     declarativeplaces/qdeclarativesupplier.cpp \
     declarativeplaces/qdeclarativesearchmodelbase.cpp
 
-HEADERS += \
+PRIVATE_HEADERS += \
 #models
-    declarativeplaces/qdeclarativeplacecontentmodel.h \
     declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h \
     declarativeplaces/qdeclarativesearchsuggestionmodel_p.h \
     declarativeplaces/qdeclarativesearchresultmodel_p.h \
     declarativeplaces/qdeclarativereviewmodel_p.h \
     declarativeplaces/qdeclarativeplaceimagemodel_p.h \
-    declarativeplaces/qdeclarativeplaceeditorialmodel.h \
 #data
     declarativeplaces/qdeclarativecontactdetail_p.h \
     declarativeplaces/qdeclarativecategory_p.h \
@@ -37,7 +36,9 @@ HEADERS += \
     declarativeplaces/qdeclarativeplaceuser_p.h \
     declarativeplaces/qdeclarativeratings_p.h \
     declarativeplaces/qdeclarativesupplier_p.h \
-    declarativeplaces/qdeclarativesearchmodelbase.h
+    declarativeplaces/qdeclarativesearchmodelbase_p.h \
+    declarativeplaces/qdeclarativeplacecontentmodel_p.h \
+    declarativeplaces/qdeclarativeplaceeditorialmodel_p.h
 
 
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp b/src/location/declarativeplaces/qdeclarativecategory.cpp
index ae496c1b..c58ec3a2 100644
--- a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp
+++ b/src/location/declarativeplaces/qdeclarativecategory.cpp
@@ -44,7 +44,7 @@
 #include <QtLocation/QPlaceManager>
 #include <QCoreApplication>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Category
@@ -454,3 +454,5 @@ QPlaceManager *QDeclarativeCategory::manager()
 
     return placeManager;
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h b/src/location/declarativeplaces/qdeclarativecategory_p.h
index 63b255b4..c32072f4 100644
--- a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h
+++ b/src/location/declarativeplaces/qdeclarativecategory_p.h
@@ -48,13 +48,14 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtQml/qqml.h>
 #include <QtQml/QQmlParserStatus>
 #include <QObject>
 
-#include <qplacecategory.h>
+#include <QtLocation/qplacecategory.h>
 
-#include "qdeclarativegeoserviceprovider_p.h"
+#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -62,7 +63,7 @@ class QDeclarativePlaceIcon;
 class QPlaceReply;
 class QPlaceManager;
 
-class QDeclarativeCategory : public QObject, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeCategory : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp b/src/location/declarativeplaces/qdeclarativecontactdetail.cpp
index c16c2018..7a7a4c33 100644
--- a/src/imports/location/declarativeplaces/qdeclarativecontactdetail.cpp
+++ b/src/location/declarativeplaces/qdeclarativecontactdetail.cpp
@@ -36,6 +36,8 @@
 
 #include "qdeclarativecontactdetail_p.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \qmltype ContactDetails
     \instantiates QDeclarativeContactDetails
@@ -217,3 +219,5 @@ void QDeclarativeContactDetail::setValue(const QString &value)
         emit valueChanged();
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h b/src/location/declarativeplaces/qdeclarativecontactdetail_p.h
index 9d404def..ad60c3b5 100644
--- a/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h
+++ b/src/location/declarativeplaces/qdeclarativecontactdetail_p.h
@@ -48,6 +48,7 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtCore/QObject>
 #include <QtLocation/QPlaceContactDetail>
 #include <QtQml/QQmlPropertyMap>
@@ -55,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeContactDetails : public QQmlPropertyMap
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeContactDetails : public QQmlPropertyMap
 {
     Q_OBJECT
 
@@ -64,7 +65,7 @@ public:
     virtual QVariant updateValue(const QString &key, const QVariant &input);
 };
 
-class QDeclarativeContactDetail : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeContactDetail : public QObject
 {
     Q_OBJECT
 
@@ -98,5 +99,6 @@ private:
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactDetail)
+QML_DECLARE_TYPE(QDeclarativeContactDetails)
 
 #endif
diff --git a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h b/src/location/declarativeplaces/qdeclarativeperiod_p.h
index 3ded0109..3ded0109 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h
+++ b/src/location/declarativeplaces/qdeclarativeperiod_p.h
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/location/declarativeplaces/qdeclarativeplace.cpp
index 834737ff..91ef2026 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
+++ b/src/location/declarativeplaces/qdeclarativeplace.cpp
@@ -52,7 +52,7 @@
 #include <QtLocation/QPlaceIdReply>
 #include <QtLocation/QPlaceContactDetail>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Place
@@ -1225,3 +1225,5 @@ QString QDeclarativePlace::primaryValue(const QString &contactType) const
 
     return QString();
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h b/src/location/declarativeplaces/qdeclarativeplace_p.h
index 78557091..5a1470fe 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplace_p.h
@@ -48,20 +48,21 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtCore/QObject>
 #include <QtQml/QQmlListProperty>
 #include <QtQml/QQmlParserStatus>
 #include <QtQml/QQmlPropertyMap>
 #include <QtLocation/QPlace>
 
-#include "qdeclarativegeolocation_p.h"
-#include "qdeclarativecategory_p.h"
-#include "qdeclarativecontactdetail_p.h"
-#include "qdeclarativesupplier_p.h"
-#include "qdeclarativeratings_p.h"
-#include "qdeclarativereviewmodel_p.h"
-#include "qdeclarativeplaceimagemodel_p.h"
-#include "qdeclarativeplaceeditorialmodel.h"
+#include <QtPositioning/private/qdeclarativegeolocation_p.h>
+#include <QtLocation/private/qdeclarativecategory_p.h>
+#include <QtLocation/private/qdeclarativecontactdetail_p.h>
+#include <QtLocation/private/qdeclarativesupplier_p.h>
+#include <QtLocation/private/qdeclarativeratings_p.h>
+#include <QtLocation/private/qdeclarativereviewmodel_p.h>
+#include <QtLocation/private/qdeclarativeplaceimagemodel_p.h>
+#include <QtLocation/private/qdeclarativeplaceeditorialmodel_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -70,7 +71,7 @@ class QPlaceReply;
 class QPlaceManager;
 class QDeclarativePlaceIcon;
 
-class QDeclarativePlace : public QObject, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlace : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp b/src/location/declarativeplaces/qdeclarativeplaceattribute.cpp
index 9a04d383..20adbafb 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp
+++ b/src/location/declarativeplaces/qdeclarativeplaceattribute.cpp
@@ -36,6 +36,8 @@
 
 #include "qdeclarativeplaceattribute_p.h"
 
+QT_BEGIN_NAMESPACE
+
 /*!
     \qmltype ExtendedAttributes
     \instantiates QQmlPropertyMap
@@ -215,3 +217,5 @@ QString QDeclarativePlaceAttribute::text() const
 {
     return m_attribute.text();
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h b/src/location/declarativeplaces/qdeclarativeplaceattribute_p.h
index f1c873c3..8079df9c 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceattribute_p.h
@@ -48,15 +48,16 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QObject>
 #include <QtQml/qqml.h>
 #include <QString>
 
-#include <qplaceattribute.h>
+#include <QtLocation/qplaceattribute.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativePlaceAttribute : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceAttribute : public QObject
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp b/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp
index b031e0c9..faf7e418 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp
+++ b/src/location/declarativeplaces/qdeclarativeplacecontentmodel.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeplacecontentmodel.h"
+#include "qdeclarativeplacecontentmodel_p.h"
 #include "qdeclarativeplace_p.h"
 #include "qdeclarativegeoserviceprovider_p.h"
 #include "qdeclarativeplaceuser_p.h"
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h
index d839b92d..a8ed2fdb 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplacecontentmodel.h
+++ b/src/location/declarativeplaces/qdeclarativeplacecontentmodel_p.h
@@ -37,6 +37,7 @@
 #ifndef QDECLARATIVEPLACECONTENTMODEL_H
 #define QDECLARATIVEPLACECONTENTMODEL_H
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtCore/QAbstractListModel>
 #include <QtQml/QQmlParserStatus>
 #include <QtLocation/QPlaceContent>
@@ -50,7 +51,7 @@ class QGeoServiceProvider;
 class QDeclarativeSupplier;
 class QDeclarativePlaceUser;
 
-class QDeclarativePlaceContentModel : public QAbstractListModel, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceContentModel : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp
index ebde46c0..dbc23737 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp
+++ b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeplaceeditorialmodel.h"
+#include "qdeclarativeplaceeditorialmodel_p.h"
 
 #include <QtCore/QUrl>
 #include <QtLocation/QPlaceEditorial>
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h
index eb2faf66..f574677a 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceeditorialmodel_p.h
@@ -37,11 +37,12 @@
 #ifndef QDECLARATIVEPLACEEDITORIALMODEL_H
 #define QDECLARATIVEPLACEEDITORIALMODEL_H
 
-#include "qdeclarativeplacecontentmodel.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativeplacecontentmodel_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativePlaceEditorialModel : public QDeclarativePlaceContentModel
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceEditorialModel : public QDeclarativePlaceContentModel
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp b/src/location/declarativeplaces/qdeclarativeplaceicon.cpp
index 1d3fb2c1..24891138 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon.cpp
+++ b/src/location/declarativeplaces/qdeclarativeplaceicon.cpp
@@ -42,7 +42,7 @@
 #include <QtQml/QQmlInfo>
 #include <QCoreApplication>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Icon
@@ -246,3 +246,5 @@ void QDeclarativePlaceIcon::initParameters(const QVariantMap &parameterMap)
         m_parameters->insert(key, value);
     }
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h b/src/location/declarativeplaces/qdeclarativeplaceicon_p.h
index 23acb36e..535d98eb 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceicon_p.h
@@ -48,9 +48,10 @@
 // We mean it.
 //
 
-#include "qdeclarativegeoserviceprovider_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
 
-#include <qplaceicon.h>
+#include <QtLocation/qplaceicon.h>
 #include <QtQml/qqml.h>
 #include <QtQml/QQmlPropertyMap>
 
@@ -60,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 class QQmlPropertyMap;
 
-class QDeclarativePlaceIcon : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceIcon : public QObject
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp b/src/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp
index 4da37081..4da37081 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp
+++ b/src/location/declarativeplaces/qdeclarativeplaceimagemodel.cpp
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h b/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h
index 8f8f3f4e..2c244219 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h
@@ -48,13 +48,14 @@
 // We mean it.
 //
 
-#include "qdeclarativeplacecontentmodel.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativeplacecontentmodel_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeSupplier;
 
-class QDeclarativePlaceImageModel : public QDeclarativePlaceContentModel
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceImageModel : public QDeclarativePlaceContentModel
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp b/src/location/declarativeplaces/qdeclarativeplaceuser.cpp
index d8bae3fe..86901a98 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceuser.cpp
+++ b/src/location/declarativeplaces/qdeclarativeplaceuser.cpp
@@ -36,7 +36,7 @@
 
 #include "qdeclarativeplaceuser_p.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype User
@@ -136,3 +136,4 @@ QString QDeclarativePlaceUser::name() const
     return m_user.name();
 }
 
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h b/src/location/declarativeplaces/qdeclarativeplaceuser_p.h
index 6c6ececf..8cd64493 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h
+++ b/src/location/declarativeplaces/qdeclarativeplaceuser_p.h
@@ -48,13 +48,14 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QtCore/QObject>
 #include <QtQml/qqml.h>
 #include <QtLocation/QPlaceUser>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativePlaceUser : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativePlaceUser : public QObject
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativeratings.cpp b/src/location/declarativeplaces/qdeclarativeratings.cpp
index ff044124..150e5966 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeratings.cpp
+++ b/src/location/declarativeplaces/qdeclarativeratings.cpp
@@ -36,7 +36,7 @@
 
 #include "qdeclarativeratings_p.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Ratings
@@ -150,3 +150,4 @@ int QDeclarativeRatings::count() const
     return m_ratings.count();
 }
 
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h b/src/location/declarativeplaces/qdeclarativeratings_p.h
index 7583e703..5ee530dc 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h
+++ b/src/location/declarativeplaces/qdeclarativeratings_p.h
@@ -48,14 +48,15 @@
 // We mean it.
 //
 
-#include <qplaceratings.h>
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/qplaceratings.h>
 #include <QtQml/qqml.h>
 
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeRatings : public QObject
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeRatings : public QObject
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp b/src/location/declarativeplaces/qdeclarativereviewmodel.cpp
index b7237bc9..b7237bc9 100644
--- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel.cpp
+++ b/src/location/declarativeplaces/qdeclarativereviewmodel.cpp
diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h b/src/location/declarativeplaces/qdeclarativereviewmodel_p.h
index 06bf7aa8..e6d2bd95 100644
--- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativereviewmodel_p.h
@@ -48,11 +48,12 @@
 // We mean it.
 //
 
-#include "qdeclarativeplacecontentmodel.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativeplacecontentmodel_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeReviewModel : public QDeclarativePlaceContentModel
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeReviewModel : public QDeclarativePlaceContentModel
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp b/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
index acfb54df..3a3faa56 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
+++ b/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativesearchmodelbase.h"
+#include "qdeclarativesearchmodelbase_p.h"
 #include "qdeclarativeplace_p.h"
 #include "error_messages.h"
 
@@ -46,6 +46,8 @@
 #include <QtLocation/QPlaceSearchReply>
 #include <QtPositioning/QGeoCircle>
 
+QT_BEGIN_NAMESPACE
+
 QDeclarativeSearchModelBase::QDeclarativeSearchModelBase(QObject *parent)
 :   QAbstractListModel(parent), m_plugin(0), m_reply(0), m_complete(false), m_status(Null)
 {
@@ -356,3 +358,5 @@ void QDeclarativeSearchModelBase::setNextPageRequest(const QPlaceSearchRequest &
     m_nextPageRequest = next;
     emit nextPagesAvailableChanged();
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h b/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h
index 45470458..cb8e4032 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.h
+++ b/src/location/declarativeplaces/qdeclarativesearchmodelbase_p.h
@@ -37,14 +37,14 @@
 #ifndef QDECLARATIVESEARCHMODELBASE_H
 #define QDECLARATIVESEARCHMODELBASE_H
 
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
 #include <QtCore/QAbstractListModel>
 #include <QtQml/QQmlParserStatus>
 #include <QtLocation/QPlaceSearchRequest>
 #include <QtLocation/QPlaceSearchResult>
 #include <QtLocation/QPlaceReply>
 
-#include "qdeclarativegeoserviceprovider_p.h"
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceManager;
@@ -52,7 +52,7 @@ class QPlaceSearchRequest;
 class QPlaceSearchReply;
 class QDeclarativePlace;
 
-class QDeclarativeSearchModelBase : public QAbstractListModel, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSearchModelBase : public QAbstractListModel, public QQmlParserStatus
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/location/declarativeplaces/qdeclarativesearchresultmodel.cpp
index 3c7c2610..31d152db 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp
+++ b/src/location/declarativeplaces/qdeclarativesearchresultmodel.cpp
@@ -48,7 +48,7 @@
 #include <QtLocation/QPlaceResult>
 #include <QtLocation/QPlaceProposedSearchResult>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype PlaceSearchModel
@@ -777,7 +777,7 @@ void QDeclarativeSearchResultModel::queryFinished()
                 }
 
                 QVariantMap params;
-                params.insert(QPlaceMatchRequest::AlternativeId, QString::fromLatin1("x_id_") + m_plugin->name());
+                params.insert(QPlaceMatchRequest::AlternativeId, QVariant(QString::fromLatin1("x_id_") + m_plugin->name()));
                 request.setParameters(params);
             } else {
                 request.setParameters(m_matchParameters);
@@ -914,3 +914,4 @@ int QDeclarativeSearchResultModel::getRow(const QString &placeId) const
    The corresponding handler is \c onDataChanged.
 */
 
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
index 73bf16d3..77526fd0 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesearchresultmodel_p.h
@@ -48,16 +48,17 @@
 // We mean it.
 //
 
-#include "qdeclarativesearchmodelbase.h"
-#include "qdeclarativecategory_p.h"
-#include "qdeclarativeplace_p.h"
-#include "qdeclarativeplaceicon_p.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativesearchmodelbase_p.h>
+#include <QtLocation/private/qdeclarativecategory_p.h>
+#include <QtLocation/private/qdeclarativeplace_p.h>
+#include <QtLocation/private/qdeclarativeplaceicon_p.h>
 
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeGeoServiceProvider;
 
-class QDeclarativeSearchResultModel : public QDeclarativeSearchModelBase
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSearchResultModel : public QDeclarativeSearchModelBase
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
index abc845f2..95cd3277 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
+++ b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp
@@ -43,7 +43,7 @@
 #include <qplacemanager.h>
 #include <qplacesearchrequest.h>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype PlaceSearchSuggestionModel
@@ -349,3 +349,5 @@ QPlaceReply *QDeclarativeSearchSuggestionModel::sendQuery(QPlaceManager *manager
 {
     return manager->searchSuggestions(request);
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
index 49e09980..5d75ee4b 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h
@@ -48,7 +48,8 @@
 // We mean it.
 //
 
-#include "qdeclarativesearchmodelbase.h"
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativesearchmodelbase_p.h>
 
 #include <QtCore/QStringList>
 
@@ -57,7 +58,7 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeGeoServiceProvider;
 class QGeoServiceProvider;
 
-class QDeclarativeSearchSuggestionModel : public QDeclarativeSearchModelBase
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSearchSuggestionModel : public QDeclarativeSearchModelBase
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp b/src/location/declarativeplaces/qdeclarativesupplier.cpp
index 8fca9e8c..92e9a8fd 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupplier.cpp
+++ b/src/location/declarativeplaces/qdeclarativesupplier.cpp
@@ -38,7 +38,7 @@
 
 #include <QtCore/QUrl>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Supplier
@@ -217,3 +217,5 @@ void QDeclarativeSupplier::setIcon(QDeclarativePlaceIcon *icon)
     m_icon = icon;
     emit iconChanged();
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h b/src/location/declarativeplaces/qdeclarativesupplier_p.h
index 35b1dbda..b344d674 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h
+++ b/src/location/declarativeplaces/qdeclarativesupplier_p.h
@@ -48,17 +48,18 @@
 // We mean it.
 //
 
+#include <QtLocation/private/qlocationglobal_p.h>
 #include <QObject>
 #include <QtCore/QUrl>
 #include <QtQml/qqml.h>
 #include <QtQml/QQmlParserStatus>
-#include <qplacesupplier.h>
+#include <QtLocation/qplacesupplier.h>
 
-#include "qdeclarativeplaceicon_p.h"
+#include <QtLocation/private/qdeclarativeplaceicon_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeSupplier : public QObject, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSupplier : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
index 2865957b..d832ff40 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
+++ b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel.cpp
@@ -45,7 +45,7 @@
 #include <QtLocation/QPlaceManager>
 #include <QtLocation/QPlaceIcon>
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype CategoryModel
@@ -685,3 +685,5 @@ int QDeclarativeSupportedCategoriesModel::rowToAddChild(PlaceCategoryNode *node,
 
    The corresponding handler is \c onDataChanged.
 */
+
+QT_END_NAMESPACE
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
index 98167892..9f17ab4d 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
+++ b/src/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
@@ -48,7 +48,8 @@
 // We mean it.
 //
 
-#include <qdeclarativegeoserviceprovider_p.h>
+#include <QtLocation/private/qlocationglobal_p.h>
+#include <QtLocation/private/qdeclarativegeoserviceprovider_p.h>
 
 #include <QObject>
 #include <QtCore/QStringList>
@@ -59,7 +60,7 @@
 
 #include <QtLocation/QPlaceCategory>
 
-#include "qdeclarativecategory_p.h"
+#include <QtLocation/private/qdeclarativecategory_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -75,7 +76,7 @@ public:
     QSharedPointer<QDeclarativeCategory> declCategory;
 };
 
-class QDeclarativeSupportedCategoriesModel : public QAbstractItemModel, public QQmlParserStatus
+class Q_LOCATION_PRIVATE_EXPORT QDeclarativeSupportedCategoriesModel : public QAbstractItemModel, public QQmlParserStatus
 {
     Q_OBJECT
 
diff --git a/src/location/location.pro b/src/location/location.pro
index 3669188c..b43d626a 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -1,15 +1,19 @@
 TARGET = QtLocation
 QT = core-private positioning-private
-
-#INCLUDEPATH += ../3rdparty/poly2tri
-INCLUDEPATH += ../3rdparty/clipper
-INCLUDEPATH += ../3rdparty/clip2tri
-
 android {
     # adding qtconcurrent dependency here for the osm plugin
     QT += concurrent
 }
 
+CONFIG += simd optimize_full
+
+INCLUDEPATH += ../3rdparty/poly2tri
+INCLUDEPATH += ../3rdparty/clipper
+INCLUDEPATH += ../3rdparty/clip2tri
+INCLUDEPATH += ../positioning
+INCLUDEPATH += ../imports/positioning
+INCLUDEPATH *= $$PWD
+
 MODULE_PLUGIN_TYPES = \
     geoservices
 
@@ -18,6 +22,7 @@ OTHER_FILES += doc/src/*.qdoc   # show .qdoc files in Qt Creator
 
 PUBLIC_HEADERS += \
                     qlocation.h \
+                    qlocationglobal_p.h \
                     qlocationglobal.h
 
 PRIVATE_HEADERS += \
@@ -28,6 +33,8 @@ SOURCES += \
 
 include(maps/maps.pri)
 include(places/places.pri)
+include(declarativemaps/declarativemaps.pri)
+include(declarativeplaces/declarativeplaces.pri)
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS