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

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

Change-Id: I804895a4dd2d98707f0d1bbbc9bb78782b07a397
Reviewed-on: https://gerrit.libreoffice.org/61505
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

44 files changed, 50 insertions, 90 deletions

diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 61da70d93294..2fe87e01a76a 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -292,10 +292,24 @@ blacklist:
     - com/sun/star/util/XCloneable.hpp
     - com/sun/star/util/XModifyBroadcaster.hpp
     - com/sun/star/util/XModifyListener.hpp
-    chart2/source/tools/ImplOPropertySet.hxx:
-    # base class has to be a complete type
-    - com/sun/star/beans/PropertyState.hpp
-    - com/sun/star/uno/Sequence.hxx
+    chart2/source/tools/ImplOPropertySet.cxx:
+    # Needed for template
+    - com/sun/star/style/XStyle.hpp
+    chart2/source/tools/LinePropertiesHelper.cxx:
+    # Needed for template
+    - com/sun/star/drawing/LineDash.hpp
+    chart2/source/tools/LifeTime.cxx:
+    # Has to be complete type
+    - com/sun/star/util/CloseVetoException.hpp
+    chart2/source/tools/MediaDescriptorHelper.cxx:
+    # Needed for template
+    - com/sun/star/embed/XStorage.hpp
+    chart2/source/tools/ObjectIdentifier.cxx:
+    # Needed for template
+    - com/sun/star/drawing/XShape.hpp
+    chart2/source/tools/RangeHighlighter.cxx:
+    # Needed for template
+    - com/sun/star/drawing/XShape.hpp
     chart2/source/tools/RegressionEquation.hxx:
     # base class has to be a complete type
     - com/sun/star/chart2/XTitle.hpp
@@ -303,6 +317,15 @@ blacklist:
     - com/sun/star/util/XCloneable.hpp
     - com/sun/star/util/XModifyBroadcaster.hpp
     - com/sun/star/util/XModifyListener.hpp
+    chart2/source/tools/RegressionEquation.cxx:
+    # Needed for template
+    - com/sun/star/awt/Size.hpp
+    - com/sun/star/chart2/RelativePosition.hpp
+    chart2/source/tools/UserDefinedProperties.cxx:
+    # Needs a complete type
+    - com/sun/star/beans/Property.hpp
+    # Needed for template
+    - com/sun/star/container/XNameContainer.hpp
     chart2/source/view/inc/3DChartObjects.hxx:
     # base class has to be a complete type
     - boost/shared_array.hpp
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index e0a6f4623d7e..733d716bd945 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -41,11 +41,9 @@
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 
-#include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 
-#include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/sequence.hxx>
diff --git a/chart2/source/tools/BaseGFXHelper.cxx b/chart2/source/tools/BaseGFXHelper.cxx
index e2ec9396e283..4bdeb26b780c 100644
--- a/chart2/source/tools/BaseGFXHelper.cxx
+++ b/chart2/source/tools/BaseGFXHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <BaseGFXHelper.hxx>
-#include <com/sun/star/drawing/DoubleSequence.hpp>
 #include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 7861ade125de..1341075e9f91 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <CachedDataSequence.hxx>
-#include <PropertyHelper.hxx>
 #include <CommonFunctors.hxx>
 #include <ModifyListenerHelper.hxx>
 
@@ -27,8 +26,6 @@
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <rtl/math.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 5e1fd9cbcf11..659ef6d955f3 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -21,19 +21,13 @@
 
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 
-#include <com/sun/star/awt/FontFamily.hpp>
-#include <com/sun/star/awt/CharSet.hpp>
-#include <com/sun/star/awt/FontPitch.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
-#include <com/sun/star/style/CaseMap.hpp>
 #include <com/sun/star/text/FontRelief.hpp>
 #include <com/sun/star/text/FontEmphasis.hpp>
-#include <com/sun/star/text/RubyAdjust.hpp>
 #include <com/sun/star/awt/FontStrikeout.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index 7ccd373dcb32..8140adf1477b 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -29,9 +29,7 @@
 #include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
-#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index fcb740ae45b0..b7f3be2f5c5f 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -19,14 +19,12 @@
 
 #include <ChartTypeHelper.hxx>
 #include <DiagramHelper.hxx>
