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: I74e76ed86361fbbf8957bf7a0540f2bd3350eb0a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
author: Sergio Ahumada <sergio.ahumada@digia.com> 2013-01-27 10:41:42 +0100
committer: The Qt Project <gerrit-noreply@qt-project.org> 2013-01-28 22:44:55 +0100
commit: 37f34eb393d750c310e93e95b964a28a0118ad3a (patch)
tree: 0cdef57bab99744fe181349188c4056ef1b7a601
parent: 767effafb8fbb97ec9b85b775f191126a3111c3a (diff)
download: qtxmlpatterns-37f34eb393d750c310e93e95b964a28a0118ad3a.tar.gz
398 files changed, 3 insertions, 1528 deletions
diff --git a/src/xmlpatterns/acceltree/qacceliterators_p.h b/src/xmlpatterns/acceltree/qacceliterators_p.h
index 45c9c00..0b1c0a4 100644
--- a/src/xmlpatterns/acceltree/qacceliterators_p.h
+++ b/src/xmlpatterns/acceltree/qacceliterators_p.h
@@ -55,8 +55,6 @@
 #include <private/qacceltree_p.h>
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -408,6 +406,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/acceltree/qacceltree_p.h b/src/xmlpatterns/acceltree/qacceltree_p.h
index def20c6..0b32e71 100644
--- a/src/xmlpatterns/acceltree/qacceltree_p.h
+++ b/src/xmlpatterns/acceltree/qacceltree_p.h
@@ -60,8 +60,6 @@
 #include <private/qitem_p.h>
 #include <private/qnamepool_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -399,6 +397,4 @@ Q_DECLARE_TYPEINFO(QPatternist::AccelTree::BasicNodeData, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
index 8e7eafa..23c9a30 100644
--- a/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreebuilder_p.h
@@ -66,8 +66,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <QtDebug>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -199,6 +197,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
index e0f639c..51bc531 100644
--- a/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
+++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader_p.h
@@ -63,8 +63,6 @@
 #include <private/qnetworkaccessdelegator_p.h>
 #include <private/qreportcontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
@@ -205,6 +203,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
index 05b8a9e..cc0b6f3 100644
--- a/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
+++ b/src/xmlpatterns/acceltree/qcompressedwhitespace_p.h
@@ -54,8 +54,6 @@
 
 #include <QtGlobal>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QChar;
@@ -181,6 +179,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h
index 8fbd8ae..6007395 100644
--- a/src/xmlpatterns/api/qabstractmessagehandler.h
+++ b/src/xmlpatterns/api/qabstractmessagehandler.h
@@ -45,8 +45,6 @@
 #include <QtXmlPatterns/QSourceLocation>
 #include <QtCore/QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -75,6 +73,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h
index 5014ec7..c84d4d5 100644
--- a/src/xmlpatterns/api/qabstracturiresolver.h
+++ b/src/xmlpatterns/api/qabstracturiresolver.h
@@ -45,7 +45,6 @@
 #include <QtCore/QObject>
 #include <QtXmlPatterns/qtxmlpatternsglobal.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
@@ -69,6 +68,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
index 5ab4e7d..69544a1 100644
--- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
+++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h
@@ -57,8 +57,6 @@
 #include <QtCore/QSharedData>
 #include <QtCore/QString>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -335,6 +333,4 @@ qint64 QAbstractXmlForwardIterator<T>::sizeHint() const
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h
index 08461d7..7db8a76 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h
@@ -46,7 +46,6 @@
 #include <QtCore/QSharedData>
 #include <QtCore/QScopedPointer>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
@@ -428,6 +427,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QXmlItem) /* This macro must appear after QT_END_NAMESPACE. */
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
index 9a91503..0d10c17 100644
--- a/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
+++ b/src/xmlpatterns/api/qabstractxmlnodemodel_p.h
@@ -55,8 +55,6 @@
 #include "qabstractxmlnodemodel.h"
 #include "qsourcelocation.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QAbstractXmlNodeModelPrivate
@@ -76,6 +74,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
index b84a4a0..2749192 100644
--- a/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
+++ b/src/xmlpatterns/api/qabstractxmlpullprovider_p.h
@@ -54,8 +54,6 @@
 
 #include <QtCore/QtGlobal>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QXmlItem;
@@ -108,6 +106,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qabstractxmlreceiver.h b/src/xmlpatterns/api/qabstractxmlreceiver.h
index a31579c..6100856 100644
--- a/src/xmlpatterns/api/qabstractxmlreceiver.h
+++ b/src/xmlpatterns/api/qabstractxmlreceiver.h
@@ -46,8 +46,6 @@
 #include <QtCore/QScopedPointer>
 #include <QtXmlPatterns/QXmlNodeModelIndex>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -101,6 +99,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qabstractxmlreceiver_p.h b/src/xmlpatterns/api/qabstractxmlreceiver_p.h
index ed91afc..40f651f 100644
--- a/src/xmlpatterns/api/qabstractxmlreceiver_p.h
+++ b/src/xmlpatterns/api/qabstractxmlreceiver_p.h
@@ -52,8 +52,6 @@
 #ifndef QABSTRACTXMLRECEIVER_P_H
 #define QABSTRACTXMLRECEIVER_P_H
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QAbstractXmlReceiverPrivate
@@ -66,6 +64,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qcoloringmessagehandler_p.h b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
index bf59536..4fe16c1 100644
--- a/src/xmlpatterns/api/qcoloringmessagehandler_p.h
+++ b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
@@ -57,8 +57,6 @@
 #include <private/qcoloroutput_p.h>
 #include <QAbstractMessageHandler>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h
index bdcdc8c..85034ac 100644
--- a/src/xmlpatterns/api/qcoloroutput_p.h
+++ b/src/xmlpatterns/api/qcoloroutput_p.h
@@ -55,8 +55,6 @@
 #include <QtCore/QtGlobal>
 #include <QtCore/QHash>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -129,6 +127,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QPatternist::ColorOutput::ColorCode)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qdeviceresourceloader_p.h b/src/xmlpatterns/api/qdeviceresourceloader_p.h
index d29f1b4..00902b3 100644
--- a/src/xmlpatterns/api/qdeviceresourceloader_p.h
+++ b/src/xmlpatterns/api/qdeviceresourceloader_p.h
@@ -54,7 +54,6 @@
 
 #include <private/qresourceloader_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 template<typename T> class QSet;
@@ -83,6 +82,4 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
index c9d4d23..7024279 100644
--- a/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
+++ b/src/xmlpatterns/api/qnetworkaccessdelegator_p.h
@@ -56,7 +56,6 @@
 #include <QPointer>
 #include <QSharedData>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QNetworkAccessManager;
@@ -101,6 +100,4 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qpullbridge_p.h b/src/xmlpatterns/api/qpullbridge_p.h
index 3b5e746..75191c6 100644
--- a/src/xmlpatterns/api/qpullbridge_p.h
+++ b/src/xmlpatterns/api/qpullbridge_p.h
@@ -59,8 +59,6 @@
 #include <private/qabstractxmlpullprovider_p.h>
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qreferencecountedvalue_p.h b/src/xmlpatterns/api/qreferencecountedvalue_p.h
index 1f1a81b..6b07d24 100644
--- a/src/xmlpatterns/api/qreferencecountedvalue_p.h
+++ b/src/xmlpatterns/api/qreferencecountedvalue_p.h
@@ -52,7 +52,6 @@
 #ifndef QPatternist_ReferenceCountedValue_p_h
 #define QPatternist_ReferenceCountedValue_p_h
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -101,6 +100,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/api/qresourcedelegator_p.h b/src/xmlpatterns/api/qresourcedelegator_p.h
index 4ededf8..0ca6dff 100644
--- a/src/xmlpatterns/api/qresourcedelegator_p.h
+++ b/src/xmlpatterns/api/qresourcedelegator_p.h
@@ -57,7 +57,6 @@
 
 #include <private/qdeviceresourceloader_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -114,6 +113,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h
index 8fbeb63..d26608e 100644
--- a/src/xmlpatterns/api/qsimplexmlnodemodel.h
+++ b/src/xmlpatterns/api/qsimplexmlnodemodel.h
@@ -45,8 +45,6 @@
 #include <QtXmlPatterns/QAbstractXmlNodeModel>
 #include <QtXmlPatterns/QXmlQuery>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -71,6 +69,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qsourcelocation.h b/src/xmlpatterns/api/qsourcelocation.h
index f6ccca3..de97a9c 100644
--- a/src/xmlpatterns/api/qsourcelocation.h
+++ b/src/xmlpatterns/api/qsourcelocation.h
@@ -46,8 +46,6 @@
 #include <QtCore/QUrl>
 #include <QtXmlPatterns/qtxmlpatternsglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -96,6 +94,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QSourceLocation) /* This macro must appear after QT_END_NAMESPACE. */
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qtxmlpatternsglobal.h b/src/xmlpatterns/api/qtxmlpatternsglobal.h
index 0795d0b..b69ace8 100644
--- a/src/xmlpatterns/api/qtxmlpatternsglobal.h
+++ b/src/xmlpatterns/api/qtxmlpatternsglobal.h
@@ -44,8 +44,6 @@
 
 #include <QtCore/qglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #ifndef Q_XMLPATTERNS_EXPORT
@@ -62,6 +60,4 @@ QT_BEGIN_NAMESPACE
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qvariableloader_p.h b/src/xmlpatterns/api/qvariableloader_p.h
index c1d6e71..337d23e 100644
--- a/src/xmlpatterns/api/qvariableloader_p.h
+++ b/src/xmlpatterns/api/qvariableloader_p.h
@@ -59,8 +59,6 @@
 #include <private/qdynamiccontext_p.h>
 #include <private/qexternalvariableloader_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -113,6 +111,4 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QIODevice *)
 Q_DECLARE_METATYPE(QXmlQuery)
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h
index 164d7a4..f3515cf 100644
--- a/src/xmlpatterns/api/qxmlformatter.h
+++ b/src/xmlpatterns/api/qxmlformatter.h
@@ -44,8 +44,6 @@
 
 #include <QtXmlPatterns/QXmlSerializer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -88,6 +86,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlname.h b/src/xmlpatterns/api/qxmlname.h
index eb1f04c..8808507 100644
--- a/src/xmlpatterns/api/qxmlname.h
+++ b/src/xmlpatterns/api/qxmlname.h
@@ -46,8 +46,6 @@
 #include <QtCore/QMetaType>
 #include <QtXmlPatterns/qtxmlpatternsglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -137,6 +135,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QXmlName) /* This macro must appear after QT_END_NAMESPACE. */
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlnamepool.h b/src/xmlpatterns/api/qxmlnamepool.h
index 24e7916..ae7ce78 100644
--- a/src/xmlpatterns/api/qxmlnamepool.h
+++ b/src/xmlpatterns/api/qxmlnamepool.h
@@ -46,8 +46,6 @@
 #include <QtCore/QString>
 #include <QtXmlPatterns/qtxmlpatternsglobal.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -90,6 +88,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlpatternistcli_p.h b/src/xmlpatterns/api/qxmlpatternistcli_p.h
index 7569589..1b4ca5b 100644
--- a/src/xmlpatterns/api/qxmlpatternistcli_p.h
+++ b/src/xmlpatterns/api/qxmlpatternistcli_p.h
@@ -54,8 +54,6 @@
 
 #include <QCoreApplication>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QXmlPatternistCLI
@@ -69,6 +67,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlquery.h b/src/xmlpatterns/api/qxmlquery.h
index f8c904f..b84987b 100644
--- a/src/xmlpatterns/api/qxmlquery.h
+++ b/src/xmlpatterns/api/qxmlquery.h
@@ -47,7 +47,6 @@
 #include <QtXmlPatterns/QAbstractXmlReceiver>
 #include <QtXmlPatterns/QXmlNamePool>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
@@ -149,6 +148,5 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/api/qxmlquery_p.h b/src/xmlpatterns/api/qxmlquery_p.h
index b91f9e5..69f8f5b 100644
--- a/src/xmlpatterns/api/qxmlquery_p.h
+++ b/src/xmlpatterns/api/qxmlquery_p.h
@@ -323,6 +323,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h
index 64d5335..975aff0 100644
--- a/src/xmlpatterns/api/qxmlresultitems.h
+++ b/src/xmlpatterns/api/qxmlresultitems.h
@@ -46,7 +46,6 @@
 #include <QtCore/QScopedPointer>
 #include <QtXmlPatterns/qtxmlpatternsglobal.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
@@ -72,6 +71,5 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/api/qxmlschema.h b/src/xmlpatterns/api/qxmlschema.h
index 3f4f28a..68f9a6f 100644
--- a/src/xmlpatterns/api/qxmlschema.h
+++ b/src/xmlpatterns/api/qxmlschema.h
@@ -46,7 +46,6 @@
 #include <QtCore/QUrl>
 #include <QtXmlPatterns/QXmlNamePool>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
@@ -91,6 +90,4 @@ class Q_XMLPATTERNS_EXPORT QXmlSchema
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlschema_p.h b/src/xmlpatterns/api/qxmlschema_p.h
index 63619f7..f11abd2 100644
--- a/src/xmlpatterns/api/qxmlschema_p.h
+++ b/src/xmlpatterns/api/qxmlschema_p.h
@@ -65,8 +65,6 @@
 #include <QtCore/QSharedData>
 #include <QtNetwork/QNetworkAccessManager>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QXmlSchemaPrivate : public QSharedData
@@ -104,6 +102,4 @@ class QXmlSchemaPrivate : public QSharedData
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlschemavalidator.h b/src/xmlpatterns/api/qxmlschemavalidator.h
index 237e14a..e65af25 100644
--- a/src/xmlpatterns/api/qxmlschemavalidator.h
+++ b/src/xmlpatterns/api/qxmlschemavalidator.h
@@ -45,7 +45,6 @@
 #include <QtCore/QUrl>
 #include <QtXmlPatterns/QXmlNamePool>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
@@ -91,6 +90,4 @@ class Q_XMLPATTERNS_EXPORT QXmlSchemaValidator
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlschemavalidator_p.h b/src/xmlpatterns/api/qxmlschemavalidator_p.h
index 2ee4b8c..4cee550 100644
--- a/src/xmlpatterns/api/qxmlschemavalidator_p.h
+++ b/src/xmlpatterns/api/qxmlschemavalidator_p.h
@@ -64,8 +64,6 @@
 
 #include <QtNetwork/QNetworkAccessManager>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QXmlSchemaValidatorPrivate
@@ -126,6 +124,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h
index 74c4eb8..ae142da 100644
--- a/src/xmlpatterns/api/qxmlserializer.h
+++ b/src/xmlpatterns/api/qxmlserializer.h
@@ -44,8 +44,6 @@
 
 #include <QtXmlPatterns/QAbstractXmlReceiver>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -152,6 +150,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/api/qxmlserializer_p.h b/src/xmlpatterns/api/qxmlserializer_p.h
index 43580d2..83a835a 100644
--- a/src/xmlpatterns/api/qxmlserializer_p.h
+++ b/src/xmlpatterns/api/qxmlserializer_p.h
@@ -62,8 +62,6 @@
 #include <private/qnamepool_p.h>
 #include <private/qabstractxmlreceiver_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QXmlSerializerPrivate : public QAbstractXmlReceiverPrivate
@@ -125,6 +123,5 @@ void QXmlSerializerPrivate::write(const char c)
     device->putChar(c);
 }
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/data/qabstractdatetime_p.h b/src/xmlpatterns/data/qabstractdatetime_p.h
index 85696a7..8c3341a 100644
--- a/src/xmlpatterns/data/qabstractdatetime_p.h
+++ b/src/xmlpatterns/data/qabstractdatetime_p.h
@@ -57,8 +57,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -256,6 +254,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qabstractduration_p.h b/src/xmlpatterns/data/qabstractduration_p.h
index 696bb0d..8d3a300 100644
--- a/src/xmlpatterns/data/qabstractduration_p.h
+++ b/src/xmlpatterns/data/qabstractduration_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -187,6 +185,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qabstractfloat_p.h b/src/xmlpatterns/data/qabstractfloat_p.h
index cb2b4ed..e1341c8 100644
--- a/src/xmlpatterns/data/qabstractfloat_p.h
+++ b/src/xmlpatterns/data/qabstractfloat_p.h
@@ -62,8 +62,6 @@
 #include <private/qvalidationerror_p.h>
 #include <private/qbuiltintypes_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -169,6 +167,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qabstractfloatcasters_p.h b/src/xmlpatterns/data/qabstractfloatcasters_p.h
