tdf#42949 Fix IWYU warnings in chart2/source/view/*cxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I9ee3318c79d3b59f272a2a5f89c38b26afa05974
Reviewed-on: https://gerrit.libreoffice.org/63775
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

43 files changed, 12 insertions, 146 deletions

diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 2fe87e01a76a..9349a4baa55a 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -468,6 +468,9 @@ blacklist:
     chart2/source/controller/main/ElementSelector.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XServiceInfo.hpp
+    chart2/source/view/main/ShapeFactory.cxx:
+    # Needed for template
+    - com/sun/star/graphic/XGraphic.hpp
     chart2/source/controller/main/StatusBarCommandDispatch.hxx:
     # base class has to be a complete type
     - CommandDispatch.hxx
diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx
index 046760436acd..2e1fa3a4b867 100644
--- a/chart2/source/view/axes/DateHelper.cxx
+++ b/chart2/source/view/axes/DateHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <DateHelper.hxx>
-#include "DateScaling.hxx"
 #include <rtl/math.hxx>
 #include <com/sun/star/chart/TimeUnit.hpp>
 
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index 28b66633628d..1ce1e1d06746 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -20,7 +20,6 @@
 #include "DateScaling.hxx"
 #include <com/sun/star/chart/TimeUnit.hpp>
 #include <rtl/math.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 namespace
diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
index 861407840db1..50c3d4958694 100644
--- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
+++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/chart/TimeUnit.hpp>
 
 #include <rtl/math.hxx>
-#include <com/sun/star/awt/Size.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 5a72a875168b..6c014dd0848a 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -22,7 +22,6 @@
 #include <DateHelper.hxx>
 #include "DateScaling.hxx"
 #include <AxisHelper.hxx>
-#include "VAxisProperties.hxx"
 #include <com/sun/star/chart/TimeUnit.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
 
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 33ce421205d3..b35023422aaf 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -22,7 +22,6 @@
 #include "Tickmarks_Dates.hxx"
 #include <ViewDefines.hxx>
 #include "VAxisProperties.hxx"
-#include <rtl/math.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/chart2/AxisType.hpp>
 
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 85a6a4915a3c..e8910efadfb9 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "Tickmarks_Equidistant.hxx"
-#include <ViewDefines.hxx>
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>
 #include <float.h>
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 3ab5ce3ae633..49bd9cd14382 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -19,7 +19,6 @@
 
 #include "VAxisBase.hxx"
 #include <ShapeFactory.hxx>
-#include <CommonConverters.hxx>
 #include <ExplicitCategoriesProvider.hxx>
 #include "Tickmarks.hxx"
 #include <com/sun/star/drawing/XShapes.hpp>
diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx
index f11c8a4a20a9..290f3a36887e 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.cxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "VAxisOrGridBase.hxx"
-#include <ShapeFactory.hxx>
 #include <CommonConverters.hxx>
 #include "Tickmarks.hxx"
 
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index fd16b851412b..c52650eb3b13 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -19,19 +19,17 @@
 
 #include "VAxisProperties.hxx"
 #include <ViewDefines.hxx>
-#include <CommonConverters.hxx>
 #include <AxisHelper.hxx>
-#include <DiagramHelper.hxx>
 #include <ChartModelHelper.hxx>
 #include <ExplicitCategoriesProvider.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
+#include <com/sun/star/chart2/XAxis.hpp>
 
 #include <sal/log.hxx>
+#include <rtl/math.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 0b488abaa5e1..7a025878733b 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -20,8 +20,6 @@
 #include "VCartesianAxis.hxx"
 #include <PlottingPositionHelper.hxx>
 #include <ShapeFactory.hxx>
-#include <CommonConverters.hxx>
-#include <ViewDefines.hxx>
 #include <PropertyMapper.hxx>
 #include <NumberFormatterWrapper.hxx>
 #include <LabelPositionHelper.hxx>
@@ -33,9 +31,6 @@
 
 #include <rtl/math.hxx>
 #include <tools/color.hxx>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/WritingMode2.hpp>
