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>

42 files changed, 93 insertions, 93 deletions

diff --git a/src/xmlpatterns/data/qabstractdatetime_p.h b/src/xmlpatterns/data/qabstractdatetime_p.h
index 985270e..bbc5a30 100644
--- a/src/xmlpatterns/data/qabstractdatetime_p.h
+++ b/src/xmlpatterns/data/qabstractdatetime_p.h
@@ -55,7 +55,7 @@
 #include <QDateTime>
 #include <QRegExp>
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qabstractduration_p.h b/src/xmlpatterns/data/qabstractduration_p.h
index 4e6429f..3d7cf6f 100644
--- a/src/xmlpatterns/data/qabstractduration_p.h
+++ b/src/xmlpatterns/data/qabstractduration_p.h
@@ -54,7 +54,7 @@
 
 #include <QRegExp>
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qabstractfloat_p.h b/src/xmlpatterns/data/qabstractfloat_p.h
index 4a0e709..53e3549 100644
--- a/src/xmlpatterns/data/qabstractfloat_p.h
+++ b/src/xmlpatterns/data/qabstractfloat_p.h
@@ -56,11 +56,11 @@
 
 #include <qnumeric.h>
 
-#include "qcommonvalues_p.h"
-#include "qdecimal_p.h"
-#include "qschemanumeric_p.h"
-#include "qvalidationerror_p.h"
-#include "qbuiltintypes_p.h"
+#include <private/qcommonvalues_p.h>
+#include <private/qdecimal_p.h>
+#include <private/qschemanumeric_p.h>
+#include <private/qvalidationerror_p.h>
+#include <private/qbuiltintypes_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qabstractfloatcasters_p.h b/src/xmlpatterns/data/qabstractfloatcasters_p.h
index ffbef40..0f6ab74 100644
--- a/src/xmlpatterns/data/qabstractfloatcasters_p.h
+++ b/src/xmlpatterns/data/qabstractfloatcasters_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_AbstractFloatCasters_H
 #define Patternist_AbstractFloatCasters_H
 
-#include "qabstractfloat_p.h"
-#include "qatomiccaster_p.h"
-#include "qschemanumeric_p.h"
+#include <private/qabstractfloat_p.h>
+#include <private/qatomiccaster_p.h>
+#include <private/qschemanumeric_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/data/qabstractfloatmathematician_p.h b/src/xmlpatterns/data/qabstractfloatmathematician_p.h
index f263c4d..e170172 100644
--- a/src/xmlpatterns/data/qabstractfloatmathematician_p.h
+++ b/src/xmlpatterns/data/qabstractfloatmathematician_p.h
@@ -52,12 +52,12 @@
 #ifndef Patternist_AbstractFloatMathematician_H
 #define Patternist_AbstractFloatMathematician_H
 
-#include "qabstractfloat_p.h"
-#include "qatomicmathematician_p.h"
-#include "qinteger_p.h"
-#include "qschemanumeric_p.h"
-#include "qpatternistlocale_p.h"
-#include "qsourcelocationreflection_p.h"
+#include <private/qabstractfloat_p.h>
+#include <private/qatomicmathematician_p.h>
+#include <private/qinteger_p.h>
+#include <private/qschemanumeric_p.h>
+#include <private/qpatternistlocale_p.h>
+#include <private/qsourcelocationreflection_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/data/qanyuri_p.h b/src/xmlpatterns/data/qanyuri_p.h
index 855c377..2b7b61e 100644
--- a/src/xmlpatterns/data/qanyuri_p.h
+++ b/src/xmlpatterns/data/qanyuri_p.h
@@ -55,10 +55,10 @@
 #include <QUrl>
 #include <QtDebug>
 
-#include "qatomicstring_p.h"
-#include "qbuiltintypes_p.h"
-#include "qpatternistlocale_p.h"
-#include "qreportcontext_p.h"
+#include <private/qatomicstring_p.h>
+#include <private/qbuiltintypes_p.h>
+#include <private/qpatternistlocale_p.h>
+#include <private/qreportcontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qatomiccaster_p.h b/src/xmlpatterns/data/qatomiccaster_p.h
index f322f07..94423bb 100644
--- a/src/xmlpatterns/data/qatomiccaster_p.h
+++ b/src/xmlpatterns/data/qatomiccaster_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_AtomicCaster_H
 #define Patternist_AtomicCaster_H
 
