basctl/source/basicide/objectbrowser.cxx                    |    1 
 chart2/source/controller/sidebar/ChartAxisPanel.cxx         |    1 
 chart2/source/controller/sidebar/ChartElementsPanel.cxx     |    1 
 chart2/source/controller/sidebar/ChartErrorBarPanel.cxx     |    1 
 chart2/source/controller/sidebar/ChartErrorBarPanel.hxx     |    1 
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx       |    1 
 chart2/source/model/main/ChartModel_Persistence.cxx         |    1 
 cui/source/dialogs/about.cxx                                |    1 
 cui/source/dialogs/hlmarkwn.cxx                             |    1 
 cui/source/dialogs/hyperlinknewdoctabpage.cxx               |    2 
 cui/source/dialogs/insdlg.cxx                               |    2 
 cui/source/dialogs/scriptdlg.cxx                            |    1 
 cui/source/dialogs/tipofthedaydlg.cxx                       |    2 
 cui/source/dialogs/welcomedlg.cxx                           |    3 
 cui/source/inc/grfpage.hxx                                  |    1 
 cui/source/options/optasian.cxx                             |    1 
 cui/source/tabpages/autocdlg.cxx                            |    2 
 cui/source/tabpages/border.cxx                              |    1 
 cui/source/tabpages/numfmt.cxx                              |    1 
 cui/source/tabpages/numpages.cxx                            |    2 
 dbaccess/source/filter/xml/xmlfilter.cxx                    |    1 
 dbaccess/source/ui/dlg/ConnectionHelper.cxx                 |    1 
 desktop/source/lib/init.cxx                                 |    2 
 extensions/source/abpilot/datasourcehandling.cxx            |    1 
 filter/source/msfilter/mstoolbar.cxx                        |    1 
 filter/source/msfilter/msvbahelper.cxx                      |    1 
 filter/source/msfilter/svdfppt.cxx                          |    1 
 filter/source/pdf/impdialog.cxx                             |    1 
 forms/source/component/clickableimage.cxx                   |    3 
 forms/source/richtext/parametrizedattributedispatcher.cxx   |    1 
 include/IwyuFilter_include.yaml                             |   73 ++----------
 include/sfx2/AccessibilityIssue.hxx                         |    6 
 include/sfx2/AdditionsDialogHelper.hxx                      |    7 -
 include/sfx2/LokControlHandler.hxx                          |   11 +
 include/sfx2/StyleManager.hxx                               |    4 
 include/sfx2/StylePreviewRenderer.hxx                       |    7 -
 include/sfx2/app.hxx                                        |    4 
 include/sfx2/basedlgs.hxx                                   |    6 
 include/sfx2/bindings.hxx                                   |   11 +
 include/sfx2/brokenpackageint.hxx                           |    7 -
 include/sfx2/charmapcontainer.hxx                           |   13 +-
 include/sfx2/childwin.hxx                                   |    5 
 include/sfx2/classificationhelper.hxx                       |    7 -
 include/sfx2/ctrlitem.hxx                                   |    6 
 include/sfx2/devtools/DocumentModelTreeHandler.hxx          |   12 +
 include/sfx2/devtools/ObjectInspectorTreeHandler.hxx        |   29 +++-
 include/sfx2/devtools/ObjectInspectorWidgets.hxx            |   38 +++++-
 include/sfx2/dialoghelper.hxx                               |    2 
 include/sfx2/digitalsignatures.hxx                          |   31 ++++-
 include/sfx2/dinfdlg.hxx                                    |    4 
 include/sfx2/dispatch.hxx                                   |    8 -
 include/sfx2/docfile.hxx                                    |   13 +-
 include/sfx2/docinf.hxx                                     |    3 
 include/sfx2/dockwin.hxx                                    |    5 
 include/sfx2/docmacromode.hxx                               |    6 
 include/sfx2/event.hxx                                      |    2 
 include/sfx2/evntconf.hxx                                   |    2 
 include/sfx2/fcontnr.hxx                                    |    2 
 include/sfx2/filedlghelper.hxx                              |    4 
 include/sfx2/infobar.hxx                                    |   23 +++
 include/sfx2/ipclient.hxx                                   |    6 
 include/sfx2/listview.hxx                                   |    6 
 include/sfx2/lnkbase.hxx                                    |    2 
 include/sfx2/lokcomponenthelpers.hxx                        |    3 
 include/sfx2/mailmodelapi.hxx                               |    2 
 include/sfx2/module.hxx                                     |    4 
 include/sfx2/msgpool.hxx                                    |    2 
 include/sfx2/newstyle.hxx                                   |   24 +++
 include/sfx2/notebookbar/SfxNotebookBar.hxx                 |    2 
 include/sfx2/objface.hxx                                    |    2 
 include/sfx2/objsh.hxx                                      |   20 +--
 include/sfx2/opengrf.hxx                                    |    2 
 include/sfx2/printopt.hxx                                   |   11 +
 include/sfx2/sfxbasecontroller.hxx                          |    3 
 include/sfx2/sfxbasemodel.hxx                               |    3 
 include/sfx2/sfxdlg.hxx                                     |    4 
 include/sfx2/sfxmodelfactory.hxx                            |    3 
 include/sfx2/sfxresid.hxx                                   |    3 
 include/sfx2/sfxstatuslistener.hxx                          |    4 
 include/sfx2/sfxuno.hxx                                     |    3 
 include/sfx2/sidebar/Deck.hxx                               |   15 ++
 include/sfx2/sidebar/FocusManager.hxx                       |    5 
 include/sfx2/sidebar/ILayoutableWindow.hxx                  |    6 
 include/sfx2/sidebar/Panel.hxx                              |   29 ++++
 include/sfx2/sidebar/PanelLayout.hxx                        |    2 
 include/sfx2/sidebar/ResourceManager.hxx                    |    6 
 include/sfx2/sidebar/Sidebar.hxx                            |    2 
 include/sfx2/sidebar/SidebarController.hxx                  |    6 
 include/sfx2/sidebar/TabBar.hxx                             |    6 
 include/sfx2/sidebar/Theme.hxx                              |    2 
 include/sfx2/signaturestate.hxx                             |    9 +
 include/sfx2/stbitem.hxx                                    |    3 
 include/sfx2/strings.hrc                                    |    2 
 include/sfx2/styfitem.hxx                                   |    6 
 include/sfx2/tabdlg.hxx                                     |    5 
 include/sfx2/tbxctrl.hxx                                    |    5 
 include/sfx2/templatedlg.hxx                                |   20 ++-
 include/sfx2/templatelocalview.hxx                          |    2 
 include/sfx2/templdlg.hxx                                   |    5 
 include/sfx2/thumbnailview.hxx                              |    2 
 include/sfx2/tplpitem.hxx                                   |    4 
 include/sfx2/uiobject.hxx                                   |    3 
 include/sfx2/viewfrm.hxx                                    |    3 
 include/sfx2/viewsh.hxx                                     |    1 
 include/sfx2/weldutils.hxx                                  |   12 +
 include/svx/ClassificationCommon.hxx                        |    1 
 include/svx/ClassificationDialog.hxx                        |    2 
 include/svx/linectrl.hxx                                    |    1 
 include/svx/pszctrl.hxx                                     |    1 
 include/svx/swframeexample.hxx                              |    2 
 include/svx/zoomsliderctrl.hxx                              |    1 
 reportdesign/source/filter/xml/xmlfilter.cxx                |    1 
 sc/qa/unit/helper/scfiltertestbase.cxx                      |    1 
 sc/source/core/data/dpobject.cxx                            |    1 
 sc/source/core/tool/addincol.cxx                            |    1 
 sc/source/filter/ftools/fapihelper.cxx                      |    1 
 sc/source/filter/html/htmlexp.cxx                           |    1 
 sc/source/filter/xml/xmlimprt.cxx                           |    1 
 sc/source/ui/app/inputwin.cxx                               |    1 
 sc/source/ui/app/scmod.cxx                                  |    1 
 sc/source/ui/dbgui/asciiopt.cxx                             |    1 
 sc/source/ui/docshell/externalrefmgr.cxx                    |    1 
 sc/source/ui/docshell/tablink.cxx                           |    1 
 sc/source/ui/drawfunc/chartsh.cxx                           |    1 
 sc/source/ui/drawfunc/drawsh.cxx                            |    2 
 sc/source/ui/drawfunc/drtxtob.cxx                           |    1 
 sc/source/ui/drawfunc/fuins2.cxx                            |    1 
 sc/source/ui/drawfunc/graphsh.cxx                           |    1 
 sc/source/ui/drawfunc/mediash.cxx                           |    1 
 sc/source/ui/drawfunc/oleobjsh.cxx                          |    1 
 sc/source/ui/inc/navipi.hxx                                 |    1 
 sc/source/ui/navipi/scenwnd.cxx                             |    1 
 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx             |    1 
 sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx        |    1 
 sc/source/ui/sidebar/DatabasePropertyPanel.cxx              |    1 
 sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx          |    1 
 sc/source/ui/unoobj/filtuno.cxx                             |    1 
 sc/source/ui/unoobj/scdetect.cxx                            |    1 
 sc/source/ui/view/cellsh.cxx                                |    1 
 sc/source/ui/view/formatsh.cxx                              |    1 
 sc/source/ui/view/prevwsh.cxx                               |    1 
 sc/source/ui/view/tabvwsh.cxx                               |    1 
 sc/source/ui/view/tabvwsh3.cxx                              |    1 
 sc/source/ui/view/tabvwshb.cxx                              |    1 
 scripting/source/protocolhandler/scripthandler.cxx          |    1 
 sd/qa/unit/filters-test.cxx                                 |    1 
 sd/qa/unit/import-tests2.cxx                                |    1 
 sd/source/core/drawdoc4.cxx                                 |    1 
 sd/source/filter/cgm/sdcgmfilter.cxx                        |    2 
 sd/source/filter/eppt/eppt.cxx                              |    1 
 sd/source/filter/grf/sdgrffilter.cxx                        |    1 
 sd/source/filter/html/htmlex.cxx                            |    2 
 sd/source/filter/ppt/pptin.cxx                              |    1 
 sd/source/filter/sdfilter.cxx                               |    2 
 sd/source/filter/sdpptwrp.cxx                               |    1 
 sd/source/filter/xml/sdxmlwrp.cxx                           |    1 
 sd/source/ui/animations/CustomAnimationPane.cxx             |    1 
 sd/source/ui/animations/SlideTransitionPane.cxx             |    2 
 sd/source/ui/annotations/annotationmanager.cxx              |    1 
 sd/source/ui/app/scalectrl.cxx                              |    1 
 sd/source/ui/app/tmplctrl.cxx                               |    1 
 sd/source/ui/dlg/BulletAndPositionDlg.cxx                   |    1 
 sd/source/ui/dlg/PaneChildWindows.cxx                       |    1 
 sd/source/ui/dlg/navigatr.cxx                               |    3 
 sd/source/ui/dlg/tpaction.cxx                               |    1 
 sd/source/ui/docshell/docshel4.cxx                          |    1 
 sd/source/ui/func/fulink.cxx                                |    1 
 sd/source/ui/func/futempl.cxx                               |    1 
 sd/source/ui/inc/BreakDlg.hxx                               |    1 
 sd/source/ui/inc/TableDesignPane.hxx                        |    2 
 sd/source/ui/inc/navigatr.hxx                               |    3 
 sd/source/ui/sidebar/LayoutMenu.cxx                         |    4 
 sd/source/ui/sidebar/LayoutMenu.hxx                         |    1 
 sd/source/ui/sidebar/MasterPagesSelector.cxx                |    4 
 sd/source/ui/sidebar/NavigatorWrapper.cxx                   |    2 
 sd/source/ui/sidebar/SlideBackground.cxx                    |    1 
 sd/source/ui/uitest/uiobject.cxx                            |    1 
 sd/source/ui/unoidl/unodoc.cxx                              |    1 
 sd/source/ui/view/ViewShellBase.cxx                         |    1 
 sd/source/ui/view/drviewsi.cxx                              |    1 
 sd/source/ui/view/outlnvsh.cxx                              |    1 
 sd/source/ui/view/presvish.cxx                              |    2 
 sd/source/ui/view/sdview4.cxx                               |    2 
 sd/source/ui/view/viewshel.cxx                              |    1 
 sfx2/inc/sidebar/DeckLayouter.hxx                           |    1 
 sfx2/qa/cppunit/autoredaction.cxx                           |    1 
 sfx2/qa/cppunit/view.cxx                                    |    1 
 sfx2/source/appl/appbas.cxx                                 |    1 
 sfx2/source/appl/appdispatchprovider.cxx                    |    1 
 sfx2/source/appl/appmisc.cxx                                |    1 
 sfx2/source/appl/appopen.cxx                                |    3 
 sfx2/source/appl/appserv.cxx                                |    3 
 sfx2/source/appl/appuno.cxx                                 |    2 
 sfx2/source/appl/childwin.cxx                               |    1 
 sfx2/source/appl/linkmgr2.cxx                               |    2 
 sfx2/source/appl/lnkbase2.cxx                               |    1 
 sfx2/source/appl/macroloader.cxx                            |    1 
 sfx2/source/appl/module.cxx                                 |    1 
 sfx2/source/appl/opengrf.cxx                                |    1 
 sfx2/source/appl/sfxpicklist.cxx                            |    3 
 sfx2/source/appl/shutdowniconaqua.mm                        |    1 
 sfx2/source/appl/workwin.cxx                                |    2 
 sfx2/source/bastyp/fltfnc.cxx                               |    1 
 sfx2/source/bastyp/progress.cxx                             |    1 
 sfx2/source/bastyp/sfxresid.cxx                             |    1 
 sfx2/source/config/evntconf.cxx                             |    1 
 sfx2/source/control/charmapcontainer.cxx                    |    3 
 sfx2/source/control/charmapcontrol.cxx                      |    3 
 sfx2/source/control/dispatch.cxx                            |    1 
 sfx2/source/control/request.cxx                             |    1 
 sfx2/source/control/statcach.cxx                            |    1 
 sfx2/source/control/uiobject.cxx                            |    1 
 sfx2/source/devtools/DevToolsStrings.hrc                    |    2 
 sfx2/source/devtools/DevelopmentToolChildWindow.cxx         |    1 
 sfx2/source/devtools/DevelopmentToolDockingWindow.cxx       |    2 
 sfx2/source/devtools/DocumentModelTreeHandler.cxx           |    1 
 sfx2/source/devtools/ObjectInspectorTreeHandler.cxx         |    8 +
 sfx2/source/devtools/ObjectInspectorWidgets.cxx             |    6 
 sfx2/source/dialog/StyleList.cxx                            |    1 
 sfx2/source/dialog/dinfdlg.cxx                              |    2 
 sfx2/source/dialog/dockwin.cxx                              |    1 
 sfx2/source/dialog/documentfontsdialog.cxx                  |    1 
 sfx2/source/dialog/filedlghelper.cxx                        |    2 
 sfx2/source/dialog/infobar.cxx                              |    3 
 sfx2/source/dialog/mgetempl.cxx                             |    1 
 sfx2/source/dialog/partwnd.cxx                              |    1 
 sfx2/source/dialog/printopt.cxx                             |    2 
 sfx2/source/dialog/securitypage.cxx                         |    2 
 sfx2/source/dialog/splitwin.cxx                             |    1 
 sfx2/source/dialog/tabdlg.cxx                               |    1 
 sfx2/source/dialog/tplpitem.cxx                             |    1 
 sfx2/source/dialog/versdlg.cxx                              |    1 
 sfx2/source/doc/docfile.cxx                                 |    1 
 sfx2/source/doc/guisaveas.cxx                               |    1 
 sfx2/source/doc/objcont.cxx                                 |    2 
 sfx2/source/doc/objitem.cxx                                 |    1 
 sfx2/source/doc/objserv.cxx                                 |    2 
 sfx2/source/doc/objstor.cxx                                 |    3 
 sfx2/source/doc/objxtor.cxx                                 |    3 
 sfx2/source/doc/printhelper.cxx                             |    1 
 sfx2/source/doc/sfxbasemodel.cxx                            |    1 
 sfx2/source/doc/templatedlg.cxx                             |    2 
 sfx2/source/inc/openflag.hxx                                |    2 
 sfx2/source/notebookbar/SfxNotebookBar.cxx                  |    1 
 sfx2/source/sidebar/DeckLayouter.cxx                        |    1 
 sfx2/source/sidebar/Panel.cxx                               |    4 
 sfx2/source/sidebar/PanelLayout.cxx                         |    1 
 sfx2/source/sidebar/Sidebar.cxx                             |    1 
 sfx2/source/sidebar/SidebarChildWindow.cxx                  |    1 
 sfx2/source/sidebar/SidebarController.cxx                   |    1 
 sfx2/source/sidebar/SidebarDockingWindow.cxx                |    1 
 sfx2/source/sidebar/TabBar.cxx                              |    2 
 sfx2/source/sidebar/Theme.cxx                               |    1 
 sfx2/source/sidebar/TitleBar.cxx                            |    1 
 sfx2/source/sidebar/uiobject.cxx                            |    1 
 sfx2/source/styles/StyleManager.cxx                         |    1 
 sfx2/source/toolbox/weldutils.cxx                           |    1 
 sfx2/source/view/classificationhelper.cxx                   |    1 
 sfx2/source/view/frame.cxx                                  |    2 
 sfx2/source/view/frame2.cxx                                 |    2 
 sfx2/source/view/frmload.cxx                                |    1 
 sfx2/source/view/ipclient.cxx                               |    1 
 sfx2/source/view/sfxbasecontroller.cxx                      |    1 
 sfx2/source/view/viewfrm.cxx                                |    1 
 sfx2/source/view/viewprn.cxx                                |    3 
 sfx2/source/view/viewsh.cxx                                 |    1 
 starmath/inc/smmod.hxx                                      |    1 
 starmath/source/ElementsDockingWindow.cxx                   |    1 
 starmath/source/SmElementsPanel.cxx                         |    1 
 starmath/source/SmPropertiesPanel.cxx                       |    1 
 starmath/source/dialog.cxx                                  |    1 
 starmath/source/edit.cxx                                    |    1 
 starmath/source/mathml/export.cxx                           |    1 
 starmath/source/unodoc.cxx                                  |    1 
 starmath/source/view.cxx                                    |    4 
 svx/source/core/graphichelper.cxx                           |    1 
 svx/source/dialog/TableStylesDlg.cxx                        |    1 
 svx/source/dialog/cuicharmap.cxx                            |    1 
 svx/source/dialog/fontwork.cxx                              |    2 
 svx/source/dialog/imapdlg.cxx                               |    1 
 svx/source/dialog/imapwnd.cxx                               |    1 
 svx/source/dialog/srchdlg.cxx                               |    1 
 svx/source/form/datanavi.cxx                                |    2 
 svx/source/form/filtnav.cxx                                 |    1 
 svx/source/form/fmPropBrw.cxx                               |    1 
 svx/source/form/fmexpl.cxx                                  |    1 
 svx/source/form/fmshell.cxx                                 |    1 
 svx/source/form/fmtextcontrolshell.cxx                      |    1 
 svx/source/form/fmundo.cxx                                  |    1 
 svx/source/form/fmview.cxx                                  |    1 
 svx/source/gallery2/galctrl.cxx                             |    1 
 svx/source/gallery2/galobj.cxx                              |    2 
 svx/source/sidebar/area/AreaPropertyPanelBase.cxx           |    1 
 svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx   |    1 
 svx/source/sidebar/effect/EffectPropertyPanel.cxx           |    1 
 svx/source/sidebar/effect/TextEffectPropertyPanel.cxx       |    1 
 svx/source/sidebar/fontwork/FontworkPropertyPanel.cxx       |    1 
 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx         |    1 
 svx/source/sidebar/inspector/InspectorTextPanel.cxx         |    1 
 svx/source/sidebar/line/LinePropertyPanelBase.cxx           |    1 
 svx/source/sidebar/line/LineWidthPopup.cxx                  |    1 
 svx/source/sidebar/lists/ListsPropertyPanel.cxx             |    1 
 svx/source/sidebar/media/MediaPlaybackPanel.cxx             |    1 
 svx/source/sidebar/nbdtmg.cxx                               |    1 
 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx     |    1 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx          |    1 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx         |    2 
 svx/source/sidebar/shadow/ShadowPropertyPanel.cxx           |    1 
 svx/source/sidebar/styles/StylesPropertyPanel.cxx           |    2 
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx     |    1 
 svx/source/sidebar/text/TextPropertyPanel.cxx               |    1 
 svx/source/sidebar/text/TextUnderlineControl.cxx            |    2 
 svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx |    1 
 svx/source/stbctrls/pszctrl.cxx                             |    1 
 svx/source/table/tableautofmt.cxx                           |    2 
 svx/source/tbxctrls/StylesPreviewWindow.cxx                 |    1 
 svx/source/tbxctrls/SvxColorChildWindow.cxx                 |    1 
 svx/source/tbxctrls/itemwin.cxx                             |    1 
 svx/source/toolbars/extrusionbar.cxx                        |    1 
 svx/source/toolbars/fontworkbar.cxx                         |    1 
 svx/source/xml/xmlxtexp.cxx                                 |    1 
 svx/source/xml/xmlxtimp.cxx                                 |    1 
 svx/source/xoutdev/_xoutbmp.cxx                             |    2 
 sw/inc/docsh.hxx                                            |    1 
 sw/inc/ndole.hxx                                            |    1 
 sw/qa/core/filters-test.cxx                                 |    4 
 sw/qa/core/uwriter.cxx                                      |    1 
 sw/qa/extras/fodfexport/fodfexport.cxx                      |    1 
 sw/qa/extras/odfexport/odfexport2.cxx                       |    1 
 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx                  |    1 
 sw/qa/extras/ooxmlexport/ooxmlexport21.cxx                  |    1 
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx                   |    1 
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx                   |    1 
 sw/qa/extras/rtfexport/rtfexport6.cxx                       |    1 
 sw/qa/extras/tiledrendering/tiledrendering2.cxx             |    1 
 sw/qa/extras/uiwriter/uiwriter6.cxx                         |    1 
 sw/qa/filter/html/html.cxx                                  |    1 
 sw/source/core/access/AccessibilityIssue.cxx                |    1 
 sw/source/core/doc/DocumentStatisticsManager.cxx            |    1 
 sw/source/core/doc/doc.cxx                                  |    1 
 sw/source/core/doc/doccomp.cxx                              |    1 
 sw/source/core/doc/docglbl.cxx                              |    2 
 sw/source/core/doc/docglos.cxx                              |    1 
 sw/source/core/doc/docxforms.cxx                            |    1 
 sw/source/core/draw/drawdoc.cxx                             |    1 
 sw/source/core/edit/editsh.cxx                              |    1 
 sw/source/core/edit/edtox.cxx                               |    1 
 sw/source/core/edit/edundo.cxx                              |    2 
 sw/source/core/fields/docufld.cxx                           |    1 
 sw/source/core/swg/SwXMLTextBlocks1.cxx                     |    1 
 sw/source/core/txtnode/fmtatr2.cxx                          |    1 
 sw/source/core/unocore/unobkm.cxx                           |    2 
 sw/source/core/unocore/unocoll.cxx                          |    1 
 sw/source/core/unocore/unodraw.cxx                          |    1 
 sw/source/core/unocore/unoparagraph.cxx                     |    1 
 sw/source/core/unocore/unorefmk.cxx                         |    1 
 sw/source/core/unocore/unosect.cxx                          |    1 
 sw/source/filter/docx/swdocxreader.cxx                      |    1 
 sw/source/filter/html/htmlbas.cxx                           |    2 
 sw/source/filter/html/htmlcss1.cxx                          |    1 
 sw/source/filter/html/htmlfld.cxx                           |    1 
 sw/source/filter/html/htmlform.cxx                          |    1 
 sw/source/filter/html/swhtml.cxx                            |    1 
 sw/source/filter/html/wrthtml.cxx                           |    1 
 sw/source/filter/rtf/swparrtf.cxx                           |    1 
 sw/source/filter/ww8/ww8toolbar.cxx                         |    1 
 sw/source/filter/xml/swxml.cxx                              |    1 
 sw/source/filter/xml/wrtxml.cxx                             |    1 
 sw/source/ui/chrdlg/numpara.cxx                             |    2 
 sw/source/ui/dbui/addresslistdialog.hxx                     |    1 
 sw/source/ui/dbui/createaddresslistdialog.cxx               |    1 
 sw/source/ui/dbui/dbtablepreviewdialog.cxx                  |    1 
 sw/source/ui/dialog/macassgn.cxx                            |    1 
 sw/source/ui/fldui/fldedt.cxx                               |    1 
 sw/source/ui/fldui/fldtdlg.cxx                              |    1 
 sw/source/ui/fldui/javaedit.cxx                             |    1 
 sw/source/ui/frmdlg/frmpage.cxx                             |    1 
 sw/source/ui/index/cnttab.cxx                               |    1 
 sw/source/ui/misc/contentcontroldlg.cxx                     |    1 
 sw/source/ui/misc/glossary.cxx                              |    1 
 sw/source/uibase/app/docsh2.cxx                             |    1 
 sw/source/uibase/app/docst.cxx                              |    2 
 sw/source/uibase/app/swmodule.cxx                           |    1 
 sw/source/uibase/dbui/dbmgr.cxx                             |    1 
 sw/source/uibase/dbui/mailmergehelper.cxx                   |    2 
 sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx        |    1 
 sw/source/uibase/envelp/syncbtn.cxx                         |    1 
 sw/source/uibase/globdoc/globdoc.cxx                        |    1 
 sw/source/uibase/inc/navipi.hxx                             |    1 
 sw/source/uibase/misc/glshell.cxx                           |    1 
 sw/source/uibase/ribbar/inputwin.cxx                        |    2 
 sw/source/uibase/shells/annotsh.cxx                         |    1 
 sw/source/uibase/shells/beziersh.cxx                        |    1 
 sw/source/uibase/shells/drawsh.cxx                          |    1 
 sw/source/uibase/shells/drformsh.cxx                        |    1 
 sw/source/uibase/shells/drwtxtsh.cxx                        |    1 
 sw/source/uibase/shells/frmsh.cxx                           |    1 
 sw/source/uibase/shells/grfsh.cxx                           |    1 
 sw/source/uibase/shells/grfshex.cxx                         |    1 
 sw/source/uibase/shells/listsh.cxx                          |    1 
 sw/source/uibase/shells/mediash.cxx                         |    1 
 sw/source/uibase/shells/olesh.cxx                           |    1 
 sw/source/uibase/shells/tabsh.cxx                           |    1 
 sw/source/uibase/shells/textfld.cxx                         |    1 
 sw/source/uibase/shells/textsh.cxx                          |    1 
 sw/source/uibase/shells/translatehelper.cxx                 |    1 
 sw/source/uibase/sidebar/PageFooterPanel.cxx                |    1 
 sw/source/uibase/sidebar/PageFormatPanel.cxx                |    1 
 sw/source/uibase/sidebar/PageHeaderPanel.cxx                |    1 
 sw/source/uibase/sidebar/PageMarginControl.cxx              |    1 
 sw/source/uibase/sidebar/PageSizeControl.cxx                |    2 
 sw/source/uibase/sidebar/PageStylesPanel.cxx                |    1 
 sw/source/uibase/sidebar/QuickFindPanel.cxx                 |    1 
 sw/source/uibase/sidebar/TableEditPanel.cxx                 |    1 
 sw/source/uibase/sidebar/ThemePanel.cxx                     |    1 
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx              |    1 
 sw/source/uibase/table/tablemgr.cxx                         |    1 
 sw/source/uibase/uiview/pview.cxx                           |    1 
 sw/source/uibase/uiview/srcview.cxx                         |    2 
 sw/source/uibase/uiview/view0.cxx                           |    1 
 sw/source/uibase/uiview/view2.cxx                           |    1 
 sw/source/uibase/uno/unodoc.cxx                             |    2 
 sw/source/uibase/utlui/bookctrl.cxx                         |    1 
 sw/source/uibase/utlui/glbltree.cxx                         |    2 
 sw/source/uibase/utlui/navipi.cxx                           |    1 
 sw/source/uibase/utlui/tmplctrl.cxx                         |    1 
 sw/source/uibase/web/wdocsh.cxx                             |    1 
 sw/source/uibase/web/wformsh.cxx                            |    1 
 sw/source/uibase/web/wfrmsh.cxx                             |    1 
 sw/source/uibase/web/wgrfsh.cxx                             |    1 
 sw/source/uibase/web/wlistsh.cxx                            |    1 
 sw/source/uibase/web/wolesh.cxx                             |    1 
 sw/source/uibase/web/wtabsh.cxx                             |    1 
 sw/source/uibase/web/wtextsh.cxx                            |    1 
 sw/source/uibase/wrtsh/wrtsh1.cxx                           |    1 
 sw/source/uibase/wrtsh/wrtsh2.cxx                           |    2 
 xmlsecurity/qa/unit/signing/signing.cxx                     |    1 
 xmlsecurity/qa/unit/signing/signing2.cxx                    |    1 
 438 files changed, 885 insertions(+), 206 deletions(-)

