summaryrefslogtreecommitdiffstats
path: root/src/charts/axis
diff options
context:
space:
mode:
Diffstat (limited to 'src/charts/axis')
-rw-r--r--src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp12
-rw-r--r--src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h2
-rw-r--r--src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp12
-rw-r--r--src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h2
-rw-r--r--src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp14
-rw-r--r--src/charts/axis/barcategoryaxis/qbarcategoryaxis.h2
-rw-r--r--src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h4
-rw-r--r--src/charts/axis/cartesianchartaxis.cpp22
-rw-r--r--src/charts/axis/cartesianchartaxis_p.h4
-rw-r--r--src/charts/axis/categoryaxis/chartcategoryaxisx.cpp14
-rw-r--r--src/charts/axis/categoryaxis/chartcategoryaxisx_p.h2
-rw-r--r--src/charts/axis/categoryaxis/chartcategoryaxisy.cpp16
-rw-r--r--src/charts/axis/categoryaxis/chartcategoryaxisy_p.h2
-rw-r--r--src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp10
-rw-r--r--src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h2
-rw-r--r--src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp10
-rw-r--r--src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h2
-rw-r--r--src/charts/axis/categoryaxis/qcategoryaxis.cpp18
-rw-r--r--src/charts/axis/categoryaxis/qcategoryaxis.h4
-rw-r--r--src/charts/axis/categoryaxis/qcategoryaxis_p.h4
-rw-r--r--src/charts/axis/chartaxiselement.cpp14
-rw-r--r--src/charts/axis/chartaxiselement_p.h12
-rw-r--r--src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp14
-rw-r--r--src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h2
-rw-r--r--src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp14
-rw-r--r--src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h2
-rw-r--r--src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp8
-rw-r--r--src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h2
-rw-r--r--src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp8
-rw-r--r--src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h2
-rw-r--r--src/charts/axis/datetimeaxis/qdatetimeaxis.cpp16
-rw-r--r--src/charts/axis/datetimeaxis/qdatetimeaxis.h2
-rw-r--r--src/charts/axis/datetimeaxis/qdatetimeaxis_p.h6
-rw-r--r--src/charts/axis/horizontalaxis.cpp10
-rw-r--r--src/charts/axis/horizontalaxis_p.h2
-rw-r--r--src/charts/axis/linearrowitem_p.h6
-rw-r--r--src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp14
-rw-r--r--src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h2
-rw-r--r--src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp14
-rw-r--r--src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h2
-rw-r--r--src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp12
-rw-r--r--src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h2
-rw-r--r--src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp12
-rw-r--r--src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h2
-rw-r--r--src/charts/axis/logvalueaxis/qlogvalueaxis.cpp14
-rw-r--r--src/charts/axis/logvalueaxis/qlogvalueaxis.h2
-rw-r--r--src/charts/axis/logvalueaxis/qlogvalueaxis_p.h4
-rw-r--r--src/charts/axis/polarchartaxis.cpp6
-rw-r--r--src/charts/axis/polarchartaxis_p.h2
-rw-r--r--src/charts/axis/polarchartaxisangular.cpp16
-rw-r--r--src/charts/axis/polarchartaxisangular_p.h4
-rw-r--r--src/charts/axis/polarchartaxisradial.cpp12
-rw-r--r--src/charts/axis/polarchartaxisradial_p.h4
-rw-r--r--src/charts/axis/qabstractaxis.cpp10
-rw-r--r--src/charts/axis/qabstractaxis.h8
-rw-r--r--src/charts/axis/qabstractaxis_p.h8
-rw-r--r--src/charts/axis/valueaxis/chartvalueaxisx.cpp16
-rw-r--r--src/charts/axis/valueaxis/chartvalueaxisx_p.h2
-rw-r--r--src/charts/axis/valueaxis/chartvalueaxisy.cpp16
-rw-r--r--src/charts/axis/valueaxis/chartvalueaxisy_p.h2
-rw-r--r--src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp6
-rw-r--r--src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h2
-rw-r--r--src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp6
-rw-r--r--src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h2
-rw-r--r--src/charts/axis/valueaxis/qvalueaxis.cpp20
-rw-r--r--src/charts/axis/valueaxis/qvalueaxis.h2
-rw-r--r--src/charts/axis/valueaxis/qvalueaxis_p.h4
-rw-r--r--src/charts/axis/verticalaxis.cpp8
-rw-r--r--src/charts/axis/verticalaxis_p.h2
69 files changed, 258 insertions, 258 deletions
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
index 259cdaa9..c911ebb9 100644
--- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx.cpp
@@ -18,12 +18,12 @@
**
****************************************************************************/
-#include "chartbarcategoryaxisx_p.h"
-#include "chartpresenter_p.h"
-#include "qbarcategoryaxis_p.h"
-#include "abstractchartlayout_p.h"
-#include <QDebug>
-#include <qmath.h>
+#include <private/chartbarcategoryaxisx_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/qbarcategoryaxis_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtCore/QDebug>
+#include <QtCore/QtMath>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
index 177540e2..bc5be25b 100644
--- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTBARCATEGORYAXISX_H
#define CHARTBARCATEGORYAXISX_H
-#include "horizontalaxis_p.h"
+#include <private/horizontalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
index 126c7da3..3d661c07 100644
--- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy.cpp
@@ -18,12 +18,12 @@
**
****************************************************************************/
-#include "chartbarcategoryaxisy_p.h"
-#include "chartpresenter_p.h"
-#include "qbarcategoryaxis_p.h"
-#include "abstractchartlayout_p.h"
-#include <qmath.h>
-#include <QDebug>
+#include <private/chartbarcategoryaxisy_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/qbarcategoryaxis_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
index 82f2c505..89c41dfd 100644
--- a/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
+++ b/src/charts/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTBARCATEGORYAXISY_H
#define CHARTBARCATEGORYAXISY_H
-#include "verticalaxis_p.h"
+#include <private/verticalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp
index 7818d6f6..446bfd18 100644
--- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp
+++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.cpp
@@ -18,13 +18,13 @@
**
****************************************************************************/
-#include "qbarcategoryaxis.h"
-#include "qbarcategoryaxis_p.h"
-#include "chartbarcategoryaxisx_p.h"
-#include "chartbarcategoryaxisy_p.h"
-#include "abstractdomain_p.h"
-#include "qchart.h"
-#include <qmath.h>
+#include <QtCharts/QBarCategoryAxis>
+#include <private/qbarcategoryaxis_p.h>
+#include <private/chartbarcategoryaxisx_p.h>
+#include <private/chartbarcategoryaxisy_p.h>
+#include <private/abstractdomain_p.h>
+#include <QtCharts/QChart>
+#include <QtCore/QtMath>
QT_CHARTS_BEGIN_NAMESPACE
/*!
diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h
index 55a2430f..3e6bdb96 100644
--- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h
+++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis.h
@@ -21,7 +21,7 @@
#ifndef QBARCATEGORYAXIS_H
#define QBARCATEGORYAXIS_H
-#include <QtCharts/qabstractaxis.h>
+#include <QtCharts/QAbstractAxis>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h
index 8ebc5a4c..95a47ede 100644
--- a/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h
+++ b/src/charts/axis/barcategoryaxis/qbarcategoryaxis_p.h
@@ -30,8 +30,8 @@
#ifndef QBARCATEGORYAXIS_P_H
#define QBARCATEGORYAXIS_P_H
-#include <qbarcategoryaxis.h>
-#include "qabstractaxis_p.h"
+#include <QtCharts/QBarCategoryAxis>
+#include <private/qabstractaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/cartesianchartaxis.cpp b/src/charts/axis/cartesianchartaxis.cpp
index d067921d..399662ec 100644
--- a/src/charts/axis/cartesianchartaxis.cpp
+++ b/src/charts/axis/cartesianchartaxis.cpp
@@ -18,17 +18,17 @@
**
****************************************************************************/
-#include "cartesianchartaxis_p.h"
-#include "qabstractaxis.h"
-#include "qabstractaxis_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include "abstractdomain_p.h"
-#include "linearrowitem_p.h"
-#include <QValueAxis>
-#include <QLogValueAxis>
-#include <QGraphicsLayout>
-#include <QTextDocument>
+#include <private/cartesianchartaxis_p.h>
+#include <QtCharts/QAbstractAxis>
+#include <private/qabstractaxis_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <private/abstractdomain_p.h>
+#include <private/linearrowitem_p.h>
+#include <QtCharts/QValueAxis>
+#include <QtCharts/QLogValueAxis>
+#include <QtWidgets/QGraphicsLayout>
+#include <QtGui/QTextDocument>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/cartesianchartaxis_p.h b/src/charts/axis/cartesianchartaxis_p.h
index c0c2252b..a2f6a81b 100644
--- a/src/charts/axis/cartesianchartaxis_p.h
+++ b/src/charts/axis/cartesianchartaxis_p.h
@@ -30,8 +30,8 @@
#ifndef CARTESIANCHARTAXIS_H
#define CARTESIANCHARTAXIS_H
-#include "qchartglobal.h"
-#include "chartaxiselement_p.h"
+#include <QtCharts/QChartGlobal>
+#include <private/chartaxiselement_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp
index 2141f353..e8e587d9 100644
--- a/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp
+++ b/src/charts/axis/categoryaxis/chartcategoryaxisx.cpp
@@ -18,13 +18,13 @@
**
****************************************************************************/
-#include "chartcategoryaxisx_p.h"
-#include "qcategoryaxis.h"
-#include "qabstractaxis.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include <QGraphicsLayout>
-#include <qmath.h>
+#include <private/chartcategoryaxisx_p.h>
+#include <QtCharts/QCategoryAxis>
+#include <QtCharts/QAbstractAxis>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtWidgets/QGraphicsLayout>
+#include <QtCore/QtMath>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h
index e526b01a..503f372c 100644
--- a/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h
+++ b/src/charts/axis/categoryaxis/chartcategoryaxisx_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTCATEGORYAXISX_H
#define CHARTCATEGORYAXISX_H
-#include "horizontalaxis_p.h"
+#include <private/horizontalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp
index 7d5ba103..6f6f25a7 100644
--- a/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp
+++ b/src/charts/axis/categoryaxis/chartcategoryaxisy.cpp
@@ -18,14 +18,14 @@
**
****************************************************************************/
-#include "chartcategoryaxisy_p.h"
-#include "qcategoryaxis.h"
-#include "qabstractaxis.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include <QGraphicsLayout>
-#include <qmath.h>
-#include <QDebug>
+#include <private/chartcategoryaxisy_p.h>
+#include <QtCharts/QCategoryAxis>
+#include <QtCharts/QAbstractAxis>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtWidgets/QGraphicsLayout>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h
index e416e4c0..d4abbf4c 100644
--- a/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h
+++ b/src/charts/axis/categoryaxis/chartcategoryaxisy_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTCATEGORYAXISY_H
#define CHARTCATEGORYAXISY_H
-#include "verticalaxis_p.h"
+#include <private/verticalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp
index 8c43dd32..4996d461 100644
--- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp
+++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular.cpp
@@ -18,11 +18,11 @@
**
****************************************************************************/
-#include "polarchartcategoryaxisangular_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include "qcategoryaxis.h"
-#include <QDebug>
+#include <private/polarchartcategoryaxisangular_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtCharts/QCategoryAxis>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h
index 0432fc11..46b653da 100644
--- a/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h
+++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisangular_p.h
@@ -30,7 +30,7 @@
#ifndef POLARCHARTCATEGORYAXISANGULAR_P_H
#define POLARCHARTCATEGORYAXISANGULAR_P_H
-#include "polarchartaxisangular_p.h"
+#include <private/polarchartaxisangular_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp
index 60b77f0c..0938b640 100644
--- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp
+++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial.cpp
@@ -18,11 +18,11 @@
**
****************************************************************************/
-#include "polarchartcategoryaxisradial_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include "qcategoryaxis.h"
-#include <QDebug>
+#include <private/polarchartcategoryaxisradial_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtCharts/QCategoryAxis>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h
index 3186f5ec..1f23b884 100644
--- a/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h
+++ b/src/charts/axis/categoryaxis/polarchartcategoryaxisradial_p.h
@@ -30,7 +30,7 @@
#ifndef POLARCHARTCATEGORYAXISRADIAL_P_H
#define POLARCHARTCATEGORYAXISRADIAL_P_H
-#include "polarchartaxisradial_p.h"
+#include <private/polarchartaxisradial_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.cpp b/src/charts/axis/categoryaxis/qcategoryaxis.cpp
index d5b3d472..5ee885a1 100644
--- a/src/charts/axis/categoryaxis/qcategoryaxis.cpp
+++ b/src/charts/axis/categoryaxis/qcategoryaxis.cpp
@@ -18,15 +18,15 @@
**
****************************************************************************/
-#include "qcategoryaxis.h"
-#include "qcategoryaxis_p.h"
-#include "chartcategoryaxisx_p.h"
-#include "chartcategoryaxisy_p.h"
-#include "polarchartcategoryaxisangular_p.h"
-#include "polarchartcategoryaxisradial_p.h"
-#include "qchart.h"
-#include <qmath.h>
-#include <QDebug>
+#include <QtCharts/QCategoryAxis>
+#include <private/qcategoryaxis_p.h>
+#include <private/chartcategoryaxisx_p.h>
+#include <private/chartcategoryaxisy_p.h>
+#include <private/polarchartcategoryaxisangular_p.h>
+#include <private/polarchartcategoryaxisradial_p.h>
+#include <QtCharts/QChart>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
/*!
diff --git a/src/charts/axis/categoryaxis/qcategoryaxis.h b/src/charts/axis/categoryaxis/qcategoryaxis.h
index bd4b3d82..7109767a 100644
--- a/src/charts/axis/categoryaxis/qcategoryaxis.h
+++ b/src/charts/axis/categoryaxis/qcategoryaxis.h
@@ -21,8 +21,8 @@
#ifndef QCATEGORYAXIS_H
#define QCATEGORYAXIS_H
-#include <QtCharts/qabstractaxis.h>
-#include <QtCharts/qvalueaxis.h>
+#include <QtCharts/QAbstractAxis>
+#include <QtCharts/QValueAxis>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/categoryaxis/qcategoryaxis_p.h b/src/charts/axis/categoryaxis/qcategoryaxis_p.h
index bc657521..57a12ff8 100644
--- a/src/charts/axis/categoryaxis/qcategoryaxis_p.h
+++ b/src/charts/axis/categoryaxis/qcategoryaxis_p.h
@@ -30,8 +30,8 @@
#ifndef QCATEGORYAXIS_P_H
#define QCATEGORYAXIS_P_H
-#include <qcategoryaxis.h>
-#include "qvalueaxis_p.h"
+#include <QtCharts/QCategoryAxis>
+#include <private/qvalueaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/chartaxiselement.cpp b/src/charts/axis/chartaxiselement.cpp
index b7a60d27..73cd057e 100644
--- a/src/charts/axis/chartaxiselement.cpp
+++ b/src/charts/axis/chartaxiselement.cpp
@@ -18,13 +18,13 @@
**
****************************************************************************/
-#include "chartaxiselement_p.h"
-#include "qabstractaxis_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include <qmath.h>
-#include <QDateTime>
-#include <QTextDocument>
+#include <private/chartaxiselement_p.h>
+#include <private/qabstractaxis_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtCore/QtMath>
+#include <QtCore/QDateTime>
+#include <QtGui/QTextDocument>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/chartaxiselement_p.h b/src/charts/axis/chartaxiselement_p.h
index 1cfac64d..1fba0aff 100644
--- a/src/charts/axis/chartaxiselement_p.h
+++ b/src/charts/axis/chartaxiselement_p.h
@@ -30,12 +30,12 @@
#ifndef CHARTAXISELEMENT_H
#define CHARTAXISELEMENT_H
-#include "qchartglobal.h"
-#include "chartelement_p.h"
-#include "axisanimation_p.h"
-#include <QGraphicsItem>
-#include <QGraphicsLayoutItem>
-#include <QFont>
+#include <QtCharts/QChartGlobal>
+#include <private/chartelement_p.h>
+#include <private/axisanimation_p.h>
+#include <QtWidgets/QGraphicsItem>
+#include <QtWidgets/QGraphicsLayoutItem>
+#include <QtGui/QFont>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp
index bdd010a0..1a234b56 100644
--- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp
+++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx.cpp
@@ -18,13 +18,13 @@
**
****************************************************************************/
-#include "chartdatetimeaxisx_p.h"
-#include "chartpresenter_p.h"
-#include "qdatetimeaxis.h"
-#include "abstractchartlayout_p.h"
-#include <QGraphicsLayout>
-#include <QDateTime>
-#include <qmath.h>
+#include <private/chartdatetimeaxisx_p.h>
+#include <private/chartpresenter_p.h>
+#include <QtCharts/QDateTimeAxis>
+#include <private/abstractchartlayout_p.h>
+#include <QtWidgets/QGraphicsLayout>
+#include <QtCore/QDateTime>
+#include <QtCore/QtMath>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h
index 3ca2ef45..1809915b 100644
--- a/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h
+++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisx_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTDATETIMEAXISX_H
#define CHARTDATETIMEAXISX_H
-#include "horizontalaxis_p.h"
+#include <private/horizontalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp
index 5e67936b..67d2c3fc 100644
--- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp
+++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy.cpp
@@ -18,13 +18,13 @@
**
****************************************************************************/
-#include "chartdatetimeaxisy_p.h"
-#include "chartpresenter_p.h"
-#include "qdatetimeaxis.h"
-#include "abstractchartlayout_p.h"
-#include <QGraphicsLayout>
-#include <QDateTime>
-#include <qmath.h>
+#include <private/chartdatetimeaxisy_p.h>
+#include <private/chartpresenter_p.h>
+#include <QtCharts/QDateTimeAxis>
+#include <private/abstractchartlayout_p.h>
+#include <QtWidgets/QGraphicsLayout>
+#include <QtCore/QDateTime>
+#include <QtCore/QtMath>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h
index 0631e157..8bd2f087 100644
--- a/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h
+++ b/src/charts/axis/datetimeaxis/chartdatetimeaxisy_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTDATETIMEAXISY_H
#define CHARTDATETIMEAXISY_H
-#include "verticalaxis_p.h"
+#include <private/verticalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp
index 4ace5de6..1c1e9897 100644
--- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp
+++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular.cpp
@@ -18,10 +18,10 @@
**
****************************************************************************/
-#include "polarchartdatetimeaxisangular_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include "qdatetimeaxis.h"
+#include <private/polarchartdatetimeaxisangular_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtCharts/QDateTimeAxis>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h
index bbfd8260..0e244e71 100644
--- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h
+++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisangular_p.h
@@ -30,7 +30,7 @@
#ifndef POLARCHARTDATETIMEAXISANGULAR_P_H
#define POLARCHARTDATETIMEAXISANGULAR_P_H
-#include "polarchartaxisangular_p.h"
+#include <private/polarchartaxisangular_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp
index fdcfcc36..35965b3c 100644
--- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp
+++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial.cpp
@@ -18,10 +18,10 @@
**
****************************************************************************/
-#include "polarchartdatetimeaxisradial_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include "qdatetimeaxis.h"
+#include <private/polarchartdatetimeaxisradial_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtCharts/QDateTimeAxis>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h
index 207d5a3a..f0816597 100644
--- a/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h
+++ b/src/charts/axis/datetimeaxis/polarchartdatetimeaxisradial_p.h
@@ -30,7 +30,7 @@
#ifndef POLARCHARTDATETIMEAXISRADIAL_P_H
#define POLARCHARTDATETIMEAXISRADIAL_P_H
-#include "polarchartaxisradial_p.h"
+#include <private/polarchartaxisradial_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp b/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp
index fffd80c2..cbe448fc 100644
--- a/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp
+++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.cpp
@@ -18,14 +18,14 @@
**
****************************************************************************/
-#include "qdatetimeaxis.h"
-#include "qdatetimeaxis_p.h"
-#include "chartdatetimeaxisx_p.h"
-#include "chartdatetimeaxisy_p.h"
-#include "polarchartdatetimeaxisangular_p.h"
-#include "polarchartdatetimeaxisradial_p.h"
-#include "abstractdomain_p.h"
-#include "qchart.h"
+#include <QtCharts/QDateTimeAxis>
+#include <private/qdatetimeaxis_p.h>
+#include <private/chartdatetimeaxisx_p.h>
+#include <private/chartdatetimeaxisy_p.h>
+#include <private/polarchartdatetimeaxisangular_p.h>
+#include <private/polarchartdatetimeaxisradial_p.h>
+#include <private/abstractdomain_p.h>
+#include <QtCharts/QChart>
#include <float.h>
#include <cmath>
diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis.h b/src/charts/axis/datetimeaxis/qdatetimeaxis.h
index 72d46b5e..be8d83e3 100644
--- a/src/charts/axis/datetimeaxis/qdatetimeaxis.h
+++ b/src/charts/axis/datetimeaxis/qdatetimeaxis.h
@@ -21,7 +21,7 @@
#ifndef QDATETIMEAXIS_H
#define QDATETIMEAXIS_H
-#include <QtCharts/qabstractaxis.h>
+#include <QtCharts/QAbstractAxis>
class QDateTime;
diff --git a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h
index 30551d55..01152523 100644
--- a/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h
+++ b/src/charts/axis/datetimeaxis/qdatetimeaxis_p.h
@@ -30,9 +30,9 @@
#ifndef QDATETIMEAXIS_P_H
#define QDATETIMEAXIS_P_H
-#include "qdatetimeaxis.h"
-#include "qabstractaxis_p.h"
-#include <QDateTime>
+#include <QtCharts/QDateTimeAxis>
+#include <private/qabstractaxis_p.h>
+#include <QtCore/QDateTime>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/horizontalaxis.cpp b/src/charts/axis/horizontalaxis.cpp
index 941afc05..8e3bb975 100644
--- a/src/charts/axis/horizontalaxis.cpp
+++ b/src/charts/axis/horizontalaxis.cpp
@@ -18,11 +18,11 @@
**
****************************************************************************/
-#include "horizontalaxis_p.h"
-#include "qabstractaxis_p.h"
-#include "chartpresenter_p.h"
-#include <qmath.h>
-#include <QDebug>
+#include <private/horizontalaxis_p.h>
+#include <private/qabstractaxis_p.h>
+#include <private/chartpresenter_p.h>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/horizontalaxis_p.h b/src/charts/axis/horizontalaxis_p.h
index 9f1ad596..c75e45ae 100644
--- a/src/charts/axis/horizontalaxis_p.h
+++ b/src/charts/axis/horizontalaxis_p.h
@@ -30,7 +30,7 @@
#ifndef HORIZONTALAXIS_P_H_
#define HORIZONTALAXIS_P_H_
-#include "cartesianchartaxis_p.h"
+#include <private/cartesianchartaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/linearrowitem_p.h b/src/charts/axis/linearrowitem_p.h
index f1f94acd..ecc261e7 100644
--- a/src/charts/axis/linearrowitem_p.h
+++ b/src/charts/axis/linearrowitem_p.h
@@ -30,9 +30,9 @@
#ifndef LINEARROWITEM_P_H
#define LINEARROWITEM_P_H
-#include "chartaxiselement_p.h"
-#include "qabstractaxis_p.h"
-#include <QGraphicsLineItem>
+#include <private/chartaxiselement_p.h>
+#include <private/qabstractaxis_p.h>
+#include <QtWidgets/QGraphicsLineItem>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
index 6057fbb1..995bec39 100644
--- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
+++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx.cpp
@@ -18,13 +18,13 @@
**
****************************************************************************/
-#include "chartlogvalueaxisx_p.h"
-#include "chartpresenter_p.h"
-#include "qlogvalueaxis.h"
-#include "abstractchartlayout_p.h"
-#include <QGraphicsLayout>
-#include <qmath.h>
-#include <QDebug>
+#include <private/chartlogvalueaxisx_p.h>
+#include <private/chartpresenter_p.h>
+#include <QtCharts/QLogValueAxis>
+#include <private/abstractchartlayout_p.h>
+#include <QtWidgets/QGraphicsLayout>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h
index 490832b5..28e2689d 100644
--- a/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h
+++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisx_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTLOGVALUEAXISX_H
#define CHARTLOGVALUEAXISX_H
-#include "horizontalaxis_p.h"
+#include <private/horizontalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp
index d0492f97..5759b5e4 100644
--- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp
+++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy.cpp
@@ -18,13 +18,13 @@
**
****************************************************************************/
-#include "chartlogvalueaxisy_p.h"
-#include "chartpresenter_p.h"
-#include "qlogvalueaxis.h"
-#include "abstractchartlayout_p.h"
-#include <QGraphicsLayout>
-#include <qmath.h>
-#include <QDebug>
+#include <private/chartlogvalueaxisy_p.h>
+#include <private/chartpresenter_p.h>
+#include <QtCharts/QLogValueAxis>
+#include <private/abstractchartlayout_p.h>
+#include <QtWidgets/QGraphicsLayout>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h
index d65275c3..3b5e99de 100644
--- a/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h
+++ b/src/charts/axis/logvalueaxis/chartlogvalueaxisy_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTLOGVALUEAXISY_H
#define CHARTLOGVALUEAXISY_H
-#include "verticalaxis_p.h"
+#include <private/verticalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp
index f9fe664d..0c1f4c6a 100644
--- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp
+++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular.cpp
@@ -18,12 +18,12 @@
**
****************************************************************************/
-#include "polarchartlogvalueaxisangular_p.h"
-#include "abstractchartlayout_p.h"
-#include "chartpresenter_p.h"
-#include "qlogvalueaxis.h"
-#include <qmath.h>
-#include <QDebug>
+#include <private/polarchartlogvalueaxisangular_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <private/chartpresenter_p.h>
+#include <QtCharts/QLogValueAxis>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h
index d56f7fdc..ce65d303 100644
--- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h
+++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisangular_p.h
@@ -30,7 +30,7 @@
#ifndef POLARCHARTLOGVALUEAXISANGULAR_P_H
#define POLARCHARTLOGVALUEAXISANGULAR_P_H
-#include "polarchartaxisangular_p.h"
+#include <private/polarchartaxisangular_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp
index 3c0d01b3..6bf688e2 100644
--- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp
+++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial.cpp
@@ -18,12 +18,12 @@
**
****************************************************************************/
-#include "polarchartlogvalueaxisradial_p.h"
-#include "abstractchartlayout_p.h"
-#include "chartpresenter_p.h"
-#include "qlogvalueaxis.h"
-#include <qmath.h>
-#include <QDebug>
+#include <private/polarchartlogvalueaxisradial_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <private/chartpresenter_p.h>
+#include <QtCharts/QLogValueAxis>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h
index 4bc59061..3f2f93ed 100644
--- a/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h
+++ b/src/charts/axis/logvalueaxis/polarchartlogvalueaxisradial_p.h
@@ -30,7 +30,7 @@
#ifndef POLARCHARTLOGVALUEAXISRADIAL_P_H
#define POLARCHARTLOGVALUEAXISRADIAL_P_H
-#include "polarchartaxisradial_p.h"
+#include <private/polarchartaxisradial_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
index ad58905d..90711ef9 100644
--- a/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
+++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.cpp
@@ -18,13 +18,13 @@
**
****************************************************************************/
-#include "qlogvalueaxis.h"
-#include "qlogvalueaxis_p.h"
-#include "chartlogvalueaxisx_p.h"
-#include "chartlogvalueaxisy_p.h"
-#include "polarchartlogvalueaxisangular_p.h"
-#include "polarchartlogvalueaxisradial_p.h"
-#include "abstractdomain_p.h"
+#include <QtCharts/QLogValueAxis>
+#include <private/qlogvalueaxis_p.h>
+#include <private/chartlogvalueaxisx_p.h>
+#include <private/chartlogvalueaxisy_p.h>
+#include <private/polarchartlogvalueaxisangular_p.h>
+#include <private/polarchartlogvalueaxisradial_p.h>
+#include <private/abstractdomain_p.h>
#include <float.h>
#include <cmath>
diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis.h b/src/charts/axis/logvalueaxis/qlogvalueaxis.h
index 2ad1f6ab..ecf8e399 100644
--- a/src/charts/axis/logvalueaxis/qlogvalueaxis.h
+++ b/src/charts/axis/logvalueaxis/qlogvalueaxis.h
@@ -21,7 +21,7 @@
#ifndef QLOGVALUEAXIS_H
#define QLOGVALUEAXIS_H
-#include <QtCharts/qabstractaxis.h>
+#include <QtCharts/QAbstractAxis>
class QDateTime;
diff --git a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h
index 741626f3..dd3eb215 100644
--- a/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h
+++ b/src/charts/axis/logvalueaxis/qlogvalueaxis_p.h
@@ -30,8 +30,8 @@
#ifndef QLOGVALUEAXIS_P_H
#define QLOGVALUEAXIS_P_H
-#include <qlogvalueaxis.h>
-#include "qabstractaxis_p.h"
+#include <QtCharts/QLogValueAxis>
+#include <private/qabstractaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/polarchartaxis.cpp b/src/charts/axis/polarchartaxis.cpp
index bf9caaeb..70990741 100644
--- a/src/charts/axis/polarchartaxis.cpp
+++ b/src/charts/axis/polarchartaxis.cpp
@@ -18,9 +18,9 @@
**
****************************************************************************/
-#include "polarchartaxis_p.h"
-#include "qabstractaxis_p.h"
-#include "chartpresenter_p.h"
+#include <private/polarchartaxis_p.h>
+#include <private/qabstractaxis_p.h>
+#include <private/chartpresenter_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/polarchartaxis_p.h b/src/charts/axis/polarchartaxis_p.h
index 8924b812..e0a0d269 100644
--- a/src/charts/axis/polarchartaxis_p.h
+++ b/src/charts/axis/polarchartaxis_p.h
@@ -30,7 +30,7 @@
#ifndef POLARCHARTAXIS_P_H
#define POLARCHARTAXIS_P_H
-#include "chartaxiselement_p.h"
+#include <private/chartaxiselement_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/polarchartaxisangular.cpp b/src/charts/axis/polarchartaxisangular.cpp
index 83f1535c..e2ff4407 100644
--- a/src/charts/axis/polarchartaxisangular.cpp
+++ b/src/charts/axis/polarchartaxisangular.cpp
@@ -18,14 +18,14 @@
**
****************************************************************************/
-#include "polarchartaxisangular_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include "qabstractaxis.h"
-#include "qabstractaxis_p.h"
-#include <QDebug>
-#include <qmath.h>
-#include <QTextDocument>
+#include <private/polarchartaxisangular_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <QtCharts/QAbstractAxis>
+#include <private/qabstractaxis_p.h>
+#include <QtCore/QDebug>
+#include <QtCore/QtMath>
+#include <QtGui/QTextDocument>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/polarchartaxisangular_p.h b/src/charts/axis/polarchartaxisangular_p.h
index dd83cba7..545840bb 100644
--- a/src/charts/axis/polarchartaxisangular_p.h
+++ b/src/charts/axis/polarchartaxisangular_p.h
@@ -30,8 +30,8 @@
#ifndef POLARCHARTAXISANGULAR_P_H
#define POLARCHARTAXISANGULAR_P_H
-#include "polarchartaxis_p.h"
-#include "qvalueaxis.h"
+#include <private/polarchartaxis_p.h>
+#include <QtCharts/QValueAxis>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/polarchartaxisradial.cpp b/src/charts/axis/polarchartaxisradial.cpp
index 93bf1bd9..62f27269 100644
--- a/src/charts/axis/polarchartaxisradial.cpp
+++ b/src/charts/axis/polarchartaxisradial.cpp
@@ -18,12 +18,12 @@
**
****************************************************************************/
-#include "polarchartaxisradial_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
-#include "qabstractaxis_p.h"
-#include "linearrowitem_p.h"
-#include <QTextDocument>
+#include <private/polarchartaxisradial_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
+#include <private/qabstractaxis_p.h>
+#include <private/linearrowitem_p.h>
+#include <QtGui/QTextDocument>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/polarchartaxisradial_p.h b/src/charts/axis/polarchartaxisradial_p.h
index 6ce21513..48e64145 100644
--- a/src/charts/axis/polarchartaxisradial_p.h
+++ b/src/charts/axis/polarchartaxisradial_p.h
@@ -30,8 +30,8 @@
#ifndef POLARCHARTAXISRADIAL_P_H
#define POLARCHARTAXISRADIAL_P_H
-#include "polarchartaxis_p.h"
-#include "qvalueaxis.h"
+#include <private/polarchartaxis_p.h>
+#include <QtCharts/QValueAxis>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/qabstractaxis.cpp b/src/charts/axis/qabstractaxis.cpp
index ff7c27b6..f882e0b9 100644
--- a/src/charts/axis/qabstractaxis.cpp
+++ b/src/charts/axis/qabstractaxis.cpp
@@ -18,11 +18,11 @@
**
****************************************************************************/
-#include "qabstractaxis.h"
-#include "qabstractaxis_p.h"
-#include "chartdataset_p.h"
-#include "charttheme_p.h"
-#include "qchart_p.h"
+#include <QtCharts/QAbstractAxis>
+#include <private/qabstractaxis_p.h>
+#include <private/chartdataset_p.h>
+#include <private/charttheme_p.h>
+#include <private/qchart_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/qabstractaxis.h b/src/charts/axis/qabstractaxis.h
index cbad09e8..c50e9b01 100644
--- a/src/charts/axis/qabstractaxis.h
+++ b/src/charts/axis/qabstractaxis.h
@@ -21,10 +21,10 @@
#ifndef QABSTRACTAXIS_H
#define QABSTRACTAXIS_H
-#include <QtCharts/qchartglobal.h>
-#include <QPen>
-#include <QFont>
-#include <QVariant>
+#include <QtCharts/QChartGlobal>
+#include <QtGui/QPen>
+#include <QtGui/QFont>
+#include <QtCore/QVariant>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/qabstractaxis_p.h b/src/charts/axis/qabstractaxis_p.h
index f2f60038..bc9f9382 100644
--- a/src/charts/axis/qabstractaxis_p.h
+++ b/src/charts/axis/qabstractaxis_p.h
@@ -30,10 +30,10 @@
#ifndef QABSTRACTAXIS_P_H
#define QABSTRACTAXIS_P_H
-#include "qabstractaxis.h"
-#include "chartaxiselement_p.h"
-#include "qchart.h"
-#include <QDebug>
+#include <QtCharts/QAbstractAxis>
+#include <private/chartaxiselement_p.h>
+#include <QtCharts/QChart>
+#include <QtCore/QDebug>
class QGraphicsItem;
diff --git a/src/charts/axis/valueaxis/chartvalueaxisx.cpp b/src/charts/axis/valueaxis/chartvalueaxisx.cpp
index abf9c434..86981276 100644
--- a/src/charts/axis/valueaxis/chartvalueaxisx.cpp
+++ b/src/charts/axis/valueaxis/chartvalueaxisx.cpp
@@ -18,14 +18,14 @@
**
****************************************************************************/
-#include "chartvalueaxisx_p.h"
-#include "qabstractaxis.h"
-#include "chartpresenter_p.h"
-#include "qvalueaxis.h"
-#include "abstractchartlayout_p.h"
-#include <QGraphicsLayout>
-#include <qmath.h>
-#include <QDebug>
+#include <private/chartvalueaxisx_p.h>
+#include <QtCharts/QAbstractAxis>
+#include <private/chartpresenter_p.h>
+#include <QtCharts/QValueAxis>
+#include <private/abstractchartlayout_p.h>
+#include <QtWidgets/QGraphicsLayout>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/chartvalueaxisx_p.h b/src/charts/axis/valueaxis/chartvalueaxisx_p.h
index 7f83e5a3..08e692fa 100644
--- a/src/charts/axis/valueaxis/chartvalueaxisx_p.h
+++ b/src/charts/axis/valueaxis/chartvalueaxisx_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTVALUEAXISX_H
#define CHARTVALUEAXISX_H
-#include "horizontalaxis_p.h"
+#include <private/horizontalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/chartvalueaxisy.cpp b/src/charts/axis/valueaxis/chartvalueaxisy.cpp
index d6b7c651..16d6ebaf 100644
--- a/src/charts/axis/valueaxis/chartvalueaxisy.cpp
+++ b/src/charts/axis/valueaxis/chartvalueaxisy.cpp
@@ -18,14 +18,14 @@
**
****************************************************************************/
-#include "chartvalueaxisy_p.h"
-#include "qabstractaxis.h"
-#include "chartpresenter_p.h"
-#include "qvalueaxis.h"
-#include "abstractchartlayout_p.h"
-#include <QGraphicsLayout>
-#include <qmath.h>
-#include <QDebug>
+#include <private/chartvalueaxisy_p.h>
+#include <QtCharts/QAbstractAxis>
+#include <private/chartpresenter_p.h>
+#include <QtCharts/QValueAxis>
+#include <private/abstractchartlayout_p.h>
+#include <QtWidgets/QGraphicsLayout>
+#include <QtCore/QtMath>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/chartvalueaxisy_p.h b/src/charts/axis/valueaxis/chartvalueaxisy_p.h
index 3ec30faa..d0d6fdc3 100644
--- a/src/charts/axis/valueaxis/chartvalueaxisy_p.h
+++ b/src/charts/axis/valueaxis/chartvalueaxisy_p.h
@@ -30,7 +30,7 @@
#ifndef CHARTVALUEAXISY_H
#define CHARTVALUEAXISY_H
-#include "verticalaxis_p.h"
+#include <private/verticalaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp b/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp
index 945449a8..8dc5284e 100644
--- a/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp
+++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular.cpp
@@ -18,9 +18,9 @@
**
****************************************************************************/
-#include "polarchartvalueaxisangular_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
+#include <private/polarchartvalueaxisangular_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h
index d4a2f653..ecd35763 100644
--- a/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h
+++ b/src/charts/axis/valueaxis/polarchartvalueaxisangular_p.h
@@ -30,7 +30,7 @@
#ifndef POLARCHARTVALUEAXISANGULAR_P_H
#define POLARCHARTVALUEAXISANGULAR_P_H
-#include "polarchartaxisangular_p.h"
+#include <private/polarchartaxisangular_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp b/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp
index 006477e8..f8eff7ac 100644
--- a/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp
+++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial.cpp
@@ -18,9 +18,9 @@
**
****************************************************************************/
-#include "polarchartvalueaxisradial_p.h"
-#include "chartpresenter_p.h"
-#include "abstractchartlayout_p.h"
+#include <private/polarchartvalueaxisradial_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/abstractchartlayout_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h
index 4e13b57a..9eb249fc 100644
--- a/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h
+++ b/src/charts/axis/valueaxis/polarchartvalueaxisradial_p.h
@@ -30,7 +30,7 @@
#ifndef POLARCHARTVALUEAXISRADIAL_P_H
#define POLARCHARTVALUEAXISRADIAL_P_H
-#include "polarchartaxisradial_p.h"
+#include <private/polarchartaxisradial_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/qvalueaxis.cpp b/src/charts/axis/valueaxis/qvalueaxis.cpp
index a055dc22..798b55f5 100644
--- a/src/charts/axis/valueaxis/qvalueaxis.cpp
+++ b/src/charts/axis/valueaxis/qvalueaxis.cpp
@@ -18,16 +18,16 @@
**
****************************************************************************/
-#include "qvalueaxis.h"
-#include "qvalueaxis_p.h"
-#include "chartvalueaxisx_p.h"
-#include "chartvalueaxisy_p.h"
-#include "abstractdomain_p.h"
-#include "polarchartvalueaxisangular_p.h"
-#include "polarchartvalueaxisradial_p.h"
-#include "chartdataset_p.h"
-#include "chartpresenter_p.h"
-#include "charttheme_p.h"
+#include <QtCharts/QValueAxis>
+#include <private/qvalueaxis_p.h>
+#include <private/chartvalueaxisx_p.h>
+#include <private/chartvalueaxisy_p.h>
+#include <private/abstractdomain_p.h>
+#include <private/polarchartvalueaxisangular_p.h>
+#include <private/polarchartvalueaxisradial_p.h>
+#include <private/chartdataset_p.h>
+#include <private/chartpresenter_p.h>
+#include <private/charttheme_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/qvalueaxis.h b/src/charts/axis/valueaxis/qvalueaxis.h
index a51203a4..85ca4f17 100644
--- a/src/charts/axis/valueaxis/qvalueaxis.h
+++ b/src/charts/axis/valueaxis/qvalueaxis.h
@@ -21,7 +21,7 @@
#ifndef QVALUEAXIS_H
#define QVALUEAXIS_H
-#include <QtCharts/qabstractaxis.h>
+#include <QtCharts/QAbstractAxis>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/valueaxis/qvalueaxis_p.h b/src/charts/axis/valueaxis/qvalueaxis_p.h
index a1d9de5b..7648ea2c 100644
--- a/src/charts/axis/valueaxis/qvalueaxis_p.h
+++ b/src/charts/axis/valueaxis/qvalueaxis_p.h
@@ -30,8 +30,8 @@
#ifndef QVALUEAXIS_P_H
#define QVALUEAXIS_P_H
-#include <qvalueaxis.h>
-#include "qabstractaxis_p.h"
+#include <QtCharts/QValueAxis>
+#include <private/qabstractaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/verticalaxis.cpp b/src/charts/axis/verticalaxis.cpp
index 64c940f1..484ca1f8 100644
--- a/src/charts/axis/verticalaxis.cpp
+++ b/src/charts/axis/verticalaxis.cpp
@@ -18,10 +18,10 @@
**
****************************************************************************/
-#include "verticalaxis_p.h"
-#include "qabstractaxis.h"
-#include "chartpresenter_p.h"
-#include <QDebug>
+#include <private/verticalaxis_p.h>
+#include <QtCharts/QAbstractAxis>
+#include <private/chartpresenter_p.h>
+#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
diff --git a/src/charts/axis/verticalaxis_p.h b/src/charts/axis/verticalaxis_p.h
index 8349ff51..dc4dfa5c 100644
--- a/src/charts/axis/verticalaxis_p.h
+++ b/src/charts/axis/verticalaxis_p.h
@@ -30,7 +30,7 @@
#ifndef VERTICALAXIS_P_H_
#define VERTICALAXIS_P_H_
-#include "cartesianchartaxis_p.h"
+#include <private/cartesianchartaxis_p.h>
QT_CHARTS_BEGIN_NAMESPACE