-#include "qdynamiccontext_p.h"
-#include "qitem_p.h"
-#include "qatomictypedispatch_p.h"
+#include <private/qdynamiccontext_p.h>
+#include <private/qitem_p.h>
+#include <private/qatomictypedispatch_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qatomiccasters_p.h b/src/xmlpatterns/data/qatomiccasters_p.h
index df2f15b..f7b1537 100644
--- a/src/xmlpatterns/data/qatomiccasters_p.h
+++ b/src/xmlpatterns/data/qatomiccasters_p.h
@@ -52,12 +52,12 @@
 #ifndef Patternist_AtomicCasters_H
 #define Patternist_AtomicCasters_H
 
-#include "qatomiccaster_p.h"
-#include "qdecimal_p.h"
-#include "qderivedinteger_p.h"
-#include "qderivedstring_p.h"
-#include "qinteger_p.h"
-#include "qvalidationerror_p.h"
+#include <private/qatomiccaster_p.h>
+#include <private/qdecimal_p.h>
+#include <private/qderivedinteger_p.h>
+#include <private/qderivedstring_p.h>
+#include <private/qinteger_p.h>
+#include <private/qvalidationerror_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/data/qatomiccomparator_p.h b/src/xmlpatterns/data/qatomiccomparator_p.h
index a317a65..8765057 100644
--- a/src/xmlpatterns/data/qatomiccomparator_p.h
+++ b/src/xmlpatterns/data/qatomiccomparator_p.h
@@ -54,8 +54,8 @@
 
 #include <QFlags>
 
-#include "qitem_p.h"
-#include "qatomictypedispatch_p.h"
+#include <private/qitem_p.h>
+#include <private/qatomictypedispatch_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qatomiccomparators_p.h b/src/xmlpatterns/data/qatomiccomparators_p.h
index a70f4d7..035b45e 100644
--- a/src/xmlpatterns/data/qatomiccomparators_p.h
+++ b/src/xmlpatterns/data/qatomiccomparators_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_AtomicComparators_H
 #define Patternist_AtomicComparators_H
 
-#include "qabstractfloat_p.h"
-#include "qatomiccomparator_p.h"
-#include "qprimitives_p.h"
+#include <private/qabstractfloat_p.h>
+#include <private/qatomiccomparator_p.h>
+#include <private/qprimitives_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/data/qatomicmathematician_p.h b/src/xmlpatterns/data/qatomicmathematician_p.h
index eccc9f9..70c52fb 100644
--- a/src/xmlpatterns/data/qatomicmathematician_p.h
+++ b/src/xmlpatterns/data/qatomicmathematician_p.h
@@ -54,9 +54,9 @@
 
 #include <QFlags>
 
-#include "qdynamiccontext_p.h"
-#include "qitem_p.h"
-#include "qatomictypedispatch_p.h"
+#include <private/qdynamiccontext_p.h>
+#include <private/qitem_p.h>
+#include <private/qatomictypedispatch_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qatomicmathematicians_p.h b/src/xmlpatterns/data/qatomicmathematicians_p.h
index fb91a6f..2b00bbe 100644
--- a/src/xmlpatterns/data/qatomicmathematicians_p.h
+++ b/src/xmlpatterns/data/qatomicmathematicians_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_AtomicMathematicians_H
 #define Patternist_AtomicMathematicians_H
 
-#include "qatomicmathematician_p.h"
-#include "qsourcelocationreflection_p.h"
+#include <private/qatomicmathematician_p.h>
+#include <private/qsourcelocationreflection_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/data/qatomicstring_p.h b/src/xmlpatterns/data/qatomicstring_p.h
index 3b7fe2b..f10de77 100644
--- a/src/xmlpatterns/data/qatomicstring_p.h
+++ b/src/xmlpatterns/data/qatomicstring_p.h
@@ -54,7 +54,7 @@
 
 #include <QUrl>
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qbase64binary_p.h b/src/xmlpatterns/data/qbase64binary_p.h
index 44b7d64..39c67a1 100644
--- a/src/xmlpatterns/data/qbase64binary_p.h
+++ b/src/xmlpatterns/data/qbase64binary_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Base64Binary_H
 #define Patternist_Base64Binary_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qboolean_p.h b/src/xmlpatterns/data/qboolean_p.h
