tdf#42949 tdf#119699 Fix IWYU warnings in chart2/

* Recheck after recent refactorings and improvements in f-u-i

* Drop now unused TabPageIds.h

* The problem noticed in bug #119699 now seems to be gone too
so drop those lines from the blacklist.

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

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

58 files changed, 255 insertions, 186 deletions

diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 445a9f7d60eba..fba041a9feb31 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -200,6 +200,9 @@ blacklist:
     - com/sun/star/io/XActiveDataSource.hpp
     - com/sun/star/lang/XMultiServiceFactory.hpp
     - com/sun/star/lang/XServiceInfo.hpp
+    chart2/source/model/filter/XMLFilter.cxx:
+    # Actually used
+    - com/sun/star/lang/XMultiComponentFactory.hpp
     chart2/source/model/main/DataPoint.hxx:
     # base class has to be a complete type
     - com/sun/star/container/XChild.hpp
@@ -225,6 +228,8 @@ blacklist:
     # Needed for template
     - com/sun/star/chart2/RelativePosition.hpp
     - com/sun/star/chart2/RelativeSize.hpp
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
     chart2/source/model/main/FormattedString.hxx:
     # base class has to be a complete type
     - com/sun/star/chart2/XDataPointCustomLabelField.hpp
@@ -292,9 +297,65 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/chart2/XDataInterpreter.hpp
     - com/sun/star/lang/XServiceInfo.hpp
+    chart2/source/model/template/AreaChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/BubbleChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/BarChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/ChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/ChartTypeManager.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/ColumnLineChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/NetChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/LineChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/ScatterChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/StockChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/model/template/PieChartTypeTemplate.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
     chart2/source/model/template/XYDataInterpreter.cxx:
     # Used after #ifdef
     - sal/log.hxx
+    chart2/source/tools/AxisHelper.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    chart2/source/tools/BaseGFXHelper.cxx:
+    # Actually used
+    - com/sun/star/drawing/PolyPolygonShape3D.hpp
+    - com/sun/star/awt/Rectangle.hpp
+    chart2/source/tools/CommonConverters.cxx:
+    # Actually used
+    - com/sun/star/awt/Rectangle.hpp
+    - com/sun/star/drawing/PolyPolygonBezierCoords.hpp
+    - com/sun/star/chart2/data/XDataSequence.hpp
+    chart2/source/tools/ErrorBar.cxx:
+    # Actually used
+    - com/sun/star/drawing/LineStyle.hpp
+    - com/sun/star/util/Color.hpp
+    - com/sun/star/drawing/LineJoint.hpp
+    chart2/source/tools/CharacterProperties.cxx:
+    # Actually used
+    - com/sun/star/beans/XMultiPropertySet.hpp
+    chart2/source/tools/DataSourceHelper.cxx:
+    # Actually used
+    - com/sun/star/chart2/data/XLabeledDataSequence.hpp
     chart2/source/tools/RegressionCurveModel.hxx:
     # base class has to be a complete type
     - com/sun/star/chart2/XRegressionCurve.hpp
@@ -306,21 +367,36 @@ blacklist:
     chart2/source/tools/ImplOPropertySet.cxx:
     # Needed for template
     - com/sun/star/style/XStyle.hpp
+    chart2/source/tools/LegendHelper.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
     chart2/source/tools/LinePropertiesHelper.cxx:
     # Needed for template
     - com/sun/star/drawing/LineDash.hpp
+    # Actually used
+    - com/sun/star/beans/XPropertySet.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
+    # Actually used
+    - com/sun/star/beans/PropertyValue.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
+    # 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
     chart2/source/tools/RegressionEquation.hxx:
     # base class has to be a complete type
     - com/sun/star/chart2/XTitle.hpp
@@ -332,11 +408,33 @@ blacklist:
     # Needed for template
     - com/sun/star/awt/Size.hpp
     - com/sun/star/chart2/RelativePosition.hpp
