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>

49 files changed, 89 insertions, 89 deletions

diff --git a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
index fd558d7..63fe415 100644
--- a/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
+++ b/src/xmlpatterns/functions/qabstractfunctionfactory_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_AbstractFunctionFactory_H
 #define Patternist_AbstractFunctionFactory_H
 
-#include "qcommonnamespaces_p.h"
-#include "qfunctionfactory_p.h"
-#include "qfunctionsignature_p.h"
+#include <private/qcommonnamespaces_p.h>
+#include <private/qfunctionfactory_p.h>
+#include <private/qfunctionsignature_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qaccessorfns_p.h b/src/xmlpatterns/functions/qaccessorfns_p.h
index 34df197..95a0ed9 100644
--- a/src/xmlpatterns/functions/qaccessorfns_p.h
+++ b/src/xmlpatterns/functions/qaccessorfns_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AccessorFNs_H
 #define Patternist_AccessorFNs_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qaggregatefns_p.h b/src/xmlpatterns/functions/qaggregatefns_p.h
index 08a2efd..ee53aba 100644
--- a/src/xmlpatterns/functions/qaggregatefns_p.h
+++ b/src/xmlpatterns/functions/qaggregatefns_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_AggregateFNs_H
 #define Patternist_AggregateFNs_H
 
-#include "qaggregator_p.h"
-#include "qatomiccomparator_p.h"
-#include "qatomicmathematician_p.h"
-#include "qcomparisonplatform_p.h"
+#include <private/qaggregator_p.h>
+#include <private/qatomiccomparator_p.h>
+#include <private/qatomicmathematician_p.h>
+#include <private/qcomparisonplatform_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qaggregator_p.h b/src/xmlpatterns/functions/qaggregator_p.h
index fc74452..30f54a3 100644
--- a/src/xmlpatterns/functions/qaggregator_p.h
+++ b/src/xmlpatterns/functions/qaggregator_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_Aggregator_H
 #define Patternist_Aggregator_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qassemblestringfns_p.h b/src/xmlpatterns/functions/qassemblestringfns_p.h
index defc460..490ea26 100644
--- a/src/xmlpatterns/functions/qassemblestringfns_p.h
+++ b/src/xmlpatterns/functions/qassemblestringfns_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_AssembleStringFNs_H
 #define Patternist_AssembleStringFNs_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qbooleanfns_p.h b/src/xmlpatterns/functions/qbooleanfns_p.h
index 740dbbb..6dd2e61 100644
--- a/src/xmlpatterns/functions/qbooleanfns_p.h
+++ b/src/xmlpatterns/functions/qbooleanfns_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_BooleanFNs_H
 #define Patternist_BooleanFNs_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qcomparescaseaware_p.h b/src/xmlpatterns/functions/qcomparescaseaware_p.h
index 76f0e1f..867d037 100644
--- a/src/xmlpatterns/functions/qcomparescaseaware_p.h
+++ b/src/xmlpatterns/functions/qcomparescaseaware_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_ComparesCaseAware_H
 #define Patternist_ComparesCaseAware_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qcomparestringfns_p.h b/src/xmlpatterns/functions/qcomparestringfns_p.h
index 75a5b36..ef87099 100644
--- a/src/xmlpatterns/functions/qcomparestringfns_p.h
+++ b/src/xmlpatterns/functions/qcomparestringfns_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_CompareStringFNs_H
 #define Patternist_CompareStringFNs_H
 
-#include "qcomparescaseaware_p.h"
+#include <private/qcomparescaseaware_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qcomparingaggregator_p.h b/src/xmlpatterns/functions/qcomparingaggregator_p.h
index 3a8b7f4..1684aab 100644
--- a/src/xmlpatterns/functions/qcomparingaggregator_p.h
+++ b/src/xmlpatterns/functions/qcomparingaggregator_p.h
@@ -58,14 +58,14 @@
  * and <tt>fn:min()</tt>, MinFN, and the class ComparingAggregator.
  */
 
-#include "qabstractfloat_p.h"
-#include "qdecimal_p.h"
-#include "qcastingplatform_p.h"
-#include "qcomparisonplatform_p.h"
-#include "qliteral_p.h"
-#include "qaggregator_p.h"
-#include "quntypedatomicconverter_p.h"
-#include "qpatternistlocale_p.h"
+#include <private/qabstractfloat_p.h>
+#include <private/qdecimal_p.h>
+#include <private/qcastingplatform_p.h>
+#include <private/qcomparisonplatform_p.h>
+#include <private/qliteral_p.h>
+#include <private/qaggregator_p.h>
+#include <private/quntypedatomicconverter_p.h>
+#include <private/qpatternistlocale_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
index 390c4ae..42a6ebf 100644
--- a/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
+++ b/src/xmlpatterns/functions/qconstructorfunctionsfactory_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_ConstructorFunctionsFactory_H
 #define Patternist_ConstructorFunctionsFactory_H
 