index 615defb..d55c03c 100644
--- a/src/xmlpatterns/data/qabstractfloatcasters_p.h
+++ b/src/xmlpatterns/data/qabstractfloatcasters_p.h
@@ -62,8 +62,6 @@
  * are responsible of casting an atomic value to AbstractFloat.
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -170,6 +168,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qabstractfloatmathematician_p.h b/src/xmlpatterns/data/qabstractfloatmathematician_p.h
index 4f76ba4..4a165d3 100644
--- a/src/xmlpatterns/data/qabstractfloatmathematician_p.h
+++ b/src/xmlpatterns/data/qabstractfloatmathematician_p.h
@@ -59,7 +59,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <private/qsourcelocationreflection_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -99,6 +98,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/data/qanyuri_p.h b/src/xmlpatterns/data/qanyuri_p.h
index 6961e87..a6611d0 100644
--- a/src/xmlpatterns/data/qanyuri_p.h
+++ b/src/xmlpatterns/data/qanyuri_p.h
@@ -60,8 +60,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <private/qreportcontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -207,6 +205,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qatomiccaster_p.h b/src/xmlpatterns/data/qatomiccaster_p.h
index 54ff76a..069dbac 100644
--- a/src/xmlpatterns/data/qatomiccaster_p.h
+++ b/src/xmlpatterns/data/qatomiccaster_p.h
@@ -56,8 +56,6 @@
 #include <private/qitem_p.h>
 #include <private/qatomictypedispatch_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qatomiccasters_p.h b/src/xmlpatterns/data/qatomiccasters_p.h
index 91720d7..0b61dff 100644
--- a/src/xmlpatterns/data/qatomiccasters_p.h
+++ b/src/xmlpatterns/data/qatomiccasters_p.h
@@ -65,8 +65,6 @@
  * are responsible of casting an atomic value to another type.
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -700,6 +698,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qatomiccomparator_p.h b/src/xmlpatterns/data/qatomiccomparator_p.h
index 4319862..961b71f 100644
--- a/src/xmlpatterns/data/qatomiccomparator_p.h
+++ b/src/xmlpatterns/data/qatomiccomparator_p.h
@@ -57,8 +57,6 @@
 #include <private/qitem_p.h>
 #include <private/qatomictypedispatch_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -218,6 +216,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qatomiccomparators_p.h b/src/xmlpatterns/data/qatomiccomparators_p.h
index a7709af..9deefc5 100644
--- a/src/xmlpatterns/data/qatomiccomparators_p.h
+++ b/src/xmlpatterns/data/qatomiccomparators_p.h
@@ -61,8 +61,6 @@
  * @short Contains all the classes implementing comparisons between atomic values.
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -293,6 +291,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qatomicmathematician_p.h b/src/xmlpatterns/data/qatomicmathematician_p.h
index 346f545..ef5fa35 100644
--- a/src/xmlpatterns/data/qatomicmathematician_p.h
+++ b/src/xmlpatterns/data/qatomicmathematician_p.h
@@ -58,8 +58,6 @@
 #include <private/qitem_p.h>
 #include <private/qatomictypedispatch_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qatomicmathematicians_p.h b/src/xmlpatterns/data/qatomicmathematicians_p.h
index 7546014..843d8ef 100644
--- a/src/xmlpatterns/data/qatomicmathematicians_p.h
+++ b/src/xmlpatterns/data/qatomicmathematicians_p.h
@@ -61,8 +61,6 @@
  * subtracting two dates.
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -244,6 +242,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qatomicstring_p.h b/src/xmlpatterns/data/qatomicstring_p.h
index e22a4e1..e3d0d99 100644
--- a/src/xmlpatterns/data/qatomicstring_p.h
+++ b/src/xmlpatterns/data/qatomicstring_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -118,6 +116,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qbase64binary_p.h b/src/xmlpatterns/data/qbase64binary_p.h
index 76a981c..9705e6b 100644
--- a/src/xmlpatterns/data/qbase64binary_p.h
+++ b/src/xmlpatterns/data/qbase64binary_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -113,6 +111,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qboolean_p.h b/src/xmlpatterns/data/qboolean_p.h
index 89c1c05..6720131 100644
--- a/src/xmlpatterns/data/qboolean_p.h
+++ b/src/xmlpatterns/data/qboolean_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -121,6 +119,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/data/qcommonvalues_p.h b/src/xmlpatterns/data/qcommonvalues_p.h
index c98234c..48a6732 100644
--- a/src/xmlpatterns/data/qcommonvalues_p.h
+++ b/src/xmlpatterns/data/qcommonvalues_p.h
@@ -56,8 +56,6 @@
 #include <private/qyearmonthduration_p.h>
 #include <private/qemptyiterator_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -223,6 +221,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qcomparisonfactory_p.h b/src/xmlpatterns/data/qcomparisonfactory_p.h
index 826abce..88f2a83 100644
--- a/src/xmlpatterns/data/qcomparisonfactory_p.h
+++ b/src/xmlpatterns/data/qcomparisonfactory_p.h
@@ -58,7 +58,6 @@
 #include <private/qreportcontext_p.h>
 #include <private/qschematype_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -116,6 +115,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h
