14 files changed, 39 insertions, 19 deletions
diff --git a/src/imports/location/mapnode_p.h b/src/imports/location/mapnode_p.h
index 9a90f869..6c08b181 100644
--- a/src/imports/location/mapnode_p.h
+++ b/src/imports/location/mapnode_p.h
@@ -58,6 +58,8 @@
 #include "qglframebufferobjectsurface.h"
 #include <private/qsgtexture_p.h>
 
+QT_BEGIN_NAMESPACE
+
 class Map;
 class QOpenGLFramebufferObject;
 class QGLPainter;
@@ -95,4 +97,6 @@ private:
     bool m_dirtyFBO;
 };
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/imports/location/qdeclarativegeomappincharea_p.h b/src/imports/location/qdeclarativegeomappincharea_p.h
index 1253b3e3..05685c09 100644
--- a/src/imports/location/qdeclarativegeomappincharea_p.h
+++ b/src/imports/location/qdeclarativegeomappincharea_p.h
@@ -47,14 +47,13 @@
 #include <QObject>
 #include <QDebug>
 
+QT_BEGIN_NAMESPACE
+
 class QGraphicsSceneMouseEvent;
 class QDeclarativeGeoMap;
 class QTouchEvent;
 class Map;
 
-QT_BEGIN_NAMESPACE
-
-
 class QDeclarativeGeoMapPinchEvent : public QObject
 {
     Q_OBJECT
diff --git a/src/location/mapsgl/cameradata.cpp b/src/location/mapsgl/cameradata.cpp
index 1fbcee21..619c8250 100644
--- a/src/location/mapsgl/cameradata.cpp
+++ b/src/location/mapsgl/cameradata.cpp
@@ -51,6 +51,7 @@
 
 #include <cmath>
 
+QT_BEGIN_NAMESPACE
 
 class CameraDataPrivate : public QSharedData
 {
@@ -288,3 +289,5 @@ QSharedPointer<Projection> CameraData::projection() const
 {
     return d->projection_.toStrongRef();
 }
+
+QT_END_NAMESPACE
diff --git a/src/location/mapsgl/cameradata.h b/src/location/mapsgl/cameradata.h
index fbe7c62a..a735a24f 100644
--- a/src/location/mapsgl/cameradata.h
+++ b/src/location/mapsgl/cameradata.h
@@ -98,10 +98,10 @@ private:
     QSharedDataPointer<CameraDataPrivate> d;
 };
 
-Q_DECLARE_METATYPE(CameraData)
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(CameraData)
+
 QT_END_HEADER
 
 #endif // CAMERADATA_H
diff --git a/src/location/mapsgl/frustum_p.h b/src/location/mapsgl/frustum_p.h
index 504ead1f..e558b99f 100644
--- a/src/location/mapsgl/frustum_p.h
+++ b/src/location/mapsgl/frustum_p.h
@@ -57,6 +57,8 @@
 
 #include <Qt3D/qplane3d.h>
 
+QT_BEGIN_NAMESPACE
+
 class QGLCamera;
 
 class Q_AUTOTEST_EXPORT Frustum
@@ -136,4 +138,6 @@ private:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(Frustum::Planes)
 
+QT_END_NAMESPACE
+
 #endif // TILEFRUSTUM_H
diff --git a/src/location/mapsgl/map_p.h b/src/location/mapsgl/map_p.h
index cf9c20e1..b7258fd7 100644
--- a/src/location/mapsgl/map_p.h
+++ b/src/location/mapsgl/map_p.h
@@ -68,6 +68,8 @@
 
 #include <QSharedPointer>
 
+QT_BEGIN_NAMESPACE
+
 class QGeoMappingManager;
 
 class Tile;
@@ -245,4 +247,6 @@ private:
     QMatrix4x4 projectionMatrix_;
 };
 
+QT_END_NAMESPACE
+
 #endif // MAP_P_H
diff --git a/src/location/mapsgl/mapcontroller.h b/src/location/mapsgl/mapcontroller.h
index 70e72d67..6873488e 100644
--- a/src/location/mapsgl/mapcontroller.h
+++ b/src/location/mapsgl/mapcontroller.h
@@ -47,6 +47,8 @@
 #include "qgeocoordinate.h"
 #include "cameradata.h"
 
