Make private headers usable, and use them in the tests.

The xmlpatterns private headers were not including each other correctly,
making them unusable unless the source directory was available and in
INCLUDEPATH.

Fix it so that the private headers include each other by <private/...>,
allowing them to work for an installed Qt.

Change-Id: I9c7cbad219ed141c356d9ea097e67e0fb2fa550c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>

44 files changed, 162 insertions, 162 deletions

diff --git a/src/xmlpatterns/schema/qnamespacesupport_p.h b/src/xmlpatterns/schema/qnamespacesupport_p.h
index 656026e..ddf8fb5 100644
--- a/src/xmlpatterns/schema/qnamespacesupport_p.h
+++ b/src/xmlpatterns/schema/qnamespacesupport_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_NamespaceSupport_H
 #define Patternist_NamespaceSupport_H
 
-#include "qnamepool_p.h"
+#include <private/qnamepool_p.h>
 
 #include <QtCore/QExplicitlySharedDataPointer>
 #include <QtCore/QHash>
diff --git a/src/xmlpatterns/schema/qxsdalternative_p.h b/src/xmlpatterns/schema/qxsdalternative_p.h
index 588257d..ae288f1 100644
--- a/src/xmlpatterns/schema/qxsdalternative_p.h
+++ b/src/xmlpatterns/schema/qxsdalternative_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_XsdAlternative_H
 #define Patternist_XsdAlternative_H
 
-#include "qnamedschemacomponent_p.h"
-#include "qschematype_p.h"
-#include "qxsdannotated_p.h"
-#include "qxsdxpathexpression_p.h"
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qschematype_p.h>
+#include <private/qxsdannotated_p.h>
+#include <private/qxsdxpathexpression_p.h>
 
 #include <QtCore/QList>
 
diff --git a/src/xmlpatterns/schema/qxsdannotated_p.h b/src/xmlpatterns/schema/qxsdannotated_p.h
index 6885026..d6da693 100644
--- a/src/xmlpatterns/schema/qxsdannotated_p.h
+++ b/src/xmlpatterns/schema/qxsdannotated_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XsdAnnotated_H
 #define Patternist_XsdAnnotated_H
 
-#include "qxsdannotation_p.h"
+#include <private/qxsdannotation_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdannotation_p.h b/src/xmlpatterns/schema/qxsdannotation_p.h
index 447787f..a280cbd 100644
--- a/src/xmlpatterns/schema/qxsdannotation_p.h
+++ b/src/xmlpatterns/schema/qxsdannotation_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdAnnotation_H
 #define Patternist_XsdAnnotation_H
 
-#include "qderivedstring_p.h"
-#include "qxsdapplicationinformation_p.h"
-#include "qxsddocumentation_p.h"
+#include <private/qderivedstring_p.h>
+#include <private/qxsdapplicationinformation_p.h>
+#include <private/qxsddocumentation_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
index 5df85b7..c01f566 100644
--- a/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
+++ b/src/xmlpatterns/schema/qxsdapplicationinformation_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdApplicationInformation_H
 #define Patternist_XsdApplicationInformation_H
 
-#include "qanytype_p.h"
-#include "qanyuri_p.h"
-#include "qnamedschemacomponent_p.h"
+#include <private/qanytype_p.h>
+#include <private/qanyuri_p.h>
+#include <private/qnamedschemacomponent_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdassertion_p.h b/src/xmlpatterns/schema/qxsdassertion_p.h
index 3839aee..b653ee5 100644
--- a/src/xmlpatterns/schema/qxsdassertion_p.h
+++ b/src/xmlpatterns/schema/qxsdassertion_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdAssertion_H
 #define Patternist_XsdAssertion_H
 
-#include "qnamedschemacomponent_p.h"
-#include "qxsdannotated_p.h"
-#include "qxsdxpathexpression_p.h"
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qxsdannotated_p.h>
+#include <private/qxsdxpathexpression_p.h>
 
 #include <QtCore/QList>
 
diff --git a/src/xmlpatterns/schema/qxsdattribute_p.h b/src/xmlpatterns/schema/qxsdattribute_p.h
index 169c48a..7e666ee 100644
--- a/src/xmlpatterns/schema/qxsdattribute_p.h
+++ b/src/xmlpatterns/schema/qxsdattribute_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdAttribute_H
 #define Patternist_XsdAttribute_H
 
