From fbcfd00fb7a67164283193ca2bf0d08f572a847c Mon Sep 17 00:00:00 2001
From: Michael Weghorn <m.weghorn@posteo.de>
Date: Tue, 10 Feb 2026 14:59:41 +0100
Subject: [PATCH] weld: Move weld::Dialog to own header/source

Move the class out of weld.hxx into its own header and source
file, in order to make it easier to keep an overview and to avoid
having to recompile ~all UI code when the class is
modified.

Change-Id: Ic47dac553fc065c5c9cddbf31e33012314dbe43d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199073
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
---
 basctl/source/basicide/ColorSchemeDialog.cxx  |  1 +
 basctl/source/basicide/brkdlg.cxx             |  1 +
 basctl/source/basicide/moduldl2.cxx           |  1 +
 basctl/source/basicide/moduldlg.hxx           |  1 +
 basic/source/runtime/inputbox.cxx             |  1 +
 basic/source/runtime/iosys.cxx                |  1 +
 .../dialogs/ChartResourceGroupDlgs.cxx        |  2 +
 .../dialogs/RangeSelectionListener.cxx        |  1 +
 .../controller/dialogs/dlg_DataEditor.cxx     |  1 +
 .../controller/dialogs/dlg_DataSource.cxx     |  1 +
 .../dialogs/dlg_InsertErrorBars.cxx           |  2 +
 .../controller/dialogs/dlg_InsertTitle.cxx    |  2 +
 .../dialogs/dlg_ObjectProperties.cxx          |  1 +
 .../source/controller/dialogs/dlg_View3D.cxx  |  1 +
 .../controller/dialogs/tp_DataLabel.cxx       |  2 +
 cui/source/customize/cfg.cxx                  |  1 +
 cui/source/customize/cfgutil.cxx              |  1 +
 cui/source/customize/macropg.cxx              |  1 +
 cui/source/dialogs/AdditionsDialog.cxx        |  1 +
 cui/source/dialogs/DiagramDialog.cxx          |  1 +
 cui/source/dialogs/GraphicTestsDialog.cxx     |  1 +
 cui/source/dialogs/ImageViewerDialog.cxx      |  1 +
 cui/source/dialogs/MacroManagerDialog.cxx     |  1 +
 .../dialogs/SignSignatureLineDialog.cxx       |  1 +
 cui/source/dialogs/SpellDialog.cxx            |  1 +
 cui/source/dialogs/cuifmsearch.cxx            |  1 +
 cui/source/dialogs/cuigaldlg.cxx              |  1 +
 cui/source/dialogs/dlgname.cxx                |  1 +
 cui/source/dialogs/hangulhanjadlg.cxx         |  1 +
 cui/source/dialogs/hlmarkwn.cxx               |  1 +
 cui/source/dialogs/hyperlinktabpagebase.cxx   |  1 +
 cui/source/dialogs/hyphen.cxx                 |  1 +
 cui/source/dialogs/insdlg.cxx                 |  1 +
 cui/source/dialogs/insrc.cxx                  |  1 +
 cui/source/dialogs/linkdlg.cxx                |  1 +
 cui/source/dialogs/multipat.cxx               |  1 +
 cui/source/dialogs/passwdomdlg.cxx            |  1 +
 cui/source/dialogs/pastedlg.cxx               |  1 +
 cui/source/dialogs/postdlg.cxx                |  1 +
 .../dialogs/screenshotannotationdlg.cxx       |  1 +
 cui/source/dialogs/scriptdlg.cxx              |  1 +
 cui/source/dialogs/showcols.cxx               |  1 +
 cui/source/dialogs/srchxtra.cxx               |  1 +
 cui/source/dialogs/thesdlg.cxx                |  1 +
 cui/source/dialogs/tipofthedaydlg.cxx         |  1 +
 cui/source/dialogs/welcomedlg.cxx             |  1 +
 cui/source/dialogs/widgettestdlg.cxx          |  1 +
 cui/source/dialogs/zoom.cxx                   |  1 +
 cui/source/inc/GraphicsTestsDialog.hxx        |  1 +
 cui/source/inc/insdlg.hxx                     |  1 +
 cui/source/inc/multipat.hxx                   |  1 +
 cui/source/inc/postdlg.hxx                    |  1 +
 cui/source/options/appearance.cxx             |  1 +
 cui/source/options/certpath.cxx               |  1 +
 cui/source/options/dbregister.cxx             |  1 +
 cui/source/options/doclinkdialog.cxx          |  1 +
 cui/source/options/optaboutconfig.cxx         |  1 +
 cui/source/options/optdict.cxx                |  1 +
 cui/source/options/optgenrl.cxx               |  1 +
 cui/source/options/optjava.cxx                |  1 +
 cui/source/options/optlingu.cxx               |  1 +
 cui/source/options/treeopt.cxx                |  1 +
 cui/source/options/tsaurls.cxx                |  1 +
 cui/source/options/webconninfo.cxx            |  1 +
 cui/source/tabpages/border.cxx                |  1 +
 cui/source/tabpages/connect.cxx               |  1 +
 cui/source/tabpages/grfpage.cxx               |  1 +
 cui/source/tabpages/measure.cxx               |  1 +
 cui/source/tabpages/tabarea.cxx               |  1 +
 cui/source/tabpages/tabline.cxx               |  1 +
 cui/source/tabpages/tpline.cxx                |  1 +
 cui/source/tabpages/tpshadow.cxx              |  1 +
 dbaccess/source/ui/dlg/CollectionView.cxx     |  1 +
 dbaccess/source/ui/dlg/RelationDlg.cxx        |  1 +
 dbaccess/source/ui/dlg/UserAdmin.cxx          |  1 +
 dbaccess/source/ui/dlg/adtabdlg.cxx           |  1 +
 dbaccess/source/ui/dlg/advancedsettings.cxx   |  1 +
 dbaccess/source/ui/dlg/dbfindex.cxx           |  1 +
 dbaccess/source/ui/dlg/dlgsave.cxx            |  1 +
 dbaccess/source/ui/dlg/dsselect.cxx           |  1 +
 dbaccess/source/ui/dlg/indexdialog.cxx        |  1 +
 dbaccess/source/ui/dlg/paramdialog.cxx        |  1 +
 .../source/ui/dlg/textconnectionsettings.cxx  |  1 +
 dbaccess/source/ui/querydesign/querydlg.cxx   |  1 +
 .../source/deployment/gui/dp_gui_dialog2.hxx  |  1 +
 .../deployment/gui/dp_gui_updatedialog.cxx    |  1 +
 .../gui/dp_gui_updateinstalldialog.cxx        |  1 +
 .../source/deployment/gui/license_dialog.cxx  |  1 +
 extensions/source/bibliography/datman.cxx     |  1 +
 extensions/source/dbpilots/groupboxwiz.cxx    |  1 +
 .../source/propctrlr/formlinkdialog.cxx       |  1 +
 .../source/propctrlr/listselectiondlg.cxx     |  1 +
 extensions/source/propctrlr/taborder.cxx      |  1 +
 .../xsltdialog/xmlfiltersettingsdialog.hxx    |  1 +
 .../source/xsltdialog/xmlfiltertestdialog.cxx |  1 +
 formula/source/ui/dlg/formula.cxx             |  1 +
 fpicker/source/office/PlacesListBox.cxx       |  1 +
 fpicker/source/office/commonpicker.cxx        |  1 +
 include/sfx2/filedlghelper.hxx                |  1 +
 include/svtools/prnsetup.hxx                  |  1 +
 include/svx/cuicharmap.hxx                    |  1 +
 include/svx/graphctl.hxx                      |  1 +
 include/vcl/weld/Assistant.hxx                |  2 +-
 include/vcl/weld/ColorChooserDialog.hxx       |  2 +-
 include/vcl/weld/Dialog.hxx                   | 69 +++++++++++++++++++
 include/vcl/weld/MessageDialog.hxx            |  2 +-
 include/vcl/weld/weld.hxx                     | 59 ----------------
 reportdesign/source/ui/dlg/AddField.cxx       |  1 +
 reportdesign/source/ui/dlg/CondFormat.cxx     |  1 +
 reportdesign/source/ui/dlg/Formula.cxx        |  1 +
 reportdesign/source/ui/dlg/Navigator.cxx      |  1 +
 reportdesign/source/ui/report/DesignView.cxx  |  1 +
 .../StatisticsDialogs/ChiSquareTestDialog.cxx |  2 +
 .../ui/StatisticsDialogs/FTestDialog.cxx      |  2 +
 .../FourierAnalysisDialog.cxx                 |  1 +
 .../RandomNumberGeneratorDialog.cxx           |  1 +
 .../ui/StatisticsDialogs/SamplingDialog.cxx   |  1 +
 .../StatisticsInputOutputDialog.cxx           |  1 +
 .../StatisticsTwoVariableDialog.cxx           |  1 +
 .../ui/StatisticsDialogs/TTestDialog.cxx      |  2 +
 .../ui/StatisticsDialogs/ZTestDialog.cxx      |  2 +
 sc/source/ui/attrdlg/scdlgfact.cxx            |  1 +
 sc/source/ui/condformat/condformatdlg.cxx     |  1 +
 sc/source/ui/condformat/condformateasydlg.cxx |  1 +
 sc/source/ui/condformat/condformatmgr.cxx     |  1 +
 sc/source/ui/dbgui/PivotLayoutDialog.cxx      |  1 +
 sc/source/ui/dbgui/consdlg.cxx                |  1 +
 sc/source/ui/dbgui/dapitype.cxx               |  1 +
 sc/source/ui/dbgui/dbnamdlg.cxx               |  1 +
 sc/source/ui/dbgui/filtdlg.cxx                |  1 +
 sc/source/ui/dbgui/pfiltdlg.cxx               |  1 +
 sc/source/ui/dbgui/pvfundlg.cxx               |  1 +
 sc/source/ui/dbgui/scendlg.cxx                |  1 +
 sc/source/ui/dbgui/scuiasciiopt.cxx           |  1 +
 sc/source/ui/dbgui/scuiimoptdlg.cxx           |  1 +
 sc/source/ui/dbgui/sfiltdlg.cxx               |  1 +
 sc/source/ui/dbgui/sortdlg.cxx                |  1 +
 sc/source/ui/dbgui/subtdlg.cxx                |  1 +
 sc/source/ui/dbgui/textimportoptions.cxx      |  1 +
 sc/source/ui/dbgui/validate.cxx               |  1 +
 .../ui/dialogs/SparklineDataRangeDialog.cxx   |  2 +
 sc/source/ui/dialogs/SparklineDialog.cxx      |  1 +
 sc/source/ui/formdlg/formula.cxx              |  1 +
 sc/source/ui/inc/validate.hxx                 |  1 +
 sc/source/ui/miscdlgs/acredlin.cxx            |  1 +
 sc/source/ui/miscdlgs/anyrefdg.cxx            |  1 +
 sc/source/ui/miscdlgs/conflictsdlg.cxx        |  1 +
 sc/source/ui/miscdlgs/crdlg.cxx               |  1 +
 sc/source/ui/miscdlgs/crnrdlg.cxx             |  1 +
 sc/source/ui/miscdlgs/datafdlg.cxx            |  1 +
 sc/source/ui/miscdlgs/dataproviderdlg.cxx     |  1 +
 sc/source/ui/miscdlgs/datastreamdlg.cxx       |  1 +
 sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx |  1 +
 sc/source/ui/miscdlgs/filldlg.cxx             |  1 +
 sc/source/ui/miscdlgs/gototabdlg.cxx          |  1 +
 sc/source/ui/miscdlgs/inscodlg.cxx            |  1 +
 sc/source/ui/miscdlgs/instbdlg.cxx            |  1 +
 sc/source/ui/miscdlgs/lbseldlg.cxx            |  1 +
 sc/source/ui/miscdlgs/linkarea.cxx            |  1 +
 sc/source/ui/miscdlgs/mvtabdlg.cxx            |  2 +
 .../ui/miscdlgs/onlyactivesheetsaveddlg.cxx   |  1 +
 sc/source/ui/miscdlgs/optsolver.cxx           |  1 +
 sc/source/ui/miscdlgs/protectiondlg.cxx       |  1 +
 sc/source/ui/miscdlgs/retypepassdlg.cxx       |  1 +
 sc/source/ui/miscdlgs/shtabdlg.cxx            |  1 +
 sc/source/ui/miscdlgs/solveroptions.cxx       |  1 +
 sc/source/ui/miscdlgs/solvrdlg.cxx            |  1 +
 sc/source/ui/miscdlgs/strindlg.cxx            |  1 +
 sc/source/ui/miscdlgs/tabbgcolordlg.cxx       |  1 +
 sc/source/ui/miscdlgs/tabopdlg.cxx            |  1 +
 sc/source/ui/namedlg/namepast.cxx             |  1 +
 sc/source/ui/optdlg/opredlin.cxx              |  1 +
 sc/source/ui/pagedlg/areasdlg.cxx             |  1 +
 sc/source/ui/pagedlg/hfedtdlg.cxx             |  1 +
 sc/source/ui/pagedlg/scuitphfedit.cxx         |  1 +
 sc/source/ui/view/cellsh.cxx                  |  1 +
 sc/source/ui/view/tabview3.cxx                |  1 +
 sc/source/ui/view/tabvwshd.cxx                |  1 +
 sc/source/ui/xmlsource/xmlsourcedlg.cxx       |  1 +
 sd/source/ui/dlg/PhotoAlbumDialog.cxx         |  1 +
 sd/source/ui/dlg/RemoteDialog.cxx             |  1 +
 sd/source/ui/dlg/SelectLayerDlg.cxx           |  1 +
 sd/source/ui/dlg/brkdlg.cxx                   |  1 +
 sd/source/ui/dlg/copydlg.cxx                  |  1 +
 sd/source/ui/dlg/custsdlg.cxx                 |  1 +
 sd/source/ui/dlg/dlgsnap.cxx                  |  1 +
 sd/source/ui/dlg/headerfooterdlg.cxx          |  1 +
 sd/source/ui/dlg/inspagob.cxx                 |  1 +
 sd/source/ui/dlg/layeroptionsdlg.cxx          |  1 +
 sd/source/ui/dlg/masterlayoutdlg.cxx          |  1 +
 sd/source/ui/dlg/prltempl.cxx                 |  1 +
 sd/source/ui/dlg/sdpreslt.cxx                 |  1 +
 sd/source/ui/dlg/vectdlg.cxx                  |  1 +
 sfx2/source/appl/childwin.cxx                 |  1 +
 sfx2/source/appl/newhelp.cxx                  |  1 +
 sfx2/source/dialog/basedlgs.cxx               |  1 +
 sfx2/source/dialog/checkin.cxx                |  1 +
 sfx2/source/dialog/dinfdlg.cxx                |  1 +
 sfx2/source/dialog/newstyle.cxx               |  1 +
 sfx2/source/dialog/passwd.cxx                 |  1 +
 sfx2/source/dialog/recfloat.cxx               |  1 +
 sfx2/source/dialog/styledlg.cxx               |  1 +
 sfx2/source/dialog/tabdlg.cxx                 |  1 +
 sfx2/source/dialog/versdlg.cxx                |  1 +
 sfx2/source/doc/autoredactdialog.cxx          |  1 +
 sfx2/source/doc/new.cxx                       |  1 +
 sfx2/source/doc/saveastemplatedlg.cxx         |  1 +
 sfx2/source/doc/templatedlg.cxx               |  1 +
 sfx2/source/inc/workwin.hxx                   |  1 +
 sfx2/source/view/printer.cxx                  |  1 +
 starmath/source/dialog.cxx                    |  1 +
 svtools/source/dialogs/PlaceEditDialog.cxx    |  1 +
 .../source/dialogs/ServerDetailsControls.cxx  |  1 +
 svtools/source/dialogs/addresstemplate.cxx    |  1 +
 svtools/source/dialogs/prnsetup.cxx           |  1 +
 svtools/source/dialogs/restartdialog.cxx      |  1 +
 svtools/source/filter/exportdialog.cxx        |  1 +
 svx/source/dialog/ClassificationDialog.cxx    |  1 +
 svx/source/dialog/FileExportedDialog.cxx      |  1 +
 svx/source/dialog/SafeModeDialog.cxx          |  1 +
 svx/source/dialog/TableAutoFmtDlg.cxx         |  1 +
 svx/source/dialog/TableStylesDlg.cxx          |  1 +
 svx/source/dialog/ThemeDialog.cxx             |  1 +
 svx/source/dialog/_contdlg.cxx                |  1 +
 svx/source/dialog/contimp.hxx                 |  1 +
 svx/source/dialog/contwnd.hxx                 |  5 ++
 svx/source/dialog/docrecovery.cxx             |  1 +
 svx/source/dialog/graphctl.cxx                |  1 +
 svx/source/dialog/imapdlg.cxx                 |  1 +
 svx/source/dialog/rubydialog.cxx              |  1 +
 svx/source/dialog/srchdlg.cxx                 |  1 +
 svx/source/form/datanavi.cxx                  |  1 +
 svx/source/form/fmPropBrw.cxx                 |  1 +
 svx/source/form/tabwin.cxx                    |  1 +
 svx/source/tbxctrls/fontworkgallery.cxx       |  1 +
 .../chinese_translationdialog.cxx             |  1 +
 svx/source/unodraw/recoveryui.cxx             |  1 +
 sw/source/core/view/viewsh.cxx                |  1 +
 sw/source/ui/chrdlg/break.cxx                 |  1 +
 sw/source/ui/chrdlg/chardlg.cxx               |  1 +
 sw/source/ui/chrdlg/pardlg.cxx                |  1 +
 sw/source/ui/config/mailconfigpage.cxx        |  1 +
 sw/source/ui/config/optpage.cxx               |  1 +
 sw/source/ui/dbui/addresslistdialog.cxx       |  1 +
 sw/source/ui/dbui/createaddresslistdialog.cxx |  1 +
 sw/source/ui/dbui/createaddresslistdialog.hxx |  1 +
 .../ui/dbui/customizeaddresslistdialog.cxx    |  1 +
 sw/source/ui/dbui/dbinsdlg.cxx                |  1 +
 sw/source/ui/dbui/mmaddressblockpage.cxx      |  1 +
 sw/source/ui/dbui/mmgreetingspage.cxx         |  1 +
 sw/source/ui/dbui/mmoutputtypepage.cxx        |  1 +
 sw/source/ui/dbui/mmresultdialogs.cxx         |  1 +
 sw/source/ui/dbui/selectdbtabledialog.cxx     |  1 +
 sw/source/ui/dialog/ascfldlg.cxx              |  1 +
 sw/source/ui/dialog/uiregionsw.cxx            |  1 +
 sw/source/ui/dialog/wordcountdialog.cxx       |  1 +
 sw/source/ui/dochdl/selglos.cxx               |  1 +
 sw/source/ui/envelp/label1.cxx                |  1 +
 sw/source/ui/envelp/labfmt.cxx                |  1 +
 sw/source/ui/envelp/mailmrge.cxx              |  1 +
 sw/source/ui/fldui/DropDownFieldDialog.cxx    |  1 +
 .../ui/fldui/DropDownFormFieldDialog.cxx      |  1 +
 sw/source/ui/fldui/changedb.cxx               |  1 +
 sw/source/ui/fldui/fldedt.cxx                 |  1 +
 sw/source/ui/fldui/fldtdlg.cxx                |  1 +
 sw/source/ui/fldui/inpdlg.cxx                 |  1 +
 sw/source/ui/fldui/javaedit.cxx               |  1 +
 sw/source/ui/frmdlg/column.cxx                |  1 +
 sw/source/ui/frmdlg/cption.cxx                |  1 +
 sw/source/ui/frmdlg/frmdlg.cxx                |  1 +
 sw/source/ui/frmdlg/pattern.cxx               |  2 +
 sw/source/ui/frmdlg/uiborder.cxx              |  1 +
 sw/source/ui/index/cnttab.cxx                 |  1 +
 sw/source/ui/index/swuiidxmrk.cxx             |  1 +
 sw/source/ui/misc/bookmark.cxx                |  1 +
 sw/source/ui/misc/contentcontroldlg.cxx       |  1 +
 .../ui/misc/contentcontrollistitemdlg.cxx     |  1 +
 sw/source/ui/misc/glossary.cxx                |  1 +
 sw/source/ui/misc/insfnote.cxx                |  1 +
 sw/source/ui/misc/linenum.cxx                 |  1 +
 sw/source/ui/misc/num.cxx                     |  1 +
 sw/source/ui/misc/outline.cxx                 |  1 +
 sw/source/ui/misc/pagenumberdlg.cxx           |  1 +
 sw/source/ui/misc/pgfnote.cxx                 |  1 +
 sw/source/ui/misc/pggrid.cxx                  |  1 +
 sw/source/ui/misc/swmodalredlineacceptdlg.cxx |  1 +
 sw/source/ui/misc/titlepage.cxx               |  1 +
 sw/source/ui/misc/translatelangselect.cxx     |  1 +
 sw/source/ui/table/convert.cxx                |  1 +
 sw/source/ui/table/instable.cxx               |  1 +
 sw/source/ui/utlui/copyfielddlg.cxx           |  1 +
 sw/source/ui/utlui/swrenamexnameddlg.cxx      |  1 +
 sw/source/uibase/dialog/watermarkdialog.cxx   |  1 +
 sw/source/uibase/envelp/syncbtn.cxx           |  1 +
 sw/source/uibase/inc/swuiidxmrk.hxx           |  1 +
 sw/source/uibase/misc/redlndlg.cxx            |  1 +
 sw/source/uibase/sidebar/QuickFindPanel.cxx   |  1 +
 sw/source/uibase/uiview/view2.cxx             |  1 +
 sw/source/uibase/utlui/gloslst.cxx            |  1 +
 test/source/screenshot_test.cxx               |  1 +
 uui/source/authfallbackdlg.cxx                |  1 +
 uui/source/fltdlg.cxx                         |  1 +
 uui/source/logindlg.cxx                       |  1 +
 uui/source/masterpasscrtdlg.cxx               |  1 +
 uui/source/masterpassworddlg.cxx              |  1 +
 uui/source/nameclashdlg.cxx                   |  1 +
 uui/source/openlocked.cxx                     |  1 +
 uui/source/passworddlg.cxx                    |  1 +
 vcl/Library_vcl.mk                            |  1 +
 vcl/inc/qt5/QtInstanceBuilder.hxx             |  1 +
 vcl/inc/qt5/QtInstanceDialog.hxx              |  1 +
 vcl/inc/salvtables.hxx                        |  1 +
 vcl/source/weld/Dialog.cxx                    | 21 ++++++
 vcl/source/weld/DialogController.cxx          |  1 +
 vcl/source/window/dialog.cxx                  |  1 +
 vcl/source/window/printdlg.cxx                |  1 +
 vcl/unx/generic/print/genprnpsp.cxx           |  1 +
 vcl/unx/generic/print/prtsetup.cxx            |  1 +
 vcl/unx/gtk3/gtkinst.cxx                      |  1 +
 .../source/common/WPFTEncodingDialog.cxx      |  1 +
 .../source/writer/EPUBExportDialog.cxx        |  1 +
 .../source/dialogs/certificatechooser.cxx     |  1 +
 .../source/dialogs/certificateviewer.cxx      |  1 +
 .../dialogs/digitalsignaturesdialog.cxx       |  1 +
 xmlsecurity/source/dialogs/macrosecurity.cxx  |  1 +
 325 files changed, 427 insertions(+), 62 deletions(-)
 create mode 100644 include/vcl/weld/Dialog.hxx
 create mode 100644 vcl/source/weld/Dialog.cxx

diff --git a/basctl/source/basicide/ColorSchemeDialog.cxx b/basctl/source/basicide/ColorSchemeDialog.cxx
index a092d56edeb5..87a6eee39691 100644
--- a/basctl/source/basicide/ColorSchemeDialog.cxx
+++ b/basctl/source/basicide/ColorSchemeDialog.cxx
@@ -22,6 +22,7 @@
 #include <iderid.hxx>
 #include <ColorSchemeDialog.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include "baside2.hxx"
 #include <BasicColorConfig.hxx>
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 201762656494..a08ea2bb99b4 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -28,6 +28,7 @@
 #include <svl/itemset.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index e2ae771302f5..e34e248ea08c 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -41,6 +41,7 @@
 #include <tools/urlobj.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index de326f6b25d0..6e8c3235bf0a 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -26,6 +26,7 @@
 #include <bastype2.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/Notebook.hxx>
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 227a5633bb1e..ae9e64e13f6a 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 2bdb20a3f473..39aaf4a9e8cc 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -21,6 +21,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/MessageDialog.hxx>
diff --git a/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx b/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx
index 3e426c4e02c9..215f52c27eef 100644
--- a/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx
+++ b/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx
@@ -23,6 +23,8 @@
 #include <strings.hrc>
 #include <ResId.hxx>
 
+#include <vcl/weld/Dialog.hxx>
+
 namespace chart
 {
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
index d3ceb64c8f32..fc61dbcef101 100644
--- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
@@ -20,6 +20,7 @@
 #include <RangeSelectionListener.hxx>
 #include <ChartModel.hxx>
 #include <vcl/weld/Assistant.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/weld.hxx>
 #include <utility>
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index c71b1c1d178c..72f4ebc4e2ba 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -23,6 +23,7 @@
 
 #include <com/sun/star/awt/XWindow.hpp>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <utility>
 
 using namespace ::com::sun::star;
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 2e210de81a61..27c11e68d68c 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -28,6 +28,7 @@
 #include "tp_DataSource.hxx"
 
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace ::chart;
 
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 4e5c3e453c7f..9f7f93385f84 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -29,6 +29,8 @@
 #include <ObjectNameProvider.hxx>
 #include <DataSeries.hxx>
 
+#include <vcl/weld/Dialog.hxx>
+
 using namespace ::com::sun::star;
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index 5e96f9ae9c73..67a5c77b972c 100644
--- a/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -21,6 +21,8 @@
 #include <res_Titles.hxx>
 #include <ObjectNameProvider.hxx>
 
+#include <vcl/weld/Dialog.hxx>
+
 namespace chart
 {
 SchTitleDlg::SchTitleDlg(weld::Window* pWindow, const TitleDialogData& rInput)
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 7d73cbedae35..1f3d96d88d74 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -67,6 +67,7 @@
 
 #include <svx/flagsdef.hxx>
 #include <svx/numinf.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <svl/cjkoptions.hxx>
 #include <utility>
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 984e06bc8ed4..a988ae7d66e6 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -26,6 +26,7 @@
 #include <Diagram.hxx>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 0bd8f6831f27..84481e343660 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -19,6 +19,8 @@
 
 #include "tp_DataLabel.hxx"
 
+#include <vcl/weld/Dialog.hxx>
+
 namespace chart
 {
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 66a63ce528f4..075e33dac97a 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -33,6 +33,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/decoview.hxx>
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index f4fcf59c6dcc..4dfa636184b9 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -54,6 +54,7 @@
 #include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
 
 #include <sfx2/sidebar/ResourceManager.hxx>
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 4db82adf4e9c..51e775bbb066 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -35,6 +35,7 @@
 #include <o3tl/string_view.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <utility>
 
 using namespace ::com::sun::star;
diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx
index 23d9b88e1a6f..d6ba045dd57f 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -35,6 +35,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
 #include <com/sun/star/util/SearchFlags.hpp>
diff --git a/cui/source/dialogs/DiagramDialog.cxx b/cui/source/dialogs/DiagramDialog.cxx
index 1bc067252e00..5e7cebe37e8c 100644
--- a/cui/source/dialogs/DiagramDialog.cxx
+++ b/cui/source/dialogs/DiagramDialog.cxx
@@ -17,6 +17,7 @@
 #include <svx/diagram/datamodel_svx.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <svx/diagram/DiagramHelper_svx.hxx>
 
 DiagramDialog::DiagramDialog(weld::Window* pWindow, SdrObjGroup& rDiagram)
diff --git a/cui/source/dialogs/GraphicTestsDialog.cxx b/cui/source/dialogs/GraphicTestsDialog.cxx
index 551dc79bc068..1e2cd8312bfc 100644
--- a/cui/source/dialogs/GraphicTestsDialog.cxx
+++ b/cui/source/dialogs/GraphicTestsDialog.cxx
@@ -20,6 +20,7 @@
 #include <svl/svlresid.hxx>
 #include <svl/svl.hrc>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 
 #include <dialmgr.hxx>
diff --git a/cui/source/dialogs/ImageViewerDialog.cxx b/cui/source/dialogs/ImageViewerDialog.cxx
index 85845e559827..5c3d402f2571 100644
--- a/cui/source/dialogs/ImageViewerDialog.cxx
+++ b/cui/source/dialogs/ImageViewerDialog.cxx
@@ -9,6 +9,7 @@
 
 #include <vcl/virdev.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <ImageViewerDialog.hxx>
 
 ImageViewerDialog::ImageViewerDialog(weld::Dialog* pParent, Bitmap aBitmap, const OUString& atitle)
diff --git a/cui/source/dialogs/MacroManagerDialog.cxx b/cui/source/dialogs/MacroManagerDialog.cxx
index 7e7a14f90ee7..db985be0d4c8 100644
--- a/cui/source/dialogs/MacroManagerDialog.cxx
+++ b/cui/source/dialogs/MacroManagerDialog.cxx
@@ -39,6 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <dlgname.hxx>
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index d2ac17152a2f..36fcd169bc74 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -27,6 +27,7 @@
 #include <svx/signaturelinehelper.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index d681e4f4d856..ba977180c09f 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -47,6 +47,7 @@
 #include <vcl/event.hxx>
 #include <vcl/texteng.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svx/SpellDialogChildWindow.hxx>
 #include <SpellDialog.hxx>
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 3aaf05440804..56a114a5e556 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/wintypes.hxx>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 61688d322c65..2c3f4583b270 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -30,6 +30,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <avmedia/mediawindow.hxx>
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index 6c0afd5820d8..ae163b9528ff 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -21,6 +21,7 @@
 
 #include <comphelper/string.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 /*************************************************************************
 |*
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index cfe4f045614e..af5f295f0bb2 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -29,6 +29,7 @@
 #include <tools/debug.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weldutils.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/linguprops.hxx>
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 5c1cdc2c96d3..b6f78eaa2b90 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -25,6 +25,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/windowstate.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 // UNO-Stuff
 #include <comphelper/processfactory.hxx>
diff --git a/cui/source/dialogs/hyperlinktabpagebase.cxx b/cui/source/dialogs/hyperlinktabpagebase.cxx
index eb40c5e3e21d..33d83ea125de 100644
--- a/cui/source/dialogs/hyperlinktabpagebase.cxx
+++ b/cui/source/dialogs/hyperlinktabpagebase.cxx
@@ -12,6 +12,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxsids.hrc>
+#include <vcl/weld/Dialog.hxx>
 #include <macroass.hxx>
 #include <dialmgr.hxx>
 #include <strings.hrc>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 5784f086c8ef..d222e0c8f182 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -29,6 +29,7 @@
 #include <tools/debug.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <utility>
 
 #define HYPH_POS_CHAR       '='
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 8ab1ab98a67e..e88724423021 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -46,6 +46,7 @@
 #include <vcl/dibtools.hxx>
 #include <vcl/image.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 63fa75ffb7a1..a193c9c07a61 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -21,6 +21,7 @@
 #include <strings.hrc>
 #include <insrc.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 bool SvxInsRowColDlg::isInsertBefore() const
 {
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 1e3f74314d21..2c68ae233159 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -28,6 +28,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/weld/weldutils.hxx>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 03e7405b1703..e8c2cc7cc31d 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -25,6 +25,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 048c9f4e256e..a3720b6d7a0c 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <passwdomdlg.hxx>
 #include <strings.hrc>
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 74ad54c728ca..150e906e596f 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 SvPasteObjectDialog::SvPasteObjectDialog(weld::Window* pParent)
     : GenericDialogController(pParent, u"cui/ui/pastespecial.ui"_ustr, u"PasteSpecialDialog"_ustr)
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index d3a9f67e0e3c..aadf2d974f69 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -28,6 +28,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <svx/svxids.hrc>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <svx/postattr.hxx>
 #include <postdlg.hxx>
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index ac3483cb0cda..e2763c95cd8e 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -48,6 +48,7 @@
 #include <vcl/salgtype.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/TextView.hxx>
 #include <vcl/weld/customweld.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index e4c6dce33a10..f47ced0fbba0 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/objsh.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 
 #include <strings.hrc>
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index febc6bd7b86b..53f49fbbb7a9 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 constexpr OUString CUIFM_PROP_HIDDEN = u"Hidden"_ustr;
 constexpr OUStringLiteral CUIFM_PROP_LABEL = u"Label";
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 684e5d91eff1..102024641bf6 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -34,6 +34,7 @@
 #include <tools/debug.hxx>
 #include <tools/resary.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <vcl/tabs.hrc>
 
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index f34f5ec0c634..e0dae2882e5f 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -24,6 +24,7 @@
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <svtools/langtab.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <comphelper/string.hxx>
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx
index 303e4658d992..d17d46d27663 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -28,6 +28,7 @@
 #include <vcl/vclevent.hxx>
 #include <vcl/window.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/ImageTree.hxx>
 
 #include <com/sun/star/frame/XDispatch.hpp>
diff --git a/cui/source/dialogs/welcomedlg.cxx b/cui/source/dialogs/welcomedlg.cxx
index ba665c565000..f25cdf6b741f 100644
--- a/cui/source/dialogs/welcomedlg.cxx
+++ b/cui/source/dialogs/welcomedlg.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
 #include <sfx2/viewfrm.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 constexpr OUString sNewsTab = u"WhatsNewTabPage"_ustr;
 constexpr OUString sUITab = u"UITabPage"_ustr;
diff --git a/cui/source/dialogs/widgettestdlg.cxx b/cui/source/dialogs/widgettestdlg.cxx
index cc388a0d8dda..7649328df9d8 100644
--- a/cui/source/dialogs/widgettestdlg.cxx
+++ b/cui/source/dialogs/widgettestdlg.cxx
@@ -9,6 +9,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <widgettestdlg.hxx>
 #include <bitmaps.hlst>
 
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 531361112f78..845427df7b14 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -29,6 +29,7 @@
 #include <tools/fldunit.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace
 {
diff --git a/cui/source/inc/GraphicsTestsDialog.hxx b/cui/source/inc/GraphicsTestsDialog.hxx
index db26c45ad3ce..e1f426035462 100644
--- a/cui/source/inc/GraphicsTestsDialog.hxx
+++ b/cui/source/inc/GraphicsTestsDialog.hxx
@@ -10,6 +10,7 @@
 
 #include <vcl/bitmap.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/TextView.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index cf57d56e74a5..f17c2af3cb37 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/embed/XStorage.hpp>
 
 #include <svtools/insdlg.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/SpinButton.hxx>
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index ec8495478e70..4d5b0b2ddc48 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -18,6 +18,7 @@
  */
 #pragma once
 
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/TreeView.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index cdba5154e7ba..c69a9adb548b 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -23,6 +23,7 @@
 #include <string_view>
 
 #include <sfx2/basedlgs.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/TextView.hxx>
 
 // class SvxPostItDialog -------------------------------------------------
diff --git a/cui/source/options/appearance.cxx b/cui/source/options/appearance.cxx
index 008a7dae8ac5..e8a5eb35ecea 100644
--- a/cui/source/options/appearance.cxx
+++ b/cui/source/options/appearance.cxx
@@ -21,6 +21,7 @@
 #include <svtools/restartdialog.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/themecolors.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <map>
 
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index b4ce0ea5dc41..82b3184cc76c 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -14,6 +14,7 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include "certpath.hxx"
 
 #include <com/sun/star/xml/crypto/NSSInitializer.hpp>
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index b1299a422564..45ce28b69caf 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -33,6 +33,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/TreeView.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index b9f3f3fb4448..477d4fd61558 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -31,6 +31,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <ucbhelper/content.hxx>
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index aea11bb4c567..4b7f87c8e764 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -36,6 +36,7 @@
 #include <unotools/textsearch.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <utility>
 
 #include <dialmgr.hxx>
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index d045547bc1f5..b5511fc36f04 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -31,6 +31,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index a1646be6d6f4..3091cb596d45 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -32,6 +32,7 @@
 #include <svl/intitem.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <officecfg/Office/Common.hxx>
 #include <unotools/useroptions.hxx>
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 980797f8bacc..c84de5c806bb 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -40,6 +40,7 @@
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index bcda5bb9c4f5..248ef6da3845 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -21,6 +21,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/SpinButton.hxx>
 #include <vcl/weld/weld.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b9c862347bf0..d255182eddf2 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -106,6 +106,7 @@
 #include <utility>
 #include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/window.hxx>
 #include <sal/log.hxx>
 
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index 039ea38ffe2f..36cfe4a335a8 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -13,6 +13,7 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include "tsaurls.hxx"
 
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 37679ee8af2e..29865c891ccc 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/docpasswordrequest.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 62343dc738ce..f24d9c78eb29 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -46,6 +46,7 @@
 #include <comphelper/lok.hxx>
 #include <svtools/unitconv.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace ::editeng;
 using ::com::sun::star::uno::Reference;
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 9cd9eb9d18fc..9c0eae4cc4ac 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -32,6 +32,7 @@
 #include <svtools/unitconv.hxx>
 #include <tools/debug.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <connect.hxx>
 
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 7615825a8b4f..d8ac54613740 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -37,6 +37,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <svtools/unitconv.hxx>
 #include <svtools/optionsdrawinglayer.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 6dbc6e98ad47..7ac2ef7f0433 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -35,6 +35,7 @@
 #include <svtools/unitconv.hxx>
 #include <tools/debug.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <measure.hxx>
 
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index ceda68ca59da..eab21a7e3d68 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -26,6 +26,7 @@
 #include <cuitabarea.hxx>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 SvxAreaTabDialog::SvxAreaTabDialog
 (
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index a262b04db69b..fe4352fc7461 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -27,6 +27,7 @@
 #include <svx/drawitem.hxx>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 SvxLineTabDialog::SvxLineTabDialog(weld::Window* pParent, const SfxItemSet* pAttr,
     SdrModel* pModel, const SdrObject* pSdrObj, bool bHasObj)
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index a49ef2ca4de4..f5a66761cc14 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -64,6 +64,7 @@
 #include <svx/strings.hrc>
 #include <cuitabarea.hxx>
 #include <svtools/unitconv.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <comphelper/lok.hxx>
 #include <o3tl/string_view.hxx>
 
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 20b64e0adc79..5310b807d7da 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -37,6 +37,7 @@
 #include <svx/xfltrit.hxx>
 #include <cuitabarea.hxx>
 #include <svx/dlgutil.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <cuitabline.hxx>
 
 using namespace com::sun::star;
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index f04278299bff..5497b90efb56 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -30,6 +30,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <UITools.hxx>
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index c1bba08df1c5..bfd913410873 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -30,6 +30,7 @@
 #include <RTableConnectionData.hxx>
 #include <RelationControl.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index e141e4e4572f..bb2afba84271 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -36,6 +36,7 @@
 #include <connectivity/dbtools.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <sfx2/passwd.hxx>
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index e885328d3ba5..c7fbf478e7d3 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/containermultiplexer.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 // slot ids
 using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 8361986cf7d0..843456689884 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -32,6 +32,7 @@
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index f9418a72fd55..82d39d893b52 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -30,6 +30,7 @@
 #include <svl/filenotation.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <rtl/strbuf.hxx>
 #include <utility>
 
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index b5b02d686e8d..064d19eeb8da 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -28,6 +28,7 @@
 #include <objectnamecheck.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace dbaui;
 using namespace dbtools;
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 5108d3f9ece5..e3b68c703190 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -20,6 +20,7 @@
 #include "dsselect.hxx"
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index f2cdbcde493e..25e09de6a8f2 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -29,6 +29,7 @@
 #include <indexcollection.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <com/sun/star/sdb/SQLContext.hpp>
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index b953d087a327..2aabd218025d 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -26,6 +26,7 @@
 #include <connectivity/dbtools.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index 8f565397dc02..a3a38537abee 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -22,6 +22,7 @@
 #include <dsitems.hxx>
 #include <stringconstants.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 5eb7bc96319f..b33dbd4f9fa8 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -27,6 +27,7 @@
 #include <QueryTableView.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
+#include <vcl/weld/Dialog.hxx>
 #include <RelationControl.hxx>
 
 #define ID_INNER_JOIN       1
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index b3f61020e768..87ec49773f77 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -22,6 +22,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/locktoplevels.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/TextView.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index f92cdd4c75b1..fec95a80cd60 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -60,6 +60,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 6737e932f5d3..ef1342103662 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -26,6 +26,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <utility>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index d76d21c3e02c..bdb056583d9f 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/threadex.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/TextView.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index a6d0ad152b1d..ac3a59f3073f 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -47,6 +47,7 @@
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/TreeView.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 026505d29de2..983ccfcd7556 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -22,6 +22,7 @@
 #include <tools/debug.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include "optiongrouplayouter.hxx"
 #include <helpids.h>
 #include <o3tl/safeint.hxx>
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 3eb3ce5f3775..d9ddbdb23076 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -30,6 +30,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 246d9374fb19..7c042ebfdeb3 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 4ebb3ffbf193..1b292bccb175 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -32,6 +32,7 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace pcr
 {
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 34b045be83b9..8676a37b6086 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -20,6 +20,7 @@
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/TreeView.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 73f966bca2e9..b6d07223d530 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -42,6 +42,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <osl/file.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 868e94656f32..c569de51832b 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Notebook.hxx>
 #include <vcl/weld/TextView.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index 366d5fd58063..d27ddbfcf94d 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -10,6 +10,7 @@
 #include "PlacesListBox.hxx"
 #include <svtools/PlaceEditDialog.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <bitmaps.hlst>
 
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index e1ea97d60c26..292673ea677e 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/window.hxx>
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 123f16531aa4..7fe3db860212 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -30,6 +30,7 @@
 #include <tools/link.hxx>
 #include <comphelper/errcode.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <memory>
 #include <optional>
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index bbf16510be94..3b7fd5df7aed 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -22,6 +22,7 @@
 #include <svtools/svtdllapi.h>
 #include <vcl/print.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/timer.hxx>
diff --git a/include/svx/cuicharmap.hxx b/include/svx/cuicharmap.hxx
index 1c4422e21c09..93c96a2f3063 100644
--- a/include/svx/cuicharmap.hxx
+++ b/include/svx/cuicharmap.hxx
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/customweld.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 699be9b9563d..195e87dad80e 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SVX_GRAPHCTL_HXX
 
 #include <vcl/graph.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/customweld.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/vcl/weld/Assistant.hxx b/include/vcl/weld/Assistant.hxx
index 3984b216e11a..401985084aee 100644
--- a/include/vcl/weld/Assistant.hxx
+++ b/include/vcl/weld/Assistant.hxx
@@ -10,7 +10,7 @@
 #pragma once
 
 #include <vcl/dllapi.h>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace weld
 {
diff --git a/include/vcl/weld/ColorChooserDialog.hxx b/include/vcl/weld/ColorChooserDialog.hxx
index 8f3b358c04f1..f07fe51b59bf 100644
--- a/include/vcl/weld/ColorChooserDialog.hxx
+++ b/include/vcl/weld/ColorChooserDialog.hxx
@@ -10,7 +10,7 @@
 #pragma once
 
 #include <vcl/dllapi.h>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace weld
 {
diff --git a/include/vcl/weld/Dialog.hxx b/include/vcl/weld/Dialog.hxx
new file mode 100644
index 000000000000..1f3be2898a6b
--- /dev/null
+++ b/include/vcl/weld/Dialog.hxx
@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <vcl/dllapi.h>
+#include <vcl/weld/weld.hxx>
+
+namespace weld
+{
+class VCL_DLLPUBLIC Dialog : virtual public Window
+{
+private:
+    friend DialogController;
+    virtual bool runAsync(std::shared_ptr<DialogController> const& rxOwner,
+                          const std::function<void(sal_Int32)>& func)
+        = 0;
+
+public:
+    virtual void set_modal(bool bModal) = 0;
+    virtual bool get_modal() const = 0;
+
+    // center dialog on its parent
+    //
+    // bTrackGeometryRequests set to true tries to ensure the dialog will end
+    // up still centered on its parent windows final size, taking into account
+    // that there may currently be pending geometry requests for the parent not
+    // yet processed by the underlying toolkit
+    //
+    // for e.g gtk this will means the dialog is always centered even when
+    // resized, calling set_centered_on_parent with false will turn this
+    // off again.
+    virtual void set_centered_on_parent(bool bTrackGeometryRequests) = 0;
+
+    virtual int run() = 0;
+    // Run async without a controller
+    // @param self - must point to this, to enforce that the dialog was created/held by a shared_ptr
+    virtual bool runAsync(std::shared_ptr<Dialog> const& rxSelf,
+                          const std::function<void(sal_Int32)>& func)
+        = 0;
+    virtual void response(int response) = 0;
+    virtual void add_button(const OUString& rText, int response, const OUString& rHelpId = {}) = 0;
+    virtual std::unique_ptr<Button> weld_button_for_response(int response) = 0;
+    virtual std::unique_ptr<weld::Container> weld_content_area() = 0;
+
+    // with pOld of null, automatically find the old default widget and unset
+    // it, otherwise use as hint to the old default
+    virtual void change_default_button(weld::Button* pOld, weld::Button* pNew) = 0;
+    virtual bool is_default_button(const weld::Button* pCandidate) const = 0;
+
+    virtual void set_default_response(int nResponse);
+
+    // shrink the dialog down to shown just these widgets
+    virtual void collapse(weld::Widget& rEdit, weld::Widget* pButton) = 0;
+    // undo previous dialog collapse
+    virtual void undo_collapse() = 0;
+
+    virtual void SetInstallLOKNotifierHdl(const Link<void*, vcl::ILibreOfficeKitNotifier*>& rLink)
+        = 0;
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/include/vcl/weld/MessageDialog.hxx b/include/vcl/weld/MessageDialog.hxx
index 351f53becfae..d14c8ca6e9c4 100644
--- a/include/vcl/weld/MessageDialog.hxx
+++ b/include/vcl/weld/MessageDialog.hxx
@@ -10,7 +10,7 @@
 #pragma once
 
 #include <vcl/dllapi.h>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace weld
 {
diff --git a/include/vcl/weld/weld.hxx b/include/vcl/weld/weld.hxx
index dcc183658735..1694ab95c2ac 100644
--- a/include/vcl/weld/weld.hxx
+++ b/include/vcl/weld/weld.hxx
@@ -527,59 +527,6 @@ public:
     }
 };
 
-class Button;
-
-class VCL_DLLPUBLIC Dialog : virtual public Window
-{
-private:
-    friend DialogController;
-    virtual bool runAsync(std::shared_ptr<DialogController> const& rxOwner,
-                          const std::function<void(sal_Int32)>& func)
-        = 0;
-
-public:
-    virtual void set_modal(bool bModal) = 0;
-    virtual bool get_modal() const = 0;
-
-    // center dialog on its parent
-    //
-    // bTrackGeometryRequests set to true tries to ensure the dialog will end
-    // up still centered on its parent windows final size, taking into account
-    // that there may currently be pending geometry requests for the parent not
-    // yet processed by the underlying toolkit
-    //
-    // for e.g gtk this will means the dialog is always centered even when
-    // resized, calling set_centered_on_parent with false will turn this
-    // off again.
-    virtual void set_centered_on_parent(bool bTrackGeometryRequests) = 0;
-
-    virtual int run() = 0;
-    // Run async without a controller
-    // @param self - must point to this, to enforce that the dialog was created/held by a shared_ptr
-    virtual bool runAsync(std::shared_ptr<Dialog> const& rxSelf,
-                          const std::function<void(sal_Int32)>& func)
-        = 0;
-    virtual void response(int response) = 0;
-    virtual void add_button(const OUString& rText, int response, const OUString& rHelpId = {}) = 0;
-    virtual std::unique_ptr<Button> weld_button_for_response(int response) = 0;
-    virtual std::unique_ptr<weld::Container> weld_content_area() = 0;
-
-    // with pOld of null, automatically find the old default widget and unset
-    // it, otherwise use as hint to the old default
-    virtual void change_default_button(weld::Button* pOld, weld::Button* pNew) = 0;
-    virtual bool is_default_button(const weld::Button* pCandidate) const = 0;
-
-    virtual inline void set_default_response(int nResponse);
-
-    // shrink the dialog down to shown just these widgets
-    virtual void collapse(weld::Widget& rEdit, weld::Widget* pButton) = 0;
-    // undo previous dialog collapse
-    virtual void undo_collapse() = 0;
-
-    virtual void SetInstallLOKNotifierHdl(const Link<void*, vcl::ILibreOfficeKitNotifier*>& rLink)
-        = 0;
-};
-
 inline OUString toId(const void* pValue)
 {
     return OUString::number(reinterpret_cast<sal_uIntPtr>(pValue));
@@ -911,12 +858,6 @@ public:
     virtual void set_mode(VclSizeGroupMode eMode) = 0;
     virtual ~SizeGroup() {}
 };
-
-void Dialog::set_default_response(int nResponse)
-{
-    std::unique_ptr<weld::Button> pButton = weld_button_for_response(nResponse);
-    change_default_button(nullptr, pButton.get());
-}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index aaa02ca99332..e104b9afe7de 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -24,6 +24,7 @@
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <comphelper/diagnose_ex.hxx>
 
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index c2afe6000164..ca96a99eb617 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -33,6 +33,7 @@
 
 #include <comphelper/property.hxx>
 #include <comphelper/propertyvalue.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <algorithm>
 #include <UndoActions.hxx>
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index bde39d4e60ea..a44f66bf4d46 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -23,6 +23,7 @@
 #include <formula/tokenarray.hxx>
 #include <formula/FormulaCompiler.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/windowstate.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index c8fcaac91c6f..933de583df9f 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -40,6 +40,7 @@
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/TreeView.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 9c798b1394e0..c69b2d7ece7e 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -36,6 +36,7 @@
 
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <algorithm>
 
diff --git a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
index 5c1ada025aa8..2304c93e4434 100644
--- a/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ChiSquareTestDialog.cxx
@@ -14,6 +14,8 @@
 #include <scresid.hxx>
 #include <strings.hrc>
 
+#include <vcl/weld/Dialog.hxx>
+
 ScChiSquareTestDialog::ScChiSquareTestDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
                     weld::Window* pParent, ScViewData& rViewData ) :
diff --git a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
index b52e72b6e8db..e6b739c19bd4 100644
--- a/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FTestDialog.cxx
@@ -10,6 +10,8 @@
 
 #include <memory>
 
+#include <vcl/weld/Dialog.hxx>
+
 #include <reffact.hxx>
 #include <TableFillingAndNavigationTools.hxx>
 #include <FTestDialog.hxx>
diff --git a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
index 94564358b9f0..c95f211ae7dc 100644
--- a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx
@@ -15,6 +15,7 @@
 #include <scresid.hxx>
 #include <strings.hrc>
 #include <o3tl/safeint.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScFourierAnalysisDialog::ScFourierAnalysisDialog(SfxBindings* pSfxBindings,
                                                  SfxChildWindow* pChildWindow,
diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
index 8ab3a384a098..23822bfcbe45 100644
--- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx
@@ -11,6 +11,7 @@
 #include <svl/undo.hxx>
 #include <rtl/math.hxx>
 #include <osl/time.h>
+#include <vcl/weld/Dialog.hxx>
 
 #include <rangelst.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
index 932ae743ca65..f294b3d96c5a 100644
--- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <svl/undo.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <comphelper/random.hxx>
 #include <rangelst.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index 3af68a8b3e40..998a075e22ca 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <svl/undo.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <rangelst.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index f9d9899d9162..eeac95bcfe17 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <svl/undo.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <rangelst.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
index 96c173aab7d2..adcb0b23d2b0 100644
--- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx
@@ -10,6 +10,8 @@
 
 #include <memory>
 
+#include <vcl/weld/Dialog.hxx>
+
 #include <reffact.hxx>
 #include <TableFillingAndNavigationTools.hxx>
 #include <TTestDialog.hxx>
diff --git a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
index 3877e5d5e604..64cec87cf17a 100644
--- a/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/ZTestDialog.cxx
@@ -10,6 +10,8 @@
 
 #include <memory>
 
+#include <vcl/weld/Dialog.hxx>
+
 #include <reffact.hxx>
 #include <TableFillingAndNavigationTools.hxx>
 #include <ZTestDialog.hxx>
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index dea44fa52129..d87d1af47eef 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -72,6 +72,7 @@
 
 #include <vcl/abstdlgimpl.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace
 {
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index d02253f81a92..81936bc8384e 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -11,6 +11,7 @@
 
 #include <sfx2/dispatch.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <anyrefdg.hxx>
 #include <document.hxx>
diff --git a/sc/source/ui/condformat/condformateasydlg.cxx b/sc/source/ui/condformat/condformateasydlg.cxx
index 2a6d8951b014..547dc8c5ed90 100644
--- a/sc/source/ui/condformat/condformateasydlg.cxx
+++ b/sc/source/ui/condformat/condformateasydlg.cxx
@@ -14,6 +14,7 @@
 #include <reffact.hxx>
 #include <scresid.hxx>
 #include <svl/style.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <strings.hrc>
 
 namespace
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index 06700db1626d..d358b0c2609a 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -15,6 +15,7 @@
 #include <o3tl/safeint.hxx>
 #include <unotools/viewoptions.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/windowstate.hxx>
 
 ScCondFormatManagerWindow::ScCondFormatManagerWindow(weld::TreeView& rTreeView,
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 9f76f67d528c..45dc4a12317a 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -27,6 +27,7 @@
 
 #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
 #include <com/sun/star/sheet/DataPilotFieldSortMode.hpp>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace css::uno;
 using namespace css::sheet;
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 4fbbe58a320b..197a258072ce 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -34,6 +34,7 @@
 #include <consdlg.hxx>
 #include <o3tl/safeint.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 62261b8db7e2..ecabcf47704e 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -23,6 +23,7 @@
 #include <comphelper/lok.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(weld::Window* pParent, bool bEnableExternal)
     : GenericDialogController(pParent, u"modules/scalc/ui/selectsource.ui"_ustr, u"SelectSourceDialog"_ustr)
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 71cf21d7cd92..647d8907ff71 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -25,6 +25,7 @@
 #include <comphelper/string.hxx>
 #include <unotools/charclass.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/EntryTreeView.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index e07f1b767a2a..e4fd24cbce51 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -39,6 +39,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svl/numformat.hxx>
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 3b1724c5b2c7..30d1d4f8ec9b 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -36,6 +36,7 @@
 #include <svl/sharedstringpool.hxx>
 #include <osl/diagnose.h>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScPivotFilterDlg::ScPivotFilterDlg(weld::Window* pParent, const SfxItemSet& rArgSet, ScViewData& rData,
                                    SCTAB nSourceTab )
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index b7154976d105..7dfe11d0f121 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -30,6 +30,7 @@
 #include <osl/diagnose.h>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <scresid.hxx>
 #include <dpobject.hxx>
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 5185da1f5b80..30fe15922353 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -23,6 +23,7 @@
 #include <svx/colorbox.hxx>
 #include <unotools/useroptions.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <unotools/localedatawrapper.hxx>
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 6bb36f39a245..f6dd6db1774c 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -46,6 +46,7 @@
 #include <svx/txenctab.hxx>
 #include <unotools/filteroptions_settings.hxx>
 #include <unotools/viewoptions.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/windowstate.hxx>
 
 //! TODO make dynamic
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 7f282148dd55..08863392dd25 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -33,6 +33,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 // ScDelimiterTable
 
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index e1ec8b54fc08..873b3eeb9544 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -34,6 +34,7 @@
 
 #include <filtdlg.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx
index d1e4ed620a45..405b26e44e53 100644
--- a/sc/source/ui/dbgui/sortdlg.cxx
+++ b/sc/source/ui/dbgui/sortdlg.cxx
@@ -25,6 +25,7 @@
 #include <unotools/viewoptions.hxx>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/windowstate.hxx>
 
 ScSortDlg::ScSortDlg(weld::Window* pParent, const SfxItemSet* pArgSet)
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index 5e403cc8ffef..86c5d47363c8 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -25,6 +25,7 @@
 
 #include <vcl/tabs.hrc>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScSubTotalDlg::ScSubTotalDlg(weld::Window* pParent, const SfxItemSet& rArgSet)
     : SfxTabDialogController(pParent, u"modules/scalc/ui/subtotaldialog.ui"_ustr, u"SubTotalDialog"_ustr, &rArgSet)
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index 5b499f8e463d..be52c3acb5b7 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -25,6 +25,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
 ScTextImportOptionsDlg::ScTextImportOptionsDlg(weld::Window* pParent)
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 515a595354a2..590768f75518 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -46,6 +46,7 @@
 #include <comphelper/lok.hxx>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 /*  Position indexes for "Allow" list box.
     They do not map directly to ScValidationMode and can safely be modified to
diff --git a/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx b/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx
index dedaf0faa742..284b5829ddf0 100644
--- a/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx
+++ b/sc/source/ui/dialogs/SparklineDataRangeDialog.cxx
@@ -12,6 +12,8 @@
 #include <reffact.hxx>
 #include <docfunc.hxx>
 
+#include <vcl/weld/Dialog.hxx>
+
 namespace sc
 {
 SparklineDataRangeDialog::SparklineDataRangeDialog(SfxBindings* pBindings,
diff --git a/sc/source/ui/dialogs/SparklineDialog.cxx b/sc/source/ui/dialogs/SparklineDialog.cxx
index ad092b6659e2..3e206868cce5 100644
--- a/sc/source/ui/dialogs/SparklineDialog.cxx
+++ b/sc/source/ui/dialogs/SparklineDialog.cxx
@@ -17,6 +17,7 @@
 
 #include <svx/colorbox.hxx>
 #include <vcl/formatter.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace sc
 {
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index e3fe69879197..b810953c9a1b 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -26,6 +26,7 @@
 #include <svl/stritem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <tools/urlobj.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <formula/formulahelper.hxx>
 #include <formula/IFunctionDescription.hxx>
 #include <formula/errorcodes.hxx>
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index c0a0a5ae9605..53bac5d5a2cd 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -21,6 +21,7 @@
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/TextView.hxx>
 
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 6892f42c826d..6b6a84e57dc5 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <o3tl/string_view.hxx>
 
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 300d115538f6..3783cfcb1535 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <osl/diagnose.h>
 #include <o3tl/string_view.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <anyrefdg.hxx>
 #include <sc.hrc>
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 8731f06aa293..026414b191c9 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -19,6 +19,7 @@
 
 #include <comphelper/string.hxx>
 #include <osl/diagnose.h>
+#include <vcl/weld/Dialog.hxx>
 
 #include <conflictsdlg.hxx>
 #include <o3tl/safeint.hxx>
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index c587298d501d..3034f078aa8b 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -22,6 +22,7 @@
 #include <crdlg.hxx>
 #include <scui_def.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScColOrRowDlg::ScColOrRowDlg(weld::Window* pParent, const OUString& rStrTitle,
                              const OUString& rStrLabel)
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 2353fd47db8e..6adc16e46c48 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -24,6 +24,7 @@
 #include <docsh.hxx>
 #include <crnrdlg.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <o3tl/string_view.hxx>
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index 3f89ed5cec89..88c8eecd239f 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -15,6 +15,7 @@
 #include <tabvwsh.hxx>
 
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <osl/diagnose.h>
 
 ScDataFormDlg::ScDataFormDlg(weld::Window* pParent, ScTabViewShell& rTabViewShellOri)
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 5657c70d5f01..68ad4e27c890 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -25,6 +25,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 
 class ScDataTransformationBaseControl
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 24a9bcfe0748..84980468c4ce 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -12,6 +12,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <svtools/inettbc.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <address.hxx>
 #include <docsh.hxx>
 #include <datastream.hxx>
diff --git a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
index 4f074833cfb5..e9ec2a43774b 100644
--- a/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
+++ b/sc/source/ui/miscdlgs/duplicaterecordsdlg.cxx
@@ -27,6 +27,7 @@
 #include <gridwin.hxx>
 #include <vector>
 #include <officecfg/Office/Calc.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScDuplicateRecordsDlg::ScDuplicateRecordsDlg(weld::Window* pParent,
                                              css::uno::Sequence<uno::Sequence<uno::Any>>& rData,
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 9a059c749a24..9ed00b056c0b 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/sc/source/ui/miscdlgs/gototabdlg.cxx b/sc/source/ui/miscdlgs/gototabdlg.cxx
index e84ffc7c0bd7..af7af9e39071 100644
--- a/sc/source/ui/miscdlgs/gototabdlg.cxx
+++ b/sc/source/ui/miscdlgs/gototabdlg.cxx
@@ -13,6 +13,7 @@
 #include <gototabdlg.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScGoToTabDlg::ScGoToTabDlg(weld::Window* pParent)
     : GenericDialogController(pParent, u"modules/scalc/ui/gotosheetdialog.ui"_ustr,
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index a37c9e940159..cac8cab37a4a 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -23,6 +23,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 InsertDeleteFlags ScInsertContentsDlg::nPreviousChecks = InsertDeleteFlags::NONE;
 ScPasteFunc  ScInsertContentsDlg::nPreviousFormulaChecks = ScPasteFunc::NONE;
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 965eff9dac5b..86fb40655001 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -27,6 +27,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index c91d3966a0e4..735967db7a2e 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -22,6 +22,7 @@
 #include <lbseldlg.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScSelEntryDlg::ScSelEntryDlg(weld::Window* pParent, const std::vector<OUString> &rEntryList)
     : GenericDialogController(pParent, u"modules/scalc/ui/selectrange.ui"_ustr, u"SelectRangeDialog"_ustr)
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index ab6d5bc9f950..f73f7ac5e76d 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -30,6 +30,7 @@
 #include <o3tl/string_view.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <dbdata.hxx>
 #include <linkarea.hxx>
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 246d939c93e4..a84d26a25434 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -28,6 +28,8 @@
 #include <utility>
 #include <tabvwsh.hxx>
 
+#include <vcl/weld/Dialog.hxx>
+
 ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, OUString aDefault)
     : GenericDialogController(pParent, u"modules/scalc/ui/movecopysheet.ui"_ustr,
                               u"MoveCopySheetDialog"_ustr)
diff --git a/sc/source/ui/miscdlgs/onlyactivesheetsaveddlg.cxx b/sc/source/ui/miscdlgs/onlyactivesheetsaveddlg.cxx
index 82910eed3dd6..26bcde863f08 100644
--- a/sc/source/ui/miscdlgs/onlyactivesheetsaveddlg.cxx
+++ b/sc/source/ui/miscdlgs/onlyactivesheetsaveddlg.cxx
@@ -22,6 +22,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScOnlyActiveSheetSavedDlg::ScOnlyActiveSheetSavedDlg(weld::Window* pParent)
     : GenericDialogController(pParent, u"modules/scalc/ui/onlyactivesheetsaveddialog.ui"_ustr,
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 9ff5cfafa56b..9be202288ee5 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -22,6 +22,7 @@
 #include <svl/numformat.hxx>
 #include <utility>
 #include <vcl/commandinfoprovider.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index f275772c9ba5..a606ce46a839 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -22,6 +22,7 @@
 #include <svl/PasswordHelper.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <vector>
 
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index dad8418ebf10..6860589e072a 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <strings.hrc>
 #include <retypepassdlg.hxx>
 #include <scresid.hxx>
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index 7fc7e4b6815f..dcaf4707b94d 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -22,6 +22,7 @@
 #include <shtabdlg.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScShowTabDlg::ScShowTabDlg(weld::Window* pParent)
     : GenericDialogController(pParent, u"modules/scalc/ui/showsheetdialog.ui"_ustr,
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index fbc6577c8344..8b5836d494f2 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -29,6 +29,7 @@
 #include <osl/diagnose.h>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <algorithm>
 
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 43243d6ac93a..64df741fefb4 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/dispatch.hxx>
 #include <svl/numformat.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index d98e36b2db84..a63fd6781c19 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -21,6 +21,7 @@
 
 #include <strindlg.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScStringInputDlg::ScStringInputDlg(weld::Window* pParent,
                                    const OUString& rTitle,
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index ad5581b01961..737bc949d894 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -24,6 +24,7 @@
 #include <tools/color.hxx>
 #include <vcl/event.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <officecfg/Office/Common.hxx>
 
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 551b9913ebd5..8cdc2457b0df 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -19,6 +19,7 @@
 
 #include <sfx2/dispatch.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 1cd41f016480..7be9921c320c 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -29,6 +29,7 @@
 #include <compiler.hxx>
 
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 ScNamePasteDlg::ScNamePasteDlg(weld::Window* pParent, ScDocShell* pShell)
     : GenericDialogController(pParent, u"modules/scalc/ui/insertname.ui"_ustr,
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 1964de7a1c5c..d85d27ad778f 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -25,6 +25,7 @@
 #include <scmod.hxx>
 #include <docsh.hxx>
 #include <svx/svxids.hrc>
+#include <vcl/weld/Dialog.hxx>
 #include <officecfg/Office/Calc.hxx>
 
 #include <opredlin.hxx>
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index a7150f4d36e3..74b74a25679c 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -24,6 +24,7 @@
 #include <svl/stritem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index 16268b787118..8ac9a1ca1f5e 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -30,6 +30,7 @@
 #include <svx/pageitem.hxx>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 ScHFEditDlg::ScHFEditDlg(weld::Window* pParent,
                          const SfxItemSet& rCoreSet,
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 54e2d2f54801..145841fd4230 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -28,6 +28,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <unotools/useroptions.hxx>
 
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 8792172ddeb6..776a512eaca6 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -33,6 +33,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <vcl/EnumContext.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <svx/clipfmtitem.hxx>
 #include <svx/statusitem.hxx>
 
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 4d73ec5d6e66..6f4e18f1a355 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -33,6 +33,7 @@
 #include <vcl/dndlistenercontainer.hxx>
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx
index 1fb20f8c150d..d4b0f0c6feb8 100644
--- a/sc/source/ui/view/tabvwshd.cxx
+++ b/sc/source/ui/view/tabvwshd.cxx
@@ -19,6 +19,7 @@
 
 #include <sfx2/childwin.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <tabvwsh.hxx>
 #include <scmod.hxx>
diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
index 9a1d96cff1e4..67a5c4f7c67e 100644
--- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx
+++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx
@@ -17,6 +17,7 @@
 
 #include <tools/urlobj.hxx>
 #include <sfx2/filedlghelper.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 2a8fdd9999d8..1dd0eb9ee4d2 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -23,6 +23,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index e946575fb49b..b8584f349bf2 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -11,6 +11,7 @@
 #include <RemoteServer.hxx>
 
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace ::sd;
 
diff --git a/sd/source/ui/dlg/SelectLayerDlg.cxx b/sd/source/ui/dlg/SelectLayerDlg.cxx
index 29b009b71941..8d58a4100029 100644
--- a/sd/source/ui/dlg/SelectLayerDlg.cxx
+++ b/sd/source/ui/dlg/SelectLayerDlg.cxx
@@ -20,6 +20,7 @@
 #include <SelectLayerDlg.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 
 SdSelectLayerDlg::SdSelectLayerDlg(weld::Window* pParent)
diff --git a/sd/source/ui/dlg/brkdlg.cxx b/sd/source/ui/dlg/brkdlg.cxx
index 952bb905a6e8..3c38812fd4fd 100644
--- a/sd/source/ui/dlg/brkdlg.cxx
+++ b/sd/source/ui/dlg/brkdlg.cxx
@@ -24,6 +24,7 @@
 #include <vcl/scheduler.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 6b8fe8c7e302..3d536eed6232 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -27,6 +27,7 @@
 
 #include <unotools/viewoptions.hxx>
 #include <svtools/unitconv.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <o3tl/string_view.hxx>
 
 #include <sdattr.hrc>
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 4ce97b52d1d3..4e7492267af1 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -29,6 +29,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 4af99ff678b0..6df16c14f597 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -25,6 +25,7 @@
 #include <svtools/unitconv.hxx>
 #include <tools/debug.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <sdattr.hrc>
 #include <View.hxx>
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 0487570d6bfa..ed074b589eff 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -41,6 +41,7 @@
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/customweld.hxx>
 
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index e9cd17416c4d..f5b45bb3134f 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -29,6 +29,7 @@
 #include <ViewShell.hxx>
 
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 SdInsertPagesObjsDlg::SdInsertPagesObjsDlg(
     weld::Window* pWindow, const SdDrawDocument& rDoc,
diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx
index 53e755b15ff3..90ec43f128d0 100644
--- a/sd/source/ui/dlg/layeroptionsdlg.cxx
+++ b/sd/source/ui/dlg/layeroptionsdlg.cxx
@@ -19,6 +19,7 @@
 
 #include <svl/itemset.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <sdattr.hxx>
 #include <layeroptionsdlg.hxx>
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx b/sd/source/ui/dlg/masterlayoutdlg.cxx
index fe0b7e6f461f..8e17fdd641bb 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -23,6 +23,7 @@
 #include <osl/diagnose.h>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace ::sd;
 
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 9b918d2d5baa..776e2de9bc7a 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -38,6 +38,7 @@
 #include <svx/flagsdef.hxx>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 #define IS_OUTLINE(x) (x >= PresentationObjects::Outline_1 && x <= PresentationObjects::Outline_9)
 
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 502cafecfdaf..9d90f1ea4745 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -26,6 +26,7 @@
 #include <vcl/image.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <strings.hrc>
 
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 316a84fa741e..c79513194b12 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -26,6 +26,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <DrawDocShell.hxx>
 #include <vectdlg.hxx>
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 31d46517d80b..feb19916aa99 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -30,6 +30,7 @@
 #include <tools/debug.hxx>
 
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 3361c1a0ad6e..a697f7d6e26c 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -81,6 +81,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 3b701fa755da..d2796b19206e 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -22,6 +22,7 @@
 #include <unotools/viewoptions.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/windowstate.hxx>
 
 #include <sfx2/basedlgs.hxx>
diff --git a/sfx2/source/dialog/checkin.cxx b/sfx2/source/dialog/checkin.cxx
index e42a2aa437c4..b126bbbcdbc7 100644
--- a/sfx2/source/dialog/checkin.cxx
+++ b/sfx2/source/dialog/checkin.cxx
@@ -10,6 +10,7 @@
 #include <checkin.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 SfxCheckinDialog::SfxCheckinDialog(weld::Window* pParent)
     : GenericDialogController( pParent, u"sfx/ui/checkin.ui"_ustr, u"CheckinDialog"_ustr)
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 105ed5407121..5f2faa678f5a 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -24,6 +24,7 @@
 #include <tools/urlobj.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/weld/weldutils.hxx>
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 38bd904348cb..ebd5730ea4b2 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -25,6 +25,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 2e1ddbdb11e5..fcbfc60a0ba9 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <bitmaps.hlst>
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index e64d1467435a..8b368f5cf794 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -23,6 +23,7 @@
 #include <svl/eitem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/windowstate.hxx>
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 8a5aaed91ef8..850c10bf3607 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -28,6 +28,7 @@
 
 #include <vcl/tabs.hrc>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 /*  [Description]
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index fcb426751b9d..e31f00ad6a0e 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -32,6 +32,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/lok.hxx>
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 0419dfe36b2b..1092cacbe4cf 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -35,6 +35,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <tools/datetime.hxx>
 
 #include <versdlg.hxx>
diff --git a/sfx2/source/doc/autoredactdialog.cxx b/sfx2/source/doc/autoredactdialog.cxx
index eef870d8ff8b..a8c7e26a1e53 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -18,6 +18,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <unotools/viewoptions.hxx>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index bbcbacb471e5..edb01988e4b4 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -39,6 +39,7 @@
 #include <unotools/viewoptions.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/TreeView.hxx>
 
 void SfxPreviewWin_Impl::SetObjectShell(SfxObjectShell const * pObj)
diff --git a/sfx2/source/doc/saveastemplatedlg.cxx b/sfx2/source/doc/saveastemplatedlg.cxx
index f52a9f296d36..41855c563734 100644
--- a/sfx2/source/doc/saveastemplatedlg.cxx
+++ b/sfx2/source/doc/saveastemplatedlg.cxx
@@ -20,6 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <sot/storage.hxx>
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 81983262260f..8ccf53e604be 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -36,6 +36,7 @@
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index f93d8b19a785..17431a199743 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -35,6 +35,7 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/shell.hxx>
 #include <sfx2/toolbarids.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 class SfxSplitWindow;
 class SfxWorkWindow;
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index bdb2caced56b..1a076e535940 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include "prnmon.hxx"
 
 // class SfxPrinter ------------------------------------------------------
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 4ff4c940dde1..3fad5dd8b4d7 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -28,6 +28,7 @@
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svtools/ctrltool.hxx>
 #include <vcl/settings.hxx>
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 7f57f0c0e1ba..fe1f8182586c 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -17,6 +17,7 @@
 #include <svtools/strings.hrc>
 #include <svtools/place.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include "ServerDetailsControls.hxx"
 
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index befc1bc6e1cb..30c5adb0bdcc 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -19,6 +19,7 @@
 #include <rtl/uri.hxx>
 #include <ucbhelper/content.hxx>
 #include <ucbhelper/commandenvironment.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <comphelper/diagnose_ex.hxx>
 
 #include <svtools/PlaceEditDialog.hxx>
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 86f7b2ec94d9..a6b7d16f12cc 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -32,6 +32,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <sal/log.hxx>
 #include <comphelper/diagnose_ex.hxx>
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 78a55d8055f9..709c3220da37 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -30,6 +30,7 @@
 #include <vcl/PrinterSupport.hxx>
 #include <vcl/event.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/vclevent.hxx>
 #include <sal/log.hxx>
 
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index 1a62faaed486..8ff0b2406264 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -19,6 +19,7 @@
 #include <tools/link.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 283173b7e840..3f36e163ea8a 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -47,6 +47,7 @@
 #include <vcl/graph.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include "exportdialog.hxx"
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index 6274eb8819ac..778c1bd6dcb1 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -27,6 +27,7 @@
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/customweld.hxx>
 
 #include <officecfg/Office/Common.hxx>
diff --git a/svx/source/dialog/FileExportedDialog.cxx b/svx/source/dialog/FileExportedDialog.cxx
index b834c9061815..2d9270e6d489 100644
--- a/svx/source/dialog/FileExportedDialog.cxx
+++ b/svx/source/dialog/FileExportedDialog.cxx
@@ -10,6 +10,7 @@
 #include <svx/FileExportedDialog.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <comphelper/diagnose_ex.hxx>
 #include <comphelper/backupfilehelper.hxx>
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index b9c176101e26..c0eb6320978b 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -14,6 +14,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/dialog/TableAutoFmtDlg.cxx b/svx/source/dialog/TableAutoFmtDlg.cxx
index 74ccd822fe2e..2554b0fdcbe8 100644
--- a/svx/source/dialog/TableAutoFmtDlg.cxx
+++ b/svx/source/dialog/TableAutoFmtDlg.cxx
@@ -25,6 +25,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 
 namespace
diff --git a/svx/source/dialog/TableStylesDlg.cxx b/svx/source/dialog/TableStylesDlg.cxx
index eb4fdf5cd7ff..fe424a9f29b2 100644
--- a/svx/source/dialog/TableStylesDlg.cxx
+++ b/svx/source/dialog/TableStylesDlg.cxx
@@ -37,6 +37,7 @@
 #include <svx/svxtableitems.hxx>
 #include <svx/dialog/TableStylesDlg.hxx>
 #include <tools/fldunit.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/Toolbar.hxx>
 
diff --git a/svx/source/dialog/ThemeDialog.cxx b/svx/source/dialog/ThemeDialog.cxx
index 45e58896a2b3..0a5a0bcaef35 100644
--- a/svx/source/dialog/ThemeDialog.cxx
+++ b/svx/source/dialog/ThemeDialog.cxx
@@ -14,6 +14,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <comphelper/lok.hxx>
 #include <vcl/virdev.hxx>
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index c4fe435bf214..fe74de52147b 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -40,6 +40,7 @@
 #include <vcl/virdev.hxx>
 #include "dlgunit.hxx"
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 4cbec1a9ccad..a2b67b80277e 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -21,6 +21,7 @@
 #include <sfx2/ctrlitem.hxx>
 #include "contwnd.hxx"
 #include <vcl/idle.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MetricSpinButton.hxx>
 #include <vcl/weld/Toolbar.hxx>
 
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index a6b6efff1a7d..a00b15bbc7a8 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -19,6 +19,11 @@
 
 #pragma once
 
+namespace weld
+{
+class Dialog;
+}
+
 #include <tools/poly.hxx>
 #include <svx/graphctl.hxx>
 
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 35d45c9c4eb0..2645b94572ec 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -29,6 +29,7 @@
 #include <sfx2/filedlghelper.hxx>
 #include <tools/urlobj.hxx>
 #include <utility>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 2a37ca14b654..b91187a73468 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -23,6 +23,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <svx/graphctl.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 055696e60ecc..f01c3d5864d1 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -33,6 +33,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svx/imapdlg.hxx>
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index efc467d5a3b7..68b5ae06850a 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -48,6 +48,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <svl/itemset.hxx>
 
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index abc7d9674b96..d6dd7adcb6df 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -68,6 +68,7 @@
 #include <svx/svxdlg.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <comphelper/lok.hxx>
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 2cb79f8a312a..e06e2736afb1 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -44,6 +44,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index b698bf71d16e..0542e11b38e1 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -62,6 +62,7 @@
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/weld/weldutils.hxx>
 #include <toolkit/controls/unocontrolcontainer.hxx>
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 2141202b40e0..c188f5392e7f 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -42,6 +42,7 @@
 #include <sfx2/frame.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tabwin.hrc>
 #include <utility>
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index c564bc17fd61..02ba44c4eb4a 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -29,6 +29,7 @@
 #include <o3tl/untaint.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <sfx2/viewsh.hxx>
 
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 45950f43e595..5410cb201ec8 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -25,6 +25,7 @@
 #include <unotools/linguprops.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace textconversiondlgs
 {
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 674c7ca3dd55..cff53c0d1332 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -32,6 +32,7 @@
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace svxdr = svx::DocRecovery;
 using namespace ::osl;
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index c7f8a5c9c379..d7492c040809 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -74,6 +74,7 @@
 #include <unotools/configmgr.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <svx/sdrpaintwindow.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/svdpagv.hxx>
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 330e79d186bd..430abdcabdfa 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <osl/diagnose.h>
 #include <bitmaps.hlst>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 8c1995c9a4d0..e19e5f541972 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -35,6 +35,7 @@
 #include <svx/dialogs.hrc>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 4692ba8bcb61..57d901fabc85 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -40,6 +40,7 @@
 #include <officecfg/Office/Common.hxx>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 SwParaDlg::SwParaDlg(weld::Window *pParent,
                     SwView& rVw,
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 3b439dfe642e..192e69e24c8e 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -26,6 +26,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/TextView.hxx>
 #include <vcl/weld/weld.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 6e1751cc8b03..0676e9efbf14 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -71,6 +71,7 @@
 #include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <optload.hxx>
 
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx
index c06adbfb8f76..0ed45d2a7e1f 100644
--- a/sw/source/ui/dbui/addresslistdialog.cxx
+++ b/sw/source/ui/dbui/addresslistdialog.cxx
@@ -30,6 +30,7 @@
 #include <unotools/tempfile.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.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 8cfdeee11559..1921fb8e0967 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -30,6 +30,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/ScrolledWindow.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx
index 0792d26ead7d..0111207ac4da 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.hxx
@@ -21,6 +21,7 @@
 
 #include <sfx2/basedlgs.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/SpinButton.hxx>
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index abd26c42f998..92a407917200 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -22,6 +22,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
         weld::Window* pParent, const SwCSVData& rOldData)
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index e3b743989552..95e2b597d613 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -44,6 +44,7 @@
 #include <utility>
 #include <vcl/mnemonic.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <svl/style.hxx>
 #include <svl/zformat.hxx>
 #include <sfx2/htmlmode.hxx>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 9721978a83f2..af962a2a0537 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -31,6 +31,7 @@
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/ScrolledWindow.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 912fa618f5a5..81b72b71ce63 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/mapunit.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <swmodule.hxx>
 #include <view.hxx>
 
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 1c67809ef5cd..9282eb7b36cb 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -30,6 +30,7 @@
 #include <vcl/idle.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/TextView.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 4d5909bc42fd..796e251e46ba 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -42,6 +42,7 @@
 #include <vcl/PrinterSupport.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/scheduler.hxx>
diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx
index e67718e46997..a53e06345da7 100644
--- a/sw/source/ui/dbui/selectdbtabledialog.cxx
+++ b/sw/source/ui/dbui/selectdbtabledialog.cxx
@@ -23,6 +23,7 @@
 #include "selectdbtabledialog.hxx"
 #include "dbtablepreviewdialog.hxx"
 #include <osl/diagnose.h>
+#include <vcl/weld/Dialog.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index d36e49f829c8..9f9d4665c1c4 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -34,6 +34,7 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/docfile.hxx>
 #include <svl/languageoptions.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <editeng/langitem.hxx>
 #include <swtypes.hxx>
 #include <ascfldlg.hxx>
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index d29ed83bad25..d81c3e0fcc01 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -22,6 +22,7 @@
 #include <svl/urihelper.hxx>
 #include <svl/PasswordHelper.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svl/stritem.hxx>
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 26ac0bc28aaf..8a5996543915 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -31,6 +31,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <comphelper/lok.hxx>
 #include <PostItMgr.hxx>
 
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index 7892b00a2f45..4db70d93be45 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -20,6 +20,7 @@
 #include <selglos.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 SwSelGlossaryDlg::SwSelGlossaryDlg(weld::Window * pParent, std::u16string_view rShortName)
     : GenericDialogController(pParent, u"modules/swriter/ui/insertautotextdialog.ui"_ustr, u"InsertAutoTextDialog"_ustr)
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 6a2457e5d9d6..5c459545a046 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/lineend.hxx>
 #include <svtools/unitconv.hxx>
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 341db8a1e33a..54947c84da0f 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -20,6 +20,7 @@
 #include <svtools/unitconv.hxx>
 #include <tools/poly.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 6a1a5ea91aa5..39351fe36e1b 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -20,6 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <comphelper/propertyvalue.hxx>
 
 #include <tools/urlobj.hxx>
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 7603689492dd..cb6d7258c4da 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -23,6 +23,7 @@
 #include <flddropdown.hxx>
 
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <memory>
 
diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
index 24610f57970c..b8e51d4d2b8c 100644
--- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
@@ -13,6 +13,7 @@
 #include <xmloff/odffields.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <strings.hrc>
 #include <swtypes.hxx>
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index 50426f7a6d29..5a694dd0cea3 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -27,6 +27,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <o3tl/string_view.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <view.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 278e0c99d4ae..23919c51f227 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <svx/optgenrl.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <docufld.hxx>
 #include <expfld.hxx>
 #include <view.hxx>
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 3d0bc7d7c8a9..8257c7e60024 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -48,6 +48,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 // carrier of the dialog
 SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper* /*pCW*/, weld::Window *pParent)
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 5f6f2158c8f0..d9e392acbcf9 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -20,6 +20,7 @@
 #include <tools/lineend.hxx>
 #include <unotools/charclass.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <wrtsh.hxx>
 #include <fldbas.hxx>
 #include <expfld.hxx>
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index af7265ea2857..3fc356729f09 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <docsh.hxx>
 #include <wrtsh.hxx>
 #include <fldbas.hxx>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index dba3a2c41230..bbd54da943f3 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -39,6 +39,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/IconView.hxx>
 
 #include <swmodule.hxx>
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index ad9dd21ef598..026c78cdbc93 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -38,6 +38,7 @@
 #include <com/sun/star/text/XTextFramesSupplier.hpp>
 #include <comphelper/string.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <strings.hrc>
 #include <SwStyleNameMapper.hxx>
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx
index 862233bdc4bd..3441246ba7f8 100644
--- a/sw/source/ui/frmdlg/frmdlg.cxx
+++ b/sw/source/ui/frmdlg/frmdlg.cxx
@@ -41,6 +41,7 @@
 #include <comphelper/lok.hxx>
 
 #include <vcl/tabs.hrc>
+#include <vcl/weld/Dialog.hxx>
 
 // the dialog's carrier
 SwFrameDlg::SwFrameDlg(const SfxViewFrame& rViewFrame,
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 097ed1823027..e4d4d9959279 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -19,6 +19,8 @@
 
 #include <sfx2/sfxdlg.hxx>
 #include <svx/dialogs.hrc>
+#include <vcl/weld/Dialog.hxx>
+
 #include <swtypes.hxx>
 #include <pattern.hxx>
 #include <strings.hrc>
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 73c55b0e3cd3..74d50f4227af 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/sfxdlg.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <svl/intitem.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <swtypes.hxx>
 #include <uiborder.hxx>
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 80ff01b196ad..cb2e6d61297d 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -24,6 +24,7 @@
 #include <sal/log.hxx>
 #include <svl/style.hxx>
 #include <utility>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 0a44dacb3859..f88debc6416b 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -33,6 +33,7 @@
 #include <i18nutil/searchopt.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index a1e4d2a4401f..6f96a31d521d 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -23,6 +23,7 @@
 #include <svl/stritem.hxx>
 #include <unotools/viewoptions.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/windowstate.hxx>
 #include <o3tl/string_view.hxx>
diff --git a/sw/source/ui/misc/contentcontroldlg.cxx b/sw/source/ui/misc/contentcontroldlg.cxx
index 3d7f7dd9ec50..148a371808e9 100644
--- a/sw/source/ui/misc/contentcontroldlg.cxx
+++ b/sw/source/ui/misc/contentcontroldlg.cxx
@@ -19,6 +19,7 @@
 
 #include <contentcontroldlg.hxx>
 
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svx/cuicharmap.hxx>
 #include <svl/numformat.hxx>
diff --git a/sw/source/ui/misc/contentcontrollistitemdlg.cxx b/sw/source/ui/misc/contentcontrollistitemdlg.cxx
index 141088d0869e..da0d309ec3f3 100644
--- a/sw/source/ui/misc/contentcontrollistitemdlg.cxx
+++ b/sw/source/ui/misc/contentcontrollistitemdlg.cxx
@@ -23,6 +23,7 @@
 
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 SwContentControlListItemDlg::SwContentControlListItemDlg(weld::Widget* pParent,
                                                          SwContentControlListItem& rItem)
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 407a4e683bcc..115239d76672 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/transfer.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svl/stritem.hxx>
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index 5b88dde52f02..3a2156fccfdd 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -28,6 +28,7 @@
 #include <insfnote.hxx>
 #include <svx/svxdlg.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <memory>
 
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 05c7b0c318c1..ed41091cf758 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -22,6 +22,7 @@
 #include <svtools/unitconv.hxx>
 #include <sal/log.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.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 8b6fd3bdc1f7..e42690a37a96 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -41,6 +41,7 @@
 
 #include <vcl/tabs.hrc>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 static bool bLastRelative = false;
 
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 47db21690abe..d7bd6f7ff5f3 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -23,6 +23,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <editeng/brushitem.hxx>
 #include <unotools/configmgr.hxx>
diff --git a/sw/source/ui/misc/pagenumberdlg.cxx b/sw/source/ui/misc/pagenumberdlg.cxx
index 2c46945dd7d6..666a87fb72a3 100644
--- a/sw/source/ui/misc/pagenumberdlg.cxx
+++ b/sw/source/ui/misc/pagenumberdlg.cxx
@@ -25,6 +25,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <tools/gen.hxx>
 
 SwPageNumberDlg::SwPageNumberDlg(weld::Window* pParent)
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index ac9362903f2e..f46209c67060 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -30,6 +30,7 @@
 #include <svl/eitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <svl/grabbagitem.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <uitool.hxx>
 #include <pagedesc.hxx>
 #include <pgfnote.hxx>
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 41614fc4cae2..92708ef05b43 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -29,6 +29,7 @@
 #include <pggrid.hxx>
 #include <tgrditem.hxx>
 #include <svx/pageitem.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <wrtsh.hxx>
 #include <doc.hxx>
diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
index b0abc98b6808..2668ae75f08c 100644
--- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
+++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx
@@ -20,6 +20,7 @@
 #include <o3tl/deleter.hxx>
 #include <svx/ctredlin.hxx>
 #include <unotools/viewoptions.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <redlndlg.hxx>
 #include <swmodalredlineacceptdlg.hxx>
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index ab5acb914f2b..d7f077af81a4 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -18,6 +18,7 @@
 #include <pagedesc.hxx>
 
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace
 {
diff --git a/sw/source/ui/misc/translatelangselect.cxx b/sw/source/ui/misc/translatelangselect.cxx
index 55454e14a32e..805c1d8aa9aa 100644
--- a/sw/source/ui/misc/translatelangselect.cxx
+++ b/sw/source/ui/misc/translatelangselect.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <uitool.hxx>
 #include <translatelangselect.hxx>
 #include <translatehelper.hxx>
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index e67e249f9554..65cc7f8d1145 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -33,6 +33,7 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <sal/log.hxx>
 #include <shellres.hxx>
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 26470a57e450..83c8dfddfa7d 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -25,6 +25,7 @@
 #include <viewopt.hxx>
 #include <comphelper/lok.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 
 void SwInsTableDlg::GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
diff --git a/sw/source/ui/utlui/copyfielddlg.cxx b/sw/source/ui/utlui/copyfielddlg.cxx
index 281643c14b7b..d350550e6f4b 100644
--- a/sw/source/ui/utlui/copyfielddlg.cxx
+++ b/sw/source/ui/utlui/copyfielddlg.cxx
@@ -21,6 +21,7 @@
 #include <comphelper/string.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index 1b56013cb6f9..f0e5dcabca9f 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -20,6 +20,7 @@
 #include <osl/diagnose.h>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <swrenamexnameddlg.hxx>
 
diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx
index a8b8889cfcaf..611c2f9c2819 100644
--- a/sw/source/uibase/dialog/watermarkdialog.cxx
+++ b/sw/source/uibase/dialog/watermarkdialog.cxx
@@ -18,6 +18,7 @@
 #include <sfx2/objsh.hxx>
 #include <tools/fldunit.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <sfx2/watermarkitem.hxx>
 #include <svtools/ctrltool.hxx>
 #include <comphelper/lok.hxx>
diff --git a/sw/source/uibase/envelp/syncbtn.cxx b/sw/source/uibase/envelp/syncbtn.cxx
index 9d9c161d9a01..976b9c6dbcf5 100644
--- a/sw/source/uibase/envelp/syncbtn.cxx
+++ b/sw/source/uibase/envelp/syncbtn.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/dispatch.hxx>
 #include <vcl/windowstate.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <cmdid.h>
 #include <swmodule.hxx>
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 82df94699b7f..7367e4891537 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -25,6 +25,7 @@
 #include <sfx2/childwin.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/SpinButton.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 4bd546c1f973..02cc0ed690d6 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -27,6 +27,7 @@
 #include <svx/postattr.hxx>
 #include <utility>
 #include <vcl/commandevent.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/uibase/sidebar/QuickFindPanel.cxx b/sw/source/uibase/sidebar/QuickFindPanel.cxx
index e47bb8b21a89..65dc5415aa2c 100644
--- a/sw/source/uibase/sidebar/QuickFindPanel.cxx
+++ b/sw/source/uibase/sidebar/QuickFindPanel.cxx
@@ -26,6 +26,7 @@
 #include <vcl/jsdialog/executor.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/sysdata.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <swwait.hxx>
 
 #include <sfx2/strings.hrc>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index ba607a73325e..3b209da425e2 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -60,6 +60,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <editeng/unolingu.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <editeng/tstpitem.hxx>
diff --git a/sw/source/uibase/utlui/gloslst.cxx b/sw/source/uibase/utlui/gloslst.cxx
index 64d4308b3c4c..4627058cfce3 100644
--- a/sw/source/uibase/utlui/gloslst.cxx
+++ b/sw/source/uibase/utlui/gloslst.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/TreeView.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index 27e4f7f325e5..6acec5c04eb1 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Notebook.hxx>
 #include <vcl/weld/weld.hxx>
 #include <tools/stream.hxx>
diff --git a/uui/source/authfallbackdlg.cxx b/uui/source/authfallbackdlg.cxx
index 80bb1b8c234b..81293db32774 100644
--- a/uui/source/authfallbackdlg.cxx
+++ b/uui/source/authfallbackdlg.cxx
@@ -10,6 +10,7 @@
 #include "authfallbackdlg.hxx"
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 AuthFallbackDlg::AuthFallbackDlg(weld::Window* pParent, const OUString& instructions,
                                  const OUString& url)
diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index b7d40ea8a405..d24c4d761636 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -24,6 +24,7 @@
 #include <tools/urlobj.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <osl/file.hxx>
 
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index cae33b6fa16d..ca8f05fc1ecd 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -20,6 +20,7 @@
 #include <comphelper/string.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <utility>
 #include "logindlg.hxx"
 
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index 73f307f87033..810b7e1b1b2f 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <strings.hrc>
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index 91883078ef32..41a92e2258a2 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -21,6 +21,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <strings.hrc>
 #include "masterpassworddlg.hxx"
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 5e9411d60030..d769cfcf8888 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index 89dc09f1cda5..7aa73d8b788f 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -22,6 +22,7 @@
 #include <officecfg/Office/Common.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weldutils.hxx>
 
 using namespace vcl;
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 852d32033d1d..c85340d4def0 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -28,6 +28,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <bitmaps.hlst>
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index e0d7cd43f172..e9acf2f397dc 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -596,6 +596,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/weld/AssistantController \
     vcl/source/weld/Builder \
     vcl/source/weld/ComboBox \
+    vcl/source/weld/Dialog \
     vcl/source/weld/DialogController \
     vcl/source/weld/Entry \
     vcl/source/weld/EntryTreeView \
diff --git a/vcl/inc/qt5/QtInstanceBuilder.hxx b/vcl/inc/qt5/QtInstanceBuilder.hxx
index 392902c53137..f51cad76a8ba 100644
--- a/vcl/inc/qt5/QtInstanceBuilder.hxx
+++ b/vcl/inc/qt5/QtInstanceBuilder.hxx
@@ -19,6 +19,7 @@
 #include <vcl/weld/Assistant.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DrawingArea.hxx>
 #include <vcl/weld/Entry.hxx>
 #include <vcl/weld/EntryTreeView.hxx>
diff --git a/vcl/inc/qt5/QtInstanceDialog.hxx b/vcl/inc/qt5/QtInstanceDialog.hxx
index 2bc71532f49a..4ed4c4eaa896 100644
--- a/vcl/inc/qt5/QtInstanceDialog.hxx
+++ b/vcl/inc/qt5/QtInstanceDialog.hxx
@@ -11,6 +11,7 @@
 
 #include "QtInstanceWindow.hxx"
 
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 
 #include <QtWidgets/QAbstractButton>
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 97dda6d6a26e..14a7c9be7a8c 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -13,6 +13,7 @@
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/ColorChooserDialog.hxx>
 #include <vcl/weld/ComboBox.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/DrawingArea.hxx>
 #include <vcl/weld/Entry.hxx>
diff --git a/vcl/source/weld/Dialog.cxx b/vcl/source/weld/Dialog.cxx
new file mode 100644
index 000000000000..18740cff9ab3
--- /dev/null
+++ b/vcl/source/weld/Dialog.cxx
@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <vcl/weld/Dialog.hxx>
+
+namespace weld
+{
+void Dialog::set_default_response(int nResponse)
+{
+    std::unique_ptr<weld::Button> pButton = weld_button_for_response(nResponse);
+    change_default_button(nullptr, pButton.get());
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/vcl/source/weld/DialogController.cxx b/vcl/source/weld/DialogController.cxx
index 3547b088b9db..dbbc83c79729 100644
--- a/vcl/source/weld/DialogController.cxx
+++ b/vcl/source/weld/DialogController.cxx
@@ -10,6 +10,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/DialogController.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 04ac7e4d0d90..6fb54332b2c8 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -58,6 +58,7 @@
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <vcl/uitest/logger.hxx>
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b8345368ce88..c4d03923c3b5 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -41,6 +41,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weldutils.hxx>
 #include <vcl/windowstate.hxx>
 
diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 37a99301d9ff..728600bee82c 100644
--- a/vcl/unx/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -56,6 +56,7 @@
 #include <printerinfomanager.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <strings.hrc>
 #include <unx/genprn.h>
diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx
index 7fbea31e7cec..5ff8353673ee 100644
--- a/vcl/unx/generic/print/prtsetup.cxx
+++ b/vcl/unx/generic/print/prtsetup.cxx
@@ -22,6 +22,7 @@
 #include <strings.hrc>
 
 #include <officecfg/Office/Common.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace psp;
 
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 757ef42534b8..ad50d36ba4e9 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -40,6 +40,7 @@
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/weld/DrawingArea.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/FormattedSpinButton.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/MenuButton.hxx>
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx
index e46f6fd32888..e69b9e38eaea 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -28,6 +28,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 namespace writerperfect
 {
diff --git a/writerperfect/source/writer/EPUBExportDialog.cxx b/writerperfect/source/writer/EPUBExportDialog.cxx
index b8bf51f7b195..ff6385fc73f8 100644
--- a/writerperfect/source/writer/EPUBExportDialog.cxx
+++ b/writerperfect/source/writer/EPUBExportDialog.cxx
@@ -22,6 +22,7 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include "EPUBExportFilter.hxx"
 
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx
index b4d4ee2282ab..bf8de9e57d8c 100644
--- a/xmlsecurity/source/dialogs/certificatechooser.cxx
+++ b/xmlsecurity/source/dialogs/certificatechooser.cxx
@@ -31,6 +31,7 @@
 #include <sfx2/viewsh.hxx>
 #include <svl/cryptosign.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 #include <com/sun/star/security/NoPasswordException.hpp>
 #include <com/sun/star/security/CertificateCharacters.hpp>
diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx
index 33510bcd4ece..72197690c54c 100644
--- a/xmlsecurity/source/dialogs/certificateviewer.cxx
+++ b/xmlsecurity/source/dialogs/certificateviewer.cxx
@@ -41,6 +41,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 
 using namespace comphelper;
 using namespace ::com::sun::star;
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
index 0b0bf29952d2..afd310af8f60 100644
--- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
+++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx
@@ -51,6 +51,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include <utility>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <vcl/svapp.hxx>
diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx
index 9885a8bd5d3c..c5df5b706eaa 100644
--- a/xmlsecurity/source/dialogs/macrosecurity.cxx
+++ b/xmlsecurity/source/dialogs/macrosecurity.cxx
@@ -43,6 +43,7 @@
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 
 using namespace comphelper;