index 74a9ed0..d502418 100644
--- a/src/xmlpatterns/data/qboolean_p.h
+++ b/src/xmlpatterns/data/qboolean_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Boolean_H
 #define Patternist_Boolean_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qcommonvalues_p.h b/src/xmlpatterns/data/qcommonvalues_p.h
index aba0e20..05e1e48 100644
--- a/src/xmlpatterns/data/qcommonvalues_p.h
+++ b/src/xmlpatterns/data/qcommonvalues_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_CommonValues_H
 #define Patternist_CommonValues_H
 
-#include "qdaytimeduration_p.h"
-#include "qyearmonthduration_p.h"
-#include "qemptyiterator_p.h"
+#include <private/qdaytimeduration_p.h>
+#include <private/qyearmonthduration_p.h>
+#include <private/qemptyiterator_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qcomparisonfactory_p.h b/src/xmlpatterns/data/qcomparisonfactory_p.h
index aad99e9..993fc97 100644
--- a/src/xmlpatterns/data/qcomparisonfactory_p.h
+++ b/src/xmlpatterns/data/qcomparisonfactory_p.h
@@ -52,11 +52,11 @@
 #ifndef Patternist_ComparisonFactory_H
 #define Patternist_ComparisonFactory_H
 
-#include "qatomiccomparator_p.h"
-#include "qderivedstring_p.h"
-#include "qitem_p.h"
-#include "qreportcontext_p.h"
-#include "qschematype_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qderivedstring_p.h>
+#include <private/qitem_p.h>
+#include <private/qreportcontext_p.h>
+#include <private/qschematype_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/data/qdate_p.h b/src/xmlpatterns/data/qdate_p.h
index 0a57789..35311e1 100644
--- a/src/xmlpatterns/data/qdate_p.h
+++ b/src/xmlpatterns/data/qdate_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Date_H
 #define Patternist_Date_H
 
-#include "qabstractdatetime_p.h"
+#include <private/qabstractdatetime_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qdaytimeduration_p.h b/src/xmlpatterns/data/qdaytimeduration_p.h
index d2dd5cb..e5a9eb9 100644
--- a/src/xmlpatterns/data/qdaytimeduration_p.h
+++ b/src/xmlpatterns/data/qdaytimeduration_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_DayTimeDuration_H
 #define Patternist_DayTimeDuration_H
 
-#include "qabstractduration_p.h"
-#include "qitem_p.h"
+#include <private/qabstractduration_p.h>
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qdecimal_p.h b/src/xmlpatterns/data/qdecimal_p.h
index d1eb098..97a09d8 100644
--- a/src/xmlpatterns/data/qdecimal_p.h
+++ b/src/xmlpatterns/data/qdecimal_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Decimal_H
 #define Patternist_Decimal_H
 
-#include "qschemanumeric_p.h"
+#include <private/qschemanumeric_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h
index 4e68dc5..05783e3 100644
--- a/src/xmlpatterns/data/qderivedinteger_p.h
+++ b/src/xmlpatterns/data/qderivedinteger_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_DerivedInteger_H
 #define Patternist_DerivedInteger_H
 
-#include "qbuiltintypes_p.h"
-#include "qinteger_p.h"
-#include "qpatternistlocale_p.h"
-#include "qvalidationerror_p.h"
+#include <private/qbuiltintypes_p.h>
+#include <private/qinteger_p.h>
+#include <private/qpatternistlocale_p.h>
+#include <private/qvalidationerror_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qderivedstring_p.h b/src/xmlpatterns/data/qderivedstring_p.h
index 2c13fef..51766ca 100644
--- a/src/xmlpatterns/data/qderivedstring_p.h
+++ b/src/xmlpatterns/data/qderivedstring_p.h
@@ -54,10 +54,10 @@
 
 #include <QRegExp>
 
-#include "private/qxmlutils_p.h"
-#include "qbuiltintypes_p.h"
-#include "qpatternistlocale_p.h"
-#include "qvalidationerror_p.h"
+#include <private/qxmlutils_p.h>
+#include <private/qbuiltintypes_p.h>
+#include <private/qpatternistlocale_p.h>
+#include <private/qvalidationerror_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qduration_p.h b/src/xmlpatterns/data/qduration_p.h
index 3c88a5e..d2f6ccc 100644
--- a/src/xmlpatterns/data/qduration_p.h
+++ b/src/xmlpatterns/data/qduration_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Duration_H
 #define Patternist_Duration_H
 
