tdf#42949 Fix IWYU warnings in chart2/source/view/{axes,charttypes,main}/*hxx

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

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

30 files changed, 141 insertions, 36 deletions

diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index dddaf9547596..f3899404d2c8 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -294,6 +294,63 @@ blacklist:
     chart2/source/view/inc/VPolarTransformation.hxx:
     # base class has to be a complete type
     - com/sun/star/chart2/XTransformation.hpp
+    chart2/source/view/axes/DateScaling.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
+    # 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/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/controller/inc/AccessibleTextHelper.hxx:
     # base class has to be a complete type
     - com/sun/star/accessibility/XAccessibleContext.hpp
diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx
index acbb5409e9ef..2c2f34dd6330 100644
--- a/chart2/source/view/axes/DateScaling.hxx
+++ b/chart2/source/view/axes/DateScaling.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/chart2/XScaling.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <tools/date.hxx>
 
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 6e99df1b9c6a..e6f2d4d0192f 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -22,7 +22,9 @@
 #include <DateHelper.hxx>
 #include "DateScaling.hxx"
 #include <AxisHelper.hxx>
+#include "VAxisProperties.hxx"
 #include <com/sun/star/chart/TimeUnit.hpp>
+#include <com/sun/star/chart2/AxisType.hpp>
 
 #include <rtl/math.hxx>
 #include <limits>
diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx
index 611b0393723f..2fa86b6510e2 100644
--- a/chart2/source/view/axes/Tickmarks.cxx
+++ b/chart2/source/view/axes/Tickmarks.cxx
@@ -21,8 +21,10 @@
 #include "Tickmarks_Equidistant.hxx"
 #include "Tickmarks_Dates.hxx"
 #include <ViewDefines.hxx>
+#include "VAxisProperties.hxx"
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>
+#include <com/sun/star/chart2/AxisType.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::rtl::math;
diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx
index f08d2d9aff66..b0cb774dbf5d 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -19,16 +19,17 @@
 #ifndef INCLUDED_CHART2_SOURCE_VIEW_AXES_TICKMARKS_HXX
 #define INCLUDED_CHART2_SOURCE_VIEW_AXES_TICKMARKS_HXX
 
-#include "TickmarkProperties.hxx"
-#include "VAxisProperties.hxx"
 #include <chartview/ExplicitScaleValues.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/uno/Sequence.h>
 
 #include <vector>
 