-#include "qabstractfunctionfactory_p.h"
-#include "qschematypefactory_p.h"
+#include <private/qabstractfunctionfactory_p.h>
+#include <private/qschematypefactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qcontextfns_p.h b/src/xmlpatterns/functions/qcontextfns_p.h
index 8485d3d..094a06f 100644
--- a/src/xmlpatterns/functions/qcontextfns_p.h
+++ b/src/xmlpatterns/functions/qcontextfns_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_ContextFNs_H
 #define Patternist_ContextFNs_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qcontextnodechecker_p.h b/src/xmlpatterns/functions/qcontextnodechecker_p.h
index b1933f5..0353a56 100644
--- a/src/xmlpatterns/functions/qcontextnodechecker_p.h
+++ b/src/xmlpatterns/functions/qcontextnodechecker_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_ContextNodeChecker_H
 #define Patternist_ContextNodeChecker_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/functions/qcurrentfn_p.h b/src/xmlpatterns/functions/qcurrentfn_p.h
index d873e8a..7b29ad6 100644
--- a/src/xmlpatterns/functions/qcurrentfn_p.h
+++ b/src/xmlpatterns/functions/qcurrentfn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_CurrentFN_H
 #define Patternist_CurrentFN_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qdatetimefn_p.h b/src/xmlpatterns/functions/qdatetimefn_p.h
index 9583515..1214428 100644
--- a/src/xmlpatterns/functions/qdatetimefn_p.h
+++ b/src/xmlpatterns/functions/qdatetimefn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_DateTimeFN_H
 #define Patternist_DateTimeFN_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qdatetimefns_p.h b/src/xmlpatterns/functions/qdatetimefns_p.h
index d786ae7..a933426 100644
--- a/src/xmlpatterns/functions/qdatetimefns_p.h
+++ b/src/xmlpatterns/functions/qdatetimefns_p.h
@@ -52,13 +52,13 @@
 #ifndef Patternist_DateTimeFNs_H
 #define Patternist_DateTimeFNs_H
 
-#include "qatomiccomparator_p.h"
-#include "qcommonvalues_p.h"
-#include "qschemadatetime_p.h"
-#include "qdaytimeduration_p.h"
-#include "qdecimal_p.h"
-#include "qinteger_p.h"
-#include "qfunctioncall_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qcommonvalues_p.h>
+#include <private/qschemadatetime_p.h>
+#include <private/qdaytimeduration_p.h>
+#include <private/qdecimal_p.h>
+#include <private/qinteger_p.h>
+#include <private/qfunctioncall_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qdeepequalfn_p.h b/src/xmlpatterns/functions/qdeepequalfn_p.h
index 31c876d..1208c0c 100644
--- a/src/xmlpatterns/functions/qdeepequalfn_p.h
+++ b/src/xmlpatterns/functions/qdeepequalfn_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_DeepEqualFN_H
 #define Patternist_DeepEqualFN_H
 
-#include "qatomiccomparator_p.h"
-#include "qcomparisonplatform_p.h"
-#include "qfunctioncall_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qcomparisonplatform_p.h>
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qdocumentfn_p.h b/src/xmlpatterns/functions/qdocumentfn_p.h
index cfffd27..7de2f91 100644
--- a/src/xmlpatterns/functions/qdocumentfn_p.h
+++ b/src/xmlpatterns/functions/qdocumentfn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_DocumentFN_H
 #define Patternist_DocumentFN_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qelementavailablefn_p.h b/src/xmlpatterns/functions/qelementavailablefn_p.h
index cfec21c..f8c09c7 100644
--- a/src/xmlpatterns/functions/qelementavailablefn_p.h
+++ b/src/xmlpatterns/functions/qelementavailablefn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_ElementAvailableFN_H
 #define Patternist_ElementAvailableFN_H
 
-#include "qstaticnamespacescontainer_p.h"
+#include <private/qstaticnamespacescontainer_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/functions/qerrorfn_p.h b/src/xmlpatterns/functions/qerrorfn_p.h
index e08e43a..af7d415 100644
--- a/src/xmlpatterns/functions/qerrorfn_p.h
+++ b/src/xmlpatterns/functions/qerrorfn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_ErrorFN_H
 #define Patternist_ErrorFN_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qfunctionargument_p.h b/src/xmlpatterns/functions/qfunctionargument_p.h
