tdf#42949 Fix IWYU warnings in chart2/source/inc/[l-z]*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Some only-recently analyzed files were cleaned.
Also tried harder to use more fw decls instead of blacklisting

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

chart2/IwyuFilter_chart2.yaml

@@ -87,18 +87,13 @@ blacklist:
     - com/sun/star/lang/XInitialization.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/util/XCloneable.hpp
-    chart2/source/inc/MediaDescriptorHelper.hxx:
+    chart2/source/inc/LabeledDataSequence.hxx:
     # base class has to be a complete type
-    - com/sun/star/beans/PropertyValue.hpp
+    - com/sun/star/chart2/data/XLabeledDataSequence2.hpp
-    - com/sun/star/embed/XStorage.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
-    - com/sun/star/io/XInputStream.hpp
-    - com/sun/star/io/XOutputStream.hpp
-    - com/sun/star/io/XStream.hpp
     chart2/source/inc/ModifyListenerHelper.hxx:
     # base class has to be a complete type
-    - com/sun/star/uno/XWeak.hpp
     - com/sun/star/util/XModifyListener.hpp
-    - cppuhelper/weakref.hxx
     chart2/source/inc/NameContainer.hxx:
     # base class has to be a complete type
     - com/sun/star/container/XNameContainer.hpp
@@ -107,51 +102,26 @@ blacklist:
     chart2/source/inc/NumberFormatterWrapper.hxx:
     # base class has to be a complete type
     - com/sun/star/util/XNumberFormatsSupplier.hpp
-    - svl/zforlist.hxx
     chart2/source/inc/PropertyHelper.hxx:
     # base class has to be a complete type
-    - com/sun/star/lang/XMultiServiceFactory.hpp
     - com/sun/star/uno/Any.hxx
     chart2/source/inc/PopupRequest.hxx:
     # base class has to be a complete type
     - com/sun/star/awt/XRequestCallback.hpp
     chart2/source/inc/RangeHighlighter.hxx:
     # base class has to be a complete type
-    - com/sun/star/beans/XPropertySet.hpp
     - com/sun/star/chart2/data/XRangeHighlighter.hpp
-    - com/sun/star/view/XSelectionSupplier.hpp
+    - com/sun/star/view/XSelectionChangeListener.hpp
-    chart2/source/inc/RelativePositionHelper.hxx:
+    chart2/source/inc/RegressionCurveCalculator.hxx:
     # base class has to be a complete type
-    - com/sun/star/awt/Size.hpp
+    - com/sun/star/chart2/XRegressionCurveCalculator.hpp
-    - com/sun/star/chart2/RelativeSize.hpp
-    chart2/source/inc/RelativeSizeHelper.hxx:
-    # base class has to be a complete type
-    - com/sun/star/awt/Size.hpp
-    - com/sun/star/beans/XPropertySet.hpp
     chart2/source/inc/Scaling.hxx:
     # base class has to be a complete type
     - com/sun/star/chart2/XScaling.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/lang/XServiceName.hpp
-    chart2/source/inc/StatisticsHelper.hxx:
-    # base class has to be a complete type
-    - com/sun/star/chart2/XDataSeries.hpp
-    - com/sun/star/chart2/data/XDataProvider.hpp
-    - com/sun/star/chart2/data/XDataSource.hpp
-    - com/sun/star/uno/Sequence.hxx
-    chart2/source/inc/SceneProperties.hxx:
-    # base class has to be a complete type
-    - com/sun/star/beans/Property.hpp
-    chart2/source/inc/ThreeDHelper.hxx:
-    # base class has to be a complete type
-    - com/sun/star/chart2/XDiagram.hpp
-    chart2/source/inc/UserDefinedProperties.hxx:
-    # base class has to be a complete type
-    - com/sun/star/beans/Property.hpp
     chart2/source/inc/UncachedDataSequence.hxx:
     # base class has to be a complete type
-    - com/sun/star/beans/XPropertySet.hpp
-    - com/sun/star/chart2/XInternalDataProvider.hpp
     - com/sun/star/chart2/data/XDataSequence.hpp
     - com/sun/star/chart2/data/XNumericalDataSequence.hpp
     - com/sun/star/chart2/data/XTextualDataSequence.hpp
