Recheck module chart2 with IWYU

See tdf#42949 for motivation

This time using the new --noexclude switch to recheck validity
of the excludelist; these were the obsolete exclusions

Change-Id: Ifdf79b30ebaf198082c2194611a2ed2b664e6f1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133309
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

39 files changed, 0 insertions, 138 deletions

diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index e1c845f6fffe..194bc932e81e 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -140,7 +140,6 @@ excludelist:
     - com/sun/star/util/XModifiable.hpp
     chart2/source/inc/WeakListenerAdapter.hxx:
     # base class has to be a complete type
-    - com/sun/star/util/XModifyListener.hpp
     - com/sun/star/view/XSelectionChangeListener.hpp
     chart2/source/inc/WrappedProperty.hxx:
     # Needed for implicit dtor
@@ -161,7 +160,6 @@ excludelist:
     - com/sun/star/document/XExporter.hpp
     - com/sun/star/document/XFilter.hpp
     - com/sun/star/document/XImporter.hpp
-    - com/sun/star/io/XActiveDataSource.hpp
     - com/sun/star/lang/XMultiServiceFactory.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     chart2/source/model/filter/XMLFilter.cxx:
@@ -322,9 +320,6 @@ excludelist:
     - com/sun/star/drawing/XShape.hpp
     # Actually used
     - com/sun/star/view/XSelectionSupplier.hpp
-    chart2/source/tools/ReferenceSizeProvider.cxx:
-    # Actually used
-    - com/sun/star/chart2/XTitle.hpp
     chart2/source/tools/RegressionCurveHelper.cxx:
     # Actually used
     - com/sun/star/chart2/XRegressionCurveCalculator.hpp
@@ -357,9 +352,6 @@ excludelist:
     chart2/source/tools/StatisticsHelper.cxx:
     # Actually used
     - com/sun/star/chart2/data/XDataProvider.hpp
-    chart2/source/tools/UncachedDataSequence.cxx:
-    # Actually used
-    - com/sun/star/chart2/XInternalDataProvider.hpp
     chart2/source/tools/UserDefinedProperties.cxx:
     # Needs a complete type
     - com/sun/star/beans/Property.hpp
@@ -376,43 +368,18 @@ excludelist:
     - com/sun/star/chart2/XScaling.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/lang/XServiceName.hpp
-    chart2/source/view/axes/VAxisBase.cxx:
-    # Needed for direct member access
-    - com/sun/star/drawing/XShapes.hpp
-    # Needed for implicit dtor
-    - com/sun/star/chart2/XAxis.hpp
     chart2/source/view/axes/VAxisProperties.cxx:
-    # Actually used
-    - com/sun/star/chart2/XAxis.hpp
     # Needed for rtl::math::round
     - rtl/math.hxx
-    chart2/source/view/axes/VCartesianCoordinateSystem.cxx:
-    # Actually used
-    - com/sun/star/chart2/XCoordinateSystem.hpp
     chart2/source/view/axes/VPolarAngleAxis.cxx:
     # Needed for implicit dtor
     - Axis.hxx
-    chart2/source/view/axes/VPolarCoordinateSystem.cxx:
-    # Actually used
-    - com/sun/star/chart2/XCoordinateSystem.hpp
     chart2/source/view/axes/VPolarRadiusAxis.cxx:
     # Needed for implicit dtor
     - Axis.hxx
-    chart2/source/view/axes/VCartesianAxis.cxx:
-    # Needed for implicit dtor
-    - com/sun/star/chart2/XAxis.hpp
     chart2/source/view/axes/VCartesianGrid.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
-    chart2/source/view/charttypes/Splines.cxx:
-    # Actually used
-    - com/sun/star/drawing/PolyPolygonShape3D.hpp
-    chart2/source/view/charttypes/AreaChart.cxx:
-    # Actually used
-    - com/sun/star/drawing/XShapes.hpp
-    chart2/source/view/charttypes/NetChart.cxx:
-    # Actually used
-    - com/sun/star/drawing/XShapes.hpp
     chart2/source/view/charttypes/BarChart.cxx:
     # comphelper::ScopeGuard being used
     - comphelper/scopeguard.hxx
