Remove QT_{BEGIN,END}_HEADER macro usage

The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: If3f1040766e1c7de05bb8e90cd8a8a2a349bd096
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

59 files changed, 0 insertions, 118 deletions

diff --git a/src/imports/sensors/qmlaccelerometer.h b/src/imports/sensors/qmlaccelerometer.h
index b2dc671f..7a9a4cd0 100644
--- a/src/imports/sensors/qmlaccelerometer.h
+++ b/src/imports/sensors/qmlaccelerometer.h
@@ -44,7 +44,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QAccelerometer;
@@ -107,5 +106,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlambientlightsensor.h b/src/imports/sensors/qmlambientlightsensor.h
index eecb6b12..7715a39f 100644
--- a/src/imports/sensors/qmlambientlightsensor.h
+++ b/src/imports/sensors/qmlambientlightsensor.h
@@ -45,7 +45,6 @@
 #include "qmlsensor.h"
 #include <QAmbientLightSensor>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QAmbientLightSensor;
@@ -86,5 +85,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlcompass.h b/src/imports/sensors/qmlcompass.h
index 30edbf0a..76294bf9 100644
--- a/src/imports/sensors/qmlcompass.h
+++ b/src/imports/sensors/qmlcompass.h
@@ -44,7 +44,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QCompass;
@@ -88,5 +87,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlgyroscope.h b/src/imports/sensors/qmlgyroscope.h
index c5f6c902..f6fb6795 100644
--- a/src/imports/sensors/qmlgyroscope.h
+++ b/src/imports/sensors/qmlgyroscope.h
@@ -44,7 +44,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QGyroscope;
@@ -92,5 +91,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlholstersensor.h b/src/imports/sensors/qmlholstersensor.h
index 95c7bfaf..262ba69d 100644
--- a/src/imports/sensors/qmlholstersensor.h
+++ b/src/imports/sensors/qmlholstersensor.h
@@ -43,7 +43,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QHolsterSensor;
@@ -84,5 +83,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlirproximitysensor.h b/src/imports/sensors/qmlirproximitysensor.h
index 2b2d4c49..ec39fe8b 100644
--- a/src/imports/sensors/qmlirproximitysensor.h
+++ b/src/imports/sensors/qmlirproximitysensor.h
@@ -44,7 +44,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QIRProximitySensor;
@@ -83,5 +82,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmllightsensor.h b/src/imports/sensors/qmllightsensor.h
index 90fe0b7f..de7e3944 100644
--- a/src/imports/sensors/qmllightsensor.h
+++ b/src/imports/sensors/qmllightsensor.h
@@ -44,7 +44,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QLightSensor;
@@ -91,5 +90,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlmagnetometer.h b/src/imports/sensors/qmlmagnetometer.h
index d6c75c1e..a008a36c 100644
--- a/src/imports/sensors/qmlmagnetometer.h
+++ b/src/imports/sensors/qmlmagnetometer.h
@@ -44,7 +44,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QMagnetometer;
@@ -99,5 +98,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlorientationsensor.h b/src/imports/sensors/qmlorientationsensor.h
index d14197e8..35e9d6fb 100644
--- a/src/imports/sensors/qmlorientationsensor.h
+++ b/src/imports/sensors/qmlorientationsensor.h
@@ -45,7 +45,6 @@
 #include "qmlsensor.h"
 #include <QOrientationSensor>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QOrientationSensor;
@@ -86,5 +85,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlpressuresensor.h b/src/imports/sensors/qmlpressuresensor.h
index e150c7df..627915a6 100644
--- a/src/imports/sensors/qmlpressuresensor.h
+++ b/src/imports/sensors/qmlpressuresensor.h
@@ -43,7 +43,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QPressureSensor;
@@ -84,5 +83,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlproximitysensor.h b/src/imports/sensors/qmlproximitysensor.h
index afbc3a01..17cb2f9a 100644
--- a/src/imports/sensors/qmlproximitysensor.h
+++ b/src/imports/sensors/qmlproximitysensor.h
@@ -44,7 +44,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QProximitySensor;
@@ -84,5 +83,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlrotationsensor.h b/src/imports/sensors/qmlrotationsensor.h
index db3b62f6..105b0fb8 100644
--- a/src/imports/sensors/qmlrotationsensor.h
+++ b/src/imports/sensors/qmlrotationsensor.h
@@ -44,7 +44,6 @@
 
 #include "qmlsensor.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QRotationSensor;