index fc00f0f..d1ff151 100644
--- a/src/xmlpatterns/functions/qfunctionargument_p.h
+++ b/src/xmlpatterns/functions/qfunctionargument_p.h
@@ -55,8 +55,8 @@
 #include <QList>
 #include <QSharedData>
 
-#include "qxmlname.h"
-#include "qsequencetype_p.h"
+#include <QXmlName>
+#include <private/qsequencetype_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qfunctionavailablefn_p.h b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
index 72cade8..0f588d4 100644
--- a/src/xmlpatterns/functions/qfunctionavailablefn_p.h
+++ b/src/xmlpatterns/functions/qfunctionavailablefn_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_FunctionAvailableFN_H
 #define Patternist_FunctionAvailableFN_H
 
-#include "qstaticnamespacescontainer_p.h"
-#include "qfunctionfactory_p.h"
+#include <private/qstaticnamespacescontainer_p.h>
+#include <private/qfunctionfactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qfunctioncall_p.h b/src/xmlpatterns/functions/qfunctioncall_p.h
index ab72628..82bfa39 100644
--- a/src/xmlpatterns/functions/qfunctioncall_p.h
+++ b/src/xmlpatterns/functions/qfunctioncall_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_FunctionCall_H
 #define Patternist_FunctionCall_H
 
-#include "qunlimitedcontainer_p.h"
-#include "qfunctionsignature_p.h"
-#include "qxpathhelper_p.h"
+#include <private/qunlimitedcontainer_p.h>
+#include <private/qfunctionsignature_p.h>
+#include <private/qxpathhelper_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qfunctionfactory_p.h b/src/xmlpatterns/functions/qfunctionfactory_p.h
index 334152e..45a238f 100644
--- a/src/xmlpatterns/functions/qfunctionfactory_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactory_p.h
@@ -56,10 +56,10 @@
 #include <QHash>
 #include <QSharedData>
 
-#include "qexpression_p.h"
-#include "qfunctionsignature_p.h"
-#include "qprimitives_p.h"
-#include "qxmlname.h"
+#include <private/qexpression_p.h>
+#include <private/qfunctionsignature_p.h>
+#include <private/qprimitives_p.h>
+#include <QXmlName>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
index f5de567..dba50f0 100644
--- a/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
+++ b/src/xmlpatterns/functions/qfunctionfactorycollection_p.h
@@ -53,7 +53,7 @@
 #ifndef Patternist_FunctionFactoryCollection_H
 #define Patternist_FunctionFactoryCollection_H
 
-#include "qfunctionfactory_p.h"
+#include <private/qfunctionfactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qfunctionsignature_p.h b/src/xmlpatterns/functions/qfunctionsignature_p.h
index 80e786c..5a14379 100644
--- a/src/xmlpatterns/functions/qfunctionsignature_p.h
+++ b/src/xmlpatterns/functions/qfunctionsignature_p.h
@@ -57,11 +57,11 @@ template<typename T> class QList;
 
 #include <QSharedData>
 
-#include "qcalltargetdescription_p.h"
-#include "qexpression_p.h"
-#include "qfunctionargument_p.h"
-#include "qpatternistlocale_p.h"
-#include "qprimitives_p.h"
+#include <private/qcalltargetdescription_p.h>
+#include <private/qexpression_p.h>
+#include <private/qfunctionargument_p.h>
+#include <private/qpatternistlocale_p.h>
+#include <private/qprimitives_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qgenerateidfn_p.h b/src/xmlpatterns/functions/qgenerateidfn_p.h
index 3b5aacd..cd343a5 100644
--- a/src/xmlpatterns/functions/qgenerateidfn_p.h
+++ b/src/xmlpatterns/functions/qgenerateidfn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_GenerateIDFN_H
 #define Patternist_GenerateIDFN_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qnodefns_p.h b/src/xmlpatterns/functions/qnodefns_p.h
index 8ca4a10..38d13b2 100644
--- a/src/xmlpatterns/functions/qnodefns_p.h
+++ b/src/xmlpatterns/functions/qnodefns_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_NodeFNs_H
 #define Patternist_NodeFNs_H
 
-#include "qfunctioncall_p.h"
-#include "qcastingplatform_p.h"
+#include <private/qfunctioncall_p.h>
+#include <private/qcastingplatform_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qnumericfns_p.h b/src/xmlpatterns/functions/qnumericfns_p.h
index 2b73ed3..8f89879 100644
--- a/src/xmlpatterns/functions/qnumericfns_p.h
+++ b/src/xmlpatterns/functions/qnumericfns_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_NumericFNs_H
 #define Patternist_NumericFNs_H
 