@@ -422,15 +389,8 @@ excludelist:
     chart2/source/view/main/LabelPositionHelper.cxx:
     # Actually used
     - com/sun/star/beans/XPropertySet.hpp
-    - com/sun/star/drawing/XShape.hpp
     # Actually used
     - rtl/math.hxx
-    chart2/source/view/main/VButton.cxx:
-    # Actually used
-    - com/sun/star/lang/XMultiServiceFactory.hpp
-    chart2/source/view/main/PlottingPositionHelper.cxx:
-    # Actually used
-    - com/sun/star/drawing/XShapes.hpp
     chart2/source/view/main/PropertyMapper.cxx:
     # Actually used
     - com/sun/star/beans/XPropertySet.hpp
@@ -439,7 +399,6 @@ excludelist:
     - com/sun/star/graphic/XGraphic.hpp
     # Actually used
     - com/sun/star/chart2/XFormattedString.hpp
-    - com/sun/star/lang/XMultiServiceFactory.hpp
     chart2/source/view/main/ChartView.cxx:
     # comphelper::ScopeGuard being used
     - comphelper/scopeguard.hxx
@@ -449,7 +408,6 @@ excludelist:
     chart2/source/view/main/VTitle.cxx:
     # Actually used
     - com/sun/star/chart2/XTitle.hpp
-    - com/sun/star/drawing/XShape.hpp
     chart2/source/controller/inc/AccessibleTextHelper.hxx:
     # base class has to be a complete type
     - com/sun/star/accessibility/XAccessibleContext.hpp
@@ -516,9 +474,6 @@ excludelist:
     chart2/source/controller/inc/RangeSelectionListener.hxx:
     # base class has to be a complete type
     - com/sun/star/sheet/XRangeSelectionListener.hpp
-    chart2/source/controller/accessibility/AccessibleBase.cxx:
-    # Needed for template
-    - com/sun/star/chart2/XChartDocument.hpp
     chart2/source/controller/accessibility/AccessibleChartShape.hxx:
     # base class has to be a complete type
     - AccessibleBase.hxx
@@ -530,9 +485,6 @@ excludelist:
     chart2/source/controller/accessibility/AccessibleChartView.cxx:
     # Actually used
     - com/sun/star/view/XSelectionSupplier.hpp
-    chart2/source/controller/chartapiwrapper/AxisWrapper.cxx:
-    # Needed for implicit dtor
-    - com/sun/star/frame/XModel.hpp
     chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:
     # Needed for rtl::math::round
     - rtl/math.hxx
@@ -547,46 +499,21 @@ excludelist:
     - com/sun/star/beans/XPropertySet.hpp
     - com/sun/star/beans/XPropertyState.hpp
     chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:
-    # Actually used
-    - vector
     # Needed for implicit dtor
     - BaseCoordinateSystem.hxx
-    chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx:
-    # Needed for implicit dtor
-    - com/sun/star/chart2/XAxis.hpp
     chart2/source/controller/dialogs/ChartTypeDialogController.cxx:
-    # Actually used
-    - com/sun/star/chart2/XChartDocument.hpp
     # Needed for implicit dtor
     - DataSeries.hxx
     - BaseCoordinateSystem.hxx
-    chart2/source/controller/dialogs/DataBrowser.cxx:
-    # Needed for complex variable type
-    - com/sun/star/chart2/XChartDocument.hpp
     chart2/source/controller/dialogs/DialogModel.cxx:
-    # Actually used
-    - com/sun/star/uno/XComponentContext.hpp
-    - com/sun/star/chart2/XChartDocument.hpp
     # Needed for implicit dtor
     - LabeledDataSequence.hxx
-    chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx:
-    # Needed for complex variable type
-    - com/sun/star/frame/XModel.hpp
     chart2/source/controller/dialogs/dlg_CreationWizard.cxx:
     # Needed for implicit dtor
     - ChartTypeTemplate.hxx
     chart2/source/controller/dialogs/dlg_DataEditor.cxx:
     # Needed for direct member access
     - com/sun/star/awt/XWindow.hpp
