Recheck modules s[a-c]* with IWYU

See tdf#42949 for motivation

Change-Id: I867e1f7a2c44210de3281b36e22708a5d32ddb7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129476
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>

60 files changed, 11 insertions, 67 deletions

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 913a2984421f..c619bc4c44c2 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -55,7 +55,6 @@
 #include <comphelper/sequence.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/docfile.hxx>
-#include <svx/unoshape.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <vcl/svapp.hxx>
@@ -69,7 +68,6 @@
 
 #include <algorithm>
 
-#include <svx/unoapi.hxx>
 #include <scmod.hxx>
 
 #ifdef indices
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
index 24b455e30408..c181656fe14b 100644
--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
@@ -21,7 +21,6 @@
 #include <svx/svdmodel.hxx>
 #include <svx/unomod.hxx>
 #include <svx/svdobj.hxx>
-#include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
 
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index c2810113f9c8..aae96bbf281d 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -44,7 +44,6 @@
 #include <svl/stritem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weldutils.hxx>
-#include <vcl/virdev.hxx>
 #include <unotools/charclass.hxx>
 
 #include <inputwin.hxx>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index a941076cfef7..a3ecb34b5f7d 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -33,12 +33,9 @@
 #include <comphelper/lok.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <tools/json_writer.hxx>
-#include <sfx2/viewsh.hxx>
 #include <svl/numformat.hxx>
-#include <vcl/jsdialog/executor.hxx>
 
 #include <document.hxx>
-#include <docsh.hxx>
 #include <viewdata.hxx>
 
 using namespace com::sun::star;
diff --git a/sc/source/ui/dataprovider/sqldataprovider.cxx b/sc/source/ui/dataprovider/sqldataprovider.cxx
index c8ffd0d7aa29..a7d27dfa9426 100644
--- a/sc/source/ui/dataprovider/sqldataprovider.cxx
+++ b/sc/source/ui/dataprovider/sqldataprovider.cxx
@@ -20,7 +20,6 @@
 #include <datamapper.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/processfactory.hxx>
-#include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 
 using namespace css;
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index aa6acd6ba9b2..6752fcb78a3d 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -46,6 +46,7 @@
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/langitem.hxx>
+#include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <editutil.hxx>
 // *** edit engine ***
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index 43b8f296e072..198d82783df6 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -20,7 +20,6 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include <comphelper/processfactory.hxx>
-#include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 
 #include <com/sun/star/sheet/DataImportMode.hpp>
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 6c9ba66db23a..ea948fb827b9 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -34,13 +34,13 @@
 #include <strings.hrc>
 
 #include <filtdlg.hxx>
+#include <svx/colorwindow.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
 #include <svl/numformat.hxx>
 #include <svl/sharedstringpool.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 
 #include <limits>
 
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 8995aceafdff..d30d4b89f236 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -29,6 +29,7 @@
 #include <comphelper/propertyvalue.hxx>
 #include <formula/errorcodes.hxx>
 #include <vcl/stdtext.hxx>
+#include <vcl/syswin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index a3a0a9abb20a..be66c6625401 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -43,7 +43,6 @@
 #include <tabvwsh.hxx>
 #include <document.hxx>
 #include <drwlayer.hxx>
-#include <userdat.hxx>
 #include <drtxtob.hxx>
 #include <gridwin.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index d7c3ee434e0d..82559462c040 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -44,7 +44,6 @@
 #include <docsh.hxx>
 #include <undotab.hxx>
 #include <drwlayer.hxx>
-#include <userdat.hxx>
 #include <drtxtob.hxx>
 #include <memory>
 
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index ed4522fb85e8..ec2e7f0836b7 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -33,8 +33,6 @@
 #include <drawview.hxx>
 #include <editeng/adjustitem.hxx>
 