-#include "qanysimpletype_p.h"
-#include "qnamedschemacomponent_p.h"
-#include "qxsdannotated_p.h"
+#include <private/qanysimpletype_p.h>
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qxsdannotated_p.h>
 
 #include <QtCore/QList>
 
diff --git a/src/xmlpatterns/schema/qxsdattributegroup_p.h b/src/xmlpatterns/schema/qxsdattributegroup_p.h
index aba4d01..80f83ce 100644
--- a/src/xmlpatterns/schema/qxsdattributegroup_p.h
+++ b/src/xmlpatterns/schema/qxsdattributegroup_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdAttributeGroup_H
 #define Patternist_XsdAttributeGroup_H
 
-#include "qxsdannotated_p.h"
-#include "qxsdattributeuse_p.h"
-#include "qxsdwildcard_p.h"
+#include <private/qxsdannotated_p.h>
+#include <private/qxsdattributeuse_p.h>
+#include <private/qxsdwildcard_p.h>
 
 #include <QtCore/QList>
 
diff --git a/src/xmlpatterns/schema/qxsdattributereference_p.h b/src/xmlpatterns/schema/qxsdattributereference_p.h
index 7bec32d..8209b7d 100644
--- a/src/xmlpatterns/schema/qxsdattributereference_p.h
+++ b/src/xmlpatterns/schema/qxsdattributereference_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XsdAttributeReference_H
 #define Patternist_XsdAttributeReference_H
 
-#include "qxsdattributeuse_p.h"
+#include <private/qxsdattributeuse_p.h>
 
 #include <QtXmlPatterns/QSourceLocation>
 
diff --git a/src/xmlpatterns/schema/qxsdattributeterm_p.h b/src/xmlpatterns/schema/qxsdattributeterm_p.h
index 58c8017..3bc81fc 100644
--- a/src/xmlpatterns/schema/qxsdattributeterm_p.h
+++ b/src/xmlpatterns/schema/qxsdattributeterm_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_XsdAttributeTerm_H
 #define Patternist_XsdAttributeTerm_H
 
-#include "qnamedschemacomponent_p.h"
-#include "qxsdannotated_p.h"
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qxsdannotated_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdattributeuse_p.h b/src/xmlpatterns/schema/qxsdattributeuse_p.h
index e06407f..e5c8cd7 100644
--- a/src/xmlpatterns/schema/qxsdattributeuse_p.h
+++ b/src/xmlpatterns/schema/qxsdattributeuse_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_XsdAttributeUse_H
 #define Patternist_XsdAttributeUse_H
 
-#include "qxsdattribute_p.h"
-#include "qxsdattributeterm_p.h"
+#include <private/qxsdattribute_p.h>
+#include <private/qxsdattributeterm_p.h>
 
 #include <QtCore/QList>
 
diff --git a/src/xmlpatterns/schema/qxsdcomplextype_p.h b/src/xmlpatterns/schema/qxsdcomplextype_p.h
index 5e2a8dc..2c9565d 100644
--- a/src/xmlpatterns/schema/qxsdcomplextype_p.h
+++ b/src/xmlpatterns/schema/qxsdcomplextype_p.h
@@ -52,13 +52,13 @@
 #ifndef Patternist_XsdComplexType_H
 #define Patternist_XsdComplexType_H
 
-#include "qanytype_p.h"
-#include "qxsdassertion_p.h"
-#include "qxsdattributeuse_p.h"
-#include "qxsdparticle_p.h"
-#include "qxsdsimpletype_p.h"
-#include "qxsduserschematype_p.h"
-#include "qxsdwildcard_p.h"
+#include <private/qanytype_p.h>
+#include <private/qxsdassertion_p.h>
+#include <private/qxsdattributeuse_p.h>
+#include <private/qxsdparticle_p.h>
+#include <private/qxsdsimpletype_p.h>
+#include <private/qxsduserschematype_p.h>
+#include <private/qxsdwildcard_p.h>
 
 #include <QtCore/QSet>
 