New commits:
commit a9e9175ba6be99bebd82228e78cd77f33b1515ea
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Sat Feb 14 17:50:37 2026 +0100
Commit:     Gabor Kelemen <[email protected]>
CommitDate: Mon Feb 23 12:19:48 2026 +0100

    tdf#146619 Use more forward declarations in include/sfx2
    
    This shaves off some 300M of input
    Change-Id: I2fae9ff6c6dab31010986e55365676d4a01f402d
    
    Change-Id: I3b2551a1937929100f25c01c0c416a419e7fbb51
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199388
    Reviewed-by: Gabor Kelemen <[email protected]>
    Tested-by: Jenkins

diff --git a/basctl/source/basicide/objectbrowser.cxx 
b/basctl/source/basicide/objectbrowser.cxx
index a046e4d3b7c5..03a03c55cc23 100644
--- a/basctl/source/basicide/objectbrowser.cxx
+++ b/basctl/source/basicide/objectbrowser.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/taskpanelist.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx 
b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index a26e4515ec16..387f6b18dff9 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/chart2/AxisOrientation.hpp>
 
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <sal/log.hxx>
 
 #include "ChartAxisPanel.hxx"
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx 
b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index e12d942477e6..6a7ff5df12e2 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/chart/ChartLegendExpansion.hpp>
 
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 
 #include "ChartElementsPanel.hxx"
 #include <ChartController.hxx>
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx 
b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index 87be2b47d185..11efff24eb1d 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -24,6 +24,7 @@
 #include <ChartController.hxx>
 #include <ChartModel.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <sal/log.hxx>
 
 
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx 
b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
index d93eceee6170..38b76ff28eba 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -10,6 +10,7 @@
 
 #pragma once
 
+#include <rtl/ref.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
 #include <sfx2/sidebar/SidebarModelUpdate.hxx>
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx 
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 0d68bd75ffd4..7f70f6199e1b 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <sal/log.hxx>
 
 #include "ChartSeriesPanel.hxx"
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx 
b/chart2/source/model/main/ChartModel_Persistence.cxx
index db66318834ff..00c2c4368586 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -50,6 +50,7 @@
 
 #include <chart2/AbstractPivotTableDataProvider.hxx>
 
+#include <tools/stream.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/tempfile.hxx>
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 19edc74806ca..64b203fa1969 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -27,6 +27,7 @@
 #include <rtl/bootstrap.hxx>
 #include <sal/log.hxx> //SAL_WARN
 #include <tools/color.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx> //Graphic
 #include <vcl/settings.hxx> //GetSettings
 #include <vcl/svapp.hxx> //Application::
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index e605cd422edd..f95997c72ca1 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -21,6 +21,7 @@
 #include <o3tl/any.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <unotools/viewoptions.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/windowstate.hxx>
diff --git a/cui/source/dialogs/hyperlinknewdoctabpage.cxx 
b/cui/source/dialogs/hyperlinknewdoctabpage.cxx
index 430659cf4567..25783af7dc1d 100644
--- a/cui/source/dialogs/hyperlinknewdoctabpage.cxx
+++ b/cui/source/dialogs/hyperlinknewdoctabpage.cxx
@@ -8,12 +8,14 @@
  */
 
 #include <hyperlinknewdoctabpage.hxx>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <svl/stritem.hxx>
+#include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index e88724423021..90557a75b2c1 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/XInsertObjectDialog.hpp>
 #include <com/sun/star/embed/MSOLEObjectSystemCreator.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
@@ -38,6 +39,7 @@
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 
+#include <comphelper/documentconstants.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index f47ced0fbba0..c970894b1c26 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -45,6 +45,7 @@
 #include <com/sun/star/script/provider/ScriptFrameworkErrorType.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx 
b/cui/source/dialogs/tipofthedaydlg.cxx
index d17d46d27663..d740f8ff2f79 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -25,6 +25,7 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/help.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/window.hxx>
 #include <vcl/weld/Builder.hxx>
@@ -33,6 +34,7 @@
 
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 
diff --git a/cui/source/dialogs/welcomedlg.cxx 
b/cui/source/dialogs/welcomedlg.cxx
index b80fa4469551..742733c547d2 100644
--- a/cui/source/dialogs/welcomedlg.cxx
+++ b/cui/source/dialogs/welcomedlg.cxx
@@ -18,6 +18,7 @@
 #include <officecfg/Setup.hxx>
 #include <unotools/confignode.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/Notebook.hxx>
 
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
@@ -27,6 +28,8 @@
 #include <sfx2/viewfrm.hxx>
 #include <vcl/weld/Dialog.hxx>
 
+#include <com/sun/star/frame/XModel3.hpp>
+
 constexpr OUString sNewsTab = u"WhatsNewTabPage"_ustr;
 constexpr OUString sUITab = u"UITabPage"_ustr;
 constexpr OUString sAppearanceTab = u"AppearanceTabPage"_ustr;
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 48c9c19893e0..d4fada67e8e2 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <vcl/graph.hxx>
+#include <vcl/mapmod.hxx>
 #include <vcl/weld/DrawingArea.hxx>
 #include <vcl/weld/MetricSpinButton.hxx>
 #include <vcl/weld/customweld.hxx>
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index fadc263d43a2..b8d8de5356d3 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -26,6 +26,7 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <svl/asiancfg.hxx>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 41467d7fa521..6d8c40580391 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -27,6 +27,7 @@
 #include <vcl/rendercontext/GetDefaultFontFlags.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/transfer.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <vcl/weld/MetricSpinButton.hxx>
 #include <vcl/weld/TreeView.hxx>
 #include <sfx2/app.hxx>
@@ -47,6 +48,7 @@
 #include <o3tl/temporary.hxx>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
+#include <tools/fldunit.hxx>
 
 #include <autocdlg.hxx>
 #include <editeng/acorrcfg.hxx>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 4f7b675a3c9e..214e62b61b09 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -44,6 +44,7 @@
 #include <svl/intitem.hxx>
 #include <svl/ilstitem.hxx>
 #include <svl/int64item.hxx>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/lok.hxx>
 #include <svtools/unitconv.hxx>
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 1e75e30a486e..c0807cb72851 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -43,6 +43,7 @@
 #include <svx/flagsdef.hxx>
 #include <vector>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <limits>
 #include <memory>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index aa2618c51f06..41f7ae0296bd 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -24,6 +24,7 @@
 #include <o3tl/untaint.hxx>
 #include <tools/debug.hxx>
 #include <tools/mapunit.hxx>
+#include <tools/stream.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <editeng/numitem.hxx>
 #include <svl/eitem.hxx>
@@ -72,6 +73,7 @@
 #include <sal/log.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <svx/SvxNumOptionsTabPageHelper.hxx>
 #include <tools/urlobj.hxx>
 #include <o3tl/temporary.hxx>
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx 
b/dbaccess/source/filter/xml/xmlfilter.cxx
index 9dc52f514558..d3e6a8ea2407 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
 #include "xmlfilter.hxx"
+#include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <xmloff/xmlnamespace.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx 
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 72207ae0c117..853a17776023 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -22,6 +22,7 @@
 #include "ConnectionHelper.hxx"
 #include <IItemSetHelper.hxx>
 #include <strings.hrc>
+#include <comphelper/documentconstants.hxx>
 #include <svl/itemset.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9c54b4d43aa9..e5edb459933c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -152,6 +152,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
+#include <sfx2/signaturestate.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/msgpool.hxx>
@@ -174,6 +175,7 @@
 #include <tools/debug.hxx>
 #include <tools/fract.hxx>
 #include <tools/json_writer.hxx>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/ctrltool.hxx>
 #include <svtools/langtab.hxx>
diff --git a/extensions/source/abpilot/datasourcehandling.cxx 
b/extensions/source/abpilot/datasourcehandling.cxx
index a1124dca2172..46c0f3410bff 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
diff --git a/filter/source/msfilter/mstoolbar.cxx 
b/filter/source/msfilter/mstoolbar.cxx
index 624bc457ade4..b5628c3b53d3 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -16,6 +16,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
diff --git a/filter/source/msfilter/msvbahelper.cxx 
b/filter/source/msfilter/msvbahelper.cxx
index d3699dc427ff..28556b2ca116 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/urlobj.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 9f5e7d1cf69a..5d637b5f74c0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -34,6 +34,7 @@
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
 #include <com/sun/star/office/XAnnotationAccess.hpp>
 #include <com/sun/star/text/XText.hpp>
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 9f44685e9714..936cb978a731 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -31,6 +31,7 @@
 #include <vcl/weld/weld.hxx>
 #include <sfx2/passwd.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <sfx2/AccessibilityIssue.hxx>
 #include <sfx2/objsh.hxx>
 #include <svl/stritem.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/forms/source/component/clickableimage.cxx 
b/forms/source/component/clickableimage.cxx
index 0c264f453c14..634b57c27094 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -27,13 +27,16 @@
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/awt/ActionEvent.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/graphic/GraphicObject.hpp>
 #include <com/sun/star/util/VetoException.hpp>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx 
b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 3cd8bf2a83b2..e335af69a64d 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "parametrizedattributedispatcher.hxx"
+#include <comphelper/sequenceashashmap.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/editview.hxx>
 #include <svl/itemset.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 375b75757b1f..09b555b0623d 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -540,55 +540,22 @@ excludelist:
     include/sfx2/dinfdlg.hxx:
     # Needed for implicit dtor
     - com/sun/star/document/CmisProperty.hpp
+    - com/sun/star/beans/PropertyValue.hpp
     include/sfx2/docstoragemodifylistener.hxx:
     # base class has to be a complete type
     - com/sun/star/util/XModifyListener.hpp
     include/sfx2/DocumentMetadataAccess.hxx:
     # base class has to be a complete type
     - com/sun/star/rdf/XDocumentMetadataAccess.hpp
-    include/sfx2/sfxbasecontroller.hxx:
-    # base class has to be a complete type
-    - com/sun/star/frame/XController2.hpp
-    - com/sun/star/frame/XControllerBorder.hpp
-    - com/sun/star/frame/XDispatchProvider.hpp
-    - com/sun/star/task/XStatusIndicatorSupplier.hpp
-    - com/sun/star/ui/XContextMenuInterception.hpp
-    - com/sun/star/awt/XUserInputInterception.hpp
-    - com/sun/star/frame/XDispatchInformationProvider.hpp
-    - com/sun/star/frame/XTitle.hpp
-    - com/sun/star/frame/XTitleChangeBroadcaster.hpp
-    - com/sun/star/lang/XInitialization.hpp
-    include/sfx2/sfxbasemodel.hxx:
-    # base class has to be a complete type
-    - com/sun/star/container/XChild.hpp
-    - com/sun/star/document/XDocumentPropertiesSupplier.hpp
-    - com/sun/star/document/XCmisDocument.hpp
-    - com/sun/star/rdf/XDocumentMetadataAccess.hpp
-    - com/sun/star/document/XUndoManagerSupplier.hpp
-    - com/sun/star/document/XDocumentEventBroadcaster.hpp
-    - com/sun/star/lang/XEventListener.hpp
-    - com/sun/star/document/XEventsSupplier.hpp
-    - com/sun/star/document/XEmbeddedScripts.hpp
-    - com/sun/star/document/XScriptInvocationContext.hpp
-    - com/sun/star/util/XModifiable2.hpp
-    - com/sun/star/view/XPrintable.hpp
-    - com/sun/star/view/XPrintJobBroadcaster.hpp
-    - com/sun/star/frame/XStorable2.hpp
-    - com/sun/star/frame/XLoadable.hpp
-    - com/sun/star/script/XStarBasicAccess.hpp
-    - com/sun/star/document/XViewDataSupplier.hpp
-    - com/sun/star/util/XCloseable.hpp
-    - com/sun/star/datatransfer/XTransferable.hpp
-    - com/sun/star/document/XDocumentSubStorageSupplier.hpp
-    - com/sun/star/document/XStorageBasedDocument.hpp
-    - com/sun/star/script/provider/XScriptProviderSupplier.hpp
-    - com/sun/star/ui/XUIConfigurationManagerSupplier.hpp
-    - com/sun/star/embed/XVisualObject.hpp
-    - com/sun/star/lang/XUnoTunnel.hpp
-    - com/sun/star/frame/XModule.hpp
-    - com/sun/star/frame/XTitle.hpp
-    - com/sun/star/frame/XTitleChangeBroadcaster.hpp
-    - com/sun/star/frame/XUntitledNumbers.hpp
+    include/sfx2/mieclip.hxx:
+    # complete type is needed for constructor
+    - tools/stream.hxx
+    include/sfx2/Metadatable.hxx:
+    # base class has to be a complete type
+    - com/sun/star/rdf/XMetadatable.hpp
+    include/sfx2/msg.hxx:
+    # used in #define macro
+    - sfx2/groupid.hxx
     include/sfx2/sfxsids.hrc:
     # Needed for sfxitems.sdi to build
     - svl/memberid.h
@@ -606,23 +573,9 @@ excludelist:
     # base class has to be a complete type
     - com/sun/star/frame/XStatusListener.hpp
     - com/sun/star/lang/XComponent.hpp
-    include/sfx2/sidebar/SidebarController.hxx:
-    # base class has to be a complete type
-    - com/sun/star/ui/XContextChangeEventListener.hpp
-    - com/sun/star/beans/XPropertyChangeListener.hpp
-    - com/sun/star/ui/XSidebar.hpp
-    - com/sun/star/frame/XStatusListener.hpp
-    - com/sun/star/frame/XFrameActionListener.hpp
-    include/sfx2/sidebar/SidebarPanelBase.hxx:
-    # base class has to be a complete type
-    - com/sun/star/ui/XContextChangeEventListener.hpp
-    - com/sun/star/ui/XUIElement.hpp
-    - com/sun/star/ui/XToolPanel.hpp
-    - com/sun/star/ui/XSidebarPanel.hpp
-    - com/sun/star/ui/XUpdateModel.hpp
-    include/sfx2/sidebar/Theme.hxx:
-    # base class has to be a complete type
-    - com/sun/star/beans/XPropertySet.hpp
+    include/sfx2/strings.hrc:
+    # Needed for TranslateId macro
+    - unotools/resmgr.hxx
     include/sfx2/viewsh.hxx:
     # Needed for macro 
     - class SfxViewFactory
diff --git a/include/sfx2/AccessibilityIssue.hxx 
b/include/sfx2/AccessibilityIssue.hxx
index c6db4ab63d6e..bd19db3dbba7 100644
--- a/include/sfx2/AccessibilityIssue.hxx
+++ b/include/sfx2/AccessibilityIssue.hxx
@@ -12,12 +12,16 @@
 
 #include <sfx2/dllapi.h>
 
-#include <vcl/weld/weld.hxx>
 #include <rtl/ustring.hxx>
 
 #include <vector>
 #include <memory>
 
