Remove use of QT_{BEGIN,END}_HEADER macros.

These macros were removed from Qt Core and they are no longer defined
causing Qt Location to fail to build.

Change-Id: Ibed30daa1a802957cebe95a577dfe86f0f643970
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>

73 files changed, 1 insertions, 342 deletions

diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h
index 6a6ff171..b61d306f 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplaceeditorialmodel.h
@@ -44,12 +44,8 @@
 
 #include "qdeclarativeplacecontentmodel.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QDeclarativePlaceEditorialModel : public QDeclarativePlaceContentModel
 {
     Q_OBJECT
@@ -70,6 +66,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QDECLARATIVEPLACEEDITORIALMODEL_H
diff --git a/src/location/maps/qcache3q_p.h b/src/location/maps/qcache3q_p.h
index d41223ee..5a2d1899 100644
--- a/src/location/maps/qcache3q_p.h
+++ b/src/location/maps/qcache3q_p.h
@@ -58,8 +58,6 @@
 #include <QtCore/qsharedpointer.h>
 #include <QDebug>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template <class Key, class T>
@@ -475,6 +473,4 @@ inline QSharedPointer<T> QCache3Q<Key,T,EvPolicy>::operator[](const Key &key) co
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QCACHE3Q_H
diff --git a/src/location/maps/qdoublevector2d_p.h b/src/location/maps/qdoublevector2d_p.h
index b5bbe521..f66a95a2 100644
--- a/src/location/maps/qdoublevector2d_p.h
+++ b/src/location/maps/qdoublevector2d_p.h
@@ -57,8 +57,6 @@
 
 #include <QtCore/qmetatype.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDoubleVector3D;
@@ -235,6 +233,4 @@ QDataStream &operator>>(QDataStream &, QDoubleVector2D &);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qdoublevector3d_p.h b/src/location/maps/qdoublevector3d_p.h
index c33c57ec..e237287d 100644
--- a/src/location/maps/qdoublevector3d_p.h
+++ b/src/location/maps/qdoublevector3d_p.h
@@ -57,8 +57,6 @@
 
 #include <QtCore/qmetatype.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDoubleVector2D;
@@ -289,6 +287,4 @@ QDataStream &operator>>(QDataStream &, QDoubleVector3D &);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h
index fb33a144..9d492a0e 100644
--- a/src/location/maps/qgeocodereply.h
+++ b/src/location/maps/qgeocodereply.h
@@ -46,8 +46,6 @@
 #include <QtCore/QList>
 #include <QtLocation/QGeoLocation>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoShape;
@@ -107,6 +105,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h
index dfd80b96..94b2d50a 100644
--- a/src/location/maps/qgeocodingmanager.h
+++ b/src/location/maps/qgeocodingmanager.h
@@ -49,12 +49,8 @@
 #include <QList>
 #include <QMap>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QLocale;
 
 class QGeocodingManagerEngine;
@@ -98,6 +94,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index d4ce005a..5b727b48 100644
--- a/src/location/maps/qgeocodingmanagerengine.h
+++ b/src/location/maps/qgeocodingmanagerengine.h
@@ -46,8 +46,6 @@
 #include <QtLocation/qlocationglobal.h>
 #include <QtLocation/QGeocodeReply>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoAddress;
@@ -93,6 +91,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index 88efe7ac..75cabe94 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -45,12 +45,8 @@
 #include <qshareddata.h>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QString;
 
 class QGeoCoordinate;
@@ -110,6 +106,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeomappingmanager_p.h b/src/location/maps/qgeomappingmanager_p.h
index 9a68ad56..fd1a8ae6 100644
--- a/src/location/maps/qgeomappingmanager_p.h
+++ b/src/location/maps/qgeomappingmanager_p.h
@@ -59,8 +59,6 @@
 #include <QtLocation/qlocationglobal.h>
 #include "qgeomaptype_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoMap;
@@ -110,6 +108,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeomappingmanagerengine_p.h b/src/location/maps/qgeomappingmanagerengine_p.h
index 458f26b3..903ac14b 100644
--- a/src/location/maps/qgeomappingmanagerengine_p.h
+++ b/src/location/maps/qgeomappingmanagerengine_p.h
@@ -65,12 +65,8 @@
 #include "qgeomaptype_p.h"
 #include "qgeomappingmanager_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QLocale;
 
 class QGeoRectangle;
@@ -129,6 +125,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeomaptype_p.h b/src/location/maps/qgeomaptype_p.h
index f39b4d02..99e5baf0 100644
--- a/src/location/maps/qgeomaptype_p.h
+++ b/src/location/maps/qgeomaptype_p.h
@@ -57,8 +57,6 @@
 #include <QString>
 #include <QSharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoMapTypePrivate;
@@ -101,6 +99,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QGEOMAPTYPE_H
diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h
index 21e0d987..0eb163f9 100644
--- a/src/location/maps/qgeoroute.h
+++ b/src/location/maps/qgeoroute.h
@@ -49,12 +49,8 @@
 #include <QList>
 #include <QHash>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoRectangle;
 class QGeoRouteSegment;
 
@@ -102,6 +98,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoroutereply.h b/src/location/maps/qgeoroutereply.h
index d3a40290..dc22b0a2 100644
--- a/src/location/maps/qgeoroutereply.h
+++ b/src/location/maps/qgeoroutereply.h
@@ -47,12 +47,8 @@
 #include <QList>
 #include <QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoRouteRequest;
 class QGeoRouteReplyPrivate;
 
@@ -100,6 +96,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h
index 0e10463b..16793130 100644
--- a/src/location/maps/qgeorouterequest.h
+++ b/src/location/maps/qgeorouterequest.h
@@ -48,12 +48,8 @@
 
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoCoordinate;
 class QGeoRectangle;
 class QGeoRouteRequestPrivate;
@@ -167,6 +163,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoRouteRequest::ManeuverDetails)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h
index 7e167ed1..a2af9dbe 100644
--- a/src/location/maps/qgeoroutesegment.h
+++ b/src/location/maps/qgeoroutesegment.h
@@ -46,12 +46,8 @@
 #include <QList>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoCoordinate;
 class QGeoManeuver;
 class QGeoRouteSegmentPrivate;