diff --git a/src/xmlpatterns/schema/qxsddocumentation_p.h b/src/xmlpatterns/schema/qxsddocumentation_p.h
index 3ca2332..c4ff38d 100644
--- a/src/xmlpatterns/schema/qxsddocumentation_p.h
+++ b/src/xmlpatterns/schema/qxsddocumentation_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_XsdDocumentation_H
 #define Patternist_XsdDocumentation_H
 
-#include "qanytype_p.h"
-#include "qanyuri_p.h"
-#include "qderivedstring_p.h"
-#include "qnamedschemacomponent_p.h"
+#include <private/qanytype_p.h>
+#include <private/qanyuri_p.h>
+#include <private/qderivedstring_p.h>
+#include <private/qnamedschemacomponent_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdelement_p.h b/src/xmlpatterns/schema/qxsdelement_p.h
index ac1755a..69afe4e 100644
--- a/src/xmlpatterns/schema/qxsdelement_p.h
+++ b/src/xmlpatterns/schema/qxsdelement_p.h
@@ -52,11 +52,11 @@
 #ifndef Patternist_XsdElement_H
 #define Patternist_XsdElement_H
 
-#include "qschemacomponent_p.h"
-#include "qschematype_p.h"
-#include "qxsdalternative_p.h"
-#include "qxsdidentityconstraint_p.h"
-#include "qxsdcomplextype_p.h"
+#include <private/qschemacomponent_p.h>
+#include <private/qschematype_p.h>
+#include <private/qxsdalternative_p.h>
+#include <private/qxsdidentityconstraint_p.h>
+#include <private/qxsdcomplextype_p.h>
 
 #include <QtCore/QList>
 #include <QtCore/QSet>
diff --git a/src/xmlpatterns/schema/qxsdfacet_p.h b/src/xmlpatterns/schema/qxsdfacet_p.h
index a24f6bc..af4faf8 100644
--- a/src/xmlpatterns/schema/qxsdfacet_p.h
+++ b/src/xmlpatterns/schema/qxsdfacet_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_XsdFacet_H
 #define Patternist_XsdFacet_H
 
-#include "qitem_p.h"
-#include "qnamedschemacomponent_p.h"
-#include "qxsdannotated_p.h"
-#include "qxsdassertion_p.h"
+#include <private/qitem_p.h>
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qxsdannotated_p.h>
+#include <private/qxsdassertion_p.h>
 
 #include <QtCore/QList>
 
diff --git a/src/xmlpatterns/schema/qxsdidcache_p.h b/src/xmlpatterns/schema/qxsdidcache_p.h
index 56588f0..39fc8f7 100644
--- a/src/xmlpatterns/schema/qxsdidcache_p.h
+++ b/src/xmlpatterns/schema/qxsdidcache_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XsdIdCache_H
 #define Patternist_XsdIdCache_H
 
-#include "qschemacomponent_p.h"
+#include <private/qschemacomponent_p.h>
 
 #include <QtCore/QExplicitlySharedDataPointer>
 #include <QtCore/QReadWriteLock>
diff --git a/src/xmlpatterns/schema/qxsdidchelper_p.h b/src/xmlpatterns/schema/qxsdidchelper_p.h
index 122b12d..01451b3 100644
--- a/src/xmlpatterns/schema/qxsdidchelper_p.h
+++ b/src/xmlpatterns/schema/qxsdidchelper_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_XsdIdcHelper_H
 #define Patternist_XsdIdcHelper_H
 
-#include "qreportcontext_p.h"
-#include "qschematype_p.h"
+#include <private/qreportcontext_p.h>
+#include <private/qschematype_p.h>
 
 #include <QtXmlPatterns/QXmlItem>
 
diff --git a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
index 7f083c3..6661df5 100644
--- a/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
+++ b/src/xmlpatterns/schema/qxsdidentityconstraint_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdIdentityConstraint_H
 #define Patternist_XsdIdentityConstraint_H
 
-#include "qnamedschemacomponent_p.h"
-#include "qxsdannotated_p.h"
-#include "qxsdxpathexpression_p.h"
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qxsdannotated_p.h>
+#include <private/qxsdxpathexpression_p.h>
 
 #include <QtCore/QStringList>
 