+    chart2/source/tools/RelativePositionHelper.cxx:
+    # Actually used
+    - com/sun/star/awt/Size.hpp
+    - com/sun/star/chart2/RelativeSize.hpp
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    chart2/source/tools/RelativeSizeHelper.cxx:
+    # Actually used
+    - com/sun/star/awt/Size.hpp
+    - com/sun/star/beans/XPropertySet.hpp
+    chart2/source/tools/PropertyHelper.cxx:
+    # Actually used
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    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
     # Needed for template
     - com/sun/star/container/XNameContainer.hpp
+    chart2/source/tools/WrappedProperty.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertyState.hpp
     chart2/source/view/inc/3DChartObjects.hxx:
     # base class has to be a complete type
     - boost/shared_array.hpp
@@ -355,58 +453,64 @@ blacklist:
     - com/sun/star/chart2/XScaling.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/lang/XServiceName.hpp
-    # TODO: in view/axes iwyu actually runs without
-    # -I/$SRCDIR/chart2/source/view/inc
-    # thus gives way more false positives
-    chart2/source/view/axes/VAxisOrGridBase.hxx:
-    # False positives
-    - ThreeDHelper.hxx
-    - basegfx/matrix/b3dhommatrix.hxx
-    chart2/source/view/axes/VAxisProperties.hxx:
-    # False positives
-    - com/sun/star/awt/Rectangle.hpp
-    - com/sun/star/awt/Size.hpp
-    - com/sun/star/chart/ChartAxisMarkPosition.hpp
-    - com/sun/star/chart/ChartAxisPosition.hpp
-    - com/sun/star/uno/Any.hxx
-    - vector
-    - TickmarkProperties.hxx
+    chart2/source/view/axes/VAxisBase.cxx:
+    # Needed for direct member access
+    - com/sun/star/drawing/XShapes.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/VPolarCoordinateSystem.cxx:
+    # Actually used
+    - com/sun/star/chart2/XCoordinateSystem.hpp
     chart2/source/view/axes/VCartesianGrid.hxx:
     # base class has to be a complete type
     - com/sun/star/beans/XPropertySet.hpp
-    chart2/source/view/axes/VPolarAxis.hxx:
-    # False positives
-    - memory
-    chart2/source/view/axes/VPolarGrid.hxx:
-    # False positives
-    - memory
-    chart2/source/view/axes/VPolarGrid.hxx:
-    # False positives
-    - com/sun/star/drawing/PointSequenceSequence.hpp
-    chart2/source/view/axes/VPolarRadiusAxis.hxx:
-    # False positives
-    - memory
-    chart2/source/view/axes/VPolarGrid.hxx:
-    # False positives
-    - memory
-    - com/sun/star/drawing/PointSequenceSequence.hpp
-    chart2/source/view/charttypes/BarChart.hxx:
-    # False positives
-    - memory
-    chart2/source/view/charttypes/CandleStickChart.hxx:
-    # False positives
-    - memory
-    chart2/source/view/charttypes/AreaChart.hxx:
-    # False positives
-    - memory
-    chart2/source/view/charttypes/NetChart.hxx:
-    # False positives
-    - memory
-    chart2/source/view/charttypes/PieChart.hxx:
-    # False positives
-    - memory
-    - basegfx/vector/b2ivector.hxx
-    - com/sun/star/awt/Point.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
+    chart2/source/view/main/LabelPositionHelper.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/drawing/XShape.hpp
+    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
+    chart2/source/view/main/ShapeFactory.cxx:
+    # Needed for template
+    - 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
+    chart2/source/view/main/VLineProperties.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    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
@@ -484,18 +588,81 @@ blacklist:
     # base class has to be a complete type
     - AccessibleBase.hxx
     - com/sun/star/accessibility/XAccessibleExtendedComponent.hpp
+    chart2/source/controller/accessibility/AccessibleChartView.cxx:
+    # Actually used
+    - com/sun/star/view/XSelectionSupplier.hpp
+    chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
     chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx:
     # Needed for complex variable type
     - com/sun/star/util/XRefreshable.hpp
     chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx:
     # Needed for complex variable type
     - com/sun/star/util/XRefreshable.hpp