@@ -96,5 +95,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmlsensor.h b/src/imports/sensors/qmlsensor.h
index 9b8f7b75..e538ed0a 100644
--- a/src/imports/sensors/qmlsensor.h
+++ b/src/imports/sensors/qmlsensor.h
@@ -46,7 +46,6 @@
 #include <QQmlListProperty>
 #include "qmlsensorrange.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QSensor;
@@ -187,6 +186,5 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/imports/sensors/qmlsensorglobal.h b/src/imports/sensors/qmlsensorglobal.h
index fbbd30d7..cd28ffef 100644
--- a/src/imports/sensors/qmlsensorglobal.h
+++ b/src/imports/sensors/qmlsensorglobal.h
@@ -45,7 +45,6 @@
 #include <QObject>
 #include <QStringList>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QSensor;
@@ -69,6 +68,5 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/imports/sensors/qmlsensorrange.h b/src/imports/sensors/qmlsensorrange.h
index 261825b5..f2fcb510 100644
--- a/src/imports/sensors/qmlsensorrange.h
+++ b/src/imports/sensors/qmlsensorrange.h
@@ -44,7 +44,6 @@
 
 #include <QObject>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QmlSensorRange : public QObject
@@ -94,5 +93,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmltapsensor.h b/src/imports/sensors/qmltapsensor.h
index f9ae94bd..234af271 100644
--- a/src/imports/sensors/qmltapsensor.h
+++ b/src/imports/sensors/qmltapsensor.h
@@ -45,7 +45,6 @@
 #include "qmlsensor.h"
 #include <QTapSensor>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QTapSensor;
@@ -97,5 +96,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/imports/sensors/qmltiltsensor.h b/src/imports/sensors/qmltiltsensor.h
index 9afed564..422c21dd 100644
--- a/src/imports/sensors/qmltiltsensor.h
+++ b/src/imports/sensors/qmltiltsensor.h
@@ -45,7 +45,6 @@
 #include "qmlsensor.h"
 #include <QtSensors/QTiltSensor>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QTiltSensor;
@@ -90,5 +89,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/plugins/sensors/generic/generictiltsensor.h b/src/plugins/sensors/generic/generictiltsensor.h
index 0633662c..4d228bbc 100644
--- a/src/plugins/sensors/generic/generictiltsensor.h
+++ b/src/plugins/sensors/generic/generictiltsensor.h
@@ -46,7 +46,6 @@
 #include <qtiltsensor.h>
 #include <qaccelerometer.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class GenericTiltSensor : public QSensorBackend, public QAccelerometerFilter
@@ -77,7 +76,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h
index 65d204c6..64649093 100644
--- a/src/sensors/gestures/qsensorgesture.h
+++ b/src/sensors/gestures/qsensorgesture.h
@@ -52,7 +52,6 @@
 
 #include <QtCore/qmetatype.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -93,7 +92,6 @@ Q_SIGNALS:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 
 #endif // QSENSORGESTURE_H
diff --git a/src/sensors/gestures/qsensorgesture_p.h b/src/sensors/gestures/qsensorgesture_p.h
index 5bad75b5..4ee19b9c 100644
--- a/src/sensors/gestures/qsensorgesture_p.h
+++ b/src/sensors/gestures/qsensorgesture_p.h
@@ -61,7 +61,6 @@
 #include "qsensorgesturemanager.h"
 #include <QtCore/private/qmetaobjectbuilder_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QSensorGesturePrivate : public QObject