diff --git a/src/xmlpatterns/schema/qxsdinstancereader_p.h b/src/xmlpatterns/schema/qxsdinstancereader_p.h
index 2217d64..2c089b9 100644
--- a/src/xmlpatterns/schema/qxsdinstancereader_p.h
+++ b/src/xmlpatterns/schema/qxsdinstancereader_p.h
@@ -53,8 +53,8 @@
 #define Patternist_XsdInstanceReader_H
 
 #include "qabstractxmlnodemodel.h"
-#include "qpullbridge_p.h"
-#include "qxsdschemacontext_p.h"
+#include <private/qpullbridge_p.h>
+#include <private/qxsdschemacontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdmodelgroup_p.h b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
index 56b0ed0..dcafd5e 100644
--- a/src/xmlpatterns/schema/qxsdmodelgroup_p.h
+++ b/src/xmlpatterns/schema/qxsdmodelgroup_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_XsdModelGroup_H
 #define Patternist_XsdModelGroup_H
 
-#include "qxsdparticle_p.h"
-#include "qxsdterm_p.h"
+#include <private/qxsdparticle_p.h>
+#include <private/qxsdterm_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdnotation_p.h b/src/xmlpatterns/schema/qxsdnotation_p.h
index fd54e48..23bf50d 100644
--- a/src/xmlpatterns/schema/qxsdnotation_p.h
+++ b/src/xmlpatterns/schema/qxsdnotation_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_XsdNotation_H
 #define Patternist_XsdNotation_H
 
-#include "qanyuri_p.h"
-#include "qderivedstring_p.h"
-#include "qnamedschemacomponent_p.h"
-#include "qxsdannotated_p.h"
+#include <private/qanyuri_p.h>
+#include <private/qderivedstring_p.h>
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qxsdannotated_p.h>
 
 #include <QtCore/QList>
 
diff --git a/src/xmlpatterns/schema/qxsdparticle_p.h b/src/xmlpatterns/schema/qxsdparticle_p.h
index 5d7e554..beea28b 100644
--- a/src/xmlpatterns/schema/qxsdparticle_p.h
+++ b/src/xmlpatterns/schema/qxsdparticle_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_XsdParticle_H
 #define Patternist_XsdParticle_H
 
-#include "qnamedschemacomponent_p.h"
-#include "qxsdterm_p.h"
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qxsdterm_p.h>
 
 #include <QtCore/QList>
 
diff --git a/src/xmlpatterns/schema/qxsdparticlechecker_p.h b/src/xmlpatterns/schema/qxsdparticlechecker_p.h
index 14c5d84..68134a5 100644
--- a/src/xmlpatterns/schema/qxsdparticlechecker_p.h
+++ b/src/xmlpatterns/schema/qxsdparticlechecker_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_XsdParticleChecker_H
 #define Patternist_XsdParticleChecker_H
 
-#include "qxsdelement_p.h"
-#include "qxsdparticle_p.h"
-#include "qxsdschemacontext_p.h"
-#include "qxsdwildcard_p.h"
+#include <private/qxsdelement_p.h>
+#include <private/qxsdparticle_p.h>
+#include <private/qxsdschemacontext_p.h>
+#include <private/qxsdwildcard_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdreference_p.h b/src/xmlpatterns/schema/qxsdreference_p.h
index c32f57f..996e91d 100644
--- a/src/xmlpatterns/schema/qxsdreference_p.h
+++ b/src/xmlpatterns/schema/qxsdreference_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XsdReference_H
 #define Patternist_XsdReference_H
 
-#include "qxsdterm_p.h"
+#include <private/qxsdterm_p.h>
 
 #include <QtXmlPatterns/QSourceLocation>
 
diff --git a/src/xmlpatterns/schema/qxsdschema_p.h b/src/xmlpatterns/schema/qxsdschema_p.h
index f563543..d746a01 100644
--- a/src/xmlpatterns/schema/qxsdschema_p.h
+++ b/src/xmlpatterns/schema/qxsdschema_p.h
@@ -52,16 +52,16 @@
 #ifndef Patternist_XsdSchema_H
 #define Patternist_XsdSchema_H
 