+namespace chart { struct AxisProperties; }
+namespace chart { struct TickmarkProperties; }
+namespace com { namespace sun { namespace star { namespace chart2 { class XScaling; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+
 namespace chart {
 
 struct TickInfo
diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index 4fcd36771b5b..1566ca41da8d 100644
--- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -21,6 +21,7 @@
 #include <ViewDefines.hxx>
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>
+#include <float.h>
 
 #include <limits>
 
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index 6a2d05ce5f64..db7d798bfe9b 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -20,7 +20,12 @@
 #include "VAxisBase.hxx"
 #include <ShapeFactory.hxx>
 #include <CommonConverters.hxx>
+#include <ExplicitCategoriesProvider.hxx>
 #include "Tickmarks.hxx"
+#include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/chart2/AxisType.hpp>
+#include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <osl/diagnose.h>
 
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index 82baf6edddc8..488583c10c2d 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -22,7 +22,8 @@
 #include "VAxisOrGridBase.hxx"
 #include "VAxisProperties.hxx"
 #include "Tickmarks.hxx"
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx
index 26cca1626bec..705f298f2ea5 100644
--- a/chart2/source/view/axes/VAxisOrGridBase.hxx
+++ b/chart2/source/view/axes/VAxisOrGridBase.hxx
@@ -23,11 +23,10 @@
 #include <ThreeDHelper.hxx>
 #include <chartview/ExplicitScaleValues.hxx>
 
-#include <com/sun/star/drawing/HomogenMatrix.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 
+namespace com { namespace sun { namespace star { namespace drawing { struct HomogenMatrix; } } } }
+
 namespace chart
 {
 
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 8597544e169b..03b392c2a676 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -23,11 +23,13 @@
 #include <AxisHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <ChartModelHelper.hxx>
+#include <ExplicitCategoriesProvider.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
+#include <com/sun/star/chart2/AxisType.hpp>
 
 #include <sal/log.hxx>
 
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 9a10c94f4719..10116ee22f26 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -20,25 +20,23 @@
 #define INCLUDED_CHART2_SOURCE_VIEW_AXES_VAXISPROPERTIES_HXX
 
 #include "TickmarkProperties.hxx"
-#include <PlottingPositionHelper.hxx>
 #include <LabelAlignment.hxx>
-#include <ExplicitCategoriesProvider.hxx>
 
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
 #include <com/sun/star/chart/ChartAxisPosition.hpp>
-#include <com/sun/star/chart2/XAxis.hpp>
-#include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/uno/Any.hxx>
 
 #include <vector>
 #include <boost/optional.hpp>
 
+namespace chart { class ExplicitCategoriesProvider; }
+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 { namespace data { class XTextualDataSequence; } } } } }
+
 namespace chart
 {
 
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 1ef31cae6664..13cd0b7dba02 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -29,6 +29,7 @@
 #include <BaseGFXHelper.hxx>
 #include <AxisHelper.hxx>
 #include "Tickmarks_Equidistant.hxx"
+#include <ExplicitCategoriesProvider.hxx>
 
 #include <rtl/math.hxx>
 #include <tools/color.hxx>
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index d0ea0a42e857..ec2e62baa282 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -26,6 +26,8 @@
 #include <cppuhelper/implbase.hxx>
 #include <ChartModel.hxx>
 #include <com/sun/star/chart2/XCoordinateSystem.hpp>
+#include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
+#include <com/sun/star/chart2/AxisType.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 2ce8066b014f..a9df579ac353 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -24,9 +24,11 @@
 #include <ObjectIdentifier.hxx>
 #include <CommonConverters.hxx>
 #include <AxisHelper.hxx>
+#include <VLineProperties.hxx>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/chart2/XTransformation.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx
index de16ee1b8a90..d655e0e87142 100644
--- a/chart2/source/view/axes/VCartesianGrid.hxx
+++ b/chart2/source/view/axes/VCartesianGrid.hxx
@@ -20,7 +20,9 @@
 #define INCLUDED_CHART2_SOURCE_VIEW_AXES_VCARTESIANGRID_HXX
 
 #include "VAxisOrGridBase.hxx"
-#include <VLineProperties.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
+
+namespace chart { struct VLineProperties; }
 
 namespace chart
 {
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 3bfb7d6b5221..2c171d8bb11d 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -24,6 +24,7 @@
 #include <ShapeFactory.hxx>
 #include <NumberFormatterWrapper.hxx>
 #include <PolarLabelPositionHelper.hxx>
+#include <PlottingPositionHelper.hxx>
 #include <tools/color.hxx>
 
 #include <memory>
diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx
index 4416394cf105..7ac5f55cc13f 100644
--- a/chart2/source/view/axes/VPolarAxis.cxx
+++ b/chart2/source/view/axes/VPolarAxis.cxx
@@ -22,6 +22,7 @@
 #include "VPolarRadiusAxis.hxx"
 #include "Tickmarks.hxx"
 #include <ShapeFactory.hxx>
+#include <PlottingPositionHelper.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 007247c387fa..b0e3f2c86faa 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -24,8 +24,10 @@
 #include <ShapeFactory.hxx>
 #include <ObjectIdentifier.hxx>
 #include <CommonConverters.hxx>
+#include <VLineProperties.hxx>
 #include "Tickmarks_Equidistant.hxx"
 #include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <osl/diagnose.h>
 
diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx
index 8f3270853062..29fa8b27065a 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -21,10 +21,11 @@
 
 #include "VAxisOrGridBase.hxx"
 #include "Tickmarks.hxx"
-#include <VLineProperties.hxx>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <memory>
 
+namespace chart { struct VLineProperties; }
+
 namespace chart
 {
 
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index e7c3e4b19a7d..a176adaaf44a 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -22,8 +22,8 @@
 
 #include <memory>
 #include <VSeriesPlotter.hxx>
-#include <basegfx/vector/b2dvector.hxx>
-#include <basegfx/range/b2irectangle.hxx>
+#include <basegfx/vector/b2ivector.hxx>
+#include <com/sun/star/awt/Point.hpp>
 
 namespace chart
 {
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index 4ff16718f242..d0b2389c550f 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -20,6 +20,7 @@
 #include "Splines.hxx"
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>
+#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
 
 #include <vector>
 #include <algorithm>
diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx
index 4966169e2933..91fbfd7a4a2a 100644
--- a/chart2/source/view/charttypes/Splines.hxx
+++ b/chart2/source/view/charttypes/Splines.hxx
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_CHART2_SOURCE_VIEW_CHARTTYPES_SPLINES_HXX
 #define INCLUDED_CHART2_SOURCE_VIEW_CHARTTYPES_SPLINES_HXX
 
-#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx
index 82ebb0cc73e6..b311b3050aa7 100644
--- a/chart2/source/view/main/ChartItemPool.hxx
+++ b/chart2/source/view/main/ChartItemPool.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CHART2_SOURCE_VIEW_MAIN_CHARTITEMPOOL_HXX
 #define INCLUDED_CHART2_SOURCE_VIEW_MAIN_CHARTITEMPOOL_HXX
 
-#include <svl/poolitem.hxx>
+#include <tools/mapunit.hxx>
 #include <svl/itempool.hxx>
 #include <memory>
 
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 27eea131cae8..5bd8dc7b8f04 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -34,6 +34,7 @@
 #include <LegendHelper.hxx>
 #include "VLegend.hxx"
 #include <PropertyMapper.hxx>
+#include <ChartModel.hxx>
 #include <ChartModelHelper.hxx>
 #include <ChartTypeHelper.hxx>
 #include <ScaleAutomatism.hxx>
diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx
index c9c6255974b0..7dde0f25369a 100644
--- a/chart2/source/view/main/VButton.cxx
+++ b/chart2/source/view/main/VButton.cxx
@@ -12,9 +12,12 @@
 #include <ShapeFactory.hxx>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <memory>
 
diff --git a/chart2/source/view/main/VButton.hxx b/chart2/source/view/main/VButton.hxx
index 4d87b3db7342..d2616bb818c2 100644
--- a/chart2/source/view/main/VButton.hxx
+++ b/chart2/source/view/main/VButton.hxx
@@ -10,10 +10,15 @@
 #ifndef INCLUDED_CHART2_SOURCE_VIEW_MAIN_VBUTTON_HXX
 #define INCLUDED_CHART2_SOURCE_VIEW_MAIN_VBUTTON_HXX
 
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/color.hxx>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index bb1b0621d931..7b5565a4cb3b 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -20,6 +20,7 @@
 #include "VLegend.hxx"
 #include "VButton.hxx"
 #include <PropertyMapper.hxx>
+#include <ChartModel.hxx>
 #include <CommonConverters.hxx>
 #include <ObjectIdentifier.hxx>
 #include <RelativePositionHelper.hxx>
@@ -33,6 +34,7 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/drawing/LineJoint.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx
index cc430dfe28d8..9e58c40c601f 100644
--- a/chart2/source/view/main/VLegend.hxx
+++ b/chart2/source/view/main/VLegend.hxx
@@ -19,16 +19,19 @@
 #ifndef INCLUDED_CHART2_SOURCE_VIEW_MAIN_VLEGEND_HXX
 #define INCLUDED_CHART2_SOURCE_VIEW_MAIN_VLEGEND_HXX
 
-#include <com/sun/star/chart2/XLegend.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
-
-#include <ChartModel.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <vector>
 
+namespace chart { class ChartModel; }
+namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } }
+namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XLegend; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace chart
 {
 
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index a746c2a61427..1ccbe29939a3 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -22,6 +22,8 @@
 #include <PropertyMapper.hxx>
 #include <ShapeFactory.hxx>
 #include <com/sun/star/chart2/XFormattedString.hpp>
+#include <com/sun/star/chart2/XTitle.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
 #include <rtl/math.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx
index 7ccbe7a60ff1..55a6f5e0de8b 100644
--- a/chart2/source/view/main/VTitle.hxx
+++ b/chart2/source/view/main/VTitle.hxx
@@ -19,9 +19,16 @@
 #ifndef INCLUDED_CHART2_SOURCE_VIEW_MAIN_VTITLE_HXX
 #define INCLUDED_CHART2_SOURCE_VIEW_MAIN_VTITLE_HXX
 
-#include <com/sun/star/chart2/XTitle.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XTitle; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
 
 namespace chart
 {