tdf#42949 Fix IWYU warnings in chart2/source/controller/dialogs/*hxx

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

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

35 files changed, 111 insertions, 81 deletions

diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index db42744007aa..459dc29e27ad 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/chart2/DataPointGeometry3D.hpp>
 #include <com/sun/star/chart2/PieChartOffsetMode.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 
 #include <svtools/controldims.hxx>
 #include <svtools/valueset.hxx>
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 9946845e16ee..2985d31b10db 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -28,11 +28,13 @@
 #include <ThreeDHelper.hxx>
 
 #include <com/sun/star/chart2/CurveStyle.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XChartTypeTemplate.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/weld.hxx>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartTypeTemplate; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
+
 class SvtValueSet;
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
index 963952807b86..bc04dbbe3cae 100644
--- a/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_CHARTTYPETEMPLATEPROVIDER_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_CHARTTYPETEMPLATEPROVIDER_HXX
 
-#include <com/sun/star/chart2/XChartTypeTemplate.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartTypeTemplate; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index ddc583049166..4681e4ff6412 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DATABROWSER_HXX
 
 #include <svtools/editbrowsebox.hxx>
-#include <vcl/outdev.hxx>
 #include <svtools/fmtfield.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <memory>
 #include <vector>
@@ -34,6 +32,10 @@ namespace com { namespace sun { namespace star {
     }
 }}}
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
+class OutputDevice;
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index 7d9f90843dbf..fb497bd563c5 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -19,12 +19,14 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DATABROWSERMODEL_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DATABROWSERMODEL_HXX
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <memory>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 namespace com { namespace sun { namespace star { namespace chart2 {
     class XDataSeries;
     class XChartType;
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 13b85804c9c7..d38ee3c68cbe 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -30,11 +30,14 @@
 #include <ControllerLockGuard.hxx>
 #include <ChartTypeHelper.hxx>
 #include <ThreeDHelper.hxx>
+#include <ChartModel.hxx>
 
 #include <com/sun/star/util/XCloneable.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index 704962e06012..400302762a93 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -20,16 +20,19 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_DIALOGMODEL_HXX
 
 #include <TimerTriggeredControllerLock.hxx>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include <ChartModel.hxx>
+#include <rtl/ustring.hxx>
 
 #include <map>
 #include <memory>
 #include <vector>
 
+namespace chart { class ChartModel; }
+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 frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+
 namespace com { namespace sun { namespace star { namespace chart2 {
     class XDataSeriesContainer;
     class XDataSeries;
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 2b7ea4405fda..c9da0b2227e7 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -21,6 +21,7 @@
 #include <ResId.hxx>
 #include <strings.hrc>
 #include <helpids.h>
+#include <ChartModel.hxx>
 
 #include "tp_ChartType.hxx"
 #include "tp_RangeChooser.hxx"
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index f71abafffebf..9a182ef19726 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -22,6 +22,7 @@
 #include <ResId.hxx>
 #include "ChartTypeTemplateProvider.hxx"
 #include <DiagramHelper.hxx>
+#include <ChartModel.hxx>
 #include "DialogModel.hxx"
 
 #include "tp_RangeChooser.hxx"
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index 25ab3ac063c5..132422b5d17f 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "res_BarGeometry.hxx"
+#include <vcl/builder.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index e77fb0644961..65442d9764f8 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -19,6 +19,7 @@
 
 #include "res_DataLabel.hxx"
 
+#include <TextDirectionListBox.hxx>
 #include <chartview/ChartSfxItemIds.hxx>
 #include "dlg_NumberFormat.hxx"
 
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index c1bbaef60ae0..b8f2667b7418 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -19,14 +19,13 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_DATALABEL_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_DATALABEL_HXX
 
-#include <vcl/button.hxx>
-#include <vcl/layout.hxx>
 #include <svl/itemset.hxx>
-#include <TextDirectionListBox.hxx>
 #include <svx/dialcontrol.hxx>
-#include <sfx2/tabdlg.hxx>
+
+#include <map>
 
 class SvNumberFormatter;
+namespace chart { class TextDirectionListBox; }
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 2829c3792abc..785d61d4065d 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -19,15 +19,15 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_TRENDLINE_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_TRENDLINE_HXX
 
-#include <vcl/window.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <svl/itemset.hxx>
 #include <svx/chrtitem.hxx>
 #include <vcl/field.hxx>
-#include <svl/zformat.hxx>
 #include <svtools/fmtfield.hxx>
 
+class SvNumberFormatter;
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index f095eb068cbe..e261cff87d3c 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -20,8 +20,10 @@
 #include "tp_3D_SceneAppearance.hxx"
 #include <ChartModelHelper.hxx>
 #include <ThreeDHelper.hxx>
+#include <ControllerLockGuard.hxx>
 #include <rtl/math.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/ShadeMode.hpp>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index f30ce108aae3..f85d33290c67 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -20,13 +20,11 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEAPPEARANCE_HXX
 
 #include <vcl/tabpage.hxx>
-#include <vcl/field.hxx>
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
-#include <com/sun/star/drawing/ShadeMode.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 
-#include <ControllerLockGuard.hxx>
+namespace chart { class ControllerLockHelper; }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index acc07bc386d9..43cb32e001e2 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -23,6 +23,7 @@
 #include <DiagramHelper.hxx>
 #include <ChartTypeHelper.hxx>
 #include <ThreeDHelper.hxx>
+#include <ControllerLockGuard.hxx>
 #include <rtl/math.hxx>
 #include <editeng/unoprnms.hxx>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index 50989d947b40..5ce39c0c18ca 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
@@ -19,15 +19,13 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEGEOMETRY_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_3D_SCENEGEOMETRY_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <basegfx/matrix/b3dhommatrix.hxx>
-
 #include <vcl/tabpage.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 #include <vcl/button.hxx>
 
-#include <ControllerLockGuard.hxx>
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace chart { class ControllerLockHelper; }
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
index 04023f053f7c..72e39d673539 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx
@@ -21,14 +21,12 @@
 
 #include <TimerTriggeredControllerLock.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-
 #include <vcl/tabpage.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <svx/dlgctrl.hxx>
 #include <svx/dlgctl3d.hxx>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+
 class SvxColorListBox;
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 477049d24a5e..0272b44a97aa 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -21,6 +21,7 @@
 
 #include "TabPageIds.h"
 #include <chartview/ChartSfxItemIds.hxx>
+#include <TextDirectionListBox.hxx>
 
 #include <svx/chrtitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index cd5673b7cb98..47d52c449843 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -21,9 +21,16 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <svx/dialcontrol.hxx>
-#include <vcl/customweld.hxx>
-#include <vcl/weld.hxx>
-#include <TextDirectionListBox.hxx>
+
+namespace chart { class TextDirectionListBox; }
+namespace weld {
+    class CheckButton;
+    class CustomWeld;
+    class Label;
+    class RadioButton;
+    class SpinButton;
+    class ToggleButton;
+}
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 5359e3490ea8..154dafdad0ad 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -21,9 +21,7 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <svtools/fmtfield.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index e80e2303e433..bec21d752cf1 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -25,8 +25,11 @@
 #include "res_BarGeometry.hxx"
 #include <ControllerLockGuard.hxx>
 #include <unonames.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 
 #include <svtools/controldims.hxx>
+#include <svtools/valueset.hxx>
 
 #include <o3tl/make_unique.hxx>
 #include <vcl/weld.hxx>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 09cb16c3ce87..4470ed60443d 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -26,13 +26,12 @@
 #include "ChartTypeTemplateProvider.hxx"
 #include <TimerTriggeredControllerLock.hxx>
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <svtools/wizardmachine.hxx>
-#include <svtools/valueset.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace weld { class CustomWeld; }
+
+class SvtValueSet;
 
 namespace chart
 {
@@ -41,7 +40,6 @@ class Dim3DLookResourceGroup;
 class StackingResourceGroup;
 class SplineResourceGroup;
 class GeometryResourceGroup;
-class ChartTypeParameter;
 class SortByXValuesResourceGroup;
 
 class ChartTypeTabPage final : public ResourceChangeListener, public svt::OWizardPage, public ChartTypeTemplateProvider
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index ad3ddf8a9e8d..4919de66e71b 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -27,10 +27,13 @@
 #include "tp_DataSourceControls.hxx"
 #include <ControllerLockGuard.hxx>
 #include <DataSourceHelper.hxx>
+#include "DialogModel.hxx"
+#include <TabPageNotifiable.hxx>
 #include <com/sun/star/sheet/XRangeSelection.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/chart2/XChartType.hpp>
 #include <com/sun/star/chart2/XChartTypeTemplate.hpp>
+#include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 26ff781154b8..4d2acf859360 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -21,26 +21,14 @@
 
 #include <svtools/wizardmachine.hxx>
 
-#include "DialogModel.hxx"
-#include <TabPageNotifiable.hxx>
-
-#include <vcl/edit.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <svtools/svtabbx.hxx>
 #include <vcl/treelistbox.hxx>
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include <com/sun/star/chart2/data/XDataProvider.hpp>
-#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/sheet/XRangeSelection.hpp>
-
-#include <utility>
-#include <vector>
 
 #include <RangeSelectionListener.hxx>
 
+namespace chart { class TabPageNotifiable; }
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
index 83def2a32d1f..55e49aebacf7 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx
@@ -19,14 +19,12 @@
 #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_DATASOURCECONTROLS_HXX
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_DATASOURCECONTROLS_HXX
 
-#include <com/sun/star/chart2/XChartType.hpp>
-#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
-
-#include <svtools/svtabbx.hxx>
 #include <vcl/treelistbox.hxx>
 #include <vcl/treelistentry.hxx>
 
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartType; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+
 namespace chart
 {
 
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index ce44fc18229e..0e358234e51e 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -20,6 +20,7 @@
 #include "tp_LegendPosition.hxx"
 #include "TabPageIds.h"
 #include <res_LegendPosition.hxx>
+#include <TextDirectionListBox.hxx>
 #include <chartview/ChartSfxItemIds.hxx>
 #include <svx/chrtitem.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index b1c58effa821..3e48cd9d5530 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -20,9 +20,10 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_LEGENDPOSITION_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/weld.hxx>
+
 #include <res_LegendPosition.hxx>
-#include <TextDirectionListBox.hxx>
+
+namespace chart { class TextDirectionListBox; }
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index 56cd4005417f..a789c4ffc9c5 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -21,8 +21,13 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <svx/dialcontrol.hxx>
-#include <vcl/customweld.hxx>
-#include <vcl/weld.hxx>
+
+namespace weld {
+    class CheckButton;
+    class CustomWeld;
+    class Frame;
+    class SpinButton;
+}
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 838d4df9fdd7..da340f0c1ac8 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -23,9 +23,11 @@
 #include "ChartTypeTemplateProvider.hxx"
 #include "DialogModel.hxx"
 #include <RangeSelectionHelper.hxx>
+#include <TabPageNotifiable.hxx>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/XComponentSupplier.hpp>
+#include <com/sun/star/chart2/XChartTypeTemplate.hpp>
 #include <svtools/miscopt.hxx>
 
 namespace
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 7acfb74bc42c..fb7325d72e13 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -21,15 +21,11 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_RANGECHOOSER_HXX
 
 #include <RangeSelectionListener.hxx>
-#include <TabPageNotifiable.hxx>
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/data/XDataProvider.hpp>
-#include <com/sun/star/chart2/XChartTypeTemplate.hpp>
 #include <svtools/wizardmachine.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <com/sun/star/sheet/XRangeSelection.hpp>
+
+namespace chart { class TabPageNotifiable; }
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartTypeTemplate; } } } }
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 61a2d0b63377..1f6a16aeac43 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -20,7 +20,14 @@
 #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_TP_SERIESTOAXIS_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/weld.hxx>
+
+namespace weld {
+    class CheckButton;
+    class MetricSpinButton;
+    class RadioButton;
+    class ToggleButton;
+    class Widget;
+}
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index c6c64df00566..d82092513047 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -21,6 +21,7 @@
 
 #include "TabPageIds.h"
 #include <chartview/ChartSfxItemIds.hxx>
+#include <TextDirectionListBox.hxx>
 
 #include <editeng/eeitem.hxx>
 #include <editeng/frmdiritem.hxx>
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index edcab4ce9118..9368a41e4c24 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -21,9 +21,15 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <svx/dialcontrol.hxx>
-#include <vcl/customweld.hxx>
-#include <vcl/weld.hxx>
-#include <TextDirectionListBox.hxx>
+
+namespace chart { class TextDirectionListBox; }
+namespace weld {
+    class CheckButton;
+    class CustomWeld;
+    class Label;
+    class SpinButton;
+    class ToggleButton;
+}
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index b57350cc8aad..332d56376973 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -22,14 +22,14 @@
 
 #include <TimerTriggeredControllerLock.hxx>
 
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <svtools/wizardmachine.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <memory>
 
-#include <res_LegendPosition.hxx>
-#include <res_Titles.hxx>
+namespace chart { class LegendPositionResources; }
+namespace chart { class TitleResources; }
+namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace chart
 {