@@ -84,6 +83,5 @@ public:
 
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // QSENSORGESTURE_P_H
diff --git a/src/sensors/gestures/qsensorgesturemanager.h b/src/sensors/gestures/qsensorgesturemanager.h
index da5048a0..a189ce3b 100644
--- a/src/sensors/gestures/qsensorgesturemanager.h
+++ b/src/sensors/gestures/qsensorgesturemanager.h
@@ -48,7 +48,6 @@
 #include <QtSensors/qsensorgesture.h>
 #include <QtSensors/qsensorgesturerecognizer.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -78,6 +77,5 @@ Q_SIGNALS:
 
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // QSENSORGESTUREMANAGER_P_H
diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
index 50770c77..0994b2ab 100644
--- a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
+++ b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h
@@ -52,7 +52,6 @@
 #include "qsensorgesture.h"
 #include "qsensorgesturerecognizer.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QFactoryLoader;
@@ -99,6 +98,5 @@ private slots:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // QSENSORGESTUREMANAGERPRIVATE_P_H
diff --git a/src/sensors/gestures/qsensorgestureplugininterface.h b/src/sensors/gestures/qsensorgestureplugininterface.h
index 6b6a683d..71e4ecdd 100644
--- a/src/sensors/gestures/qsensorgestureplugininterface.h
+++ b/src/sensors/gestures/qsensorgestureplugininterface.h
@@ -48,7 +48,6 @@
 #include <QtSensors/qsensorgesture.h>
 #include <QtSensors/qsensorgesturerecognizer.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -68,6 +67,5 @@ public:
 Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, "org.qt-project.QSensorGesturePluginInterface");
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // QSENSORGESTUREPLUGININTERFACE_H
diff --git a/src/sensors/gestures/qsensorgesturerecognizer.h b/src/sensors/gestures/qsensorgesturerecognizer.h
index bebc5ce6..a951dfcb 100644
--- a/src/sensors/gestures/qsensorgesturerecognizer.h
+++ b/src/sensors/gestures/qsensorgesturerecognizer.h
@@ -48,7 +48,6 @@
 
 #include <QtSensors/qsensorgesture.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -84,6 +83,5 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // QSENSORGESTURERECOGNIZER_H
diff --git a/src/sensors/qaccelerometer.h b/src/sensors/qaccelerometer.h
index d230eb1f..ee7b0371 100644
--- a/src/sensors/qaccelerometer.h
+++ b/src/sensors/qaccelerometer.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -111,7 +110,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qaccelerometer_p.h b/src/sensors/qaccelerometer_p.h
index 371535bf..e8023db2 100644
--- a/src/sensors/qaccelerometer_p.h
+++ b/src/sensors/qaccelerometer_p.h
@@ -55,7 +55,6 @@
 
 #include "qsensor_p.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QAccelerometerReadingPrivate