-    chart2/source/controller/dialogs/dlg_View3D.cxx:
-    # Needed for implicit dtor
-    - com/sun/star/chart2/XDiagram.hpp
-    chart2/source/controller/dialogs/RangeSelectionHelper.cxx:
-    # Actually used
-    - com/sun/star/chart2/XChartDocument.hpp
-    chart2/source/controller/dialogs/res_ErrorBar.cxx:
-    # Actually used
-    - com/sun/star/chart2/XChartDocument.hpp
     chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx:
     # Needed for implicit dtor
     - ChartType.hxx
@@ -596,13 +523,8 @@ excludelist:
     chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx:
     # Actually used
     - com/sun/star/beans/XPropertySet.hpp
-    chart2/source/controller/dialogs/tp_ChartType.cxx:
-    # Actually used
-    - com/sun/star/chart2/XChartDocument.hpp
     chart2/source/controller/dialogs/tp_DataSource.cxx:
     # Needed for implicit dtor
-    - com/sun/star/frame/XModel.hpp
-    # Needed for implicit dtor
     - ChartTypeTemplate.hxx
     - LabeledDataSequence.hxx
     chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx:
@@ -654,17 +576,11 @@ excludelist:
     chart2/source/controller/main/ChartFrameloader.cxx:
     # Actually used
     - com/sun/star/uno/XComponentContext.hpp
-    chart2/source/controller/main/ChartDropTargetHelper.cxx:
-    # Actually used
-    - com/sun/star/chart2/XChartDocument.hpp
     chart2/source/controller/main/CommandDispatch.hxx:
     # base class has to be a complete type
     - com/sun/star/frame/XDispatch.hpp
     - com/sun/star/util/XModifyListener.hpp
     - comphelper/interfacecontainer2.hxx
-    chart2/source/controller/main/CommandDispatchContainer.cxx:
-    # Actually used
-    - com/sun/star/frame/XModel.hpp
     chart2/source/controller/main/ControllerCommandDispatch.hxx:
     # base class has to be a complete type
     - CommandDispatch.hxx
@@ -672,27 +588,17 @@ excludelist:
     chart2/source/controller/main/ElementSelector.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XServiceInfo.hpp
-    chart2/source/controller/main/ObjectHierarchy.cxx:
-    # Actually used
-    - com/sun/star/awt/KeyEvent.hpp
     chart2/source/controller/main/StatusBarCommandDispatch.hxx:
     # base class has to be a complete type
     - CommandDispatch.hxx
     - com/sun/star/view/XSelectionChangeListener.hpp
-    chart2/source/controller/main/ChartController_EditData.cxx:
-    # Needed for member access
-    - ChartWindow.hxx
     chart2/source/controller/main/ChartController_Insert.cxx:
     # Needed for implicit dtor
     - Legend.hxx
     chart2/source/controller/main/ChartController_Position.cxx:
-    # Needed for member access
-    - ChartWindow.hxx
     # Needed for implicit dtor
     - ChartModel.hxx
     chart2/source/controller/main/ChartController_Properties.cxx:
-    # Needed for member access
-    - ChartWindow.hxx
     # Needed for implicit dtor
     - RegressionCurveModel.hxx
     chart2/source/controller/main/ChartController_TextEdit.cxx:
@@ -711,7 +617,6 @@ excludelist:
     # Actually used
     - com/sun/star/awt/Rectangle.hpp
     # Needed for implicit dtor
-    - com/sun/star/chart2/XDiagram.hpp
     - Diagram.hxx
     chart2/source/controller/main/SelectionHelper.cxx:
     # Needed for implicit dtor
@@ -844,6 +749,3 @@ excludelist:
     chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx:
     # Needed for implicit dtor
     - RegressionCurveModel.hxx
