summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basctl/inc/pch/precompiled_basctl.hxx1
-rw-r--r--basic/inc/pch/precompiled_sb.hxx1
-rw-r--r--canvas/workben/canvasdemo.cxx1
-rw-r--r--desktop/inc/pch/precompiled_deploymentgui.hxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_theextmgr.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx1
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx1
-rw-r--r--desktop/source/deployment/gui/license_dialog.cxx1
-rw-r--r--editeng/inc/pch/precompiled_editeng.hxx1
-rw-r--r--editeng/source/editeng/editattr.cxx1
-rw-r--r--editeng/source/editeng/editdoc.cxx1
-rw-r--r--editeng/source/editeng/editobj.cxx1
-rw-r--r--editeng/source/editeng/editsel.cxx1
-rw-r--r--editeng/source/editeng/editundo.cxx1
-rw-r--r--editeng/source/editeng/editview.cxx2
-rw-r--r--editeng/source/editeng/edtspell.cxx1
-rw-r--r--editeng/source/editeng/eehtml.cxx1
-rw-r--r--editeng/source/editeng/eeobj.cxx1
-rw-r--r--editeng/source/editeng/eerdll.cxx1
-rw-r--r--editeng/source/editeng/eertfpar.cxx1
-rw-r--r--editeng/source/editeng/impedit.cxx1
-rw-r--r--editeng/source/editeng/impedit2.cxx1
-rw-r--r--editeng/source/editeng/impedit3.cxx1
-rw-r--r--editeng/source/editeng/impedit4.cxx1
-rw-r--r--editeng/source/editeng/impedit5.cxx1
-rw-r--r--editeng/source/editeng/textconv.cxx1
-rw-r--r--editeng/source/misc/hangulhanja.cxx1
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx1
-rw-r--r--extensions/source/abpilot/unodialogabp.cxx1
-rw-r--r--extensions/source/bibliography/datman.cxx1
-rw-r--r--extensions/source/bibliography/framectr.cxx1
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx1
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx1
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx1
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx1
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx1
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx1
-rw-r--r--extensions/source/propctrlr/listselectiondlg.cxx1
-rw-r--r--filter/source/graphicfilter/egif/egif.cxx1
-rw-r--r--filter/source/graphicfilter/eps/eps.cxx1
-rw-r--r--filter/source/graphicfilter/etiff/etiff.cxx1
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx1
-rw-r--r--fpicker/source/office/PlacesListBox.cxx1
-rw-r--r--fpicker/source/office/commonpicker.cxx1
-rw-r--r--fpicker/source/office/iodlgimp.cxx1
-rw-r--r--fpicker/test/svdem.cxx1
-rw-r--r--include/svtools/asynclink.hxx1
-rw-r--r--reportdesign/inc/pch/precompiled_rptui.hxx1
-rw-r--r--reportdesign/source/filter/xml/dbloader2.hxx1
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.cxx1
-rw-r--r--reportdesign/source/ui/dlg/DateTime.cxx1
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx1
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx1
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.cxx1
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx1
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx1
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx1
-rw-r--r--sc/inc/pch/precompiled_sc.hxx1
-rw-r--r--sc/inc/pch/precompiled_scui.hxx1
-rw-r--r--sc/inc/pch/precompiled_vbaobj.hxx1
-rw-r--r--sc/source/core/data/documen8.cxx1
-rw-r--r--sc/source/core/data/validat.cxx1
-rw-r--r--sc/source/ui/app/scmod.cxx1
-rw-r--r--sc/source/ui/condformat/condformatdlg.cxx1
-rw-r--r--sc/source/ui/condformat/condformatdlgentry.cxx1
-rw-r--r--sc/source/ui/condformat/condformatmgr.cxx1
-rw-r--r--sc/source/ui/dbgui/pvfundlg.cxx1
-rw-r--r--sc/source/ui/dbgui/sfiltdlg.cxx1
-rw-r--r--sc/source/ui/dbgui/sortdlg.cxx1
-rw-r--r--sc/source/ui/dbgui/textimportoptions.cxx1
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx1
-rw-r--r--sc/source/ui/docshell/docfunc.cxx1
-rw-r--r--sc/source/ui/docshell/docsh3.cxx1
-rw-r--r--sc/source/ui/drawfunc/chartsh.cxx1
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx1
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx1
-rw-r--r--sc/source/ui/drawfunc/drformsh.cxx1
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx1
-rw-r--r--sc/source/ui/drawfunc/drtxtob1.cxx1
-rw-r--r--sc/source/ui/drawfunc/fuins1.cxx1
-rw-r--r--sc/source/ui/drawfunc/fuins2.cxx1
-rw-r--r--sc/source/ui/drawfunc/graphsh.cxx1
-rw-r--r--sc/source/ui/drawfunc/oleobjsh.cxx1
-rw-r--r--sc/source/ui/inc/redcom.hxx1
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx1
-rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx1
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx1
-rw-r--r--sc/source/ui/miscdlgs/highred.cxx1
-rw-r--r--sc/source/ui/miscdlgs/instbdlg.cxx1
-rw-r--r--sc/source/ui/miscdlgs/lbseldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/mvtabdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx1
-rw-r--r--sc/source/ui/miscdlgs/protectiondlg.cxx1
-rw-r--r--sc/source/ui/miscdlgs/redcom.cxx1
-rw-r--r--sc/source/ui/miscdlgs/retypepassdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/shtabdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/simpref.cxx1
-rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx1
-rw-r--r--sc/source/ui/miscdlgs/solvrdlg.cxx1
-rw-r--r--sc/source/ui/namedlg/namedefdlg.cxx1
-rw-r--r--sc/source/ui/namedlg/namedlg.cxx1
-rw-r--r--sc/source/ui/navipi/scenwnd.cxx1
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx1
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx1
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx1
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx1
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx1
-rw-r--r--sc/source/ui/pagedlg/tphfedit.cxx1
-rw-r--r--sc/source/ui/unoobj/filtuno.cxx1
-rw-r--r--sc/source/ui/vba/vbaname.cxx1
-rw-r--r--sc/source/ui/vba/vbanames.cxx1
-rw-r--r--sc/source/ui/view/cellsh2.cxx1
-rw-r--r--sc/source/ui/view/editsh.cxx1
-rw-r--r--sc/source/ui/view/formatsh.cxx1
-rw-r--r--sc/source/ui/view/gridwin2.cxx1
-rw-r--r--sc/source/ui/view/pivotsh.cxx1
-rw-r--r--sc/source/ui/view/prevwsh.cxx1
-rw-r--r--sc/source/ui/view/tabvwsh3.cxx1
-rw-r--r--sc/source/ui/view/tabvwsha.cxx1
-rw-r--r--sc/source/ui/view/tabvwshc.cxx1
-rw-r--r--sc/source/ui/view/tabvwshh.cxx1
-rw-r--r--sc/source/ui/view/viewfun5.cxx1
-rw-r--r--sc/source/ui/view/viewfun6.cxx1
-rw-r--r--sc/source/ui/view/viewutil.cxx1
-rw-r--r--sd/inc/pch/precompiled_sd.hxx1
-rw-r--r--sd/inc/pch/precompiled_sdui.hxx1
-rw-r--r--sd/source/core/drawdoc3.cxx1
-rw-r--r--sd/source/filter/html/pubdlg.cxx1
-rw-r--r--sd/source/filter/html/sdhtmlfilter.cxx1
-rw-r--r--sd/source/filter/ppt/pptin.cxx1
-rw-r--r--sd/source/ui/app/sdmod1.cxx1
-rw-r--r--sd/source/ui/app/sdmod2.cxx1
-rw-r--r--sd/source/ui/app/sdxfer.cxx1
-rw-r--r--sd/source/ui/dlg/brkdlg.cxx1
-rw-r--r--sd/source/ui/dlg/filedlg.cxx1
-rw-r--r--sd/source/ui/dlg/sdpreslt.cxx1
-rw-r--r--sd/source/ui/dlg/vectdlg.cxx1
-rw-r--r--sd/source/ui/docshell/docshel2.cxx1
-rw-r--r--sd/source/ui/func/fuarea.cxx1
-rw-r--r--sd/source/ui/func/fubullet.cxx1
-rw-r--r--sd/source/ui/func/fuchar.cxx1
-rw-r--r--sd/source/ui/func/fuconnct.cxx1
-rw-r--r--sd/source/ui/func/fucushow.cxx1
-rw-r--r--sd/source/ui/func/fuhhconv.cxx1
-rw-r--r--sd/source/ui/func/fuinsert.cxx1
-rw-r--r--sd/source/ui/func/fuinsfil.cxx1
-rw-r--r--sd/source/ui/func/fuline.cxx1
-rw-r--r--sd/source/ui/func/fumeasur.cxx1
-rw-r--r--sd/source/ui/func/fuoaprms.cxx1
-rw-r--r--sd/source/ui/func/fuolbull.cxx1
-rw-r--r--sd/source/ui/func/fuparagr.cxx1
-rw-r--r--sd/source/ui/func/fuprlout.cxx1
-rw-r--r--sd/source/ui/func/fuprobjs.cxx1
-rw-r--r--sd/source/ui/func/fusldlg.cxx1
-rw-r--r--sd/source/ui/func/fusnapln.cxx1
-rw-r--r--sd/source/ui/func/futempl.cxx1
-rw-r--r--sd/source/ui/func/futransf.cxx1
-rw-r--r--sd/source/ui/func/futxtatt.cxx1
-rw-r--r--sd/source/ui/func/fuvect.cxx1
-rw-r--r--sd/source/ui/sidebar/SlideBackground.cxx1
-rw-r--r--sd/source/ui/slidesorter/controller/SlsClipboard.cxx1
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx1
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSlotManager.cxx1
-rw-r--r--sd/source/ui/table/tablefunction.cxx1
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx1
-rw-r--r--sd/source/ui/view/Outliner.cxx1
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx1
-rw-r--r--sd/source/ui/view/ViewShellImplementation.cxx1
-rw-r--r--sd/source/ui/view/drviews1.cxx1
-rw-r--r--sd/source/ui/view/drviews6.cxx1
-rw-r--r--sd/source/ui/view/drviews8.cxx1
-rw-r--r--sd/source/ui/view/drviewsb.cxx1
-rw-r--r--sd/source/ui/view/drviewsc.cxx1
-rw-r--r--sd/source/ui/view/outlnvs2.cxx1
-rw-r--r--sd/source/ui/view/outlview.cxx1
-rw-r--r--sd/source/ui/view/sdview.cxx1
-rw-r--r--sd/source/ui/view/sdview2.cxx1
-rw-r--r--sd/source/ui/view/viewshe3.cxx1
-rw-r--r--sfx2/inc/pch/precompiled_sfx.hxx1
-rw-r--r--sfx2/source/appl/app.cxx1
-rw-r--r--sfx2/source/appl/appbas.cxx1
-rw-r--r--sfx2/source/appl/appcfg.cxx1
-rw-r--r--sfx2/source/appl/appdata.cxx1
-rw-r--r--sfx2/source/appl/appinit.cxx1
-rw-r--r--sfx2/source/appl/appmisc.cxx1
-rw-r--r--sfx2/source/appl/fileobj.cxx1
-rw-r--r--sfx2/source/appl/impldde.cxx2
-rw-r--r--sfx2/source/appl/newhelp.cxx1
-rw-r--r--sfx2/source/config/evntconf.cxx1
-rw-r--r--sfx2/source/dialog/backingwindow.cxx1
-rw-r--r--sfx2/source/dialog/basedlgs.cxx1
-rw-r--r--sfx2/source/dialog/checkin.cxx1
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx1
-rw-r--r--sfx2/source/dialog/mgetempl.cxx1
-rw-r--r--sfx2/source/dialog/printopt.cxx1
-rw-r--r--sfx2/source/dialog/styledlg.cxx1
-rw-r--r--sfx2/source/dialog/tabdlg.cxx1
-rw-r--r--sfx2/source/dialog/versdlg.cxx1
-rw-r--r--sfx2/source/doc/docfile.cxx1
-rw-r--r--sfx2/source/doc/docinsert.cxx1
-rw-r--r--sfx2/source/doc/new.cxx1
-rw-r--r--sfx2/source/doc/objmisc.cxx1
-rw-r--r--sfx2/source/doc/objxtor.cxx1
-rw-r--r--sfx2/source/view/frame.cxx1
-rw-r--r--sfx2/source/view/printer.cxx1
-rw-r--r--sfx2/source/view/sfxbasecontroller.cxx1
-rw-r--r--sfx2/source/view/viewsh.cxx1
-rw-r--r--svx/inc/pch/precompiled_svx.hxx1
-rw-r--r--svx/inc/pch/precompiled_svxcore.hxx1
-rw-r--r--sw/inc/pch/precompiled_sw.hxx1
-rw-r--r--sw/inc/pch/precompiled_swui.hxx1
-rw-r--r--sw/source/core/crsr/swcrsr.cxx1
-rw-r--r--sw/source/core/edit/autofmt.cxx2
-rw-r--r--sw/source/core/edit/edlingu.cxx1
-rw-r--r--sw/source/filter/basflt/fltini.cxx1
-rw-r--r--sw/source/ui/chrdlg/break.cxx1
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx1
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx1
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx1
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx1
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx1
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx1
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx1
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx1
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx1
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx1
-rw-r--r--sw/source/ui/dialog/macassgn.cxx1
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx1
-rw-r--r--sw/source/ui/envelp/envfmt.cxx1
-rw-r--r--sw/source/ui/envelp/envlop1.cxx1
-rw-r--r--sw/source/ui/envelp/labfmt.hxx1
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx1
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx1
-rw-r--r--sw/source/ui/fldui/changedb.cxx1
-rw-r--r--sw/source/ui/fldui/fldedt.cxx1
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx1
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx1
-rw-r--r--sw/source/ui/fldui/javaedit.cxx1
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx1
-rw-r--r--sw/source/ui/frmdlg/column.cxx1
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx1
-rw-r--r--sw/source/ui/misc/insfnote.cxx1
-rw-r--r--sw/source/ui/misc/linenum.cxx1
-rw-r--r--sw/source/ui/misc/num.cxx1
-rw-r--r--sw/source/ui/misc/outline.cxx1
-rw-r--r--sw/source/ui/misc/srtdlg.cxx1
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx1
-rw-r--r--sw/source/ui/misc/titlepage.cxx1
-rw-r--r--sw/source/ui/table/convert.cxx1
-rw-r--r--sw/source/ui/table/tabledlg.cxx1
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx1
-rw-r--r--sw/source/uibase/app/appenv.cxx1
-rw-r--r--sw/source/uibase/app/apphdl.cxx1
-rw-r--r--sw/source/uibase/app/applab.cxx1
-rw-r--r--sw/source/uibase/app/appopt.cxx1
-rw-r--r--sw/source/uibase/app/swmodul1.cxx1
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx1
-rw-r--r--sw/source/uibase/dbui/mailmergehelper.cxx1
-rw-r--r--sw/source/uibase/dialog/regionsw.cxx1
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx1
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.cxx1
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx1
-rw-r--r--sw/source/uibase/fldui/fldwrap.cxx1
-rw-r--r--sw/source/uibase/inc/redlndlg.hxx1
-rw-r--r--sw/source/uibase/index/idxmrk.cxx1
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx1
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx1
-rw-r--r--sw/source/uibase/shells/annotsh.cxx1
-rw-r--r--sw/source/uibase/shells/basesh.cxx1
-rw-r--r--sw/source/uibase/shells/drawdlg.cxx1
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx1
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx1
-rw-r--r--sw/source/uibase/shells/drwtxtsh.cxx1
-rw-r--r--sw/source/uibase/shells/frmsh.cxx1
-rw-r--r--sw/source/uibase/shells/grfsh.cxx1
-rw-r--r--sw/source/uibase/shells/grfshex.cxx1
-rw-r--r--sw/source/uibase/shells/langhelper.cxx2
-rw-r--r--sw/source/uibase/shells/mediash.cxx1
-rw-r--r--sw/source/uibase/shells/tabsh.cxx1
-rw-r--r--sw/source/uibase/shells/textfld.cxx1
-rw-r--r--sw/source/uibase/shells/textidx.cxx1
-rw-r--r--sw/source/uibase/shells/textsh.cxx1
-rw-r--r--sw/source/uibase/shells/textsh2.cxx1
-rw-r--r--sw/source/uibase/shells/txtattr.cxx1
-rw-r--r--sw/source/uibase/shells/txtnum.cxx1
-rw-r--r--sw/source/uibase/table/chartins.cxx1
-rw-r--r--sw/source/uibase/table/swtablerep.cxx1
-rw-r--r--sw/source/uibase/uiview/pview.cxx1
-rw-r--r--sw/source/uibase/uiview/srcview.cxx1
-rw-r--r--sw/source/uibase/uiview/uivwimp.cxx1
-rw-r--r--sw/source/uibase/uiview/view2.cxx1
-rw-r--r--sw/source/uibase/uiview/viewling.cxx1
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx1
-rw-r--r--sw/source/uibase/uno/SwXFilterOptions.cxx1
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx1
-rw-r--r--sw/source/uibase/utlui/gloslst.cxx1
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx1
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx1
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx1
-rw-r--r--uui/source/authfallbackdlg.cxx1
-rw-r--r--uui/source/fltdlg.hxx1
-rw-r--r--uui/source/iahndl-authentication.cxx1
-rw-r--r--uui/source/iahndl-locking.cxx1
-rw-r--r--uui/source/logindlg.cxx1
-rw-r--r--vcl/qa/cppunit/dndtest.cxx1
-rw-r--r--vcl/source/window/dialog.cxx1
-rw-r--r--vcl/unx/generic/app/gensys.cxx1
-rw-r--r--xmlsecurity/source/dialogs/certificatechooser.cxx1
-rw-r--r--xmlsecurity/source/dialogs/macrosecurity.cxx2
309 files changed, 4 insertions, 314 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index ae77ead0b697..a9d35fa89690 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -157,7 +157,6 @@
#include <vcl/metaact.hxx>
#include <vcl/metaactiontypes.hxx>
#include <vcl/mnemonicengine.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/notebookbar.hxx>
#include <vcl/outdev.hxx>
#include <vcl/outdevmap.hxx>
diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index 9e9dbe6fa543..a6177f48f86c 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -51,7 +51,6 @@
#include <vcl/dllapi.h>
#include <vcl/errcode.hxx>
#include <vcl/mapmod.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/frame/XModel.hpp>
diff --git a/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index 94e6531d208c..c419bb72775a 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.cxx
@@ -48,7 +48,6 @@
#include <rtl/bootstrap.hxx>
#include <sal/macros.h>
#include <vcl/canvastools.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/unowrap.hxx>
#include <vcl/virdev.hxx>
diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx
index 38b78d6c3fa4..3ee56d5d2985 100644
--- a/desktop/inc/pch/precompiled_deploymentgui.hxx
+++ b/desktop/inc/pch/precompiled_deploymentgui.hxx
@@ -65,7 +65,6 @@
#include <vcl/image.hxx>
#include <vcl/layout.hxx>
#include <vcl/mnemonicengine.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/outdev.hxx>
#include <vcl/quickselectionengine.hxx>
#include <vcl/salnativewidgets.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index ca84148ec7de..94a8dd09df6c 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -18,7 +18,6 @@
*/
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 0e12991f1ee8..1b33096de022 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -92,7 +92,6 @@
#include <vcl/dialog.hxx>
#include <vcl/fixed.hxx>
#include <vcl/image.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 481beee3c729..0541a0b04f47 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -25,7 +25,6 @@
#include <osl/conditn.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 39c5d61d427e..0fa3678cc838 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -24,7 +24,6 @@
#include <comphelper/unwrapargs.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <svtools/svmedit.hxx>
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 1d46896001e9..151d38fcaba2 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -115,7 +115,6 @@
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metric.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/outdev.hxx>
#include <vcl/region.hxx>
#include <vcl/salgtype.hxx>
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index 02cca758ed79..13ed53906ebf 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -20,7 +20,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <svl/grabbagitem.hxx>
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index ce315aaed1bb..fd22c598f1b9 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -21,7 +21,6 @@
#include <comphelper/string.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <editeng/tstpitem.hxx>
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 31fc124a52f1..8d54e04851dc 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -22,7 +22,6 @@
#include <rtl/strbuf.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <tools/stream.hxx>
diff --git a/editeng/source/editeng/editsel.cxx b/editeng/source/editeng/editsel.cxx
index 73bdc4a7e414..33f8a26b88dc 100644
--- a/editeng/source/editeng/editsel.cxx
+++ b/editeng/source/editeng/editsel.cxx
@@ -19,7 +19,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include "editsel.hxx"
#include "impedit.hxx"
diff --git a/editeng/source/editeng/editundo.cxx b/editeng/source/editeng/editundo.cxx
index aa02fa49f1d6..89007b3a20e2 100644
--- a/editeng/source/editeng/editundo.cxx
+++ b/editeng/source/editeng/editundo.cxx
@@ -20,7 +20,6 @@
#include <memory>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include "impedit.hxx"
#include "editundo.hxx"
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 6e1d4ec481a1..a762fd935f03 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -20,9 +20,9 @@
#include <memory>
#include <sal/macros.h>
+#include <vcl/image.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <com/sun/star/i18n/WordType.hpp>
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 72dbf1666564..61ca57ae0d81 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -20,7 +20,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include "impedit.hxx"
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 8e56f488f316..79de3dc22ae0 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -20,7 +20,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include "eehtml.hxx"
#include <editeng/adjustitem.hxx>
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 9e099813af33..188eb510a7ab 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include "eeobj.hxx"
#include <sot/exchange.hxx>
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index c8feafaedcf4..ad574cf9b6a3 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -21,7 +21,6 @@
#include <unotools/resmgr.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <com/sun/star/linguistic2/LanguageGuessing.hpp>
diff --git a/editeng/source/editeng/eertfpar.cxx b/editeng/source/editeng/eertfpar.cxx
index 3fb2afb68159..1b6bfce431a1 100644
--- a/editeng/source/editeng/eertfpar.cxx
+++ b/editeng/source/editeng/eertfpar.cxx
@@ -21,7 +21,6 @@
#include <utility>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include "eertfpar.hxx"
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 2cb670cd73fe..dabcd1c61d87 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -19,7 +19,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 362b828decbf..1d1ca663ee14 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -20,7 +20,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <editeng/lspcitem.hxx>
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 8b67a8eb7c74..4e077450c5ef 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -20,7 +20,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/metaact.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 75cb969b1887..4061a3b6f9fa 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -20,7 +20,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <svl/srchitem.hxx>
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index f826e9077062..12b1b8432533 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -20,7 +20,6 @@
#include <memory>
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include "impedit.hxx"
#include <editeng/editeng.hxx>
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index 535f9405096c..0e5f9468535f 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -20,7 +20,6 @@
#include <vcl/wrkwin.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include "impedit.hxx"
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index f98ad911209b..1e7264bf275d 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -18,7 +18,6 @@
*/
#include <editeng/hangulhanja.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/button.hxx>
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index efd0227d2944..73d0cdfe58a6 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -25,7 +25,6 @@
#include <unotools/pathoptions.hxx>
#include <svl/filenotation.hxx>
#include <sfx2/docfilt.hxx>
-#include <vcl/msgbox.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 1c1eeaaca233..dee2c9d0a231 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -22,7 +22,6 @@
#include "abspilot.hxx"
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
-#include <vcl/msgbox.hxx>
#define PROPERTY_ID_DATASOURCENAME 3
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 94005c437fef..b74712728fb6 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -58,7 +58,6 @@
#include <vcl/group.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/edit.hxx>
-#include <vcl/msgbox.hxx>
#include <tools/debug.hxx>
#include "datman.hxx"
#include "bibresid.hxx"
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 37ebf636cb59..7f6e188c14bc 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -19,7 +19,6 @@
#include <vcl/waitobj.hxx>
#include <com/sun/star/util/URL.hpp>
-#include <vcl/msgbox.hxx>
#include <vcl/stdtext.hxx>
#include <comphelper/types.hxx>
#include <comphelper/sequence.hxx>
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 8577aa14c80a..bc4897565038 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -37,7 +37,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
-#include <vcl/msgbox.hxx>
#include <comphelper/interaction.hxx>
#include <vcl/stdtext.hxx>
#include <connectivity/conncleanup.hxx>
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index c7d81548a6ce..cce25e368b3d 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -21,7 +21,6 @@
#include "commonpagesdbp.hxx"
#include <tools/debug.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include "optiongrouplayouter.hxx"
#include <helpids.h>
#include <comphelper/processfactory.hxx>
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index bf9cd9b26fa6..d1c450feed03 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/form/ListSourceType.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <tools/debug.hxx>
-#include <vcl/msgbox.hxx>
#include <connectivity/dbtools.hxx>
#include <helpids.h>
#include <comphelper/extract.hxx>
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index f09f8a6054f6..62297fcccb29 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -65,7 +65,6 @@
#include <svx/svxdlg.hxx>
#include <svx/svxids.hrc>
#include <tools/diagnose_ex.h>
-#include <vcl/msgbox.hxx>
#include <map>
#include <algorithm>
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index b03350023168..86beed0027d9 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -96,7 +96,6 @@
#include <svx/svxids.hrc>
#include <vcl/unohelp.hxx>
#include <tools/diagnose_ex.h>
-#include <vcl/msgbox.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/wrkwin.hxx>
#include <sal/macros.h>
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 2d332470449f..db66cbce1366 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -25,7 +25,6 @@
#include "formstrings.hxx"
#include <sal/log.hxx>
#include <vcl/combobox.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/layout.hxx>
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 2bc3d154c9c9..a3f1d79d8b56 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -22,7 +22,6 @@
#include "modulepcr.hxx"
#include <strings.hrc>
#include "formstrings.hxx"
-#include <vcl/msgbox.hxx>
#include <comphelper/sequence.hxx>
namespace pcr
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 17c78bec69f7..0ed794a927da 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -20,7 +20,6 @@
#include <vcl/graph.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/window.hxx>
#include <svl/solar.hrc>
#include <vcl/fltcall.hxx>
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index c5f8aa240872..0eb4e23afb61 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -30,7 +30,6 @@
#include <vcl/metric.hxx>
#include <vcl/font.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/gradient.hxx>
#include <vcl/settings.hxx>
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index 07d0fca42cd1..643f44031fb0 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -20,7 +20,6 @@
#include <vcl/graph.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/bitmapaccess.hxx>
#include <svl/solar.hrc>
#include <vcl/fltcall.hxx>
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index f4819b9a9d0c..230f1cfe1510 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -24,7 +24,6 @@
#include <svl/languageoptions.hxx>
#if OSL_DEBUG_LEVEL > 0
#include <unotools/ucbstreamhelper.hxx>
- #include <vcl/msgbox.hxx>
#include <sfx2/filedlghelper.hxx>
#include <tools/urlobj.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 8a7156c1019b..9f233d059a01 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -11,7 +11,6 @@
#include "PlacesListBox.hxx"
#include <svtools/PlaceEditDialog.hxx>
-#include <vcl/msgbox.hxx>
#include <svtools/headbar.hxx>
#include <svtools/svtresid.hxx>
#include <bitmaps.hlst>
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index fe1dab768923..74e6cc27441a 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -26,7 +26,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/weakeventlistener.hxx>
#include <comphelper/types.hxx>
-#include <vcl/msgbox.hxx>
#include "iodlg.hxx"
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index 287658213b48..eedbde38aac0 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -23,7 +23,6 @@
#include <unotools/resmgr.hxx>
#include <tools/urlobj.hxx>
#include <vcl/menu.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/svapp.hxx>
#include <svl/eitem.hxx>
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index 864a31c17935..4471fa897e67 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -44,7 +44,6 @@
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/button.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index c229b25f3d1c..5f4a33b2fee8 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -23,6 +23,7 @@
#include <svtools/svtdllapi.h>
#include <tools/solar.h>
#include <tools/link.hxx>
+#include <vcl/idle.hxx>
#include <osl/mutex.hxx>
#include <memory>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 46537e6b5607..81d4fb74047d 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -161,7 +161,6 @@
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
#include <vcl/metaactiontypes.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/notebookbar.hxx>
#include <vcl/outdev.hxx>
#include <vcl/outdevmap.hxx>
diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx
index 1bbe47cd4b99..94ac1791cb38 100644
--- a/reportdesign/source/filter/xml/dbloader2.hxx
+++ b/reportdesign/source/filter/xml/dbloader2.hxx
@@ -52,7 +52,6 @@
#include <sfx2/docfile.hxx>
#include <unotools/moduleoptions.hxx>
#include <comphelper/storagehelper.hxx>
-#include <vcl/msgbox.hxx>
namespace rptxml
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 82668f4a1f09..cffe5bf281ad 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -32,7 +32,6 @@
#include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <tools/debug.hxx>
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index d8625a16dd38..6d9e3c30b014 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -20,7 +20,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <strings.hrc>
#include <rptui_slotid.hrc>
-#include <vcl/msgbox.hxx>
#include <connectivity/dbconversion.hxx>
#include <unotools/syslocale.hxx>
#include <UITools.hxx>
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 4ac618c5a756..3e3d5f03206f 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -19,7 +19,6 @@
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
-#include <vcl/msgbox.hxx>
#include <unotools/charclass.hxx>
#include <unotools/viewoptions.hxx>
#include <formula/formdata.hxx>
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 675c99cb4e21..abf80c764880 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -39,7 +39,6 @@
#include <cppuhelper/implbase.hxx>
#include <comphelper/property.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <algorithm>
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index f4666a1be752..0a70b5205ff6 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -21,7 +21,6 @@
#include <strings.hrc>
#include <rptui_slotid.hrc>
#include <RptDef.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <UITools.hxx>
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 012a35b8520a..eb69fba75036 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -64,7 +64,6 @@
#include <com/sun/star/inspection/XNumericControl.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
-#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
#include <tools/fldunit.hxx>
#include <vcl/stdtext.hxx>
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 55eb29e1109d..58ea17e3eeed 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -97,7 +97,6 @@
#include <com/sun/star/sdb/SQLContext.hpp>
#include <i18nlangtag/languagetag.hxx>
#include <dlgpage.hxx>
-#include <vcl/msgbox.hxx>
#include <rptui_slotid.hrc>
#include <strings.hxx>
#include <core_resource.hxx>
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index dab9dd56d237..cb40696019ed 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -78,7 +78,6 @@
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
#include <svx/fmview.hxx>
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 1e1a9f171301..4e42f9be0c38 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -155,7 +155,6 @@
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metric.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/notebookbar.hxx>
#include <vcl/outdev.hxx>
#include <vcl/pointr.hxx>
diff --git a/sc/inc/pch/precompiled_scui.hxx b/sc/inc/pch/precompiled_scui.hxx
index aef3572e4867..08321aeca6f3 100644
--- a/sc/inc/pch/precompiled_scui.hxx
+++ b/sc/inc/pch/precompiled_scui.hxx
@@ -41,7 +41,6 @@
#include <vcl/fixed.hxx>
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/waitobj.hxx>
diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx
index 4772b80c60b9..d702cb26c03c 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -33,7 +33,6 @@
#include <rtl/ustrbuf.hxx>
#include <sal/config.h>
#include <sal/macros.h>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 293641ac9d68..a379c04d108e 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -44,7 +44,6 @@
#include <unotools/securityoptions.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <inputopt.hxx>
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index afd69531c6ef..49715d9ad26f 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -33,7 +33,6 @@
#include <svl/zforlist.hxx>
#include <svl/sharedstringpool.hxx>
#include <vcl/weld.hxx>
-#include <vcl/msgbox.hxx>
#include <rtl/math.hxx>
#include <scitems.hxx>
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 29c2c33d81df..dd6a0b39c61a 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -57,7 +57,6 @@
#include <svx/modctrl.hxx>
#include <svx/pszctrl.hxx>
#include <svx/zoomsliderctrl.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/inethist.hxx>
#include <vcl/waitobj.hxx>
#include <svx/svxerr.hxx>
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index fa5676961b29..b79bb01782a0 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -16,7 +16,6 @@
#include <svl/intitem.hxx>
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
#include <libxml/tree.h>
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index cbec1095517c..88fac76ec789 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -22,7 +22,6 @@
#include <svx/colorbox.hxx>
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <formula/token.hxx>
#include <formula/errorcodes.hxx>
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index 76236fede3ac..28c5185cb17d 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -11,7 +11,6 @@
#include <scresid.hxx>
#include <globstr.hrc>
#include <condformatdlg.hxx>
-#include <vcl/msgbox.hxx>
#include <document.hxx>
ScCondFormatManagerWindow::ScCondFormatManagerWindow(SvSimpleTableContainer& rParent,
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 037ed41d0994..b840ed762fa7 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/sheet/DataPilotFieldShowItemsMode.hpp>
#include <vcl/builderfactory.hxx>
-#include <vcl/msgbox.hxx>
#include <scresid.hxx>
#include <dpobject.hxx>
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 0df2ed7769df..6ea837ddc946 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -35,7 +35,6 @@
#include <strings.hrc>
#include <filtdlg.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
// DEFINE --------------------------------------------------------------------
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index 7cfde8809a4b..d4a4644d8831 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -19,7 +19,6 @@
#undef SC_DLLIMPLEMENTATION
-#include <vcl/msgbox.hxx>
#include <tpsort.hxx>
#include <sortdlg.hxx>
#include <scresid.hxx>
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index b1d5f1ef7c44..8f459bbc89ef 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -21,7 +21,6 @@
#include <textimportoptions.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/window.hxx>
#include <vcl/settings.hxx>
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 58d2a7594dd3..ee008bd01089 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -19,7 +19,6 @@
#undef SC_DLLIMPLEMENTATION
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <svtools/collatorres.hxx>
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 6b0ee190fdd5..1e4e6556c9b3 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -24,7 +24,6 @@
#include <editeng/editobj.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/bindings.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <vcl/virdev.hxx>
#include <vcl/waitobj.hxx>
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 8adcbfb0006c..cc262620741c 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -33,7 +33,6 @@
#include <svx/postattr.hxx>
#include <unotools/misccfg.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <docsh.hxx>
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 45abd51082d4..054cce77a439 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -27,7 +27,6 @@
#include <sfx2/request.hxx>
#include <vcl/EnumContext.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <chartsh.hxx>
#include <drwlayer.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 8310001948f1..32782c5385b4 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -33,7 +33,6 @@
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <drawsh.hxx>
#include <drwlayer.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index d78705c3163f..59846c4e7cc8 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -35,7 +35,6 @@
#include <svx/svdpage.hxx>
#include <svx/svdundo.hxx>
#include <svx/xdef.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/extrusionbar.hxx>
#include <svx/fontworkbar.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index b6a0b619869b..41d7359c9b63 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -24,7 +24,6 @@
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <drformsh.hxx>
#include <drwlayer.hxx>
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 5f7a48e882d4..8029644348bf 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -56,7 +56,6 @@
#include <svtools/transfer.hxx>
#include <svl/whiter.hxx>
#include <svl/languageoptions.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 6dc3914bd763..994b6aa8b44a 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -28,7 +28,6 @@
#include <editeng/spltitem.hxx>
#include <editeng/widwitem.hxx>
#include <sot/exchange.hxx>
-#include <vcl/msgbox.hxx>
#include <svtools/transfer.hxx>
#include <sc.hrc>
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index a688f4fe268d..72c243bbe882 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -29,7 +29,6 @@
#include <vcl/graphicfilter.hxx>
#include <svl/stritem.hxx>
#include <svtools/miscopt.hxx>
-#include <vcl/msgbox.hxx>
#include <avmedia/mediawindow.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index b494a11952d7..948e13d40797 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -29,7 +29,6 @@
#include <svl/stritem.hxx>
#include <svx/svdoole2.hxx>
#include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/syschild.hxx>
#include <svl/urihelper.hxx>
#include <unotools/moduleoptions.hxx>
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index 49feeb8c90b9..641d3854ebb3 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -29,7 +29,6 @@
#include <svx/grafctrl.hxx>
#include <svx/compressgraphicdialog.hxx>
#include <svx/graphichelper.hxx>
-#include <vcl/msgbox.hxx>
#include <graphsh.hxx>
#include <strings.hrc>
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 53d11055f13b..21bbcd3f3171 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -24,7 +24,6 @@
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <oleobjsh.hxx>
#include <drwlayer.hxx>
diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx
index f6ed3400fc0c..622ac2ea7e02 100644
--- a/sc/source/ui/inc/redcom.hxx
+++ b/sc/source/ui/inc/redcom.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_REDCOM_HXX
#define INCLUDED_SC_SOURCE_UI_INC_REDCOM_HXX
+#include <vcl/dialog.hxx>
#include <chgtrack.hxx>
class ScDocShell;
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 210392eaf8be..aa857b578416 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -22,7 +22,6 @@
#include <unotools/textsearch.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/collatorwrapper.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/app.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 80d4daf69a7a..9dfd7054e133 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -31,7 +31,6 @@
#include <editeng/wghtitem.hxx>
#include <vcl/svapp.hxx>
#include <svl/zforlist.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index fb35f9d1f46d..4ceb6c11d92d 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <comphelper/string.hxx>
-#include <vcl/msgbox.hxx>
#include <conflictsdlg.hxx>
#include <strings.hrc>
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 627fb68af76b..72ad52d5fd5a 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -25,7 +25,6 @@
#include <globstr.hrc>
#include <highred.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/app.hxx>
// class ScHighlightChgDlg
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index f5b5dc11f51c..3e66652d76f2 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -25,7 +25,6 @@
#include <sfx2/filedlghelper.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <global.hxx>
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index 1e6cacc89b6e..fd0040cb37f5 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -19,8 +19,6 @@
#undef SC_DLLIMPLEMENTATION
-#include <vcl/msgbox.hxx>
-
#include <lbseldlg.hxx>
#include <scresid.hxx>
#include <strings.hrc>
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 0e7bc58ff38f..0b2f7dc15b85 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -19,8 +19,6 @@
#undef SC_DLLIMPLEMENTATION
-#include <vcl/msgbox.hxx>
-
#include <mvtabdlg.hxx>
#include <document.hxx>
#include <docsh.hxx>
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 6ffb40cd8453..216c24a1bb6c 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -23,7 +23,6 @@
#include <svl/zforlist.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/commandinfoprovider.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index 9b67e2d50d67..3513f14d266b 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -22,7 +22,6 @@
#include <tabprotection.hxx>
#include <sal/macros.h>
-#include <vcl/msgbox.hxx>
#include <vector>
namespace {
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index 4da173c54b07..45c90f0f9680 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/msgbox.hxx>
#include <unotools/localedatawrapper.hxx>
#include <redcom.hxx>
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index dc3e0dc7091f..cea2f2716e86 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -23,8 +23,6 @@
#include <document.hxx>
#include <tabprotection.hxx>
-#include <vcl/msgbox.hxx>
-
ScRetypePassDlg::ScRetypePassDlg(vcl::Window* pParent) :
ModalDialog(pParent, "RetypePass", "modules/scalc/ui/retypepassdialog.ui"),
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index 3bdb2e30c88e..f7b12d5d5f1c 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -19,8 +19,6 @@
#undef SC_DLLIMPLEMENTATION
-#include <vcl/msgbox.hxx>
-
#include <shtabdlg.hxx>
#include <scresid.hxx>
#include <strings.hrc>
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 3994155de2cf..8ac7214ca8ba 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/msgbox.hxx>
#include <sfx2/app.hxx>
#include <reffact.hxx>
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index adb02578012a..74aba52a1d9e 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -25,7 +25,6 @@
#include <solverutil.hxx>
#include <rtl/math.hxx>
-#include <vcl/msgbox.hxx>
#include <unotools/collatorwrapper.hxx>
#include <unotools/localedatawrapper.hxx>
#include <svtools/svlbitm.hxx>
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 919bf98b91c2..7fd9948e27c4 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -21,7 +21,6 @@
#include <scitems.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/zforlist.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <uiitems.hxx>
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index 3cd904d8dd0b..d0ee3fb04508 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -9,7 +9,6 @@
#include <namedefdlg.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <formula/errorcodes.hxx>
#include <sfx2/app.hxx>
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index fd21418397aa..73b780298519 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -33,7 +33,6 @@
#include <sfx2/app.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <formula/errorcodes.hxx>
#include <o3tl/make_unique.hxx>
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index ab93cb559397..d574bf8dedaa 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -22,7 +22,6 @@
#include <sfx2/viewfrm.hxx>
#include <svl/slstitm.hxx>
#include <svl/stritem.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/settings.hxx>
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 3351289b43ce..4e03a51f0f92 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -20,7 +20,6 @@
#undef SC_DLLIMPLEMENTATION
#include <scitems.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <global.hxx>
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 0bd80b7f62db..3d950155c6b9 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -29,7 +29,6 @@
#include <scresid.hxx>
#include <formula/grammar.hxx>
#include "calcoptionsdlg.hxx"
-#include <vcl/msgbox.hxx>
#include <unotools/localedatawrapper.hxx>
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index 89082ccfa240..a317528a6dd4 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -22,7 +22,6 @@
#include <comphelper/string.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/stritem.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <unotools/charclass.hxx>
#include <stdlib.h>
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 5ac92feac1db..671012b2395a 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -28,7 +28,6 @@
#include <editeng/flditem.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/objsh.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 5a810ac498e3..41983ea64c32 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -23,7 +23,6 @@
#include <sfx2/basedlgs.hxx>
#include <svl/style.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <attrib.hxx>
#include <tphf.hxx>
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index a9d6c3eaf18b..d3bc68faabbb 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -28,7 +28,6 @@
#include <editeng/fhgtitem.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/objsh.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 3a03ca3dff03..f345b93d875c 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -19,7 +19,6 @@
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 0180a0d2bdf4..920cc22cb520 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -27,7 +27,6 @@
#include "vbaglobals.hxx"
#include <vector>
#include <rangenam.hxx>
-#include <vcl/msgbox.hxx>
#include <tabvwsh.hxx>
#include <viewdata.hxx>
#include <nameuno.hxx>
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx
index 42b290c67df3..3dea193fe844 100644
--- a/sc/source/ui/vba/vbanames.cxx
+++ b/sc/source/ui/vba/vbanames.cxx
@@ -26,7 +26,6 @@
#include "vbarange.hxx"
#include "vbaglobals.hxx"
#include <vector>
-#include <vcl/msgbox.hxx>
#include <tabvwsh.hxx>
#include <viewdata.hxx>
#include <compiler.hxx>
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 7ab26814d1a4..2965aa1c8354 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -29,7 +29,6 @@
#include <basic/sbxcore.hxx>
#include <svl/whiter.hxx>
#include <svl/zforlist.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/visitem.hxx>
#include <svtools/miscopt.hxx>
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 18673f262192..be066a1d1da2 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -53,7 +53,6 @@
#include <sot/exchange.hxx>
#include <svtools/cliplistener.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <sot/formats.hxx>
#include <svtools/transfer.hxx>
#include <svl/stritem.hxx>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index ce6114d78766..d75204e3546d 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -32,7 +32,6 @@
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/zformat.hxx>
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 9cde192c663d..0a5cbd4be577 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -18,7 +18,6 @@
*/
#include <scitems.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <comphelper/lok.hxx>
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index 83fd8990283e..039c5afd1098 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -24,7 +24,6 @@
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/EnumContext.hxx>
#include <sc.hrc>
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 2067dd94687d..fa6ae5dae200 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -35,7 +35,6 @@
#include <sfx2/request.hxx>
#include <svl/stritem.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/help.hxx>
#include <vcl/settings.hxx>
#include <tools/urlobj.hxx>
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 1248d4e5576c..404b55abcb53 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -30,7 +30,6 @@
#include <svl/stritem.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/objface.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/vclenum.hxx>
#include <globstr.hrc>
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 266f44aea649..f66b0becfe3d 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -32,7 +32,6 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/request.hxx>
-#include <vcl/msgbox.hxx>
#include <global.hxx>
#include <attrib.hxx>
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index 46fe3f1629c2..3508395d7d21 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -20,7 +20,6 @@
#include <config_mpl.h>
#include <scitems.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/dispatch.hxx>
#include <editeng/editview.hxx>
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index c59e6dcc4e6c..ae6215d04cea 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -28,7 +28,6 @@
#include <sfx2/request.hxx>
#include <basic/sbxcore.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <tabvwsh.hxx>
#include <client.hxx>
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 5fc67cf56b3a..85bf6785b159 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -64,7 +64,6 @@
#include <scabstdlg.hxx>
#include <clipparam.hxx>
#include <markdata.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/dbaexchange.hxx>
#include <memory>
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index ffe5035fe97b..eb2d6cb45eaf 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -21,7 +21,6 @@
#include <svx/svdocapt.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
#include <editeng/editview.hxx>
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index cb8ef91e37b3..76198a2de57b 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -29,7 +29,6 @@
#include <svl/cjkoptions.hxx>
#include <svl/ctloptions.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/settings.hxx>
#include <sfx2/request.hxx>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 71542643b8ea..e02b65cbae48 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -119,7 +119,6 @@
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/outdev.hxx>
#include <vcl/region.hxx>
#include <vcl/salnativewidgets.hxx>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 0935afd1be22..49668dcbc2ff 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -161,7 +161,6 @@
#include <vcl/metaact.hxx>
#include <vcl/metaactiontypes.hxx>
#include <vcl/metric.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/notebookbar.hxx>
#include <vcl/outdev.hxx>
#include <vcl/outdevmap.hxx>
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 60e01846f277..03575d4778d9 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -36,7 +36,6 @@
#include <svx/svdpagv.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svdundo.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <sot/formats.hxx>
#include <xmloff/autolayout.hxx>
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 07a8e3913075..d28cead6f6cc 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -29,7 +29,6 @@
#include <svl/aeitem.hxx>
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <svtools/valueset.hxx>
#include <vcl/graph.hxx>
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index 33fdf3c6493f..a4b323b4bdfa 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -19,7 +19,6 @@
#include <unotools/localfilehelper.hxx>
#include <vcl/errinf.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/metaact.hxx>
#include <vcl/virdev.hxx>
#include <vcl/FilterConfigItem.hxx>
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index ff769a1b9280..6bf664f8a797 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -30,7 +30,6 @@
#include <sfx2/app.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdlayer.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/style.hxx>
#include <svx/xflclit.hxx>
#include <editeng/eeitem.hxx>
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 5049d6fb42df..56f9eb41cd8f 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -27,7 +27,6 @@
#include <vcl/errinf.hxx>
#include <editeng/langitem.hxx>
#include <editeng/editdata.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <editeng/svxenum.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 9c514395387a..e9d185c58758 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -28,7 +28,6 @@
#include <svl/flagitem.hxx>
#include <unotools/useroptions.hxx>
#include <sfx2/bindings.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/request.hxx>
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 471955e3f7ba..7b3783d79b9b 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -28,7 +28,6 @@
#include <editeng/flditem.hxx>
#include <svx/svdpagv.hxx>
#include <sfx2/app.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdotext.hxx>
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index a0ffda6385d3..724df7d201cb 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -23,7 +23,6 @@
#include <svx/svdedtv.hxx>
#include <svx/svdetc.hxx>
#include <sfx2/app.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <sdattr.hxx>
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index f55eebbdfbe0..780f36dd067c 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/ui/dialogs/XFilePickerListener.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
-#include <vcl/msgbox.hxx>
#include <vcl/idle.hxx>
#include <sal/types.h>
#include <osl/thread.hxx>
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 7853e84c501e..27998d39e311 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -19,7 +19,6 @@
#include <svl/itemset.hxx>
#include <sfx2/new.hxx>
-#include <vcl/msgbox.hxx>
#include <strings.hrc>
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index d1a153493abf..db9a7ed61908 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -27,7 +27,6 @@
#include <sdiocmpt.hxx>
#include <vectdlg.hxx>
#include <vcl/bitmapaccess.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/metaact.hxx>
#define VECTORIZE_MAX_EXTENT 512
diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx
index a0958eb1ef0e..2eed71680ac5 100644
--- a/sd/source/ui/docshell/docshel2.cxx
+++ b/sd/source/ui/docshell/docshel2.cxx
@@ -19,7 +19,6 @@
#include <memory>
#include <DrawDocShell.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index 6311bf13c716..48ab232e591b 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -20,7 +20,6 @@
#include <fuarea.hxx>
#include <svx/svxids.hrc>
-#include <vcl/msgbox.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <sfx2/request.hxx>
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index e90da72220f5..1762d86597d5 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -31,7 +31,6 @@
#include <strings.hrc>
#include <sdresid.hxx>
#include <svx/svdoutl.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <svl/ctloptions.hxx>
#include <svl/itempool.hxx>
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 339ab3fc87cd..a0f80d8ac365 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -26,7 +26,6 @@
#include <editeng/eeitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/brushitem.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <View.hxx>
diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx
index eeca78bf542d..a65a92c11e7f 100644
--- a/sd/source/ui/func/fuconnct.cxx
+++ b/sd/source/ui/func/fuconnct.cxx
@@ -19,7 +19,6 @@
#include <fuconnct.hxx>
#include <sfx2/request.hxx>
-#include <vcl/msgbox.hxx>
#include <View.hxx>
#include <ViewShell.hxx>
#include <drawdoc.hxx>
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index f573b75a6d52..f934f0de6605 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -27,7 +27,6 @@
#include <Window.hxx>
#include <drawdoc.hxx>
#include <sdpage.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index 3eac550fc361..e3516b2e1bee 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/propertysequence.hxx>
#include <cppuhelper/bootstrap.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/style.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/langitem.hxx>
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 6f17a4b1b6d5..fa6cbcc8f0f3 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -64,7 +64,6 @@
#include <sot/storage.hxx>
#include <sot/formats.hxx>
#include <svx/svdpagv.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/opengrf.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/charthelper.hxx>
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 01f5490ce035..bc1956e2993a 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -26,7 +26,6 @@
#include <svl/stritem.hxx>
#include <sfx2/request.hxx>
#include <sfx2/app.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <sfx2/printer.hxx>
#include <svx/svdorect.hxx>
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 71a35f4ec42e..3d45adf33000 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -22,7 +22,6 @@
#include <svx/svxids.hrc>
#include <svx/tabline.hxx>
#include <svx/xenum.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <sfx2/request.hxx>
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx
index 869d105e50d6..b4e259a8e154 100644
--- a/sd/source/ui/func/fumeasur.cxx
+++ b/sd/source/ui/func/fumeasur.cxx
@@ -18,7 +18,6 @@
*/
#include <fumeasur.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <View.hxx>
#include <ViewShell.hxx>
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 5d9375a7862a..9b56cdc45028 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -28,7 +28,6 @@
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/aeitem.hxx>
#include <svx/xtable.hxx>
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 2da671bafa29..8a26602cb89b 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -18,7 +18,6 @@
*/
#include <fuolbull.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/intitem.hxx>
#include <editeng/outliner.hxx>
#include <editeng/eeitem.hxx>
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 36af7fa013b7..48d61597d26b 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -19,7 +19,6 @@
#include <fuparagr.hxx>
#include <editeng/eeitem.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index d1e891df21a8..ef1092d4e71f 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -22,7 +22,6 @@
#include <sfx2/dispatch.hxx>
#include <svl/itempool.hxx>
#include <sot/storage.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/svdundo.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx
index 7d27ee9c07fa..a98048b3d56b 100644
--- a/sd/source/ui/func/fuprobjs.cxx
+++ b/sd/source/ui/func/fuprobjs.cxx
@@ -19,7 +19,6 @@
#include <fuprobjs.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/style.hxx>
#include <editeng/outliner.hxx>
#include <svl/hint.hxx>
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 10f9afa23cf4..13da0d20e957 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -19,7 +19,6 @@
#include <fusldlg.hxx>
#include <svl/itemset.hxx>
-#include <vcl/msgbox.hxx>
#include <drawdoc.hxx>
#include <sdpage.hxx>
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index b0b38e48c5a3..f86710d28f62 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -19,7 +19,6 @@
#include <fusnapln.hxx>
#include <svl/aeitem.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <svx/svxids.hrc>
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index d51f9e25e18e..4264391a78e6 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -29,7 +29,6 @@
#include <sfx2/bindings.hxx>
#include <svl/aeitem.hxx>
#include <sfx2/dispatch.hxx>
-#include <vcl/msgbox.hxx>
#include <editeng/eeitem.hxx>
#include <sfx2/request.hxx>
#include <editeng/numitem.hxx>
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index 33d4b0d2796f..00193fe98bb9 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -21,7 +21,6 @@
#include <comphelper/scopeguard.hxx>
#include <svx/dialogs.hrc>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <strings.hrc>
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index 0810a95541b3..78fcb3f011d0 100644
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -18,7 +18,6 @@
*/
#include <futxtatt.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <svx/svxdlg.hxx>
diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx
index 7217edc78fe6..6722e9e379c6 100644
--- a/sd/source/ui/func/fuvect.cxx
+++ b/sd/source/ui/func/fuvect.cxx
@@ -20,7 +20,6 @@
#include <fuvect.hxx>
#include <tools/poly.hxx>
#include <svx/svdograf.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/svdedtv.hxx>
#include <View.hxx>
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 16024b23115a..616f51171e7b 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -40,7 +40,6 @@
#include <svx/gallery.hxx>
#include <svx/drawitem.hxx>
#include <unotools/pathoptions.hxx>
-#include <vcl/msgbox.hxx>
#include <tools/urlobj.hxx>
#include <sfx2/sidebar/Theme.hxx>
#include <app.hrc>
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 66b518187ef5..07bf85ee8d85 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -67,7 +67,6 @@
#include <sfx2/docfile.hxx>
#include <svx/svxids.hrc>
#include <svx/strings.hrc>
-#include <vcl/msgbox.hxx>
#include <tools/urlobj.hxx>
#include <rtl/ustring.hxx>
#include <vcl/svapp.hxx>
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 255b3a3792f8..f3e1a784c850 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -62,7 +62,6 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
#include <svx/svdpagv.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/svxids.hrc>
#include <boost/optional.hpp>
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 9f302fdd8f7c..c5d376270269 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -74,7 +74,6 @@
#include <sfx2/zoomitem.hxx>
#include <svx/svxdlg.hxx>
#include <svx/dialogs.hrc>
-#include <vcl/msgbox.hxx>
#include <svl/intitem.hxx>
#include <svl/whiter.hxx>
#include <svl/itempool.hxx>
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index ce518259d9e0..502661ce14ed 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -41,7 +41,6 @@
#include <svx/sdrpagewindow.hxx>
#include <svx/sdr/table/tabledesign.hxx>
#include <svx/svxdlg.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/itempool.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 479da5229d91..90871e3e4456 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -20,7 +20,6 @@
#include <GraphicObjectBar.hxx>
#include <limits.h>
-#include <vcl/msgbox.hxx>
#include <svl/whiter.hxx>
#include <svl/itempool.hxx>
#include <sfx2/app.hxx>
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index f25fdd32b7f8..b0d4aff1660a 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -30,7 +30,6 @@
#include <svx/dlgutil.hxx>
#include <svx/xtable.hxx>
#include <vcl/weld.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/printer.hxx>
#include <svx/svxerr.hxx>
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 5097f86ff6e6..354f1207f047 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -70,7 +70,6 @@
#include <sfx2/viewfrm.hxx>
#include <svl/whiter.hxx>
#include <vcl/commandinfoprovider.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 1989c3525ee8..e34f97ef6aad 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -46,7 +46,6 @@
#include <sfx2/sidebar/Sidebar.hxx>
#include <svl/aeitem.hxx>
#include <svx/imapdlg.hxx>
-#include <vcl/msgbox.hxx>
#include <basic/sbstar.hxx>
#include <xmloff/autolayout.hxx>
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 256dcf0a32ee..2c5ca8dcd194 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -37,7 +37,6 @@
#include <vcl/scrbar.hxx>
#include <svx/svdograf.hxx>
#include <svx/svdopage.hxx>
-#include <vcl/msgbox.hxx>
#include <sot/storage.hxx>
#include <svx/fmshell.hxx>
#include <svx/globl3d.hxx>
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index f9a736b7744b..595ec0353681 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -23,7 +23,6 @@
#include <vcl/metaact.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/svdograf.hxx>
diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx
index 01472424b848..a9a6db449d28 100644
--- a/sd/source/ui/view/drviews8.cxx
+++ b/sd/source/ui/view/drviews8.cxx
@@ -24,7 +24,6 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <sfx2/dispatch.hxx>
#include <svx/svxids.hrc>
-#include <vcl/msgbox.hxx>
#include <svx/svddef.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index f0f1857dddbc..f6fdfc0def55 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -26,7 +26,6 @@
#include <svx/hlnkitem.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/flditem.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
#include <svx/svdorect.hxx>
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index e7d25768052c..42c301d62adc 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -24,7 +24,6 @@
#include <svx/svxids.hrc>
#include <svx/dialogs.hrc>
#include <svx/imapdlg.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svdoole2.hxx>
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index ff5a555756c6..7445372219bb 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -29,7 +29,6 @@
#include <svl/eitem.hxx>
#include <sfx2/zoomitem.hxx>
#include <svx/svxids.hrc>
-#include <vcl/msgbox.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/flditem.hxx>
#include <editeng/editstat.hxx>
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index cd63ec9f63c6..28bfc4c3f510 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -35,7 +35,6 @@
#include <svl/style.hxx>
#include <svx/svdorect.hxx>
#include <svx/svdundo.hxx>
-#include <vcl/msgbox.hxx>
#include <editeng/adjustitem.hxx>
#include <editeng/tstpitem.hxx>
#include <editeng/lspcitem.hxx>
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 6ffe568b7099..d0344d2ab4e5 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -32,7 +32,6 @@
#include <svx/svdundo.hxx>
#include <vcl/settings.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/app.hxx>
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 57db0d9bef2d..8f8775b015f7 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -22,7 +22,6 @@
#include <vector>
#include <com/sun/star/embed/XEmbedPersist.hpp>
#include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdograf.hxx>
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 2427b6836c39..ff49bc21fe39 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -40,7 +40,6 @@
#include <svx/svdopage.hxx>
#include <sfx2/progress.hxx>
#include <svx/svdobj.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/bindings.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdetc.hxx>
diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index fcc40e260176..51b5c8e10195 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -120,7 +120,6 @@
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
#include <vcl/metaactiontypes.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/outdev.hxx>
#include <vcl/outdevmap.hxx>
#include <vcl/outdevstate.hxx>
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index f10f257c3131..ce7af2aa535a 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -29,7 +29,6 @@
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <svl/urlbmk.hxx>
-#include <vcl/msgbox.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 2b0d2d1d2319..98392536c58f 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -39,7 +39,6 @@
#include <basic/sbmeth.hxx>
#include <basic/sbstar.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
#include <basic/sbuno.hxx>
#include <svtools/sfxecode.hxx>
#include <svtools/ehdl.hxx>
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index f3e0552dc223..f7d761d9f804 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -25,7 +25,6 @@
#include <osl/file.hxx>
#include <stdlib.h>
-#include <vcl/msgbox.hxx>
#include <rtl/ustring.hxx>
#include <svl/itempool.hxx>
#include <svl/aeitem.hxx>
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 4a277865d830..c6fb631733b4 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -23,7 +23,6 @@
#include <svl/stritem.hxx>
#include <vcl/menu.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/wrkwin.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 218fa03c3656..9879307d9830 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -36,7 +36,6 @@
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
-#include <vcl/msgbox.hxx>
#include <svtools/ehdl.hxx>
#include <comphelper/processfactory.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 9027b173bcf8..1cf2df5630d1 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -21,7 +21,6 @@
#include <vcl/canvastools.hxx>
#include <vcl/status.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/whiter.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 670d59a35cd6..ebe5b37de43c 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -18,7 +18,6 @@
*/
#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
#include <tools/urlobj.hxx>
#include <tools/stream.hxx>
#include <sot/formats.hxx>
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 4428f875bd08..280cd6da21c1 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -30,7 +30,7 @@
#include <vcl/fixed.hxx>
#include <vcl/edit.hxx>
#include <vcl/button.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/dialog.hxx>
#include <sot/exchange.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/ustring.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 61ef0588bf30..7f63abc6b860 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -96,7 +96,6 @@
#include <vcl/weld.hxx>
#include <ucbhelper/content.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/waitobj.hxx>
#include <unotools/ucbhelper.hxx>
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 0712e7cda534..0ad3d365efee 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -20,7 +20,6 @@
#include <memory>
-#include <vcl/msgbox.hxx>
#include <svl/lstner.hxx>
#include <basic/basmgr.hxx>
#include <basic/sbmod.hxx>
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index d2a30e25acdf..d9eb953e3ea9 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -33,7 +33,6 @@
#include <sfx2/filedlghelper.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfx2/templatecontaineritem.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/menubtn.hxx>
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index f08e26f702d7..ceeb43093272 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -25,7 +25,6 @@
#include <osl/file.hxx>
#include <vcl/fixed.hxx>
#include <vcl/help.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/eitem.hxx>
#include <unotools/viewoptions.hxx>
#include <svtools/controldims.hxx>
diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx
index 7998ea9a6819..60cd7e145cff 100644
--- a/sfx2/source/dialog/checkin.cxx
+++ b/sfx2/source/dialog/checkin.cxx
@@ -8,7 +8,6 @@
*/
#include <sfx2/checkin.hxx>
-#include <vcl/msgbox.hxx>
SfxCheckinDialog::SfxCheckinDialog( vcl::Window* pParent ) :
ModalDialog( pParent, "CheckinDialog", "sfx/ui/checkin.ui" )
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index ea9cb326f8ee..9c8386746628 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -58,7 +58,6 @@
#include <osl/security.hxx>
#include <osl/thread.hxx>
#include <vcl/cvtgrf.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/mnemonic.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/saveopt.hxx>
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index bc40c3e83893..f7f29f4e0010 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -19,7 +19,6 @@
#include <comphelper/string.hxx>
#include <vcl/weld.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/field.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index 8b8538b92ee3..dd077ca8c832 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -19,7 +19,6 @@
#include <sal/macros.h>
-#include <vcl/msgbox.hxx>
#include <unotools/printwarningoptions.hxx>
#include <svtools/printoptions.hxx>
#include <svtools/restartdialog.hxx>
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index a619c6595b6e..8cafb0ec0eba 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -19,7 +19,6 @@
#include <svl/whiter.hxx>
#include <svl/style.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/styledlg.hxx>
#include <sfx2/mgetempl.hxx>
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 4dfc47a248f3..d24668bd59e2 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -38,7 +38,6 @@
#include <uitest/sfx_uiobject.hxx>
#include <unotools/viewoptions.hxx>
#include <vcl/builder.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/IDialogRenderable.hxx>
#include <sfx2/strings.hrc>
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index f3d9715c26e2..2408eb5f9ba9 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -27,7 +27,6 @@
#include <svl/itemset.hxx>
#include <unotools/useroptions.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <tools/datetime.hxx>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 916acba81659..63ce058f0a47 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -78,7 +78,6 @@
#include <unotools/streamhelper.hxx>
#include <unotools/localedatawrapper.hxx>
#include <utility>
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <svl/lckbitem.hxx>
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index bdb083a58334..33ff0c1a1099 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/itemset.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 1ec298ac3e52..136911e2cb13 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -22,7 +22,6 @@
#include <sfx2/new.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/idle.hxx>
#include <svtools/svmedit.hxx>
#include <svl/itemset.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 2d59f8fc6bbe..ef521b3475bc 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -62,7 +62,6 @@
#include <basic/sbuno.hxx>
#include <basic/sbstar.hxx>
#include <basic/basmgr.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <basic/sbx.hxx>
#include <svtools/sfxecode.hxx>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 53ec4e2af9c6..872d8db6a91b 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/frame/XTitle.hpp>
#include <osl/file.hxx>
#include <rtl/instance.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index 605f7a1e90f1..3233464804b0 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -35,7 +35,6 @@
#include <tools/globname.hxx>
#include <com/sun/star/awt/PosSize.hpp>
#include <comphelper/processfactory.hxx>
-#include <vcl/msgbox.hxx>
#include <appdata.hxx>
#include <sfx2/app.hxx>
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 5832ad9cd150..1036f63f872d 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -19,7 +19,6 @@
#include <vcl/virdev.hxx>
#include <vcl/metric.hxx>
-#include <vcl/msgbox.hxx>
#include <unotools/printwarningoptions.hxx>
#include <svtools/printoptions.hxx>
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 827ec6237081..1b753c1b6a46 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -71,7 +71,6 @@
#include <toolkit/helper/convert.hxx>
#include <framework/titlehelper.hxx>
#include <comphelper/processfactory.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/event.hxx>
#include <sfx2/viewfac.hxx>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 3b742b0a56d6..defb4a6d9f91 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -22,7 +22,6 @@
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <svl/whiter.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/weld.hxx>
#include <svl/intitem.hxx>
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index e89a697c1fd6..30f2dae197dc 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -110,7 +110,6 @@
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metric.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/outdev.hxx>
#include <vcl/region.hxx>
#include <vcl/scopedbitmapaccess.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index 6edc695c8495..eabbd7fc21da 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -143,7 +143,6 @@
#include <vcl/menu.hxx>
#include <vcl/metaact.hxx>
#include <vcl/metric.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/notebookbar.hxx>
#include <vcl/outdev.hxx>
#include <vcl/region.hxx>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 12419305f50f..f6b214ecda33 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -123,7 +123,6 @@
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/metric.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/outdev.hxx>
#include <vcl/region.hxx>
#include <vcl/salnativewidgets.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 6322d2fa84a9..03dce4d8945a 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -169,7 +169,6 @@
#include <vcl/metaactiontypes.hxx>
#include <vcl/metric.hxx>
#include <vcl/mnemonicengine.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/notebookbar.hxx>
#include <vcl/outdev.hxx>
#include <vcl/outdevmap.hxx>
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 612367e785df..83c3d111cf35 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -44,7 +44,6 @@
#include <viewsh.hxx>
#include <frmatr.hxx>
#include <breakit.hxx>
-#include <vcl/msgbox.hxx>
#include <mdiexp.hxx>
#include <strings.hrc>
#include <redline.hxx>
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index f201ac55f62f..4a07168b8d0d 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -21,8 +21,6 @@
#include <unotools/charclass.hxx>
-#include <vcl/msgbox.hxx>
-
#include <editeng/boxitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/formatbreakitem.hxx>
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 9373007147db..c4f602ce0e36 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -29,7 +29,6 @@
#include <strings.hrc>
#include <hintids.hxx>
#include <linguistic/lngprops.hxx>
-#include <vcl/msgbox.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/svxacorr.hxx>
#include <editeng/langitem.hxx>
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index c90fc94ddb34..fc7fcd406edd 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -23,7 +23,6 @@
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/any.hxx>
#include <tools/svlibrary.h>
-#include <vcl/msgbox.hxx>
#include <svtools/parhtml.hxx>
#include <sot/storage.hxx>
#include <comphelper/classids.hxx>
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 038284e6a11c..14d66f1927f8 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -20,7 +20,6 @@
#include <sfx2/request.hxx>
#include <svl/stritem.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <cmdid.h>
#include <uitool.hxx>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index c15f7f9ef342..6563cd0ed56a 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -21,7 +21,6 @@
#include <hintids.hxx>
#include <comphelper/fileurl.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/urihelper.hxx>
#include <svl/stritem.hxx>
#include <editeng/flstitem.hxx>
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index c7509d5f9d71..74575f59bb13 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/mail/MailServiceType.hpp>
#include <com/sun/star/mail/XMailService.hpp>
#include <com/sun/star/mail/MailServiceProvider.hpp>
-#include <vcl/msgbox.hxx>
#include <globals.hrc>
#include <dbui.hrc>
#include <bitmaps.hlst>
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index c07c3dfb4b05..abd64165f2f0 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -27,7 +27,6 @@
#include <dbmgr.hxx>
#include <dbconfig.hxx>
#include <unotools/tempfile.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index cc8a2fb97511..5b1bf9df0145 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -27,7 +27,6 @@
#include <mmconfigitem.hxx>
#include <comphelper/string.hxx>
#include <vcl/scrbar.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/builderfactory.hxx>
#include <svtools/controldims.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index 54b58cde71a2..81deb59639e2 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -21,7 +21,6 @@
#include "customizeaddresslistdialog.hxx"
#include "createaddresslistdialog.hxx"
#include <vcl/scrbar.hxx>
-#include <vcl/msgbox.hxx>
#include <dbui.hrc>
SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 8a1df9b58491..1bc236dccaa6 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -43,7 +43,6 @@
#include <editeng/langitem.hxx>
#include <svl/numuno.hxx>
#include <svl/stritem.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/mnemonic.hxx>
#include <svl/style.hxx>
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index f72c95f5a1be..72702b2b264e 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -31,7 +31,6 @@
#include <dbmgr.hxx>
#include <sfx2/viewfrm.hxx>
#include <wrtsh.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <helpids.h>
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index b869e40cd5c7..0a80fe3852cf 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -23,7 +23,6 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/docfac.hxx>
-#include <vcl/msgbox.hxx>
#include <view.hxx>
#include <docsh.hxx>
#include "mmdocselectpage.hxx"
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index a05a5c203962..35aecdbbbeee 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -22,7 +22,6 @@
#include <mmconfigitem.hxx>
#include "mmaddressblockpage.hxx"
#include <swtypes.hxx>
-#include <vcl/msgbox.hxx>
#include <dbui.hrc>
#include <com/sun/star/sdb/XColumn.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 732cc26ae4ed..fa5ea301551f 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -39,7 +39,6 @@
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <sfx2/dinfdlg.hxx>
#include <sfx2/printer.hxx>
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx
index 55e69c58cdd7..7b192f89c2cb 100644
--- a/sw/source/ui/dialog/macassgn.cxx
+++ b/sw/source/ui/dialog/macassgn.cxx
@@ -22,7 +22,6 @@
#include <sfx2/htmlmode.hxx>
#include <svx/svxids.hrc>
#include <sfx2/app.hxx>
-#include <vcl/msgbox.hxx>
#include <swtypes.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 452bea1ea50c..f0039617f3da 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -30,7 +30,6 @@
#include <sfx2/viewfrm.hxx>
#include <svl/cjkoptions.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
IMPL_STATIC_LINK_NOARG(SwWordCountFloatDlg, CloseHdl, Button*, void)
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 2b5cb4583d6c..56c2ddb67984 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -23,7 +23,6 @@
#include <editeng/tstpitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/brushitem.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/menu.hxx>
#include <cmdid.h>
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 850ec6c536d3..0c2a678c2500 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -20,7 +20,6 @@
#include <dbmgr.hxx>
#include <sfx2/app.hxx>
#include <vcl/builderfactory.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <swwait.hxx>
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index a1044c7c85a3..0aa1059e2b8a 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -21,7 +21,6 @@
#include "swuilabimp.hxx"
#include <labimg.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/idle.hxx>
class SwLabFormatPage;
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 794852abb4c7..e674709e2092 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index f72d9a696cec..8de7bd7c32d8 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -20,7 +20,6 @@
#include <wrtsh.hxx>
#include <fldbas.hxx>
#include <fldmgr.hxx>
-#include <vcl/msgbox.hxx>
#include <DropDownFieldDialog.hxx>
#include <flddropdown.hxx>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 21cfda853898..fb86ec11d24e 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/msgbox.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/sdb/DatabaseContext.hpp>
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index f0e30e05c1bb..ab8e4f1483f4 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/msgbox.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/request.hxx>
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index bdc38bc9ddf6..5fd48cec0ada 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -23,7 +23,6 @@
#include <comphelper/processfactory.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/dispatch.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/htmlmode.hxx>
#include <viewopt.hxx>
#include <docsh.hxx>
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index c11adb50e72e..5d10fa20ad94 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <comphelper/string.hxx>
-#include <vcl/msgbox.hxx>
#include <unotools/charclass.hxx>
#include <editeng/unolingu.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 269877ceb3fe..fc5df961b9be 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -19,7 +19,6 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <hintids.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/svapp.hxx>
#include <svl/urihelper.hxx>
#include <view.hxx>
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index f9403730ccee..500fa8194919 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -19,7 +19,6 @@
#include <hintids.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <svx/hdft.hxx>
#include <editeng/flstitem.hxx>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 18d28eacc478..af958e54abb2 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -36,7 +36,6 @@
#include <editeng/frmdiritem.hxx>
#include <svl/ctloptions.hxx>
#include <sfx2/dispatch.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 63bfe8f2c3d5..269f54d4a17c 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -22,7 +22,6 @@
#include <cmdid.h>
#include <hintids.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/mnemonic.hxx>
#include <svl/urihelper.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index d5d8ac063abc..72eae981aefc 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -22,7 +22,6 @@
#include <svl/stritem.hxx>
#include <sfx2/request.hxx>
#include <editeng/fontitem.hxx>
-#include <vcl/msgbox.hxx>
#include <fmtftn.hxx>
#include <swundo.hxx>
#include <cmdid.h>
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 731c8fca41b7..3416730d414d 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -19,7 +19,6 @@
#include <sfx2/viewfrm.hxx>
#include <svl/style.hxx>
-#include <vcl/msgbox.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 5d65297f293e..6d6a52c2d71d 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/app.hxx>
#include <svx/gallery.hxx>
#include <editeng/brushitem.hxx>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index fe967dd98a71..1de834c33858 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -19,7 +19,6 @@
#include <hintids.hxx>
#include <vcl/menu.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 5aad03cd65ba..cc5fe336e436 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -22,7 +22,6 @@
#include <srtdlg.hxx>
#include <vcl/lstbox.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index 843de9af7741..ef10fa86f0dd 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -19,7 +19,6 @@
#include <redline.hxx>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/eitem.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index eb2263393bcd..4d21a57850fa 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -8,7 +8,6 @@
*/
#include <sfx2/viewfrm.hxx>
-#include <vcl/msgbox.hxx>
#include <view.hxx>
#include <swmodule.hxx>
#include <wrtsh.hxx>
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index dd7007cf0a13..8374e5865f04 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <sfx2/viewfrm.hxx>
#include <modcfg.hxx>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index c7d65cb6f2db..3c99d5bfc0f8 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -20,7 +20,6 @@
#include <hintids.hxx>
#include <comphelper/string.hxx>
#include <vcl/weld.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
#include <editeng/keepitem.hxx>
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index ad4333fb71af..44ea13652a21 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -23,7 +23,6 @@
#include <strings.hrc>
#include <unoprnms.hxx>
#include <osl/diagnose.h>
-#include <vcl/msgbox.hxx>
#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
#include <com/sun/star/view/XScreenCursor.hpp>
#include <com/sun/star/view/DocumentZoomType.hpp>
diff --git a/sw/source/uibase/app/appenv.cxx b/sw/source/uibase/app/appenv.cxx
index db85851c7eb6..3d860da8654f 100644
--- a/sw/source/uibase/app/appenv.cxx
+++ b/sw/source/uibase/app/appenv.cxx
@@ -31,7 +31,6 @@
#include <sfx2/app.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/printer.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/dispatch.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index b7c9ff0c8b0a..296f2bae6732 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -43,7 +43,6 @@
#include <svl/stritem.hxx>
#include <svl/ctloptions.hxx>
#include <unotools/useroptions.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/wrkwin.hxx>
#include <svx/insctrl.hxx>
diff --git a/sw/source/uibase/app/applab.cxx b/sw/source/uibase/app/applab.cxx
index d2f8944c12df..6dfdd0168cf4 100644
--- a/sw/source/uibase/app/applab.cxx
+++ b/sw/source/uibase/app/applab.cxx
@@ -27,7 +27,6 @@
#include <o3tl/deleter.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/printer.hxx>
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 50ee0cc1997d..32804af2102e 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -24,7 +24,6 @@
#include <hintids.hxx>
#include <o3tl/make_unique.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/eitem.hxx>
#include <sfx2/request.hxx>
#include <sfx2/app.hxx>
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index cee9fb854b42..10ad0ef5d8fa 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -40,7 +40,6 @@
#include <editeng/cmapitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/brushitem.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/cjkoptions.hxx>
#include <swmodule.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index ef7227e71c94..ff6bf6a16b2b 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -115,7 +115,6 @@
#include <unomailmerge.hxx>
#include <sfx2/event.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <osl/mutex.hxx>
#include <rtl/textenc.h>
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index aae8e1f553da..f42ace586ebb 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/mail/MailServiceProvider.hpp>
#include <com/sun/star/mail/XSmtpService.hpp>
#include <comphelper/processfactory.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
diff --git a/sw/source/uibase/dialog/regionsw.cxx b/sw/source/uibase/dialog/regionsw.cxx
index 69c830cb0e65..801ac52b9a4e 100644
--- a/sw/source/uibase/dialog/regionsw.cxx
+++ b/sw/source/uibase/dialog/regionsw.cxx
@@ -22,7 +22,6 @@
#include <comphelper/string.hxx>
#include <svl/urihelper.hxx>
#include <svl/PasswordHelper.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
#include <sot/formats.hxx>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 0031d74c1604..7e2e33cd563d 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -43,7 +43,6 @@
#include <tools/urlobj.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/weld.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/stritem.hxx>
#include <svtools/imap.hxx>
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 0fbd7315e4a4..f11890e34897 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -38,7 +38,6 @@
#include <vcl/svapp.hxx>
#include <vcl/help.hxx>
#include <vcl/weld.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/gradient.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index a6334cd57e60..53728e07eb11 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -33,7 +33,6 @@
#include <vcl/help.hxx>
#include <vcl/graph.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <sot/storage.hxx>
#include <svl/macitem.hxx>
diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx
index 463dabd1fdbd..697f183d7445 100644
--- a/sw/source/uibase/fldui/fldwrap.cxx
+++ b/sw/source/uibase/fldui/fldwrap.cxx
@@ -21,7 +21,6 @@
#include <swtypes.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/dispatch.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/htmlmode.hxx>
#include <viewopt.hxx>
#include <docsh.hxx>
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index b8c647846cfb..a0ddb69ba3a3 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -22,7 +22,6 @@
#include "chldwrap.hxx"
#include <redline.hxx>
#include <tools/datetime.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/eitem.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <sfx2/basedlgs.hxx>
diff --git a/sw/source/uibase/index/idxmrk.cxx b/sw/source/uibase/index/idxmrk.cxx
index 7e6119827548..9f41aac6f07f 100644
--- a/sw/source/uibase/index/idxmrk.cxx
+++ b/sw/source/uibase/index/idxmrk.cxx
@@ -20,7 +20,6 @@
#include <hintids.hxx>
#include <comphelper/processfactory.hxx>
#include <svl/stritem.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/eitem.hxx>
#include <editeng/scripttypeitem.hxx>
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index f49e92c93c9e..2ddc37cd28da 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -24,7 +24,6 @@
#include <globals.hrc>
#include <splargs.hxx>
-#include <vcl/msgbox.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/langitem.hxx>
#include <editeng/fontitem.hxx>
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index ecea03ff3c5c..6d1c67493655 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -19,7 +19,6 @@
#include <redline.hxx>
#include <tools/datetime.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/eitem.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 63f7b1a191e6..ba020cb0fdad 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -61,7 +61,6 @@
#include <svl/cjkoptions.hxx>
#include <svl/ctloptions.hxx>
#include <unotools/useroptions.hxx>
-#include <vcl/msgbox.hxx>
#include <editeng/flditem.hxx>
#include <editeng/editstat.hxx>
#include <svx/hlnkitem.hxx>
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 30898e79fcb6..0e90ed956a1c 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -40,7 +40,6 @@
#include <svx/contdlg.hxx>
#include <vcl/graph.hxx>
#include <svl/slstitm.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/ptitem.hxx>
#include <svl/itemiter.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/uibase/shells/drawdlg.cxx b/sw/source/uibase/shells/drawdlg.cxx
index 06a107981c58..21dbe250db15 100644
--- a/sw/source/uibase/shells/drawdlg.cxx
+++ b/sw/source/uibase/shells/drawdlg.cxx
@@ -18,7 +18,6 @@
*/
#include <svx/svxids.hrc>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
#include <svx/svdview.hxx>
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 9e6fca607df5..c3605a9ab451 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -24,7 +24,6 @@
#include <sfx2/bindings.hxx>
#include <svl/aeitem.hxx>
#include <svx/svdview.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/srchitem.hxx>
#include <svl/whiter.hxx>
#include <svx/swframevalidation.hxx>
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 9fb3d1b86739..0ff4ada96451 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -53,7 +53,6 @@
#include <svl/ctloptions.hxx>
#include <svtools/langtab.hxx>
#include <svl/languageoptions.hxx>
-#include <vcl/msgbox.hxx>
#include <editeng/flditem.hxx>
#include <editeng/editstat.hxx>
#include <svx/hlnkitem.hxx>
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 9087ec1f006b..e6401ddcef7e 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -25,7 +25,6 @@
#include <editeng/fontitem.hxx>
#include <editeng/langitem.hxx>
#include <svx/svdview.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
#include <svx/svdotext.hxx>
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index cd43b0c097ec..181bb8c72ead 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -42,7 +42,6 @@
#include <vcl/EnumContext.hxx>
#include <svx/hlnkitem.hxx>
#include <svx/svdview.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/commandinfoprovider.hxx>
#include <doc.hxx>
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 089cb51830e2..a91688561fb4 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -21,7 +21,6 @@
#include <hintids.hxx>
#include <o3tl/make_unique.hxx>
#include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/whiter.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/uibase/shells/grfshex.cxx b/sw/source/uibase/shells/grfshex.cxx
index faebe58c21fd..7b2562b0ee99 100644
--- a/sw/source/uibase/shells/grfshex.cxx
+++ b/sw/source/uibase/shells/grfshex.cxx
@@ -34,7 +34,6 @@
#include <docsh.hxx>
#include <frmfmt.hxx>
#include <frmmgr.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <svx/svdomedia.hxx>
#include <svx/svdview.hxx>
diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx
index 2c6d1da1f21d..33bdcce561df 100644
--- a/sw/source/uibase/shells/langhelper.cxx
+++ b/sw/source/uibase/shells/langhelper.cxx
@@ -49,8 +49,6 @@
#include <swabstdlg.hxx>
-#include <vcl/msgbox.hxx>
-
#include <langhelper.hxx>
#include <memory>
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index fe8c8d5c9157..2e9fa7010f4d 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -19,7 +19,6 @@
#include <cmdid.h>
#include <hintids.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/whiter.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 53cd6789fd7f..0c3180a44a4d 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -41,7 +41,6 @@
#include <svl/zformat.hxx>
#include <sfx2/bindings.hxx>
#include <vcl/weld.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/objface.hxx>
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 0ce7fe6db1eb..fe367a81c2cd 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -27,7 +27,6 @@
#include <editeng/outliner.hxx>
#include <sfx2/lnkbase.hxx>
#include <fmtfld.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/itempool.hxx>
#include <unotools/useroptions.hxx>
#include <svl/whiter.hxx>
diff --git a/sw/source/uibase/shells/textidx.cxx b/sw/source/uibase/shells/textidx.cxx
index 73061b385934..e2ce8d906be6 100644
--- a/sw/source/uibase/shells/textidx.cxx
+++ b/sw/source/uibase/shells/textidx.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 901323446dcf..790cf3442d77 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -32,7 +32,6 @@
#include <svl/ptitem.hxx>
#include <svl/stritem.hxx>
#include <unotools/moduleoptions.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/fcontnr.hxx>
#include <svx/hlnkitem.hxx>
#include <svl/srchitem.hxx>
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx
index 8a9630027822..857a7f9cc495 100644
--- a/sw/source/uibase/shells/textsh2.cxx
+++ b/sw/source/uibase/shells/textsh2.cxx
@@ -25,7 +25,6 @@
#include <sfx2/event.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/itemset.hxx>
#include <sfx2/request.hxx>
diff --git a/sw/source/uibase/shells/txtattr.cxx b/sw/source/uibase/shells/txtattr.cxx
index 765d116811a5..ff92c7266691 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -20,7 +20,6 @@
#include <hintids.hxx>
#include <o3tl/make_unique.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/whiter.hxx>
#include <svl/stritem.hxx>
#include <svl/itemiter.hxx>
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index 5565c2bd1db6..67a918697a4a 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/request.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/uibase/table/chartins.cxx b/sw/source/uibase/table/chartins.cxx
index fa0dbd934e2c..d97c7e31e2b5 100644
--- a/sw/source/uibase/table/chartins.cxx
+++ b/sw/source/uibase/table/chartins.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/viewfrm.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/basedlgs.hxx>
#include <IDocumentUndoRedo.hxx>
diff --git a/sw/source/uibase/table/swtablerep.cxx b/sw/source/uibase/table/swtablerep.cxx
index a9b9ae49b9ec..22b2e1bebd1e 100644
--- a/sw/source/uibase/table/swtablerep.cxx
+++ b/sw/source/uibase/table/swtablerep.cxx
@@ -18,7 +18,6 @@
*/
#include <hintids.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
#include <editeng/keepitem.hxx>
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index c4cbbe55b15e..f2958a819faa 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -35,7 +35,6 @@
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
-#include <vcl/msgbox.hxx>
#include <svx/stddlg.hxx>
#include <editeng/paperinf.hxx>
#include <svl/srchitem.hxx>
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 9dbe6d1fa265..5e263e45f808 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -25,7 +25,6 @@
#include <vcl/errinf.hxx>
#include <vcl/weld.hxx>
#include <vcl/print.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/metric.hxx>
#include <svtools/ctrltool.hxx>
diff --git a/sw/source/uibase/uiview/uivwimp.cxx b/sw/source/uibase/uiview/uivwimp.cxx
index a3e6107aa71b..cdb25d80f08c 100644
--- a/sw/source/uibase/uiview/uivwimp.cxx
+++ b/sw/source/uibase/uiview/uivwimp.cxx
@@ -28,7 +28,6 @@
#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index ba09eba84464..721a6039ece7 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -56,7 +56,6 @@
#include <unotools/textsearch.hxx>
#include <editeng/unolingu.hxx>
#include <vcl/weld.hxx>
-#include <vcl/msgbox.hxx>
#include <editeng/tstpitem.hxx>
#include <sfx2/event.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 8ac2ccd217de..f7a1b91b1ebf 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -30,7 +30,6 @@
#include <comphelper/propertysequence.hxx>
#include <comphelper/scopeguard.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/weld.hxx>
#include <svtools/ehdl.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index d2932070dc89..48a870638e9b 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -42,7 +42,6 @@
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
#include <vcl/layout.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/wrkwin.hxx>
#include <editeng/unolingu.hxx>
#include <edtwin.hxx>
diff --git a/sw/source/uibase/uno/SwXFilterOptions.cxx b/sw/source/uibase/uno/SwXFilterOptions.cxx
index 1426c688d587..df404103e7e4 100644
--- a/sw/source/uibase/uno/SwXFilterOptions.cxx
+++ b/sw/source/uibase/uno/SwXFilterOptions.cxx
@@ -22,7 +22,6 @@
#include <swdll.hxx>
#include <unoprnms.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <comphelper/propertysequence.hxx>
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index d29d3eb49762..8c15eb15d787 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/msgbox.hxx>
#include <svl/stritem.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/linkmgr.hxx>
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 9f2a54830503..0d1662e039de 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -19,7 +19,6 @@
#include <tools/urlobj.hxx>
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
diff --git a/sw/source/uibase/utlui/numfmtlb.cxx b/sw/source/uibase/utlui/numfmtlb.cxx
index e842ee41cebd..fcaa66eabe68 100644
--- a/sw/source/uibase/utlui/numfmtlb.cxx
+++ b/sw/source/uibase/utlui/numfmtlb.cxx
@@ -26,7 +26,6 @@
#include <svl/eitem.hxx>
#include <svx/svxids.hrc>
#include <svx/numinf.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/builderfactory.hxx>
#include <svx/flagsdef.hxx>
#include <svl/itemset.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 1bb5fedd7588..6bbc5821f881 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -46,7 +46,6 @@
#include <editeng/svxacorr.hxx>
#include <editeng/ulspitem.hxx>
#include <vcl/graph.hxx>
-#include <vcl/msgbox.hxx>
#include <sfx2/printer.hxx>
#include <unotools/charclass.hxx>
#include <comphelper/storagehelper.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 00d8a7a0f783..2d8c629ee947 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -20,7 +20,6 @@
#include <hintids.hxx>
#include <svl/macitem.hxx>
#include <sfx2/frame.hxx>
-#include <vcl/msgbox.hxx>
#include <svl/urihelper.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index 230de254ca11..b5d8b4f1c5a4 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -9,7 +9,6 @@
#include "authfallbackdlg.hxx"
-#include <vcl/msgbox.hxx>
#include <iostream>
using namespace boost;
diff --git a/uui/source/fltdlg.hxx b/uui/source/fltdlg.hxx
index dbedcea11a36..76d1d257d6a0 100644
--- a/uui/source/fltdlg.hxx
+++ b/uui/source/fltdlg.hxx
@@ -22,7 +22,6 @@
#include <vcl/dialog.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/button.hxx>
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 2d4d5362f169..2351cdbc395d 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -37,7 +37,6 @@
#include <unotools/resmgr.hxx>
#include <vcl/errcode.hxx>
#include <vcl/errinf.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/svapp.hxx>
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index d52142da4667..0facddd6debb 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -33,7 +33,6 @@
#include <unotools/resmgr.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
#include <strings.hrc>
#include "getcontinuations.hxx"
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index 53011ff1ddf5..c2efb7dfb6e4 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -18,7 +18,6 @@
*/
#include <comphelper/string.hxx>
-#include <vcl/msgbox.hxx>
#include "logindlg.hxx"
#include <strings.hrc>
diff --git a/vcl/qa/cppunit/dndtest.cxx b/vcl/qa/cppunit/dndtest.cxx
index 66cc9a12c3d7..37629239b83c 100644
--- a/vcl/qa/cppunit/dndtest.cxx
+++ b/vcl/qa/cppunit/dndtest.cxx
@@ -23,7 +23,6 @@
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/lstbox.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 25e9fc972dbb..40eccbd30378 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -50,7 +50,6 @@
#include <vcl/tabctrl.hxx>
#include <vcl/tabpage.hxx>
#include <vcl/decoview.hxx>
-#include <vcl/msgbox.hxx>
#include <vcl/unowrap.hxx>
#include <vcl/settings.hxx>
#include <vcl/uitest/uiobject.hxx>
diff --git a/vcl/unx/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx
index b512123f768e..1e4ae1b7aba4 100644
--- a/vcl/unx/generic/app/gensys.cxx
+++ b/vcl/unx/generic/app/gensys.cxx
@@ -21,7 +21,6 @@
#include <unx/gensys.h>
-#include <vcl/msgbox.hxx>
#include <vcl/button.hxx>
#include <svdata.hxx>
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index 5a1edcae872d..7df6bc14f91a 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/security/CertificateCharacters.hpp>
#include <resourcemanager.hxx>
-#include <vcl/msgbox.hxx>
#include <svtools/treelistentry.hxx>
#include <unotools/useroptions.hxx>
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index c91432d93c68..41c597754294 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -39,8 +39,6 @@
#include <tools/urlobj.hxx>
#include <svtools/treelistentry.hxx>
-#include <vcl/msgbox.hxx>
-
#include <strings.hrc>
#include <resourcemanager.hxx>