tdf#42949 Fix IWYU warnings in sc/source/ui/d*/*cxx

Also additions were needed in include/sfx2/msg.hxx
to avoid build breakage

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

Change-Id: I259ff10aaa5d044d4b11f9041174765d5a5f7dc7
Reviewed-on: https://gerrit.libreoffice.org/68364
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

25 files changed, 10 insertions, 143 deletions

diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 9ab065d3fa80..0e9bfe3521f1 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -21,19 +21,12 @@
 #include <svx/svdobj.hxx>
 #include <svx/graphichelper.hxx>
 
-#include <svl/srchitem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/request.hxx>
 #include <vcl/EnumContext.hxx>
-#include <svl/whiter.hxx>
 
 #include <chartsh.hxx>
-#include <drwlayer.hxx>
 #include <sc.hrc>
 #include <viewdata.hxx>
-#include <document.hxx>
-#include <docpool.hxx>
 #include <drawview.hxx>
 #include <gridwin.hxx>
 
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 4d68e8365fd2..33af4c4f1289 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -21,11 +21,8 @@
 #include <svx/dialogs.hrc>
 #include <sc.hrc>
 
-#include <scitems.hxx>
-
 #include <editeng/eeitem.hxx>
 #include <svx/fontwork.hxx>
-#include <svl/srchitem.hxx>
 #include <svx/svdpage.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
@@ -39,12 +36,9 @@
 #include <strings.hrc>
 #include <viewdata.hxx>
 #include <document.hxx>
-#include <docpool.hxx>
 #include <drawview.hxx>
 #include <scresid.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/xtable.hxx>
 #include <tabvwsh.hxx>
 #include <gridwin.hxx>
 #include <sfx2/bindings.hxx>
@@ -57,7 +51,6 @@
 #include <sfx2/evntconf.hxx>
 #include <sfx2/viewsh.hxx>
 #include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <memory>
 
 
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 08cda1bac046..c7946f956f74 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -19,16 +19,13 @@
 
 #include <com/sun/star/embed/EmbedMisc.hpp>
 
-#include <scitems.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xdef.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/ptitem.hxx>
-#include <svl/whiter.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/extrusionbar.hxx>
@@ -48,7 +45,6 @@
 #include <drtxtob.hxx>
 #include <gridwin.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/svdocapt.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index a571411c945a..7184889a6773 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -17,19 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <scitems.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/fontwork.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/xdef.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <svx/svdoashp.hxx>
 #include <drawsh.hxx>
 #include <drawview.hxx>
 #include <viewdata.hxx>
-#include <tabvwsh.hxx>
-#include <sc.hrc>
 
 void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
 {
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 920d62f9b43f..5b1dd28f08ea 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -25,16 +25,9 @@
 #include <tools/urlobj.hxx>
 #include <cliputil.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
-#include <svx/fmglob.hxx>
 #include <svx/hlnkitem.hxx>
-#include <svx/fontwork.hxx>
-#include <svx/svdocapt.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdouno.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svdundo.hxx>
-#include <svx/xdef.hxx>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #include <sfx2/docfile.hxx>
@@ -42,7 +35,6 @@
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
 
 #include <drawsh.hxx>
 #include <drawview.hxx>
@@ -52,7 +44,6 @@
 #include <undotab.hxx>
 #include <drwlayer.hxx>
 #include <userdat.hxx>
-#include <postit.hxx>
 #include <drtxtob.hxx>
 #include <memory>
 
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 43f37575fc1f..4da5061b8e0e 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -17,22 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/eeitem.hxx>
-#include <svx/fontwork.hxx>
-#include <svl/srchitem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/request.hxx>
-#include <svl/whiter.hxx>
+#include <sfx2/msg.hxx>
+#include <sfx2/toolbarids.hxx>
+#include <sfx2/shell.hxx>
 
+#include <drawsh.hxx>
 #include <drformsh.hxx>
-#include <drwlayer.hxx>
-#include <sc.hrc>
-#include <viewdata.hxx>
-#include <document.hxx>
-#include <docpool.hxx>
-#include <drawview.hxx>
-#include <svx/svdobj.hxx>
 #include <vcl/EnumContext.hxx>
 
 #define ShellClass_ScDrawFormShell
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 90708dee1fb6..340c5afe9ee7 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/lang/Locale.hpp>
 #include <comphelper/string.hxx>
 #include <scitems.hxx>
 
@@ -37,16 +36,12 @@
 #include <editeng/ulspitem.hxx>
 #include <svx/hlnkitem.hxx>
 #include <svx/svdoutl.hxx>
-#include <editeng/unolingu.hxx>
-#include <editeng/outlobj.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/shdditem.hxx>
-#include <svl/srchitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/writingmodeitem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
@@ -58,7 +53,6 @@
 #include <svl/languageoptions.hxx>
 
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
 #include <vcl/EnumContext.hxx>
 
 #include <sc.hrc>
@@ -66,7 +60,6 @@
 #include <scresid.hxx>
 #include <scmod.hxx>
 #include <drtxtob.hxx>
-#include <fudraw.hxx>
 #include <viewdata.hxx>
 #include <document.hxx>
 #include <drawview.hxx>
@@ -77,8 +70,6 @@
 #define ShellClass_ScDrawTextObjectBar
 #include <scslots.hxx>
 
-#include <memory>
-
 using namespace ::com::sun::star;
 
 SFX_IMPL_INTERFACE(ScDrawTextObjectBar, SfxShell)
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 92f09f3f61a6..183362cf0b9e 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <scitems.hxx>
 #include <editeng/eeitem.hxx>
 
 #include <svx/svxdlg.hxx>
@@ -27,17 +26,16 @@
 #include <editeng/outliner.hxx>
 #include <editeng/spltitem.hxx>
 #include <editeng/widwitem.hxx>
-#include <sot/exchange.hxx>
+#include <editeng/editids.hrc>
+#include <svx/svxids.hrc>
 #include <vcl/transfer.hxx>
 
-#include <sc.hrc>
 #include <drtxtob.hxx>
 #include <drawview.hxx>
 #include <viewdata.hxx>
 #include <gridwin.hxx>
 
 #include <scabstdlg.hxx>
-#include <memory>
 
 bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
                                                 SfxItemSet& rOutSet , sal_uInt16 nSlot)
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 192f05e6bd34..3af7fa3a95a8 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -17,20 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <scitems.hxx>
 #include <editeng/adjustitem.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/fontwork.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <editeng/outlobj.hxx>
-#include <svx/svdocapt.hxx>
-#include <svx/xtextit.hxx>
 #include <editeng/writingmodeitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
-#include <sot/formats.hxx>
 #include <svl/whiter.hxx>
 #include <svx/svdoashp.hxx>
 #include <sc.hrc>
@@ -38,10 +31,6 @@
 #include <viewdata.hxx>
 #include <drawview.hxx>
 #include <tabvwsh.hxx>
-#include <impex.hxx>
-#include <docsh.hxx>
-#include <transobj.hxx>
-#include <drwtrans.hxx>
 #include <drwlayer.hxx>
 
 sal_uInt16 ScGetFontWorkId()
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 1c93f4a38882..4a05ea4470d5 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <fuconarc.hxx>
-#include <sc.hrc>
 #include <tabvwsh.hxx>
 #include <drawview.hxx>
 
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 6d168ad82740..3ed220a31352 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -27,9 +27,7 @@
 #include <svx/svdoashp.hxx>
 #include <editeng/eeitem.hxx>
 #include <svx/sdtagitm.hxx>
-#include <fuconuno.hxx>
 #include <tabvwsh.hxx>
-#include <sc.hrc>
 #include <drawview.hxx>
 #include <editeng/adjustitem.hxx>
 
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index ed345c5ae5c2..138cf5da8f14 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -19,7 +19,6 @@
 
 #include <fuconpol.hxx>
 #include <tabvwsh.hxx>
-#include <sc.hrc>
 #include <drawview.hxx>
 
 // Create default drawing objects via keyboard
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 5ecc2b057bc1..4761c7a01899 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -19,14 +19,12 @@
 
 #include <fuconrec.hxx>
 #include <tabvwsh.hxx>
