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>

44 files changed, 0 insertions, 176 deletions

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