index 6004a8b..6628f85 100644
--- a/src/xmlpatterns/data/qdate_p.h
+++ b/src/xmlpatterns/data/qdate_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractdatetime_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -90,6 +88,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qdaytimeduration_p.h b/src/xmlpatterns/data/qdaytimeduration_p.h
index f5839ea..cc7df54 100644
--- a/src/xmlpatterns/data/qdaytimeduration_p.h
+++ b/src/xmlpatterns/data/qdaytimeduration_p.h
@@ -55,8 +55,6 @@
 #include <private/qabstractduration_p.h>
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -149,6 +147,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h
index 4bea118..d50b0b5 100644
--- a/src/xmlpatterns/data/qdecimal_p.h
+++ b/src/xmlpatterns/data/qdecimal_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qschemanumeric_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 /**
@@ -151,6 +149,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h
index fc091dc..7978268 100644
--- a/src/xmlpatterns/data/qderivedinteger_p.h
+++ b/src/xmlpatterns/data/qderivedinteger_p.h
@@ -57,8 +57,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <private/qvalidationerror_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -619,6 +617,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qderivedstring_p.h b/src/xmlpatterns/data/qderivedstring_p.h
index 68c9e8b..df36ca4 100644
--- a/src/xmlpatterns/data/qderivedstring_p.h
+++ b/src/xmlpatterns/data/qderivedstring_p.h
@@ -59,8 +59,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <private/qvalidationerror_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -336,6 +334,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qduration_p.h b/src/xmlpatterns/data/qduration_p.h
index ba196db..d6d7d09 100644
--- a/src/xmlpatterns/data/qduration_p.h
+++ b/src/xmlpatterns/data/qduration_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractduration_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qgday_p.h b/src/xmlpatterns/data/qgday_p.h
index e451da4..4883a99 100644
--- a/src/xmlpatterns/data/qgday_p.h
+++ b/src/xmlpatterns/data/qgday_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractdatetime_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qgmonth_p.h b/src/xmlpatterns/data/qgmonth_p.h
index 257d696..da446d4 100644
--- a/src/xmlpatterns/data/qgmonth_p.h
+++ b/src/xmlpatterns/data/qgmonth_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractdatetime_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qgmonthday_p.h b/src/xmlpatterns/data/qgmonthday_p.h
index 3503a15..aeea751 100644
--- a/src/xmlpatterns/data/qgmonthday_p.h
+++ b/src/xmlpatterns/data/qgmonthday_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractdatetime_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -90,6 +88,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qgyear_p.h b/src/xmlpatterns/data/qgyear_p.h
index 16ac4cc..8ffdfc7 100644
--- a/src/xmlpatterns/data/qgyear_p.h
+++ b/src/xmlpatterns/data/qgyear_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractdatetime_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qgyearmonth_p.h b/src/xmlpatterns/data/qgyearmonth_p.h
index dbc6407..b04315d 100644
--- a/src/xmlpatterns/data/qgyearmonth_p.h
+++ b/src/xmlpatterns/data/qgyearmonth_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractdatetime_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qhexbinary_p.h b/src/xmlpatterns/data/qhexbinary_p.h
index 9b4bb4b..f15f9cf 100644
--- a/src/xmlpatterns/data/qhexbinary_p.h
+++ b/src/xmlpatterns/data/qhexbinary_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qbase64binary_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qinteger_p.h b/src/xmlpatterns/data/qinteger_p.h
index ec826d4..d691759 100644
--- a/src/xmlpatterns/data/qinteger_p.h
+++ b/src/xmlpatterns/data/qinteger_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qschemanumeric_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -136,6 +134,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qitem_p.h b/src/xmlpatterns/data/qitem_p.h
index 1b917e6..9bf4ae2 100644
--- a/src/xmlpatterns/data/qitem_p.h
+++ b/src/xmlpatterns/data/qitem_p.h
@@ -72,8 +72,6 @@
  * @short Qt's base class for reference counting.
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename T> class QList;
@@ -528,6 +526,4 @@ Q_DECLARE_TYPEINFO(QPatternist::AtomicValue, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qnodebuilder_p.h b/src/xmlpatterns/data/qnodebuilder_p.h
index 63f670c..29d02ff 100644
--- a/src/xmlpatterns/data/qnodebuilder_p.h
+++ b/src/xmlpatterns/data/qnodebuilder_p.h
@@ -56,8 +56,6 @@
 #include "qabstractxmlreceiver.h"
 #include <private/qautoptr_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -106,6 +104,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qqnamevalue_p.h b/src/xmlpatterns/data/qqnamevalue_p.h
index 19e8a11..fc89088 100644
--- a/src/xmlpatterns/data/qqnamevalue_p.h
+++ b/src/xmlpatterns/data/qqnamevalue_p.h
@@ -55,8 +55,6 @@
 #include <private/qitem_p.h>
 #include <QXmlName>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -108,6 +106,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qresourceloader_p.h b/src/xmlpatterns/data/qresourceloader_p.h
index b39a04a..0db7ea4 100644
--- a/src/xmlpatterns/data/qresourceloader_p.h
+++ b/src/xmlpatterns/data/qresourceloader_p.h
@@ -57,8 +57,6 @@
 #include <private/qsequencetype_p.h>
 #include <private/qsourcelocationreflection_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QUrl;
@@ -315,6 +313,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qschemadatetime_p.h b/src/xmlpatterns/data/qschemadatetime_p.h
index 435d91b..954f55c 100644
--- a/src/xmlpatterns/data/qschemadatetime_p.h
+++ b/src/xmlpatterns/data/qschemadatetime_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractdatetime_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 /**
@@ -96,6 +94,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qschemanumeric_p.h b/src/xmlpatterns/data/qschemanumeric_p.h
index 8b9533b..a10d46f 100644
--- a/src/xmlpatterns/data/qschemanumeric_p.h
+++ b/src/xmlpatterns/data/qschemanumeric_p.h
@@ -55,8 +55,6 @@
 #include <private/qitem_p.h>
 #include <private/qprimitives_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 /**
@@ -230,6 +228,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h
index 9630255..7620312 100644
--- a/src/xmlpatterns/data/qschematime_p.h
+++ b/src/xmlpatterns/data/qschematime_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractdatetime_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qsequencereceiver_p.h b/src/xmlpatterns/data/qsequencereceiver_p.h
index 39eb3c8..5208b8c 100644
--- a/src/xmlpatterns/data/qsequencereceiver_p.h
+++ b/src/xmlpatterns/data/qsequencereceiver_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -187,6 +185,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qsorttuple_p.h b/src/xmlpatterns/data/qsorttuple_p.h
index 810f10e..06a924a 100644
--- a/src/xmlpatterns/data/qsorttuple_p.h
+++ b/src/xmlpatterns/data/qsorttuple_p.h
@@ -56,8 +56,6 @@
 #include <private/qitem_p.h>
 #include <private/qitemtype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -143,6 +141,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/quntypedatomic_p.h b/src/xmlpatterns/data/quntypedatomic_p.h
index 4518eaa..4193d99 100644
--- a/src/xmlpatterns/data/quntypedatomic_p.h
+++ b/src/xmlpatterns/data/quntypedatomic_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qatomicstring_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -92,6 +90,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qvalidationerror_p.h b/src/xmlpatterns/data/qvalidationerror_p.h
index d7a1964..e271750 100644
--- a/src/xmlpatterns/data/qvalidationerror_p.h
+++ b/src/xmlpatterns/data/qvalidationerror_p.h
@@ -55,8 +55,6 @@
 #include <private/qitem_p.h>
 #include <private/qreportcontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -118,6 +116,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/data/qvaluefactory_p.h b/src/xmlpatterns/data/qvaluefactory_p.h
index 74f1249..9019297 100644
--- a/src/xmlpatterns/data/qvaluefactory_p.h
+++ b/src/xmlpatterns/data/qvaluefactory_p.h
@@ -56,7 +56,6 @@
 #include <private/qreportcontext_p.h>
 #include <private/qschematype_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -93,6 +92,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h
index cd51494..64b9264 100644
--- a/src/xmlpatterns/data/qyearmonthduration_p.h
+++ b/src/xmlpatterns/data/qyearmonthduration_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractduration_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -146,6 +144,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
index 51fcbbb..ded69a1 100644
--- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h
+++ b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qdelegatingdynamiccontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -88,6 +86,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
index 75fb2d7..4f377e5 100644
--- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
@@ -55,8 +55,6 @@
 #include <private/qdynamiccontext_p.h>
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -125,6 +123,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
index a1e7b4e..2a835ea 100644
--- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
@@ -58,8 +58,6 @@
 #include <private/qfunctionfactory_p.h>
 #include <private/qschematypefactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -142,6 +140,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h
index 51fd63e..a16e7ca 100644
--- a/src/xmlpatterns/environment/qdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdynamiccontext_p.h
@@ -62,8 +62,6 @@
 #include <private/qreportcontext_p.h>
 #include <private/qresourceloader_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDateTime;
@@ -226,6 +224,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h
index 57397c8..fcb7ea1 100644
--- a/src/xmlpatterns/environment/qfocus_p.h
+++ b/src/xmlpatterns/environment/qfocus_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qdelegatingdynamiccontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
index feb4c7a..fba1b04 100644
--- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
@@ -59,8 +59,6 @@
 #include <private/qstackcontextbase_p.h>
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -150,6 +148,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
index d0d393c..b7c6558 100644
--- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
@@ -59,8 +59,6 @@
 #include <private/qfunctionfactory_p.h>
 #include <private/qschematypefactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -194,6 +192,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
index 96e8cbc..0ca896e 100644
--- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qdelegatingdynamiccontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -84,6 +82,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qreportcontext_p.h b/src/xmlpatterns/environment/qreportcontext_p.h
index 035bea6..4283dc6 100644
--- a/src/xmlpatterns/environment/qreportcontext_p.h
+++ b/src/xmlpatterns/environment/qreportcontext_p.h
@@ -59,8 +59,6 @@
 #include <private/qnamepool_p.h>
 #include <QXmlName>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QAbstractMessageHandler;
@@ -2459,6 +2457,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h
index 1a6184e..9c09b1e 100644
--- a/src/xmlpatterns/environment/qstackcontextbase_p.h
+++ b/src/xmlpatterns/environment/qstackcontextbase_p.h
@@ -58,8 +58,6 @@
 #include <private/qdelegatingdynamiccontext_p.h>
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
index bde699e..ede23cc 100644
--- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
+++ b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qdelegatingstaticcontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -86,6 +84,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
index f4bbd93..cf7f3b7 100644
--- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
@@ -54,7 +54,6 @@
 
 #include <private/qdelegatingstaticcontext_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -79,6 +78,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h
index 89cbc31..0150843 100644
--- a/src/xmlpatterns/environment/qstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcontext_p.h
@@ -59,8 +59,6 @@
 #include <private/qreportcontext_p.h>
 #include <private/qresourceloader_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QUrl;
@@ -294,6 +292,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
index ba19eb4..a2111a3 100644
--- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qdelegatingstaticcontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -85,6 +83,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
index 0dc5931..0a3ed82 100644
--- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h
+++ b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qdelegatingstaticcontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -86,6 +84,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
index 7dd8392..63cf5a6 100644
--- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
+++ b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qdelegatingstaticcontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -84,6 +82,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qandexpression_p.h b/src/xmlpatterns/expr/qandexpression_p.h
index 03b1584..79e4c0f 100644
--- a/src/xmlpatterns/expr/qandexpression_p.h
+++ b/src/xmlpatterns/expr/qandexpression_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qapplytemplate_p.h b/src/xmlpatterns/expr/qapplytemplate_p.h
index 3e42f33..60550fe 100644
--- a/src/xmlpatterns/expr/qapplytemplate_p.h
+++ b/src/xmlpatterns/expr/qapplytemplate_p.h
@@ -54,7 +54,6 @@
 
 #include <private/qtemplatemode_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -139,6 +138,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/expr/qargumentreference_p.h b/src/xmlpatterns/expr/qargumentreference_p.h
index ecdd72a..5e60313 100644
--- a/src/xmlpatterns/expr/qargumentreference_p.h
+++ b/src/xmlpatterns/expr/qargumentreference_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qvariablereference_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qarithmeticexpression_p.h b/src/xmlpatterns/expr/qarithmeticexpression_p.h
index 933df98..6c43f9b 100644
--- a/src/xmlpatterns/expr/qarithmeticexpression_p.h
+++ b/src/xmlpatterns/expr/qarithmeticexpression_p.h
@@ -55,8 +55,6 @@
 #include <private/qatomicmathematician_p.h>
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -128,6 +126,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qattributeconstructor_p.h b/src/xmlpatterns/expr/qattributeconstructor_p.h
index 2a29c0d..e226533 100644
--- a/src/xmlpatterns/expr/qattributeconstructor_p.h
+++ b/src/xmlpatterns/expr/qattributeconstructor_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -103,6 +101,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qattributenamevalidator_p.h b/src/xmlpatterns/expr/qattributenamevalidator_p.h
index ea7b832..7ab6127 100644
--- a/src/xmlpatterns/expr/qattributenamevalidator_p.h
+++ b/src/xmlpatterns/expr/qattributenamevalidator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -94,6 +92,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qaxisstep_p.h b/src/xmlpatterns/expr/qaxisstep_p.h
index faf247f..6f2ff7f 100644
--- a/src/xmlpatterns/expr/qaxisstep_p.h
+++ b/src/xmlpatterns/expr/qaxisstep_p.h
@@ -55,8 +55,6 @@
 #include <private/qemptycontainer_p.h>
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -163,6 +161,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcachecells_p.h b/src/xmlpatterns/expr/qcachecells_p.h
index 69a0045..38790df 100644
--- a/src/xmlpatterns/expr/qcachecells_p.h
+++ b/src/xmlpatterns/expr/qcachecells_p.h
@@ -57,8 +57,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -152,6 +150,4 @@ Q_DECLARE_TYPEINFO(QPatternist::ItemSequenceCacheCell, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcallsite_p.h b/src/xmlpatterns/expr/qcallsite_p.h
index 90b13ee..8ae5c68 100644
--- a/src/xmlpatterns/expr/qcallsite_p.h
+++ b/src/xmlpatterns/expr/qcallsite_p.h
@@ -56,7 +56,6 @@
 #include <private/qcalltargetdescription_p.h>
 #include <QXmlName>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -106,6 +105,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h
index 4489b1b..6989593 100644
--- a/src/xmlpatterns/expr/qcalltargetdescription_p.h
+++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename Key, typename Value> class QHash;
@@ -114,7 +112,5 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/xmlpatterns/expr/qcalltemplate_p.h b/src/xmlpatterns/expr/qcalltemplate_p.h
index d3f787d..deac7bc 100644
--- a/src/xmlpatterns/expr/qcalltemplate_p.h
+++ b/src/xmlpatterns/expr/qcalltemplate_p.h
@@ -56,7 +56,6 @@
 #include <private/qtemplateinvoker_p.h>
 #include <private/qtemplate_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -112,6 +111,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/expr/qcastableas_p.h b/src/xmlpatterns/expr/qcastableas_p.h
index 94be0ef..96792ee 100644
--- a/src/xmlpatterns/expr/qcastableas_p.h
+++ b/src/xmlpatterns/expr/qcastableas_p.h
@@ -55,8 +55,6 @@
 #include <private/qsinglecontainer_p.h>
 #include <private/qcastingplatform_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -106,6 +104,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcastas_p.h b/src/xmlpatterns/expr/qcastas_p.h
index 75723c5..5c9a433 100644
--- a/src/xmlpatterns/expr/qcastas_p.h
+++ b/src/xmlpatterns/expr/qcastas_p.h
@@ -55,8 +55,6 @@
 #include <private/qsinglecontainer_p.h>
 #include <private/qcastingplatform_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -143,6 +141,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcastingplatform_p.h b/src/xmlpatterns/expr/qcastingplatform_p.h
index 1f6b32d..048f150 100644
--- a/src/xmlpatterns/expr/qcastingplatform_p.h
+++ b/src/xmlpatterns/expr/qcastingplatform_p.h
@@ -64,8 +64,6 @@
 #include <private/qstaticcontext_p.h>
 #include <private/qvalidationerror_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -201,6 +199,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcollationchecker_p.h b/src/xmlpatterns/expr/qcollationchecker_p.h
index 339f68c..860ccca 100644
--- a/src/xmlpatterns/expr/qcollationchecker_p.h
+++ b/src/xmlpatterns/expr/qcollationchecker_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -94,6 +92,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcombinenodes_p.h b/src/xmlpatterns/expr/qcombinenodes_p.h
index c94bddf..22d1d7d 100644
--- a/src/xmlpatterns/expr/qcombinenodes_p.h
+++ b/src/xmlpatterns/expr/qcombinenodes_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -111,6 +109,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcommentconstructor_p.h b/src/xmlpatterns/expr/qcommentconstructor_p.h
index 6c898c5..c1459ab 100644
--- a/src/xmlpatterns/expr/qcommentconstructor_p.h
+++ b/src/xmlpatterns/expr/qcommentconstructor_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -95,6 +93,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcomparisonplatform_p.h b/src/xmlpatterns/expr/qcomparisonplatform_p.h
index dd98047..1e5c684 100644
--- a/src/xmlpatterns/expr/qcomparisonplatform_p.h
+++ b/src/xmlpatterns/expr/qcomparisonplatform_p.h
@@ -60,8 +60,6 @@
 #include <private/qitemtype_p.h>
 #include <private/qpatternistlocale_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -203,6 +201,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
index 9d542ee..fff8dd3 100644
--- a/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qcomputednamespaceconstructor_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -97,6 +95,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcontextitem_p.h b/src/xmlpatterns/expr/qcontextitem_p.h
index fa3a0e6..6cfc700 100644
--- a/src/xmlpatterns/expr/qcontextitem_p.h
+++ b/src/xmlpatterns/expr/qcontextitem_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -123,6 +121,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcopyof_p.h b/src/xmlpatterns/expr/qcopyof_p.h
index ff9eeb6..fc1a6b2 100644
--- a/src/xmlpatterns/expr/qcopyof_p.h
+++ b/src/xmlpatterns/expr/qcopyof_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -116,6 +114,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qcurrentitemstore_p.h b/src/xmlpatterns/expr/qcurrentitemstore_p.h
index 42d492f..7d85177 100644
--- a/src/xmlpatterns/expr/qcurrentitemstore_p.h
+++ b/src/xmlpatterns/expr/qcurrentitemstore_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -99,6 +97,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qdocumentconstructor_p.h b/src/xmlpatterns/expr/qdocumentconstructor_p.h
index 976eae0..76dd6f2 100644
--- a/src/xmlpatterns/expr/qdocumentconstructor_p.h
+++ b/src/xmlpatterns/expr/qdocumentconstructor_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
index 468e199..f3a2722 100644
--- a/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
+++ b/src/xmlpatterns/expr/qdocumentcontentvalidator_p.h
@@ -56,8 +56,6 @@
 #include <private/qexpression_p.h>
 #include "qabstractxmlreceiver.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -112,6 +110,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qdynamiccontextstore_p.h b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
index ffd4e36..050034c 100644
--- a/src/xmlpatterns/expr/qdynamiccontextstore_p.h
+++ b/src/xmlpatterns/expr/qdynamiccontextstore_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -92,6 +90,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qelementconstructor_p.h b/src/xmlpatterns/expr/qelementconstructor_p.h
index e14580b..1a99cf3 100644
--- a/src/xmlpatterns/expr/qelementconstructor_p.h
+++ b/src/xmlpatterns/expr/qelementconstructor_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -102,6 +100,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qemptycontainer_p.h b/src/xmlpatterns/expr/qemptycontainer_p.h
index 990e51f..c974a6a 100644
--- a/src/xmlpatterns/expr/qemptycontainer_p.h
+++ b/src/xmlpatterns/expr/qemptycontainer_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qemptysequence_p.h b/src/xmlpatterns/expr/qemptysequence_p.h
index 6ca34f1..f4dd36a 100644
--- a/src/xmlpatterns/expr/qemptysequence_p.h
+++ b/src/xmlpatterns/expr/qemptysequence_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h
index 2dc8940..ca4d09d 100644
--- a/src/xmlpatterns/expr/qevaluationcache_p.h
+++ b/src/xmlpatterns/expr/qevaluationcache_p.h
@@ -59,8 +59,6 @@
 #include <private/qsinglecontainer_p.h>
 #include <private/qvariabledeclaration_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -141,6 +139,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h
index 002092a..5d95fda 100644
--- a/src/xmlpatterns/expr/qexpression_p.h
+++ b/src/xmlpatterns/expr/qexpression_p.h
@@ -64,8 +64,6 @@
 #include <private/qsourcelocationreflection_p.h>
 #include <private/qstaticcontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename T> class QList;
@@ -904,6 +902,4 @@ Q_DECLARE_TYPEINFO(QPatternist::Expression::Ptr, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qexpressiondispatch_p.h b/src/xmlpatterns/expr/qexpressiondispatch_p.h
index 552fff3..e459d9f 100644
--- a/src/xmlpatterns/expr/qexpressiondispatch_p.h
+++ b/src/xmlpatterns/expr/qexpressiondispatch_p.h
@@ -55,8 +55,6 @@
 #include <QSharedData>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -236,6 +234,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qexpressionfactory_p.h b/src/xmlpatterns/expr/qexpressionfactory_p.h
index a257932..d4a16c5 100644
--- a/src/xmlpatterns/expr/qexpressionfactory_p.h
+++ b/src/xmlpatterns/expr/qexpressionfactory_p.h
@@ -60,8 +60,6 @@
 #include <QSharedData>
 #include <QUrl>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
@@ -182,6 +180,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qexpressionsequence_p.h b/src/xmlpatterns/expr/qexpressionsequence_p.h
index 28b096b..e907460 100644
--- a/src/xmlpatterns/expr/qexpressionsequence_p.h
+++ b/src/xmlpatterns/expr/qexpressionsequence_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qunlimitedcontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qexpressionvariablereference_p.h b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
index 88c3b94..cd9529a 100644
--- a/src/xmlpatterns/expr/qexpressionvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexpressionvariablereference_p.h
@@ -55,8 +55,6 @@
 #include <private/qvariabledeclaration_p.h>
 #include <private/qvariablereference_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qexternalvariableloader_p.h b/src/xmlpatterns/expr/qexternalvariableloader_p.h
index 323b054..f423fee 100644
--- a/src/xmlpatterns/expr/qexternalvariableloader_p.h
+++ b/src/xmlpatterns/expr/qexternalvariableloader_p.h
@@ -56,8 +56,6 @@
 #include <private/qsequencetype_p.h>
 #include <QXmlName>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -134,6 +132,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qexternalvariablereference_p.h b/src/xmlpatterns/expr/qexternalvariablereference_p.h
index 8ba1141..9823f03 100644
--- a/src/xmlpatterns/expr/qexternalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qexternalvariablereference_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qfirstitempredicate_p.h b/src/xmlpatterns/expr/qfirstitempredicate_p.h
index 321c53b..a61e136 100644
--- a/src/xmlpatterns/expr/qfirstitempredicate_p.h
+++ b/src/xmlpatterns/expr/qfirstitempredicate_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qforclause_p.h b/src/xmlpatterns/expr/qforclause_p.h
index c416ea4..c5792b4 100644
--- a/src/xmlpatterns/expr/qforclause_p.h
+++ b/src/xmlpatterns/expr/qforclause_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -117,6 +115,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qgeneralcomparison_p.h b/src/xmlpatterns/expr/qgeneralcomparison_p.h
index 3aa2955..0530ad7 100644
--- a/src/xmlpatterns/expr/qgeneralcomparison_p.h
+++ b/src/xmlpatterns/expr/qgeneralcomparison_p.h
@@ -56,8 +56,6 @@
 #include <private/qpaircontainer_p.h>
 #include <private/qcomparisonplatform_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qgenericpredicate_p.h b/src/xmlpatterns/expr/qgenericpredicate_p.h
index ab8ff75..72d26b8 100644
--- a/src/xmlpatterns/expr/qgenericpredicate_p.h
+++ b/src/xmlpatterns/expr/qgenericpredicate_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -143,6 +141,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qifthenclause_p.h b/src/xmlpatterns/expr/qifthenclause_p.h
index ba80804..e1a34fb 100644
--- a/src/xmlpatterns/expr/qifthenclause_p.h
+++ b/src/xmlpatterns/expr/qifthenclause_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qtriplecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qinstanceof_p.h b/src/xmlpatterns/expr/qinstanceof_p.h
index bd4290f..d4e9116 100644
--- a/src/xmlpatterns/expr/qinstanceof_p.h
+++ b/src/xmlpatterns/expr/qinstanceof_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qletclause_p.h b/src/xmlpatterns/expr/qletclause_p.h
index 63ebd34..e0db56f 100644
--- a/src/xmlpatterns/expr/qletclause_p.h
+++ b/src/xmlpatterns/expr/qletclause_p.h
@@ -55,8 +55,6 @@
 #include <private/qpaircontainer_p.h>
 #include <private/qvariabledeclaration_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qliteral_p.h b/src/xmlpatterns/expr/qliteral_p.h
index aefa8d1..7ecf6d3 100644
--- a/src/xmlpatterns/expr/qliteral_p.h
+++ b/src/xmlpatterns/expr/qliteral_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -143,6 +141,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qliteralsequence_p.h b/src/xmlpatterns/expr/qliteralsequence_p.h
index 32921c8..67db8e1 100644
--- a/src/xmlpatterns/expr/qliteralsequence_p.h
+++ b/src/xmlpatterns/expr/qliteralsequence_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -99,6 +97,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qnamespaceconstructor_p.h b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
index 0e8c9a0..df16312 100644
--- a/src/xmlpatterns/expr/qnamespaceconstructor_p.h
+++ b/src/xmlpatterns/expr/qnamespaceconstructor_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qncnameconstructor_p.h b/src/xmlpatterns/expr/qncnameconstructor_p.h
index 110205d..52f9d07 100644
--- a/src/xmlpatterns/expr/qncnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qncnameconstructor_p.h
@@ -56,8 +56,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <private/qxmlutils_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -149,6 +147,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qnodecomparison_p.h b/src/xmlpatterns/expr/qnodecomparison_p.h
index 1844d01..89fb00e 100644
--- a/src/xmlpatterns/expr/qnodecomparison_p.h
+++ b/src/xmlpatterns/expr/qnodecomparison_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qnodesort_p.h b/src/xmlpatterns/expr/qnodesort_p.h
index 8cf620b..460cb3e 100644
--- a/src/xmlpatterns/expr/qnodesort_p.h
+++ b/src/xmlpatterns/expr/qnodesort_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qoperandsiterator_p.h b/src/xmlpatterns/expr/qoperandsiterator_p.h
index 526f1f1..5ec45c8 100644
--- a/src/xmlpatterns/expr/qoperandsiterator_p.h
+++ b/src/xmlpatterns/expr/qoperandsiterator_p.h
@@ -57,8 +57,6 @@
 
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -188,6 +186,5 @@ namespace QPatternist
 
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/expr/qoptimizationpasses_p.h b/src/xmlpatterns/expr/qoptimizationpasses_p.h
index e78f39e..b0f0658 100644
--- a/src/xmlpatterns/expr/qoptimizationpasses_p.h
+++ b/src/xmlpatterns/expr/qoptimizationpasses_p.h
@@ -56,8 +56,6 @@
 #include <private/qexpression_p.h>
 #include <private/qoptimizerframework_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -138,6 +136,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qoptimizerblocks_p.h b/src/xmlpatterns/expr/qoptimizerblocks_p.h
index 57552d1..ab6ca5a 100644
--- a/src/xmlpatterns/expr/qoptimizerblocks_p.h
+++ b/src/xmlpatterns/expr/qoptimizerblocks_p.h
@@ -56,8 +56,6 @@
 #include <private/qexpression_p.h>
 #include <private/qoptimizerframework_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -221,6 +219,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qoptimizerframework_p.h b/src/xmlpatterns/expr/qoptimizerframework_p.h
index 4f91457..e5344f7 100644
--- a/src/xmlpatterns/expr/qoptimizerframework_p.h
+++ b/src/xmlpatterns/expr/qoptimizerframework_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -289,6 +287,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qorderby_p.h b/src/xmlpatterns/expr/qorderby_p.h
index 21216e5..92400bf 100644
--- a/src/xmlpatterns/expr/qorderby_p.h
+++ b/src/xmlpatterns/expr/qorderby_p.h
@@ -56,8 +56,6 @@
 #include <private/qcomparisonplatform_p.h>
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -178,6 +176,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qorexpression_p.h b/src/xmlpatterns/expr/qorexpression_p.h
index 1b0ec2e..358ef25 100644
--- a/src/xmlpatterns/expr/qorexpression_p.h
+++ b/src/xmlpatterns/expr/qorexpression_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qandexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -83,6 +81,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qpaircontainer_p.h b/src/xmlpatterns/expr/qpaircontainer_p.h
index a54d7b0..679854a 100644
--- a/src/xmlpatterns/expr/qpaircontainer_p.h
+++ b/src/xmlpatterns/expr/qpaircontainer_p.h
@@ -55,8 +55,6 @@
 #include <private/qexpression_p.h>
 #include <private/qatomictype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -84,6 +82,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qparentnodeaxis_p.h b/src/xmlpatterns/expr/qparentnodeaxis_p.h
index f992443..21bd356 100644
--- a/src/xmlpatterns/expr/qparentnodeaxis_p.h
+++ b/src/xmlpatterns/expr/qparentnodeaxis_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qpath_p.h b/src/xmlpatterns/expr/qpath_p.h
index d374dd9..9e64a98 100644
--- a/src/xmlpatterns/expr/qpath_p.h
+++ b/src/xmlpatterns/expr/qpath_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -171,6 +169,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qpositionalvariablereference_p.h b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
index 1315c3c..520ce1d 100644
--- a/src/xmlpatterns/expr/qpositionalvariablereference_p.h
+++ b/src/xmlpatterns/expr/qpositionalvariablereference_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qvariablereference_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -95,6 +93,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
index 6e22f74..25b7137 100644
--- a/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
+++ b/src/xmlpatterns/expr/qprocessinginstructionconstructor_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qqnameconstructor_p.h b/src/xmlpatterns/expr/qqnameconstructor_p.h
index 74cafac..5ad47ff 100644
--- a/src/xmlpatterns/expr/qqnameconstructor_p.h
+++ b/src/xmlpatterns/expr/qqnameconstructor_p.h
@@ -57,8 +57,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <private/qxpathhelper_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -177,6 +175,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qquantifiedexpression_p.h b/src/xmlpatterns/expr/qquantifiedexpression_p.h
index 4fc130c..577aefd 100644
--- a/src/xmlpatterns/expr/qquantifiedexpression_p.h
+++ b/src/xmlpatterns/expr/qquantifiedexpression_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qrangeexpression_p.h b/src/xmlpatterns/expr/qrangeexpression_p.h
index 0a8229d..efbe184 100644
--- a/src/xmlpatterns/expr/qrangeexpression_p.h
+++ b/src/xmlpatterns/expr/qrangeexpression_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qpaircontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -107,6 +105,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qrangevariablereference_p.h b/src/xmlpatterns/expr/qrangevariablereference_p.h
index 39cb308..7420550 100644
--- a/src/xmlpatterns/expr/qrangevariablereference_p.h
+++ b/src/xmlpatterns/expr/qrangevariablereference_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qvariablereference_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -95,6 +93,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qreturnorderby_p.h b/src/xmlpatterns/expr/qreturnorderby_p.h
index 4283c14..7132e58 100644
--- a/src/xmlpatterns/expr/qreturnorderby_p.h
+++ b/src/xmlpatterns/expr/qreturnorderby_p.h
@@ -55,8 +55,6 @@
 #include <private/qorderby_p.h>
 #include <private/qunlimitedcontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
index 4a1ccc2..9be782e 100644
--- a/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qsimplecontentconstructor_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qsinglecontainer_p.h b/src/xmlpatterns/expr/qsinglecontainer_p.h
index 96f67c7..fa380a5 100644
--- a/src/xmlpatterns/expr/qsinglecontainer_p.h
+++ b/src/xmlpatterns/expr/qsinglecontainer_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -83,6 +81,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qsourcelocationreflection_p.h b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
index 6fbbcdb..99e6914 100644
--- a/src/xmlpatterns/expr/qsourcelocationreflection_p.h
+++ b/src/xmlpatterns/expr/qsourcelocationreflection_p.h
@@ -52,8 +52,6 @@
 #ifndef Patternist_SourceLocationReflection_H
 #define Patternist_SourceLocationReflection_H
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -126,6 +124,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qstaticbaseuristore_p.h b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
index 82c385c..32f8947 100644
--- a/src/xmlpatterns/expr/qstaticbaseuristore_p.h
+++ b/src/xmlpatterns/expr/qstaticbaseuristore_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
index e1482fe..97c97b6 100644
--- a/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
+++ b/src/xmlpatterns/expr/qstaticcompatibilitystore_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qtemplate_p.h b/src/xmlpatterns/expr/qtemplate_p.h
index 1881a16..c5eae92 100644
--- a/src/xmlpatterns/expr/qtemplate_p.h
+++ b/src/xmlpatterns/expr/qtemplate_p.h
@@ -61,7 +61,6 @@
 #include <private/qtemplateinvoker_p.h>
 #include <private/qvariabledeclaration_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -141,6 +140,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/expr/qtemplateinvoker_p.h b/src/xmlpatterns/expr/qtemplateinvoker_p.h
index b2c3e1f..8132fa9 100644
--- a/src/xmlpatterns/expr/qtemplateinvoker_p.h
+++ b/src/xmlpatterns/expr/qtemplateinvoker_p.h
@@ -55,7 +55,6 @@
 #include <private/qcallsite_p.h>
 #include <private/qwithparam_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -113,7 +112,6 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/xmlpatterns/expr/qtemplatemode_p.h b/src/xmlpatterns/expr/qtemplatemode_p.h
index b7e2af5..dad3206 100644
--- a/src/xmlpatterns/expr/qtemplatemode_p.h
+++ b/src/xmlpatterns/expr/qtemplatemode_p.h
@@ -57,7 +57,6 @@
 
 #include <private/qtemplatepattern_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -123,6 +122,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qtemplateparameterreference_p.h b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
index 3ce9194..18b28a5 100644
--- a/src/xmlpatterns/expr/qtemplateparameterreference_p.h
+++ b/src/xmlpatterns/expr/qtemplateparameterreference_p.h
@@ -55,7 +55,6 @@
 #include <private/qvariabledeclaration_p.h>
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -100,6 +99,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/expr/qtemplatepattern_p.h b/src/xmlpatterns/expr/qtemplatepattern_p.h
index 9f79ac9..251e247 100644
--- a/src/xmlpatterns/expr/qtemplatepattern_p.h
+++ b/src/xmlpatterns/expr/qtemplatepattern_p.h
@@ -54,7 +54,6 @@
 
 #include <private/qtemplate_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -155,7 +154,5 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/xmlpatterns/expr/qtextnodeconstructor_p.h b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
index 8662213..a1f7020 100644
--- a/src/xmlpatterns/expr/qtextnodeconstructor_p.h
+++ b/src/xmlpatterns/expr/qtextnodeconstructor_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -92,6 +90,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qtreatas_p.h b/src/xmlpatterns/expr/qtreatas_p.h
index 5ed5ae7..e4b5e72 100644
--- a/src/xmlpatterns/expr/qtreatas_p.h
+++ b/src/xmlpatterns/expr/qtreatas_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -117,6 +115,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qtriplecontainer_p.h b/src/xmlpatterns/expr/qtriplecontainer_p.h
index 64eac77..7954856 100644
--- a/src/xmlpatterns/expr/qtriplecontainer_p.h
+++ b/src/xmlpatterns/expr/qtriplecontainer_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qtruthpredicate_p.h b/src/xmlpatterns/expr/qtruthpredicate_p.h
index 6b8a90c..a10e99f 100644
--- a/src/xmlpatterns/expr/qtruthpredicate_p.h
+++ b/src/xmlpatterns/expr/qtruthpredicate_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qgenericpredicate_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -107,6 +105,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qunaryexpression_p.h b/src/xmlpatterns/expr/qunaryexpression_p.h
index 66b4cea..7934cbc 100644
--- a/src/xmlpatterns/expr/qunaryexpression_p.h
+++ b/src/xmlpatterns/expr/qunaryexpression_p.h
@@ -52,8 +52,6 @@
 #ifndef Patternist_UnaryExpression_H
 #define Patternist_UnaryExpression_H
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 #include <private/qarithmeticexpression_p.h>
@@ -109,6 +107,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qunlimitedcontainer_p.h b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
index d514549..0270f20 100644
--- a/src/xmlpatterns/expr/qunlimitedcontainer_p.h
+++ b/src/xmlpatterns/expr/qunlimitedcontainer_p.h
@@ -56,8 +56,6 @@
 #include <private/qexpression_p.h>
 #include <private/qgenericsequencetype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -144,6 +142,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
index fbf612b..9a09b48 100644
--- a/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
+++ b/src/xmlpatterns/expr/qunresolvedvariablereference_p.h
@@ -54,7 +54,6 @@
 
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -106,6 +105,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h
index f00f4b1..c0ccbaa 100644
--- a/src/xmlpatterns/expr/quserfunction_p.h
+++ b/src/xmlpatterns/expr/quserfunction_p.h
@@ -58,8 +58,6 @@
 #include <private/qfunctionsignature_p.h>
 #include <private/qvariabledeclaration_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename T> class QList;
@@ -130,6 +128,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/quserfunctioncallsite_p.h b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
index 3ec04d6..936cede 100644
--- a/src/xmlpatterns/expr/quserfunctioncallsite_p.h
+++ b/src/xmlpatterns/expr/quserfunctioncallsite_p.h
@@ -58,7 +58,6 @@
 #include <private/quserfunction_p.h>
 #include <private/qvariabledeclaration_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -177,6 +176,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qvalidate_p.h b/src/xmlpatterns/expr/qvalidate_p.h
index 1a4404c..ecf0556 100644
--- a/src/xmlpatterns/expr/qvalidate_p.h
+++ b/src/xmlpatterns/expr/qvalidate_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -101,6 +99,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qvaluecomparison_p.h b/src/xmlpatterns/expr/qvaluecomparison_p.h
index 900f7f3..f00a7d5 100644
--- a/src/xmlpatterns/expr/qvaluecomparison_p.h
+++ b/src/xmlpatterns/expr/qvaluecomparison_p.h
@@ -56,8 +56,6 @@
 #include <private/qpaircontainer_p.h>
 #include <private/qcomparisonplatform_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -133,6 +131,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qvariabledeclaration_p.h b/src/xmlpatterns/expr/qvariabledeclaration_p.h
index 77f7b89..8111318 100644
--- a/src/xmlpatterns/expr/qvariabledeclaration_p.h
+++ b/src/xmlpatterns/expr/qvariabledeclaration_p.h
@@ -58,8 +58,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <private/qvariablereference_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename T> class QStack;
@@ -198,6 +196,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qvariablereference_p.h b/src/xmlpatterns/expr/qvariablereference_p.h
index 972677e..810dcab 100644
--- a/src/xmlpatterns/expr/qvariablereference_p.h
+++ b/src/xmlpatterns/expr/qvariablereference_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qemptycontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename T> class QList;
@@ -116,6 +114,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qwithparam_p.h b/src/xmlpatterns/expr/qwithparam_p.h
index b5f808f..a574fa3 100644
--- a/src/xmlpatterns/expr/qwithparam_p.h
+++ b/src/xmlpatterns/expr/qwithparam_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctionargument_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -118,6 +116,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
index dd71f0d..00b910d 100644
--- a/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
+++ b/src/xmlpatterns/expr/qxsltsimplecontentconstructor_p.h
@@ -54,7 +54,6 @@
 
 #include <private/qsimplecontentconstructor_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -84,6 +83,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
index 9d70d88..e160203 100644
--- a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
+++ b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
@@ -56,8 +56,6 @@
 #include <private/qfunctionfactory_p.h>
 #include <private/qfunctionsignature_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -152,6 +150,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h
index f2bb3ea..4f2ca63 100644
--- a/src/xmlpatterns/functions/qaccessorfns_p.h
+++ b/src/xmlpatterns/functions/qaccessorfns_p.h
@@ -62,8 +62,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -133,6 +131,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qaggregatefns_p.h b/src/xmlpatterns/functions/qaggregatefns_p.h
index 055a2e5..2fa186a 100644
--- a/src/xmlpatterns/functions/qaggregatefns_p.h
+++ b/src/xmlpatterns/functions/qaggregatefns_p.h
@@ -68,8 +68,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -151,6 +149,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qaggregator_p.h b/src/xmlpatterns/functions/qaggregator_p.h
index 1d8f079..bee11aa 100644
--- a/src/xmlpatterns/functions/qaggregator_p.h
+++ b/src/xmlpatterns/functions/qaggregator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qassemblestringfns_p.h b/src/xmlpatterns/functions/qassemblestringfns_p.h
index 25fae15..4d23bb4 100644
--- a/src/xmlpatterns/functions/qassemblestringfns_p.h
+++ b/src/xmlpatterns/functions/qassemblestringfns_p.h
@@ -65,8 +65,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qbooleanfns_p.h b/src/xmlpatterns/functions/qbooleanfns_p.h
index 0a7ef68..8635a82 100644
--- a/src/xmlpatterns/functions/qbooleanfns_p.h
+++ b/src/xmlpatterns/functions/qbooleanfns_p.h
@@ -63,8 +63,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -114,6 +112,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qcomparescaseaware_p.h b/src/xmlpatterns/functions/qcomparescaseaware_p.h
index 06cdc93..4a1dc95 100644
--- a/src/xmlpatterns/functions/qcomparescaseaware_p.h
+++ b/src/xmlpatterns/functions/qcomparescaseaware_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qcomparestringfns_p.h b/src/xmlpatterns/functions/qcomparestringfns_p.h
index 2e70fc7..effaa57 100644
--- a/src/xmlpatterns/functions/qcomparestringfns_p.h
+++ b/src/xmlpatterns/functions/qcomparestringfns_p.h
@@ -63,8 +63,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -97,6 +95,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qcomparingaggregator_p.h b/src/xmlpatterns/functions/qcomparingaggregator_p.h
index 4c74024..299fb1e 100644
--- a/src/xmlpatterns/functions/qcomparingaggregator_p.h
+++ b/src/xmlpatterns/functions/qcomparingaggregator_p.h
@@ -67,8 +67,6 @@
 #include <private/quntypedatomicconverter_p.h>
 #include <private/qpatternistlocale_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -141,6 +139,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
index 9ef757d..092cf05 100644
--- a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
+++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
@@ -55,8 +55,6 @@
 #include <private/qabstractfunctionfactory_p.h>
 #include <private/qschematypefactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -90,6 +88,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qcontextfns_p.h b/src/xmlpatterns/functions/qcontextfns_p.h
index 6f7dd0d..8e91cb0 100644
--- a/src/xmlpatterns/functions/qcontextfns_p.h
+++ b/src/xmlpatterns/functions/qcontextfns_p.h
@@ -63,8 +63,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -190,6 +188,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qcontextnodechecker_p.h b/src/xmlpatterns/functions/qcontextnodechecker_p.h
index c6ceb37..2b29dfd 100644
--- a/src/xmlpatterns/functions/qcontextnodechecker_p.h
+++ b/src/xmlpatterns/functions/qcontextnodechecker_p.h
@@ -54,7 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -80,6 +79,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/functions/qcurrentfn_p.h b/src/xmlpatterns/functions/qcurrentfn_p.h
index 3572a69..b034f3d 100644
--- a/src/xmlpatterns/functions/qcurrentfn_p.h
+++ b/src/xmlpatterns/functions/qcurrentfn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -84,6 +82,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qdatetimefn_p.h b/src/xmlpatterns/functions/qdatetimefn_p.h
index 6616933..053a077 100644
--- a/src/xmlpatterns/functions/qdatetimefn_p.h
+++ b/src/xmlpatterns/functions/qdatetimefn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -77,6 +75,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qdatetimefns_p.h b/src/xmlpatterns/functions/qdatetimefns_p.h
index dcf5339..22327f9 100644
--- a/src/xmlpatterns/functions/qdatetimefns_p.h
+++ b/src/xmlpatterns/functions/qdatetimefns_p.h
@@ -69,8 +69,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -300,6 +298,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qdeepequalfn_p.h b/src/xmlpatterns/functions/qdeepequalfn_p.h
index b4ee4dc..7f6324d 100644
--- a/src/xmlpatterns/functions/qdeepequalfn_p.h
+++ b/src/xmlpatterns/functions/qdeepequalfn_p.h
@@ -56,8 +56,6 @@
 #include <private/qcomparisonplatform_p.h>
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qdocumentfn_p.h b/src/xmlpatterns/functions/qdocumentfn_p.h
index c515f6d..8a70a59 100644
--- a/src/xmlpatterns/functions/qdocumentfn_p.h
+++ b/src/xmlpatterns/functions/qdocumentfn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -119,6 +117,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qelementavailablefn_p.h b/src/xmlpatterns/functions/qelementavailablefn_p.h
index a15e227..9881ac3 100644
--- a/src/xmlpatterns/functions/qelementavailablefn_p.h
+++ b/src/xmlpatterns/functions/qelementavailablefn_p.h
@@ -54,7 +54,6 @@
 
 #include <private/qstaticnamespacescontainer_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -82,6 +81,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qerrorfn_p.h b/src/xmlpatterns/functions/qerrorfn_p.h
index d0c3fe7..95dae58 100644
--- a/src/xmlpatterns/functions/qerrorfn_p.h
+++ b/src/xmlpatterns/functions/qerrorfn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -86,6 +84,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qfunctionargument_p.h b/src/xmlpatterns/functions/qfunctionargument_p.h
index 5390cba..0115166 100644
--- a/src/xmlpatterns/functions/qfunctionargument_p.h
+++ b/src/xmlpatterns/functions/qfunctionargument_p.h
@@ -58,8 +58,6 @@
 #include <QXmlName>
 #include <private/qsequencetype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -93,6 +91,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qfunctionavailablefn_p.h b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
index a36fa92..b655b59 100644
--- a/src/xmlpatterns/functions/qfunctionavailablefn_p.h
+++ b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
@@ -55,8 +55,6 @@
 #include <private/qstaticnamespacescontainer_p.h>
 #include <private/qfunctionfactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 }
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qfunctioncall_p.h b/src/xmlpatterns/functions/qfunctioncall_p.h
index a91d91a..5a14852 100644
--- a/src/xmlpatterns/functions/qfunctioncall_p.h
+++ b/src/xmlpatterns/functions/qfunctioncall_p.h
@@ -56,8 +56,6 @@
 #include <private/qfunctionsignature_p.h>
 #include <private/qxpathhelper_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -97,6 +95,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qfunctionfactory_p.h b/src/xmlpatterns/functions/qfunctionfactory_p.h
index 4507b02..7961d87 100644
--- a/src/xmlpatterns/functions/qfunctionfactory_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactory_p.h
@@ -61,8 +61,6 @@
 #include <private/qprimitives_p.h>
 #include <QXmlName>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -163,6 +161,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
index 014af6b..dc7296d 100644
--- a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
@@ -55,8 +55,6 @@
 
 #include <private/qfunctionfactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -113,6 +111,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qfunctionsignature_p.h b/src/xmlpatterns/functions/qfunctionsignature_p.h
index ee56c28..acf60c7 100644
--- a/src/xmlpatterns/functions/qfunctionsignature_p.h
+++ b/src/xmlpatterns/functions/qfunctionsignature_p.h
@@ -60,8 +60,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <private/qprimitives_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename Key, typename Value> class QHash;
@@ -208,6 +206,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h
index 974bf6a..9c4a0ce 100644
--- a/src/xmlpatterns/functions/qgenerateidfn_p.h
+++ b/src/xmlpatterns/functions/qgenerateidfn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 namespace QPatternist
 {
@@ -78,6 +76,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qnodefns_p.h b/src/xmlpatterns/functions/qnodefns_p.h
index 88d3fb8..c64f7f5 100644
--- a/src/xmlpatterns/functions/qnodefns_p.h
+++ b/src/xmlpatterns/functions/qnodefns_p.h
@@ -64,8 +64,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -171,6 +169,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qnumericfns_p.h b/src/xmlpatterns/functions/qnumericfns_p.h
index 2b86e8b..3898378 100644
--- a/src/xmlpatterns/functions/qnumericfns_p.h
+++ b/src/xmlpatterns/functions/qnumericfns_p.h
@@ -63,8 +63,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -135,6 +133,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qpatternmatchingfns_p.h b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
index 0070485..fc4ddb1 100644
--- a/src/xmlpatterns/functions/qpatternmatchingfns_p.h
+++ b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
@@ -63,8 +63,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -134,6 +132,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h
index 3548111..d1d218a 100644
--- a/src/xmlpatterns/functions/qpatternplatform_p.h
+++ b/src/xmlpatterns/functions/qpatternplatform_p.h
@@ -57,8 +57,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -190,6 +188,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qqnamefns_p.h b/src/xmlpatterns/functions/qqnamefns_p.h
index e965385..e71c274 100644
--- a/src/xmlpatterns/functions/qqnamefns_p.h
+++ b/src/xmlpatterns/functions/qqnamefns_p.h
@@ -63,8 +63,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -157,6 +155,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qresolveurifn_p.h b/src/xmlpatterns/functions/qresolveurifn_p.h
index 331d1bc..722d9e6 100644
--- a/src/xmlpatterns/functions/qresolveurifn_p.h
+++ b/src/xmlpatterns/functions/qresolveurifn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -77,6 +75,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h
index c0382b7..913d9b3 100644
--- a/src/xmlpatterns/functions/qsequencefns_p.h
+++ b/src/xmlpatterns/functions/qsequencefns_p.h
@@ -68,8 +68,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -339,6 +337,4 @@ statEnv |-  (FN-URI,"reverse")(Type) : prime(Type) * quantifier(Type)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
index 3bd3394..b46c8de 100644
--- a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
+++ b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
@@ -65,8 +65,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -162,6 +160,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
diff --git a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
index d1c8ca7..1e1323b 100644
--- a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
@@ -56,7 +56,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -103,5 +102,5 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
+
 #endif
diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
index 1fda37a..2a09d0a 100644
--- a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -110,6 +108,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qstringvaluefns_p.h b/src/xmlpatterns/functions/qstringvaluefns_p.h
index 18218dd..4f0f247 100644
--- a/src/xmlpatterns/functions/qstringvaluefns_p.h
+++ b/src/xmlpatterns/functions/qstringvaluefns_p.h
@@ -65,8 +65,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -288,6 +286,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qsubstringfns_p.h b/src/xmlpatterns/functions/qsubstringfns_p.h
index 9daae80..9c67e30 100644
--- a/src/xmlpatterns/functions/qsubstringfns_p.h
+++ b/src/xmlpatterns/functions/qsubstringfns_p.h
@@ -62,8 +62,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qsystempropertyfn_p.h b/src/xmlpatterns/functions/qsystempropertyfn_p.h
index 755a96f..f85f863 100644
--- a/src/xmlpatterns/functions/qsystempropertyfn_p.h
+++ b/src/xmlpatterns/functions/qsystempropertyfn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qstaticnamespacescontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qtimezonefns_p.h b/src/xmlpatterns/functions/qtimezonefns_p.h
index 5570baa..7d0c4ae 100644
--- a/src/xmlpatterns/functions/qtimezonefns_p.h
+++ b/src/xmlpatterns/functions/qtimezonefns_p.h
@@ -63,8 +63,6 @@
  * @ingroup Patternist_functions
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -131,6 +129,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qtracefn_p.h b/src/xmlpatterns/functions/qtracefn_p.h
index 198528d..7b307a3 100644
--- a/src/xmlpatterns/functions/qtracefn_p.h
+++ b/src/xmlpatterns/functions/qtracefn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qfunctioncall_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ statEnv |-  (FN-URI,"trace")(Type) : prime(Type) * quantifier(Type)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qtypeavailablefn_p.h b/src/xmlpatterns/functions/qtypeavailablefn_p.h
index 13a5cee..64a3623 100644
--- a/src/xmlpatterns/functions/qtypeavailablefn_p.h
+++ b/src/xmlpatterns/functions/qtypeavailablefn_p.h
@@ -55,8 +55,6 @@
 #include <private/qschematypefactory_p.h>
 #include <private/qstaticnamespacescontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -87,6 +85,4 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
index ab74211..763619a 100644
--- a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qcontextnodechecker_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -77,6 +75,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qunparsedentityurifn_p.h b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
index 2b6c41a..a577993 100644
--- a/src/xmlpatterns/functions/qunparsedentityurifn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qcontextnodechecker_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -77,6 +75,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
index 2f6a241..e06ec99 100644
--- a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qstaticbaseuricontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 namespace QPatternist
 {
@@ -78,6 +76,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qunparsedtextfn_p.h b/src/xmlpatterns/functions/qunparsedtextfn_p.h
index 37ae964..6627b52 100644
--- a/src/xmlpatterns/functions/qunparsedtextfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextfn_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qstaticbaseuricontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 namespace QPatternist
 {
@@ -78,6 +76,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qxpath10corefunctions_p.h b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
index 0d91068..d3adc03 100644
--- a/src/xmlpatterns/functions/qxpath10corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractfunctionfactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -88,6 +86,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qxpath20corefunctions_p.h b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
index d7228ae..23913d1 100644
--- a/src/xmlpatterns/functions/qxpath20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractfunctionfactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/functions/qxslt20corefunctions_p.h b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
index fc390d8..708d5af 100644
--- a/src/xmlpatterns/functions/qxslt20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractfunctionfactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -89,6 +87,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qcachingiterator_p.h b/src/xmlpatterns/iterators/qcachingiterator_p.h
index 21c3ee7..380e97b 100644
--- a/src/xmlpatterns/iterators/qcachingiterator_p.h
+++ b/src/xmlpatterns/iterators/qcachingiterator_p.h
@@ -58,8 +58,6 @@
 #include <private/qdynamiccontext_p.h>
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -124,6 +122,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
index 0fc95e1..b94a512 100644
--- a/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
+++ b/src/xmlpatterns/iterators/qdeduplicateiterator_p.h
@@ -60,8 +60,6 @@
 #include <private/qcomparisonplatform_p.h>
 #include <private/qsourcelocationreflection_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qdistinctiterator_p.h b/src/xmlpatterns/iterators/qdistinctiterator_p.h
index 7e0b3ee..2fbff9d 100644
--- a/src/xmlpatterns/iterators/qdistinctiterator_p.h
+++ b/src/xmlpatterns/iterators/qdistinctiterator_p.h
@@ -60,8 +60,6 @@
 #include <private/qcomparisonplatform_p.h>
 #include <private/qsourcelocationreflection_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -123,6 +121,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qemptyiterator_p.h b/src/xmlpatterns/iterators/qemptyiterator_p.h
index 8d99282..2af3d13 100644
--- a/src/xmlpatterns/iterators/qemptyiterator_p.h
+++ b/src/xmlpatterns/iterators/qemptyiterator_p.h
@@ -55,8 +55,6 @@
 #include <private/qabstractxmlforwarditerator_p.h>
 #include <private/qprimitives_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -141,6 +139,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qexceptiterator_p.h b/src/xmlpatterns/iterators/qexceptiterator_p.h
index 5d6a8ff..942bc71 100644
--- a/src/xmlpatterns/iterators/qexceptiterator_p.h
+++ b/src/xmlpatterns/iterators/qexceptiterator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qindexofiterator_p.h b/src/xmlpatterns/iterators/qindexofiterator_p.h
index 88040e3..4ed5c8b 100644
--- a/src/xmlpatterns/iterators/qindexofiterator_p.h
+++ b/src/xmlpatterns/iterators/qindexofiterator_p.h
@@ -58,8 +58,6 @@
 #include <private/qdynamiccontext_p.h>
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -124,6 +122,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qinsertioniterator_p.h b/src/xmlpatterns/iterators/qinsertioniterator_p.h
index 2108452..2ff324e 100644
--- a/src/xmlpatterns/iterators/qinsertioniterator_p.h
+++ b/src/xmlpatterns/iterators/qinsertioniterator_p.h
@@ -55,8 +55,6 @@
 #include <private/qabstractxmlforwarditerator_p.h>
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -115,6 +113,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qintersectiterator_p.h b/src/xmlpatterns/iterators/qintersectiterator_p.h
index df80a24..b0363ef 100644
--- a/src/xmlpatterns/iterators/qintersectiterator_p.h
+++ b/src/xmlpatterns/iterators/qintersectiterator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -102,6 +100,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qitemmappingiterator_p.h b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
index 8fba02d..b9e40e0 100644
--- a/src/xmlpatterns/iterators/qitemmappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qitemmappingiterator_p.h
@@ -55,8 +55,6 @@
 #include <private/qabstractxmlforwarditerator_p.h>
 #include <private/qdynamiccontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -185,6 +183,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qrangeiterator_p.h b/src/xmlpatterns/iterators/qrangeiterator_p.h
index b8bfec6..8079f55 100644
--- a/src/xmlpatterns/iterators/qrangeiterator_p.h
+++ b/src/xmlpatterns/iterators/qrangeiterator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -136,6 +134,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qremovaliterator_p.h b/src/xmlpatterns/iterators/qremovaliterator_p.h
index 9476928..12cef31 100644
--- a/src/xmlpatterns/iterators/qremovaliterator_p.h
+++ b/src/xmlpatterns/iterators/qremovaliterator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -117,6 +115,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
index c4d0d0a..253c442 100644
--- a/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
+++ b/src/xmlpatterns/iterators/qsequencemappingiterator_p.h
@@ -55,8 +55,6 @@
 #include <private/qabstractxmlforwarditerator_p.h>
 #include <private/qdynamiccontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -232,6 +230,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qsingletoniterator_p.h b/src/xmlpatterns/iterators/qsingletoniterator_p.h
index c4ad83d..18abb33 100644
--- a/src/xmlpatterns/iterators/qsingletoniterator_p.h
+++ b/src/xmlpatterns/iterators/qsingletoniterator_p.h
@@ -56,8 +56,6 @@
 
 #include <QtXmlPatterns/private/qprimitives_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -172,6 +170,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
index 43338a0..db8b2e0 100644
--- a/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
+++ b/src/xmlpatterns/iterators/qsubsequenceiterator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -113,6 +111,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
index 86b9869..05f5cfe 100644
--- a/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
+++ b/src/xmlpatterns/iterators/qtocodepointsiterator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/iterators/qunioniterator_p.h b/src/xmlpatterns/iterators/qunioniterator_p.h
index a753278..7fe1ed7 100644
--- a/src/xmlpatterns/iterators/qunioniterator_p.h
+++ b/src/xmlpatterns/iterators/qunioniterator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -102,6 +100,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/janitors/qargumentconverter_p.h b/src/xmlpatterns/janitors/qargumentconverter_p.h
index eafd465..ec0cccd 100644
--- a/src/xmlpatterns/janitors/qargumentconverter_p.h
+++ b/src/xmlpatterns/janitors/qargumentconverter_p.h
@@ -54,8 +54,6 @@
 
 #include <private/quntypedatomicconverter_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/janitors/qatomizer_p.h b/src/xmlpatterns/janitors/qatomizer_p.h
index ea91928..1e463dd 100644
--- a/src/xmlpatterns/janitors/qatomizer_p.h
+++ b/src/xmlpatterns/janitors/qatomizer_p.h
@@ -55,8 +55,6 @@
 #include <private/qitem_p.h>
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -105,6 +103,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/janitors/qcardinalityverifier_p.h b/src/xmlpatterns/janitors/qcardinalityverifier_p.h
index c6de02f..cfdae8b 100644
--- a/src/xmlpatterns/janitors/qcardinalityverifier_p.h
+++ b/src/xmlpatterns/janitors/qcardinalityverifier_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -123,6 +121,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/janitors/qebvextractor_p.h b/src/xmlpatterns/janitors/qebvextractor_p.h
index 9e5ec79..91ffcb7 100644
--- a/src/xmlpatterns/janitors/qebvextractor_p.h
+++ b/src/xmlpatterns/janitors/qebvextractor_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/janitors/qitemverifier_p.h b/src/xmlpatterns/janitors/qitemverifier_p.h
index fe433b1..4459e31 100644
--- a/src/xmlpatterns/janitors/qitemverifier_p.h
+++ b/src/xmlpatterns/janitors/qitemverifier_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qsinglecontainer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
index 8f73719..87af5f4 100644
--- a/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
+++ b/src/xmlpatterns/janitors/quntypedatomicconverter_p.h
@@ -56,8 +56,6 @@
 #include <private/qsinglecontainer_p.h>
 #include <private/qcastingplatform_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h
index a4cdf77..760777d 100644
--- a/src/xmlpatterns/parser/qmaintainingreader_p.h
+++ b/src/xmlpatterns/parser/qmaintainingreader_p.h
@@ -61,7 +61,6 @@
 #include <private/qxpathhelper_p.h>
 #include <private/qxslttokenlookup_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QUrl;
@@ -228,7 +227,6 @@ namespace QPatternist
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 
diff --git a/src/xmlpatterns/parser/qparsercontext_p.h b/src/xmlpatterns/parser/qparsercontext_p.h
index 894063c..215908f 100644
--- a/src/xmlpatterns/parser/qparsercontext_p.h
+++ b/src/xmlpatterns/parser/qparsercontext_p.h
@@ -67,8 +67,6 @@
 #include <private/quserfunction_p.h>
 #include <private/qvariabledeclaration_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -428,6 +426,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/parser/qtokenizer_p.h b/src/xmlpatterns/parser/qtokenizer_p.h
index c1b405e..c6e1e56 100644
--- a/src/xmlpatterns/parser/qtokenizer_p.h
+++ b/src/xmlpatterns/parser/qtokenizer_p.h
@@ -65,8 +65,6 @@
  * @short Contains functions and classes used by the parser and tokenizer.
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -211,6 +209,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/parser/qtokenrevealer_p.h b/src/xmlpatterns/parser/qtokenrevealer_p.h
index c0ad688..08ad3eb 100644
--- a/src/xmlpatterns/parser/qtokenrevealer_p.h
+++ b/src/xmlpatterns/parser/qtokenrevealer_p.h
@@ -56,7 +56,6 @@
 
 #include <private/qtokenizer_p.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -91,7 +90,5 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/xmlpatterns/parser/qtokensource_p.h b/src/xmlpatterns/parser/qtokensource_p.h
index 475df77..91aa99a 100644
--- a/src/xmlpatterns/parser/qtokensource_p.h
+++ b/src/xmlpatterns/parser/qtokensource_p.h
@@ -63,8 +63,6 @@
 #include <private/qquerytransformparser_p.h>
 #include <private/qvalidate_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename T> class QQueue;
@@ -164,6 +162,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/parser/qxquerytokenizer_p.h b/src/xmlpatterns/parser/qxquerytokenizer_p.h
index 7701b80..03f0310 100644
--- a/src/xmlpatterns/parser/qxquerytokenizer_p.h
+++ b/src/xmlpatterns/parser/qxquerytokenizer_p.h
@@ -59,8 +59,6 @@
 
 #include <private/qtokenizer_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -327,6 +325,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/parser/qxslttokenizer_p.h b/src/xmlpatterns/parser/qxslttokenizer_p.h
index 5f3433e..c4c5121 100644
--- a/src/xmlpatterns/parser/qxslttokenizer_p.h
+++ b/src/xmlpatterns/parser/qxslttokenizer_p.h
@@ -61,8 +61,6 @@
 #include <private/qtokenizer_p.h>
 #include <private/qxslttokenlookup_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -476,6 +474,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/projection/qdocumentprojector_p.h b/src/xmlpatterns/projection/qdocumentprojector_p.h
index 2a5d411..7e49669 100644
--- a/src/xmlpatterns/projection/qdocumentprojector_p.h
+++ b/src/xmlpatterns/projection/qdocumentprojector_p.h
@@ -55,8 +55,6 @@
 #include <private/qprojectedexpression_p.h>
 #include "qabstractxmlreceiver.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -102,6 +100,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/projection/qprojectedexpression_p.h b/src/xmlpatterns/projection/qprojectedexpression_p.h
index 6a320fd..31bcaa9 100644
--- a/src/xmlpatterns/projection/qprojectedexpression_p.h
+++ b/src/xmlpatterns/projection/qprojectedexpression_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -160,6 +158,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qnamespacesupport_p.h b/src/xmlpatterns/schema/qnamespacesupport_p.h
index 927d122..2219748 100644
--- a/src/xmlpatterns/schema/qnamespacesupport_p.h
+++ b/src/xmlpatterns/schema/qnamespacesupport_p.h
@@ -60,8 +60,6 @@
 #include <QtCore/QStack>
 #include <QtCore/QXmlStreamNamespaceDeclarations>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -168,6 +166,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdalternative_p.h b/src/xmlpatterns/schema/qxsdalternative_p.h
index 6bab546..75076d5 100644
--- a/src/xmlpatterns/schema/qxsdalternative_p.h
+++ b/src/xmlpatterns/schema/qxsdalternative_p.h
@@ -59,8 +59,6 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdannotated_p.h b/src/xmlpatterns/schema/qxsdannotated_p.h
index 2745d81..fe3ded2 100644
--- a/src/xmlpatterns/schema/qxsdannotated_p.h
+++ b/src/xmlpatterns/schema/qxsdannotated_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qxsdannotation_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdannotation_p.h b/src/xmlpatterns/schema/qxsdannotation_p.h
index 90d48c0..1912ddd 100644
--- a/src/xmlpatterns/schema/qxsdannotation_p.h
+++ b/src/xmlpatterns/schema/qxsdannotation_p.h
@@ -56,8 +56,6 @@
 #include <private/qxsdapplicationinformation_p.h>
 #include <private/qxsddocumentation_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
index acbadf0..051cb47 100644
--- a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
+++ b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
@@ -56,8 +56,6 @@
 #include <private/qanyuri_p.h>
 #include <private/qnamedschemacomponent_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -110,6 +108,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdassertion_p.h b/src/xmlpatterns/schema/qxsdassertion_p.h
index 86a1c04..d3bbabb 100644
--- a/src/xmlpatterns/schema/qxsdassertion_p.h
+++ b/src/xmlpatterns/schema/qxsdassertion_p.h
@@ -58,8 +58,6 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -96,6 +94,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdattribute_p.h b/src/xmlpatterns/schema/qxsdattribute_p.h
index c5f3295..935ae90 100644
--- a/src/xmlpatterns/schema/qxsdattribute_p.h
+++ b/src/xmlpatterns/schema/qxsdattribute_p.h
@@ -58,8 +58,6 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -241,6 +239,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdattributegroup_p.h b/src/xmlpatterns/schema/qxsdattributegroup_p.h
index ece1759..00b7122 100644
--- a/src/xmlpatterns/schema/qxsdattributegroup_p.h
+++ b/src/xmlpatterns/schema/qxsdattributegroup_p.h
@@ -58,8 +58,6 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -117,6 +115,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdattributereference_p.h b/src/xmlpatterns/schema/qxsdattributereference_p.h
index a87378f..f92f7f7 100644
--- a/src/xmlpatterns/schema/qxsdattributereference_p.h
+++ b/src/xmlpatterns/schema/qxsdattributereference_p.h
@@ -56,8 +56,6 @@
 
 #include <QtXmlPatterns/QSourceLocation>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -142,6 +140,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdattributeterm_p.h b/src/xmlpatterns/schema/qxsdattributeterm_p.h
index 6e0a60f..3ddb1cf 100644
--- a/src/xmlpatterns/schema/qxsdattributeterm_p.h
+++ b/src/xmlpatterns/schema/qxsdattributeterm_p.h
@@ -55,8 +55,6 @@
 #include <private/qnamedschemacomponent_p.h>
 #include <private/qxsdannotated_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdattributeuse_p.h b/src/xmlpatterns/schema/qxsdattributeuse_p.h
index 5472d47..0324407 100644
--- a/src/xmlpatterns/schema/qxsdattributeuse_p.h
+++ b/src/xmlpatterns/schema/qxsdattributeuse_p.h
@@ -57,8 +57,6 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -219,6 +217,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdcomplextype_p.h b/src/xmlpatterns/schema/qxsdcomplextype_p.h
index fcbb444..bbeac90 100644
--- a/src/xmlpatterns/schema/qxsdcomplextype_p.h
+++ b/src/xmlpatterns/schema/qxsdcomplextype_p.h
@@ -62,8 +62,6 @@
 
 #include <QtCore/QSet>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -399,6 +397,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsddocumentation_p.h b/src/xmlpatterns/schema/qxsddocumentation_p.h
index 2b39b5d..74cd3f4 100644
--- a/src/xmlpatterns/schema/qxsddocumentation_p.h
+++ b/src/xmlpatterns/schema/qxsddocumentation_p.h
@@ -57,8 +57,6 @@
 #include <private/qderivedstring_p.h>
 #include <private/qnamedschemacomponent_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -132,6 +130,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h
index 00e4d7f..3c7e7ea 100644
--- a/src/xmlpatterns/schema/qxsdelement_p.h
+++ b/src/xmlpatterns/schema/qxsdelement_p.h
@@ -61,8 +61,6 @@
 #include <QtCore/QList>
 #include <QtCore/QSet>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -398,6 +396,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdfacet_p.h b/src/xmlpatterns/schema/qxsdfacet_p.h
index 9b43622..58f2b26 100644
--- a/src/xmlpatterns/schema/qxsdfacet_p.h
+++ b/src/xmlpatterns/schema/qxsdfacet_p.h
@@ -59,8 +59,6 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -208,6 +206,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdidcache_p.h b/src/xmlpatterns/schema/qxsdidcache_p.h
index e56b46f..6dc931a 100644
--- a/src/xmlpatterns/schema/qxsdidcache_p.h
+++ b/src/xmlpatterns/schema/qxsdidcache_p.h
@@ -59,8 +59,6 @@
 #include <QtCore/QSet>
 #include <QtCore/QString>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -94,6 +92,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdidchelper_p.h b/src/xmlpatterns/schema/qxsdidchelper_p.h
index 8c0d075..2dc99f8 100644
--- a/src/xmlpatterns/schema/qxsdidchelper_p.h
+++ b/src/xmlpatterns/schema/qxsdidchelper_p.h
@@ -57,8 +57,6 @@
 
 #include <QtXmlPatterns/QXmlItem>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -181,6 +179,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
index 7c7dcfa..6cc8dd3 100644
--- a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
+++ b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
@@ -58,8 +58,6 @@
 
 #include <QtCore/QStringList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -168,6 +166,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdinstancereader_p.h b/src/xmlpatterns/schema/qxsdinstancereader_p.h
index 642edbe..d4f8d26 100644
--- a/src/xmlpatterns/schema/qxsdinstancereader_p.h
+++ b/src/xmlpatterns/schema/qxsdinstancereader_p.h
@@ -56,8 +56,6 @@
 #include <private/qpullbridge_p.h>
 #include <private/qxsdschemacontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -184,6 +182,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdmodelgroup_p.h b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
index 6a46102..0465725 100644
--- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h
+++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
@@ -55,8 +55,6 @@
 #include <private/qxsdparticle_p.h>
 #include <private/qxsdterm_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename N> class QList;
@@ -134,6 +132,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdnotation_p.h b/src/xmlpatterns/schema/qxsdnotation_p.h
index 91ced78..c5622ee 100644
--- a/src/xmlpatterns/schema/qxsdnotation_p.h
+++ b/src/xmlpatterns/schema/qxsdnotation_p.h
@@ -59,8 +59,6 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -114,6 +112,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdparticle_p.h b/src/xmlpatterns/schema/qxsdparticle_p.h
index 9356df5..8698d8a 100644
--- a/src/xmlpatterns/schema/qxsdparticle_p.h
+++ b/src/xmlpatterns/schema/qxsdparticle_p.h
@@ -57,8 +57,6 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -149,6 +147,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdparticlechecker_p.h b/src/xmlpatterns/schema/qxsdparticlechecker_p.h
index 7ba4f0b..08b94e2 100644
--- a/src/xmlpatterns/schema/qxsdparticlechecker_p.h
+++ b/src/xmlpatterns/schema/qxsdparticlechecker_p.h
@@ -57,8 +57,6 @@
 #include <private/qxsdschemacontext_p.h>
 #include <private/qxsdwildcard_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -101,6 +99,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdreference_p.h b/src/xmlpatterns/schema/qxsdreference_p.h
index f3a4fe2..f2b7226 100644
--- a/src/xmlpatterns/schema/qxsdreference_p.h
+++ b/src/xmlpatterns/schema/qxsdreference_p.h
@@ -56,8 +56,6 @@
 
 #include <QtXmlPatterns/QSourceLocation>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -140,6 +138,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschema_p.h b/src/xmlpatterns/schema/qxsdschema_p.h
index 69985cc..ba679c8 100644
--- a/src/xmlpatterns/schema/qxsdschema_p.h
+++ b/src/xmlpatterns/schema/qxsdschema_p.h
@@ -70,8 +70,6 @@
  * @defgroup Patternist_schema XML Schema Processing
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -296,6 +294,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschemachecker_p.h b/src/xmlpatterns/schema/qxsdschemachecker_p.h
index 0622f72..b92217e 100644
--- a/src/xmlpatterns/schema/qxsdschemachecker_p.h
+++ b/src/xmlpatterns/schema/qxsdschemachecker_p.h
@@ -63,8 +63,6 @@
 
 #include <QtCore/QExplicitlySharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -279,6 +277,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschemacontext_p.h b/src/xmlpatterns/schema/qxsdschemacontext_p.h
index 7b15646..79fa386 100644
--- a/src/xmlpatterns/schema/qxsdschemacontext_p.h
+++ b/src/xmlpatterns/schema/qxsdschemacontext_p.h
@@ -64,8 +64,6 @@
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtXmlPatterns/QAbstractMessageHandler>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -182,6 +180,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschemadebugger_p.h b/src/xmlpatterns/schema/qxsdschemadebugger_p.h
index 7ae185e..946f723 100644
--- a/src/xmlpatterns/schema/qxsdschemadebugger_p.h
+++ b/src/xmlpatterns/schema/qxsdschemadebugger_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qxsdschema_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschemahelper_p.h b/src/xmlpatterns/schema/qxsdschemahelper_p.h
index 5ecd7f3..dedcb0e 100644
--- a/src/xmlpatterns/schema/qxsdschemahelper_p.h
+++ b/src/xmlpatterns/schema/qxsdschemahelper_p.h
@@ -60,8 +60,6 @@
 #include <private/qxsdschemacontext_p.h>
 #include <private/qxsdwildcard_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -212,6 +210,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschemamerger_p.h b/src/xmlpatterns/schema/qxsdschemamerger_p.h
index aef1bf7..cfbd588 100644
--- a/src/xmlpatterns/schema/qxsdschemamerger_p.h
+++ b/src/xmlpatterns/schema/qxsdschemamerger_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qxsdschema_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -94,6 +92,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h
index 96c4c27..00cd851 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h
@@ -73,8 +73,6 @@
 #include <QtCore/QXmlStreamReader>
 #include <QtXmlPatterns/QXmlNamePool>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -734,6 +732,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
index b508940..a34fe18 100644
--- a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
@@ -61,8 +61,6 @@
 
 #include <QtCore/QSharedData>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -226,6 +224,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschemaresolver_p.h b/src/xmlpatterns/schema/qxsdschemaresolver_p.h
index 60ac158..ee841a9 100644
--- a/src/xmlpatterns/schema/qxsdschemaresolver_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaresolver_p.h
@@ -68,8 +68,6 @@
 
 #include <QtCore/QExplicitlySharedDataPointer>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -573,6 +571,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
index 3502ee6..cd4f3a9 100644
--- a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
+++ b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
@@ -55,8 +55,6 @@
 #include <QtCore/QHash>
 #include <private/qschematypefactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -104,6 +102,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdsimpletype_p.h b/src/xmlpatterns/schema/qxsdsimpletype_p.h
index d260dbf..f4b2c4b 100644
--- a/src/xmlpatterns/schema/qxsdsimpletype_p.h
+++ b/src/xmlpatterns/schema/qxsdsimpletype_p.h
@@ -58,8 +58,6 @@
 
 #include <QtCore/QSet>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -214,6 +212,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdstatemachine_p.h b/src/xmlpatterns/schema/qxsdstatemachine_p.h
index fc73ffd..ffddfe8 100644
--- a/src/xmlpatterns/schema/qxsdstatemachine_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachine_p.h
@@ -58,8 +58,6 @@
 #include <QtCore/QSet>
 #include <QtCore/QTextStream>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
@@ -297,6 +295,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
index 7085e04..018273c 100644
--- a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
@@ -59,8 +59,6 @@
 #include <QtCore/QExplicitlySharedDataPointer>
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -136,6 +134,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdterm_p.h b/src/xmlpatterns/schema/qxsdterm_p.h
index 1043090..93f2d3c 100644
--- a/src/xmlpatterns/schema/qxsdterm_p.h
+++ b/src/xmlpatterns/schema/qxsdterm_p.h
@@ -55,8 +55,6 @@
 #include <private/qnamedschemacomponent_p.h>
 #include <private/qxsdannotated_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -109,6 +107,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdtypechecker_p.h b/src/xmlpatterns/schema/qxsdtypechecker_p.h
index b69e7d9..735ffa9 100644
--- a/src/xmlpatterns/schema/qxsdtypechecker_p.h
+++ b/src/xmlpatterns/schema/qxsdtypechecker_p.h
@@ -58,8 +58,6 @@
 #include <private/qsourcelocationreflection_p.h>
 #include <private/qxsdschemacontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QXmlQuery;
@@ -184,6 +182,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h
index 9cd1c54..e792884 100644
--- a/src/xmlpatterns/schema/qxsduserschematype_p.h
+++ b/src/xmlpatterns/schema/qxsduserschematype_p.h
@@ -56,8 +56,6 @@
 #include <private/qschematype_p.h>
 #include <private/qxsdannotated_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename N, typename M> class QHash;
@@ -119,6 +117,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
index e8ef9b0..22faa8f 100644
--- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
+++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
@@ -59,8 +59,6 @@
 #include <private/qschematype_p.h>
 #include <private/qxsdelement_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -174,6 +172,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
index 38a1548..0c06f15 100644
--- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
+++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
@@ -59,8 +59,6 @@
 
 #include <QtCore/QStack>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QXmlQuery;
@@ -291,6 +289,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdwildcard_p.h b/src/xmlpatterns/schema/qxsdwildcard_p.h
index fcb7f56..7e8d7e5 100644
--- a/src/xmlpatterns/schema/qxsdwildcard_p.h
+++ b/src/xmlpatterns/schema/qxsdwildcard_p.h
@@ -56,8 +56,6 @@
 
 #include <QtCore/QSet>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -194,6 +192,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/schema/qxsdxpathexpression_p.h b/src/xmlpatterns/schema/qxsdxpathexpression_p.h
index 3403f0e..f49d7e7 100644
--- a/src/xmlpatterns/schema/qxsdxpathexpression_p.h
+++ b/src/xmlpatterns/schema/qxsdxpathexpression_p.h
@@ -58,8 +58,6 @@
 
 #include <QtCore/QList>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -138,6 +136,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qabstractnodetest_p.h b/src/xmlpatterns/type/qabstractnodetest_p.h
index 197745f..d703ff5 100644
--- a/src/xmlpatterns/type/qabstractnodetest_p.h
+++ b/src/xmlpatterns/type/qabstractnodetest_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qanynodetype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -82,6 +80,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qanyitemtype_p.h b/src/xmlpatterns/type/qanyitemtype_p.h
index 4d30a10..a522000 100644
--- a/src/xmlpatterns/type/qanyitemtype_p.h
+++ b/src/xmlpatterns/type/qanyitemtype_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qatomictype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -114,6 +112,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qanynodetype_p.h b/src/xmlpatterns/type/qanynodetype_p.h
index 0c6c1cf..ebc351a 100644
--- a/src/xmlpatterns/type/qanynodetype_p.h
+++ b/src/xmlpatterns/type/qanynodetype_p.h
@@ -55,8 +55,6 @@
 #include <private/qatomictype_p.h>
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -108,6 +106,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qanysimpletype_p.h b/src/xmlpatterns/type/qanysimpletype_p.h
index 55274e9..2b4dcc3 100644
--- a/src/xmlpatterns/type/qanysimpletype_p.h
+++ b/src/xmlpatterns/type/qanysimpletype_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qanytype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -125,6 +123,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qanytype_p.h b/src/xmlpatterns/type/qanytype_p.h
index a0f4a76..fdb5aa9 100644
--- a/src/xmlpatterns/type/qanytype_p.h
+++ b/src/xmlpatterns/type/qanytype_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qschematype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -137,6 +135,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qatomiccasterlocator_p.h b/src/xmlpatterns/type/qatomiccasterlocator_p.h
index 25227d4..069e870 100644
--- a/src/xmlpatterns/type/qatomiccasterlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qatomictypedispatch_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -121,6 +119,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qatomiccasterlocators_p.h b/src/xmlpatterns/type/qatomiccasterlocators_p.h
index 25d62f1..54e5975 100644
--- a/src/xmlpatterns/type/qatomiccasterlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccasterlocators_p.h
@@ -62,8 +62,6 @@
  * which can perform casting from one atomic value to another.
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -904,6 +902,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
index c8bd52c..c8ef100 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qatomictypedispatch_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -127,6 +125,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
index 37fa194..7e32b8c 100644
--- a/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
+++ b/src/xmlpatterns/type/qatomiccomparatorlocators_p.h
@@ -60,8 +60,6 @@
  * which can compare atomic values.
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -351,6 +349,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
index ada89bc..870dde3 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocator_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qatomictypedispatch_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -153,6 +151,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
index 9055b2c..4d06711 100644
--- a/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
+++ b/src/xmlpatterns/type/qatomicmathematicianlocators_p.h
@@ -61,8 +61,6 @@
  * which can perform arithmetics between atomic values.
  */
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -244,6 +242,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qatomictype_p.h b/src/xmlpatterns/type/qatomictype_p.h
index d71e5e2..054192d 100644
--- a/src/xmlpatterns/type/qatomictype_p.h
+++ b/src/xmlpatterns/type/qatomictype_p.h
@@ -59,8 +59,6 @@
 #include <private/qatomictypedispatch_p.h>
 #include <private/qitemtype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -155,6 +153,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qatomictypedispatch_p.h b/src/xmlpatterns/type/qatomictypedispatch_p.h