-    chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx:
-    # Needed for compound type declaration
-    - com/sun/star/chart2/XAxis.hpp
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 8b6b94585cd2..4e8b205745a5 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 542e0e584da5..02306d2c1346 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
 #include <com/sun/star/chart2/XAxis.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 
 #include <CharacterProperties.hxx>
 #include <LinePropertiesHelper.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index d27c5ec6bb93..d0cea5602ada 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -62,7 +62,6 @@
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <tools/diagnose_ex.h>
 
-#include <vector>
 #include <algorithm>
 #include <map>
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 2f56ace70af9..4280fc4c0d40 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -23,7 +23,6 @@
 
 #include "WrappedAxisAndGridExistenceProperties.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
 #include <Axis.hxx>
 #include <AxisHelper.hxx>
 #include <WrappedProperty.hxx>
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index cbd4db6e430f..9408ca2ee07f 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -34,7 +34,6 @@
 #include <ChartModel.hxx>
 
 #include <com/sun/star/chart2/DataPointGeometry3D.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 
 #include <svtools/valueset.hxx>
 #include <vcl/image.hxx>
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 6af79ed3453e..eb15e8f3d87b 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -43,7 +43,6 @@
 #include <svl/numformat.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
 
 #include <algorithm>
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 908d6d47b433..59d9d5bb93c6 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -36,9 +36,7 @@
 #include <BaseCoordinateSystem.hxx>
 #include <LabeledDataSequence.hxx>
 
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <tools/diagnose_ex.h>
 
diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index 5cbc07f76078..ede420f070e2 100644
--- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -20,7 +20,6 @@
 #include <RangeSelectionHelper.hxx>
 #include <RangeSelectionListener.hxx>
 #include <com/sun/star/awt/XTopWindow.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <tools/diagnose_ex.h>
 #include <ChartModel.hxx>
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 873edbc48ada..0e95cd75c48e 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -23,7 +23,6 @@
 #include <servicenames.hxx>
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <com/sun/star/frame/XModel.hpp>
 
 namespace com::sun::star::awt { class XWindow; }
 
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index a99782336e03..abc2645de98e 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -26,7 +26,6 @@
 #include <ChartModelHelper.hxx>
 #include <ChartModel.hxx>
 #include <Diagram.hxx>
-#include <com/sun/star/chart2/XDiagram.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index b0173dec46ba..12fabc659dff 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -22,7 +22,6 @@
 #include <RangeSelectionHelper.hxx>
 #include <helpids.h>
 #include <chartview/ChartSfxItemIds.hxx>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <vcl/weld.hxx>
 #include <ChartModel.hxx>
 
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 2b8c36e7c9c0..7a007f9da43a 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -28,7 +28,6 @@
 #include <DiagramHelper.hxx>
 #include <Diagram.hxx>
 #include <unonames.hxx>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 
 #include <svtools/valueset.hxx>
 
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 7cadbc04d65d..b142825b37fa 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -35,7 +35,6 @@
 #include <TabPageNotifiable.hxx>
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 
 #include <tools/diagnose_ex.h>
 
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 24b5ccfd8c21..5f460be987cd 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -34,7 +34,6 @@
 #include <AxisHelper.hxx>
 #include <chartview/ExplicitValueProvider.hxx>
 #include <com/sun/star/chart2/XTitle.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx b/chart2/source/controller/main/ChartController_EditData.cxx
index 007a786ca564..c766c51cc5e6 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <ChartWindow.hxx>
 #include <ChartController.hxx>
 #include <ChartModel.hxx>
 
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 9a7c1cbfdbf2..dc8941587e44 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -19,7 +19,6 @@
 
 #include <ChartController.hxx>
 