-#include <math.h>
-
 using namespace com::sun::star;
 
 FuConstCustomShape::FuConstCustomShape(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, const SfxRequest& rReq )
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index df7a0c37d474..62cd366da38f 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -51,7 +51,6 @@
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
-#include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index b203cfeb7fd4..f5b3350ba6a6 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
 #include <sfx2/objface.hxx>
 #include <vcl/EnumContext.hxx>
 #include <svx/MediaShellHelpers.hxx>
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 883b6a063baf..031b6b23f4a3 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -23,7 +23,6 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sc/source/ui/inc/FilterListBox.hxx b/sc/source/ui/inc/FilterListBox.hxx
index f29641165235..a17a1694a89e 100644
--- a/sc/source/ui/inc/FilterListBox.hxx
+++ b/sc/source/ui/inc/FilterListBox.hxx
@@ -21,9 +21,11 @@
 
 #include <types.hxx>
 
+#include <tools/solar.h>
 #include <vcl/weld.hxx>
 
 class ScGridWindow;
+struct ImplSVEvent;
 
 enum class ScFilterBoxMode
 {
diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx
index b4392b3ecbeb..0b317c6eed1f 100644
--- a/sc/source/ui/inc/areasave.hxx
+++ b/sc/source/ui/inc/areasave.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <address.hxx>
-#include <tools/solar.h>
 
 #include <memory>
 #include <vector>
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index e3f75c036ebd..023d5160848a 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -29,7 +29,6 @@
 #include <sot/formats.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/window.hxx>
-#include <tools/solar.h>
 
 class SvxClipboardFormatItem;
 class TransferableDataHelper;
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 31d5a5b97fde..55525bac96f0 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <vcl/dockwin.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
@@ -22,6 +21,7 @@
 class ScCheckListMenuControl;
 class ScViewData;
 struct ScCheckListMember;
+struct ImplSVEvent;
 
 struct ScCheckListMember
 {
diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx
index ca43ed8bb01f..cac9bc71ee26 100644
--- a/sc/source/ui/inc/filtdlg.hxx
+++ b/sc/source/ui/inc/filtdlg.hxx
@@ -25,8 +25,6 @@
 #include <filterentries.hxx>
 #include <queryentry.hxx>
 
-#include <svx/colorbox.hxx>
-
 #include <memory>
 #include <deque>
 #include <vector>
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 0aa1d55272c9..5acb900dca6f 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -26,6 +26,7 @@
 #include "checklistmenu.hxx"
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <o3tl/deleter.hxx>
+#include <vcl/window.hxx>
 
 #include <memory>
 #include <vector>
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index 031a0ca3c571..aafeb00c9a0c 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -24,6 +24,8 @@
 #include <address.hxx>
 #include <tools/stream.hxx>
 
+#include <com/sun/star/uno/Any.hxx>
+
 class ScDocShell;
 class ScDocument;
 class ScAsciiOptions;
diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx
index 1214e5a8f640..54829050f984 100644
--- a/sc/source/ui/inc/linkarea.hxx
+++ b/sc/source/ui/inc/linkarea.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <sfx2/objsh.hxx>
-#include <tools/solar.h>
 #include <vcl/weld.hxx>
 
 namespace sfx2 { class DocumentInserter; }
diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx
index 24ea708cf7c8..4247f2ad9807 100644
--- a/sc/source/ui/inc/tphfedit.hxx
+++ b/sc/source/ui/inc/tphfedit.hxx
@@ -21,7 +21,6 @@
 
 #include <scdllapi.h>
 #include <editutil.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <svx/weldeditview.hxx>
 #include <editeng/svxenum.hxx>
 #include <unotools/weakref.hxx>
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index ef1c69ea010f..76846f194bc4 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -21,7 +21,6 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <global.hxx>
-#include <sheetlimits.hxx>
 
 class ScViewData;
 class ScDocument;
diff --git a/sc/source/ui/inc/uiobject.hxx b/sc/source/ui/inc/uiobject.hxx
index 01ebdcdc6e89..4545c50e79e2 100644
--- a/sc/source/ui/inc/uiobject.hxx
+++ b/sc/source/ui/inc/uiobject.hxx
@@ -8,7 +8,6 @@
  */
 
 #include "gridwin.hxx"
-#include "navipi.hxx"
 #include <memory>
 #include <vcl/uitest/uiobject.hxx>
 
diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx
index a4b3a7f44f76..6c169c43e32b 100644
--- a/sc/source/ui/inc/undostyl.hxx
+++ b/sc/source/ui/inc/undostyl.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <memory>
 #include <optional>
 #include <svl/style.hxx>
 #include <svl/itemset.hxx>
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 598a9b29e4c1..93ca94034434 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -33,7 +33,6 @@
 #include <o3tl/unit_conversion.hxx>
 #include <osl/diagnose.h>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <svtools/scriptedtext.hxx>
 #include <svx/framelink.hxx>
 #include <vcl/settings.hxx>
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 2d1f0fd56ddb..c72201d26fb5 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -20,7 +20,6 @@
 #undef SC_DLLIMPLEMENTATION
 
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 25dbd47d13e9..947b983eccf2 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -27,7 +27,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
-#include <global.hxx>
 #include <docsh.hxx>
 #include <viewdata.hxx>
 #include <globstr.hrc>
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index 195b64156e08..0294752a5b1e 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -29,7 +29,6 @@
 #include <svtools/sfxecode.hxx>
 
 #include <linkarea.hxx>
-#include <rangeutl.hxx>
 #include <docsh.hxx>
 #include <tablink.hxx>
 #include <scresid.hxx>
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 0905e67f91af..f0f5eb30c5d7 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -20,7 +20,6 @@
 #include <rangelst.hxx>
 #include <sfx2/bindings.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index c55e81e86856..f7cd8e27b695 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -20,7 +20,6 @@
 #include <scitems.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index ca3956ad8cd4..7d42d988140b 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -24,7 +24,6 @@
 #include <sfx2/navigat.hxx>
 #include <svl/stritem.hxx>
 #include <unotools/charclass.hxx>
-#include <uiobject.hxx>
 
 #include <viewdata.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 341fd764fe3d..3bbc6309ccd5 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -31,7 +31,6 @@
 #include <globstr.hrc>
 #include <scresid.hxx>
 #include <helpids.h>
-#include <global.hxx>
 
 // class ScScenarioWindow ------------------------------------------------
 
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index a7cc06088376..4974dcb3a519 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -22,7 +22,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 
 #include <globstr.hrc>
 #include <scresid.hxx>
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 8c3cf35c9038..55351cdcf8fc 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -25,7 +25,6 @@
 #include <vcl/weld.hxx>
 #include <osl/diagnose.h>
 
-#include <global.hxx>
 #include <document.hxx>
 #include <tabvwsh.hxx>
 #include <viewdata.hxx>
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 80a5db3027a9..ddec413e9dc9 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -31,7 +31,6 @@
 #include <unotools/useroptions.hxx>
 
 #include <editutil.hxx>
-#include <global.hxx>
 #include <attrib.hxx>
 #include <patattr.hxx>
 
diff --git a/sc/source/ui/uitest/uiobject.cxx b/sc/source/ui/uitest/uiobject.cxx
index d1f3592cecf3..58722b50e831 100644
--- a/sc/source/ui/uitest/uiobject.cxx
+++ b/sc/source/ui/uitest/uiobject.cxx
@@ -18,7 +18,6 @@
 #include <dbfunc.hxx>
 #include <tabvwsh.hxx>
 #include <drwlayer.hxx>
-#include <navipi.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 9ebad7062809..27a3dc4c7917 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -21,7 +21,6 @@
 
 #include <svl/hint.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index c3c555636167..e19324cc37e7 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -20,7 +20,6 @@
 #include <editeng/memberids.h>
 #include <svl/hint.hxx>
 #include <svl/itemprop.hxx>
-#include <tools/UnitConversion.hxx>
 #include <vcl/svapp.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 563d34b3c2c2..33f5a7d617fa 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/sequence.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/editview.hxx>
+#include <editeng/memberids.h>
 #include <editeng/outliner.hxx>
 #include <o3tl/any.hxx>
 #include <o3tl/safeint.hxx>
@@ -32,7 +33,6 @@
 #include <svx/svditer.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svxids.hrc>
-#include <svx/unoshape.hxx>
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/propertysequence.hxx>
@@ -52,7 +52,6 @@
 #include <tools/multisel.hxx>
 #include <tools/UnitConversion.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
-#include <unotools/saveopt.hxx>
 
 #include <float.h>
 
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index b5a50798b171..e5fc5848e1f0 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -29,7 +29,6 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
-#include <tools/solar.h>
 
 using namespace ::com::sun::star;
 using utl::MediaDescriptor;
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index d3e1c86747d4..accef3fd990d 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -27,7 +27,6 @@
 #include <svx/ImageMapInfo.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/event.hxx>
-#include <svx/unoshape.hxx>
 #include <editeng/unofield.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 8bf699b09ed3..9d3ca299872b 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/hint.hxx>
diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx
index 3d3cf42b95aa..0b72481e31ed 100644
--- a/sc/source/ui/vba/excelvbahelper.hxx
+++ b/sc/source/ui/vba/excelvbahelper.hxx
@@ -22,7 +22,6 @@
 
 #include <comphelper/servicehelper.hxx>
 
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <vector>
 #include <global.hxx>
 
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index a76267071bd5..1caea374fb71 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -22,7 +22,6 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <vcl/EnumContext.hxx>
-#include <osl/diagnose.h>
 
 #include <auditsh.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index f24c06e9a0d2..b373fd4561bd 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -26,7 +26,6 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <svl/stritem.hxx>
-#include <tools/UnitConversion.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <globstr.hrc>
diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx
index cfc60ff23505..9658fa7ff20b 100644
--- a/sc/source/ui/view/drawutil.cxx
+++ b/sc/source/ui/view/drawutil.cxx
@@ -24,7 +24,6 @@
 
 #include <drawutil.hxx>
 #include <document.hxx>
-#include <global.hxx>
 #include <viewdata.hxx>
 
 void ScDrawUtil::CalcScale( const ScDocument& rDoc, SCTAB nTab,
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 80cbf4e3728a..ab24d8cd5371 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -51,7 +51,6 @@
 #include <sot/formats.hxx>
 #include <comphelper/classids.hxx>
 
-#include <svx/drawitem.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 17c4057e8337..c5e97a2ffdf5 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -79,9 +79,6 @@
 #include <vcl/virdev.hxx>
 #include <svx/sdrpaintwindow.hxx>
 #include <drwlayer.hxx>
-#include <columnspanset.hxx>
-#include <docfunc.hxx>
-#include <printfun.hxx>
 
 static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle& rVisible )
 {
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index 032d84a3c230..c20663ecf775 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -40,7 +40,6 @@
 #include <chgtrack.hxx>
 #include <chgviset.hxx>
 #include <dbfunc.hxx>
-#include <userdat.hxx>
 #include <postit.hxx>
 #include <global.hxx>
 
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index e4c138055bbe..dcfbccb6c1fa 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -19,11 +19,10 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <vcl/image.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/syswin.hxx>
 #include <osl/diagnose.h>
 
 #include <olinewin.hxx>
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index ecadef053c19..5109b710b5fc 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -28,7 +28,6 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svtools/accessibilityoptions.hxx>
 #include <svl/itemset.hxx>
 #include <tools/multisel.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 5e6d7be6d392..d83d4206198d 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -53,7 +53,6 @@
 
 #include <comphelper/lok.hxx>
 #include <officecfg/Office/Calc.hxx>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index f61b8652064b..36b4a2cb9d6e 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -22,9 +22,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/whiter.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
-#include <svl/ctloptions.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/UnitConversion.hxx>
 
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 0758a9fe3724..ae0b86f86541 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -19,7 +19,6 @@
 
 #include <svl/hint.hxx>
 #include <comphelper/lok.hxx>
-#include <svl/zforlist.hxx>
 #include <svx/numfmtsh.hxx>
 #include <svx/numinf.hxx>
 #include <svx/svxids.hrc>
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index f0d5e5f7d272..e6de1564995e 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -26,7 +26,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <basic/sbstar.hxx>
 #include <basic/sberrors.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index a9a2b36d6349..26aa7907779a 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -32,7 +32,6 @@
 #include <svl/numformat.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/virdev.hxx>
 #include <stdlib.h>
@@ -48,7 +47,6 @@
 #include <patattr.hxx>
 #include <docpool.hxx>
 #include <sc.hrc>
-#include <strings.hrc>
 #include <undocell.hxx>
 #include <undoblk.hxx>
 #include <refundo.hxx>
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index ad6b770eca03..902c8c0a0bec 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -15,7 +15,6 @@
 #include <reffact.hxx>
 #include <tabvwsh.hxx>
 
-#include <unotools/pathoptions.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/objsh.hxx>