-#include "qschematype_p.h"
-#include "qxsdannotated_p.h"
-#include "qxsdattribute_p.h"
-#include "qxsdattributegroup_p.h"
-#include "qxsdcomplextype_p.h"
-#include "qxsdelement_p.h"
-#include "qxsdidentityconstraint_p.h"
-#include "qxsdmodelgroup_p.h"
-#include "qxsdnotation_p.h"
-#include "qxsdsimpletype_p.h"
+#include <private/qschematype_p.h>
+#include <private/qxsdannotated_p.h>
+#include <private/qxsdattribute_p.h>
+#include <private/qxsdattributegroup_p.h>
+#include <private/qxsdcomplextype_p.h>
+#include <private/qxsdelement_p.h>
+#include <private/qxsdidentityconstraint_p.h>
+#include <private/qxsdmodelgroup_p.h>
+#include <private/qxsdnotation_p.h>
+#include <private/qxsdsimpletype_p.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QReadWriteLock>
diff --git a/src/xmlpatterns/schema/qxsdschemachecker_p.h b/src/xmlpatterns/schema/qxsdschemachecker_p.h
index b94948d..09abc6e 100644
--- a/src/xmlpatterns/schema/qxsdschemachecker_p.h
+++ b/src/xmlpatterns/schema/qxsdschemachecker_p.h
@@ -52,14 +52,14 @@
 #ifndef Patternist_XsdSchemaChecker_H
 #define Patternist_XsdSchemaChecker_H
 
-#include "qschematype_p.h"
-#include "qxsdattribute_p.h"
-#include "qxsdattributegroup_p.h"
-#include "qxsdelement_p.h"
-#include "qxsdmodelgroup_p.h"
-#include "qxsdnotation_p.h"
-#include "qxsdschema_p.h"
-#include "qxsdsimpletype_p.h"
+#include <private/qschematype_p.h>
+#include <private/qxsdattribute_p.h>
+#include <private/qxsdattributegroup_p.h>
+#include <private/qxsdelement_p.h>
+#include <private/qxsdmodelgroup_p.h>
+#include <private/qxsdnotation_p.h>
+#include <private/qxsdschema_p.h>
+#include <private/qxsdsimpletype_p.h>
 
 #include <QtCore/QExplicitlySharedDataPointer>
 
diff --git a/src/xmlpatterns/schema/qxsdschemacontext_p.h b/src/xmlpatterns/schema/qxsdschemacontext_p.h
index c83f9b5..d258c89 100644
--- a/src/xmlpatterns/schema/qxsdschemacontext_p.h
+++ b/src/xmlpatterns/schema/qxsdschemacontext_p.h
@@ -52,13 +52,13 @@
 #ifndef Patternist_XsdSchemaContext_H
 #define Patternist_XsdSchemaContext_H
 
-#include "qnamedschemacomponent_p.h"
-#include "qreportcontext_p.h"
-#include "qschematypefactory_p.h"
-#include "qxsdschematoken_p.h"
-#include "qxsdschema_p.h"
-#include "qxsdschemachecker_p.h"
-#include "qxsdschemaresolver_p.h"
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qreportcontext_p.h>
+#include <private/qschematypefactory_p.h>
+#include <private/qxsdschematoken_p.h>
+#include <private/qxsdschema_p.h>
+#include <private/qxsdschemachecker_p.h>
+#include <private/qxsdschemaresolver_p.h>
 
 #include <QtCore/QUrl>
 #include <QtNetwork/QNetworkAccessManager>
diff --git a/src/xmlpatterns/schema/qxsdschemadebugger_p.h b/src/xmlpatterns/schema/qxsdschemadebugger_p.h
index 728359d..4893919 100644
--- a/src/xmlpatterns/schema/qxsdschemadebugger_p.h
+++ b/src/xmlpatterns/schema/qxsdschemadebugger_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XsdSchemaDebugger_H
 #define Patternist_XsdSchemaDebugger_H
 
