diff --git a/src/xmlpatterns/api/qdeviceresourceloader_p.h b/src/xmlpatterns/api/qdeviceresourceloader_p.h
index d819a6c1c93c127bc4cf4234d7a054516a96c96a..3eae3f4486d35e0180cab43cbab751b2dbf933a7 100644
--- a/src/xmlpatterns/api/qdeviceresourceloader_p.h
+++ b/src/xmlpatterns/api/qdeviceresourceloader_p.h
@@ -52,14 +52,14 @@
 #ifndef QPatternist_DeviceResourceLoader_p_H
 #define QPatternist_DeviceResourceLoader_p_H
 
-template<typename T> class QSet;
-class QUrl;
-
 #include <private/qresourceloader_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
+template<typename T> class QSet;
+class QUrl;
+
 namespace QPatternist
 {
     /**
diff --git a/src/xmlpatterns/expr/qcalltargetdescription_p.h b/src/xmlpatterns/expr/qcalltargetdescription_p.h
index 1922ea52204a55200e92b3697c87a8c2ff188ac4..8cf03b3e469f02609c619c9f11bf45d02252a4e3 100644
--- a/src/xmlpatterns/expr/qcalltargetdescription_p.h
+++ b/src/xmlpatterns/expr/qcalltargetdescription_p.h
@@ -52,9 +52,6 @@
 #ifndef Patternist_CallTargetDescription_H
 #define Patternist_CallTargetDescription_H
 
-template<typename Key, typename Value> class QHash;
-template<typename T> class QList;
-
 #include <QSharedData>
 
 #include <private/qexpression_p.h>
@@ -63,6 +60,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+template<typename Key, typename Value> class QHash;
+template<typename T> class QList;
+
 namespace QPatternist
 {
     class CallSite;
diff --git a/src/xmlpatterns/expr/quserfunction_p.h b/src/xmlpatterns/expr/quserfunction_p.h
index c7281e46e1102a373978e1a115d6c2e018ba11eb..eaa0895aa86671c7f270b093185a67b87bb3ded6 100644
--- a/src/xmlpatterns/expr/quserfunction_p.h
+++ b/src/xmlpatterns/expr/quserfunction_p.h
@@ -52,8 +52,6 @@
 #ifndef Patternist_UserFunction_H
 #define Patternist_UserFunction_H
 
-template<typename T> class QList;
-
 #include <QSharedData>
 
 #include <private/qexpression_p.h>
@@ -64,6 +62,8 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+template<typename T> class QList;
+
 namespace QPatternist
 {
     /**
diff --git a/src/xmlpatterns/functions/qfunctionsignature_p.h b/src/xmlpatterns/functions/qfunctionsignature_p.h
index 6e479502109e52f0e82472d811882cf2115c9c07..9757d91876c2ecce1f4007b48adcb8fb3642fab6 100644
--- a/src/xmlpatterns/functions/qfunctionsignature_p.h
+++ b/src/xmlpatterns/functions/qfunctionsignature_p.h
@@ -52,9 +52,6 @@
 #ifndef Patternist_FunctionSignature_H
 #define Patternist_FunctionSignature_H
 
-template<typename Key, typename Value> class QHash;
-template<typename T> class QList;
-
 #include <QSharedData>
 
 #include <private/qcalltargetdescription_p.h>
@@ -67,6 +64,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+template<typename Key, typename Value> class QHash;
+template<typename T> class QList;
+
 namespace QPatternist
 {
 
diff --git a/src/xmlpatterns/parser/qmaintainingreader_p.h b/src/xmlpatterns/parser/qmaintainingreader_p.h
index 7390a48f69edef063ce98969ac5ebdd1209a0dde..f7ae407fbb98893116a585ea5a5ddc6c71ab57cf 100644
--- a/src/xmlpatterns/parser/qmaintainingreader_p.h
+++ b/src/xmlpatterns/parser/qmaintainingreader_p.h
@@ -61,11 +61,11 @@
 #include <private/qxpathhelper_p.h>
 #include <private/qxslttokenlookup_p.h>
 
-class QUrl;
-
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
+class QUrl;
+
 namespace QPatternist
 {
     /**
diff --git a/src/xmlpatterns/schema/qxsdstatemachine_p.h b/src/xmlpatterns/schema/qxsdstatemachine_p.h
index bb405785f501d864dd18f959597cdc834b42d941..805d345c32fba9ec2b9cd1071cb96976b844890b 100644
--- a/src/xmlpatterns/schema/qxsdstatemachine_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachine_p.h
@@ -58,12 +58,12 @@
 #include <QtCore/QSet>
 #include <QtCore/QTextStream>
 
-class QIODevice;
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+class QIODevice;
+
 namespace QPatternist
 {
     /**
diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h
index 6a13f5830d9856b3555969ada99f95f6028bd49e..8c7044161593f0dfa293434f978cf7fdb3c1e927 100644
--- a/src/xmlpatterns/schema/qxsduserschematype_p.h
+++ b/src/xmlpatterns/schema/qxsduserschematype_p.h
@@ -56,13 +56,13 @@
 #include <private/qschematype_p.h>
 #include <private/qxsdannotated_p.h>
 
-template<typename N, typename M> class QHash;
-template<typename N> class QList;
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+template<typename N, typename M> class QHash;
+template<typename N> class QList;
+
 namespace QPatternist
 {
     /**
diff --git a/src/xmlpatterns/type/qlocalnametest_p.h b/src/xmlpatterns/type/qlocalnametest_p.h
index 331ef5c017556b864ee34ce60409eaef3222d83a..fc58410431507f2534b7d33ea2d2e61a127ad0d9 100644
--- a/src/xmlpatterns/type/qlocalnametest_p.h
+++ b/src/xmlpatterns/type/qlocalnametest_p.h
@@ -54,12 +54,12 @@
 
 #include <private/qabstractnodetest_p.h>
 
-template<typename Key, typename Value> class QHash;
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+template<typename Key, typename Value> class QHash;
+
 namespace QPatternist
 {
     /**
diff --git a/src/xmlpatterns/type/qnamespacenametest_p.h b/src/xmlpatterns/type/qnamespacenametest_p.h
index 6c4fbb2f82982709ee0c49cf9e33f75a38bec53c..4c08bec49624ea083229b272db7fe8847fccffc0 100644
--- a/src/xmlpatterns/type/qnamespacenametest_p.h
+++ b/src/xmlpatterns/type/qnamespacenametest_p.h
@@ -54,12 +54,12 @@
 
 #include <private/qabstractnodetest_p.h>
 
-template<typename Key, typename Value> class QHash;
-
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+template<typename Key, typename Value> class QHash;
+
 namespace QPatternist
 {
     /**