-#include <sc.hrc>
 #include <drawview.hxx>
 
 #include <editeng/outlobj.hxx>
 // Create default drawing objects via keyboard
 #include <svx/svdopath.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnstwit.hxx>
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index 1f0abb286391..4e5c54cd6b5b 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdouno.hxx>
@@ -27,10 +26,7 @@
 #include <fudraw.hxx>
 #include <tabvwsh.hxx>
 #include <futext.hxx>
-#include <sc.hrc>
 #include <drawview.hxx>
-#include <document.hxx>
-#include <gridwin.hxx>
 
 //  maximal permitted mouse movement to start Drag&Drop
 //! fusel,fuconstr,futext - combine them!
diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx
index 948b1568ddb3..16c18d075b01 100644
--- a/sc/source/ui/drawfunc/fuconuno.cxx
+++ b/sc/source/ui/drawfunc/fuconuno.cxx
@@ -19,7 +19,6 @@
 
 #include <fuconuno.hxx>
 #include <tabvwsh.hxx>
-#include <sc.hrc>
 #include <drawview.hxx>
 
 FuConstUnoControl::FuConstUnoControl(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
diff --git a/sc/source/ui/drawfunc/fudraw.cxx b/sc/source/ui/drawfunc/fudraw.cxx
index dfcce237c551..383d03c01c04 100644
--- a/sc/source/ui/drawfunc/fudraw.cxx
+++ b/sc/source/ui/drawfunc/fudraw.cxx
@@ -22,10 +22,6 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdouno.hxx>
-#include <svx/svdocapt.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svditer.hxx>
-#include <svx/svdundo.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 
@@ -36,7 +32,6 @@
 #include <drwlayer.hxx>
 #include <userdat.hxx>
 #include <docsh.hxx>
-#include <postit.hxx>
 #include <drawview.hxx>
 
 // base class for draw module specific functions
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 0bbc619ca1da..ebd42bd9db0b 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -41,7 +41,6 @@
 #include <drawview.hxx>
 #include <document.hxx>
 #include <scresid.hxx>
-#include <progress.hxx>
 #include <strings.hrc>
 #include <globstr.hrc>
 
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index e59d85af74a0..6593623a10d8 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -25,15 +25,10 @@
 #include <sot/exchange.hxx>
 #include <svl/globalnameitem.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/docfile.hxx>
 #include <svl/stritem.hxx>
 #include <svx/svdoole2.hxx>
-#include <tools/urlobj.hxx>
-#include <vcl/syschild.hxx>
-#include <svl/urihelper.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <svtools/insdlg.hxx>
-#include <svtools/soerr.hxx>
 #include <svtools/embedhlp.hxx>
 #include <svx/svxdlg.hxx>
 #include <comphelper/classids.hxx>
@@ -41,17 +36,13 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdundo.hxx>
 #include <sfx2/msgpool.hxx>
-#include <svx/charthelper.hxx>
 #include <scmod.hxx>
 #include <sal/log.hxx>
 
-#include <cppuhelper/component_context.hxx>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <com/sun/star/embed/EmbedVerbs.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -66,15 +57,13 @@
 #include <fuinsert.hxx>
 #include <tabvwsh.hxx>
 #include <sc.hrc>
-#include <chartarr.hxx>
+#include <chartpos.hxx>
 #include <docsh.hxx>
 #include <document.hxx>
 #include <undotab.hxx>
-#include <chartlis.hxx>
 #include <uiitems.hxx>
 #include <drawview.hxx>
 #include <markdata.hxx>
-#include <gridwin.hxx>
 #include <dpobject.hxx>
 #include <memory>
 
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 2c450ea7a3d2..9d063a6d80ac 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/embed/EmbedStates.hpp>
-
-#include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <svx/svddrgmt.hxx>
 #include <svx/svdoole2.hxx>
@@ -30,8 +27,8 @@
 #include <svx/svdomedia.hxx>
 #include <svx/svdpagv.hxx>
 #include <editeng/outlobj.hxx>
-#include <svx/svdocapt.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/ipclient.hxx>
 
 #include <fusel.hxx>
 #include <sc.hrc>
@@ -39,11 +36,9 @@
 #include <futext.hxx>
 #include <drawview.hxx>
 #include <tabvwsh.hxx>
-#include <drawpage.hxx>
 #include <drwlayer.hxx>
 #include <userdat.hxx>
 #include <scmod.hxx>
-#include <client.hxx>
 #include <charthelper.hxx>
 #include <docuno.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx
index 85989355a41e..b4ab7cefa6db 100644
--- a/sc/source/ui/drawfunc/fusel2.cxx
+++ b/sc/source/ui/drawfunc/fusel2.cxx
@@ -18,17 +18,12 @@
  */
 
 #include <svx/svditer.hxx>
-#include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
-#include <sfx2/dispatch.hxx>
-#include <editeng/outliner.hxx>
 
 #include <fusel.hxx>
 #include <tabvwsh.hxx>
 #include <document.hxx>
 #include <detfunc.hxx>
-#include <futext.hxx>
-#include <sc.hrc>
 #include <attrib.hxx>
 #include <scitems.hxx>
 #include <userdat.hxx>
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index a298bab0aed6..f1a4afcd91c4 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -24,7 +24,6 @@
 #include <svx/sdtacitm.hxx>
 #include <svx/svdotext.hxx>
 #include <editeng/unolingu.hxx>
-#include <svx/svdocapt.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -38,9 +37,6 @@
 #include <tabvwsh.hxx>
 #include <drawview.hxx>
 
-// Create default drawing objects via keyboard
-#include <scresid.hxx>
-
 // maximum of mouse movement which allows to start Drag&Drop
 //! fusel,fuconstr,futext - combined!
 #define SC_MAXDRAGMOVE  3
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index 67280ed649fb..43e649b687cc 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -17,30 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/editeng.hxx>
-#include <editeng/outlobj.hxx>
 #include <svx/svdocapt.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/svdundo.hxx>
-#include <svx/svdview.hxx>
-#include <editeng/editobj.hxx>
 #include <vcl/cursor.hxx>
-#include <sfx2/objsh.hxx>
-#include <editeng/writingmodeitem.hxx>
 
 #include <global.hxx>
 #include <drwlayer.hxx>
 #include <userdat.hxx>
 #include <tabvwsh.hxx>
 #include <document.hxx>
-#include <editutil.hxx>
 #include <futext.hxx>
 #include <docsh.hxx>
 #include <postit.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
-#include <attrib.hxx>
-#include <scitems.hxx>
 #include <drawview.hxx>
 #include <undocell.hxx>
 
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 64f2e4339838..e1c39b39e3a3 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -17,25 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/request.hxx>
 #include <vcl/EnumContext.hxx>
 #include <sfx2/opengrf.hxx>
-#include <svl/whiter.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/grfflt.hxx>
 #include <svx/grafctrl.hxx>
 #include <svx/compressgraphicdialog.hxx>
 #include <svx/graphichelper.hxx>
+#include <svx/svxids.hrc>
 
 #include <graphsh.hxx>
 #include <strings.hrc>
 #include <viewdata.hxx>
 #include <drawview.hxx>
+#include <gridwin.hxx>
 #include <scresid.hxx>
 #include <svx/extedit.hxx>
-#include <tabvwsh.hxx>
 
 #define ShellClass_ScGraphicShell
 #include <scslots.hxx>
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index 5e236fe3cd36..b70c5cb31d23 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <memory>
-#include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
 #include <avmedia/mediaitem.hxx>
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 5ccf2c705db7..981bf3a30a79 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -17,22 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/eeitem.hxx>
-#include <svx/fontwork.hxx>
-#include <svl/srchitem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/request.hxx>
-#include <svl/whiter.hxx>
 
 #include <oleobjsh.hxx>
-#include <drwlayer.hxx>
-#include <sc.hrc>
-#include <viewdata.hxx>
-#include <document.hxx>
-#include <docpool.hxx>
-#include <drawview.hxx>
-#include <svx/svdobj.hxx>
 #include <vcl/EnumContext.hxx>
 
 #define ShellClass_ScOleObjectShell