-#include "qxsdschema_p.h"
+#include <private/qxsdschema_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdschemahelper_p.h b/src/xmlpatterns/schema/qxsdschemahelper_p.h
index 22e74e2..3800ca7 100644
--- a/src/xmlpatterns/schema/qxsdschemahelper_p.h
+++ b/src/xmlpatterns/schema/qxsdschemahelper_p.h
@@ -52,13 +52,13 @@
 #ifndef Patternist_XsdSchemaHelper_H
 #define Patternist_XsdSchemaHelper_H
 
-#include "qcomparisonfactory_p.h"
-#include "qschematype_p.h"
-#include "qxsdattributegroup_p.h"
-#include "qxsdelement_p.h"
-#include "qxsdparticle_p.h"
-#include "qxsdschemacontext_p.h"
-#include "qxsdwildcard_p.h"
+#include <private/qcomparisonfactory_p.h>
+#include <private/qschematype_p.h>
+#include <private/qxsdattributegroup_p.h>
+#include <private/qxsdelement_p.h>
+#include <private/qxsdparticle_p.h>
+#include <private/qxsdschemacontext_p.h>
+#include <private/qxsdwildcard_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdschemamerger_p.h b/src/xmlpatterns/schema/qxsdschemamerger_p.h
index 48d2249..2b1c0de 100644
--- a/src/xmlpatterns/schema/qxsdschemamerger_p.h
+++ b/src/xmlpatterns/schema/qxsdschemamerger_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XsdSchemaMerger_H
 #define Patternist_XsdSchemaMerger_H
 
-#include "qxsdschema_p.h"
+#include <private/qxsdschema_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h
index ae2442e..ae721ff 100644
--- a/src/xmlpatterns/schema/qxsdschemaparser_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h
@@ -52,20 +52,20 @@
 #ifndef Patternist_XsdSchemaParser_H
 #define Patternist_XsdSchemaParser_H
 
-#include "qnamespacesupport_p.h"
-#include "qxsdalternative_p.h"
-#include "qxsdattribute_p.h"
-#include "qxsdattributegroup_p.h"
-#include "qxsdattributeterm_p.h"
-#include "qxsdcomplextype_p.h"
-#include "qxsdelement_p.h"
-#include "qxsdidcache_p.h"
-#include "qxsdmodelgroup_p.h"
-#include "qxsdnotation_p.h"
-#include "qxsdsimpletype_p.h"
-#include "qxsdschemacontext_p.h"
-#include "qxsdschemaparsercontext_p.h"
-#include "qxsdstatemachine_p.h"
+#include <private/qnamespacesupport_p.h>
+#include <private/qxsdalternative_p.h>
+#include <private/qxsdattribute_p.h>
+#include <private/qxsdattributegroup_p.h>
+#include <private/qxsdattributeterm_p.h>
+#include <private/qxsdcomplextype_p.h>
+#include <private/qxsdelement_p.h>
+#include <private/qxsdidcache_p.h>
+#include <private/qxsdmodelgroup_p.h>
+#include <private/qxsdnotation_p.h>
+#include <private/qxsdsimpletype_p.h>
+#include <private/qxsdschemacontext_p.h>
+#include <private/qxsdschemaparsercontext_p.h>
+#include <private/qxsdstatemachine_p.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QSet>
diff --git a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
index ed07808..808b82c 100644
--- a/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaparsercontext_p.h
@@ -52,12 +52,12 @@
 #ifndef Patternist_XsdSchemaParserContext_H
 #define Patternist_XsdSchemaParserContext_H
 
-#include "qmaintainingreader_p.h" // for definition of ElementDescription
-#include "qxsdschematoken_p.h"
-#include "qxsdschema_p.h"
-#include "qxsdschemachecker_p.h"
-#include "qxsdschemacontext_p.h"
-#include "qxsdschemaresolver_p.h"
+#include <private/qmaintainingreader_p.h> // for definition of ElementDescription
+#include <private/qxsdschematoken_p.h>
+#include <private/qxsdschema_p.h>
+#include <private/qxsdschemachecker_p.h>
+#include <private/qxsdschemacontext_p.h>
+#include <private/qxsdschemaresolver_p.h>
 
 #include <QtCore/QSharedData>
 
