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

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

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

54 files changed, 60 insertions, 112 deletions

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 3f63ccb0cea8..0b8fff456db7 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -462,6 +462,9 @@ blacklist:
     sc/source/ui/inc/ExponentialSmoothingDialog.hxx:
     # base class has to be a complete type
     - viewdata.hxx
+    sc/source/ui/inc/impex.hxx:
+    # Needed for template
+    - o3tl/deleter.hxx
     sc/source/ui/inc/MatrixComparisonGenerator.hxx:
     # base class has to be a complete type
     - viewdata.hxx
@@ -483,3 +486,4 @@ blacklist:
     sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:
     # base class has to be a complete type
     - viewdata.hxx
+
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 0407642692de..a71eaee2feb3 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -22,6 +22,7 @@
 #include <comphelper/string.hxx>
 #include <osl/thread.h>
 #include <rtl/tencinfo.h>
+#include <global.hxx>
 
 static const sal_Char pStrFix[] = "FIX";
 
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index a4a8eee681d3..6c963e2dc3a1 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -28,11 +28,13 @@
 #include "formatsh.hxx"
 #include <rtl/ref.hxx>
 #include <sot/formats.hxx>
+#include <vcl/vclptr.hxx>
 
 class SvxClipboardFormatItem;
 class TransferableDataHelper;
 class TransferableClipboardListener;
 class AbstractScLinkedAreaDlg;
