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 <gabor.kelemen@collabora.com> Tested-by: Jenkins
2026-02-23 12:19:48 +01:00
parent aac70c14c9
commit a9e9175ba6
438 changed files with 884 additions and 205 deletions
@@ -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>
@@ -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"
@@ -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>
@@ -24,6 +24,7 @@
 #include <ChartController.hxx>
 #include <ChartModel.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/Builder.hxx>
 #include <sal/log.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>
@@ -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"
@@ -50,6 +50,7 @@

 #include <chart2/AbstractPivotTableDataProvider.hxx>

+#include <tools/stream.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/tempfile.hxx>
@@ -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::
@@ -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>
@@ -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>
@@ -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>
@@ -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>

@@ -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>

@@ -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;
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -18,6 +18,7 @@
 */

 #include "parametrizedattributedispatcher.hxx"
+#include <comphelper/sequenceashashmap.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/editview.hxx>
 #include <svl/itemset.hxx>
@@ -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:
+    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/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
+    - 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
@@ -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
@@ -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
 {
@@ -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:
@@ -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
@@ -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
 {
@@ -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;
@@ -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
 {
@@ -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
 {
@@ -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
@@ -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;
@@ -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,
@@ -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;

@@ -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
 {
@@ -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
@@ -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
@@ -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
 {
@@ -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
@@ -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
 {
@@ -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;

@@ -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
@@ -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
 {
@@ -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;

@@ -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;

@@ -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
@@ -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
@@ -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
 {
@@ -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
@@ -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;
@@ -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
@@ -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
 {
@@ -10,7 +10,11 @@
 #pragma once

 #include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
+
+namespace weld
+{
+class TreeIter;
+}

 enum class TemplateViewMode
 {
@@ -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,
@@ -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
@@ -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;
@@ -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;
@@ -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;
@@ -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
 {
@@ -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>
@@ -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
@@ -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 ; }
@@ -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;

@@ -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
 {
@@ -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 );

@@ -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; }



@@ -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
 {
@@ -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
 {
@@ -21,7 +21,8 @@

 #include <sfx2/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <unotools/resmgr.hxx>
+
+struct TranslateId;

 SFX2_DLLPUBLIC OUString SfxResId(TranslateId aId);

@@ -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; }

@@ -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    ;
@@ -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
 {
@@ -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;
@@ -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
 {
@@ -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
 {
@@ -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
@@ -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 {

@@ -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 {

@@ -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 {

@@ -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 {

@@ -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 {

@@ -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
 {
@@ -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,
@@ -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")
@@ -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;
@@ -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
@@ -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 );

@@ -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
 {
@@ -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; }

@@ -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,
@@ -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;
--- a/Show More
+++ b/Show More