diff --git a/src/xmlpatterns/schema/qxsdschemaresolver_p.h b/src/xmlpatterns/schema/qxsdschemaresolver_p.h
index dd1fbe3..bff1e0d 100644
--- a/src/xmlpatterns/schema/qxsdschemaresolver_p.h
+++ b/src/xmlpatterns/schema/qxsdschemaresolver_p.h
@@ -52,19 +52,19 @@
 #ifndef Patternist_XsdSchemaResolver_H
 #define Patternist_XsdSchemaResolver_H
 
-#include "qnamespacesupport_p.h"
-#include "qschematype_p.h"
-#include "qschematypefactory_p.h"
-#include "qxsdalternative_p.h"
-#include "qxsdattribute_p.h"
-#include "qxsdattributegroup_p.h"
-#include "qxsdelement_p.h"
-#include "qxsdmodelgroup_p.h"
-#include "qxsdnotation_p.h"
-#include "qxsdreference_p.h"
-#include "qxsdschema_p.h"
-#include "qxsdschemachecker_p.h"
-#include "qxsdsimpletype_p.h"
+#include <private/qnamespacesupport_p.h>
+#include <private/qschematype_p.h>
+#include <private/qschematypefactory_p.h>
+#include <private/qxsdalternative_p.h>
+#include <private/qxsdattribute_p.h>
+#include <private/qxsdattributegroup_p.h>
+#include <private/qxsdelement_p.h>
+#include <private/qxsdmodelgroup_p.h>
+#include <private/qxsdnotation_p.h>
+#include <private/qxsdreference_p.h>
+#include <private/qxsdschema_p.h>
+#include <private/qxsdschemachecker_p.h>
+#include <private/qxsdsimpletype_p.h>
 
 #include <QtCore/QExplicitlySharedDataPointer>
 
diff --git a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
index 2448083..0652a95 100644
--- a/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
+++ b/src/xmlpatterns/schema/qxsdschematypesfactory_p.h
@@ -53,7 +53,7 @@
 #define Patternist_XsdSchemaTypesFactory_H
 
 #include <QtCore/QHash>
-#include "qschematypefactory_p.h"
+#include <private/qschematypefactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdsimpletype_p.h b/src/xmlpatterns/schema/qxsdsimpletype_p.h
index 9d5a047..576fe4c 100644
--- a/src/xmlpatterns/schema/qxsdsimpletype_p.h
+++ b/src/xmlpatterns/schema/qxsdsimpletype_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdSimpleType_H
 #define Patternist_XsdSimpleType_H
 
-#include "qanysimpletype_p.h"
-#include "qxsdfacet_p.h"
-#include "qxsduserschematype_p.h"
+#include <private/qanysimpletype_p.h>
+#include <private/qxsdfacet_p.h>
+#include <private/qxsduserschematype_p.h>
 
 #include <QtCore/QSet>
 
diff --git a/src/xmlpatterns/schema/qxsdstatemachine_p.h b/src/xmlpatterns/schema/qxsdstatemachine_p.h
index a332831..e248937 100644
--- a/src/xmlpatterns/schema/qxsdstatemachine_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachine_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XsdStateMachine_H
 #define Patternist_XsdStateMachine_H
 
-#include "qnamepool_p.h"
+#include <private/qnamepool_p.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QSet>
diff --git a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
index 8c70be3..859eb1f 100644
--- a/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
+++ b/src/xmlpatterns/schema/qxsdstatemachinebuilder_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdStateMachineBuilder_H
 #define Patternist_XsdStateMachineBuilder_H
 
-#include "qxsdparticle_p.h"
-#include "qxsdstatemachine_p.h"
-#include "qxsdterm_p.h"
+#include <private/qxsdparticle_p.h>
+#include <private/qxsdstatemachine_p.h>
+#include <private/qxsdterm_p.h>
 
 #include <QtCore/QExplicitlySharedDataPointer>
 #include <QtCore/QList>
diff --git a/src/xmlpatterns/schema/qxsdterm_p.h b/src/xmlpatterns/schema/qxsdterm_p.h
index bc4471a..ea597c6 100644
--- a/src/xmlpatterns/schema/qxsdterm_p.h
+++ b/src/xmlpatterns/schema/qxsdterm_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_XsdTerm_H
 #define Patternist_XsdTerm_H
 