@@ -165,16 +135,13 @@ blacklist:
     - com/sun/star/util/XModifyListener.hpp
     - com/sun/star/view/XSelectionChangeListener.hpp
     chart2/source/inc/WrappedProperty.hxx:
-    # base class has to be a complete type
+    # Needed for implicit dtor
-    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/uno/Any.hxx
-    - com/sun/star/beans/XPropertyState.hpp
     chart2/source/inc/WrappedPropertySet.hxx:
     # base class has to be a complete type
-    - com/sun/star/beans/Property.hpp
     - com/sun/star/beans/XMultiPropertySet.hpp
     - com/sun/star/beans/XMultiPropertyStates.hpp
     - com/sun/star/beans/XPropertySet.hpp
-    - cppuhelper/propshlp.hxx
     - com/sun/star/beans/XPropertyState.hpp
     chart2/source/model/inc/BaseCoordinateSystem.hxx:
     # base class has to be a complete type
@@ -359,6 +326,10 @@ blacklist:
     - com/sun/star/frame/XLayoutManagerListener.hpp
     - com/sun/star/ui/XContextMenuInterception.hpp
     - com/sun/star/util/XModeChangeListener.hpp
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/util/XCloseListener.hpp
+    - com/sun/star/util/XModifyListener.hpp
     chart2/source/controller/inc/ItemPropertyMap.hxx:
     # base class has to be a complete type
     - map

chart2/source/controller/accessibility/AccessibleBase.cxx

@@ -32,6 +32,7 @@
 #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 <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>

chart2/source/controller/accessibility/AccessibleChartElement.cxx

@@ -28,6 +28,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <vcl/svapp.hxx>
 #include <rtl/ustrbuf.hxx>

chart2/source/controller/accessibility/AccessibleChartShape.cxx

@@ -21,6 +21,7 @@
 #include <ObjectHierarchy.hxx>
 #include <ObjectIdentifier.hxx>
 
+#include <com/sun/star/awt/XWindow.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/AccessibleShape.hxx>

chart2/source/controller/accessibility/AccessibleChartView.cxx

@@ -30,6 +30,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 
 #include <rtl/ustring.hxx>
 #include <vcl/window.hxx>

chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx

@@ -56,6 +56,7 @@
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/propshlp.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::chart::wrapper;

chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx

@@ -55,6 +55,7 @@
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/chart/ChartSolidType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <LinePropertiesHelper.hxx>
 #include <FillProperties.hxx>

chart2/source/controller/chartapiwrapper/TitleWrapper.cxx

@@ -36,6 +36,7 @@
 
 #include <algorithm>
 #include <rtl/ustrbuf.hxx>
+#include <cppuhelper/propshlp.hxx>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::beans::Property;

chart2/source/controller/chartapiwrapper/TitleWrapper.hxx

@@ -25,6 +25,7 @@
 #include <TitleHelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
+#include <comphelper/interfacecontainer2.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>

chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx

@@ -20,6 +20,8 @@
 #include "WrappedAutomaticPositionProperties.hxx"
 #include <FastPropertyIdRanges.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <tools/diagnose_ex.h>
 

chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx

@@ -21,6 +21,7 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WRAPPEDAUTOMATICPOSITIONPROPERTIES_HXX
 
 #include <WrappedProperty.hxx>
+#include <com/sun/star/beans/Property.hpp>
 #include <vector>
 
 namespace chart

chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx

@@ -21,6 +21,7 @@
 #include <AxisHelper.hxx>
 #include <ChartModelHelper.hxx>
 #include <TitleHelper.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;

chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx

@@ -20,6 +20,8 @@
 #include "WrappedCharacterHeightProperty.hxx"
 #include <RelativeSizeHelper.hxx>
 #include "ReferenceSizePropertyProvider.hxx"
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
 #include <osl/diagnose.h>
 
 using namespace ::com::sun::star;

chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx

@@ -21,6 +21,7 @@
 #include <FastPropertyIdRanges.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;

chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx

@@ -33,6 +33,7 @@
 #include <com/sun/star/chart/ChartRegressionCurveType.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <utility>
 
 using namespace ::com::sun::star;

chart2/source/controller/dialogs/ObjectNameProvider.cxx

@@ -21,6 +21,7 @@
 #include <ResId.hxx>
 #include <strings.hrc>
 #include <AxisHelper.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <DataSeriesHelper.hxx>