-#include <editeng/unoprnms.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/unoshtxt.hxx>
 #include <sal/log.hxx>
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index ec2e62baa282..c46d8d0b44ad 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -22,7 +22,6 @@
 #include "VCartesianAxis.hxx"
 #include <AxisIndexDefines.hxx>
 #include <AxisHelper.hxx>
-#include <ChartTypeHelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <ChartModel.hxx>
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index da6eca3acf0c..7699f1d493d0 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/chart2/XTransformation.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index a9143d498aac..9caaff5de1da 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -22,23 +22,17 @@
 #include "VCartesianCoordinateSystem.hxx"
 #include "VPolarCoordinateSystem.hxx"
 #include <ScaleAutomatism.hxx>
-#include <VSeriesPlotter.hxx>
 #include <ShapeFactory.hxx>
 #include <servicenames_coosystems.hxx>
-#include <AxisIndexDefines.hxx>
 #include <ObjectIdentifier.hxx>
 #include <ExplicitCategoriesProvider.hxx>
-#include <AxisHelper.hxx>
 #include <ContainerHelper.hxx>
 #include "VAxisBase.hxx"
-#include <ViewDefines.hxx>
-#include <DataSeriesHelper.hxx>
 #include <defines.hxx>
 #include <chartview/ExplicitValueProvider.hxx>
 #include <com/sun/star/chart/TimeUnit.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XChartTypeContainer.hpp>
-#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <comphelper/sequence.hxx>
 #include <sal/log.hxx>
 
diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx
index 7ac5f55cc13f..2b251ef9a081 100644
--- a/chart2/source/view/axes/VPolarAxis.cxx
+++ b/chart2/source/view/axes/VPolarAxis.cxx
@@ -20,8 +20,6 @@
 #include "VPolarAxis.hxx"
 #include "VPolarAngleAxis.hxx"
 #include "VPolarRadiusAxis.hxx"
-#include "Tickmarks.hxx"
-#include <ShapeFactory.hxx>
 #include <PlottingPositionHelper.hxx>
 
 namespace chart
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 232c72b8c19e..78f13b463322 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -26,8 +26,6 @@
 #include <CommonConverters.hxx>
 #include <VLineProperties.hxx>
 #include "Tickmarks_Equidistant.hxx"
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <osl/diagnose.h>
 
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index a652c5fad2bd..59e05354b78e 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -22,7 +22,6 @@
 #include <PlottingPositionHelper.hxx>
 #include <CommonConverters.hxx>
 #include "Tickmarks_Equidistant.hxx"
-#include <rtl/math.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 238e4f21b514..f7f49af92f30 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -22,7 +22,6 @@
 #include <ShapeFactory.hxx>
 #include <CommonConverters.hxx>
 #include <ExplicitCategoriesProvider.hxx>
-#include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
 #include "Splines.hxx"
 #include <ChartTypeHelper.hxx>
@@ -36,15 +35,12 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 
-#include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
 #include <com/sun/star/drawing/DoubleSequence.hpp>
-#include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 namespace chart
diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx
index 45565989f9d7..cdf781085d90 100644
--- a/chart2/source/view/charttypes/BarPositionHelper.cxx
+++ b/chart2/source/view/charttypes/BarPositionHelper.cxx
@@ -18,12 +18,8 @@
  */
 
 #include "BarPositionHelper.hxx"
-#include <Linear3DTransformation.hxx>
-#include <ViewDefines.hxx>
-#include <CommonConverters.hxx>
 #include <DateHelper.hxx>
 #include <o3tl/make_unique.hxx>
-#include <com/sun/star/chart/TimeUnit.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 012d1301f49d..c97d23682c61 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -20,23 +20,13 @@
 #include "BubbleChart.hxx"
 #include <PlottingPositionHelper.hxx>
 #include <ShapeFactory.hxx>
-#include <CommonConverters.hxx>
-#include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
-#include "Splines.hxx"
 #include <LabelPositionHelper.hxx>