-#include "qaggregator_p.h"
+#include <private/qaggregator_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qpatternmatchingfns_p.h b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
index 1fad10d..c1a8949 100644
--- a/src/xmlpatterns/functions/qpatternmatchingfns_p.h
+++ b/src/xmlpatterns/functions/qpatternmatchingfns_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_PatternMatchingFNs_H
 #define Patternist_PatternMatchingFNs_H
 
-#include "qpatternplatform_p.h"
+#include <private/qpatternplatform_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h
index a7f3fc6..51c7465 100644
--- a/src/xmlpatterns/functions/qpatternplatform_p.h
+++ b/src/xmlpatterns/functions/qpatternplatform_p.h
@@ -55,7 +55,7 @@
 #include <QFlags>
 #include <QRegExp>
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qqnamefns_p.h b/src/xmlpatterns/functions/qqnamefns_p.h
index 335389c..cbf1286 100644
--- a/src/xmlpatterns/functions/qqnamefns_p.h
+++ b/src/xmlpatterns/functions/qqnamefns_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_QNameFNs_H
 #define Patternist_QNameFNs_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qresolveurifn_p.h b/src/xmlpatterns/functions/qresolveurifn_p.h
index cafc8c7..d41cc3a 100644
--- a/src/xmlpatterns/functions/qresolveurifn_p.h
+++ b/src/xmlpatterns/functions/qresolveurifn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_ResolveURIFN_H
 #define Patternist_ResolveURIFN_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h
index fd9921d..5c41be1 100644
--- a/src/xmlpatterns/functions/qsequencefns_p.h
+++ b/src/xmlpatterns/functions/qsequencefns_p.h
@@ -52,10 +52,10 @@
 #ifndef Patternist_SequenceFNs_H
 #define Patternist_SequenceFNs_H
 
-#include "qatomiccomparator_p.h"
-#include "qcomparisonplatform_p.h"
-#include "qliteral_p.h"
-#include "qfunctioncall_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qcomparisonplatform_p.h>
+#include <private/qliteral_p.h>
+#include <private/qfunctioncall_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
index d7d22e2..7581281 100644
--- a/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
+++ b/src/xmlpatterns/functions/qsequencegeneratingfns_p.h
@@ -52,9 +52,9 @@
 #ifndef Patternist_SequenceGeneratingFNs_H
 #define Patternist_SequenceGeneratingFNs_H
 
-#include "qanyuri_p.h"
-#include "qcontextnodechecker_p.h"
-#include "qstaticbaseuricontainer_p.h"
+#include <private/qanyuri_p.h>
+#include <private/qcontextnodechecker_p.h>
+#include <private/qstaticbaseuricontainer_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
index 9e81fb3..c110133 100644
--- a/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticbaseuricontainer_p.h
@@ -54,7 +54,7 @@
 
 #include <QUrl>
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
diff --git a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
index 5463e5d..6deac9e 100644
--- a/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
+++ b/src/xmlpatterns/functions/qstaticnamespacescontainer_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_StaticNamespacesContainer_H
 #define Patternist_StaticNamespacesContainer_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qstringvaluefns_p.h b/src/xmlpatterns/functions/qstringvaluefns_p.h
index 6947763..f15045e 100644
--- a/src/xmlpatterns/functions/qstringvaluefns_p.h
+++ b/src/xmlpatterns/functions/qstringvaluefns_p.h
@@ -54,7 +54,7 @@
 
 #include <QByteArray>
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qsubstringfns_p.h b/src/xmlpatterns/functions/qsubstringfns_p.h
index 86fceab..2ec6338 100644
--- a/src/xmlpatterns/functions/qsubstringfns_p.h
+++ b/src/xmlpatterns/functions/qsubstringfns_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_SubStringFNs_H
 #define Patternist_SubStringFNs_H
 
-#include "qcomparescaseaware_p.h"
+#include <private/qcomparescaseaware_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qsystempropertyfn_p.h b/src/xmlpatterns/functions/qsystempropertyfn_p.h
index 052e8e6..d719b7c 100644
--- a/src/xmlpatterns/functions/qsystempropertyfn_p.h
+++ b/src/xmlpatterns/functions/qsystempropertyfn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_SystemPropertyFN_H
 #define Patternist_SystemPropertyFN_H
 