@@ -85,7 +84,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qambientlightsensor.h b/src/sensors/qambientlightsensor.h
index 8b69fc2c..b74e2695 100644
--- a/src/sensors/qambientlightsensor.h
+++ b/src/sensors/qambientlightsensor.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -93,7 +92,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qambientlightsensor_p.h b/src/sensors/qambientlightsensor_p.h
index 5faf8530..c921c6bf 100644
--- a/src/sensors/qambientlightsensor_p.h
+++ b/src/sensors/qambientlightsensor_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QAmbientLightReadingPrivate
@@ -68,7 +67,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h
index 17b06584..0399f233 100644
--- a/src/sensors/qcompass.h
+++ b/src/sensors/qcompass.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -87,7 +86,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qcompass_p.h b/src/sensors/qcompass_p.h
index 04a3b798..49da19b2 100644
--- a/src/sensors/qcompass_p.h
+++ b/src/sensors/qcompass_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QCompassReadingPrivate
@@ -70,7 +69,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qgyroscope.h b/src/sensors/qgyroscope.h
index 7589c6ce..d23e97fb 100644
--- a/src/sensors/qgyroscope.h
+++ b/src/sensors/qgyroscope.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -91,7 +90,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qgyroscope_p.h b/src/sensors/qgyroscope_p.h
index 21bcde41..a5e42766 100644
--- a/src/sensors/qgyroscope_p.h
+++ b/src/sensors/qgyroscope_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QGyroscopeReadingPrivate
@@ -72,7 +71,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qholstersensor.h b/src/sensors/qholstersensor.h
index 459f49bb..63f8133f 100644
--- a/src/sensors/qholstersensor.h
+++ b/src/sensors/qholstersensor.h
@@ -43,7 +43,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -83,6 +82,5 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/sensors/qholstersensor_p.h b/src/sensors/qholstersensor_p.h
index e13ddeff..a90613f0 100644
--- a/src/sensors/qholstersensor_p.h
+++ b/src/sensors/qholstersensor_p.h
@@ -52,7 +52,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QHolsterReadingPrivate
@@ -67,6 +66,5 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h
index c6b8925b..6c98ec37 100644
--- a/src/sensors/qirproximitysensor.h
+++ b/src/sensors/qirproximitysensor.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -83,7 +82,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qirproximitysensor_p.h b/src/sensors/qirproximitysensor_p.h
index 6241b629..9b16af56 100644
--- a/src/sensors/qirproximitysensor_p.h
+++ b/src/sensors/qirproximitysensor_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QIRProximityReadingPrivate
@@ -68,6 +67,5 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h
index 096df931..5e0bf355 100644
--- a/src/sensors/qlightsensor.h
+++ b/src/sensors/qlightsensor.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -86,7 +85,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qlightsensor_p.h b/src/sensors/qlightsensor_p.h
index da84463e..bd0edfc5 100644
--- a/src/sensors/qlightsensor_p.h
+++ b/src/sensors/qlightsensor_p.h
@@ -55,7 +55,6 @@
 
 #include "qsensor_p.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QLightReadingPrivate : public QSensorReadingPrivate
@@ -70,7 +69,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h
index 60e142d4..d5ed2883 100644
--- a/src/sensors/qmagnetometer.h
+++ b/src/sensors/qmagnetometer.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -98,7 +97,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qmagnetometer_p.h b/src/sensors/qmagnetometer_p.h
index 2b42cfd7..9ac824c1 100644
--- a/src/sensors/qmagnetometer_p.h
+++ b/src/sensors/qmagnetometer_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QMagnetometerReadingPrivate
@@ -74,7 +73,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h
index 641f355c..3f5e4ce0 100644
--- a/src/sensors/qorientationsensor.h
+++ b/src/sensors/qorientationsensor.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -94,7 +93,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qorientationsensor_p.h b/src/sensors/qorientationsensor_p.h
index 09a65a71..433f3dd9 100644
--- a/src/sensors/qorientationsensor_p.h
+++ b/src/sensors/qorientationsensor_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QOrientationReadingPrivate
@@ -68,7 +67,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qpressuresensor.h b/src/sensors/qpressuresensor.h
index 80c99f0e..9f092450 100644
--- a/src/sensors/qpressuresensor.h
+++ b/src/sensors/qpressuresensor.h
@@ -43,7 +43,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -83,6 +82,5 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/sensors/qpressuresensor_p.h b/src/sensors/qpressuresensor_p.h
index 4067ccbe..1c74e7f1 100644
--- a/src/sensors/qpressuresensor_p.h
+++ b/src/sensors/qpressuresensor_p.h
@@ -52,7 +52,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QPressureReadingPrivate
@@ -67,6 +66,5 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h
index efabead9..9da948dd 100644
--- a/src/sensors/qproximitysensor.h
+++ b/src/sensors/qproximitysensor.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -83,7 +82,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qproximitysensor_p.h b/src/sensors/qproximitysensor_p.h
index 57125d50..8f951e6a 100644
--- a/src/sensors/qproximitysensor_p.h
+++ b/src/sensors/qproximitysensor_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QProximityReadingPrivate
@@ -68,7 +67,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h
index c049238c..f59eadc3 100644
--- a/src/sensors/qrotationsensor.h
+++ b/src/sensors/qrotationsensor.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -91,7 +90,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qrotationsensor_p.h b/src/sensors/qrotationsensor_p.h
index f6ce13ff..bf3aef7c 100644
--- a/src/sensors/qrotationsensor_p.h
+++ b/src/sensors/qrotationsensor_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QRotationReadingPrivate
@@ -72,7 +71,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h
index 45d1aa3c..8e921c5e 100644
--- a/src/sensors/qsensor.h
+++ b/src/sensors/qsensor.h
@@ -50,7 +50,6 @@
 #include <QtCore/QVariant>
 #include <QtCore/QPair>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -284,7 +283,6 @@ private:
 
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 Q_DECLARE_METATYPE(qrange)
 Q_DECLARE_METATYPE(qrangelist)