index 412902b..483bd9f 100644
--- a/src/xmlpatterns/type/qatomictypedispatch_p.h
+++ b/src/xmlpatterns/type/qatomictypedispatch_p.h
@@ -55,8 +55,6 @@
 #include <QSharedData>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -272,6 +270,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qbasictypesfactory_p.h b/src/xmlpatterns/type/qbasictypesfactory_p.h
index e7fb7cc..a3db54b 100644
--- a/src/xmlpatterns/type/qbasictypesfactory_p.h
+++ b/src/xmlpatterns/type/qbasictypesfactory_p.h
@@ -55,8 +55,6 @@
 #include <QHash>
 #include <private/qschematypefactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -116,6 +114,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qbuiltinatomictype_p.h b/src/xmlpatterns/type/qbuiltinatomictype_p.h
index 208fcb2..c7cb246 100644
--- a/src/xmlpatterns/type/qbuiltinatomictype_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictype_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qatomictype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -125,6 +123,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qbuiltinatomictypes_p.h b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
index f17450f..eec8fc8 100644
--- a/src/xmlpatterns/type/qbuiltinatomictypes_p.h
+++ b/src/xmlpatterns/type/qbuiltinatomictypes_p.h
@@ -56,8 +56,6 @@
 #include <private/qatomiccomparatorlocators_p.h>
 #include <private/qbuiltinatomictype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -784,6 +782,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qbuiltinnodetype_p.h b/src/xmlpatterns/type/qbuiltinnodetype_p.h