+QT_BEGIN_NAMESPACE
+
 class Map;
 
 class Q_LOCATION_EXPORT AnimatableCoordinate {
@@ -66,8 +68,6 @@ private:
     QSharedPointer<Projection> projection_;
 };
 
-Q_DECLARE_METATYPE(AnimatableCoordinate)
-
 class Q_LOCATION_EXPORT MapController : public QObject
 {
     Q_OBJECT
@@ -115,4 +115,8 @@ private:
     CameraData oldCameraData_;
 };
 
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(AnimatableCoordinate)
+
 #endif // MAPCONTROLLER_H
diff --git a/src/location/mapsgl/tilecache.cpp b/src/location/mapsgl/tilecache.cpp
index 4ff71bb1..20e98045 100644
--- a/src/location/mapsgl/tilecache.cpp
+++ b/src/location/mapsgl/tilecache.cpp
@@ -56,6 +56,8 @@
 
 Q_DECLARE_METATYPE(QList<TileSpec>)
 
+QT_BEGIN_NAMESPACE
+
 class TileDisk
 {
 public:
@@ -458,3 +460,5 @@ TileSpec TileCache::filenameToTileSpec(const QString &filename)
 
     return spec;
 }
+
+QT_END_NAMESPACE
diff --git a/src/location/mapsgl/tilespec.h b/src/location/mapsgl/tilespec.h
index 6ad6eeb7..5d29a3eb 100644
--- a/src/location/mapsgl/tilespec.h
+++ b/src/location/mapsgl/tilespec.h
@@ -82,10 +82,10 @@ unsigned int qHash(const TileSpec &spec);
 
 QDebug operator<<(QDebug, const TileSpec &);
 
-Q_DECLARE_METATYPE(TileSpec)
-
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(TileSpec)
+
 QT_END_HEADER
 
 #endif // TILESPEC_H
diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp
index ad78ab3d..886b1dea 100644
--- a/src/location/places/qplacemanagerengine.cpp
+++ b/src/location/places/qplacemanagerengine.cpp
@@ -42,7 +42,7 @@
 #include "qplacemanagerengine.h"
 #include "qplacemanagerengine_p.h"
 
-QT_USE_NAMESPACE
+QT_BEGIN_NAMESPACE
 
 /*!
     \class QPlaceManagerEngine
@@ -357,7 +357,6 @@ QPlaceManagerEnginePrivate::~QPlaceManagerEnginePrivate()
     This signal is only emitted by manager engines that support the QPlaceManager::NotificationsFeature.
 */
 
-#include "moc_qplacemanagerengine.cpp"
-
 QT_END_NAMESPACE
 
+#include "moc_qplacemanagerengine.cpp"
diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource_p.h b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource_p.h
index fdc25157..48dbb160 100644
--- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource_p.h
+++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource_p.h
@@ -52,9 +52,9 @@
 #include <QTest>
 #include <QObject>
 
-QT_USE_NAMESPACE
-
+QT_BEGIN_NAMESPACE
 class QGeoPositionInfoSource;
+QT_END_NAMESPACE
 
 class TestQGeoPositionInfoSource : public QObject
 {
diff --git a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource_p.h b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource_p.h
index c9cabbd7..92fd4adc 100644
--- a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource_p.h
+++ b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource_p.h
@@ -45,9 +45,9 @@
 #include <QTest>
 #include <QObject>
 
-QT_USE_NAMESPACE
-
+QT_BEGIN_NAMESPACE
 class QGeoSatelliteInfoSource;
+QT_END_NAMESPACE
 
 
 class TestQGeoSatelliteInfoSource : public QObject
diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
index 8bcd9eb8..f9c53a34 100644
--- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
+++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
@@ -49,7 +49,6 @@
 #include <QSignalSpy>
 #include <QTest>
 
-QT_USE_NAMESPACE
 Q_DECLARE_METATYPE(QNmeaPositionInfoSource::UpdateMode)
 Q_DECLARE_METATYPE(QGeoPositionInfo)
 
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
index 2105f35c..056e5023 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
@@ -46,11 +46,11 @@
 
 #include <qnmeapositioninfosource.h>
 
-QT_USE_NAMESPACE
-
+QT_BEGIN_NAMESPACE
 class QTcpServer;
 class QIODevice;
 class QNmeaPositionInfoSource;
+QT_END_NAMESPACE
 
 class QNmeaPositionInfoSourceProxy : public QObject
 {