-#include <ChartWindow.hxx>
 #include <DrawViewWrapper.hxx>
 #include <PositionAndSizeHelper.hxx>
 #include <ChartModel.hxx>
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index fd15ebc11125..1b72833f93bc 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ChartController.hxx>
-#include <ChartWindow.hxx>
 #include <chartview/DrawModelWrapper.hxx>
 #include <chartview/ChartSfxItemIds.hxx>
 #include <ObjectIdentifier.hxx>
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index b6e359b96d2e..b1dfc35d4b5a 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -23,7 +23,6 @@
 #include <ChartModel.hxx>
 #include <Diagram.hxx>
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 
 #include <sot/formats.hxx>
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 05eea58de66d..d42936ce7e35 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -26,7 +26,6 @@
 #include <ChartModel.hxx>
 
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <rtl/ref.hxx>
 
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index b21d8354108c..335fa506a615 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -44,7 +44,6 @@
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/awt/Key.hpp>
-#include <com/sun/star/awt/KeyEvent.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <tools/diagnose_ex.h>
 
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 421d9081a891..ca8a4549adfe 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -20,7 +20,6 @@
 #include <PositionAndSizeHelper.hxx>
 #include <ControllerLockGuard.hxx>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/chart2/RelativeSize.hpp>
 #include <tools/gen.hxx>
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx
index fe693668a3e8..f300f1aa0391 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index b189ce0b3530..332bf62ca081 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <osl/mutex.hxx>
 #include <vcl/errcode.hxx>
 
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 6c690af40e0e..dd099edcf877 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -26,7 +26,6 @@
 #include <Diagram.hxx>
 #include <Axis.hxx>
 #include <AxisHelper.hxx>
-#include <com/sun/star/chart2/XTitle.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <vector>
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 097e05aa4df9..b07fc11ad9f2 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -26,7 +26,6 @@
 #include <algorithm>
 #include <strings.hrc>
 #include <ResId.hxx>
-#include <com/sun/star/chart2/XInternalDataProvider.hpp>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index c176bd4590e7..ace362a9b964 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -22,9 +22,7 @@
 #include <ExplicitCategoriesProvider.hxx>
 #include "Tickmarks.hxx"
 #include <Axis.hxx>
-#include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
 
 #include <osl/diagnose.h>
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index a53c3c656fe6..f8f177936e1d 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
 
 #include <tools/diagnose_ex.h>
 #include <rtl/math.hxx>
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 835e085955be..95a86fe377c2 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -29,7 +29,6 @@
 #include "Tickmarks_Equidistant.hxx"
 #include <ExplicitCategoriesProvider.hxx>
 #include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
 #include <rtl/math.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/color.hxx>
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 2b14282cec6c..866c8fdd89bb 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -26,7 +26,6 @@
 #include <AxisHelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <ChartModel.hxx>
-#include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
 
diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index 1312b4feacb3..e287120f965e 100644
--- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -25,7 +25,6 @@
 #include <Axis.hxx>
 #include <AxisHelper.hxx>
 #include <ChartModel.hxx>
-#include <com/sun/star/chart2/XCoordinateSystem.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index de1dc30af2f5..d7f862ae5cec 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -40,7 +40,6 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
-#include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <officecfg/Office/Compatibility.hxx>
 
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 098864ac0db4..647ea083f583 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -35,7 +35,6 @@
 
 #include <osl/diagnose.h>
 
-#include <com/sun/star/drawing/XShapes.hpp>
 #include <officecfg/Office/Compatibility.hxx>
 
 #include <limits>
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 1f97ec81d620..2aac969291f2 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -19,7 +19,6 @@
 
 #include "Splines.hxx"
 #include <osl/diagnose.h>
-#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
 
 #include <vector>
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index ec169ce4f4cc..e39bc04952e0 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
 
 #include <cmath>
 
diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx
index d4ed69579826..eab2f69e7d9a 100644
--- a/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/chart/TimeUnit.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/drawing/Position3D.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
 
 #include <rtl/math.hxx>
 
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 889dbf389d43..86e93fc44394 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -41,7 +41,6 @@
 #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/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx
index dc8e22c4961d..a515e3fa0cba 100644
--- a/chart2/source/view/main/VButton.cxx
+++ b/chart2/source/view/main/VButton.cxx
@@ -15,7 +15,6 @@
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <CommonConverters.hxx>
 #include <editeng/unoprnms.hxx>
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index 4d90a2fb7503..74d276742bd9 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -21,7 +21,6 @@
 #include <CommonConverters.hxx>
 #include <ShapeFactory.hxx>
 #include <com/sun/star/chart2/XTitle.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/diagnose_ex.h>