diff --git a/src/sensors/qsensor_p.h b/src/sensors/qsensor_p.h
index 041e4baa..9b6e7e5b 100644
--- a/src/sensors/qsensor_p.h
+++ b/src/sensors/qsensor_p.h
@@ -57,7 +57,6 @@
 
 #include "private/qobject_p.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 typedef QList<QSensorFilter*> QFilterList;
@@ -132,7 +131,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qsensorbackend.h b/src/sensors/qsensorbackend.h
index fcf36244..f3ac09f9 100644
--- a/src/sensors/qsensorbackend.h
+++ b/src/sensors/qsensorbackend.h
@@ -45,7 +45,6 @@
 #include <QtSensors/qsensor.h>
 #include <QtSensors/qsensormanager.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -94,7 +93,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qsensormanager.h b/src/sensors/qsensormanager.h
index c2037f75..5f24b8a3 100644
--- a/src/sensors/qsensormanager.h
+++ b/src/sensors/qsensormanager.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -77,7 +76,6 @@ protected:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qsensorplugin.h b/src/sensors/qsensorplugin.h
index bac35b82..e8f59a70 100644
--- a/src/sensors/qsensorplugin.h
+++ b/src/sensors/qsensorplugin.h
@@ -46,7 +46,6 @@
 
 #include <QtCore/qplugin.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -71,7 +70,6 @@ Q_DECLARE_INTERFACE(QSensorPluginInterface, "com.nokia.Qt.QSensorPluginInterface
 Q_DECLARE_INTERFACE(QSensorChangesInterface, "com.nokia.Qt.QSensorChangesInterface/5.0");
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qsensorsglobal.h b/src/sensors/qsensorsglobal.h
index bdd016ff..337e398c 100644
--- a/src/sensors/qsensorsglobal.h
+++ b/src/sensors/qsensorsglobal.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -60,7 +59,6 @@ QT_MODULE(QtSensors)
 #endif
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif // QSENSORSGLOBAL_H
 
diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h
index e8a450c6..4fff7738 100644
--- a/src/sensors/qtapsensor.h
+++ b/src/sensors/qtapsensor.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -107,7 +106,6 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qtapsensor_p.h b/src/sensors/qtapsensor_p.h
index 68270e87..bc2b8e98 100644
--- a/src/sensors/qtapsensor_p.h
+++ b/src/sensors/qtapsensor_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QTapReadingPrivate
@@ -70,7 +69,6 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/sensors/qtiltsensor.h b/src/sensors/qtiltsensor.h
index 68dcdfea..6617fb8d 100644
--- a/src/sensors/qtiltsensor.h
+++ b/src/sensors/qtiltsensor.h
@@ -44,7 +44,6 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 QT_MODULE(QtSensors)
@@ -91,5 +90,4 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/sensors/qtiltsensor_p.h b/src/sensors/qtiltsensor_p.h
index 14946243..e8cce136 100644
--- a/src/sensors/qtiltsensor_p.h
+++ b/src/sensors/qtiltsensor_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QTiltReadingPrivate
@@ -70,5 +69,4 @@ public:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 #endif
diff --git a/src/sensors/sensorlog_p.h b/src/sensors/sensorlog_p.h
index d1cde707..f808ab2d 100644
--- a/src/sensors/sensorlog_p.h
+++ b/src/sensors/sensorlog_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 #ifdef ENABLE_RUNTIME_SENSORLOG
@@ -83,7 +82,6 @@ static bool logEnabled()
 #endif
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif