tdf#42949 Fix IWYU warnings in sc/source/ui/inc/[m-z]*

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

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

70 files changed, 63 insertions, 121 deletions

diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 632e297a4111..169875f51697 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -27,6 +27,7 @@
 #include <officecfg/Office/Calc.hxx>
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>
+#include <imoptdlg.hxx>
 
 // ScDelimiterTable
 
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 92a996e531e3..0af20114ee10 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -19,6 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
+#include <scui_def.hxx>
 #include <tpsort.hxx>
 #include <sortdlg.hxx>
 
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 4c269559f25c..288ffaea6462 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -21,6 +21,7 @@
 
 #include <tpsubt.hxx>
 #include <subtdlg.hxx>
+#include <scui_def.hxx>
 
 ScSubTotalDlg::ScSubTotalDlg(vcl::Window* pParent, const SfxItemSet* pArgSet)
     : SfxTabDialog(pParent, "SubTotalDialog",
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 438e97578461..ad5251543cc6 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -94,6 +94,8 @@
 #include <undoconvert.hxx>
 #include <docfuncutil.hxx>
 #include <sheetevents.hxx>
+#include <conditio.hxx>
+#include <columnspanset.hxx>
 
 #include <memory>
 #include <utility>
diff --git a/sc/source/ui/docshell/docfuncutil.cxx b/sc/source/ui/docshell/docfuncutil.cxx
index 6e469c5c7e88..a2559ee562e2 100644
--- a/sc/source/ui/docshell/docfuncutil.cxx
+++ b/sc/source/ui/docshell/docfuncutil.cxx
@@ -23,6 +23,7 @@
 #include <undobase.hxx>
 #include <global.hxx>
 #include <undoblk.hxx>
+#include <columnspanset.hxx>
 
 #include <o3tl/make_unique.hxx>
 
diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx
index 245e25915851..2164af873583 100644
--- a/sc/source/ui/inc/redcom.hxx
+++ b/sc/source/ui/inc/redcom.hxx
@@ -20,9 +20,13 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_REDCOM_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_REDCOM_HXX
 
-#include <vcl/weld.hxx>
-#include <chgtrack.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/link.hxx>
+#include <vcl/vclptr.hxx>
 
+namespace weld { class Window; }
+class ScChangeAction;
+class SfxItemSet;
 class ScDocShell;
 class AbstractSvxPostItDialog;
 
diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index 9780f9f6839c..9165fc22e62c 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -23,8 +23,6 @@
 #include <sfx2/childwin.hxx>
 #include "ChildWindowWrapper.hxx"
 
-#include "dbfunc.hxx"
-
 #include <sc.hrc>
 
 #define DECL_WRAPPER_WITHID(Class) \
diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx
index 650ae66176b2..89543e312270 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -22,20 +22,15 @@
 
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
-#include <vcl/scrbar.hxx>
 #include <vcl/weld.hxx>
-#include <svx/checklbx.hxx>
 
 #include <tabprotection.hxx>
 
 #include <memory>
 
 namespace vcl { class Window; }
-class ScDocProtection;
-class ScTableProtection;
 class ScDocument;
 
 class ScRetypePassDlg : public ModalDialog
diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx
index 2a6d13c6bd28..d1c543a6f3ac 100644
--- a/sc/source/ui/inc/rfindlst.hxx
+++ b/sc/source/ui/inc/rfindlst.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_RFINDLST_HXX
 
 #include <tools/color.hxx>
-#include <global.hxx>
 #include <address.hxx>
 #include <tools/solar.h>
 
diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx
index 67b997059a61..0af25fa2484e 100644
--- a/sc/source/ui/inc/scendlg.hxx
+++ b/sc/source/ui/inc/scendlg.hxx
@@ -21,13 +21,10 @@
 #define INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX
 
 #include <vcl/dialog.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <svtools/svmedit.hxx>
-#include <svtools/ctrlbox.hxx>
 
 enum class ScScenarioFlags;
+class Edit;
 
 class SvxColorListBox;
 
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 850d992b4471..e2d6518c0ee3 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -28,11 +28,8 @@
 
 class Button;
 class CheckBox;
-class ComboBox;
 class Edit;
 class FixedText;
-class ListBox;
-class NumericField;
 class RadioButton;
 
 class ScCsvTableBox;
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx
index aa16ba72a62d..551b3aee9fbb 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -22,9 +22,9 @@
 
 #include <vcl/layout.hxx>
 #include <svx/txencbox.hxx>
-#include "imoptdlg.hxx"
 
 class ScDelimiterTable;
+class ScImportOptions;
 
 class ScImportOptionsDlg : public ModalDialog
 {
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 50cf77089460..74b980f7319d 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_SCUITPHFEDIT_HXX
 
 #include "tphfedit.hxx"
+#include <vcl/menubtn.hxx>
 
 enum ScHFEntryId
 {
diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx
index 0a2f37003956..d3071f31e344 100644
--- a/sc/source/ui/inc/select.hxx
+++ b/sc/source/ui/inc/select.hxx
@@ -25,7 +25,6 @@
 #include "viewdata.hxx"
 
 class ScTabView;
-class ScViewData;
 
 class ScViewSelectionEngine : public SelectionEngine
 {
diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx
index b45b4725f59e..0d7505260227 100644
--- a/sc/source/ui/inc/selectionstate.hxx
+++ b/sc/source/ui/inc/selectionstate.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_SELECTIONSTATE_HXX
 
 #include <editeng/editdata.hxx>
-#include <rangelst.hxx>
+#include <address.hxx>
 
 /** Enumerates all possible types of selections in a Calc document. */
 enum ScSelectionType
diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
index afca29b90e62..d6b664e1c3a0 100644
--- a/sc/source/ui/inc/servobj.hxx
+++ b/sc/source/ui/inc/servobj.hxx
@@ -23,8 +23,8 @@
 #include <svl/lstner.hxx>
 #include <svl/listener.hxx>
 #include <sfx2/linksrc.hxx>
-#include <global.hxx>
 #include <address.hxx>
+#include <svl/SfxBroadcaster.hxx>
 
 class ScDocShell;
 class ScServerObject;
diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx
index c54c99c11e60..7a6d7a2c5451 100644
--- a/sc/source/ui/inc/sharedocdlg.hxx
+++ b/sc/source/ui/inc/sharedocdlg.hxx
@@ -23,10 +23,11 @@
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/simptabl.hxx>
+#include <scdllapi.h>
 
 class ScViewData;
 class ScDocShell;
+class SvSimpleTable;
 
 // class ScShareDocumentDlg
 
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index 94b67684743d..492dac5910b2 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_SIMPREF_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_SIMPREF_HXX
 
-#include <vcl/combobox.hxx>
 #include <vcl/fixed.hxx>
 #include "anyrefdg.hxx"
-#include <dbdata.hxx>
 
 class ScDocument;
 
diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx
index 9ad1fb0f6c17..73e2dc1c9c40 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -22,9 +22,6 @@
 
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/weld.hxx>
 #include <svx/checklbx.hxx>
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index b7ca8c7ba8f9..29883c0a2ccc 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX
 
-#include <global.hxx>
 #include <address.hxx>
 #include "anyrefdg.hxx"
 
diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx
index 91a27e4aca4f..c45143296347 100644
--- a/sc/source/ui/inc/sortdlg.hxx
+++ b/sc/source/ui/inc/sortdlg.hxx
@@ -22,7 +22,6 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/weld.hxx>
-#include "scui_def.hxx"
 
 class ScSortDlg : public SfxTabDialogController
 {
diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx
index faddd6a92925..29ab6ab21b5d 100644
--- a/sc/source/ui/inc/sortkeydlg.hxx
+++ b/sc/source/ui/inc/sortkeydlg.hxx
@@ -13,10 +13,7 @@
 #include <vector>
 #include <memory>
 
-#include "anyrefdg.hxx"
-
 #include <vcl/weld.hxx>
-#include <svx/langbox.hxx>
 
 struct ScSortKeyItem
 {
diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx
index 40da6612f54f..655217bf8d8b 100644
--- a/sc/source/ui/inc/spelldialog.hxx
+++ b/sc/source/ui/inc/spelldialog.hxx
@@ -29,7 +29,6 @@ class ScSelectionState;
 class ScTabViewShell;
 class ScViewData;
 class ScRangeList;
-class ScDocument;
 
 /** Specialized spell check dialog child window for Calc.
 
diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx
index 6077f9c6c6f9..abf9ffd9d9bf 100644
--- a/sc/source/ui/inc/subtdlg.hxx
+++ b/sc/source/ui/inc/subtdlg.hxx
@@ -22,8 +22,6 @@
 
 #include <sfx2/tabdlg.hxx>
 
-#include "scui_def.hxx"
-
 class ScSubTotalDlg : public SfxTabDialog
 {
 public:
diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx
index 16327bf4c0b3..4b27a4fe73e6 100644
--- a/sc/source/ui/inc/tabbgcolordlg.hxx
+++ b/sc/source/ui/inc/tabbgcolordlg.hxx
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_TABBGCOLORDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_TABBGCOLORDLG_HXX
 
-#include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
 #include <svx/SvxColorValueSet.hxx>
 
 class ScTabBgColorDlg : public weld::GenericDialogController
diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
index f8d7167d1b73..d59af229d90d 100644
--- a/sc/source/ui/inc/tabcont.hxx
+++ b/sc/source/ui/inc/tabcont.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_TABCONT_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_TABCONT_HXX
 
-#include <address.hxx>
+#include <types.hxx>
 #include <svtools/tabbar.hxx>
 #include <svtools/transfer.hxx>
 
diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx
index 65b8dece561f..c02ef2881378 100644
--- a/sc/source/ui/inc/tabopdlg.hxx
+++ b/sc/source/ui/inc/tabopdlg.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TABOPDLG_HXX
 
 #include <vcl/fixed.hxx>
-#include <global.hxx>
 #include <address.hxx>
 #include "anyrefdg.hxx"
 
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 344eda24850e..d53480945284 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -26,9 +26,6 @@
 #include <vcl/scrbar.hxx>
 #include <vcl/help.hxx>
 
-#include <sfx2/ipclient.hxx>
-
-#include "fupoor.hxx"
 #include "hiranges.hxx"
 #include "viewutil.hxx"
 #include "select.hxx"
@@ -40,14 +37,12 @@ namespace editeng {
 }
 
 class ScEditEngineDefaulter;
-class ScGridWindow;
 class ScOutlineWindow;
 class ScRowBar;
 class ScColBar;
 class ScTabControl;
 class ScTabViewShell;
 struct ScRangeFindData;
-class ScDrawView;
 class SvBorder;
 class FuPoor;
 class Splitter;
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index cf5b8723df9a..28e19d4e3e3b 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -21,23 +21,18 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TABVWSH_HXX
 
 #include <formula/errorcodes.hxx>
-#include <o3tl/deleter.hxx>
 #include <svx/fmshell.hxx>
-#include <svtools/htmlcfg.hxx>
 #include <sfx2/viewsh.hxx>
-#include <sfx2/viewfac.hxx>
 #include <editeng/svxenum.hxx>
 #include <scdllapi.h>
 #include "dbfunc.hxx"
 #include "target.hxx"
-#include <rangelst.hxx>
 #include <shellids.hxx>
 #include <tabprotection.hxx>
 
 #include <memory>
 #include <map>
 
-class SbxObject;
 class SdrOle2Obj;
 class SfxBindings;
 class SfxChildWindow;
@@ -65,6 +60,8 @@ class ScRangeName;
 
 struct ScHeaderFieldData;
 
+namespace o3tl { template <typename T> struct default_delete; }
+
 namespace editeng { class SvxBorderLine; }
 
 namespace com { namespace sun { namespace star { namespace frame {
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
index e81f913d7dac..2b664bf4dd16 100644
--- a/sc/source/ui/inc/tbzoomsliderctrl.hxx
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -22,8 +22,10 @@
 #include <vcl/window.hxx>
 #include <svl/poolitem.hxx>
 #include <sfx2/tbxctrl.hxx>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <svx/zoomslideritem.hxx>
+
+namespace com { namespace sun { namespace star { namespace frame { class XDispatchProvider; } } } }
+
+class SvxZoomSliderItem;
 
 class ScZoomSliderControl : public SfxToolBoxControl
 {
diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx
index 9a1e005986c7..b052b4fda609 100644
--- a/sc/source/ui/inc/textimportoptions.hxx
+++ b/sc/source/ui/inc/textimportoptions.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
 #include <i18nlangtag/lang.h>
 #include <svx/langbox.hxx>
 
diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx
index 8430b637228e..ad9d19fb195d 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TPCOMPATIBILITY_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 
 class ScTpCompatOptions : public SfxTabPage
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index 7808f31a2556..b173e6a6df2b 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TPDEFAULTS_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 
 class ScTpDefaultsOptions : public SfxTabPage
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 22445b7586ec..d15b06077f0d 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TPFORMULA_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/button.hxx>
 
 #include <calcconfig.hxx>
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index a52791203184..f7036cf8a22f 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -20,26 +20,24 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_TPHFEDIT_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_TPHFEDIT_HXX
 
-#include <sfx2/tabdlg.hxx>
-#include <svx/pageitem.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/menubtn.hxx>
-#include <vcl/timer.hxx>
-#include <vcl/virdev.hxx>
 #include <scdllapi.h>
-#include <scitems.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <cppuhelper/weakref.hxx>
+#include <tools/wintypes.hxx>
+#include <editeng/svxenum.hxx>
+#include <vcl/ctrl.hxx>
+#include <vcl/menu.hxx>
 
 #include <functional>
 
+namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
+
 class ScHeaderEditEngine;
 class ScPatternAttr;
 class EditView;
 class EditTextObject;
 class SvxFieldItem;
 class ScAccessibleEditObject;
-class ScEditWindow;
+namespace vcl { class Window; }
 
 enum ScEditWindowLocation
 {
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 1e4c2b15788e..755b9f8bb529 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -23,14 +23,12 @@
 #include <vector>
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 #include <svx/langbox.hxx>
+#include <unotools/collatorwrapper.hxx>
+#include <svtools/collatorres.hxx>
 
 #include "sortkeydlg.hxx"
 
-#include <global.hxx>
 #include <address.hxx>
 #include <sortparam.hxx>
 
@@ -38,8 +36,6 @@
 #define SC_MAXFIELDS    MAXCOLCOUNT+1
 
 class ScViewData;
-class ScSortDlg;
-struct ScSortParam;
 
 // Sort Criteria
 
@@ -97,8 +93,6 @@ private:
 // Sort Options
 
 class ScDocument;
-class CollatorResource;
-class CollatorWrapper;
 
 class ScTabPageSortOptions : public SfxTabPage
 {
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 8ed4b12ec851..60f94a85c573 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -22,7 +22,6 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <svx/checklbx.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <global.hxx>
 
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 93e643ff7a3b..61e5317fc8b0 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TPTABLE_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/weld.hxx>
 
 class ScTablePage : public SfxTabPage
 {
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index bd1c690b1019..1493e85110a8 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -28,7 +28,7 @@
 class ScUserList;
 class ScDocument;
 class ScViewData;
-class ScRangeUtil;
+class ScRefAddress;
 
 class ScTpUserLists : public SfxTabPage
 {
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index adebba217d81..c0985e2a7260 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -23,8 +23,6 @@
 #include <sfx2/tabdlg.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/ctrlbox.hxx>
-#include <svx/strarray.hxx>
 
 class ScViewOptions;
 class SvxColorListBox;
diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx
index e22ee5be52f3..9c2bd0a59b93 100644
--- a/sc/source/ui/inc/transobj.hxx
+++ b/sc/source/ui/inc/transobj.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_TRANSOBJ_HXX
 
 #include <svtools/transfer.hxx>
-#include <global.hxx>
 #include <address.hxx>
 #include <document.hxx>
 #include <sfx2/objsh.hxx>
@@ -29,7 +28,6 @@
 
 class ScDocShell;
 class ScMarkData;
-class SfxObjectShell;
 enum class ScDragSrc;
 
 namespace com { namespace sun { namespace star {
diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx
index c3d0094fc949..7ed2c35c6233 100644
--- a/sc/source/ui/inc/uiitems.hxx
+++ b/sc/source/ui/inc/uiitems.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_UIITEMS_HXX
 
 #include <scdllapi.h>
-#include <conditio.hxx>
 #include <sortparam.hxx>
 #include <subtotalparam.hxx>
 #include <paramisc.hxx>
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 0057d549bfa4..fea28529fd7d 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -21,16 +21,12 @@
 #define INCLUDED_SC_SOURCE_UI_INC_UNDOBASE_HXX
 
 #include <svl/undo.hxx>
-#include <global.hxx>
 #include <address.hxx>
 #include "docsh.hxx"
-#include <columnspanset.hxx>
 
 #include <memory>
 #include <map>
 
-class ScDocument;
-class ScDocShell;
 class SdrUndoAction;
 class ScRefUndoData;
 class ScDBData;
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index 93a8db996bf8..875766b34270 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -21,20 +21,16 @@
 
 #include "undobase.hxx"
 #include <markdata.hxx>
-#include "viewutil.hxx"
 #include "spellparam.hxx"
 #include "cellmergeoption.hxx"
 #include <paramisc.hxx>
+#include <editeng/boxitem.hxx>
 
 #include <memory>
 
 class ScDocShell;
-class ScDocument;
 class ScOutlineTable;
-class ScRangeList;
 class ScPatternAttr;
-class SvxBoxItem;
-class SvxBoxInfoItem;
 class SvxSearchItem;
 class SdrUndoAction;
 class ScEditDataArray;
diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx
index 5785ac841c63..3227c33f1635 100644
--- a/sc/source/ui/inc/undocell.hxx
+++ b/sc/source/ui/inc/undocell.hxx
@@ -26,22 +26,13 @@
 #include <cellvalue.hxx>
 #include <cellvalues.hxx>
 #include <svx/svdundo.hxx>
+#include <editeng/editobj.hxx>
 
 #include <memory>
 
 class ScDocShell;
 class ScPatternAttr;
-class EditTextObject;
-class ScDetOpList;
-class ScDetOpData;
 class ScRangeName;
-class ScDocument;
-
-namespace sc {
-
-class CellValues;
-
-}
 
 class ScUndoSdrCaptionObj: public SdrUndoAction
 {
diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx
index 5a3035d86017..5ff7159a2e4e 100644
--- a/sc/source/ui/inc/undodat.hxx
+++ b/sc/source/ui/inc/undodat.hxx
@@ -21,24 +21,18 @@
 #define INCLUDED_SC_SOURCE_UI_INC_UNDODAT_HXX
 
 #include "undobase.hxx"
+#include "refundo.hxx"
+#include <dpobject.hxx>
+#include <olinetab.hxx>
 #include <rangeutl.hxx>
 #include <rangelst.hxx>
-#include <sortparam.hxx>
 #include <queryparam.hxx>
 #include <subtotalparam.hxx>
-#include <pivot.hxx>
 
 #include <memory>
 
 class ScDocShell;
-class ScDocument;
-class ScOutlineTable;
-class ScRangeName;
-class ScDBData;
-class ScDBCollection;
-class ScDPObject;
 class SdrUndoAction;
-class ScMarkData;
 
 class ScUndoDoOutline: public ScSimpleUndo
 {
diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx
index c5d5f425a919..20e749f40c20 100644
--- a/sc/source/ui/inc/undostyl.hxx
+++ b/sc/source/ui/inc/undostyl.hxx
@@ -25,7 +25,6 @@
 #include "undobase.hxx"
 
 class ScDocShell;
-class SfxStyleSheetBase;
 
 class ScStyleSaveData
 {
diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx
index e7df53065f46..b65298530e28 100644
--- a/sc/source/ui/inc/undotab.hxx
+++ b/sc/source/ui/inc/undotab.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_UNDOTAB_HXX
 
 #include "undobase.hxx"
-#include <formula/grammar.hxx>
 #include <tools/color.hxx>
 #include <tabbgcolor.hxx>
 
@@ -29,7 +28,6 @@
 #include <vector>
 
 class ScDocShell;
-class ScDocument;
 class SdrUndoAction;
 class ScPrintRangeSaver;
 class SdrObject;
diff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxx
index 40e8f74a303d..b95af8a198b2 100644
--- a/sc/source/ui/inc/undoutil.hxx
+++ b/sc/source/ui/inc/undoutil.hxx
@@ -22,7 +22,6 @@
 
 #include <address.hxx>
 
-class ScRange;
 class ScDocShell;
 class ScDBData;
 class ScDocument;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 413c03c1a505..62b4388272e1 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -21,12 +21,10 @@
 #define INCLUDED_SC_SOURCE_UI_INC_VALIDATE_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/vclmedit.hxx>
-#include <svtools/svmedit.hxx>
 
 #include "anyrefdg.hxx"
 #include <sc.hrc>
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 80235f836a07..0e1a275af067 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -99,7 +99,6 @@ namespace o3tl {
 }
 
 class ScDocFunc;
-class ScDocShell;
 class ScDocument;
 class ScDBFunc;
 class ScTabViewShell;
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index e9cca10dd49c..85857d5065d7 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -23,7 +23,6 @@
 
 #include <tabbgcolor.hxx>
 
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <vector>
 
@@ -43,7 +42,6 @@ class ScValidationData;
 class ScConversionParam;
 class SdrModel;
 class Graphic;
-class Exchange;
 class ScRangeList;
 class SvxHyperlinkItem;
 class ScTransferObj;
@@ -51,6 +49,7 @@ class ScTableProtection;
 enum class CreateNameFlags;
 
 namespace editeng { class SvxBorderLine; }
+namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } }
 
 namespace sc {
 
diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx
index 8d57370b950f..f8dddbfbc8e1 100644
--- a/sc/source/ui/inc/viewutil.hxx
+++ b/sc/source/ui/inc/viewutil.hxx
@@ -31,8 +31,6 @@ class SfxViewFrame;
 class ScChangeAction;
 class ScChangeViewSettings;
 class ScDocument;
-class ScAddress;
-class ScRange;
 class ScMarkData;
 enum class SvtScriptType;
 enum class TransliterationFlags;
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index cea274a5b5cf..cccab8df1097 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -19,6 +19,7 @@
 
 #include <unotools/localedatawrapper.hxx>
 
+#include <chgtrack.hxx>
 #include <redcom.hxx>
 #include <docsh.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 6d9500255692..108e8c91c1ad 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/dialoghelper.hxx>
 #include <svl/sharecontrolfile.hxx>
 #include <unotools/useroptions.hxx>
+#include <svtools/simptabl.hxx>
 
 #include <docsh.hxx>
 
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index ca6d105ec212..995e86418eba 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -28,6 +28,9 @@
 #include <scresid.hxx>
 #include <scuitphfedit.hxx>
 #include <svx/svxids.hrc>
+#include <svx/pageitem.hxx>
+#include <vcl/menubtn.hxx>
+#include <vcl/lstbox.hxx>
 
 ScHFEditDlg::ScHFEditDlg( vcl::Window*           pParent,
                           const SfxItemSet& rCoreSet,
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 4249db1bd7ab..36cbaf11f1b5 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/objsh.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/lstbox.hxx>
 #include <sal/log.hxx>
 
 #include <unotools/useroptions.hxx>
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index bc905ef89e63..feb652e8a6c2 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -34,6 +34,7 @@
 #include <rowheightcontext.hxx>
 #include <column.hxx>
 #include <sortparam.hxx>
+#include <columnspanset.hxx>
 
 
 ScSimpleUndo::ScSimpleUndo( ScDocShell* pDocSh ) :
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 7e4a4faee2fe..4e982824e2ea 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -57,6 +57,7 @@
 #include <validat.hxx>
 #include <gridwin.hxx>
 #include <svl/listener.hxx>
+#include <columnspanset.hxx>
 
 #include <memory>
 #include <set>
diff --git a/sc/source/ui/undo/undoblk2.cxx b/sc/source/ui/undo/undoblk2.cxx
index 24f1ee9a24c0..6418e604192b 100644
--- a/sc/source/ui/undo/undoblk2.cxx
+++ b/sc/source/ui/undo/undoblk2.cxx
@@ -28,6 +28,7 @@
 #include <scresid.hxx>
 #include <global.hxx>
 #include <target.hxx>
+#include <columnspanset.hxx>
 
 #include <undoolk.hxx>
 
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index a3531af7249c..15d5a9b2853c 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -135,6 +135,7 @@
 #include <TablePivotCharts.hxx>
 #include <table.hxx>
 #include <refundo.hxx>
+#include <columnspanset.hxx>
 
 #include <list>
 #include <memory>
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 3d43be0ba219..10db96a23e7f 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -126,6 +126,8 @@
 #include <dbdata.hxx>
 #include <docfunc.hxx>
 #include <docuno.hxx>
+#include <columnspanset.hxx>
+#include <sortparam.hxx>
 
 #include <sfx2/dispatch.hxx>
 #include <sfx2/app.hxx>
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 140b481868ea..0e3ce98c515f 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -39,6 +39,7 @@
 #include <queryentry.hxx>
 #include <markdata.hxx>
 #include <tabvwsh.hxx>
+#include <sortparam.hxx>
 
 ScDBFunc::ScDBFunc( vcl::Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) :
     ScViewFunc( pParent, rDocSh, pViewShell )
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 7ca42e09f0e2..acc7cce99b52 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -68,6 +68,7 @@
 #include <stringutil.hxx>
 #include <tabvwsh.hxx>
 #include <generalfunction.hxx>
+#include <sortparam.hxx>
 
 #include <sfx2/lokhelper.hxx>
 #include <comphelper/lok.hxx>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 20e5be4093a0..ba4d08dc874a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -35,6 +35,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/ipclient.hxx>
 #include <svl/stritem.hxx>
 #include <svtools/svtabbx.hxx>
 #include <svl/urlbmk.hxx>
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 0438ce1467f4..82458b0b8ad0 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -65,6 +65,7 @@
 #include <viewutil.hxx>
 #include <docpool.hxx>
 #include <patattr.hxx>
+#include <columnspanset.hxx>
 
 #include <memory>
 
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index f5057c247a65..696ca8babcf1 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -34,6 +34,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/ipclient.hxx>
 #include <svl/whiter.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 85edda400cf5..3a6d8c2b62bc 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -88,6 +88,7 @@
 #include <comphelper/lok.hxx>
 #include <mergecellsdialog.hxx>
 #include <sheetevents.hxx>
+#include <columnspanset.hxx>
 
 #include <vector>
 #include <memory>
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index 512477711a28..b0b1770f7033 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -31,6 +31,7 @@
 #include <svtools/embedhlp.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <sfx2/ipclient.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/embed/Aspects.hpp>
 
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 29af7b0c42e5..a0e1185a6d3f 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -83,6 +83,8 @@
 #include <docfuncutil.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <comphelper/lok.hxx>
+#include <conditio.hxx>
+#include <columnspanset.hxx>
 
 #include <memory>