+namespace weld
+{
+class Window;
+}
+
 namespace sfx
 {
 enum class AccessibilityIssueID
diff --git a/include/sfx2/AdditionsDialogHelper.hxx 
b/include/sfx2/AdditionsDialogHelper.hxx
index 91a9c53acea6..91c9f4603eb1 100644
--- a/include/sfx2/AdditionsDialogHelper.hxx
+++ b/include/sfx2/AdditionsDialogHelper.hxx
@@ -10,7 +10,12 @@
 #pragma once
 
 #include <sfx2/dllapi.h>
-#include <vcl/weld/weld.hxx>
+#include <rtl/ustring.hxx>
+
+namespace weld
+{
+class Window;
+}
 
 class SFX2_DLLPUBLIC AdditionsDialogHelper
 {
diff --git a/include/sfx2/LokControlHandler.hxx 
b/include/sfx2/LokControlHandler.hxx
index 08a49f6f20d9..e2bd0047250e 100644
--- a/include/sfx2/LokControlHandler.hxx
+++ b/include/sfx2/LokControlHandler.hxx
@@ -17,14 +17,21 @@
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/awt/XWindowPeer.hpp>
-#include <com/sun/star/awt/XGraphics.hpp>
 #include <com/sun/star/awt/XView.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/UnitConversion.hxx>
 
 #include <optional>
 
+namespace com::sun::star::awt
+{
+class XGraphics;
+}
+namespace com::sun::star::awt
+{
+class XWindowPeer;
+}
+
 class LokControlHandler
 {
 public:
diff --git a/include/sfx2/StyleManager.hxx b/include/sfx2/StyleManager.hxx
index 1c19b981d64c..a5eaba5417f9 100644
--- a/include/sfx2/StyleManager.hxx
+++ b/include/sfx2/StyleManager.hxx
@@ -12,13 +12,15 @@
 
 #include <sfx2/dllapi.h>
 
-#include <svl/style.hxx>
 #include <tools/long.hxx>
 
 #include <memory>
+#include <string_view>
 
 class OutputDevice;
 class SfxObjectShell;
+class SfxStyleSheetBase;
+enum class SfxStyleFamily;
 namespace sfx2 { class StylePreviewRenderer; }
 
 namespace sfx2
diff --git a/include/sfx2/StylePreviewRenderer.hxx 
b/include/sfx2/StylePreviewRenderer.hxx
index 33ed26c793e7..09ca31c89ab6 100644
--- a/include/sfx2/StylePreviewRenderer.hxx
+++ b/include/sfx2/StylePreviewRenderer.hxx
@@ -11,10 +11,15 @@
 #define INCLUDED_SFX2_STYLEPREVIEWRENDERER_HXX
 
 #include <sfx2/dllapi.h>
-#include <sfx2/objsh.hxx>
+#include <tools/long.hxx>
 
+#include <string_view>
+
+class Color;
 class OutputDevice;
+class SfxObjectShell;
 class SfxStyleSheetBase;
+namespace tools { class Rectangle; }
 
 namespace sfx2
 {
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 2a1d17e48347..3c7fdddfe5c8 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -25,19 +25,19 @@
 #include <sal/types.h>
 #include <comphelper/errcode.hxx>
 #include <svl/poolitem.hxx>
-#include <vcl/bitmap.hxx>
 #include <tools/link.hxx>
-#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
 #include <unordered_map>
 
 #include <sfx2/shell.hxx>
 
 namespace com::sun::star::frame { class XFrame; }
 namespace com::sun::star::script { class XStorageBasedLibraryContainer; }
+namespace com::sun::star::ui { class XAcceleratorConfiguration; }
 
 namespace weld { class Window; }
 
 class BasicManager;
+class Bitmap;
 class DdeService;
 class SfxAppData_Impl;
 class SfxDispatcher;
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index 05d868bd2259..a4e90d4b2dc2 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -22,8 +22,9 @@
 #include <memory>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
+#include <tools/link.hxx>
 #include <vcl/weld/DialogController.hxx>
-#include <vcl/weld/weld.hxx>
+//#include <vcl/weld/weld.hxx>
 
 class SfxTabPage;
 class SfxBindings;
@@ -31,6 +32,9 @@ class SfxChildWindow;
 struct SfxChildWinInfo;
 class SfxItemSet;
 class WhichRangesContainer;
+namespace vcl { class ILibreOfficeKitNotifier; }
+namespace weld { class Button; }
+namespace weld { class Window; }
 
 class SFX2_DLLPUBLIC SfxDialogController : public weld::GenericDialogController
 {
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 4266cbea8fa4..068401359ffe 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -30,16 +30,17 @@
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
 #include <tools/link.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <svl/poolitem.hxx>
 #include <svl/SfxBroadcaster.hxx>
-#include <sfx2/shell.hxx>
+#include <svl/typedwhich.hxx>
+
+#include <boost/property_tree/ptree_fwd.hpp>
 
 namespace com::sun::star::frame { class XDispatch; }
 namespace com::sun::star::frame { class XDispatchProvider; }
 namespace com::sun::star::frame { class XDispatchRecorder; }
 namespace com::sun::star::frame { class XFrame; }
 namespace com::sun::star::util { struct URL; }
+namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
 
 class SfxSlot;
 class SfxSlotServer;
@@ -53,6 +54,10 @@ class SfxWorkWindow;
 struct SfxFoundCache_Impl;
 class SfxFoundCacheArr_Impl;
 class SfxPoolItemHolder;
+class SfxPoolItem;
+class SfxRequest;
+class SfxShell;
+enum class SfxItemState;
 
 enum class SfxCallMode : sal_uInt16
 {
diff --git a/include/sfx2/brokenpackageint.hxx 
b/include/sfx2/brokenpackageint.hxx
index 37c98540a6bc..95b693209c3f 100644
--- a/include/sfx2/brokenpackageint.hxx
+++ b/include/sfx2/brokenpackageint.hxx
@@ -22,14 +22,17 @@
 
 #include <sal/config.h>
 #include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
 
-#include <com/sun/star/uno/Reference.hxx>
-
 namespace com::sun::star::task
 {
 class XInteractionRequest;
 }
+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
 
 class RequestPackageReparation_Impl;
 class SFX2_DLLPUBLIC RequestPackageReparation
diff --git a/include/sfx2/charmapcontainer.hxx 
b/include/sfx2/charmapcontainer.hxx
index bf9cb187dd1b..cfc40e2455b2 100644
--- a/include/sfx2/charmapcontainer.hxx
+++ b/include/sfx2/charmapcontainer.hxx
@@ -21,12 +21,19 @@
 
 #include <sfx2/dllapi.h>
 #include <vcl/vclenum.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/weld/Builder.hxx>
 #include <vcl/weld/IconView.hxx>
-#include <vcl/weld/weld.hxx>
 #include <deque>
 
+class VirtualDevice;
+namespace weld
+{
+class Builder;
+}
+namespace weld
+{
+class Widget;
+}
+
 struct CharAndFont
 {
     OUString sChar;
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index def7c5478a12..2aa5d36510ee 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -27,17 +27,18 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <vcl/window.hxx>
 
-#include <sfx2/chalign.hxx>
-#include <sfx2/basedlgs.hxx>
 #include <comphelper/lok.hxx>
 
 namespace com::sun::star::frame { class XFrame; }
 
+class SfxDialogController;
 class SfxWorkWindow;
 class SfxModule;
 class SfxChildWindow;
 class SfxBindings;
 
+enum class SfxChildAlignment;
+
 enum class SfxChildWindowFlags
 {
     NONE            = 0x000,
diff --git a/include/sfx2/classificationhelper.hxx 
b/include/sfx2/classificationhelper.hxx
index 5a4fa6b1eeab..87b4c2c8e0e5 100644
--- a/include/sfx2/classificationhelper.hxx
+++ b/include/sfx2/classificationhelper.hxx
@@ -17,7 +17,8 @@
 #include <o3tl/string_view.hxx>
 #include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
-#include <sfx2/infobar.hxx>
+
+enum class InfobarType;
 
 namespace com::sun::star::beans
 {
@@ -27,6 +28,10 @@ namespace com::sun::star::document
 {
 class XDocumentProperties;
 }
+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
 
 class SfxViewFrame;
 
diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index 0bf711eb0f38..f0e56768981c 100644
--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.hxx
@@ -20,12 +20,16 @@
 #define INCLUDED_SFX2_CTRLITEM_HXX
 
 #include <sal/config.h>
+#include <boost/property_tree/ptree_fwd.hpp>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <svl/poolitem.hxx>
 #include <tools/debug.hxx>
 
+
 class SfxBindings;
+class SfxPoolItem;
+enum class MapUnit : sal_uInt8;
+enum class SfxItemState;
 
 class SFX2_DLLPUBLIC SfxControllerItem
 {
diff --git a/include/sfx2/devtools/DocumentModelTreeHandler.hxx 
b/include/sfx2/devtools/DocumentModelTreeHandler.hxx
index d5ae86c54cf6..d92fd08226f5 100644
--- a/include/sfx2/devtools/DocumentModelTreeHandler.hxx
+++ b/include/sfx2/devtools/DocumentModelTreeHandler.hxx
@@ -10,12 +10,20 @@
 
 #pragma once
 
-#include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
+#include <tools/link.hxx>
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
+namespace weld
+{
+class TreeIter;
+}
+namespace weld
+{
+class TreeView;
+}
+
 /** Document model tree handler
  *
  * Handles the DOM tree part of DevTools, which includes interaction with
diff --git a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx 
b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
index 9f8f1eb9cc94..d7ac02c49cc2 100644
--- a/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
+++ b/include/sfx2/devtools/ObjectInspectorTreeHandler.hxx
@@ -10,20 +10,35 @@
 
 #pragma once
 
-#include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
-#include <vcl/commandevent.hxx>
 #include <comphelper/string.hxx>
+#include <tools/link.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-#include <sfx2/devtools/ObjectInspectorWidgets.hxx>
 
 #include <memory>
 #include <deque>
 
+class CommandEvent;
+struct ObjectInspectorWidgets;
+
+namespace com::sun::star::uno
+{
+class XComponentContext;
+}
+namespace com::sun::star::uno
+{
+class XInterface;
+}
+
+namespace weld
+{
+class TreeIter;
+}
+namespace weld
+{
+class TreeView;
+}
+
 /** Object inspector tree handler
  *
  * Handles the object inspector part of DevTools - mainly interaction
diff --git a/include/sfx2/devtools/ObjectInspectorWidgets.hxx 
b/include/sfx2/devtools/ObjectInspectorWidgets.hxx
index f18fe3bbd83a..4d077d27322d 100644
--- a/include/sfx2/devtools/ObjectInspectorWidgets.hxx
+++ b/include/sfx2/devtools/ObjectInspectorWidgets.hxx
@@ -11,13 +11,37 @@
 #pragma once
 
 #include <sfx2/dllapi.h>
-#include <vcl/weld/Builder.hxx>
-#include <vcl/weld/Notebook.hxx>
-#include <vcl/weld/Paned.hxx>
-#include <vcl/weld/TextView.hxx>
-#include <vcl/weld/Toolbar.hxx>
-#include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
+
+#include <memory>
+
+namespace weld
+{
+class Builder;
+}
+namespace weld
+{
+class Label;
+}
+namespace weld
+{
+class Notebook;
+}
+namespace weld
+{
+class Paned;
+}
+namespace weld
+{
+class TextView;
+}
+namespace weld
+{
+class Toolbar;
+}
+namespace weld
+{
+class TreeView;
+}
 
 struct SFX2_DLLPUBLIC ObjectInspectorWidgets
 {
diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx
index a853d5d9de5c..dbd632d17431 100644
--- a/include/sfx2/dialoghelper.hxx
+++ b/include/sfx2/dialoghelper.hxx
@@ -12,11 +12,11 @@
 
 #include <sfx2/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <tools/gen.hxx>
 
 class DateTime;
 class LocaleDataWrapper;
 class OutputDevice;
+class Size;
 
 //when two tab pages both have the same basic layout with a preview on the
 //right, get both of their non-preview areas to request the same size so that
diff --git a/include/sfx2/digitalsignatures.hxx 
b/include/sfx2/digitalsignatures.hxx
index 7778f5e1fb89..1189363bc6f4 100644
--- a/include/sfx2/digitalsignatures.hxx
+++ b/include/sfx2/digitalsignatures.hxx
@@ -11,19 +11,38 @@
 
 #include <functional>
 
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/security/XCertificate.hpp>
-#include <com/sun/star/security/CertificateKind.hpp>
-
 #include <sal/types.h>
+#include <rtl/ustring.hxx>
 
 class SfxViewShell;
 namespace svl::crypto
 {
 class SigningContext;
 }
+namespace com::sun::star::embed
+{
+class XStorage;
+}
+namespace com::sun::star::frame
+{
+class XModel;
+}
+namespace com::sun::star::io
+{
+class XStream;
+}
+namespace com::sun::star::security
+{
+class XCertificate;
+}
+namespace com::sun::star::security
+{
+enum class CertificateKind;
+}
+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
 
 namespace sfx2
 {
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 222ce6304bdb..63a81ed283d8 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -38,7 +38,6 @@
 #include <vcl/weld/FormattedSpinButton.hxx>
 #include <vcl/weld/ScrolledWindow.hxx>
 #include <vcl/weld/SpinButton.hxx>
-#include <vcl/weld/TextView.hxx>
 #include <vcl/weld/weldutils.hxx>
 
 #include <sfx2/tabdlg.hxx>
@@ -47,13 +46,12 @@
 #include <memory>
 #include <vcl/abstdlg.hxx>
 
-namespace com::sun::star::beans { struct PropertyValue; }
-
 namespace com::sun::star {
     namespace document {
         class XDocumentProperties;
     }
 }
+namespace weld { class TextView; }
 
 struct CustomProperty;
 
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 3af732228a27..6ac266915933 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -22,11 +22,10 @@
 #include <memory>
 #include <span>
 #include <sal/config.h>
-#include <rtl/ref.hxx>
 #include <sfx2/dllapi.h>
-#include <sfx2/toolbarids.hxx>
 #include <sal/types.h>
 
+#include <rtl/ustring.hxx>
 #include <sfx2/bindings.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
@@ -38,11 +37,16 @@ class SfxRequest;
 class SfxViewFrame;
 class SfxItemSet;
 class SfxModule;
+class SfxShell;
 class Point;
 struct SfxDispatcher_Impl;
 class VCLXPopupMenu;
 class SfxPoolItemHolder;
+enum class ToolbarId : sal_uInt32;
+enum class SfxDisableFlags;
 
+namespace com::sun::star::uno { class Any; }
+namespace rtl { template <class reference_type> class Reference; }
 namespace vcl { class Window; }
 
 enum class SfxDispatcherPopFlags
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 016b29608b13..88b68e9513a9 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -22,17 +22,17 @@
 
 #include <memory>
 #include <sal/config.h>
+#include <comphelper/errcode.hxx>
 #include <sfx2/dllapi.h>
-#include <sfx2/signaturestate.hxx>
 #include <svl/lockfilecommon.hxx>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <svl/itemset.hxx>
 #include <tools/link.hxx>
-#include <tools/stream.hxx>
+#include <tools/ref.hxx>
 
-#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 
+#include <functional>
 #include <mutex>
 
 namespace com::sun::star::beans { struct PropertyValue; }
@@ -46,6 +46,7 @@ namespace com::sun::star::ucb { class XCommandEnvironment; }
 namespace com::sun::star::ucb { class XContent; }
 namespace com::sun::star::util { struct DateTime; }
 namespace com::sun::star::util { struct RevisionTag; }
+namespace com::sun::star::uno { template <typename> class Sequence; }
 namespace com::sun::star::frame
 {
 class XModel;
@@ -59,9 +60,13 @@ class SfxFilter;
 class SfxMedium_Impl;
 class INetURLObject;
 class SfxFrame;
+class SfxItemSet;
 class SfxViewShell;
+class SvStream;
 class DateTime;
 struct ImplSVEvent;
+enum class SignatureState;
+enum class StreamMode;
 
 namespace weld
 {
diff --git a/include/sfx2/docinf.hxx b/include/sfx2/docinf.hxx
index 218f80148973..2ce0a2239c13 100644
--- a/include/sfx2/docinf.hxx
+++ b/include/sfx2/docinf.hxx
@@ -22,9 +22,8 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <comphelper/errcode.hxx>
-
 
+class ErrCode;
 class GDIMetaFile;
 class SotStorage;
 
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index d45b9094c9f7..b1d77e71e481 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -23,13 +23,14 @@
 #include <sal/config.h>
 #include <sal/types.h>
 #include <vcl/dockwin.hxx>
-
-#include <com/sun/star/uno/Reference.hxx>
+#include <vcl/weld/weld.hxx>
 
 #include <sfx2/dllapi.h>
 #include <sfx2/childwin.hxx>
 
 namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
+namespace weld { class Builder; }
 
 class SfxDockingWindow_Impl;
 
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 19ce18250175..672abf9e30ee 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -22,9 +22,7 @@
 
 #include <config_options.h>
 #include <sfx2/dllapi.h>
-#include <sfx2/signaturestate.hxx>
-
-#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
 
 #include <memory>
 
@@ -32,6 +30,8 @@ namespace com::sun::star::document { class XEmbeddedScripts; }
 namespace com::sun::star::embed { class XStorage; }
 namespace com::sun::star::script { class XLibraryContainer; }
 namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
+enum class SignatureState;
 
 
 namespace sfx2
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 0e4fd8977a7d..00456a7afa38 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -32,10 +32,10 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/frame/XController2.hpp>
-#include <com/sun/star/view/PrintableState.hpp>
 #include <utility>
 
 namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::view { enum class PrintableState; }
 
 /**
   these values get stored in streams in a 16-bit value
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index da7d2c52be8e..480c7c0957e6 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -22,7 +22,6 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <sfx2/event.hxx>
 #include <svl/poolitem.hxx>
 #include <memory>
 #include <utility>
@@ -30,6 +29,7 @@
 
 class SfxObjectShell;
 class SvxMacro;
+enum class SvMacroItemId : sal_uInt16;
 
 struct SFX2_DLLPUBLIC SfxEventName
 {
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index 026f0e1c1bf3..6bb386f36dfb 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -25,7 +25,6 @@
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
 #include <comphelper/documentconstants.hxx>
-#include <sot/formats.hxx>
 
 #include <memory>
 
@@ -38,6 +37,7 @@ class ErrCode;
 class SfxFilter;
 class SfxMedium;
 class SfxFilterContainer_Impl;
+enum class SotClipboardFormatId : sal_uInt32;
 
 
 class SFX2_DLLPUBLIC SfxFilterContainer
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 7fe3db860212..d8029d39a9b0 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -22,11 +22,9 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/uno/Sequence.hxx>
 
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <comphelper/documentconstants.hxx>
 #include <tools/link.hxx>
 #include <comphelper/errcode.hxx>
 #include <o3tl/typed_flags_set.hxx>
@@ -44,9 +42,11 @@ namespace com::sun::star::ui::dialogs
 }
 namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::uno { template <typename> class Sequence; }
 namespace com::sun::star::uno { class XComponentContext; }
 namespace weld { class Window; }
 
+enum class SfxFilterFlags;
 enum class SignatureState;
 class Graphic;
 class SfxFilter;
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index 5647748d5487..36377f1f38bc 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.hxx
@@ -16,8 +16,27 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/dllapi.h>
 #include <vcl/InterimItemWindow.hxx>
-#include <vcl/weld/TextView.hxx>
-#include <vcl/weld/Toolbar.hxx>
+
+namespace weld
+{
+class Button;
+}
+namespace weld
+{
+class Image;
+}
+namespace weld
+{
+class Label;
+}
+namespace weld
+{
+class TextView;
+}
+namespace weld
+{
+class Toolbar;
+}
 
 // These must match the values in offapi/com/sun/star/frame/InfobarType.idl
 enum class InfobarType
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index 2e58f5e339bc..54c0c3f03520 100644
--- a/include/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.hxx
@@ -24,9 +24,6 @@
 #include <sal/types.h>
 #include <rtl/ref.hxx>
 
-#include <tools/gen.hxx>
-
-#include <comphelper/errcode.hxx>
 #include <vcl/vclptr.hxx>
 
 namespace com::sun::star::embed { class XEmbeddedObject; }
@@ -37,7 +34,8 @@ class SfxInPlaceClient_Impl;
 class SfxViewShell;
 class SfxObjectShell;
 class Fraction;
-
+class ErrCodeMsg;
+namespace tools { class Rectangle; }
 
 class SFX2_DLLPUBLIC SfxInPlaceClient
 {
diff --git a/include/sfx2/listview.hxx b/include/sfx2/listview.hxx
index 2991d4e92316..20a79d647095 100644
--- a/include/sfx2/listview.hxx
+++ b/include/sfx2/listview.hxx
@@ -10,7 +10,11 @@
 #pragma once
 
 #include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
+
+namespace weld
+{
+class TreeIter;
+}
 
 enum class TemplateViewMode
 {
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 00f48067bbbe..556f1e1745d5 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -23,7 +23,6 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sfx2/linksrc.hxx>
-#include <sot/formats.hxx>
 #include <tools/ref.hxx>
 #include <tools/link.hxx>
 #include <memory>
@@ -34,6 +33,7 @@ namespace com::sun::star::uno
 }
 
 namespace com::sun::star::io { class XInputStream; }
+enum class SotClipboardFormatId : sal_uInt32;
 
 enum class SfxLinkUpdateMode {
     NONE   = 0,
diff --git a/include/sfx2/lokcomponenthelpers.hxx 
b/include/sfx2/lokcomponenthelpers.hxx
index e298d1d9617f..bfafe852562d 100644
--- a/include/sfx2/lokcomponenthelpers.hxx
+++ b/include/sfx2/lokcomponenthelpers.hxx
@@ -10,7 +10,6 @@
 #pragma once
 
 #include <sfx2/dllapi.h>
-#include <tools/gen.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/window.hxx>
 
@@ -19,9 +18,11 @@ namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::frame { class XFrame; }
 namespace com::sun::star::uno { template<class E> class Sequence; }
 
+class Point;
 class SfxInPlaceClient;
 class SfxViewShell;
 class VirtualDevice;
+namespace tools { class Rectangle; }
 
 /// A class for chart editing support via LibreOfficeKit.
 class SFX2_DLLPUBLIC LokChartHelper
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index cc4f143e9ada..f9cbda5f557b 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <config_options.h>
-#include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
 #include <vector>
@@ -32,6 +31,7 @@ namespace com::sun::star::frame { class XModel; }
 namespace com::sun::star::lang { class XMultiServiceFactory; }
 namespace com::sun::star::uno { class XInterface; }
 namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
 
 // class AddressList_Impl ------------------------------------------------
 typedef ::std::vector< OUString > AddressList_Impl;
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 07aa35401935..d748a44950b8 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -24,8 +24,6 @@
 #include <sfx2/shell.hxx>
 #include <sfx2/styfitem.hxx>
 #include <sal/types.h>
-#include <tools/fldunit.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 
 class SfxObjectFactory;
 class SfxModule_Impl;
@@ -34,10 +32,12 @@ struct SfxChildWinFactory;
 struct SfxStbCtrlFactory;
 struct SfxTbxCtrlFactory;
 class SfxTabPage;
+enum class FieldUnit : sal_uInt16;
 
 namespace com::sun::star::frame {
     class XFrame;
 }
+namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
 
 namespace weld {
     class Container;
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index 7aa38904c35d..d29d6cf4f137 100644
--- a/include/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
@@ -23,9 +23,9 @@
 #include <sal/config.h>
 #include <sal/types.h>
 #include <sfx2/dllapi.h>
-#include <sfx2/groupid.hxx>
 #include <vector>
 
+enum class SfxGroupId;
 class SfxInterface;
 class SfxSlot;
 class SfxViewFrame;
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx
index a43f5745d0f9..7d76f1c70931 100644
--- a/include/sfx2/newstyle.hxx
+++ b/include/sfx2/newstyle.hxx
@@ -22,13 +22,27 @@
 #include <comphelper/string.hxx>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <svl/style.hxx>
-#include <vcl/weld/ComboBox.hxx>
 #include <vcl/weld/DialogController.hxx>
 #include <vcl/weld/EntryTreeView.hxx>
-#include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
+
+class SfxStyleSheetBasePool;
+enum class SfxStyleFamily;
+namespace weld
+{
+class ComboBox;
+}
+namespace weld
+{
+class TreeView;
+}
+namespace weld
+{
+class Widget;
+}
+namespace weld
+{
+class MessageDialog;
+}
 
 class SFX2_DLLPUBLIC SfxNewStyleDlg final : public 
weld::GenericDialogController
 {
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx 
b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index b7d2e769ddb2..21a518689d87 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -12,7 +12,7 @@
 
 #include <sfx2/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <vcl/notebookbar/notebookbar.hxx>
+#include <tools/link.hxx>
 #include <vcl/EnumContext.hxx>
 
 #include <string_view>
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 0a1745d66578..d8476e901b6b 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -24,10 +24,10 @@
 #include <sal/types.h>
 #include <sfx2/dllapi.h>
 #include <sfx2/msg.hxx>
-#include <sfx2/toolbarids.hxx>
 
 struct SfxInterface_Impl;
 class  SfxModule;
+enum class ToolbarId : sal_uInt32;
 
 #define SFX_OBJECTBAR_APPLICATION       0
 #define SFX_OBJECTBAR_OBJECT            1
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index be583e556194..a54ad4733765 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -21,20 +21,15 @@
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <sfx2/signaturestate.hxx>
 #include <sal/types.h>
 #include <comphelper/errcode.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/frame/XModel3.hpp>
-#include <vcl/bitmap.hxx>
 
 #include <svl/poolitem.hxx>
-#include <sot/formats.hxx>
 #include <sot/object.hxx>
 #include <tools/gen.hxx>
 #include <tools/link.hxx>
-#include <tools/stream.hxx>
 
 #include <sfx2/shell.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
@@ -44,17 +39,20 @@
 
 #include <o3tl/typed_flags_set.hxx>
 #include <functional>
-#include <sfx2/AccessibilityIssue.hxx>
 #include <sfx2/redlinerecordingmode.hxx>
 
-#include <unotools/ucbstreamhelper.hxx>
-
 namespace weld {class Button; }
 namespace model {class ColorSet; }
+namespace rtl
+{
+template <class reference_type> class Reference;
+}
+
 struct NamedColor;
 class SbxValue;
 class SbxArray;
 class BasicManager;
+class Bitmap;
 class SfxMedium;
 class SfxObjectFactory;
 class SfxDocumentInfoDialog;
@@ -73,12 +71,16 @@ class OutputDevice;
 class Color;
 class Fraction;
 class SvGlobalName;
+class SvStream;
 class InfobarData;
 class VirtualDevice;
 
 enum class SfxModelFlags;
 enum class SfxEventHintId;
 enum class InfobarType;
+enum class SignatureState;
+enum class SotClipboardFormatId : sal_uInt32;
+enum class SvStreamEndian;
 
 // These values presumably must match exactly the corresponding
 // css::embed::Aspects ones (in offapi/com/sun/star/embed/Aspects.idl)
@@ -97,12 +99,14 @@ namespace sfx2
 }
 
 namespace sfx { class IDocumentModelAccessor; }
+namespace sfx { class AccessibilityIssueCollection; }
 
 namespace com::sun::star::awt { class XWindow; }
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::document { struct CmisVersion; }
 namespace com::sun::star::document { class XDocumentProperties; }
 namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::frame { class XModel3; }
 namespace com::sun::star::graphic { class XGraphic; }
 namespace com::sun::star::io { class XStream; }
 namespace com::sun::star::script { class XStorageBasedLibraryContainer ; }
diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx
index 4546fbabc726..7e3a4d42b53d 100644
--- a/include/sfx2/opengrf.hxx
+++ b/include/sfx2/opengrf.hxx
@@ -21,12 +21,12 @@
 #include <memory>
 #include <sfx2/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <comphelper/errcode.hxx>
 
 namespace com::sun::star::ui::dialogs { class XFilePickerControlAccess; }
 namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
 namespace weld { class Window; }
 
+class ErrCode;
 class Graphic;
 struct  SvxOpenGrf_Impl;
 
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 9e6e83e0098c..8d80f2031654 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -24,8 +24,15 @@
 #include <sfx2/tabdlg.hxx>
 #include <sal/types.h>
 #include <vcl/printer/Options.hxx>
-#include <vcl/weld/ComboBox.hxx>
-#include <vcl/weld/SpinButton.hxx>
+
+namespace weld { class CheckButton; }
+namespace weld { class ComboBox; }
+namespace weld { class Container; }
+namespace weld { class DialogController; }
+namespace weld { class RadioButton; }
+namespace weld { class SpinButton; }
+namespace weld { class Toggleable; }
+namespace weld { class Widget; }
 
 class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage final : public SfxTabPage
 {
diff --git a/include/sfx2/sfxbasecontroller.hxx 
b/include/sfx2/sfxbasecontroller.hxx
index 720f61c5b116..b58a4efb1a12 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -39,8 +39,6 @@
 #include <com/sun/star/awt/XUserInputInterception.hpp>
 #include <tools/link.hxx>
 
-#include <sfx2/groupid.hxx>
-
 namespace weld { class Button; }
 
 struct  IMPL_SfxBaseController_DataContainer    ;   // impl. struct to hold 
member of class SfxBaseController
@@ -48,6 +46,7 @@ struct  IMPL_SfxBaseController_DataContainer    ;   // impl. 
struct to hold memb
 class NotifyEvent;
 class SfxViewFrame;
 class SfxViewShell;
+enum class SfxGroupId;
 
 sal_Int16 MapGroupIDToCommandGroup( SfxGroupId nGroupID );
 
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 874367b9a4a2..bc7d7cdf3e0b 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -47,12 +47,10 @@
 #include <com/sun/star/view/XPrintJobBroadcaster.hpp>
 #include <com/sun/star/frame/XStorable2.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
-//#include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <cppuhelper/basemutex.hxx>
@@ -79,6 +77,7 @@ namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::document { struct EventObject; }
 namespace com::sun::star::frame { class XController2; }
 namespace com::sun::star::ui { class XUIConfigurationManager2; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 
 
 
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 350e440ba324..1dedbf084496 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -24,15 +24,14 @@
 
 #include <vcl/abstdlg.hxx>
 
-#include <sot/formats.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <com/sun/star/uno/Reference.h>
 
 class SfxItemSet;
 class SfxItemPool;
 class SvObjectServerList;
 class TransferableDataHelper;
 class SvGlobalName;
+enum class SotClipboardFormatId : sal_uInt32;
 
 namespace sfx2
 {
@@ -44,6 +43,7 @@ namespace com::sun::star::embed { class XEmbeddedObject; }
 namespace com::sun::star::embed { class XStorage; }
 namespace com::sun::star::io { class XInputStream; }
 namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
 
 class SfxAbstractDialog : virtual public VclAbstractDialog
 {
diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx
index dd5e19346509..f5250c2d02bb 100644
--- a/include/sfx2/sfxmodelfactory.hxx
+++ b/include/sfx2/sfxmodelfactory.hxx
@@ -22,12 +22,13 @@
 
 #include <sfx2/dllapi.h>
 
-#include <com/sun/star/uno/Reference.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <functional>
 
 namespace com::sun::star::uno { class XInterface; }
 namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
 
 enum class SfxModelFlags
 {
diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx
index f5cd1aca4cf3..4b96e3effbf0 100644
--- a/include/sfx2/sfxresid.hxx
+++ b/include/sfx2/sfxresid.hxx
@@ -21,7 +21,8 @@
 
 #include <sfx2/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <unotools/resmgr.hxx>
+
+struct TranslateId;
 
 SFX2_DLLPUBLIC OUString SfxResId(TranslateId aId);
 
diff --git a/include/sfx2/sfxstatuslistener.hxx 
b/include/sfx2/sfxstatuslistener.hxx
index 53060aa16a31..fd5aa3e0d9d0 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -22,12 +22,14 @@
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <svl/poolitem.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
+class SfxPoolItem;
+enum class SfxItemState;
+
 namespace com::sun::star::frame { class XDispatch; }
 namespace com::sun::star::frame { class XDispatchProvider; }
 
diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index 5a48ba10169b..5f09eb4be7e2 100644
--- a/include/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
@@ -22,11 +22,10 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 
-#include <comphelper/sequenceashashmap.hxx>
-
 namespace com::sun::star::beans { struct NamedValue; }
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace comphelper { class SequenceAsHashMap; }
 
 class SfxAllItemSet ;
 class SfxItemSet    ;
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 31282603cf01..ee2a86b1f4f0 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -20,8 +20,19 @@
 
 #include <sfx2/sidebar/Panel.hxx>
 #include <vcl/InterimItemWindow.hxx>
-#include <vcl/weld/ScrolledWindow.hxx>
-#include <vcl/weld/weld.hxx>
+
+namespace weld
+{
+class Box;
+}
+namespace weld
+{
+class ScrolledWindow;
+}
+namespace weld
+{
+class Widget;
+}
 
 namespace sfx2::sidebar
 {
diff --git a/include/sfx2/sidebar/FocusManager.hxx 
b/include/sfx2/sidebar/FocusManager.hxx
index 6eaa877b4dca..5569c9c36387 100644
--- a/include/sfx2/sidebar/FocusManager.hxx
+++ b/include/sfx2/sidebar/FocusManager.hxx
@@ -20,7 +20,10 @@
 
 #include <sfx2/sidebar/Panel.hxx>
 #include <tools/link.hxx>
-#include <vcl/keycod.hxx>
+
+class KeyEvent;
+
+namespace vcl { class KeyCode; }
 
 namespace weld {
 class Widget;
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx 
b/include/sfx2/sidebar/ILayoutableWindow.hxx
index d5124a898362..f15b2e6ba836 100644
--- a/include/sfx2/sidebar/ILayoutableWindow.hxx
+++ b/include/sfx2/sidebar/ILayoutableWindow.hxx
@@ -20,7 +20,11 @@
 
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/ui/LayoutSize.hpp>
+
+namespace com::sun::star::ui
+{
+struct LayoutSize;
+}
 
 namespace sfx2::sidebar
 {
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index be2e09f20b86..3f7d7b475659 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -19,9 +19,10 @@
 #pragma once
 
 #include <sfx2/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <tools/link.hxx>
 #include <vcl/vclptr.hxx>
-#include <vcl/weld/Builder.hxx>
-#include <vcl/weld/weld.hxx>
+
 #include <vector>
 
 namespace com::sun::star::frame
@@ -40,6 +41,30 @@ namespace com::sun::star::awt
 {
 class XWindow;
 }
+namespace tools
+{
+class JsonWriter;
+}
+namespace tools
+{
+class Rectangle;
+}
+namespace weld
+{
+class Box;
+}
+namespace weld
+{
+class Builder;
+}
+namespace weld
+{
+class Widget;
+}
+namespace weld
+{
+class Window;
+}
 
 namespace sfx2::sidebar
 {
diff --git a/include/sfx2/sidebar/PanelLayout.hxx 
b/include/sfx2/sidebar/PanelLayout.hxx
index a79e803c966d..24878a36c449 100644
--- a/include/sfx2/sidebar/PanelLayout.hxx
+++ b/include/sfx2/sidebar/PanelLayout.hxx
@@ -10,13 +10,13 @@
 #pragma once
 
 #include <sfx2/dllapi.h>
-#include <vcl/weld/Builder.hxx>
 #include <vcl/weld/weld.hxx>
 
 class DataChangedEvent;
 class VclSimpleEvent;
 namespace sfx2 { namespace sidebar { class Panel; } }
 namespace tools { class JsonWriter; }
+namespace weld { class Builder; }
 
 /// This class is the base for the Widget Layout-based sidebar panels.
 class SFX2_DLLPUBLIC PanelLayout
diff --git a/include/sfx2/sidebar/ResourceManager.hxx 
b/include/sfx2/sidebar/ResourceManager.hxx
index d1566eb8ae55..eaa727c843cb 100644
--- a/include/sfx2/sidebar/ResourceManager.hxx
+++ b/include/sfx2/sidebar/ResourceManager.hxx
@@ -18,17 +18,21 @@
  */
 #pragma once
 
-#include <unotools/confignode.hxx>
 #include <map>
+#include <memory>
 #include <vector>
 #include <set>
 
 #include <sfx2/dllapi.h>
+#include <rtl/ustring.hxx>
 
 namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { template <class interface_type> class 
Reference; }
 namespace sfx2::sidebar { class DeckDescriptor; }
 namespace sfx2::sidebar { class PanelDescriptor; }
+namespace utl { class OConfigurationNode; }
+namespace utl { class OConfigurationTreeRoot; }
 
 namespace sfx2::sidebar {
 
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index 93212a8ed557..ad143d08f6a0 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -20,13 +20,13 @@
 #pragma once
 
 #include <sfx2/dllapi.h>
-#include <sfx2/viewfrm.hxx>
 
 #include <string_view>
 
 namespace com::sun::star::frame { class XFrame; }
 namespace com::sun::star::uno { template <typename > class Reference; }
 
+class SfxViewFrame;
 
 namespace sfx2::sidebar {
 
diff --git a/include/sfx2/sidebar/SidebarController.hxx 
b/include/sfx2/sidebar/SidebarController.hxx
index 63fc4435848f..a37eac854d24 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -23,13 +23,10 @@
 
 #include <sfx2/sidebar/AsynchronousCall.hxx>
 #include <sfx2/sidebar/Context.hxx>
-#include <sfx2/sidebar/Deck.hxx>
 #include <sfx2/sidebar/FocusManager.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/TabBar.hxx>
-#include <sfx2/viewfrm.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XFrameActionListener.hpp>
@@ -40,8 +37,10 @@
 #include <comphelper/compbase.hxx>
 
 namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::beans { class XPropertySet; }
 namespace com::sun::star::frame { class XDispatch; }
 namespace com::sun::star::ui { class XUIElement; }
+namespace sfx2::sidebar { class Deck; }
 
 typedef comphelper::WeakComponentImplHelper <
     css::ui::XContextChangeEventListener,
@@ -53,6 +52,7 @@ typedef comphelper::WeakComponentImplHelper <
 
 class SfxSplitWindow;
 class SfxViewShell;
+class SfxViewFrame;
 
 namespace sfx2::sidebar {
 
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 7b8d4e83a73a..166478ccbc05 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -22,14 +22,16 @@
 
 #include <vcl/InterimItemWindow.hxx>
 #include <vcl/weld/Builder.hxx>
-#include <vcl/weld/MenuButton.hxx>
-#include <vcl/weld/Toolbar.hxx>
 
 #include <com/sun/star/graphic/XGraphic.hpp>
 
 #include <functional>
 
 namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::graphic { class XGraphic; }
+
+namespace weld { class MenuButton; }
+namespace weld { class Toolbar; }
 
 namespace sfx2::sidebar {
 
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index a3f827f4a5d1..e59b2e8b454f 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -20,7 +20,6 @@
 
 #include <sfx2/dllapi.h>
 
-#include <tools/color.hxx>
 #include <comphelper/compbase.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -28,6 +27,7 @@
 #include <map>
 #include <unordered_map>
 
+class Color;
 
 namespace sfx2::sidebar {
 
diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx
index 858f733bea6a..a4e67d53f711 100644
--- a/include/sfx2/signaturestate.hxx
+++ b/include/sfx2/signaturestate.hxx
@@ -23,7 +23,14 @@
 #include <config_options.h>
 #include <sfx2/dllapi.h>
 
-#include <com/sun/star/security/DocumentSignatureInformation.hpp>
+namespace com::sun::star::security
+{
+struct DocumentSignatureInformation;
+}
+namespace com::sun::star::uno
+{
+template <class E> class Sequence;
+}
 
 enum class SignatureState
 {
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index b2a9fc1009d3..f5c4464e7ec2 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.hxx
@@ -21,13 +21,14 @@
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <svl/poolitem.hxx>
 #include <svtools/statusbarcontroller.hxx>
 #include <vcl/vclptr.hxx>
 
 class SfxModule;
 class SfxStatusBarControl;
 class StatusBar;
+class SfxPoolItem;
+enum class SfxItemState;
 
 rtl::Reference<svt::StatusbarController> SfxStatusBarControllerFactory(
     const css::uno::Reference< css::frame::XFrame >& rFrame,
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index b892ce42478e..88d64a425f77 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SFX2_INC_STRINGS_HRC
 #define INCLUDED_SFX2_INC_STRINGS_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, u8##String)
 
 #define STR_TEMPLATE_FILTER                     NC_("STR_TEMPLATE_FILTER", 
"Templates")
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index d53f9fcdc02c..e6ecf89fe8d0 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.hxx
@@ -22,11 +22,13 @@
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <svl/style.hxx>
-#include <unotools/resmgr.hxx>
 #include <utility>
 #include <vector>
 
+enum class SfxStyleFamily;
+enum class SfxStyleSearchBits;
+struct TranslateId;
+
 struct SFX2_DLLPUBLIC SfxFilterTuple
 {
     OUString aName;
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 93ca85b046b9..9866b5d85164 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -27,14 +27,13 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/basedlgs.hxx>
 #include <sal/types.h>
-#include <vcl/bitmap.hxx>
 #include <vcl/builderpage.hxx>
-#include <vcl/weld/Notebook.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/setitem.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
+class Bitmap;
 class SfxTabPage;
 
 typedef std::unique_ptr<SfxTabPage> (*CreateTabPage)(weld::Container* pPage, 
weld::DialogController* pController, const SfxItemSet *rAttrSet);
@@ -43,6 +42,8 @@ struct TabPageImpl;
 
 struct TabDlg_Impl;
 
+namespace weld { class Notebook; }
+
 namespace com::sun::star::frame { class XFrame; }
 
 #define RET_USER        100
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index d513c0807b21..b73241e8d86c 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -23,18 +23,19 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <svl/poolitem.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #include <rtl/ref.hxx>
-#include <vcl/vclptr.hxx>
 
 namespace com::sun::star::frame { class XDispatchProvider; }
 namespace com::sun::star::frame { class XFrame; }
 namespace vcl { class Window; }
+template <class reference_type> class VclPtr;
 
 class InterimItemWindow;
 class SfxToolBoxControl;
 class SfxModule;
+class SfxPoolItem;
+enum class SfxItemState;
 
 rtl::Reference<svt::ToolboxController> SfxToolBoxControllerFactory( const 
css::uno::Reference< css::frame::XFrame >& rFrame, ToolBox* pToolbox, 
ToolBoxItemId nID, const OUString& aCommandURL );
 
diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx
index f53ccc8cbf1b..57fd56371c05 100644
--- a/include/sfx2/templatedlg.hxx
+++ b/include/sfx2/templatedlg.hxx
@@ -18,11 +18,7 @@
 
 #include <vcl/idle.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/weld/ComboBox.hxx>
 #include <vcl/weld/DialogController.hxx>
-#include <vcl/weld/Entry.hxx>
-#include <vcl/weld/MenuButton.hxx>
-#include <vcl/weld/TreeView.hxx>
 #include <vcl/weld/weld.hxx>
 
 #include <sfx2/templatedlglocalview.hxx>
@@ -37,6 +33,22 @@ class XDesktop2;
 class XModel;
 }
 }
+namespace weld
+{
+class ComboBox;
+}
+namespace weld
+{
+class Entry;
+}
+namespace weld
+{
+class TreeView;
+}
+namespace weld
+{
+class MenuButton;
+}
 
 class SFX2_DLLPUBLIC SfxTemplateManagerDlg : public 
weld::GenericDialogController
 {
diff --git a/include/sfx2/templatelocalview.hxx 
b/include/sfx2/templatelocalview.hxx
index e03470a48959..38214dc2d0b8 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX
 
 #include <sfx2/thumbnailview.hxx>
-#include <sfx2/templateproperties.hxx>
 #include <functional>
 #include <memory>
 #include <set>
@@ -33,6 +32,7 @@
 class SfxDocumentTemplates;
 class TemplateContainerItem;
 class TemplateViewItem;
+struct TemplateItemProperties;
 
 namespace weld { class Menu; }
 
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 700a5a8187fd..cbda3d844f51 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -25,10 +25,13 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/sidebar/PanelLayout.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
-#include <vcl/weld/Builder.hxx>
 
 class SfxBindings;
 class SfxTemplateDialog_Impl;
+namespace weld
+{
+class Builder;
+}
 
 class UNLESS_MERGELIBS(SFX2_DLLPUBLIC) SfxTemplatePanelControl final
     : public PanelLayout,
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index e75303e41d38..fe4196f44519 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -17,11 +17,11 @@
 #include <vector>
 
 #include <tools/color.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/weld/ScrolledWindow.hxx>
 #include <vcl/weld/customweld.hxx>
 
 class Bitmap;
+class StyleSettings;
 class ThumbnailViewItem;
 typedef ::std::vector< ThumbnailViewItem* > ThumbnailValueItemList;
 class ThumbnailViewAcc;
diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx
index 3206f929197c..1ba6f7589641 100644
--- a/include/sfx2/tplpitem.hxx
+++ b/include/sfx2/tplpitem.hxx
@@ -23,7 +23,9 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <svl/flagitem.hxx>
-#include <svl/style.hxx>
+//#include <svl/style.hxx>
+
+enum class SfxStyleSearchBits;
 
 class SFX2_DLLPUBLIC SfxTemplateItem final : public SfxFlagItem
 {
diff --git a/include/sfx2/uiobject.hxx b/include/sfx2/uiobject.hxx
index bcd18289b21e..211a58965980 100644
--- a/include/sfx2/uiobject.hxx
+++ b/include/sfx2/uiobject.hxx
@@ -8,7 +8,8 @@
  */
 
 #include <vcl/uitest/uiobject.hxx>
-#include <sfx2/templatedlg.hxx>
+
+class TemplateDlgLocalView;
 
 class TemplateDlgLocalViewUIObject : public DrawingAreaUIObject
 {
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 7ef97412e8d6..0eea007c14ad 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -28,7 +28,6 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/shell.hxx>
 #include <svl/poolitem.hxx>
-#include <vcl/svapp.hxx>
 
 namespace weld {
     class Button;
@@ -45,6 +44,8 @@ class SfxChildWindow;
 class SfxInfoBarWindow;
 enum class InfobarType;
 class CommandPopupHandler;
+struct ImplSVHelpData;
+struct ImplSVWinData;
 
 class SFX2_DLLPUBLIC SfxViewFrame final : public SfxShell, public SfxListener
 {
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index e3ff20a7bfce..be1dfa7f6f3c 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -24,7 +24,6 @@
 #include <optional>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/uno/Reference.h>
 #include <svl/lstner.hxx>
 #include <sfx2/shell.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/include/sfx2/weldutils.hxx b/include/sfx2/weldutils.hxx
index 0d1b52d533ab..ceba59375a37 100644
--- a/include/sfx2/weldutils.hxx
+++ b/include/sfx2/weldutils.hxx
@@ -10,18 +10,24 @@
 #ifndef INCLUDED_SFX2_WELDUTILS_HXX
 #define INCLUDED_SFX2_WELDUTILS_HXX
 
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XToolbarController.hpp>
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <tools/link.hxx>
 #include <sfx2/dllapi.h>
 #include <svtools/miscopt.hxx>
-#include <vcl/vclenum.hxx>
-#include <vcl/weld/weld.hxx>
 
 #include <map>
 
+namespace com::sun::star::frame
+{
+class XFrame;
+}
+namespace vcl
+{
+enum class ImageType;
+}
+
 namespace weld
 {
 class Builder;
diff --git a/include/svx/ClassificationCommon.hxx 
b/include/svx/ClassificationCommon.hxx
index 71be4b85c91b..e9dd9154afb9 100644
--- a/include/svx/ClassificationCommon.hxx
+++ b/include/svx/ClassificationCommon.hxx
@@ -15,6 +15,7 @@
 #include <svx/svxdllapi.h>
 #include <vector>
 #include <sfx2/classificationhelper.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 
 namespace com::sun::star::beans
 {
diff --git a/include/svx/ClassificationDialog.hxx 
b/include/svx/ClassificationDialog.hxx
index 7b9239839598..9c210aa408a7 100644
--- a/include/svx/ClassificationDialog.hxx
+++ b/include/svx/ClassificationDialog.hxx
@@ -30,6 +30,8 @@ namespace weld
 class CustomWeld;
 }
 
+struct ImplSVEvent;
+
 namespace svx
 {
 class SVX_DLLPUBLIC ClassificationDialog final : public 
weld::GenericDialogController
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 240cc7a97c88..c936ef277bad 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -27,6 +27,7 @@
 namespace svx {
     class ToolboxButtonLineStyleUpdater;
 }
+enum class MapUnit : sal_uInt8;
 
 typedef std::function<bool(const OUString&, const css::uno::Any&)> 
LineStyleSelectFunction;
 typedef std::function<void(bool)> LineStyleIsNoneFunction;
diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index e22b18096e27..1b1cdf89b53d 100644
--- a/include/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
@@ -22,6 +22,7 @@
 #include <memory>
 #include <sfx2/stbitem.hxx>
 #include <svx/svxdllapi.h>
+#include <tools/long.hxx>
 
 struct SvxPosSizeStatusBarControl_Impl;
 
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index 700bcbd3dad0..151920ead3aa 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -26,6 +26,8 @@
 #include <vcl/weld/customweld.hxx>
 #include <com/sun/star/text/WrapTextMode.hpp>
 
+#include <optional>
+
 class SVX_DLLPUBLIC SwFrameExample final : public weld::CustomWidgetController
 {
     Color       m_aBgCol;           ///< background
diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index ba300e26116a..265f20de0259 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -22,6 +22,7 @@
 
 #include <sfx2/stbitem.hxx>
 #include <svx/svxdllapi.h>
+#include <tools/long.hxx>
 #include <memory>
 
 class SVX_DLLPUBLIC SvxZoomSliderControl final : public SfxStatusBarControl
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx 
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 79319b9e65b8..faf05a88674c 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -46,6 +46,7 @@
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <tools/stream.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
 #include <xmloff/XMLTextMasterStylesContext.hxx>
diff --git a/sc/qa/unit/helper/scfiltertestbase.cxx 
b/sc/qa/unit/helper/scfiltertestbase.cxx
index 270ed973e5f6..8f29d6ec533e 100644
--- a/sc/qa/unit/helper/scfiltertestbase.cxx
+++ b/sc/qa/unit/helper/scfiltertestbase.cxx
@@ -13,6 +13,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svl/intitem.hxx>
+#include <tools/stream.hxx>
 
 #include <com/sun/star/document/MacroExecMode.hpp>
 
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 4b23db8b5ba3..4fc8876768ba 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -73,6 +73,7 @@
 #include <svl/numformat.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <svl/zforlist.hxx>
+#include <tools/stream.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 3159380fca4b..c3b0181a76aa 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -30,6 +30,7 @@
 
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
diff --git a/sc/source/filter/ftools/fapihelper.cxx 
b/sc/source/filter/ftools/fapihelper.cxx
index 7cba3adbd6b4..c8ffb3fff209 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/sc/source/filter/html/htmlexp.cxx 
b/sc/source/filter/html/htmlexp.cxx
index 771a47de1a3b..6287447c0e97 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -46,6 +46,7 @@
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/parhtml.hxx>
+#include <tools/stream.hxx>
 #include <vcl/outdev.hxx>
 #include <stdio.h>
 #include <osl/diagnose.h>
diff --git a/sc/source/filter/xml/xmlimprt.cxx 
b/sc/source/filter/xml/xmlimprt.cxx
index c9bf323bf681..f8355b1f4f86 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -29,6 +29,7 @@
 #include <xmloff/xmlmetai.hxx>
 #include <sfx2/objsh.hxx>
 #include <tools/mapunit.hxx>
+#include <tools/stream.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/tempfile.hxx>
 #include <xmloff/xmlscripti.hxx>
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index b8c2287e68a8..b0c7deb6f3d2 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -24,6 +24,7 @@
 #include <editeng/eeitem.hxx>
 
 #include <sfx2/app.hxx>
+#include <sfx2/chalign.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editstat.hxx>
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index d9d11e1a07e6..4456f5da8d3a 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -28,6 +28,7 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
+#include <sfx2/toolbarids.hxx>
 
 #include <IAnyRefDialog.hxx>
 
diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx
index 4c470793f9ac..6c48d5c41511 100644
--- a/sc/source/ui/dbgui/asciiopt.cxx
+++ b/sc/source/ui/dbgui/asciiopt.cxx
@@ -23,6 +23,7 @@
 #include <osl/thread.h>
 #include <o3tl/string_view.hxx>
 #include <sfx2/objsh.hxx>
+#include <tools/stream.hxx>
 
 constexpr std::u16string_view pStrFix = u"FIX";
 constexpr std::u16string_view pStrMrg = u"MRG";
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx 
b/sc/source/ui/docshell/externalrefmgr.cxx
index c467ac123dab..7ae2d9c43b2a 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -52,6 +52,7 @@
 #include <svl/sharedstringpool.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <tools/hostfilter.hxx>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/configuration.hxx>
diff --git a/sc/source/ui/docshell/tablink.cxx 
b/sc/source/ui/docshell/tablink.cxx
index 51373b055ecc..9dcfb270452a 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -32,6 +32,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <utility>
 #include <vcl/weld/weld.hxx>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <comphelper/configuration.hxx>
diff --git a/sc/source/ui/drawfunc/chartsh.cxx 
b/sc/source/ui/drawfunc/chartsh.cxx
index 96f72e115cbe..5eccb41d442a 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -22,6 +22,7 @@
 #include <svx/graphichelper.hxx>
 
 #include <sfx2/objface.hxx>
+#include <sfx2/toolbarids.hxx>
 #include <vcl/EnumContext.hxx>
 
 #include <chartsh.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 2d1d5fd21c32..b5e2163ae59a 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -24,7 +24,9 @@
 #include <svx/fontwork.hxx>
 #include <svx/svdpage.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/event.hxx>
 #include <sfx2/objface.hxx>
+#include <sfx2/toolbarids.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx 
b/sc/source/ui/drawfunc/drtxtob.cxx
index 558e1a3f462f..eaf9ef2adb5b 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -53,6 +53,7 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/toolbarids.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svtools/cliplistener.hxx>
 #include <vcl/transfer.hxx>
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 3d9c83db8c65..d8921bdc4d90 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -44,6 +44,7 @@
 #include <scmod.hxx>
 #include <sal/log.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weldutils.hxx>
 
diff --git a/sc/source/ui/drawfunc/graphsh.cxx 
b/sc/source/ui/drawfunc/graphsh.cxx
index 71420be473b7..d112544c0822 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -20,6 +20,7 @@
 #include <sfx2/objface.hxx>
 #include <vcl/EnumContext.hxx>
 #include <sfx2/opengrf.hxx>
+#include <sfx2/toolbarids.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/grfflt.hxx>
 #include <svx/grafctrl.hxx>
diff --git a/sc/source/ui/drawfunc/mediash.cxx 
b/sc/source/ui/drawfunc/mediash.cxx
index 438f7a2c9bdb..152222fc1fd3 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sfx2/objface.hxx>
+#include <sfx2/toolbarids.hxx>
 #include <vcl/EnumContext.hxx>
 #include <svx/MediaShellHelpers.hxx>
 
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx 
b/sc/source/ui/drawfunc/oleobjsh.cxx
index afc0a61d655c..fa37020815c3 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sfx2/objface.hxx>
+#include <sfx2/toolbarids.hxx>
 
 #include <oleobjsh.hxx>
 #include <vcl/EnumContext.hxx>
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index ef09e293f58a..462efaa1704b 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -37,6 +37,7 @@ class ScTabViewShell;
 class ScViewData;
 class ScNavigatorControllerItem;
 class ScNavigatorSettings;
+namespace weld { class ComboBox; }
 
 #define SC_DROPMODE_URL         0
 #define SC_DROPMODE_LINK        1
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 1119b689cfa4..37a71cc1dd05 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -26,6 +26,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx 
b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index d07f6029df9b..2904f4cf47b6 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -30,6 +30,7 @@
 #include <svtools/unitconv.hxx>
 #include <tools/fldunit.hxx>
 #include <tools/mapunit.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 using namespace css;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx 
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 04b62e2d52ed..31af5be8e75a 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -29,6 +29,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include "CellLineStyleControl.hxx"
 #include "CellBorderStyleControl.hxx"
diff --git a/sc/source/ui/sidebar/DatabasePropertyPanel.cxx 
b/sc/source/ui/sidebar/DatabasePropertyPanel.cxx
index 9c8dbb90aad1..a9cf92f7c109 100644
--- a/sc/source/ui/sidebar/DatabasePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/DatabasePropertyPanel.cxx
@@ -19,6 +19,7 @@
 #include <svl/itemset.hxx>
 #include <svx/rotmodit.hxx>
 #include <svtools/unitconv.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <dbdata.hxx>
 
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx 
b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index c62ddfd4b0df..9144e86b7931 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -26,6 +26,7 @@
 #include <svl/itemset.hxx>
 #include <svx/numfmtsh.hxx>
 #include <o3tl/string_view.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 using namespace css;
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 7162d5985ecc..841c328592b3 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 6236ac62faab..89a2d9aaff1d 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -26,6 +26,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <comphelper/sequenceashashmap.hxx>
+#include <tools/stream.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 776a512eaca6..915060d397df 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/toolbarids.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/EnumContext.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index a7f21b68b548..a0faf82a88c8 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -27,6 +27,7 @@
 #include <sfx2/namedcolor.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/toolbarids.hxx>
 #include <svl/whiter.hxx>
 
 #include <svl/stritem.hxx>
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index f633c5ebb364..1af4c22399bc 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -29,6 +29,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/toolbarids.hxx>
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <vcl/commandevent.hxx>
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index d7f42c1353c5..a92b42040f66 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -20,6 +20,7 @@
 #include <svx/imapdlg.hxx>
 #include <svx/srchdlg.hxx>
 #include <sfx2/objface.hxx>
+#include <sfx2/toolbarids.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/infobar.hxx>
 #include <sfx2/sidebar/SidebarChildWindow.hxx>
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 086155215c72..6a9d2946338c 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -25,6 +25,7 @@
 #include <svl/stritem.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/objface.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index a3cd308bbc90..e5ae4360050a 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/embed/EmbedMisc.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <vcl/errinf.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <sfx2/app.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
diff --git a/scripting/source/protocolhandler/scripthandler.cxx 
b/scripting/source/protocolhandler/scripthandler.cxx
index 5e87f1623e7d..becf01a89ca6 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/frame/DispatchResultState.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index b70fbb7cfacd..52df0ca4c476 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -14,6 +14,7 @@
 
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
+#include <tools/stream.hxx>
 
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
diff --git a/sd/qa/unit/import-tests2.cxx b/sd/qa/unit/import-tests2.cxx
index fd52c8e3e721..a75ea5e84f28 100644
--- a/sd/qa/unit/import-tests2.cxx
+++ b/sd/qa/unit/import-tests2.cxx
@@ -55,6 +55,7 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/text/XTextColumns.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/graphicmimetype.hxx>
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 01fe4d913308..772507eb04b9 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/form/XReset.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx 
b/sd/source/filter/cgm/sdcgmfilter.cxx
index 1a4ba2019177..959a339b7392 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -30,6 +30,8 @@
 #include <drawdoc.hxx>
 #include <sdcgmfilter.hxx>
 
+#include <com/sun/star/frame/XModel3.hpp>
+
 #include <DrawDocShell.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 2ba6c5c6f4d6..43f7b6247c3c 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <comphelper/sequence.hxx>
+#include <sot/formats.hxx>
 #include <tools/zcodec.hxx>
 #include <unotools/securityoptions.hxx>
 #include <filter/msfilter/classids.hxx>
diff --git a/sd/source/filter/grf/sdgrffilter.cxx 
b/sd/source/filter/grf/sdgrffilter.cxx
index a3945c60d10c..68251d1e5a20 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -34,6 +34,7 @@
 #include <DrawDocShell.hxx>
 
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequenceashashmap.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
 #include <vcl/gfxlink.hxx>
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 24991dfe2295..218d9018447e 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -20,6 +20,7 @@
 #include "htmlex.hxx"
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 
 #include <sal/log.hxx>
 #include <rtl/tencinfo.h>
@@ -47,6 +48,7 @@
 #include <svx/svdoutl.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdotable.hxx>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <svtools/sfxecode.hxx>
 #include <tools/debug.hxx>
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 44244f0a6b7b..5a5ef2a1f50b 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -84,6 +84,7 @@
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <comphelper/string.hxx>
 #include <oox/ole/olehelper.hxx>
 
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index ec95da771ced..08c79c0822f2 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -27,6 +27,8 @@
 #include <sfx2/sfxsids.hrc>
 #include <svl/itemset.hxx>
 
+#include <com/sun/star/frame/XModel3.hpp>
+
 #include <DrawDocShell.hxx>
 
 #include <pres.hxx>
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index dfae3e8065a8..a218aed8a984 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <filter/msfilter/msoleexp.hxx>
+#include <svl/itemset.hxx>
 #include <svx/svxerr.hxx>
 #include <unotools/streamwrap.hxx>
 #include <sot/storage.hxx>
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx 
b/sd/source/filter/xml/sdxmlwrp.cxx
index 9131299b1e2a..3672dce210cf 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -56,6 +56,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index fc7f13945e4c..88996e6d3930 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/ui/LayoutSize.hpp>
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 #include <com/sun/star/presentation/EffectCommands.hpp>
 #include <com/sun/star/animations/AnimationTransformType.hpp>
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index e7e96a52002a..cb42a66e7a33 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/drawing/XDrawView.hpp>
+#include <com/sun/star/ui/LayoutSize.hpp>
 #include <SlideTransitionPane.hxx>
 
 #include <TransitionPreset.hxx>
@@ -40,6 +41,7 @@
 #include <utility>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/weld.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sd/source/ui/annotations/annotationmanager.cxx 
b/sd/source/ui/annotations/annotationmanager.cxx
index f31c7daf3736..8790f54673e4 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -19,6 +19,7 @@
 
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 #include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
diff --git a/sd/source/ui/app/scalectrl.cxx b/sd/source/ui/app/scalectrl.cxx
index 208bacb89ad1..d96409adb78f 100644
--- a/sd/source/ui/app/scalectrl.cxx
+++ b/sd/source/ui/app/scalectrl.cxx
@@ -21,6 +21,7 @@
 
 #include <vcl/commandevent.hxx>
 #include <vcl/status.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/weldutils.hxx>
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 58f68114abbd..231871c859d2 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -19,6 +19,7 @@
 
 #include <vcl/commandevent.hxx>
 #include <vcl/status.hxx>
+#include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/weldutils.hxx>
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx 
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index ef3bd75daed8..d5af9c6b6e78 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -42,6 +42,7 @@
 #include <svl/stritem.hxx>
 #include <sal/log.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <svx/SvxNumOptionsTabPageHelper.hxx>
 #include <View.hxx>
diff --git a/sd/source/ui/dlg/PaneChildWindows.cxx 
b/sd/source/ui/dlg/PaneChildWindows.cxx
index 5bbfa4eb2c4d..33b0a2f40ef4 100644
--- a/sd/source/ui/dlg/PaneChildWindows.cxx
+++ b/sd/source/ui/dlg/PaneChildWindows.cxx
@@ -26,6 +26,7 @@
 #include <sdresid.hxx>
 
 #include <sfx2/bindings.hxx>
+#include <sfx2/chalign.hxx>
 #include <sfx2/dispatch.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 50d745a1ae93..c91f67b137d8 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -22,6 +22,7 @@
 
 #include <osl/diagnose.h>
 #include <osl/file.hxx>
+#include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svl/stritem.hxx>
@@ -51,6 +52,8 @@
 #include <vcl/jsdialog/executor.hxx>
 
 #include <vcl/commandevent.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <comphelper/lok.hxx>
 
 #include <sdpage.hxx>
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index b3dd7c05230e..24306cde460f 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -32,6 +32,7 @@
 #include <sfx2/strings.hrc>
 #include <o3tl/safeint.hxx>
 #include <tools/debug.hxx>
+#include <tools/stream.hxx>
 #include <sfx2/app.hxx>
 #include <svx/svdograf.hxx>
 #include <svl/stritem.hxx>
diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index a2032899864b..ae00224932e8 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -47,6 +47,7 @@
 #include <sot/formats.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/syswin.hxx>
+#include <vcl/svapp.hxx>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <tools/debug.hxx>
diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx
index cbaf6b6196e3..8b86e53fec0f 100644
--- a/sd/source/ui/func/fulink.cxx
+++ b/sd/source/ui/func/fulink.cxx
@@ -32,6 +32,7 @@
 #include <svtools/svtresid.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <officecfg/Office/Common.hxx>
+#include <vcl/svapp.hxx>
 
 class SfxRequest;
 
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index b30250c87bb7..3f0ac6143f56 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XModel3.hpp>
 
 #include <futempl.hxx>
 
diff --git a/sd/source/ui/inc/BreakDlg.hxx b/sd/source/ui/inc/BreakDlg.hxx
index cad8bb4ad898..c0b62b62df9c 100644
--- a/sd/source/ui/inc/BreakDlg.hxx
+++ b/sd/source/ui/inc/BreakDlg.hxx
@@ -23,6 +23,7 @@
 #include <sfx2/progress.hxx>
 #include <svx/svdetc.hxx>
 #include <vcl/idle.hxx>
-e 
... etc. - the rest is truncated

Reply via email to