-#include <DataSeriesHelper.hxx>
 #include <servicenames_charttypes.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/StackingDirection.hpp>
-#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
 #include <tools/diagnose_ex.h>
 
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index 6de0addac8f4..01b2c2c758a4 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -21,7 +21,6 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-#include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/chart2/data/XDataSequence.hpp>
 #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
 #include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
@@ -29,8 +28,6 @@
 #include <osl/diagnose.h>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 
-#include <cstdarg>
-
 namespace chart
 {
 
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index e54c5d2eadde..9a2957a11c37 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <DataSeriesHelper.hxx>
-#include <DiagramHelper.hxx>
 #include <DataSource.hxx>
 #include <ContainerHelper.hxx>
 #include <unonames.hxx>
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index 1e271a125407..a3597a0f7b1f 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <DataSource.hxx>
-#include <LabeledDataSequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index cbdb75f7619f..0631bd1f47b0 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -24,7 +24,6 @@
 #include <DataSeriesHelper.hxx>
 #include <DataSource.hxx>
 #include <ControllerLockGuard.hxx>
-#include <PropertyHelper.hxx>
 #include <CachedDataSequence.hxx>
 #include <LabeledDataSequence.hxx>
 #include <unonames.hxx>
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index a3059ecc5c4a..b372114ea891 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -18,15 +18,12 @@
  */
 
 #include <DiagramHelper.hxx>
-#include <LegendHelper.hxx>
-#include <PropertyHelper.hxx>
 #include <DataSeriesHelper.hxx>
 #include <AxisHelper.hxx>
 #include <ContainerHelper.hxx>
 #include <ChartTypeHelper.hxx>
 #include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
-#include <CommonConverters.hxx>
 #include <ExplicitCategoriesProvider.hxx>
 #include <servicenames_charttypes.hxx>
 #include <RelativePositionHelper.hxx>
@@ -35,7 +32,6 @@
 #include <unonames.hxx>
 
 #include <com/sun/star/chart/MissingValueTreatment.hpp>
-#include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart/XDiagramPositioning.hpp>
 #include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
 #include <com/sun/star/chart2/XTitled.hpp>
@@ -43,7 +39,6 @@
 #include <com/sun/star/chart2/XChartTypeTemplate.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
-#include <com/sun/star/chart2/InterpretedData.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/DataPointGeometry3D.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
@@ -52,12 +47,11 @@
 
 #include <com/sun/star/util/CloseVetoException.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 
 #include <unotools/saveopt.hxx>
 #include <rtl/math.hxx>
-#include <svl/zformat.hxx>
+#include <svl/zforlist.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 645f187cc321..8cb31099d166 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -20,7 +20,6 @@
 #include <ErrorBar.hxx>
 #include <ContainerHelper.hxx>
 #include <EventListenerHelper.hxx>
-#include <PropertyHelper.hxx>
 #include <CloneHelper.hxx>
 #include <ModifyListenerHelper.hxx>
 
@@ -29,15 +28,12 @@
 #include <svl/itemprop.hxx>
 #include <vcl/svapp.hxx>
 
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/drawing/LineJoint.hpp>
 
-#include <rtl/math.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 835f5243488e..37d59ea2e500 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -21,7 +21,6 @@
 #include <DiagramHelper.hxx>
 #include <ChartTypeHelper.hxx>
 #include <AxisHelper.hxx>
-#include <CommonConverters.hxx>
 #include <DataSourceHelper.hxx>
 #include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
@@ -29,8 +28,6 @@
 #include <unonames.hxx>
 
 #include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/util/NumberFormat.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <tools/diagnose_ex.h>
 
 namespace chart
diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx
index 1eff3e204caa..ff885494d231 100644
--- a/chart2/source/tools/FormattedStringHelper.cxx
+++ b/chart2/source/tools/FormattedStringHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <FormattedStringHelper.hxx>
-#include <PropertyHelper.hxx>
 #include <com/sun/star/chart2/FormattedString.hpp>
 #include <tools/diagnose_ex.h>
 #include <comphelper/property.hxx>
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index fba181c3bbd9..2eb03d99e52a 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -23,7 +23,6 @@
 #include <algorithm>
 #include <iterator>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/XFastPropertySet.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 184e06687407..72ebb2b8d059 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -20,15 +20,12 @@
 #include <rtl/math.hxx>
 
 #include <iterator>
-#include <valarray>
 
 #include <InternalDataProvider.hxx>
 #include <LabeledDataSequence.hxx>
 #include <DataSource.hxx>
-#include <PropertyHelper.hxx>
 #include <XMLRangeHelper.hxx>
 #include <ContainerHelper.hxx>
-#include <CommonConverters.hxx>
 #include <CommonFunctors.hxx>
 #include <UncachedDataSequence.hxx>
 #include <DataSourceHelper.hxx>
@@ -37,11 +34,8 @@
 #include <DiagramHelper.hxx>
 #include <ExplicitCategoriesProvider.hxx>
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/data/XDataSequence.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
-#include <rtl/ustrbuf.hxx>
-#include <unotools/charclass.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/property.hxx>
@@ -50,6 +44,8 @@
 #include <vector>
 #include <algorithm>
 
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+
 using namespace ::com::sun::star;
 using namespace ::std;
 
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index 59db1cd73c2f..7c9944b283f3 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -21,7 +21,8 @@
 #include <ModifyListenerHelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/diagnose_ex.h>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx
index a72479b37627..6fbd6bf63143 100644
--- a/chart2/source/tools/LegendHelper.cxx
+++ b/chart2/source/tools/LegendHelper.cxx
@@ -22,9 +22,6 @@
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XLegend.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <tools/diagnose_ex.h>
 
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index e9b25fee8dcb..adc04802925b 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/util/CloseVetoException.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XCloseListener.hpp>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index 026c0df98023..9cf3492d8e8e 100644
--- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -18,10 +18,6 @@
  */
 
 #include <LinearRegressionCurveCalculator.hxx>
-#include <RegressionCalculationHelper.hxx>
-
-#include <rtl/math.hxx>
-#include <rtl/ustrbuf.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 3f052eb5da51..b9d342cbe519 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -21,7 +21,6 @@
 
 #include <osl/diagnose.h>
 #include <rtl/math.hxx>
-#include <rtl/ustrbuf.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/MediaDescriptorHelper.cxx b/chart2/source/tools/MediaDescriptorHelper.cxx
index e7190453f3b3..8307bc38a31c 100644
--- a/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 7fc6e6208a6c..b921cd167109 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -20,7 +20,6 @@
 #include <ModifyListenerHelper.hxx>
 #include <WeakListenerAdapter.hxx>
 
-#include <cppuhelper/interfacecontainer.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index 3da6d4f7afe4..2ba5df0b6fca 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -23,7 +23,6 @@
 #include <strings.hrc>
 
 #include <rtl/math.hxx>
-#include <rtl/ustrbuf.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index 52879263a352..a1085c4dac06 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -19,9 +19,8 @@
 
 #include <NumberFormatterWrapper.hxx>
 #include <svl/numuno.hxx>
-#include <svl/zformat.hxx>
+#include <svl/zforlist.hxx>
 #include <tools/color.hxx>
-#include <i18nlangtag/mslangid.hxx>
 #include <com/sun/star/util/Date.hpp>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index 50fd0d6f21d7..0c45241d96f0 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -22,7 +22,6 @@
 #include <cppuhelper/queryinterface.hxx>
 
 #include <vector>
-#include <algorithm>
 #include <memory>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index a424dbd29595..a884afea02df 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -28,7 +28,6 @@
 #include <AxisHelper.hxx>
 #include <servicenames_charttypes.hxx>
 #include <DiagramHelper.hxx>
-#include <AxisIndexDefines.hxx>
 #include <unonames.hxx>
 
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
@@ -43,6 +42,8 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+
 namespace chart
 {
 using namespace ::com::sun::star;
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 93a515fc6d0c..6ed262206cbf 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -19,7 +19,6 @@
 
 #include <PropertyHelper.hxx>
 #include <ContainerHelper.hxx>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <osl/diagnose.h>
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 7cd340b5b32a..fe67460230a3 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -24,9 +24,9 @@
 #include <ObjectIdentifier.hxx>
 #include <DataSeriesHelper.hxx>
 
-#include <com/sun/star/chart2/XDataSeries.hpp>
+#include <com/sun/star/chart2/ScaleData.hpp>
+#include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
-#include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index ada80c8317c4..524a2ac84621 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -22,7 +22,6 @@
 #include <ChartModelHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <AxisHelper.hxx>
-#include <DataSeriesHelper.hxx>
 
 #include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/chart2/XTitle.hpp>
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index 2b4c02d148cf..7cfe95ed028e 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <RegressionCurveCalculator.hxx>
-#include <RegressionCalculationHelper.hxx>
-#include <servicenames_coosystems.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <rtl/math.hxx>
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 096c92ae5447..dede8cb4c110 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -29,12 +29,10 @@
 #include "RegressionCurveModel.hxx"
 #include <ChartTypeHelper.hxx>
 #include <ChartModelHelper.hxx>
-#include <PropertyHelper.hxx>
 #include <ResId.hxx>
 #include <strings.hrc>
 #include <DiagramHelper.hxx>
 #include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <tools/diagnose_ex.h>
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 38e92be1285b..6082e4de6813 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -20,18 +20,16 @@
 #include "RegressionCurveModel.hxx"
 #include <LinePropertiesHelper.hxx>
 #include <RegressionCurveHelper.hxx>
-#include <RegressionCalculationHelper.hxx>
 #include "RegressionEquation.hxx"
 #include <CloneHelper.hxx>
 #include <PropertyHelper.hxx>
 #include <ModifyListenerHelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <rtl/math.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 using namespace ::com::sun::star;
 
 using ::com::sun::star::beans::Property;
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index d32e0c7aa8c7..1051526ce384 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -34,11 +34,12 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index 1e23ee3e9c83..492f845e932f 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -20,9 +20,10 @@
 #include <Scaling.hxx>
 #include <rtl/math.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace
 {
 
diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx
index a939117257ec..9d5746ef649d 100644
--- a/chart2/source/tools/SceneProperties.cxx
+++ b/chart2/source/tools/SceneProperties.cxx
@@ -19,7 +19,6 @@
 
 #include <SceneProperties.hxx>
 #include <ChartTypeHelper.hxx>
-#include <ThreeDHelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
 #include <com/sun/star/drawing/ShadeMode.hpp>
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index d4d2b150a269..b9721490b7e7 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -18,15 +18,12 @@
  */
 
 #include <UncachedDataSequence.hxx>
-#include <PropertyHelper.hxx>
 #include <CommonFunctors.hxx>
 #include <ModifyListenerHelper.hxx>
 
 #include <cppuhelper/supportsservice.hxx>
 #include <algorithm>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
-#include <rtl/math.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx
index 733f8de11549..f610ae0f7426 100644
--- a/chart2/source/tools/UserDefinedProperties.cxx
+++ b/chart2/source/tools/UserDefinedProperties.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <cppu/unotype.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx
index 74d2b4b0aae0..576458a3fd36 100644
--- a/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -21,7 +21,8 @@
 #include <tools/diagnose_ex.h>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
+
+namespace com { namespace sun { namespace star { namespace beans { class XPropertyState; } } } }
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index c76a4ac10393..4e62dca5bd10 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -18,11 +18,8 @@
  */
 
 #include <WrappedIgnoreProperty.hxx>
-#include <com/sun/star/awt/Gradient.hpp>
-#include <com/sun/star/drawing/Hatch.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/drawing/LineJoint.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/RectanglePoint.hpp>
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index 4f4d2bbb090c..ee28aba86e68 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <WrappedProperty.hxx>
-#include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <tools/diagnose_ex.h>
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index d195c59a7c29..2e1ba7dd7d4a 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -20,7 +20,6 @@
 #include <WrappedPropertySet.hxx>
 #include <cppuhelper/propshlp.hxx>
 
-#include <tools/solar.h>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index 39e19e49a4b8..5a23b3790458 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <XMLRangeHelper.hxx>
-#include <unotools/charclass.hxx>
+#include <rtl/character.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>