+    chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/beans/XPropertyState.hpp
+    chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx:
+    # Actually used
+    - vector
+    chart2/source/controller/dialogs/ChartTypeDialogController.cxx:
+    # Actually used
+    - com/sun/star/chart2/XChartDocument.hpp
     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
     chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx:
     # Needed for complex variable type
     - com/sun/star/frame/XModel.hpp
+    chart2/source/controller/dialogs/dlg_DataEditor.cxx:
+    # Needed for direct member access
+    - com/sun/star/awt/XWindow.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_AxisPositions.cxx:
+    # Actually used
+    - rtl/math.hxx
+    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/itemsetwrapper/ItemConverter.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
     chart2/source/controller/main/ChartModelClone.hxx:
     # Needed for implicit dtor
     - com/sun/star/uno/Any.hxx
@@ -503,11 +670,20 @@ blacklist:
     # base class has to be a complete type
     - com/sun/star/frame/XSynchronousFrameLoader.hpp
     - com/sun/star/lang/XServiceInfo.hpp
+    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
@@ -515,9 +691,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/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
@@ -534,6 +710,15 @@ blacklist:
     chart2/source/controller/main/ChartController_Tools.cxx:
     # Needed for template
     - com/sun/star/graphic/XGraphic.hpp
+    chart2/source/controller/main/PositionAndSizeHelper.cxx:
+    # Actually used
+    - com/sun/star/awt/Rectangle.hpp
+    chart2/source/controller/main/StatusBarCommandDispatch.cxx:
+    # Actually used
+    - com/sun/star/view/XSelectionSupplier.hpp
+    chart2/source/controller/main/UndoGuard.cxx:
+    # Actually used
+    - com/sun/star/document/XUndoManager.hpp
     chart2/source/controller/main/UndoActions.hxx:
     # base class has to be a complete type
     - com/sun/star/document/XUndoAction.hpp
@@ -641,9 +826,6 @@ blacklist:
     chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx:
     # Needed for css namespace shortcut
     - sal/types.h
-    chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx:
-    # Needed for css namespace shortcut
-    - sal/types.h
     chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx:
     # Needed for css namespace shortcut
     - sal/types.h
@@ -656,4 +838,3 @@ blacklist:
     chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx:
     # Needed for compound type declaration
     - com/sun/star/chart2/XAxis.hpp
-    
diff --git a/chart2/inc/SpecialCharacters.hxx b/chart2/inc/SpecialCharacters.hxx
index 5bf13e25cde35..60d9a19539417 100644
--- a/chart2/inc/SpecialCharacters.hxx
+++ b/chart2/inc/SpecialCharacters.hxx
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_CHART2_INC_SPECIALCHARACTERS_HXX
 #define INCLUDED_CHART2_INC_SPECIALCHARACTERS_HXX
 
+#include <sal/types.h>
+
 const sal_Unicode aMinusSign = 0x2212;
 const sal_Unicode aSuperscriptFigures[10]={ 0x2070, 0x00B9, 0x00B2, 0x00B3, 0x2074, 0x2075, 0x2076, 0x2077, 0x2078, 0x2079 };
 
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index e404d48a28d09..26657d429bd1b 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -36,6 +36,7 @@
 #include <vcl/svapp.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <i18nlangtag/languagetag.hxx>
 #include <vcl/unohelp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
@@ -43,7 +44,6 @@
 #include <o3tl/functional.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/accessiblestatesethelper.hxx>
-#include <unotools/localedatawrapper.hxx>
 
 #include <algorithm>
 #include <iterator>
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index d9f594a83b6a3..20f9da101be90 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -32,7 +32,6 @@
 #include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 10c1ecaffe44c..d5146749cd4dc 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -39,7 +39,6 @@
 #include <osl/diagnose.h>
 #include <toolkit/helper/vclunohelper.hxx>
 
-#include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XChartType.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 4edd9c4c2c13e..2a3d954a61fa8 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -32,7 +32,6 @@
 #include <RegressionCurveHelper.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ustring.hxx>