@@ -95,6 +91,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index a8c04da2..d9ff6816 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -48,12 +48,8 @@
 #include <QObject>
 #include <QMap>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QLocale;
 
 class QGeoRoutingManagerEngine;
@@ -97,6 +93,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 29b15568..fa05b984 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -48,12 +48,8 @@
 #include <QObject>
 #include <QMap>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QLocale;
 
 class QGeoRoutingManagerEnginePrivate;
@@ -106,6 +102,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index 8d7bcf53..155aa196 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -47,8 +47,6 @@
 #include <QtCore/QObject>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QLocale;
@@ -167,6 +165,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoServiceProvider::PlacesFeatures)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h
index 7f4b9ca5..924e5f28 100644
--- a/src/location/maps/qgeoserviceproviderfactory.h
+++ b/src/location/maps/qgeoserviceproviderfactory.h
@@ -48,8 +48,6 @@
 #include <QMap>
 #include <QString>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoServiceProviderFactory
@@ -76,6 +74,4 @@ Q_DECLARE_INTERFACE(QGeoServiceProviderFactory,
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index 244ca3b7..22e8b867 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -56,8 +56,6 @@
 #include "qgeomaptype_p.h"
 #include "qgeomappingmanagerengine_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoTiledMappingManagerEnginePrivate;
@@ -130,6 +128,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoTiledMappingManagerEngine::CacheAreas)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeotiledmapreply_p.h b/src/location/maps/qgeotiledmapreply_p.h
index 55e0e6d6..1bf8727d 100644
--- a/src/location/maps/qgeotiledmapreply_p.h
+++ b/src/location/maps/qgeotiledmapreply_p.h
@@ -57,12 +57,8 @@
 
 #include <QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoTileSpec;
 class QGeoTiledMapReplyPrivate;
 
@@ -115,6 +111,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h
index 4177f2fa..45e38e05 100644
--- a/src/location/maps/qgeotilefetcher_p.h
+++ b/src/location/maps/qgeotilefetcher_p.h
@@ -58,8 +58,6 @@
 #include "qgeomaptype_p.h"
 #include "qgeotiledmappingmanagerengine_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoMapRequestOptions;
@@ -110,6 +108,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/maps/qgeotilespec_p.h b/src/location/maps/qgeotilespec_p.h
index 212443c5..ae2db7b6 100644
--- a/src/location/maps/qgeotilespec_p.h
+++ b/src/location/maps/qgeotilespec_p.h
@@ -59,8 +59,6 @@
 
 #include <QSharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoTileSpecPrivate;
@@ -104,6 +102,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGeoTileSpec)
 
-QT_END_HEADER
-
 #endif // QGEOTILESPEC_H
diff --git a/src/location/places/placemacro.h b/src/location/places/placemacro.h
index a90931f3..530f6200 100644
--- a/src/location/places/placemacro.h
+++ b/src/location/places/placemacro.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/QtGlobal>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #define Q_DECLARE_D_FUNC(Class) \
@@ -75,6 +73,4 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplace.h b/src/location/places/qplace.h
index 8f2652f2..54e73a9e 100644
--- a/src/location/places/qplace.h
+++ b/src/location/places/qplace.h
@@ -54,12 +54,8 @@
 #include <QtLocation/QPlaceAttribute>
 #include <QtLocation/QPlaceContactDetail>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QString;
 class QPlaceIcon;
 class QPlacePrivate;
@@ -141,6 +137,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlace)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplaceattribute.h b/src/location/places/qplaceattribute.h
index 51184b2e..6ac81642 100644
--- a/src/location/places/qplaceattribute.h
+++ b/src/location/places/qplaceattribute.h
@@ -48,12 +48,8 @@
 
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceAttributePrivate;
 class Q_LOCATION_EXPORT QPlaceAttribute
 {
@@ -85,8 +81,6 @@ protected:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 Q_DECLARE_METATYPE(QPlaceAttribute)
 
 #endif
diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h
index 423f8109..62c2d9c0 100644
--- a/src/location/places/qplacecategory.h
+++ b/src/location/places/qplacecategory.h
@@ -49,12 +49,8 @@
 #include <QtCore/QMetaType>
 #include <QtLocation/qtlocation.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceIcon;
 
 class QPlaceCategoryPrivate;
@@ -97,6 +93,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceCategory)
 
-QT_END_HEADER
-
 #endif // QPLACECATEGORY_H
diff --git a/src/location/places/qplacecontactdetail.h b/src/location/places/qplacecontactdetail.h
index b36e7034..a5f946e0 100644
--- a/src/location/places/qplacecontactdetail.h
+++ b/src/location/places/qplacecontactdetail.h
@@ -48,8 +48,6 @@
 
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceContactDetailPrivate;
@@ -85,8 +83,6 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 Q_DECLARE_METATYPE(QPlaceContactDetail)
 
 #endif
diff --git a/src/location/places/qplacecontent.h b/src/location/places/qplacecontent.h
index 2d8348e6..6768ed38 100644
--- a/src/location/places/qplacecontent.h
+++ b/src/location/places/qplacecontent.h
@@ -47,12 +47,8 @@
 #include <QMetaType>
 #include <QSharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 #define Q_DECLARE_CONTENT_D_FUNC(Class) \
     inline Class##Private *d_func(); \
     inline const Class##Private *d_func() const;\
@@ -112,7 +108,5 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QPlaceContent)
 Q_DECLARE_METATYPE(QPlaceContent::Type)
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/location/places/qplacecontentreply.h b/src/location/places/qplacecontentreply.h
index 37cf7432..8d781a46 100644
--- a/src/location/places/qplacecontentreply.h
+++ b/src/location/places/qplacecontentreply.h
@@ -46,8 +46,6 @@
 #include <QtLocation/QPlaceContent>
 #include <QtLocation/QPlaceContentRequest>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceContentReplyPrivate;
@@ -79,6 +77,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacecontentrequest.h b/src/location/places/qplacecontentrequest.h
index 01aad475..b535a133 100644
--- a/src/location/places/qplacecontentrequest.h
+++ b/src/location/places/qplacecontentrequest.h
@@ -46,12 +46,8 @@
 
 #include <QtLocation/QPlaceContent>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceContentRequestPrivate;
 
 class Q_LOCATION_EXPORT QPlaceContentRequest
@@ -84,6 +80,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index 0f3e7a3e..21d32b4b 100644
--- a/src/location/places/qplacedetailsreply.h
+++ b/src/location/places/qplacedetailsreply.h
@@ -45,8 +45,6 @@
 #include <QtLocation/QPlaceReply>
 #include <QtLocation/QPlace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceDetailsReplyPrivate;
@@ -71,6 +69,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QPLACEDETAILSREPLY_H
diff --git a/src/location/places/qplaceeditorial.h b/src/location/places/qplaceeditorial.h
index 5101683a..4fc485af 100644
--- a/src/location/places/qplaceeditorial.h
+++ b/src/location/places/qplaceeditorial.h
@@ -44,12 +44,8 @@
 
 #include <QtLocation/QPlaceContent>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceEditorialPrivate;
 
 class Q_LOCATION_EXPORT QPlaceEditorial : public QPlaceContent