index 9831e87..cf34ce8 100644
--- a/src/xmlpatterns/type/qbuiltinnodetype_p.h
+++ b/src/xmlpatterns/type/qbuiltinnodetype_p.h
@@ -56,8 +56,6 @@
 #include <private/qanynodetype_p.h>
 #include <private/qbuiltintypes_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -105,6 +103,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qbuiltintypes_p.h b/src/xmlpatterns/type/qbuiltintypes_p.h
index 62f25de..ac8c422 100644
--- a/src/xmlpatterns/type/qbuiltintypes_p.h
+++ b/src/xmlpatterns/type/qbuiltintypes_p.h
@@ -60,8 +60,6 @@
 #include <private/qnumerictype_p.h>
 #include <private/quntyped_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -168,7 +166,5 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/xmlpatterns/type/qcardinality_p.h b/src/xmlpatterns/type/qcardinality_p.h
index 51449fd..ecd65a6 100644
--- a/src/xmlpatterns/type/qcardinality_p.h
+++ b/src/xmlpatterns/type/qcardinality_p.h
@@ -54,8 +54,6 @@
 
 #include <QtCore/QtGlobal>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -539,6 +537,4 @@ Q_DECLARE_TYPEINFO(QPatternist::Cardinality, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qcommonsequencetypes_p.h b/src/xmlpatterns/type/qcommonsequencetypes_p.h