-#include <sal/log.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/chart2/source/controller/dialogs/TabPageIds.h b/chart2/source/controller/dialogs/TabPageIds.h
deleted file mode 100644
index 0058fd33e9145..0000000000000
--- a/chart2/source/controller/dialogs/TabPageIds.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TABPAGEIDS_H
-#define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TABPAGEIDS_H
-
-//TabPage Ids:
-#define TP_LEGEND_POS   900
-#define TP_DATA_DESCR   901
-#define TP_ALIGNMENT    902
-#define TP_LAYOUT       907
-#define TP_OPTIONS      908
-#define TP_POLAROPTIONS 909
-#define TP_AXIS_LABEL   920
-#define TP_SCALE        903
-#define TP_AXIS_POSITIONS   904
-
-#define TP_3D_SCENEGEOMETRY     915
-#define TP_3D_SCENEAPPEARANCE   916
-#define TP_3D_SCENEILLUMINATION 917
-
-#define TP_TRENDLINE    918
-#define TP_YERRORBAR    919
-#define TP_XERRORBAR    923
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 2bdedc9628565..34a0e08005788 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -22,7 +22,6 @@
 #include <strings.hrc>
 #include <helpids.h>
 #include <ChartModel.hxx>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
 #include "tp_ChartType.hxx"
 #include "tp_RangeChooser.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index ceca927916780..6fc20984918a7 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -22,7 +22,6 @@
 #include <servicenames.hxx>
 #include <TimerTriggeredControllerLock.hxx>
 #include <vcl/svapp.hxx>
-#include <toolkit/awt/vclxwindow.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 03f78205da255..a9fdf71a96e0b 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -21,10 +21,6 @@
 #include "DataBrowser.hxx"
 #include <comphelper/stl_types.hxx>
 
-#include <osl/diagnose.h>
-#include <vcl/taskpanelist.hxx>
-#include <svtools/miscopt.hxx>
-
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 03a5fcc299f55..311182615935f 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -19,7 +19,6 @@
 
 #include <dlg_View3D.hxx>
 #include <strings.hrc>
-#include "TabPageIds.h"
 #include <ResId.hxx>
 #include "tp_3D_SceneGeometry.hxx"
 #include "tp_3D_SceneAppearance.hxx"
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 46407f7cc7320..b8511f21896ce 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -26,7 +26,6 @@
 #include <vcl/weld.hxx>
 
 #include <rtl/math.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <svl/stritem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 293f4658d2b0c..6c603c344270f 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -18,13 +18,11 @@
  */
 
 #include "tp_ChartType.hxx"
-#include <ChartResourceGroupDlgs.hxx>
 #include <ChartResourceGroups.hxx>
 #include <strings.hrc>
 #include <ResId.hxx>
 #include <ChartModelHelper.hxx>
 #include <DiagramHelper.hxx>
-#include <res_BarGeometry.hxx>
 #include <unonames.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
@@ -33,7 +31,6 @@
 
 #include <vcl/weld.hxx>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index addaf99281ced..94a3d6c771737 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "tp_ErrorBars.hxx"
-#include <vcl/event.hxx>
-#include <vcl/settings.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index 6a91ebf30e172..fe25959bdd517 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "tp_Trendline.hxx"
-#include <vcl/event.hxx>
-#include <vcl/settings.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 8a28e975c256d..7113eba8857b3 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -33,7 +33,6 @@
 #include <vcl/virdev.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpage.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 namespace chart
diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx
index 5577df790bd77..4790bd42dc6a2 100644
--- a/chart2/source/controller/inc/ItemPropertyMap.hxx
+++ b/chart2/source/controller/inc/ItemPropertyMap.hxx
@@ -21,6 +21,8 @@
 
 #include <sal/config.h>
 