@@ -77,6 +73,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QPLACEEDITORIAL_H
diff --git a/src/location/places/qplaceicon.h b/src/location/places/qplaceicon.h
index 2f7a7e7f..4043cc15 100644
--- a/src/location/places/qplaceicon.h
+++ b/src/location/places/qplaceicon.h
@@ -50,8 +50,6 @@
 #include <QtCore/QSize>
 #include <QtCore/QSharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceManager;
@@ -91,6 +89,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceIcon)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h
index 1b0276f6..dd8fb5d9 100644
--- a/src/location/places/qplaceidreply.h
+++ b/src/location/places/qplaceidreply.h
@@ -45,12 +45,8 @@
 #include <QtLocation/QPlaceReply>
 #include <QtLocation/QPlace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceIdReplyPrivate;
 class Q_LOCATION_EXPORT QPlaceIdReply : public QPlaceReply
 {
@@ -81,6 +77,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplaceimage.h b/src/location/places/qplaceimage.h
index cb219ee5..8fff99f4 100644
--- a/src/location/places/qplaceimage.h
+++ b/src/location/places/qplaceimage.h
@@ -47,12 +47,8 @@
 #include <QtLocation/QPlaceSupplier>
 #include <QtLocation/QPlaceContent>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceImagePrivate;
 class QUrl;
 
@@ -83,6 +79,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index c47bc854..786fdc1d 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -59,8 +59,6 @@
 #include <QObject>
 #include <QtLocation/QPlaceIcon>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceManagerEngine;
@@ -131,6 +129,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QPLACEMANAGER_H
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index 3cb968fc..ee019637 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -44,8 +44,6 @@
 
 #include <QtLocation/QPlaceManager>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceManagerEnginePrivate;
@@ -126,6 +124,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacematchreply.h b/src/location/places/qplacematchreply.h
index af3e5273..0b3f6d85 100644
--- a/src/location/places/qplacematchreply.h
+++ b/src/location/places/qplacematchreply.h
@@ -45,8 +45,6 @@
 #include <QtLocation/QPlaceReply>
 #include <QtLocation/QPlaceMatchRequest>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceMatchReplyPrivate;
@@ -72,6 +70,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacematchrequest.h b/src/location/places/qplacematchrequest.h
index 202d2b7f..ae71ac8a 100644
--- a/src/location/places/qplacematchrequest.h
+++ b/src/location/places/qplacematchrequest.h
@@ -45,8 +45,6 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/QPlaceSearchResult>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceMatchRequestPrivate;
@@ -85,6 +83,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplaceratings.h b/src/location/places/qplaceratings.h
index c03ec736..da2e24c4 100644
--- a/src/location/places/qplaceratings.h
+++ b/src/location/places/qplaceratings.h
@@ -46,8 +46,6 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceRatingsPrivate;
@@ -86,6 +84,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceRatings)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacereply.h b/src/location/places/qplacereply.h
index 47dc1077..c479e715 100644
--- a/src/location/places/qplacereply.h
+++ b/src/location/places/qplacereply.h
@@ -46,8 +46,6 @@
 #include <QtCore/QObject>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceReplyPrivate;
@@ -110,6 +108,4 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QPlaceReply::Error)
 Q_DECLARE_METATYPE(QPlaceReply *)
 
-QT_END_HEADER
-
 #endif // QPLACEREPLY_H
diff --git a/src/location/places/qplaceresult.h b/src/location/places/qplaceresult.h
index 8b407be5..703c2ed7 100644
--- a/src/location/places/qplaceresult.h
+++ b/src/location/places/qplaceresult.h
@@ -45,8 +45,6 @@
 #include <QtLocation/QPlace>
 #include <QtLocation/QPlaceSearchResult>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceResultPrivate;