-#include "qabstractduration_p.h"
+#include <private/qabstractduration_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qgday_p.h b/src/xmlpatterns/data/qgday_p.h
index 3a52bc6..b2b8073 100644
--- a/src/xmlpatterns/data/qgday_p.h
+++ b/src/xmlpatterns/data/qgday_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_GDay_H
 #define Patternist_GDay_H
 
-#include "qabstractdatetime_p.h"
+#include <private/qabstractdatetime_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qgmonth_p.h b/src/xmlpatterns/data/qgmonth_p.h
index 2c6ff42..e722ef0 100644
--- a/src/xmlpatterns/data/qgmonth_p.h
+++ b/src/xmlpatterns/data/qgmonth_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_GMonth_H
 #define Patternist_GMonth_H
 
-#include "qabstractdatetime_p.h"
+#include <private/qabstractdatetime_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qgmonthday_p.h b/src/xmlpatterns/data/qgmonthday_p.h
index 4456fbf..3ea9232 100644
--- a/src/xmlpatterns/data/qgmonthday_p.h
+++ b/src/xmlpatterns/data/qgmonthday_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_GMonthDay_H
 #define Patternist_GMonthDay_H
 
-#include "qabstractdatetime_p.h"
+#include <private/qabstractdatetime_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qgyear_p.h b/src/xmlpatterns/data/qgyear_p.h
index 3fc59ae..61c0536 100644
--- a/src/xmlpatterns/data/qgyear_p.h
+++ b/src/xmlpatterns/data/qgyear_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_GYear_H
 #define Patternist_GYear_H
 
-#include "qabstractdatetime_p.h"
+#include <private/qabstractdatetime_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qgyearmonth_p.h b/src/xmlpatterns/data/qgyearmonth_p.h
index c83a43f..13ab4ed 100644
--- a/src/xmlpatterns/data/qgyearmonth_p.h
+++ b/src/xmlpatterns/data/qgyearmonth_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_GYearMonth_H
 #define Patternist_GYearMonth_H
 
-#include "qabstractdatetime_p.h"
+#include <private/qabstractdatetime_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qhexbinary_p.h b/src/xmlpatterns/data/qhexbinary_p.h
index 45117da..91eaca3 100644
--- a/src/xmlpatterns/data/qhexbinary_p.h
+++ b/src/xmlpatterns/data/qhexbinary_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_HexBinary_H
 #define Patternist_HexBinary_H
 
-#include "qbase64binary_p.h"
+#include <private/qbase64binary_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qinteger_p.h b/src/xmlpatterns/data/qinteger_p.h
index 880653a..5d2eaf4 100644
--- a/src/xmlpatterns/data/qinteger_p.h
+++ b/src/xmlpatterns/data/qinteger_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Integer_H
 #define Patternist_Integer_H
 
-#include "qschemanumeric_p.h"
+#include <private/qschemanumeric_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qnodebuilder_p.h b/src/xmlpatterns/data/qnodebuilder_p.h
index d4ba939..9618c20 100644
--- a/src/xmlpatterns/data/qnodebuilder_p.h
+++ b/src/xmlpatterns/data/qnodebuilder_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_NodeBuilder_H
 #define Patternist_NodeBuilder_H
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 #include "qabstractxmlreceiver.h"
-#include "qautoptr_p.h"
+#include <private/qautoptr_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qqnamevalue_p.h b/src/xmlpatterns/data/qqnamevalue_p.h
index d38b6fa..6a71026 100644
--- a/src/xmlpatterns/data/qqnamevalue_p.h
+++ b/src/xmlpatterns/data/qqnamevalue_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_QNameValue_H
 #define Patternist_QNameValue_H
 
-#include "qitem_p.h"
-#include "qxmlname.h"
+#include <private/qitem_p.h>
+#include <QXmlName>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qresourceloader_p.h b/src/xmlpatterns/data/qresourceloader_p.h
index 5562307..ca14ab0 100644
--- a/src/xmlpatterns/data/qresourceloader_p.h
+++ b/src/xmlpatterns/data/qresourceloader_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_ResourceLoader_H
 #define Patternist_ResourceLoader_H
 