chart2/source/controller/inc/AccessibleBase.hxx

@@ -30,12 +30,15 @@
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <rtl/ref.hxx>
+#include <tools/color.hxx>
 
 #include <map>
 #include <vector>
+#include <memory>
 
 #include <MutexContainer.hxx>
 
+namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
 namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
 namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
 namespace utl { class AccessibleStateSetHelper; }

chart2/source/controller/inc/ChartController.hxx

@@ -31,7 +31,11 @@
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/ui/XContextMenuInterception.hpp>
 #include <com/sun/star/util/XModeChangeListener.hpp>
+#include <com/sun/star/util/XCloseListener.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/frame/XLayoutManagerListener.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <memory>
 #include <set>
@@ -51,12 +55,8 @@ namespace com { namespace sun { namespace star { namespace frame { class XContro
 namespace com { namespace sun { namespace star { namespace frame { class XDispatch; } } } }
 namespace com { namespace sun { namespace star { namespace frame { class XLayoutManagerEventBroadcaster; } } } }
 namespace com { namespace sun { namespace star { namespace lang { class XInitialization; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class XServiceInfo; } } } }
 namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 namespace com { namespace sun { namespace star { namespace util { class XCloseable; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XCloseListener; } } } }
-namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } }
 namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
 
 

chart2/source/controller/inc/PositionAndSizeHelper.hxx

@@ -23,6 +23,7 @@
 #include <ObjectIdentifier.hxx>
 
 namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } }
 
 namespace chart
 {

chart2/source/controller/inc/TitleDialogData.hxx

@@ -20,8 +20,8 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TITLEDIALOGDATA_HXX
 
 #include <ReferenceSizeProvider.hxx>
-
 #include <memory>
+#include <com/sun/star/uno/Sequence.hxx>
 
 namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }

chart2/source/controller/inc/dlg_ObjectProperties.hxx