-#include "qstaticnamespacescontainer_p.h"
+#include <private/qstaticnamespacescontainer_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qtimezonefns_p.h b/src/xmlpatterns/functions/qtimezonefns_p.h
index 53530a2..2bbd01a 100644
--- a/src/xmlpatterns/functions/qtimezonefns_p.h
+++ b/src/xmlpatterns/functions/qtimezonefns_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_TimezoneFNs_H
 #define Patternist_TimezoneFNs_H
 
-#include "qatomiccomparator_p.h"
-#include "qfunctioncall_p.h"
+#include <private/qatomiccomparator_p.h>
+#include <private/qfunctioncall_p.h>
 
 /**
  * @file
diff --git a/src/xmlpatterns/functions/qtracefn_p.h b/src/xmlpatterns/functions/qtracefn_p.h
index 66a2f31..23588a7 100644
--- a/src/xmlpatterns/functions/qtracefn_p.h
+++ b/src/xmlpatterns/functions/qtracefn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_TraceFN_H
 #define Patternist_TraceFN_H
 
-#include "qfunctioncall_p.h"
+#include <private/qfunctioncall_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qtypeavailablefn_p.h b/src/xmlpatterns/functions/qtypeavailablefn_p.h
index 51ed928..40d1e37 100644
--- a/src/xmlpatterns/functions/qtypeavailablefn_p.h
+++ b/src/xmlpatterns/functions/qtypeavailablefn_p.h
@@ -52,8 +52,8 @@
 #ifndef Patternist_TypeAvailableFN_H
 #define Patternist_TypeAvailableFN_H
 
-#include "qschematypefactory_p.h"
-#include "qstaticnamespacescontainer_p.h"
+#include <private/qschematypefactory_p.h>
+#include <private/qstaticnamespacescontainer_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
index ff5ade2..614748d 100644
--- a/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentitypublicidfn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_UnparsedEntityPublicID_H
 #define Patternist_UnparsedEntityPublicID_H
 
-#include "qcontextnodechecker_p.h"
+#include <private/qcontextnodechecker_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qunparsedentityurifn_p.h b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
index 9df24a7..f977814 100644
--- a/src/xmlpatterns/functions/qunparsedentityurifn_p.h
+++ b/src/xmlpatterns/functions/qunparsedentityurifn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_UnparsedEntityURIFN_H
 #define Patternist_UnparsedEntityURIFN_H
 
-#include "qcontextnodechecker_p.h"
+#include <private/qcontextnodechecker_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
index 5ac72ba..83d214a 100644
--- a/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextavailablefn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_UnparsedTextAvailableFN_H
 #define Patternist_UnparsedTextAvailableFN_H
 
-#include "qstaticbaseuricontainer_p.h"
+#include <private/qstaticbaseuricontainer_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qunparsedtextfn_p.h b/src/xmlpatterns/functions/qunparsedtextfn_p.h
index c53cb46..6ea8a84 100644
--- a/src/xmlpatterns/functions/qunparsedtextfn_p.h
+++ b/src/xmlpatterns/functions/qunparsedtextfn_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_UnparsedTextFN_H
 #define Patternist_UnparsedTextFN_H
 
-#include "qstaticbaseuricontainer_p.h"
+#include <private/qstaticbaseuricontainer_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qxpath10corefunctions_p.h b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
index d094a89..2e2894e 100644
--- a/src/xmlpatterns/functions/qxpath10corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath10corefunctions_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XPath10CoreFunctions_H
 #define Patternist_XPath10CoreFunctions_H
 
-#include "qabstractfunctionfactory_p.h"
+#include <private/qabstractfunctionfactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qxpath20corefunctions_p.h b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
index 164b57a..cccd94f 100644
--- a/src/xmlpatterns/functions/qxpath20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxpath20corefunctions_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XPath20CoreFunctions_H
 #define Patternist_XPath20CoreFunctions_H
 
-#include "qabstractfunctionfactory_p.h"
+#include <private/qabstractfunctionfactory_p.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/xmlpatterns/functions/qxslt20corefunctions_p.h b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
index 1a5fb28..a78c3a9 100644
--- a/src/xmlpatterns/functions/qxslt20corefunctions_p.h
+++ b/src/xmlpatterns/functions/qxslt20corefunctions_p.h
@@ -52,7 +52,7 @@
 #ifndef Patternist_XSLT20CoreFunctions_H
 #define Patternist_XSLT20CoreFunctions_H
 
-#include "qabstractfunctionfactory_p.h"
+#include <private/qabstractfunctionfactory_p.h>
 
 QT_BEGIN_HEADER