-#include <Clipping.hxx>
-#include <Stripe.hxx>
 
-#include <com/sun/star/chart2/Symbol.hpp>
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
-#include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
-#include <com/sun/star/drawing/DoubleSequence.hpp>
-#include <com/sun/star/drawing/NormalsKind.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index e3ed188f4ea7..1297a23ba85f 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -22,15 +22,9 @@
 #include <CommonConverters.hxx>
 #include <ExplicitCategoriesProvider.hxx>
 #include <ObjectIdentifier.hxx>
-#include <LabelPositionHelper.hxx>
 #include "BarPositionHelper.hxx"
-#include <VLegendSymbolFactory.hxx>
-#include <FormattedStringHelper.hxx>
-#include <DataSeriesHelper.hxx>
 #include <DateHelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <rtl/math.hxx>
-#include <editeng/unoprnms.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 56bfb451e2b2..eef6aa067885 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -22,12 +22,9 @@
 #include <ShapeFactory.hxx>
 #include <ExplicitCategoriesProvider.hxx>
 #include <CommonConverters.hxx>
-#include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
-#include <ChartTypeHelper.hxx>
 #include <LabelPositionHelper.hxx>
 #include <Clipping.hxx>
-#include <Stripe.hxx>
 #include <PolarLabelPositionHelper.hxx>
 #include <DateHelper.hxx>
 
@@ -35,14 +32,10 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 
-#include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>
 
-#include <com/sun/star/drawing/DoubleSequence.hpp>
-#include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 35e789b52f8f..45c246f7896c 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -24,7 +24,6 @@
 #include <ShapeFactory.hxx>
 #include <PolarLabelPositionHelper.hxx>
 #include <CommonConverters.hxx>
-#include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
 
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 01545cc9409e..c03df7c7d719 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -24,7 +24,6 @@
 
 #include <vector>
 #include <algorithm>
-#include <functional>
 #include <memory>
 
 namespace chart
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index b61a195bec97..9bcab4e62ad5 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -21,12 +21,9 @@
 #include <VSeriesPlotter.hxx>
 #include <VLineProperties.hxx>
 #include <ShapeFactory.hxx>
-#include <chartview/ExplicitValueProvider.hxx>
-#include <svl/zformat.hxx>
 
 #include <CommonConverters.hxx>
 #include <ExplicitCategoriesProvider.hxx>
-#include <ViewDefines.hxx>
 #include <ObjectIdentifier.hxx>
 #include <StatisticsHelper.hxx>
 #include <PlottingPositionHelper.hxx>
@@ -70,18 +67,9 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XSimpleText.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
-#include <com/sun/star/drawing/TextFitToSizeType.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
 
-#include <svx/unoshape.hxx>
 #include <comphelper/sequence.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 4f3c095a2afe..feb839be8de2 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -25,15 +25,10 @@
 #include <ObjectIdentifier.hxx>
 #include <DiagramHelper.hxx>
 #include <BaseGFXHelper.hxx>
-#include <CommonConverters.hxx>
 #include <ChartTypeHelper.hxx>
 #include <ThreeDHelper.hxx>
 #include <defines.hxx>
 #include <editeng/unoprnms.hxx>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/drawing/ProjectionMode.hpp>