index 7361f3d..c085323 100644
--- a/src/xmlpatterns/type/qcommonsequencetypes_p.h
+++ b/src/xmlpatterns/type/qcommonsequencetypes_p.h
@@ -55,8 +55,6 @@
 #include <private/qemptysequencetype_p.h>
 #include <private/qnonetype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -408,7 +406,5 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 
diff --git a/src/xmlpatterns/type/qebvtype_p.h b/src/xmlpatterns/type/qebvtype_p.h
index d5f54cf..df3cbf8 100644
--- a/src/xmlpatterns/type/qebvtype_p.h
+++ b/src/xmlpatterns/type/qebvtype_p.h
@@ -55,8 +55,6 @@
 #include <private/qatomictype_p.h>
 #include <private/qsequencetype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -130,6 +128,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qemptysequencetype_p.h b/src/xmlpatterns/type/qemptysequencetype_p.h
index 5406583..7552367 100644
--- a/src/xmlpatterns/type/qemptysequencetype_p.h
+++ b/src/xmlpatterns/type/qemptysequencetype_p.h
@@ -55,8 +55,6 @@
 #include <private/qatomictype_p.h>
 #include <private/qsequencetype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -119,6 +117,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qgenericsequencetype_p.h b/src/xmlpatterns/type/qgenericsequencetype_p.h