-#include "qitem_p.h"
-#include "qreportcontext_p.h"
-#include "qsequencetype_p.h"
-#include "qsourcelocationreflection_p.h"
+#include <private/qitem_p.h>
+#include <private/qreportcontext_p.h>
+#include <private/qsequencetype_p.h>
+#include <private/qsourcelocationreflection_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qschemadatetime_p.h b/src/xmlpatterns/data/qschemadatetime_p.h
index dfd91cf..344c4c4 100644
--- a/src/xmlpatterns/data/qschemadatetime_p.h
+++ b/src/xmlpatterns/data/qschemadatetime_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_DateTime_H
 #define Patternist_DateTime_H
 
-#include "qabstractdatetime_p.h"
+#include <private/qabstractdatetime_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qschemanumeric_p.h b/src/xmlpatterns/data/qschemanumeric_p.h
index c0d94b5..9369b0c 100644
--- a/src/xmlpatterns/data/qschemanumeric_p.h
+++ b/src/xmlpatterns/data/qschemanumeric_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_Numeric_H
 #define Patternist_Numeric_H
 
-#include "qitem_p.h"
-#include "qprimitives_p.h"
+#include <private/qitem_p.h>
+#include <private/qprimitives_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qschematime_p.h b/src/xmlpatterns/data/qschematime_p.h
index 57b0109..6f47b5c 100644
--- a/src/xmlpatterns/data/qschematime_p.h
+++ b/src/xmlpatterns/data/qschematime_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Time_H
 #define Patternist_Time_H
 
-#include "qabstractdatetime_p.h"
+#include <private/qabstractdatetime_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qsequencereceiver_p.h b/src/xmlpatterns/data/qsequencereceiver_p.h
index 2416160..8de6865 100644
--- a/src/xmlpatterns/data/qsequencereceiver_p.h
+++ b/src/xmlpatterns/data/qsequencereceiver_p.h
@@ -54,7 +54,7 @@
 
 #include <QSharedData>
 
-#include "qitem_p.h"
+#include <private/qitem_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qsorttuple_p.h b/src/xmlpatterns/data/qsorttuple_p.h
index 56e6ed4..585b56e 100644
--- a/src/xmlpatterns/data/qsorttuple_p.h
+++ b/src/xmlpatterns/data/qsorttuple_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_SortTuple_H
 #define Patternist_SortTuple_H
 
-#include "qitem_p.h"
-#include "qitem_p.h"
-#include "qitemtype_p.h"
+#include <private/qitem_p.h>
+#include <private/qitem_p.h>
+#include <private/qitemtype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/quntypedatomic_p.h b/src/xmlpatterns/data/quntypedatomic_p.h
index d25d0b5..187e539 100644
--- a/src/xmlpatterns/data/quntypedatomic_p.h
+++ b/src/xmlpatterns/data/quntypedatomic_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_UntypedAtomic_H
 #define Patternist_UntypedAtomic_H
 
-#include "qatomicstring_p.h"
+#include <private/qatomicstring_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qvalidationerror_p.h b/src/xmlpatterns/data/qvalidationerror_p.h
index 85ff2a6..5a489df 100644
--- a/src/xmlpatterns/data/qvalidationerror_p.h
+++ b/src/xmlpatterns/data/qvalidationerror_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_ValidationError_H
 #define Patternist_ValidationError_H
 
-#include "qitem_p.h"
-#include "qreportcontext_p.h"
+#include <private/qitem_p.h>
+#include <private/qreportcontext_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/data/qvaluefactory_p.h b/src/xmlpatterns/data/qvaluefactory_p.h
index b7d351e..124448a 100644
--- a/src/xmlpatterns/data/qvaluefactory_p.h
+++ b/src/xmlpatterns/data/qvaluefactory_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_ValueFactory_H
 #define Patternist_ValueFactory_H
 
-#include "qitem_p.h"
-#include "qreportcontext_p.h"
-#include "qschematype_p.h"
+#include <private/qitem_p.h>
+#include <private/qreportcontext_p.h>
+#include <private/qschematype_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/data/qyearmonthduration_p.h b/src/xmlpatterns/data/qyearmonthduration_p.h
index ffffdf4..02b6916 100644
--- a/src/xmlpatterns/data/qyearmonthduration_p.h
+++ b/src/xmlpatterns/data/qyearmonthduration_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_YearMonthDuration_H
 #define Patternist_YearMonthDuration_H
 
-#include "qabstractduration_p.h"
+#include <private/qabstractduration_p.h>
 
 QT_BEGIN_HEADER