tdf#42949 Fix IWYU warnings in chart2/source/controller/inc/[I-V]*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
A bit of fallout management as well.

Change-Id: Ie058eac6608d7c6dc2cfb29f1081b6684a4412ac
Reviewed-on: https://gerrit.libreoffice.org/55541
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>

38 files changed, 90 insertions, 62 deletions

diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml
index 1fcf186531a9..17a1f840b677 100644
--- a/chart2/IwyuFilter_chart2.yaml
+++ b/chart2/IwyuFilter_chart2.yaml
@@ -317,3 +317,9 @@ blacklist:
     - com/sun/star/frame/XLayoutManagerListener.hpp
     - com/sun/star/ui/XContextMenuInterception.hpp
     - com/sun/star/util/XModeChangeListener.hpp
+    chart2/source/controller/inc/ItemPropertyMap.hxx:
+    # base class has to be a complete type
+    - map
+    chart2/source/controller/inc/RangeSelectionHelper.hxx:
+    # base class has to be a complete type
+    - com/sun/star/uno/Sequence.h
diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index b3c12418387c..639fd1afe55c 100644
--- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <TimerTriggeredControllerLock.hxx>
+#include <ControllerLockGuard.hxx>
 
 #include <vcl/edit.hxx>
 
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 6600108b8bf6..6615fe1a73e9 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -22,9 +22,11 @@
 #include <RangeSelectionHelper.hxx>
 #include <TabPageNotifiable.hxx>
 #include <helpids.h>
+#include <chartview/ChartSfxItemIds.hxx>
 
 #include <rtl/math.hxx>
 #include <vcl/dialog.hxx>
+#include <vcl/layout.hxx>
 #include <svl/stritem.hxx>
 
 #define CHART_LB_FUNCTION_STD_ERROR     0
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 4c179554ab57..cca59f0b639b 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -31,6 +31,7 @@
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <tools/diagnose_ex.h>
+#include <vcl/builder.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index 7ce9839aa321..2ba28666fcbf 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -20,6 +20,7 @@
 #include <res_Titles.hxx>
 #include <TitleDialogData.hxx>
 #include <svtools/controldims.hxx>
+#include <vcl/builder.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index c99e654dd2fd..4ee5f75f6284 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -20,6 +20,7 @@
 #include "tp_3D_SceneIllumination.hxx"
 #include <bitmaps.hlst>
 #include <CommonConverters.hxx>
+#include <ControllerLockGuard.hxx>
 
 #include <svx/colorbox.hxx>
 #include <svx/dialogs.hrc>
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index b7bba4a1bfb9..4af744d6477f 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -41,6 +41,7 @@
 #include <svx/svdobj.hxx>
 #include <vcl/virdev.hxx>
 #include <svx/svdview.hxx>
+#include <svx/svdpage.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index ea7b675f33fa..58b8cc303418 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -21,6 +21,7 @@
 
 #include "ItemConverter.hxx"
 #include "GraphicPropertyItemConverter.hxx"
+#include <com/sun/star/uno/Sequence.h>
 
 #include <tools/color.hxx>
 
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 9c2609897230..b8fa2614d6bf 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -21,10 +21,12 @@
 
 #include <unotools/eventlisteneradapter.hxx>
 #include <svl/itemset.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <utility>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