index 155c63f..1f5dcdb 100644
--- a/src/xmlpatterns/type/qgenericsequencetype_p.h
+++ b/src/xmlpatterns/type/qgenericsequencetype_p.h
@@ -55,8 +55,6 @@
 #include <private/qcommonsequencetypes_p.h>
 #include <private/qsequencetype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -110,6 +108,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qitemtype_p.h b/src/xmlpatterns/type/qitemtype_p.h
index d28d19d..62580a9 100644
--- a/src/xmlpatterns/type/qitemtype_p.h
+++ b/src/xmlpatterns/type/qitemtype_p.h
@@ -56,8 +56,6 @@
 
 #include <QtXmlPatterns/private/qnamepool_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename T> class QList;
@@ -281,6 +279,4 @@ Q_DECLARE_TYPEINFO(QPatternist::ItemType::Ptr, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qlocalnametest_p.h b/src/xmlpatterns/type/qlocalnametest_p.h
index dad8913..79abb18 100644
--- a/src/xmlpatterns/type/qlocalnametest_p.h
+++ b/src/xmlpatterns/type/qlocalnametest_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractnodetest_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename Key, typename Value> class QHash;
@@ -97,6 +95,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qmultiitemtype_p.h b/src/xmlpatterns/type/qmultiitemtype_p.h
index 0697064..4d1f5b9 100644
--- a/src/xmlpatterns/type/qmultiitemtype_p.h
+++ b/src/xmlpatterns/type/qmultiitemtype_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qitemtype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -141,6 +139,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qnamedschemacomponent_p.h b/src/xmlpatterns/type/qnamedschemacomponent_p.h
index 3f20eaf..88c19cb 100644
--- a/src/xmlpatterns/type/qnamedschemacomponent_p.h
+++ b/src/xmlpatterns/type/qnamedschemacomponent_p.h
@@ -56,8 +56,6 @@
 #include <private/qschemacomponent_p.h>
 #include <QXmlName>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qnamespacenametest_p.h b/src/xmlpatterns/type/qnamespacenametest_p.h
index af95f2d..820fc45 100644
--- a/src/xmlpatterns/type/qnamespacenametest_p.h
+++ b/src/xmlpatterns/type/qnamespacenametest_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qabstractnodetest_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename Key, typename Value> class QHash;
@@ -96,6 +94,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qnonetype_p.h b/src/xmlpatterns/type/qnonetype_p.h
index 1352fb8..3a26ff6 100644
--- a/src/xmlpatterns/type/qnonetype_p.h
+++ b/src/xmlpatterns/type/qnonetype_p.h
@@ -55,8 +55,6 @@
 #include <private/qatomictype_p.h>
 #include <private/qsequencetype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -150,6 +148,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qnumerictype_p.h b/src/xmlpatterns/type/qnumerictype_p.h
index c18fa24..80836d4 100644
--- a/src/xmlpatterns/type/qnumerictype_p.h
+++ b/src/xmlpatterns/type/qnumerictype_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qatomictype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -169,6 +167,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qprimitives_p.h b/src/xmlpatterns/type/qprimitives_p.h
index 475cd5d..13f3d43 100644
--- a/src/xmlpatterns/type/qprimitives_p.h
+++ b/src/xmlpatterns/type/qprimitives_p.h
@@ -67,8 +67,6 @@
  *
  * @author Frans Englich <frans.englich@nokia.com>
  */
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -198,6 +196,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qqnametest_p.h b/src/xmlpatterns/type/qqnametest_p.h
index 3f96b39..4e2c4d7 100644
--- a/src/xmlpatterns/type/qqnametest_p.h
+++ b/src/xmlpatterns/type/qqnametest_p.h
@@ -56,8 +56,6 @@
 
 template<typename Key, typename Value> class QHash;
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -98,6 +96,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qschemacomponent_p.h b/src/xmlpatterns/type/qschemacomponent_p.h
index a99bc26..deefc8b 100644
--- a/src/xmlpatterns/type/qschemacomponent_p.h
+++ b/src/xmlpatterns/type/qschemacomponent_p.h
@@ -55,8 +55,6 @@
 #include <QSharedData>
 #include <QtGlobal>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -80,6 +78,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h
index cf0bf8e..0f3ea0b 100644
--- a/src/xmlpatterns/type/qschematype_p.h
+++ b/src/xmlpatterns/type/qschematype_p.h
@@ -59,8 +59,6 @@
 template<typename N, typename M> class QHash;
 template<typename N> class QList;
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -243,6 +241,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qschematypefactory_p.h b/src/xmlpatterns/type/qschematypefactory_p.h
index bdf0d3f..7119c7e 100644
--- a/src/xmlpatterns/type/qschematypefactory_p.h
+++ b/src/xmlpatterns/type/qschematypefactory_p.h
@@ -58,8 +58,6 @@
 #include <private/qitemtype_p.h>
 #include <private/qschematype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -97,6 +95,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qsequencetype_p.h b/src/xmlpatterns/type/qsequencetype_p.h
index 8ae8d44..6bdcfb9 100644
--- a/src/xmlpatterns/type/qsequencetype_p.h
+++ b/src/xmlpatterns/type/qsequencetype_p.h
@@ -59,8 +59,6 @@ template<typename T> class QList;
 #include <private/qcardinality_p.h>
 #include <private/qitemtype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -133,6 +131,4 @@ Q_DECLARE_TYPEINFO(QPatternist::SequenceType::Ptr, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qtypechecker_p.h b/src/xmlpatterns/type/qtypechecker_p.h
index 085370f..87dcaa2 100644
--- a/src/xmlpatterns/type/qtypechecker_p.h
+++ b/src/xmlpatterns/type/qtypechecker_p.h
@@ -55,8 +55,6 @@
 #include <private/qstaticcontext_p.h>
 #include <private/qexpression_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -180,6 +178,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/quntyped_p.h b/src/xmlpatterns/type/quntyped_p.h
index aebdd95..f367542 100644
--- a/src/xmlpatterns/type/quntyped_p.h
+++ b/src/xmlpatterns/type/quntyped_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qanytype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -107,6 +105,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/type/qxsltnodetest_p.h b/src/xmlpatterns/type/qxsltnodetest_p.h
index 33ac3e3..60c929b 100644
--- a/src/xmlpatterns/type/qxsltnodetest_p.h
+++ b/src/xmlpatterns/type/qxsltnodetest_p.h
@@ -54,8 +54,6 @@
 
 #include <private/qanynodetype_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -95,6 +93,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qcommonnamespaces_p.h b/src/xmlpatterns/utils/qcommonnamespaces_p.h
index b53ad6a..babcceb 100644
--- a/src/xmlpatterns/utils/qcommonnamespaces_p.h
+++ b/src/xmlpatterns/utils/qcommonnamespaces_p.h
@@ -54,8 +54,6 @@
 
 #include <QLatin1String>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -147,6 +145,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qcppcastinghelper_p.h b/src/xmlpatterns/utils/qcppcastinghelper_p.h
index 74fae07..5a4e029 100644
--- a/src/xmlpatterns/utils/qcppcastinghelper_p.h
+++ b/src/xmlpatterns/utils/qcppcastinghelper_p.h
@@ -54,8 +54,6 @@
 
 #include <QtCore/QtGlobal>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -156,6 +154,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
index bb07a6b..422b0c4 100644
--- a/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qdelegatingnamespaceresolver_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qnamespaceresolver_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -91,6 +89,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
index d65cbb1..b59fb60 100644
--- a/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qgenericnamespaceresolver_p.h
@@ -56,8 +56,6 @@
 
 #include <private/qnamespaceresolver_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -108,6 +106,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qnamepool_p.h b/src/xmlpatterns/utils/qnamepool_p.h
index 6d1394f..9a2e967 100644
--- a/src/xmlpatterns/utils/qnamepool_p.h
+++ b/src/xmlpatterns/utils/qnamepool_p.h
@@ -62,8 +62,6 @@
 
 #include <QtXmlPatterns/private/qprimitives_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -551,6 +549,4 @@ Q_DECLARE_TYPEINFO(QPatternist::NamePool::Ptr, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qnamespacebinding_p.h b/src/xmlpatterns/utils/qnamespacebinding_p.h
index 2753de2..3886d3c 100644
--- a/src/xmlpatterns/utils/qnamespacebinding_p.h
+++ b/src/xmlpatterns/utils/qnamespacebinding_p.h
@@ -56,8 +56,6 @@ template<typename T> class QVector;
 
 #include <QXmlName>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -138,6 +136,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qnamespaceresolver_p.h b/src/xmlpatterns/utils/qnamespaceresolver_p.h
index e7592ec..e3ea7be 100644
--- a/src/xmlpatterns/utils/qnamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qnamespaceresolver_p.h
@@ -56,8 +56,6 @@
 #include <QXmlName>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename A, typename B> class QHash;
@@ -114,6 +112,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
index b996032..ae18681 100644
--- a/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
+++ b/src/xmlpatterns/utils/qnodenamespaceresolver_p.h
@@ -57,8 +57,6 @@
 #include <private/qnamespaceresolver_p.h>
 #include <private/qitem_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -86,6 +84,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qoutputvalidator_p.h b/src/xmlpatterns/utils/qoutputvalidator_p.h
index d0d36ac..849751f 100644
--- a/src/xmlpatterns/utils/qoutputvalidator_p.h
+++ b/src/xmlpatterns/utils/qoutputvalidator_p.h
@@ -58,8 +58,6 @@
 #include "qabstractxmlreceiver.h"
 #include <private/qsourcelocationreflection_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -122,6 +120,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/src/xmlpatterns/utils/qxpathhelper_p.h b/src/xmlpatterns/utils/qxpathhelper_p.h
index d359735..b65ef0d 100644
--- a/src/xmlpatterns/utils/qxpathhelper_p.h
+++ b/src/xmlpatterns/utils/qxpathhelper_p.h
@@ -57,8 +57,6 @@
 #include <private/qpatternistlocale_p.h>
 #include <private/qreportcontext_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternist
@@ -174,6 +172,4 @@ namespace QPatternist
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
diff --git a/tests/auto/xmlpatternssdk/ASTItem.h b/tests/auto/xmlpatternssdk/ASTItem.h
index 66c857a..855e9ec 100644
--- a/tests/auto/xmlpatternssdk/ASTItem.h
+++ b/tests/auto/xmlpatternssdk/ASTItem.h
@@ -48,8 +48,6 @@
 #include "TreeItem.h"
 #include "Global.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -109,7 +107,5 @@ ValueComparison(eq)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
index 32a0562..8033a48 100644
--- a/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
+++ b/tests/auto/xmlpatternssdk/DebugExpressionFactory.h
@@ -46,8 +46,6 @@
 #include <private/qexpressionfactory_p.h>
 #include <private/qfunctionfactory_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -122,7 +120,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ErrorHandler.h b/tests/auto/xmlpatternssdk/ErrorHandler.h
index 070bf08..424deb3 100644
--- a/tests/auto/xmlpatternssdk/ErrorHandler.h
+++ b/tests/auto/xmlpatternssdk/ErrorHandler.h
@@ -46,8 +46,6 @@
 #include "qabstractmessagehandler.h"
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename T> class QList;
@@ -143,7 +141,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ErrorItem.h b/tests/auto/xmlpatternssdk/ErrorItem.h
index 5283233..aece6ea 100644
--- a/tests/auto/xmlpatternssdk/ErrorItem.h
+++ b/tests/auto/xmlpatternssdk/ErrorItem.h
@@ -48,8 +48,6 @@
 #include "Global.h"
 #include "TreeItem.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -88,7 +86,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ExitCode.h b/tests/auto/xmlpatternssdk/ExitCode.h
index 583980b..a86327c 100644
--- a/tests/auto/xmlpatternssdk/ExitCode.h
+++ b/tests/auto/xmlpatternssdk/ExitCode.h
@@ -44,8 +44,6 @@
 
 #include "Global.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -99,7 +97,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ExpressionInfo.h b/tests/auto/xmlpatternssdk/ExpressionInfo.h
index 20157f0..5934ecc 100644
--- a/tests/auto/xmlpatternssdk/ExpressionInfo.h
+++ b/tests/auto/xmlpatternssdk/ExpressionInfo.h
@@ -48,8 +48,6 @@
 #include <QPair>
 #include <QString>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -74,7 +72,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ExpressionNamer.h b/tests/auto/xmlpatternssdk/ExpressionNamer.h
index 9c1f5e5..5f04e54 100644
--- a/tests/auto/xmlpatternssdk/ExpressionNamer.h
+++ b/tests/auto/xmlpatternssdk/ExpressionNamer.h
@@ -45,8 +45,6 @@
 #include "Global.h"
 #include <private/qexpressiondispatch_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -275,7 +273,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
index 8247c90..cfbf620 100644
--- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.h
@@ -50,8 +50,6 @@
 #include <private/qresourceloader_p.h>
 #include <private/qexternalvariableloader_p.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -131,7 +129,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/Global.h b/tests/auto/xmlpatternssdk/Global.h
index 4979ae6..9f36ad6 100644
--- a/tests/auto/xmlpatternssdk/Global.h
+++ b/tests/auto/xmlpatternssdk/Global.h
@@ -63,8 +63,6 @@
  * @see <a href="http://www.w3.org/XML/Query/test-suite/">XML Query Test Suite</a>
  * @author Frans Englich <frans.englich@nokia.com>
  */
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -122,7 +120,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/ResultThreader.h b/tests/auto/xmlpatternssdk/ResultThreader.h
index ebe6c2f..c756dc8 100644
--- a/tests/auto/xmlpatternssdk/ResultThreader.h
+++ b/tests/auto/xmlpatternssdk/ResultThreader.h
@@ -48,8 +48,6 @@
 
 #include "TestResultHandler.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QEventLoop;
@@ -104,7 +102,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.h b/tests/auto/xmlpatternssdk/TestBaseLine.h
index 5f10202..df6d477 100644
--- a/tests/auto/xmlpatternssdk/TestBaseLine.h
+++ b/tests/auto/xmlpatternssdk/TestBaseLine.h
@@ -47,8 +47,6 @@
 #include "Global.h"
 #include "TestResult.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDomNamedNodeMap;
@@ -206,7 +204,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestCase.h b/tests/auto/xmlpatternssdk/TestCase.h
index 89a23de..51c7895 100644
--- a/tests/auto/xmlpatternssdk/TestCase.h
+++ b/tests/auto/xmlpatternssdk/TestCase.h
@@ -52,8 +52,6 @@
 
 #include "TestItem.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDate;
@@ -250,7 +248,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestContainer.h b/tests/auto/xmlpatternssdk/TestContainer.h
index f51a766..18b80ab 100644
--- a/tests/auto/xmlpatternssdk/TestContainer.h
+++ b/tests/auto/xmlpatternssdk/TestContainer.h
@@ -45,8 +45,6 @@
 #include "Global.h"
 #include "TestItem.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -117,7 +115,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestGroup.h b/tests/auto/xmlpatternssdk/TestGroup.h
index 3c7a0a5..3a0deb4 100644
--- a/tests/auto/xmlpatternssdk/TestGroup.h
+++ b/tests/auto/xmlpatternssdk/TestGroup.h
@@ -46,8 +46,6 @@
 
 #include "TestContainer.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -87,7 +85,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestItem.h b/tests/auto/xmlpatternssdk/TestItem.h
index fd85777..dcd57bd 100644
--- a/tests/auto/xmlpatternssdk/TestItem.h
+++ b/tests/auto/xmlpatternssdk/TestItem.h
@@ -45,8 +45,6 @@
 #include "TestResult.h"
 #include "TreeItem.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 template<typename A, typename B> struct QPair;
@@ -127,7 +125,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestResult.h b/tests/auto/xmlpatternssdk/TestResult.h
index b36f41f..c1f8f3c 100644
--- a/tests/auto/xmlpatternssdk/TestResult.h
+++ b/tests/auto/xmlpatternssdk/TestResult.h
@@ -53,8 +53,6 @@
 #include "ASTItem.h"
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -173,7 +171,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestResultHandler.h b/tests/auto/xmlpatternssdk/TestResultHandler.h
index 1d5cfcf..7c83d61 100644
--- a/tests/auto/xmlpatternssdk/TestResultHandler.h
+++ b/tests/auto/xmlpatternssdk/TestResultHandler.h
@@ -48,8 +48,6 @@
 
 #include "TestResult.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -109,7 +107,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestSuite.h b/tests/auto/xmlpatternssdk/TestSuite.h
index efd628a..0ab0fdf 100644
--- a/tests/auto/xmlpatternssdk/TestSuite.h
+++ b/tests/auto/xmlpatternssdk/TestSuite.h
@@ -47,8 +47,6 @@
 
 #include "TestContainer.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
@@ -154,7 +152,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.h b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
index 710f59d..0efc672 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.h
@@ -50,8 +50,6 @@
 #include "TestSuite.h"
 #include "XQTSTestCase.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -163,7 +161,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TestSuiteResult.h b/tests/auto/xmlpatternssdk/TestSuiteResult.h
index 50fc4ac..08a3e7b 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteResult.h
+++ b/tests/auto/xmlpatternssdk/TestSuiteResult.h
@@ -47,8 +47,6 @@
 
 #include "TestResult.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -87,7 +85,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TreeItem.h b/tests/auto/xmlpatternssdk/TreeItem.h
index 6f5e1b4..e00b054 100644
--- a/tests/auto/xmlpatternssdk/TreeItem.h
+++ b/tests/auto/xmlpatternssdk/TreeItem.h
@@ -46,8 +46,6 @@
 
 #include "Global.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QVariant;
@@ -108,7 +106,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/TreeModel.h b/tests/auto/xmlpatternssdk/TreeModel.h
index b8eda04..b393be2 100644
--- a/tests/auto/xmlpatternssdk/TreeModel.h
+++ b/tests/auto/xmlpatternssdk/TreeModel.h
@@ -49,8 +49,6 @@
 
 #include "Global.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -104,7 +102,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/Worker.h b/tests/auto/xmlpatternssdk/Worker.h
index 45329b4..60879ef 100644
--- a/tests/auto/xmlpatternssdk/Worker.h
+++ b/tests/auto/xmlpatternssdk/Worker.h
@@ -49,8 +49,6 @@
 
 #include "ResultThreader.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QEventLoop;
@@ -94,7 +92,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XMLWriter.h b/tests/auto/xmlpatternssdk/XMLWriter.h
index c05709d..2d9c05f 100644
--- a/tests/auto/xmlpatternssdk/XMLWriter.h
+++ b/tests/auto/xmlpatternssdk/XMLWriter.h
@@ -47,8 +47,6 @@
 #include <QtXml/QXmlContentHandler>
 #include <QtXml/QXmlLexicalHandler>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
@@ -397,7 +395,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XQTSTestCase.h b/tests/auto/xmlpatternssdk/XQTSTestCase.h
index c0cc8c3..bdfdfc6 100644
--- a/tests/auto/xmlpatternssdk/XQTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XQTSTestCase.h
@@ -51,8 +51,6 @@
 #include "TestBaseLine.h"
 #include "TestCase.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -143,7 +141,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XSDTSTestCase.h b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
index 1902d93..5e16c2e 100644
--- a/tests/auto/xmlpatternssdk/XSDTSTestCase.h
+++ b/tests/auto/xmlpatternssdk/XSDTSTestCase.h
@@ -49,7 +49,6 @@
 #include "TestBaseLine.h"
 #include "TestCase.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -155,7 +154,6 @@ namespace QPatternistSDK
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
index 02adf1e..c456cc6 100644
--- a/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSDTestSuiteHandler.h
@@ -49,7 +49,6 @@
 #include "TestSuite.h"
 #include "XQTSTestCase.h"
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -115,7 +114,6 @@ namespace QPatternistSDK
 }
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
index 7f7b422..ee003f4 100644
--- a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
+++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.h
@@ -50,8 +50,6 @@
 #include "TestSuite.h"
 #include "XQTSTestCase.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -152,7 +150,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