@@ -81,6 +79,4 @@ Q_DECLARE_TYPEINFO(QPlaceResult, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacereview.h b/src/location/places/qplacereview.h
index d77fb9a8..a69b72bb 100644
--- a/src/location/places/qplacereview.h
+++ b/src/location/places/qplacereview.h
@@ -44,12 +44,8 @@
 
 #include <QtLocation/QPlaceContent>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QDateTime;
 class QPlaceReviewPrivate;
 
@@ -84,6 +80,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QPLACEREVIEW_H
diff --git a/src/location/places/qplacesearchreply.h b/src/location/places/qplacesearchreply.h
index 7c434af3..4266b988 100644
--- a/src/location/places/qplacesearchreply.h
+++ b/src/location/places/qplacesearchreply.h
@@ -46,12 +46,8 @@
 #include <QtLocation/QPlaceSearchResult>
 #include <QtLocation/QPlaceSearchRequest>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QPlaceSearchReplyPrivate;
 class Q_LOCATION_EXPORT QPlaceSearchReply : public QPlaceReply
 {
@@ -75,6 +71,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h
index f914311c..dea85112 100644
--- a/src/location/places/qplacesearchrequest.h
+++ b/src/location/places/qplacesearchrequest.h
@@ -47,12 +47,8 @@
 #include <QtLocation/QPlaceCategory>
 #include <QtLocation/qtlocation.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoShape;
 class QPlaceSearchRequestPrivate;
 
@@ -112,6 +108,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceSearchRequest::RelevanceHint)
 
-QT_END_HEADER
-
 #endif // QPLACESEARCHQUERY_H
diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h
index 399a5ac8..f8f0a5fc 100644
--- a/src/location/places/qplacesearchresult.h
+++ b/src/location/places/qplacesearchresult.h
@@ -47,8 +47,6 @@
 #include <QString>
 #include <QtLocation/QPlace>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #define Q_DECLARE_SEARCHRESULT_D_FUNC(Class) \
@@ -107,6 +105,4 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QPlaceSearchResult)
 Q_DECLARE_METATYPE(QPlaceSearchResult::SearchResultType)
 
-QT_END_HEADER
-
 #endif // QPLACESEARCHRESULT_H
diff --git a/src/location/places/qplacesearchsuggestionreply.h b/src/location/places/qplacesearchsuggestionreply.h
index b1d68b2c..172d5efa 100644
--- a/src/location/places/qplacesearchsuggestionreply.h
+++ b/src/location/places/qplacesearchsuggestionreply.h
@@ -46,8 +46,6 @@
 
 #include <QStringList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceSearchSuggestionReplyPrivate;
@@ -72,6 +70,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/places/qplacesupplier.h b/src/location/places/qplacesupplier.h
index da84bf2f..cd887b0a 100644
--- a/src/location/places/qplacesupplier.h
+++ b/src/location/places/qplacesupplier.h
@@ -46,8 +46,6 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/QPlaceIcon>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QUrl;
@@ -89,6 +87,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceSupplier)
 
-QT_END_HEADER
-
 #endif // QPLACESUPPLIER_H
diff --git a/src/location/places/qplaceuser.h b/src/location/places/qplaceuser.h
index 52b463bb..d5f6b042 100644
--- a/src/location/places/qplaceuser.h
+++ b/src/location/places/qplaceuser.h
@@ -46,8 +46,6 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QPlaceUserPrivate;
@@ -80,6 +78,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QPlaceUser)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h
index faccafd7..c82f824b 100644
--- a/src/location/qgeoaddress.h
+++ b/src/location/qgeoaddress.h
@@ -46,12 +46,8 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QString;
 class QGeoAddressPrivate;
 class Q_LOCATION_EXPORT QGeoAddress
@@ -109,6 +105,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGeoAddress)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qgeoareamonitor.h b/src/location/qgeoareamonitor.h
index 872ae0f4..361ec633 100644
--- a/src/location/qgeoareamonitor.h
+++ b/src/location/qgeoareamonitor.h
@@ -45,12 +45,8 @@
 
 #include <QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoPositionInfo;
 class QGeoAreaMonitorPrivate;
 class Q_LOCATION_EXPORT QGeoAreaMonitor : public QObject
@@ -83,6 +79,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qgeocircle.h b/src/location/qgeocircle.h
index a8f88851..158a48a6 100644
--- a/src/location/qgeocircle.h
+++ b/src/location/qgeocircle.h
@@ -44,8 +44,6 @@
 
 #include <QtLocation/QGeoShape>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
@@ -103,7 +101,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGeoCircle)
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/location/qgeocoordinate.h b/src/location/qgeocoordinate.h
index e7bf849b..4948ad97 100644
--- a/src/location/qgeocoordinate.h
+++ b/src/location/qgeocoordinate.h
@@ -47,12 +47,8 @@
 #include <QSharedDataPointer>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QDebug;
 class QDataStream;
 
@@ -128,6 +124,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGeoCoordinate)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qgeolocation.h b/src/location/qgeolocation.h
index 30157d8c..d3f1718a 100644
--- a/src/location/qgeolocation.h
+++ b/src/location/qgeolocation.h
@@ -46,8 +46,6 @@
 #include <QtCore/QMetaType>
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoAddress;
@@ -89,6 +87,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGeoLocation)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qgeopositioninfo.h b/src/location/qgeopositioninfo.h
index 1572ed3e..ac2f51ba 100644
--- a/src/location/qgeopositioninfo.h
+++ b/src/location/qgeopositioninfo.h
@@ -45,12 +45,8 @@
 
 #include <QDateTime>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QDebug;
 class QDataStream;
 
@@ -114,6 +110,4 @@ Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qgeopositioninfosource.h b/src/location/qgeopositioninfosource.h
index a8540f21..931316ce 100644
--- a/src/location/qgeopositioninfosource.h
+++ b/src/location/qgeopositioninfosource.h
@@ -45,12 +45,8 @@
 
 #include <QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QGeoPositionInfoSourcePrivate;
 class Q_LOCATION_EXPORT QGeoPositionInfoSource : public QObject
 {
@@ -115,6 +111,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGeoPositionInfoSource::PositioningMethods)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qgeopositioninfosource_p.h b/src/location/qgeopositioninfosource_p.h
index b6d712ab..97baadbf 100644
--- a/src/location/qgeopositioninfosource_p.h
+++ b/src/location/qgeopositioninfosource_p.h
@@ -49,8 +49,6 @@
 #include <QHash>
 #include <QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoPositionInfoSourcePrivate
@@ -72,6 +70,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QGEOPOSITIONINFOSOURCE_P_H
diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/location/qgeopositioninfosourcefactory.h
index 5431fbc7..f5e31c4b 100644
--- a/src/location/qgeopositioninfosourcefactory.h
+++ b/src/location/qgeopositioninfosourcefactory.h
@@ -46,8 +46,6 @@
 #include <QtLocation/QGeoSatelliteInfoSource>
 #include <QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class Q_LOCATION_EXPORT QGeoPositionInfoSourceFactory
@@ -65,6 +63,4 @@ Q_DECLARE_INTERFACE(QGeoPositionInfoSourceFactory,
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QGEOPOSITIONINFOSOURCEFACTORY_H
diff --git a/src/location/qgeorectangle.h b/src/location/qgeorectangle.h
index 31144f75..5d0ab579 100644
--- a/src/location/qgeorectangle.h
+++ b/src/location/qgeorectangle.h
@@ -44,8 +44,6 @@
 
 #include <QtLocation/QGeoShape>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoCoordinate;
@@ -139,7 +137,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGeoRectangle)
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/location/qgeosatelliteinfo.h b/src/location/qgeosatelliteinfo.h
index aa67ebab..e2afb4ff 100644
--- a/src/location/qgeosatelliteinfo.h
+++ b/src/location/qgeosatelliteinfo.h
@@ -43,12 +43,8 @@
 
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QDebug;
 class QDataStream;
 
@@ -115,6 +111,4 @@ Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qgeosatelliteinfosource.h b/src/location/qgeosatelliteinfosource.h
index 830dfda3..c7f734b6 100644
--- a/src/location/qgeosatelliteinfosource.h
+++ b/src/location/qgeosatelliteinfosource.h
@@ -46,11 +46,8 @@
 #include <QObject>
 #include <QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
 class QGeoSatelliteInfoSourcePrivate;
 class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject
 {
@@ -97,6 +94,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qgeoshape.h b/src/location/qgeoshape.h
index fe5585d4..8be73aeb 100644
--- a/src/location/qgeoshape.h
+++ b/src/location/qgeoshape.h
@@ -45,8 +45,6 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtLocation/QGeoCoordinate>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDebug;
@@ -101,7 +99,5 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QGeoShape)
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/location/qlocationglobal.h b/src/location/qlocationglobal.h
index 34a451aa..ddf15102 100644
--- a/src/location/qlocationglobal.h
+++ b/src/location/qlocationglobal.h
@@ -43,7 +43,6 @@
 
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_STATIC
@@ -57,7 +56,6 @@ QT_BEGIN_NAMESPACE
 #endif
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // QLOCATIONGLOBAL_H
 