+class Dialog;
 
 struct CellShell_Impl
 {
diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index de6ec72dcb54..afa1527b84d9 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -25,8 +25,6 @@
 
 class ScDocument;
 
-#include "scui_def.hxx"
-
 class ScFillSeriesDlg : public weld::GenericDialogController
 {
 public:
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index 86df47984813..5a2ab1542c34 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -23,7 +23,6 @@
 #include <vcl/combobox.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/layout.hxx>
-#include <global.hxx>
 #include <address.hxx>
 #include "anyrefdg.hxx"
 #include <queryparam.hxx>
diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx
index 01ff63e6e712..eddfc10d2491 100644
--- a/sc/source/ui/inc/foptmgr.hxx
+++ b/sc/source/ui/inc/foptmgr.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_FOPTMGR_HXX
 
 #include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
 
diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx
index 1b2123780e3e..ad1c55b506b6 100644
--- a/sc/source/ui/inc/formatsh.hxx
+++ b/sc/source/ui/inc/formatsh.hxx
@@ -22,9 +22,8 @@
 
 #include <sfx2/shell.hxx>
 #include <shellids.hxx>
-#include <sfx2/module.hxx>
-#include <svx/svdmark.hxx>
 
+class SfxModule;
 class ScViewData;
 enum class SvNumFormatType : sal_Int16;
 
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx
index d49405412aa8..a40b55ecb9e1 100644
--- a/sc/source/ui/inc/formula.hxx
+++ b/sc/source/ui/inc/formula.hxx
@@ -22,12 +22,6 @@
 
 #include <memory>
 #include "anyrefdg.hxx"
-#include <global.hxx>
-#include <vcl/lstbox.hxx>
-#include <svtools/svmedit.hxx>
-#include <vcl/tabpage.hxx>
-
-#include <compiler.hxx>
 
 #include <formula/formula.hxx>
 #include "IAnyRefDialog.hxx"
@@ -37,7 +31,6 @@ class ScDocument;
 class ScFuncDesc;
 class ScInputHandler;
 class ScDocShell;
-class ScFormulaCell;
 
 class ScFormulaDlg final : public formula::FormulaDlg,
                      public IAnyRefDialog
diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx
index 74bdc96d2308..4fb21013596b 100644
--- a/sc/source/ui/inc/fupoor.hxx
+++ b/sc/source/ui/inc/fupoor.hxx
@@ -20,19 +20,18 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_FUPOOR_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_FUPOOR_HXX
 
-#include <vcl/event.hxx>
 #include <vcl/timer.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svdobj.hxx>
+#include <vcl/window.hxx>
 
 class ScDrawView;
 class ScTabViewShell;
-namespace vcl { class Window; }
 class SdrModel;
 class Dialog;
-
-// Create default drawing objects via keyboard
-class SdrObject;
+class CommandEvent;
+class KeyEvent;
+class MouseEvent;
 
 //  Return values for command
 #define SC_CMD_NONE     0
diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx
index 97bf3a3fa8c4..d6bbdb8f6221 100644
--- a/sc/source/ui/inc/futext.hxx
+++ b/sc/source/ui/inc/futext.hxx
@@ -22,8 +22,6 @@
 
 #include "fuconstr.hxx"
 
-class SdrObject;
-class SdrTextObj;
 class SdrOutliner;
 
 /** Base class for Text functions */
diff --git a/sc/source/ui/inc/graphsh.hxx b/sc/source/ui/inc/graphsh.hxx
index 8d86458b616c..d2fee2481b9c 100644
--- a/sc/source/ui/inc/graphsh.hxx
+++ b/sc/source/ui/inc/graphsh.hxx
@@ -21,13 +21,13 @@
 #define INCLUDED_SC_SOURCE_UI_INC_GRAPHSH_HXX
 
 #include <memory>
+#include <vector>
 #include <sfx2/shell.hxx>
 #include <shellids.hxx>
-#include <sfx2/module.hxx>
-#include <svx/svdmark.hxx>
 
 class SdrExternalToolEdit;
 class ScViewData;
+class SfxModule;
 
 #include "drawsh.hxx"
 
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 06a01df9feae..24415a7041cb 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -24,10 +24,7 @@
 #include "viewutil.hxx"
 #include "viewdata.hxx"
 #include "cbutton.hxx"
-#include <o3tl/deleter.hxx>
-#include <svx/sdr/overlay/overlayobject.hxx>
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include <memory>
 #include <vector>
@@ -40,6 +37,9 @@ namespace sc {
     struct SpellCheckContext;
 }
 
+namespace sdr { namespace overlay { class OverlayManager; } }
+namespace o3tl { template <typename T> struct default_delete; }
+
 class FmFormView;
 struct ScTableInfo;
 class ScDPObject;
diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx
index 03bbb265d244..2ffc9c9f3aa5 100644
--- a/sc/source/ui/inc/hdrcont.hxx
+++ b/sc/source/ui/inc/hdrcont.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_SC_SOURCE_UI_INC_HDRCONT_HXX
 
 #include <vcl/window.hxx>
-#include <vcl/seleng.hxx>
-#include <address.hxx>
+#include <scdllapi.h>
+#include <types.hxx>
 
 #define HDR_SIZE_OPTIMUM    0xFFFF
 
@@ -30,6 +30,7 @@
 #define HDR_SLIDERSIZE      2
 
 class ScTabView;
+class SelectionEngine;
 
 class SC_DLLPUBLIC ScHeaderControl : public vcl::Window
 {
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index 3f3c13aa6669..0011bd2fcc4d 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_HFEDTDLG_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <svx/pageitem.hxx>
-
-#include <scres.hrc>
+#include <editeng/svxenum.hxx>
 
 class ScHFEditDlg : public SfxTabDialog
 {
diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx
index c13d4a1b5518..1a4c595a0cb8 100644
--- a/sc/source/ui/inc/highred.hxx
+++ b/sc/source/ui/inc/highred.hxx
@@ -20,18 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_HIGHRED_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_HIGHRED_HXX
 
-#include <vcl/combobox.hxx>
-#include <svtools/headbar.hxx>
-#include <svtools/simptabl.hxx>
-#include <svtools/svtabbx.hxx>
-
-#include <rangenam.hxx>
 #include "anyrefdg.hxx"
 
-#include <vcl/lstbox.hxx>
-
 #include <svx/ctredlin.hxx>
-#include <chgtrack.hxx>
 #include <chgviset.hxx>
 
 class ScViewData;
diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx
index 425f2466c44c..3a1d92c175c3 100644
--- a/sc/source/ui/inc/hiranges.hxx
+++ b/sc/source/ui/inc/hiranges.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_HIRANGES_HXX
 
 #include <tools/color.hxx>
-#include <global.hxx>
 #include <address.hxx>
 
 struct ScHighlightEntry
diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx
index 4bdbbbb0750f..1f8b946fac7e 100644
--- a/sc/source/ui/inc/imoptdlg.hxx
+++ b/sc/source/ui/inc/imoptdlg.hxx
@@ -20,14 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_IMOPTDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_IMOPTDLG_HXX
 
-#include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-#include <svx/txencbox.hxx>
+#include <rtl/textenc.h>
+#include <rtl/ustring.hxx>
 #include <scdllapi.h>
-#include <global.hxx>
 
 class SC_DLLPUBLIC ScImportOptions
 {
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index f33d777bb97e..1b703d821373 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -21,14 +21,12 @@
 #define INCLUDED_SC_SOURCE_UI_INC_IMPEX_HXX
 
 #include <o3tl/deleter.hxx>
-#include <sot/exchange.hxx>
-#include <global.hxx>
+#include <sot/formats.hxx>
 #include <address.hxx>
 #include <tools/stream.hxx>
 
 class ScDocShell;
 class ScDocument;
-class SvStream;
 class ScAsciiOptions;
 
 /**
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 0afa464a81a5..a03461784783 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -28,7 +28,6 @@
 #include <tools/fract.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
-#include <vcl/vclevent.hxx>
 #include <vcl/vclptr.hxx>
 #include <editeng/svxenum.hxx>
 
@@ -48,8 +47,8 @@ class ScRangeFindList;
 class Timer;
 class KeyEvent;
 class CommandEvent;
-
-struct ESelection;
+class VclWindowEvent;
+namespace vcl { class Window; }
 
 //  ScInputHandler
 
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index c562198de265..1a78985ffee0 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -31,16 +31,13 @@
 #include <vcl/window.hxx>
 #include <svtools/transfer.hxx>
 
-class Accelerator;
 class EditView;
 class ScAccessibleEditLineTextData;
 class ScEditEngineDefaulter;
 class ScInputBarGroup;
 class ScInputHandler;
-class ScRangeList;
 class ScTabViewShell;
 struct EENotify;
-struct ESelection;
 
 class ScTextWndBase : public vcl::Window
 {
diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx
index 60bb94db2827..449ec75e2ff1 100644
--- a/sc/source/ui/inc/instbdlg.hxx
+++ b/sc/source/ui/inc/instbdlg.hxx
@@ -22,7 +22,7 @@
 
 #include <sfx2/objsh.hxx>
 #include <vcl/weld.hxx>
-#include <address.hxx>
+#include <types.hxx>
 
 class ScViewData;
 class ScDocument;
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index 222fe52f3b69..8b2151d40375 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -22,12 +22,12 @@
 
 #include <vcl/weld.hxx>
 #include <sfx2/objsh.hxx>
-#include <svtools/inettbc.hxx>
 
 namespace sfx2 { class DocumentInserter; }
 namespace sfx2 { class FileDialogHelper; }
 
 class ScDocShell;
+class URLBox;
 
 class ScLinkedAreaDlg : public weld::GenericDialogController
 {
diff --git a/sc/source/ui/inc/mediash.hxx b/sc/source/ui/inc/mediash.hxx
index d6b2358961dd..86737cc103c8 100644
--- a/sc/source/ui/inc/mediash.hxx
+++ b/sc/source/ui/inc/mediash.hxx
@@ -22,10 +22,9 @@
 
 #include <sfx2/shell.hxx>
 #include <shellids.hxx>
-#include <sfx2/module.hxx>
-#include <svx/svdmark.hxx>
 
 class ScViewData;
+class SfxModule;
 
 #include "drawsh.hxx"
 
diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx
index 76a56ac6b162..decadab2568e 100644
--- a/sc/source/ui/inc/msgpool.hxx
+++ b/sc/source/ui/inc/msgpool.hxx
@@ -20,12 +20,10 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_MSGPOOL_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_MSGPOOL_HXX
 
-#include <scitems.hxx>
 #include <svl/srchitem.hxx>
 
 #include <svl/itempool.hxx>
 #include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
 
 #include "uiitems.hxx"
 #include "condformatdlgitem.hxx"
diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx
index 6c56de77f2fa..9836cc544639 100644
--- a/sc/source/ui/inc/mvtabdlg.hxx
+++ b/sc/source/ui/inc/mvtabdlg.hxx
@@ -20,9 +20,11 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX
 
-#include <address.hxx>
+#include <types.hxx>
 #include <vcl/weld.hxx>
 
+class ScDocument;
+
 class ScMoveTableDlg : public weld::GenericDialogController
 {
 public:
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index 7d5885045d2a..aa971727884c 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -13,7 +13,6 @@
 #include "anyrefdg.hxx"
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
 
 #include <map>
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 4139c1ae1c75..cf8192ba4196 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -20,16 +20,13 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_NAMEDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_NAMEDLG_HXX
 
-#include <vcl/combobox.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 
-#include <rangenam.hxx>
 #include "anyrefdg.hxx"
 #include "namemgrtable.hxx"
 
 #include <memory>
-#include <stack>
 #include <map>
 
 class ScViewData;
diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx
index c429dc8b6d3d..adf2175428e9 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_NAMEMGRTABLE_HXX
 
 #include <svtools/simptabl.hxx>
-#include <vcl/ctrl.hxx>
 
 #include <address.hxx>
 
diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx
index ba460fb70488..bf07a076d68d 100644
--- a/sc/source/ui/inc/namepast.hxx
+++ b/sc/source/ui/inc/namepast.hxx
@@ -22,15 +22,12 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
 #include "namemgrtable.hxx"
 
 #include <memory>
 #include <vector>
 #include <map>
 
-#include "scui_def.hxx"
 class ScRangeName;
 class ScDocShell;
 
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 4f6a639586ec..32c6c8b6a9ff 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -25,22 +25,20 @@
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/idle.hxx>
-#include <svl/poolitem.hxx>
 #include <svl/lstner.hxx>
 #include <sfx2/childwin.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
 #include "content.hxx"
 #include <svtools/svmedit.hxx>
 
+class SfxPoolItem;
 class ScTabViewShell;
 class ScViewData;
 class ScArea;
 class ScScenarioWindow;
 class ScNavigatorControllerItem;
-class ScNavigatorDialogWrapper;
 class ScNavigatorDlg;
 class ScNavigatorSettings;
-class VclContainer;
 
 #define SC_DROPMODE_URL         0
 #define SC_DROPMODE_LINK        1
diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx
index 226626dfe8b5..9dbf8422a34b 100644
--- a/sc/source/ui/inc/navsett.hxx
+++ b/sc/source/ui/inc/navsett.hxx
@@ -22,7 +22,6 @@
 
 #include <tools/solar.h>
 
-#include <vector>
 #include <o3tl/enumarray.hxx>
 #include "content.hxx"
 
diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx
index c53ead3fce2c..45a09ed114db 100644
--- a/sc/source/ui/inc/notemark.hxx
+++ b/sc/source/ui/inc/notemark.hxx
@@ -22,12 +22,15 @@
 
 #include <vcl/mapmod.hxx>
 #include <vcl/timer.hxx>
-#include <global.hxx>
+#include <vcl/vclptr.hxx>
+#include <tools/gen.hxx>
 #include <address.hxx>
-#include <postit.hxx>
+
+namespace vcl { class Window; }
 
 class SdrModel;
 class ScDrawView;
+class SdrCaptionObj;
 
 class ScNoteMarker
 {
diff --git a/sc/source/ui/inc/oleobjsh.hxx b/sc/source/ui/inc/oleobjsh.hxx
index 5b88140b4883..fa449b4f2edf 100644
--- a/sc/source/ui/inc/oleobjsh.hxx
+++ b/sc/source/ui/inc/oleobjsh.hxx
@@ -22,10 +22,9 @@
 
 #include <sfx2/shell.hxx>
 #include <shellids.hxx>
-#include <sfx2/module.hxx>
-#include <svx/svdmark.hxx>
 
 class ScViewData;
+class SfxModule;
 
 #include "drawsh.hxx"
 
diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx
index 89e34eca32c4..e29f7df4cbb3 100644
--- a/sc/source/ui/inc/olinefun.hxx
+++ b/sc/source/ui/inc/olinefun.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_OLINEFUN_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_OLINEFUN_HXX
 
-#include <global.hxx>
+#include <types.hxx>
 
 class ScDocShell;
 class ScRange;
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index f6df6e1bef77..1d834af2c784 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -20,13 +20,8 @@
 #define INCLUDED_SC_SOURCE_UI_INC_OPREDLIN_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
-#include <svtools/ctrlbox.hxx>
-#include <svx/fntctrl.hxx>
-#include <svx/strarray.hxx>
+
+class SvxColorListBox;
 
 class ScRedlineOptionsTabPage : public SfxTabPage
 {
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index 99122297b28d..eae17564ada3 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_OPTSOLVER_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_OPTSOLVER_HXX
 
-#include <global.hxx>
 #include <address.hxx>
 #include "anyrefdg.hxx"
 #include <vcl/fixed.hxx>
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index b833eec20333..6150dd78f8d8 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -24,10 +24,9 @@
 #include <cellvalue.hxx>
 #include <tools/color.hxx>
 #include <tools/fract.hxx>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <drawinglayer/processor2d/baseprocessor2d.hxx>
+#include <tools/gen.hxx>
 #include <editeng/svxenum.hxx>
-#include <o3tl/deleter.hxx>
+#include <vcl/outdev.hxx>
 
 namespace sc {
     struct SpellCheckContext;
@@ -36,14 +35,13 @@ namespace sc {
 namespace editeng {
     struct MisspellRanges;
 }
+namespace drawinglayer { namespace processor2d { class BaseProcessor2D; } }
+namespace o3tl { template <typename T> struct default_delete; }
 
-namespace tools { class Rectangle; }
 namespace vcl { class Font; }
-class OutputDevice;
 class EditEngine;
 class ScDocument;
 class ScPatternAttr;
-class SdrObject;
 struct RowInfo;
 struct ScTableInfo;
 class ScTabViewShell;
@@ -57,7 +55,6 @@ class SdrPaintWindow;
 
 enum ScOutputType { OUTTYPE_WINDOW, OUTTYPE_PRINTER };
 
-class ScFieldEditEngine;
 class ClearableClipRegion;
 typedef std::unique_ptr<ClearableClipRegion, o3tl::default_delete<ClearableClipRegion>> ClearableClipRegionPtr;
 
diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx
index 4f0c0579eb81..81a277c42ac2 100644
--- a/sc/source/ui/inc/pagedata.hxx
+++ b/sc/source/ui/inc/pagedata.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_PAGEDATA_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_PAGEDATA_HXX
 
-#include <global.hxx>
 #include <address.hxx>
 #include <memory>
 #include <vector>
diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx
index 7b4537d02004..df40641ad3d6 100644
--- a/sc/source/ui/inc/pfiltdlg.hxx
+++ b/sc/source/ui/inc/pfiltdlg.hxx
@@ -29,12 +29,11 @@
 #include <queryparam.hxx>
 #include <array>
 #include <memory>
-#include <vector>
 
 class ScViewData;
 class ScDocument;
 class ScQueryItem;
-class ScTypedStrData;
+class SfxItemSet;
 struct ScFilterEntries;
 
 class ScPivotFilterDlg : public ModalDialog
diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx
index c90b39b5f783..08276622c1bf 100644
--- a/sc/source/ui/inc/pgbrksh.hxx
+++ b/sc/source/ui/inc/pgbrksh.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_PGBRKSH_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_PGBRKSH_HXX
 
-#include <sfx2/module.hxx>
 #include <sfx2/shell.hxx>
 
 #include <shellids.hxx>
 
+class SfxModule;
 class ScTabViewShell;
 
 class ScPageBreakShell : public SfxShell
diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx
index dd73a9032399..16e5eba32c25 100644
--- a/sc/source/ui/inc/pivotsh.hxx
+++ b/sc/source/ui/inc/pivotsh.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_PIVOTSH_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_PIVOTSH_HXX
 
-#include <sfx2/module.hxx>
 #include <sfx2/shell.hxx>
 
 #include <shellids.hxx>
 
 class ScTabViewShell;
 class ScDPObject;
+class SfxModule;
 
 class ScPivotShell : public SfxShell
 {
diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx
index b6657ef854eb..8cebf10910ee 100644
--- a/sc/source/ui/inc/prevloc.hxx
+++ b/sc/source/ui/inc/prevloc.hxx
@@ -38,9 +38,6 @@
 #define SC_PREVIEW_RANGE_TAB    3
 
 class OutputDevice;
-namespace tools { class Rectangle; }
-class ScAddress;
-class ScRange;
 class ScDocument;
 struct ScPreviewLocationEntry;
 
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 7f7f6b71b9a4..5511d7c661da 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -20,10 +20,9 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_PREVWSH_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_PREVWSH_HXX
 
-class ScrollBar;
+#include <types.hxx>
+#include <scdllapi.h>
 
-#include <address.hxx>
-#include <sfx2/viewfac.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/zoomitem.hxx>
 
@@ -35,6 +34,7 @@ class ScPreview;
 struct ScHeaderFieldData;
 class ScPreviewLocationData;
 class CommandEvent;
+class SfxViewFactory;
 
 class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell
 {
diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx
index f298eeb0db4e..7115b7f20845 100644
--- a/sc/source/ui/inc/printfun.hxx
+++ b/sc/source/ui/inc/printfun.hxx
@@ -24,8 +24,6 @@
 #include <pagepar.hxx>
 #include <editutil.hxx>
 
-#include <vcl/print.hxx>
-
 class SfxPrinter;
 class ScDocShell;
 class ScDocument;
@@ -34,7 +32,6 @@ class SfxItemSet;
 class ScPageHFItem;
 class EditTextObject;
 class MultiSelection;
-class ScHeaderEditEngine;
 class ScPageBreakData;
 class ScPreviewLocationData;
 class ScPrintOptions;
diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx
index 1f87032fad56..3f30ea33180b 100644
--- a/sc/source/ui/inc/protectiondlg.hxx
+++ b/sc/source/ui/inc/protectiondlg.hxx
@@ -22,8 +22,6 @@
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/layout.hxx>
 #include <svx/checklbx.hxx>
 
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 18134d003cff..3dae7b74aa7d 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_SOURCE_UI_INC_PVFUNDLG_HXX
 
 #include <com/sun/star/sheet/DataPilotFieldReference.hpp>
-#include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 
 #include <vcl/fixed.hxx>
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx
index e4202eeb0575..aa16ba72a62d 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_SOURCE_UI_INC_SCUIIMOPTDLG_HXX
 
 #include <vcl/layout.hxx>
+#include <svx/txencbox.hxx>
 #include "imoptdlg.hxx"
 
 class ScDelimiterTable;
diff --git a/sc/source/ui/miscdlgs/datatableview.cxx b/sc/source/ui/miscdlgs/datatableview.cxx
index 897e7a31cdb4..0922c1415801 100644
--- a/sc/source/ui/miscdlgs/datatableview.cxx
+++ b/sc/source/ui/miscdlgs/datatableview.cxx
@@ -27,6 +27,7 @@
 #include <table.hxx>
 
 #include <vcl/builderfactory.hxx>
+#include <vcl/seleng.hxx>
 #include <sal/log.hxx>
 
 constexpr double nPPTX = 0.06666;
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index dbcdc1c25f6f..b0133f593487 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -28,6 +28,7 @@
 #include <document.hxx>
 #include <strings.hrc>
 #include <filldlg.hxx>
+#include <scui_def.hxx>
 
 // class ScFillSeriesDlg
 
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 36f231abcbfd..17d3f752dbad 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -21,6 +21,7 @@
 #include <reffact.hxx>
 #include <document.hxx>
 #include <docsh.hxx>
+#include <chgtrack.hxx>
 
 #include <highred.hxx>
 #include <sfx2/app.hxx>
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 62890a86aab8..a55c27f12272 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/fcontnr.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <svtools/ehdl.hxx>
+#include <svtools/inettbc.hxx>
 #include <svtools/sfxecode.hxx>
 #include <vcl/waitobj.hxx>
 
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index ff2b3cc21784..7b9125bb622e 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -23,6 +23,7 @@
 #include <docsh.hxx>
 #include <rangenam.hxx>
 #include <viewdata.hxx>
+#include <scui_def.hxx>
 
 #include <o3tl/make_unique.hxx>
 
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index ecf866e24754..ca6d105ec212 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -27,6 +27,7 @@
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <scuitphfedit.hxx>
+#include <svx/svxids.hrc>
 
 ScHFEditDlg::ScHFEditDlg( vcl::Window*           pParent,
                           const SfxItemSet& rCoreSet,
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index cc7b9cf20b17..8cc1f28a327c 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -28,6 +28,7 @@
 #include <attrib.hxx>
 #include <tphf.hxx>
 #include <sc.hrc>
+#include <scres.hrc>
 #include <scabstdlg.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>