@@ -23,6 +23,7 @@
 #include <sfx2/tabdlg.hxx>
 
 namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+class Graphic;
 
 namespace chart
 {

chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx

@@ -33,6 +33,7 @@
 #include <svl/stritem.hxx>
 
 #include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/XFormattedString.hpp>
 #include <tools/diagnose_ex.h>
 

chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx

@@ -42,6 +42,7 @@
 #include <com/sun/star/chart2/FillBitmap.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;

chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx

@@ -31,6 +31,8 @@
 #include <AxisHelper.hxx>
 #include <chartview/ExplicitValueProvider.hxx>
 #include <DiagramHelper.hxx>
+#include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;

chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx

@@ -38,6 +38,7 @@
 #include <com/sun/star/chart2/DataPointLabel.hpp>
 #include <com/sun/star/chart2/XInternalDataProvider.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <tools/diagnose_ex.h>

chart2/source/controller/main/ChartController.cxx

@@ -26,6 +26,7 @@
 #include <servicenames.hxx>
 #include <ResId.hxx>
 #include <dlg_DataSource.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include "ControllerCommandDispatch.hxx"
 #include <strings.hrc>

chart2/source/controller/main/ChartController_Insert.cxx

@@ -28,6 +28,7 @@
 #include <dlg_ObjectProperties.hxx>
 
 #include <ChartWindow.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include <AxisHelper.hxx>
 #include <TitleHelper.hxx>
@@ -53,6 +54,8 @@
 #include <LegendHelper.hxx>
 
 #include <com/sun/star/chart2/XRegressionCurve.hpp>
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <svx/ActionDescriptionProvider.hxx>
 

chart2/source/controller/main/ChartController_Position.cxx

@@ -22,6 +22,7 @@
 #include <ChartWindow.hxx>
 #include <DrawViewWrapper.hxx>
 #include <PositionAndSizeHelper.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include "UndoGuard.hxx"
 #include <ObjectNameProvider.hxx>

chart2/source/controller/main/ChartController_Properties.cxx

@@ -54,6 +54,7 @@
 #include <RegressionCurveHelper.hxx>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/util/CloseVetoException.hpp>
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 
 #include <memory>
 

chart2/source/controller/main/ChartController_TextEdit.cxx

@@ -36,6 +36,7 @@
 #include <svx/dialogs.hrc>
 #include <vcl/svapp.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/chart2/XTitled.hpp>
 #include <svl/stritem.hxx>
 #include <editeng/fontitem.hxx>
 #include <memory>

chart2/source/controller/main/ChartController_Tools.cxx

@@ -19,6 +19,7 @@
 
 #include <ChartController.hxx>
 #include <ChartWindow.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include <TitleHelper.hxx>
 #include <ThreeDHelper.hxx>
@@ -50,6 +51,8 @@
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 
 #include <editeng/editview.hxx>
 #include <editeng/outliner.hxx>

chart2/source/controller/main/ChartController_Window.cxx

@@ -23,6 +23,7 @@
 #include <ChartWindow.hxx>
 #include <ResId.hxx>
 #include <CommonConverters.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <TitleHelper.hxx>
@@ -50,6 +51,7 @@
 #include <com/sun/star/chart2/RelativeSize.hpp>
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 
 #include <com/sun/star/awt/PopupMenuDirection.hpp>
 #include <com/sun/star/frame/DispatchHelper.hpp>
@@ -57,6 +59,7 @@
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/qa/XDumper.hpp>
 
 #include <comphelper/lok.hxx>
 #include <comphelper/propertysequence.hxx>

chart2/source/controller/main/ControllerCommandDispatch.cxx

@@ -30,6 +30,7 @@
 #include <RegressionCurveHelper.hxx>
 #include <DataSeriesHelper.hxx>
 #include <StatisticsHelper.hxx>
+#include <ReferenceSizeProvider.hxx>
 #include "ShapeController.hxx"
 
 #include <vcl/svapp.hxx>
@@ -41,6 +42,7 @@
 #include <com/sun/star/chart2/XChartType.hpp>
 #include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/chart2/XRegressionCurve.hpp>
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp>
 #include <com/sun/star/chart2/XDataProviderAccess.hpp>
 

chart2/source/controller/main/ElementSelector.cxx

@@ -34,6 +34,7 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 namespace chart
 {

chart2/source/controller/main/ObjectHierarchy.cxx

@@ -39,6 +39,7 @@
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 
 #include <com/sun/star/container/XIndexAccess.hpp>

chart2/source/controller/main/StatusBarCommandDispatch.cxx

@@ -20,7 +20,7 @@
 #include "StatusBarCommandDispatch.hxx"
 #include <ObjectNameProvider.hxx>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
-
+#include <com/sun/star/chart2/XChartDocument.hpp>
 
 using namespace ::com::sun::star;
 

chart2/source/controller/sidebar/ChartAreaPanel.cxx

@@ -14,6 +14,8 @@
 #include <PropertyHelper.hxx>
 
 #include <chartview/DrawModelWrapper.hxx>
+#include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
 
 #include <editeng/memberids.h>
 #include <svx/xfltrit.hxx>

chart2/source/controller/sidebar/ChartAxisPanel.cxx

@@ -20,6 +20,8 @@
 #include <sfx2/sidebar/ControlFactory.hxx>
 
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
+#include <com/sun/star/chart2/XCoordinateSystem.hpp>
+#include <com/sun/star/util/XModifyBroadcaster.hpp>
 
 #include "ChartAxisPanel.hxx"
 #include <ChartController.hxx>

chart2/source/controller/sidebar/ChartColorWrapper.cxx

@@ -10,6 +10,7 @@
 #include "ChartColorWrapper.hxx"
 
 #include <ChartController.hxx>
+#include <com/sun/star/chart2/XDiagram.hpp>
 
 #include <svx/tbcontrl.hxx>
 

chart2/source/controller/sidebar/ChartErrorBarPanel.cxx

@@ -21,6 +21,7 @@
 
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
+#include <com/sun/star/util/XModifyBroadcaster.hpp>
 
 #include "ChartErrorBarPanel.hxx"
 #include <ChartController.hxx>

chart2/source/controller/sidebar/ChartLinePanel.cxx

@@ -23,6 +23,8 @@
 #include <vcl/svapp.hxx>
 
 #include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <com/sun/star/chart2/XDiagram.hpp>
 
 namespace chart { namespace sidebar {
 

chart2/source/controller/sidebar/ChartSeriesPanel.cxx

@@ -24,9 +24,11 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
+#include <com/sun/star/chart2/XDataSeries.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 
 #include "ChartSeriesPanel.hxx"
 #include <ChartController.hxx>

chart2/source/controller/uitest/uiobject.cxx

@@ -14,6 +14,7 @@
 #include <ChartController.hxx>
 #include <ObjectHierarchy.hxx>
 #include <chartview/ExplicitValueProvider.hxx>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 
 #include <vcl/svapp.hxx>
 

chart2/source/inc/LabeledDataSequence.hxx

@@ -24,9 +24,10 @@
 
 #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/util/XCloneable.hpp>
+
-#include <com/sun/star/uno/XComponentContext.hpp>
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } }
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
+namespace com { namespace sun { namespace star { namespace util { class XCloneable; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XModifyListener; } } } }
 
 namespace chart
 {

chart2/source/inc/LegendHelper.hxx

@@ -19,13 +19,13 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_LEGENDHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_LEGENDHELPER_HXX
 
-#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/chart2/XLegend.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include "charttoolsdllapi.hxx"
 
-#include <ChartModel.hxx>
+namespace chart { class ChartModel; }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XLegend; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace chart
 {

chart2/source/inc/LinearRegressionCurveCalculator.hxx

@@ -19,7 +19,6 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_LINEARREGRESSIONCURVECALCULATOR_HXX
 #define INCLUDED_CHART2_SOURCE_INC_LINEARREGRESSIONCURVECALCULATOR_HXX
 
-#include "RegressionCurveCalculator.hxx"
 #include "PolynomialRegressionCurveCalculator.hxx"
 
 namespace chart

chart2/source/inc/MediaDescriptorHelper.hxx

@@ -20,13 +20,15 @@
 #define INCLUDED_CHART2_SOURCE_INC_MEDIADESCRIPTORHELPER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
 #include "charttoolsdllapi.hxx"
 
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+namespace com { namespace sun { namespace star { namespace io { class XStream; } } } }
+
 /*
 * This class helps to read and write the properties mentioned in the service description
 * com.sun.star.document.MediaDescriptor from and to a sequence of PropertyValues.

chart2/source/inc/ModifyListenerHelper.hxx

@@ -21,9 +21,7 @@
 
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/uno/XWeak.hpp>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/weakref.hxx>
 
 #include "MutexContainer.hxx"
 #include "charttoolsdllapi.hxx"
@@ -32,6 +30,9 @@
 #include <algorithm>
 #include <utility>
 
+namespace com { namespace sun { namespace star { namespace uno { class XWeak; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class WeakReference; } } } }
+
 namespace chart
 {
 namespace ModifyListenerHelper

chart2/source/inc/NumberFormatterWrapper.hxx

@@ -20,8 +20,12 @@
 #define INCLUDED_CHART2_SOURCE_INC_NUMBERFORMATTERWRAPPER_HXX
 
 #include "charttoolsdllapi.hxx"
-#include <svl/zforlist.hxx>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <tools/solar.h>
+#include <tools/date.hxx>
+
+class SvNumberFormatter;
+class Color;
 
 namespace chart
 {

chart2/source/inc/ObjectIdentifier.hxx

@@ -19,20 +19,22 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_OBJECTIDENTIFIER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_OBJECTIDENTIFIER_HXX
 
-#include <com/sun/star/chart2/XChartType.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include <com/sun/star/chart2/XCoordinateSystem.hpp>
-#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include "TitleHelper.hxx"
 #include "charttoolsdllapi.hxx"
-#include <ChartModel.hxx>
 
 #include <rtl/ustring.hxx>
-#include <com/sun/star/frame/XModel.hpp>
+
-#include <com/sun/star/beans/XPropertySet.hpp>
+namespace chart { class ChartModel; }
-#include <com/sun/star/awt/Point.hpp>
+namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } }
-#include <com/sun/star/drawing/XShape.hpp>
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XAxis; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
 
 namespace chart
 {

chart2/source/inc/PotentialRegressionCurveCalculator.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_CHART2_SOURCE_INC_POTENTIALREGRESSIONCURVECALCULATOR_HXX
 
 #include "RegressionCurveCalculator.hxx"
-#include "charttoolsdllapi.hxx"
 
 namespace chart
 {

chart2/source/inc/PropertyHelper.hxx

@@ -21,11 +21,12 @@
 
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include "charttoolsdllapi.hxx"
 
 #include <unordered_map>
 
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+
 namespace chart
 {
 

chart2/source/inc/RangeHighlighter.hxx

@@ -22,8 +22,7 @@
 #include "MutexContainer.hxx"
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/chart2/data/XRangeHighlighter.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
+#include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 
 namespace com { namespace sun { namespace star {
 namespace chart2 {
@@ -32,6 +31,9 @@ namespace chart2 {
     class XAxis;
 }}}}
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace view { class XSelectionSupplier; } } } }
+
 namespace chart
 {
 

chart2/source/inc/ReferenceSizeProvider.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_CHART2_SOURCE_INC_REFERENCESIZEPROVIDER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include "charttoolsdllapi.hxx"
 
@@ -28,6 +27,10 @@ namespace com { namespace sun { namespace star {
 namespace chart2 {
     class XTitle;
     class XTitled;
+    class XChartDocument;
+}
+namespace beans {
+    class XPropertySet;
 }
 }}}
 

chart2/source/inc/RegressionCurveCalculator.hxx

@@ -23,7 +23,9 @@
 #include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
+
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } }
 
 namespace chart
 {

chart2/source/inc/RegressionCurveHelper.hxx

@@ -19,19 +19,20 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_REGRESSIONCURVEHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_REGRESSIONCURVEHELPER_HXX
 
-#include <com/sun/star/chart2/XRegressionCurve.hpp>
-#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
-#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
-#include <com/sun/star/chart2/data/XDataSource.hpp>
-#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <svx/chrtitem.hxx>
 #include "charttoolsdllapi.hxx"
 
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurve; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveCalculator; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveContainer; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+
 namespace chart
 {
 

chart2/source/inc/RelativePositionHelper.hxx

@@ -21,12 +21,13 @@
 #define INCLUDED_CHART2_SOURCE_INC_RELATIVEPOSITIONHELPER_HXX
 
 #include <com/sun/star/chart2/RelativePosition.hpp>
-#include <com/sun/star/chart2/RelativeSize.hpp>
 #include <com/sun/star/drawing/Alignment.hpp>
 #include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/Size.hpp>
 #include "charttoolsdllapi.hxx"
 
+namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { struct RelativeSize; } } } }
+
 namespace chart
 {
 

chart2/source/inc/RelativeSizeHelper.hxx

@@ -19,10 +19,12 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_RELATIVESIZEHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_RELATIVESIZEHELPER_HXX
 
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include "charttoolsdllapi.hxx"
 
+namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+
 namespace chart
 {
 

chart2/source/inc/SceneProperties.hxx

@@ -22,10 +22,11 @@
 #include "PropertyHelper.hxx"
 #include "FastPropertyIdRanges.hxx"
 #include "charttoolsdllapi.hxx"
-#include <com/sun/star/beans/Property.hpp>
 
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } }
+
 namespace chart
 {
 

chart2/source/inc/StatisticsHelper.hxx

@@ -19,12 +19,18 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_STATISTICSHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_STATISTICSHELPER_HXX
 
-#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/chart2/data/XDataSource.hpp>
+#include <rtl/ustring.hxx>
-#include <com/sun/star/chart2/data/XDataProvider.hpp>
-#include <com/sun/star/chart2/XDataSeries.hpp>
 #include "charttoolsdllapi.hxx"
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataProvider; } } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSequence; } } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XDataSource; } } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { namespace data { class XLabeledDataSequence; } } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
 namespace chart
 {
 

chart2/source/inc/ThreeDHelper.hxx

@@ -20,10 +20,12 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_THREEDHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_THREEDHELPER_HXX
 
-#include <com/sun/star/chart2/XDiagram.hpp>
 #include <com/sun/star/drawing/CameraGeometry.hpp>
 #include "charttoolsdllapi.hxx"
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
+
 namespace chart
 {
 

chart2/source/inc/TitleHelper.hxx

@@ -19,14 +19,15 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_TITLEHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_INC_TITLEHELPER_HXX
 
-#include "ReferenceSizeProvider.hxx"
+#include <com/sun/star/uno/Reference.h>
+#include <rtl/ustring.hxx>
 #include "charttoolsdllapi.hxx"
-#include <com/sun/star/chart2/XTitled.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
 
-#include <ChartModel.hxx>
+namespace chart { class ChartModel; }
+namespace chart { class ReferenceSizeProvider; }
+namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace chart
 {

chart2/source/inc/UncachedDataSequence.hxx

@@ -28,8 +28,6 @@
 
 // interfaces and types
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/chart2/XInternalDataProvider.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>
@@ -38,6 +36,9 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XInternalDataProvider; } } } }
+
 namespace chart
 {
 

chart2/source/inc/UserDefinedProperties.hxx

@@ -21,10 +21,11 @@
 
 #include "FastPropertyIdRanges.hxx"
 #include "charttoolsdllapi.hxx"
-#include <com/sun/star/beans/Property.hpp>
 
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace beans { struct Property; } } } }
+
 namespace chart
 {
 

chart2/source/inc/WrappedProperty.hxx

@@ -19,13 +19,18 @@
 #ifndef INCLUDED_CHART2_SOURCE_INC_WRAPPEDPROPERTY_HXX
 #define INCLUDED_CHART2_SOURCE_INC_WRAPPEDPROPERTY_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <rtl/ustring.hxx>
 #include "charttoolsdllapi.hxx"
 
 #include <map>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertyState; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+
 namespace chart
 {
 

chart2/source/inc/WrappedPropertySet.hxx

@@ -26,13 +26,14 @@
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/beans/Property.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/propshlp.hxx>
 
 #include <memory>
 #include <vector>
 
+namespace cppu { class IPropertyArrayHelper; }
+namespace cppu { class OPropertyArrayHelper; }
+
 namespace chart
 {
 

chart2/source/model/main/Diagram.cxx

@@ -40,6 +40,7 @@
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/drawing/CameraGeometry.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
 #include <cppuhelper/supportsservice.hxx>

chart2/source/model/template/AreaChartTypeTemplate.cxx

@@ -25,6 +25,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>

chart2/source/model/template/BarChartTypeTemplate.cxx

@@ -26,6 +26,7 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/chart2/DataPointGeometry3D.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>

chart2/source/model/template/BubbleChartTypeTemplate.cxx

@@ -28,6 +28,7 @@
 #include <PropertyHelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>

chart2/source/model/template/ColumnLineChartTypeTemplate.cxx

@@ -30,6 +30,7 @@
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>

chart2/source/model/template/LineChartTypeTemplate.cxx

@@ -30,6 +30,7 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>

chart2/source/model/template/PieChartTypeTemplate.cxx

@@ -33,6 +33,7 @@
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <rtl/math.hxx>

chart2/source/model/template/ScatterChartTypeTemplate.cxx

@@ -32,6 +32,7 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>

chart2/source/model/template/StockChartTypeTemplate.cxx

@@ -32,6 +32,7 @@
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <PropertyHelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>

chart2/source/tools/DataSource.cxx

@@ -20,6 +20,7 @@
 #include <DataSource.hxx>
 #include <LabeledDataSequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;

chart2/source/tools/DiagramHelper.cxx

@@ -24,6 +24,7 @@
 #include <AxisHelper.hxx>
 #include <ContainerHelper.hxx>
 #include <ChartTypeHelper.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include <CommonConverters.hxx>
 #include <ExplicitCategoriesProvider.hxx>

chart2/source/tools/LabeledDataSequence.cxx

@@ -21,6 +21,7 @@
 #include <ModifyListenerHelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/diagnose_ex.h>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 using namespace ::com::sun::star;
 

chart2/source/tools/LegendHelper.cxx

@@ -18,12 +18,14 @@
  */
 
 #include <LegendHelper.hxx>
+#include <ChartModel.hxx>
 #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>
 
 using namespace ::com::sun::star;

chart2/source/tools/MediaDescriptorHelper.cxx

@@ -18,6 +18,10 @@
  */
 
 #include <MediaDescriptorHelper.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Any.hxx>
 
 using namespace ::com::sun::star;
 

chart2/source/tools/ObjectIdentifier.cxx

@@ -23,6 +23,7 @@
 
 #include <ObjectIdentifier.hxx>
 #include <TitleHelper.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include <AxisHelper.hxx>
 #include <servicenames_charttypes.hxx>
@@ -36,6 +37,8 @@
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
 
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>

chart2/source/tools/PropertyHelper.cxx

@@ -21,6 +21,7 @@
 #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>
 #include <tools/diagnose_ex.h>
 

chart2/source/tools/RangeHighlighter.cxx

@@ -26,9 +26,13 @@
 
 #include <com/sun/star/chart2/XDataSeries.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>
 #include <comphelper/sequence.hxx>
 #include <tools/diagnose_ex.h>
+#include <tools/color.hxx>
 
 using namespace ::com::sun::star;
 

chart2/source/tools/RegressionCurveHelper.cxx

@@ -35,6 +35,8 @@
 #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>
 #include <comphelper/property.hxx>
 

chart2/source/tools/RegressionCurveModel.cxx

@@ -27,6 +27,7 @@
 #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>

chart2/source/tools/RelativePositionHelper.cxx

@@ -18,6 +18,8 @@
  */
 
 #include <RelativePositionHelper.hxx>
+#include <com/sun/star/chart2/RelativeSize.hpp>
+#include <com/sun/star/awt/Size.hpp>
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>
 

chart2/source/tools/RelativeSizeHelper.cxx

@@ -18,6 +18,8 @@
  */
 
 #include <RelativeSizeHelper.hxx>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/diagnose_ex.h>
 
 #include <vector>

chart2/source/tools/StatisticsHelper.cxx

@@ -28,6 +28,7 @@
 
 #include <com/sun/star/chart2/data/LabeledDataSequence.hpp>
 #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
+#include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
 #include <tools/diagnose_ex.h>

chart2/source/tools/TitleHelper.cxx

@@ -18,9 +18,11 @@
  */
 
 #include <TitleHelper.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include <AxisHelper.hxx>
 #include <DiagramHelper.hxx>
+#include <ReferenceSizeProvider.hxx>
 #include <com/sun/star/chart2/FormattedString.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <rtl/ustrbuf.hxx>

chart2/source/tools/UncachedDataSequence.cxx

@@ -25,6 +25,7 @@
 #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>
 

chart2/source/tools/UserDefinedProperties.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <UserDefinedProperties.hxx>
+#include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 

chart2/source/tools/WrappedDefaultProperty.cxx

@@ -20,6 +20,9 @@
 #include <WrappedDefaultProperty.hxx>
 #include <tools/diagnose_ex.h>
 
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
+
 using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;

chart2/source/tools/WrappedProperty.cxx

@@ -19,6 +19,8 @@
 
 #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>
 
 using namespace ::com::sun::star;

chart2/source/tools/WrappedPropertySet.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <WrappedPropertySet.hxx>
+#include <cppuhelper/propshlp.hxx>
 
 #include <tools/solar.h>
 #include <tools/diagnose_ex.h>

chart2/source/view/axes/VPolarGrid.cxx

@@ -27,6 +27,8 @@
 #include "Tickmarks_Equidistant.hxx"
 #include <com/sun/star/drawing/LineStyle.hpp>
 
+#include <osl/diagnose.h>
+
 #include <vector>
 
 namespace chart

chart2/source/view/charttypes/AreaChart.cxx

@@ -39,11 +39,13 @@
 #include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/drawing/DoubleSequence.hpp>
 #include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 namespace chart
 {

chart2/source/view/charttypes/BubbleChart.cxx

@@ -33,10 +33,12 @@
 #include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
 #include <com/sun/star/drawing/NormalsKind.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 namespace chart
 {

chart2/source/view/charttypes/CandleStickChart.cxx

@@ -28,9 +28,11 @@
 #include <FormattedStringHelper.hxx>
 #include <DataSeriesHelper.hxx>
 #include <DateHelper.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <rtl/math.hxx>
 #include <editeng/unoprnms.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 namespace chart
 {

chart2/source/view/charttypes/NetChart.cxx

@@ -37,6 +37,7 @@
 
 #include <editeng/unoprnms.hxx>
 #include <rtl/math.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/drawing/DoubleSequence.hpp>
 #include <com/sun/star/drawing/NormalsKind.hpp>

chart2/source/view/charttypes/PieChart.cxx

@@ -31,8 +31,11 @@
 #include <com/sun/star/chart2/XColorScheme.hpp>
 
 #include <com/sun/star/container/XChild.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <tools/helpers.hxx>
 
 #include <memory>