-#include <com/sun/star/drawing/ShadeMode.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <svx/unoshape.hxx>
diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx
index 6cf2876f766d..6ebc36851c26 100644
--- a/chart2/source/view/inc/LabelPositionHelper.hxx
+++ b/chart2/source/view/inc/LabelPositionHelper.hxx
@@ -32,7 +32,6 @@ namespace com { namespace sun { namespace star { namespace drawing { class XShap
 namespace chart
 {
 
-class PlottingPositionHelper;
 class ShapeFactory;
 
 class LabelPositionHelper
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index bf70d7f9c28a..74fc37cdea80 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/uno/Sequence.h>
+#include <com/sun/star/uno/Sequence.hxx>
 
 namespace com { namespace sun { namespace star { namespace chart2 { class XTransformation; } } } }
 namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index eb3395507659..c2c325aa7106 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -24,7 +24,6 @@
 #include <editeng/brushitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <svl/stritem.hxx>
-#include <svl/rectitem.hxx>
 #include <svl/ilstitem.hxx>
 #include <editeng/editids.hrc>
 #include <svx/svxids.hrc>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 9a7a67c85881..a989552ffe90 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -22,7 +22,6 @@
 #include <ChartView.hxx>
 #include <chartview/DrawModelWrapper.hxx>
 #include <NumberFormatterWrapper.hxx>
-#include <ViewDefines.hxx>
 #include <VDiagram.hxx>
 #include "VTitle.hxx"
 #include "VButton.hxx"
@@ -35,17 +34,14 @@
 #include "VLegend.hxx"
 #include <PropertyMapper.hxx>
 #include <ChartModel.hxx>
-#include <ChartModelHelper.hxx>
 #include <ChartTypeHelper.hxx>
 #include <ScaleAutomatism.hxx>
-#include <MinimumAndMaximumSupplier.hxx>
 #include <ObjectIdentifier.hxx>
 #include <DiagramHelper.hxx>
 #include <RelativePositionHelper.hxx>
 #include <servicenames.hxx>
 #include <AxisHelper.hxx>
 #include <AxisIndexDefines.hxx>
-#include <ControllerLockGuard.hxx>
 #include <BaseGFXHelper.hxx>
 #include <DataSeriesHelper.hxx>
 #include <DateHelper.hxx>
@@ -53,15 +49,12 @@
 #include <defines.hxx>
 #include <unonames.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <rtl/uuid.h>
 #include <tools/globname.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/streamwrap.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <svx/charthelper.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/unopage.hxx>
 #include <svx/unoshape.hxx>
@@ -75,33 +68,22 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
-#include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart/TimeUnit.hpp>
-#include <com/sun/star/chart/MissingValueTreatment.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/StackingDirection.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
-#include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/chart2/RelativeSize.hpp>
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
 #include <com/sun/star/chart2/data/PivotTableFieldEntry.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/XShapeGroup.hpp>
-#include <com/sun/star/drawing/XShapeDescriptor.hpp>
-#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
-#include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
@@ -114,15 +96,13 @@
 #include <servicenames_charttypes.hxx>
 
 
-#include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
-#include <osl/conditn.hxx>
-#include <o3tl/make_unique.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <memory>
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
 
 namespace chart {
 
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index c405b75a0bff..1d9d39cf0ca7 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -26,10 +26,8 @@
 #include <svl/eitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <svx/svx3ditems.hxx>
-#include <unotools/pathoptions.hxx>
 #include <svx/objfac3d.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/XPropertyTable.hxx>
 #include <svx/xtable.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/unolingu.hxx>
@@ -37,11 +35,9 @@
 #include <vcl/virdev.hxx>
 
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 
-#include <sfx2/objsh.hxx>
-#include <com/sun/star/linguistic2/XHyphenator.hpp>
-#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
+namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenator; } } } }
+namespace com { namespace sun { namespace star { namespace linguistic2 { class XSpellChecker1; } } } }
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index 9b36d1435cf3..811bf7ad148b 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -19,9 +19,7 @@
 
 #include <LabelPositionHelper.hxx>
 #include <PlottingPositionHelper.hxx>
-#include <CommonConverters.hxx>
 #include <PropertyMapper.hxx>
-#include <ShapeFactory.hxx>
 #include <RelativeSizeHelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 2962f31758a0..ea40338f6a22 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -22,7 +22,6 @@
 #include <ShapeFactory.hxx>
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>
-#include <com/sun/star/chart2/DataPointLabel.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index 164f0a8d5f64..281a3da4c040 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -19,12 +19,10 @@
 
 #include <PlottingPositionHelper.hxx>
 #include <CommonConverters.hxx>
-#include <ViewDefines.hxx>
 #include <Linear3DTransformation.hxx>
 #include <VPolarTransformation.hxx>
 #include <ShapeFactory.hxx>
 #include <PropertyMapper.hxx>
-#include <DateHelper.hxx>
 #include <defines.hxx>
 
 #include <com/sun/star/chart/TimeUnit.hpp>
diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx
index aca4a2b6f0c1..4af1d78b63a8 100644
--- a/chart2/source/view/main/PolarLabelPositionHelper.cxx
+++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx
@@ -19,7 +19,6 @@
 
 #include <PolarLabelPositionHelper.hxx>
 #include <PlottingPositionHelper.hxx>
-#include <CommonConverters.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/vector/b2ivector.hxx>
 
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 9221c750f645..35bdd98e75c7 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -23,7 +23,6 @@
 
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/drawing/LineJoint.hpp>
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 548ecef28ccf..bc452c17f04e 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -35,18 +35,13 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
-#include <com/sun/star/drawing/PolygonKind.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-#include <com/sun/star/drawing/ProjectionMode.hpp>
-#include <com/sun/star/drawing/ShadeMode.hpp>
-#include <com/sun/star/drawing/TextFitToSizeType.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/drawing/TextureProjectionMode.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/XShapes2.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -54,8 +49,6 @@
 
 #include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
-#include <svx/svdocirc.hxx>
-#include <svx/svdopath.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx
index 4ed9995fe18d..74c8ad046810 100644
--- a/chart2/source/view/main/Stripe.cxx
+++ b/chart2/source/view/main/Stripe.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
 #include <basegfx/polygon/b3dpolygon.hxx>
-#include <basegfx/polygon/b3dpolygontools.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 5d54a7e32444..92abdbaee240 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -23,7 +23,6 @@
 #include <CommonConverters.hxx>
 #include <LabelPositionHelper.hxx>
 #include <ChartTypeHelper.hxx>
-#include <DataSeriesHelper.hxx>
 #include <RegressionCurveHelper.hxx>
 #include <unonames.hxx>
 
@@ -39,10 +38,6 @@
 #include <tools/color.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 
 namespace chart {
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 0e6e32be4988..a7a313b0ad49 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -21,17 +21,14 @@
 #include "VButton.hxx"
 #include <PropertyMapper.hxx>
 #include <ChartModel.hxx>
-#include <CommonConverters.hxx>
 #include <ObjectIdentifier.hxx>
 #include <RelativePositionHelper.hxx>
 #include <ShapeFactory.hxx>
 #include <RelativeSizeHelper.hxx>
 #include <LegendEntryProvider.hxx>
 #include <chartview/DrawModelWrapper.hxx>
-#include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/drawing/LineJoint.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
@@ -42,7 +39,6 @@
 #include <com/sun/star/chart2/XFormattedString2.hpp>
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
 #include <com/sun/star/chart2/data/PivotTableFieldEntry.hpp>
-#include <rtl/ustrbuf.hxx>
 #include <svl/languageoptions.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index c1727af3b09b..02870ca52869 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -20,8 +20,6 @@
 #include <VLegendSymbolFactory.hxx>
 #include <PropertyMapper.hxx>
 #include <ShapeFactory.hxx>
-#include <ObjectIdentifier.hxx>
-#include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx
index a82bc9961a81..365a70b2b948 100644
--- a/chart2/source/view/main/VPolarTransformation.cxx
+++ b/chart2/source/view/main/VPolarTransformation.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <VPolarTransformation.hxx>
-#include <ViewDefines.hxx>
 #include <CommonConverters.hxx>
 #include <algorithm>
 
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index 5d55b09c479c..27febe8fde69 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -19,16 +19,10 @@
 
 #include "VTitle.hxx"
 #include <CommonConverters.hxx>
-#include <PropertyMapper.hxx>
 #include <ShapeFactory.hxx>
-#include <com/sun/star/chart2/XFormattedString.hpp>
 #include <com/sun/star/chart2/XTitle.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <rtl/math.hxx>
+#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/text/ControlCharacter.hpp>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XTextCursor.hpp>
 #include <sal/log.hxx>
 
 namespace chart