diff --git a/src/location/qnmeapositioninfosource.h b/src/location/qnmeapositioninfosource.h
index 1d9c4b3e..fd1abd57 100644
--- a/src/location/qnmeapositioninfosource.h
+++ b/src/location/qnmeapositioninfosource.h
@@ -43,12 +43,8 @@
 
 #include <QtLocation/QGeoPositionInfoSource>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
-
 class QIODevice;
 
 class QNmeaPositionInfoSourcePrivate;
@@ -97,6 +93,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qnmeapositioninfosource_p.h b/src/location/qnmeapositioninfosource_p.h
index a5e4c153..b231d72f 100644
--- a/src/location/qnmeapositioninfosource_p.h
+++ b/src/location/qnmeapositioninfosource_p.h
@@ -59,7 +59,6 @@
 #include <QQueue>
 #include <QPointer>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QBasicTimer;
@@ -174,6 +173,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/location/qtlocation.h b/src/location/qtlocation.h
index 94709cd5..877a6ec7 100644
--- a/src/location/qtlocation.h
+++ b/src/location/qtlocation.h
@@ -44,8 +44,6 @@
 
 #include <QtLocation/qlocationglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QtLocation {
@@ -65,6 +63,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QtLocation::VisibilityScope)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QTLOCATION_H
diff --git a/src/plugins/geoservices/places_jsondb/icon.h b/src/plugins/geoservices/places_jsondb/icon.h
index c69c8cd2..25f9236a 100644
--- a/src/plugins/geoservices/places_jsondb/icon.h
+++ b/src/plugins/geoservices/places_jsondb/icon.h
@@ -47,8 +47,6 @@
 #include <QtGui/QImage>
 #include <QtLocation/QPlaceReply>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class IconHandler;
@@ -137,6 +135,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/plugins/geoservices/places_jsondb/iconhandler.h b/src/plugins/geoservices/places_jsondb/iconhandler.h
index 9557f51e..6e84faeb 100644
--- a/src/plugins/geoservices/places_jsondb/iconhandler.h
+++ b/src/plugins/geoservices/places_jsondb/iconhandler.h
@@ -51,8 +51,6 @@
 #include <QtLocation/QPlaceIcon>
 #include <QtLocation/QPlaceReply>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class IdReply;
@@ -97,6 +95,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h b/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h
index b8299bef..7818176b 100644
--- a/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h
+++ b/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h
@@ -46,9 +46,8 @@
 #include "qgeopositioninfo.h"
 #include "qlocationdata_simulator_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
+
 class QTimer;
 
 class QGeoPositionInfoSourceSimulator : public QGeoPositionInfoSource
diff --git a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h
index 40c61250..58e414e9 100644
--- a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h
+++ b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h
@@ -49,8 +49,6 @@
 #define MINIMUM_UPDATE_INTERVAL     1000
 #define DEFAULT_UPDATE_INTERVAL     5000
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QGeoSatelliteInfoSourceSimulator : public QGeoSatelliteInfoSource
diff --git a/src/plugins/position/simulator/qlocationconnection_simulator_p.h b/src/plugins/position/simulator/qlocationconnection_simulator_p.h
index 82898494..6cbc18dd 100644
--- a/src/plugins/position/simulator/qlocationconnection_simulator_p.h
+++ b/src/plugins/position/simulator/qlocationconnection_simulator_p.h
@@ -44,11 +44,8 @@
 
 #include "qlocationdata_simulator_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
-
 namespace Simulator
 {
     class Connection;
diff --git a/src/plugins/position/simulator/qlocationdata_simulator_p.h b/src/plugins/position/simulator/qlocationdata_simulator_p.h
index a4f9795e..8ac7dcd7 100644
--- a/src/plugins/position/simulator/qlocationdata_simulator_p.h
+++ b/src/plugins/position/simulator/qlocationdata_simulator_p.h
@@ -57,7 +57,6 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 struct QGeoPositionInfoData
@@ -119,6 +118,4 @@ Q_DECLARE_METATYPE(QGeoPositionInfoData)
 Q_DECLARE_METATYPE(QGeoSatelliteInfoData)
 Q_DECLARE_METATYPE(QGeoSatelliteInfoData::SatelliteInfo)
 
-QT_END_HEADER
-
 #endif // QGEOPOSITIONINFODATA_SIMULATOR_P_H