+#include "ItemConverter.hxx"
+
 #include <map>
 
 namespace chart { namespace wrapper {
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 230cac85816d6..c3ebb615db32f 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -28,8 +28,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 
-#include <tools/link.hxx>
-#include <vcl/vclptr.hxx>
 #include "dlg_CreationWizard.hxx"
 
 namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index 680256d1db53c..58965cb967f02 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATASOURCE_HXX
 
 #include <vcl/weld.hxx>
-#include <vcl/vclptr.hxx>
 
 #include "TabPageNotifiable.hxx"
 
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 2856ff78b6976..39babb82a09c4 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/chart2/Symbol.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-#include <sal/log.hxx>
 #include <svx/xflclit.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 9b169f9280cfe..69145126e4c82 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -33,7 +33,6 @@
 #include <svl/intitem.hxx>
 #include <svl/ilstitem.hxx>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index ffbab285998e1..86f5891bbad9c 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -27,7 +27,6 @@
 #include "SchWhichPairs.hxx"
 #include <unonames.hxx>
 
-#include <sal/log.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <svl/eitem.hxx>
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index ec45a22eae0ec..a8212bf99b279 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -57,7 +57,6 @@
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <svx/ActionDescriptionProvider.hxx>
 
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 66884dfb2fa81..184c37e108ede 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -32,10 +32,8 @@
 #include <svx/ActionDescriptionProvider.hxx>
 
 #include <comphelper/servicehelper.hxx>
-#include <sal/log.hxx>
 #include <svx/svxids.hrc>
 #include <svx/rectenum.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/intitem.hxx>
 #include <svx/svxdlg.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index be7760caca62a..2adad587dec60 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -57,7 +57,6 @@
 
 #include <memory>
 
-#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <svx/ActionDescriptionProvider.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 74f7e9ab6f790..fc2b475181d5c 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -71,7 +71,6 @@
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 #include <memory>
 
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 1b8f6613c6b50..3bb2dcb1e116d 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -20,7 +20,6 @@
 #include "ShapeController.hxx"
 #include <ShapeController.h>
 #include <ChartController.hxx>
-#include <ChartWindow.hxx>
 #include <ViewElementListProvider.hxx>
 #include <dlg_ShapeFont.hxx>
 #include <dlg_ShapeParagraph.hxx>
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 1a7e9a35c6b5f..1e6c06c35b6f8 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -19,7 +19,6 @@
 
 #include "StatusBarCommandDispatch.hxx"
 #include <ObjectNameProvider.hxx>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index e6ee12ec7e4e1..88fd04440e589 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -18,39 +18,20 @@
  */
 
 #include "ChartTypePanel.hxx"
+#include <TimerTriggeredControllerLock.hxx>
 
-#include <bitmaps.hlst>
 #include <ChartController.hxx>
-#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include <ChartResourceGroupDlgs.hxx>
 #include <ChartResourceGroups.hxx>
 #include <ChartTypeDialogController.hxx>
-#include <ChartTypeHelper.hxx>
 #include <DiagramHelper.hxx>
-#include <ResId.hxx>
-#include <strings.hrc>
 #include <unonames.hxx>
 
-#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/sidebar/ControlFactory.hxx>
-
-#include <com/sun/star/chart2/DataPointGeometry3D.hpp>
-#include <com/sun/star/chart2/XChartTypeContainer.hpp>
-#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
+#include <com/sun/star/util/XModifyBroadcaster.hpp>
 
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/button.hxx>
-
-#include <svl/intitem.hxx>
-#include <svl/stritem.hxx>
-
-#include <comphelper/processfactory.hxx>
 #include <svtools/valueset.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index 02b76a6b04b60..867d3003541bf 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -27,7 +27,6 @@
 #include <ChartTypeDialogController.hxx>
 #include <ChartTypeTemplateProvider.hxx>
 #include <TimerTriggeredControllerLock.hxx>
-#include <TitleHelper.hxx>
 
 namespace com
 {
diff --git a/chart2/source/inc/AxisIndexDefines.hxx b/chart2/source/inc/AxisIndexDefines.hxx
index e7d118048301b..bc8b4e6dd2ea9 100644
--- a/chart2/source/inc/AxisIndexDefines.hxx
+++ b/chart2/source/inc/AxisIndexDefines.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_AXISINDEXDEFINES_HXX
 #define INCLUDED_CHART2_SOURCE_INC_AXISINDEXDEFINES_HXX
 
+#include <sal/types.h>
+
 namespace chart
 {
 
diff --git a/chart2/source/inc/ChartResourceGroups.hxx b/chart2/source/inc/ChartResourceGroups.hxx
index 6e474992dda76..3317f83acd096 100644
--- a/chart2/source/inc/ChartResourceGroups.hxx
+++ b/chart2/source/inc/ChartResourceGroups.hxx
@@ -23,10 +23,7 @@
 #include "res_BarGeometry.hxx"
 #include "ChangingResource.hxx"
 #include "ChartTypeDialogController.hxx"
-
-#include <vcl/tabpage.hxx>
-
-#include <com/sun/star/chart2/XChartDocument.hpp>
+#include "ChartResourceGroupDlgs.hxx"
 
 namespace chart
 {
diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx
index e20f00a1692dc..91e3372489146 100644
--- a/chart2/source/inc/FormattedStringHelper.hxx
+++ b/chart2/source/inc/FormattedStringHelper.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_FORMATTEDSTRINGHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_FORMATTEDSTRINGHELPER_HXX
 
-#include "charttoolsdllapi.hxx"
 #include <com/sun/star/uno/Sequence.h>
 
 namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index 85f88b1a1e0ef..1b10250079492 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include "charttoolsdllapi.hxx"
 
 namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index 4083edad9bc63..04d044172fbae 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -24,7 +24,6 @@
 #include <cppuhelper/compbase.hxx>
 
 #include "MutexContainer.hxx"
-#include "charttoolsdllapi.hxx"
 
 #include <vector>
 #include <algorithm>
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index eb1e46703e39d..3019b0939807b 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_REGRESSIONCALCULATIONHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_REGRESSIONCALCULATIONHELPER_HXX
 
+#include <com/sun/star/uno/Sequence.hxx>
+
 #include <rtl/math.hxx>
 
 #include <utility>
diff --git a/chart2/source/inc/TrueGuard.hxx b/chart2/source/inc/TrueGuard.hxx
index 38671d3a441f1..19047fe8065b0 100644
--- a/chart2/source/inc/TrueGuard.hxx
+++ b/chart2/source/inc/TrueGuard.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_TRUEGUARD_HXX
 #define INCLUDED_CHART2_SOURCE_INC_TRUEGUARD_HXX
 
-#include "charttoolsdllapi.hxx"
-
 namespace chart
 {
 /** This guard sets the given boolean reference to true in the constructor and to false in the destructor
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 694bba9ec5c6c..8696115799dda 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/document/GraphicStorageHandler.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index 2ff699fb0f4a5..c6a294fe8a159 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index c00e5ad3457aa..0edb82fd5dc04 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -37,7 +37,6 @@
 #include <comphelper/sequence.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 #include <algorithm>
 #include <iterator>
diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx
index 8cc1ea8b65d1e..9b47641ee13f6 100644
--- a/chart2/source/tools/ImplOPropertySet.hxx
+++ b/chart2/source/tools/ImplOPropertySet.hxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Any.hxx>
 
 #include <map>
 #include <vector>
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 1e049a856da93..b1c0865999264 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/drawing/ShadeMode.hpp>
 #include <tools/diagnose_ex.h>
 #include <tools/helpers.hxx>
-#include <sal/log.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 098401db5754f..d660915b40235 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/XAxis.hpp>
 
-#include <sal/log.hxx>
 #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 ce795abb17d00..efb87de740269 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -35,7 +35,6 @@
 #include <tools/color.hxx>
 #include <svx/unoshape.hxx>
 #include <svx/unoshtxt.hxx>
-#include <sal/log.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index ddf10f459eff1..54d3341efaf2d 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
 #include <comphelper/sequence.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <algorithm>
 #include <rtl/math.hxx>
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index e48489a619067..4204ab3fecfa7 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -25,7 +25,6 @@
 #include "BarPositionHelper.hxx"
 #include <DateHelper.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 
diff --git a/chart2/source/view/charttypes/ConfigAccess.cxx b/chart2/source/view/charttypes/ConfigAccess.cxx
index bca2b6dd99efd..2e6e507408b4a 100644
--- a/chart2/source/view/charttypes/ConfigAccess.cxx
+++ b/chart2/source/view/charttypes/ConfigAccess.cxx
@@ -19,11 +19,10 @@
 
 #include <ConfigAccess.hxx>
 
-#include <unotools/syslocale.hxx>
 #include <unotools/configitem.hxx>
-#include <unotools/localedatawrapper.hxx>
 #include <o3tl/any.hxx>
 #include <rtl/instance.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index fec07e83f0a39..a3999441b0818 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -29,13 +29,11 @@
 #include <ThreeDHelper.hxx>
 #include <defines.hxx>
 #include <editeng/unoprnms.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <svx/unoshape.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/e3dsceneupdater.hxx>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx
index 2066d0a1b8358..3335c4e795d75 100644
--- a/chart2/source/view/inc/PropertyMapper.hxx
+++ b/chart2/source/view/inc/PropertyMapper.hxx
@@ -26,8 +26,6 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Reference.h>
 
-#include <charttoolsdllapi.hxx>
-
 namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
 
 namespace chart
diff --git a/chart2/source/view/inc/ViewDefines.hxx b/chart2/source/view/inc/ViewDefines.hxx
index 186f01b2c3902..d191efe484f98 100644
--- a/chart2/source/view/inc/ViewDefines.hxx
+++ b/chart2/source/view/inc/ViewDefines.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_VIEWDEFINES_HXX
 #define INCLUDED_CHART2_SOURCE_VIEW_INC_VIEWDEFINES_HXX
 
+#include <sal/types.h>
+
 namespace chart
 {
 
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 0e4d1124847b2..ae2a3d7d0ae68 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -97,7 +97,6 @@
 
 
 #include <rtl/ustring.hxx>
-#include <sal/log.hxx>
 
 #include <tools/diagnose_ex.h>
 #include <tools/stream.hxx>
diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx
index c6802dc21b107..c27ffa3168a5f 100644
--- a/chart2/source/view/main/Linear3DTransformation.cxx
+++ b/chart2/source/view/main/Linear3DTransformation.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <Linear3DTransformation.hxx>
-#include <algorithm>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index f96c7b101509f..2658e94ea78a5 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -19,7 +19,6 @@
 
 #include <PropertyMapper.hxx>
 #include <unonames.hxx>
-#include <sal/log.hxx>
 
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 0f2749a1f6c78..1b6f23121570d 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
 
 #include <rtl/math.hxx>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/color.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx
index 003659610a967..f1ca35e717307 100644
--- a/chart2/source/view/main/VLineProperties.cxx
+++ b/chart2/source/view/main/VLineProperties.cxx
@@ -20,7 +20,6 @@
 #include <VLineProperties.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 namespace chart
diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx
index 2facc242bc3ed..6d3ba587fc9c9 100644
--- a/chart2/source/view/main/VPolarTransformation.cxx
+++ b/chart2/source/view/main/VPolarTransformation.cxx
@@ -19,7 +19,6 @@
 
 #include <VPolarTransformation.hxx>
 #include <CommonConverters.hxx>
-#include <algorithm>
 
 using namespace ::com::sun::star;
 
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index d0633263f8afe..39989f191aa08 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/chart2/XTitle.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 namespace chart
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index c4af0b0b1c0c3..b3c04fccfddef 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -933,7 +933,6 @@ chart2/source/controller/dialogs/DialogModel.hxx
 chart2/source/controller/dialogs/ObjectNameProvider.cxx
 chart2/source/controller/dialogs/RangeSelectionHelper.cxx
 chart2/source/controller/dialogs/RangeSelectionListener.cxx
-chart2/source/controller/dialogs/TabPageIds.h
 chart2/source/controller/dialogs/TextDirectionListBox.cxx
 chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
 chart2/source/controller/dialogs/TitleDialogData.cxx