index bf0ef70..c5b0fb3 100644
--- a/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
+++ b/tests/auto/xmlpatternssdk/tests/XMLWriterTest.h
@@ -44,8 +44,6 @@
 
 #include <QObject>
 
-QT_BEGIN_HEADER
-
 namespace QPatternistSDK
 {
     /**
@@ -71,7 +69,5 @@ namespace QPatternistSDK
     };
 }
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
index 55c58a4..cd6e397 100644
--- a/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
+++ b/tests/auto/xmlpatternsview/view/FunctionSignaturesView.h
@@ -46,8 +46,6 @@
 
 #include "ui_ui_FunctionSignaturesView.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -69,7 +67,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/MainWindow.h b/tests/auto/xmlpatternsview/view/MainWindow.h
index 45bd0e0..7431702 100644
--- a/tests/auto/xmlpatternsview/view/MainWindow.h
+++ b/tests/auto/xmlpatternsview/view/MainWindow.h
@@ -49,8 +49,6 @@
 #include "DebugExpressionFactory.h"
 #include "TestSuite.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -172,7 +170,5 @@ namespace QPatternistSDK
 }
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/TestCaseView.h b/tests/auto/xmlpatternsview/view/TestCaseView.h
index 155ae8d..c9243ab 100644
--- a/tests/auto/xmlpatternsview/view/TestCaseView.h
+++ b/tests/auto/xmlpatternsview/view/TestCaseView.h
@@ -46,8 +46,6 @@
 
 #include "ui_ui_TestCaseView.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -85,7 +83,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/TestResultView.h b/tests/auto/xmlpatternsview/view/TestResultView.h
index f5cae15..ed8ef70 100644
--- a/tests/auto/xmlpatternsview/view/TestResultView.h
+++ b/tests/auto/xmlpatternsview/view/TestResultView.h
@@ -46,8 +46,6 @@
 
 #include "ui_ui_TestResultView.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -80,7 +78,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/TreeSortFilter.h b/tests/auto/xmlpatternsview/view/TreeSortFilter.h
index 33a87a4..77bd669 100644
--- a/tests/auto/xmlpatternsview/view/TreeSortFilter.h
+++ b/tests/auto/xmlpatternsview/view/TreeSortFilter.h
@@ -44,8 +44,6 @@
 
 #include <QSortFilterProxyModel>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -92,7 +90,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/UserTestCase.h b/tests/auto/xmlpatternsview/view/UserTestCase.h
index 0d2ca86..dc6eace 100644
--- a/tests/auto/xmlpatternsview/view/UserTestCase.h
+++ b/tests/auto/xmlpatternsview/view/UserTestCase.h
@@ -46,8 +46,6 @@
 
 #include "TestCase.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -120,7 +118,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tests/auto/xmlpatternsview/view/XDTItemItem.h b/tests/auto/xmlpatternsview/view/XDTItemItem.h
index 63e719a..4a4c93d 100644
--- a/tests/auto/xmlpatternsview/view/XDTItemItem.h
+++ b/tests/auto/xmlpatternsview/view/XDTItemItem.h
@@ -47,8 +47,6 @@
 
 #include "TreeItem.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 namespace QPatternistSDK
@@ -86,7 +84,5 @@ namespace QPatternistSDK
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif
 // vim: et:ts=4:sw=4:sts=4
diff --git a/tools/xmlpatterns/qapplicationargument_p.h b/tools/xmlpatterns/qapplicationargument_p.h
index 0fa0343..ec76307 100644
--- a/tools/xmlpatterns/qapplicationargument_p.h
+++ b/tools/xmlpatterns/qapplicationargument_p.h
@@ -54,7 +54,6 @@
 
 #include <QtCore/QVariant>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QString;
@@ -96,6 +95,6 @@ private:
 uint qHash(const QApplicationArgument &argument);
 
 QT_END_NAMESPACE
-QT_END_HEADER
+
 #endif
 
diff --git a/tools/xmlpatterns/qapplicationargumentparser_p.h b/tools/xmlpatterns/qapplicationargumentparser_p.h
index 0d9bf08..c7cf2f0 100644
--- a/tools/xmlpatterns/qapplicationargumentparser_p.h
+++ b/tools/xmlpatterns/qapplicationargumentparser_p.h
@@ -54,7 +54,6 @@
 
 #include <QtCore/QVariant> /* Needed, because we can't forward declare QVariantList. */
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 class QApplicationArgument;
@@ -108,5 +107,5 @@ private:
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
+
 #endif
diff --git a/tools/xmlpatternsvalidator/main.h b/tools/xmlpatternsvalidator/main.h
index 99a9871..a9ea4c4 100644
--- a/tools/xmlpatternsvalidator/main.h
+++ b/tools/xmlpatternsvalidator/main.h
@@ -54,8 +54,6 @@
 
 #include <QtCore/QCoreApplication>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QXmlPatternistCLI
@@ -69,6 +67,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER 
 
 #endif
author	Sergio Ahumada <sergio.ahumada@digia.com>	2013-01-27 10:41:42 +0100
committer	The Qt Project <gerrit-noreply@qt-project.org>	2013-01-28 22:44:55 +0100
commit	37f34eb393d750c310e93e95b964a28a0118ad3a (patch)
tree	0cdef57bab99744fe181349188c4056ef1b7a601
parent	767effafb8fbb97ec9b85b775f191126a3111c3a (diff)
download	qtxmlpatterns-37f34eb393d750c310e93e95b964a28a0118ad3a.tar.gz