+
 namespace chart { namespace wrapper {
 
 
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index 231f857f16e6..a466a0886fde 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -20,11 +20,12 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_LEGENDITEMCONVERTER_HXX
 
 #include "ItemConverter.hxx"
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+
 class SdrModel;
 
 namespace chart
diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx
index 8969a106ce93..05e435c3830f 100644
--- a/chart2/source/controller/inc/MultipleChartConverters.hxx
+++ b/chart2/source/controller/inc/MultipleChartConverters.hxx
@@ -20,9 +20,10 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_MULTIPLECHARTCONVERTERS_HXX
 
 #include "MultipleItemConverter.hxx"
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
 
 class SdrModel;
 
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx
index 76a694dac9f0..10b95b951949 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -21,9 +21,8 @@
 
 #include <ObjectIdentifier.hxx>
 
-#include <rtl/ustring.hxx>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/awt/KeyEvent.hpp>
+namespace com { namespace sun { namespace star { namespace awt { struct KeyEvent; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
 
 #include <memory>
 #include <vector>
diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx
index 1c01cccbd335..3df39335cd80 100644
--- a/chart2/source/controller/inc/ObjectNameProvider.hxx
+++ b/chart2/source/controller/inc/ObjectNameProvider.hxx
@@ -22,8 +22,9 @@
 
 #include <ObjectIdentifier.hxx>
 #include <TitleHelper.hxx>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
+
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
index 8f98280f5ad5..f1236e68b851 100644
--- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx
+++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
@@ -21,7 +21,8 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_POSITIONANDSIZEHELPER_HXX
 
 #include <ObjectIdentifier.hxx>
-#include <com/sun/star/frame/XModel.hpp>
+
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx
index 0b2ab7153e52..e1f69777b6c9 100644
--- a/chart2/source/controller/inc/RangeSelectionHelper.hxx
+++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx
@@ -19,14 +19,17 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RANGESELECTIONHELPER_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RANGESELECTIONHELPER_HXX
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Sequence.h>
+#include <rtl/ustring.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
 
 namespace com { namespace sun { namespace star {
     namespace sheet{
         class XRangeSelection;
         class XRangeSelectionListener;
-        class XCellRangesAccess;
     }
 }}}
 
diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx
index 1874f0c49168..47ae70a881a6 100644
--- a/chart2/source/controller/inc/RangeSelectionListener.hxx
+++ b/chart2/source/controller/inc/RangeSelectionListener.hxx
@@ -21,8 +21,9 @@
 
 #include <ControllerLockGuard.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/sheet/XRangeSelectionListener.hpp>
+
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace sheet { class XRangeSelectionListener; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index c61489a45ee5..4b4585e1db61 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -21,11 +21,8 @@
 
 #include "ItemConverter.hxx"
 
-#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
-#include <memory>
-#include <vector>
+namespace com { namespace sun { namespace star { namespace chart2 { class XRegressionCurveContainer; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
 
 class SdrModel;
 
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index d2a80c933663..25a540ff5aef 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -20,14 +20,13 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_REGRESSIONEQUATIONITEMCONVERTER_HXX
 
 #include "ItemConverter.hxx"
-#include "GraphicPropertyItemConverter.hxx"
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/Size.hpp>
 
 #include <vector>
 
+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 lang { class XMultiServiceFactory; } } } }
+
 class SdrModel;
 
 namespace chart { namespace wrapper {
diff --git a/chart2/source/controller/inc/SelectionHelper.hxx b/chart2/source/controller/inc/SelectionHelper.hxx
index a3002dda8a7f..b9fe3fc20377 100644
--- a/chart2/source/controller/inc/SelectionHelper.hxx
+++ b/chart2/source/controller/inc/SelectionHelper.hxx
@@ -23,14 +23,12 @@
 #include <ObjectIdentifier.hxx>
 
 class SdrObject;
-#include <svx/svdtypes.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
+
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
 
 namespace chart
 {
 
-class ObjectIdentifier;
-
 class Selection
 {
 public: //methods
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index c04b626a026f..2181d9165eb9 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -20,10 +20,11 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_SERIESOPTIONSITEMCONVERTER_HXX
 
 #include "ItemConverter.hxx"
+#include <com/sun/star/uno/Sequence.h>
 
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/chart2/XCoordinateSystem.hpp>
+namespace com { namespace sun { namespace star { namespace chart2 { class XCoordinateSystem; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx
index 26bfd9caa281..40fe5e2d7804 100644
--- a/chart2/source/controller/inc/StatisticsItemConverter.hxx
+++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx
@@ -19,13 +19,9 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_STATISTICSITEMCONVERTER_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_STATISTICSITEMCONVERTER_HXX
 
-#include <com/sun/star/frame/XModel.hpp>
-
 #include "ItemConverter.hxx"
-#include "GraphicPropertyItemConverter.hxx"
-#include <NumberFormatterWrapper.hxx>
 
-#include <vector>
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx
index 6ad7335d989e..01e7b490d5a3 100644
--- a/chart2/source/controller/inc/TabPageNotifiable.hxx
+++ b/chart2/source/controller/inc/TabPageNotifiable.hxx
@@ -19,14 +19,13 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TABPAGENOTIFIABLE_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TABPAGENOTIFIABLE_HXX
 
-#include <vcl/tabpage.hxx>
-#include <tools/color.hxx>
-
 // color to use as foreground for an invalid range
 #define RANGE_SELECTION_INVALID_RANGE_FOREGROUND_COLOR COL_WHITE
 // color to use as background for an invalid range
 #define RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR Color(0xff6563)
 
+class TabPage;
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx b/chart2/source/controller/inc/TextLabelItemConverter.hxx
index f1e227691c14..3ca0ca7d7e69 100644
--- a/chart2/source/controller/inc/TextLabelItemConverter.hxx
+++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx
@@ -21,12 +21,14 @@
 
 #include "ItemConverter.hxx"
 
-#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/uno/Sequence.h>
 
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+
 namespace chart { namespace wrapper {
 
 class TextLabelItemConverter : public ItemConverter
diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
index d368fce0cd3f..932700653fd5 100644
--- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
+++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx
@@ -19,12 +19,14 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TIMERTRIGGEREDCONTROLLERLOCK_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TIMERTRIGGEREDCONTROLLERLOCK_HXX
 
-#include <ControllerLockGuard.hxx>
+#include <com/sun/star/uno/Reference.h>
 #include <vcl/timer.hxx>
-#include <com/sun/star/frame/XModel.hpp>
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace chart { class ControllerLockGuardUNO; }
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx
index 17d3d21c73d5..634ed5b76138 100644
--- a/chart2/source/controller/inc/TitleDialogData.hxx
+++ b/chart2/source/controller/inc/TitleDialogData.hxx
@@ -20,11 +20,12 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TITLEDIALOGDATA_HXX
 
 #include <ReferenceSizeProvider.hxx>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx
index 7d28217f79fd..b49a80269680 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -20,11 +20,12 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_TITLEITEMCONVERTER_HXX
 
 #include "ItemConverter.hxx"
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace awt { struct Size; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+
 class SdrModel;
 
 namespace chart { namespace wrapper {
diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx
index be224d2328b8..07da949907af 100644
--- a/chart2/source/controller/inc/ViewElementListProvider.hxx
+++ b/chart2/source/controller/inc/ViewElementListProvider.hxx
@@ -21,9 +21,10 @@
 
 #include <memory>
 #include <svx/xtable.hxx>
-#include <svx/svdpage.hxx>
 
 class FontList;
+class SdrObjList;
+class SfxItemSet;
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index a2688c288da4..7df3664bd27e 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -21,18 +21,15 @@
 
 #include <memory>
 #include <vcl/button.hxx>
-#include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
+#include <vcl/layout.hxx>
 #include <svl/itemset.hxx>
 #include <svx/chrtitem.hxx>
-#include <chartview/ChartSfxItemIds.hxx>
 #include "RangeSelectionListener.hxx"
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
-
-class Dialog;
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
index bed2a64cfc8d..928a94f544b0 100644
--- a/chart2/source/controller/inc/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx
@@ -19,12 +19,13 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_LEGENDPOSITION_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_LEGENDPOSITION_HXX
 
-#include <vcl/builder.hxx>
 #include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
 #include <svl/itemset.hxx>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+class VclBuilderContainer;
+
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/inc/res_Titles.hxx b/chart2/source/controller/inc/res_Titles.hxx
index 1902a5773859..a5b93310e36d 100644
--- a/chart2/source/controller/inc/res_Titles.hxx
+++ b/chart2/source/controller/inc/res_Titles.hxx
@@ -20,9 +20,11 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_TITLES_HXX
 
 #include "TitleDialogData.hxx"
-#include <vcl/builder.hxx>
 #include <vcl/fixed.hxx>
 
+class VclBuilderContainer;
+class Edit;
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index d9642c3df9a7..9574f3ee5d41 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -34,6 +34,7 @@
 #include <svx/chrtitem.hxx>
 #include <com/sun/star/chart2/DataPointLabel.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <svx/xflclit.hxx>
 #include <svl/intitem.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 198383cc2773..05a516b085e9 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -38,6 +38,7 @@
 #include <svl/eitem.hxx>
 #include <svx/xgrscit.hxx>
 #include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/FillBitmap.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index cf1a57b37a19..299bd30eee71 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -19,6 +19,7 @@
 
 #include <ItemConverter.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/diagnose.h>
 #include <svl/itempool.hxx>
 #include <svl/itemprop.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index b9d13e0adc6d..888b2c4ea476 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/chart2/XLegend.hpp>
 #include <com/sun/star/chart2/LegendPosition.hpp>
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index f2abc74ad764..6dbdece70632 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -24,6 +24,7 @@
 #include <CharacterPropertyItemConverter.hxx>
 #include <MultipleItemConverter.hxx>
 #include <unonames.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <svl/intitem.hxx>
 #include <rtl/math.hxx>
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 7d43b1016076..dabbeb5f45d3 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -27,6 +27,7 @@
 #include <rtl/math.hxx>
 
 #include <com/sun/star/chart2/XTitled.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <functional>
 #include <algorithm>
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index a1510a7db984..6713633a7b1d 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -33,6 +33,7 @@
 #include <TitleHelper.hxx>
 #include <DiagramHelper.hxx>
 #include <chartview/DrawModelWrapper.hxx>
+#include <chartview/ChartSfxItemIds.hxx>
 #include <NumberFormatterWrapper.hxx>
 #include <ViewElementListProvider.hxx>
 #include <MultipleChartConverters.hxx>
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index e157064a7ab7..3b4b777c3855 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -20,6 +20,7 @@
 #include <ChartController.hxx>
 #include <ChartWindow.hxx>
 #include <chartview/DrawModelWrapper.hxx>
+#include <chartview/ChartSfxItemIds.hxx>
 #include <ObjectIdentifier.hxx>
 #include <chartview/ExplicitValueProvider.hxx>
 #include <dlg_ObjectProperties.hxx>