-#include "qnamedschemacomponent_p.h"
-#include "qxsdannotated_p.h"
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qxsdannotated_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdtypechecker_p.h b/src/xmlpatterns/schema/qxsdtypechecker_p.h
index 4d2915b..fa0b6b5 100644
--- a/src/xmlpatterns/schema/qxsdtypechecker_p.h
+++ b/src/xmlpatterns/schema/qxsdtypechecker_p.h
@@ -54,9 +54,9 @@
 
 #include <QtXmlPatterns/QSourceLocation>
 
-#include "qschematype_p.h"
-#include "qsourcelocationreflection_p.h"
-#include "qxsdschemacontext_p.h"
+#include <private/qschematype_p.h>
+#include <private/qsourcelocationreflection_p.h>
+#include <private/qxsdschemacontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsduserschematype_p.h b/src/xmlpatterns/schema/qxsduserschematype_p.h
index ed32dd3..eafcf7d 100644
--- a/src/xmlpatterns/schema/qxsduserschematype_p.h
+++ b/src/xmlpatterns/schema/qxsduserschematype_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdUserSchemaType_H
 #define Patternist_XsdUserSchemaType_H
 
-#include "qnamedschemacomponent_p.h"
-#include "qschematype_p.h"
-#include "qxsdannotated_p.h"
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qschematype_p.h>
+#include <private/qxsdannotated_p.h>
 
 template<typename N, typename M> class QHash;
 template<typename N> class QList;
diff --git a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
index 8186d10..e759f3a 100644
--- a/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
+++ b/src/xmlpatterns/schema/qxsdvalidatedxmlnodemodel_p.h
@@ -54,10 +54,10 @@
 
 #include "qabstractxmlnodemodel.h"
 
-#include "qabstractxmlforwarditerator_p.h"
-#include "qitem_p.h"
-#include "qschematype_p.h"
-#include "qxsdelement_p.h"
+#include <private/qabstractxmlforwarditerator_p.h>
+#include <private/qitem_p.h>
+#include <private/qschematype_p.h>
+#include <private/qxsdelement_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
index 4def19c..f9c50ae 100644
--- a/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
+++ b/src/xmlpatterns/schema/qxsdvalidatinginstancereader_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_XsdValidatingInstanceReader_H
 #define Patternist_XsdValidatingInstanceReader_H
 
-#include "qxsdidchelper_p.h"
-#include "qxsdinstancereader_p.h"
-#include "qxsdstatemachine_p.h"
-#include "qxsdvalidatedxmlnodemodel_p.h"
+#include <private/qxsdidchelper_p.h>
+#include <private/qxsdinstancereader_p.h>
+#include <private/qxsdstatemachine_p.h>
+#include <private/qxsdvalidatedxmlnodemodel_p.h>
 
 #include <QtCore/QStack>
 
diff --git a/src/xmlpatterns/schema/qxsdwildcard_p.h b/src/xmlpatterns/schema/qxsdwildcard_p.h
index 438ced2..5dc1316 100644
--- a/src/xmlpatterns/schema/qxsdwildcard_p.h
+++ b/src/xmlpatterns/schema/qxsdwildcard_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XsdWildcard_H
 #define Patternist_XsdWildcard_H
 
-#include "qxsdterm_p.h"
+#include <private/qxsdterm_p.h>
 
 #include <QtCore/QSet>
 
diff --git a/src/xmlpatterns/schema/qxsdxpathexpression_p.h b/src/xmlpatterns/schema/qxsdxpathexpression_p.h
index 31d09da..e7c130a 100644
--- a/src/xmlpatterns/schema/qxsdxpathexpression_p.h
+++ b/src/xmlpatterns/schema/qxsdxpathexpression_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_XsdXPathExpression_H
 #define Patternist_XsdXPathExpression_H
 
-#include "qanyuri_p.h"
-#include "qnamedschemacomponent_p.h"
-#include "qxsdannotated_p.h"
+#include <private/qanyuri_p.h>
+#include <private/qnamedschemacomponent_p.h>
+#include <private/qxsdannotated_p.h>
 
 #include <QtCore/QList>