tdf#42949 Fix IWYU warnings in include/sfx2/[sS]*

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

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

basctl/source/basicide/unomodel.cxx

@@ -22,6 +22,8 @@
 #include <iderdll.hxx>
 #include <com/sun/star/io/IOException.hpp>
 #include <comphelper/sequence.hxx>
+#include <cppuhelper/queryinterface.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/svapp.hxx>
 

basctl/source/basicide/unomodel.hxx

@@ -19,6 +19,7 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_UNOMODEL_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_UNOMODEL_HXX
 
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <sfx2/sfxbasemodel.hxx>
 

cui/source/dialogs/hlmarkwn.cxx

@@ -31,6 +31,7 @@
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

dbaccess/source/ui/misc/linkeddocuments.cxx

@@ -25,6 +25,7 @@
 #include <stringconstants.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/namedvaluecollection.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/util/URL.hpp>

filter/source/msfilter/svdfppt.cxx

@@ -118,6 +118,7 @@
 #include <com/sun/star/table/XMergeableCellRange.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/table/BorderLineStyle.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <vcl/virdev.hxx>
 #include <svtools/embedhlp.hxx>
 #include <o3tl/enumrange.hxx>

include/IwyuFilter_include.yaml

@@ -698,3 +698,66 @@ blacklist:
     include/sfx2/mieclip.hxx:
     # Needed for implicit dtor
     - tools/stream.hxx
+    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/XDocumentRecovery.hpp
+    - com/sun/star/document/XUndoManagerSupplier.hpp
+    - com/sun/star/document/XEventBroadcaster.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/frame/XModel2.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/sfxsids.hrc:
+    # Needed for sfxitems.sdi to build
+    - svl/memberid.h
+    # Needed for TypedWhichId defines
+    - svl/typedwhich.hxx
+    - class SvxZoomItem
+    - class SfxUInt16Item
+    - class SvxHyperlinkItem
+    - class SfxDocumentInfoItem
+    - class SvxSearchItem
+    include/sfx2/shell.hxx:
+    # Used in macro define
+    - class SfxModule
+    include/sfx2/sfxstatuslistener.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XStatusListener.hpp
+    - com/sun/star/lang/XComponent.hpp

include/sfx2/StyleManager.hxx

@@ -12,14 +12,14 @@
 
 #include <sfx2/dllapi.h>
 
-#include <vcl/outdev.hxx>
-
-#include <sfx2/StylePreviewRenderer.hxx>
 #include <svl/style.hxx>
 
-#include <sfx2/objsh.hxx>
 #include <memory>
 
+class OutputDevice;
+class SfxObjectShell;
+namespace sfx2 { class StylePreviewRenderer; }
+
 namespace sfx2
 {
 

include/sfx2/StylePreviewRenderer.hxx

@@ -11,10 +11,11 @@
 #define INCLUDED_SFX2_STYLEPREVIEWRENDERER_HXX
 
 #include <sfx2/dllapi.h>
-#include <vcl/outdev.hxx>
-#include <svl/style.hxx>
 #include <sfx2/objsh.hxx>
 
+class OutputDevice;
+class SfxStyleSheetBase;
+
 namespace sfx2
 {
 

include/sfx2/dispatch.hxx

@@ -39,6 +39,8 @@ class SfxModule;
 class Point;
 struct SfxDispatcher_Impl;
 
+namespace vcl { class Window; }
+
 enum class SfxDispatcherPopFlags
 {
     NONE          = 0,

include/sfx2/docfac.hxx

@@ -31,6 +31,8 @@ class SfxFilter;
 class SfxViewFactory;
 struct SfxObjectFactory_Impl;
 class SfxFilterContainer;
+class SvGlobalName;
+class SfxModule;
 
 typedef void (*SfxVoidFunc)();
 

include/sfx2/objsh.hxx

@@ -62,6 +62,7 @@ class Button;
 class OutputDevice;
 class Color;
 class Fraction;
+class SvGlobalName;
 
 enum class SfxModelFlags;
 enum class SfxEventHintId;
@@ -81,6 +82,7 @@ namespace sfx2
     class StyleManager;
 }
 
+namespace vcl { class Window; }
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::document { struct CmisVersion; }
 namespace com::sun::star::embed { class XStorage; }

include/sfx2/sfxbasecontroller.hxx

@@ -24,39 +24,38 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/DispatchDescriptor.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/frame/XControllerBorder.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
 #include <com/sun/star/ui/XContextMenuInterception.hpp>
-#include <com/sun/star/ui/XContextMenuInterceptor.hpp>
-#include <com/sun/star/awt/XMouseClickHandler.hpp>
-#include <com/sun/star/awt/XKeyHandler.hpp>
 #include <com/sun/star/awt/XUserInputInterception.hpp>
 #include <tools/link.hxx>
-#include <vcl/button.hxx>
 
-#include <com/sun/star/ui/XSidebarProvider.hpp>
-
-#include <sfx2/viewsh.hxx>
-#include <sfx2/sfxuno.hxx>
 #include <sfx2/groupid.hxx>
 
+namespace com::sun::star::awt { class XKeyHandler; }
+namespace com::sun::star::awt { class XMouseClickHandler; }
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::frame { struct DispatchDescriptor; }
+namespace com::sun::star::ui { class XContextMenuInterceptor; }
+namespace com::sun::star::ui { class XSidebarProvider; }
+namespace com::sun::star::util { struct URL; }
+
 struct  IMPL_SfxBaseController_DataContainer    ;   // impl. struct to hold member of class SfxBaseController
 
+class Button;
+class NotifyEvent;
 class SfxViewFrame;
+class SfxViewShell;
 
 sal_Int16 MapGroupIDToCommandGroup( SfxGroupId nGroupID );
 

include/sfx2/sfxbasemodel.hxx

@@ -23,65 +23,44 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/frame/XModule.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/document/XCmisDocument.hpp>
-#include <com/sun/star/document/CmisVersion.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentRecovery.hpp>
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
-#include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
-#include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/NotInitializedException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
-#include <com/sun/star/frame/DoubleInitializationException.hpp>
 #include <com/sun/star/util/XModifiable2.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/util/XCloseBroadcaster.hpp>
-#include <com/sun/star/util/XCloseListener.hpp>
-#include <com/sun/star/util/CloseVetoException.hpp>
 #include <com/sun/star/view/XPrintable.hpp>
 #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/beans/PropertyValue.hpp>
-#include <com/sun/star/document/CmisProperty.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/XUIConfigurationManager2.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/weak.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/script/XStarBasicAccess.hpp>
-#include <vcl/svapp.hxx>
 
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 
@@ -89,10 +68,7 @@
 
 class ErrCode;
 class SfxMedium;
-class   SfxPrinter;
-class   SfxViewShell;
 class   SfxObjectShell                      ;
-class   SfxEventHint;
 class   SfxViewFrame;
 struct  IMPL_SfxBaseModel_DataContainer     ;   // impl. struct to hold member of class SfxBaseModel
 
@@ -100,6 +76,19 @@ namespace sfx { namespace intern {
     class ViewCreationGuard;
 } }
 
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::container { class XNameContainer; }
+namespace com::sun::star::container { class XNameReplace; }
+namespace com::sun::star::document { class XEventListener; }
+namespace com::sun::star::document { struct CmisProperty; }
+namespace com::sun::star::document { struct CmisVersion; }
+namespace com::sun::star::document { struct EventObject; }
+namespace com::sun::star::frame { class XController2; }
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::ui { class XUIConfigurationManager2; }
+namespace com::sun::star::util { class XCloseListener; }
+namespace com::sun::star::util { class XModifyListener; }
+
 //  class declarations
 
 

include/sfx2/sfxdlg.hxx

@@ -23,37 +23,28 @@
 #include <sfx2/dllapi.h>
 
 #include <vcl/abstdlg.hxx>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 
-#include <sot/exchange.hxx>
-#include <sfx2/lnkbase.hxx>
+#include <sot/formats.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-class SfxTabPage;
-class SfxViewFrame;
-class SfxBindings;
 class SfxItemSet;
 namespace vcl { class Window; }
-namespace rtl {
-   class OUString;
-};
 class SfxItemPool;
 class SvObjectServerList;
 class TransferableDataHelper;
-struct TransferableObjectDescriptor;
+class SvGlobalName;
 
 namespace sfx2
 {
     class LinkManager;
+    class SvBaseLink;
 }
 
-namespace com { namespace sun { namespace star { namespace frame {
-    class XModel;
-} } } }
+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; }
 
 class SfxAbstractDialog : virtual public VclAbstractDialog
 {
@@ -119,7 +110,7 @@ public:
     virtual void                SetRunLabel() = 0;
 };
 
-namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } }
+namespace com::sun::star::frame { class XFrame; }
 
 class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialogFactory
 {

include/sfx2/sfxhelp.hxx

@@ -24,9 +24,6 @@
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
 #include <vcl/help.hxx>
-#include <memory>
-
-class SfxFrame;
 
 class SFX2_DLLPUBLIC SfxHelp : public Help
 {

include/sfx2/sfxhtml.hxx

@@ -31,7 +31,6 @@
 
 class ImageMap;
 class SfxMedium;
-class SfxObjectShell;
 class SvNumberFormatter;
 
 class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser

include/sfx2/sfxmodelfactory.hxx

@@ -22,10 +22,14 @@
 
 #include <sfx2/dllapi.h>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::lang { class XSingleServiceFactory; }
+namespace com::sun::star::uno { class XInterface; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+
 enum class SfxModelFlags
 {
     NONE                       = 0x00,

include/sfx2/sfxresid.hxx

@@ -21,7 +21,6 @@
 
 #include <sfx2/dllapi.h>
 #include <rtl/ustring.hxx>
-#include <locale>
 
 SFX2_DLLPUBLIC OUString SfxResId(const char* pId);
 

include/sfx2/sfxstatuslistener.hxx

@@ -23,15 +23,15 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <svl/poolitem.hxx>
-#include <cppuhelper/weak.hxx>
-#include <osl/conditn.hxx>
-#include <com/sun/star/frame/FeatureStateEvent.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 
 #include <cppuhelper/implbase.hxx>
 
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::frame { class XDispatchProvider; }
+namespace com::sun::star::frame { struct FeatureStateEvent; }
+
 class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
                           css::frame::XStatusListener,
                           css::lang::XComponent>

include/sfx2/sfxuno.hxx

@@ -22,21 +22,10 @@
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <rtl/ustring.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; }
 
 class SfxAllItemSet ;
 class SfxItemSet    ;

include/sfx2/shell.hxx

@@ -20,41 +20,32 @@
 #define INCLUDED_SFX2_SHELL_HXX
 
 #include <memory>
-#include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include <sal/types.h>
 #include <svl/typedwhich.hxx>
 #include <sfx2/dllapi.h>
-#include <sfx2/sfxuno.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/strong_int.hxx>
 
-namespace vcl { class Window; }
-class ToolBox;
+namespace com::sun::star::embed { struct VerbDescriptor; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+
 class SfxItemPool;
 class SfxPoolItem;
 class SfxRequest;
 class SfxItemSet;
-struct SfxFormalArgument;
-class StatusBar;
 class SfxInterface;
 class SfxViewShell;
 class SfxObjectShell;
-class SfxSlotPool;
-class SvGlobalName;
 
-class SfxShellObject;
 class SfxShell;
 struct SfxShell_Impl;
-class SfxShellObject;
 class SfxDispatcher;
 class SfxViewFrame;
 class SfxSlot;
 class SfxRepeatTarget;
-class SbxVariable;
-class SbxBase;
 class SfxBindings;
 class SfxModule;
 class SfxUndoManager;

include/sfx2/stbitem.hxx

@@ -28,7 +28,6 @@
 
 class SfxModule;
 class SfxStatusBarControl;
-class SfxBindings;
 
 svt::StatusbarController* SfxStatusBarControllerFactory(
     const css::uno::Reference< css::frame::XFrame >& rFrame,

include/sfx2/styfitem.hxx

@@ -22,7 +22,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
 #include <svl/style.hxx>
 #include <vector>

sc/inc/funcuno.hxx

@@ -24,6 +24,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sheet/XFunctionAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 #include "document.hxx"

sc/source/core/tool/addincol.cxx

@@ -27,6 +27,7 @@
 #include <osl/diagnose.h>
 
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
@@ -35,6 +36,7 @@
 #include <com/sun/star/beans/theIntrospection.hpp>
 #include <com/sun/star/beans/MethodConcept.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/sheet/XCompatibilityNames.hpp>

sc/source/filter/excel/xeroot.cxx

@@ -46,6 +46,7 @@
 
 #include <formulabase.hxx>
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 using namespace ::com::sun::star;
 

sc/source/filter/ftools/fapihelper.cxx

@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <com/sun/star/lang/XServiceName.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XPropertySetOption.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>

sc/source/filter/xml/xmlexprt.cxx

@@ -115,6 +115,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdocapt.hxx>
 #include <svtools/miscopt.hxx>
+#include <vcl/svapp.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>

sc/source/ui/Accessibility/AccessibleEditObject.cxx

@@ -40,6 +40,7 @@
 #include <svx/svdmodel.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/objsh.hxx>
+#include <cppuhelper/queryinterface.hxx>
 
 #include <unonames.hxx>
 #include <document.hxx>

sc/source/ui/unoobj/appluno.cxx

@@ -40,6 +40,7 @@
 #include <unonames.hxx>
 #include <funcdesc.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/sheet/FunctionArgument.hpp>
 #include <memory>
 

sc/source/ui/unoobj/exceldetect.cxx

@@ -12,6 +12,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <svl/itemset.hxx>

sc/source/ui/unoobj/funcuno.cxx

@@ -23,6 +23,7 @@
 #include <svl/sharedstringpool.hxx>
 #include <unotools/charclass.hxx>
 #include <osl/diagnose.h>
+#include <vcl/svapp.hxx>
 
 #include <scitems.hxx>
 #include <funcuno.hxx>

sc/source/ui/unoobj/optuno.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <svl/itemprop.hxx>
+#include <vcl/svapp.hxx>
 
 #include <com/sun/star/util/Date.hpp>
 

scripting/source/vbaevents/eventhelper.cxx

@@ -69,6 +69,7 @@
 
 #include <com/sun/star/script/XScriptListener.hpp>
 #include <cppuhelper/implbase.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <comphelper/evtmethodhelper.hxx>
 
 #include <list>

sd/IwyuFilter_sd.yaml

@@ -176,6 +176,7 @@ blacklist:
     - com/sun/star/drawing/XDrawView.hpp
     - com/sun/star/drawing/framework/XControllerManager.hpp
     - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
     - com/sun/star/view/XFormLayerAccess.hpp
     - com/sun/star/view/XSelectionSupplier.hpp
     - sfx2/sfxbasecontroller.hxx

sd/source/filter/grf/sdgrffilter.cxx

@@ -24,6 +24,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
+#include <sfx2/sfxuno.hxx>
 #include <svx/svdograf.hxx>
 
 #include <strings.hrc>

sd/source/filter/xml/sdxmlwrp.cxx

@@ -49,6 +49,7 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>

sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx

@@ -29,6 +29,7 @@
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <sfx2/objsh.hxx>
 
+#include <cppuhelper/queryinterface.hxx>
 #include <svx/svdobj.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <Window.hxx>

sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx

@@ -27,6 +27,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sal/log.hxx>
 

sd/source/ui/app/sdxfer.cxx

@@ -58,6 +58,7 @@
 #include <sdxfer.hxx>
 #include <unomodel.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;

sd/source/ui/framework/configuration/Configuration.cxx

@@ -24,6 +24,7 @@
 #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
 #include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp>
 #include <comphelper/sequence.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <facreg.hxx>
 #include <sal/log.hxx>
 

sd/source/ui/framework/configuration/ResourceId.cxx

@@ -24,6 +24,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <comphelper/processfactory.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <rtl/ref.hxx>
 
 #include <facreg.hxx>

sd/source/ui/inc/DrawController.hxx

@@ -27,9 +27,11 @@
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <tools/weakbase.h>
+#include <tools/gen.hxx>
 #include <memory>
 #include <vector>
 

sd/source/ui/sidebar/MasterPageContainer.cxx

@@ -42,6 +42,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/util/XCloseable.hpp>
+#include <com/sun/star/util/CloseVetoException.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/app.hxx>
 #include <svx/svdpage.hxx>

sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx

@@ -36,6 +36,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <unotools/confignode.hxx>

sd/source/ui/unoidl/DrawController.cxx

@@ -34,6 +34,7 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <cppuhelper/typeprovider.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/framework/ConfigurationController.hpp>

sd/source/ui/unoidl/facreg.cxx

@@ -19,6 +19,7 @@
 
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <facreg.hxx>
 #include <sddll.hxx>

sfx2/source/appl/appopen.cxx

@@ -19,6 +19,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
@@ -39,6 +40,7 @@
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ustring.hxx>
 
 #include <comphelper/processfactory.hxx>

sfx2/source/appl/appserv.cxx

@@ -128,6 +128,7 @@
 #include <sfx2/notebookbar/SfxNotebookBar.hxx>
 #include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/safemode.hxx>
+#include <sfx2/sfxuno.hxx>
 
 #include <comphelper/types.hxx>
 #include <officecfg/Office/Common.hxx>

sfx2/source/appl/appuno.cxx

@@ -75,7 +75,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::io;

sfx2/source/appl/childwin.cxx

@@ -24,6 +24,7 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <comphelper/string.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <sal/log.hxx>

sfx2/source/appl/fileobj.cxx

@@ -34,6 +34,7 @@
 #include <sfx2/docfac.hxx>
 #include <com/sun/star/document/XTypeDetection.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <unotools/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/linkmgr.hxx>

sfx2/source/appl/shutdownicon.hxx

@@ -26,6 +26,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>

sfx2/source/bastyp/fltfnc.cxx

@@ -28,6 +28,7 @@
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <comphelper/sequenceashashmap.hxx>
 

sfx2/source/control/charwin.cxx

@@ -30,6 +30,8 @@
 #include <sfx2/sfxresid.hxx>
 #include <sfx2/strings.hrc>
 
+#include <com/sun/star/beans/PropertyValue.hpp>
+
 using namespace com::sun::star;
 
 SvxCharView::SvxCharView(const VclPtr<VirtualDevice>& rVirDev)

sfx2/source/control/request.cxx

@@ -43,6 +43,7 @@
 #include <sfx2/msg.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objface.hxx>
+#include <sfx2/sfxuno.hxx>
 #include <rtl/strbuf.hxx>
 
 

sfx2/source/control/sfxstatuslistener.cxx

@@ -34,6 +34,7 @@
 #include <com/sun/star/frame/status/ItemStatus.hpp>
 #include <com/sun/star/frame/status/ItemState.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
+#include <com/sun/star/frame/XDispatchProvider.hpp>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>

sfx2/source/dialog/documentfontsdialog.cxx

@@ -22,6 +22,7 @@
 #include <sfx2/objsh.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 using namespace ::com::sun::star;
 

sfx2/source/dialog/filedlghelper.cxx

@@ -36,6 +36,8 @@
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>

sfx2/source/dialog/versdlg.cxx

@@ -21,6 +21,7 @@
 
 #include <com/sun/star/document/XCmisDocument.hpp>
 #include <com/sun/star/util/RevisionTag.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 
 #include <unotools/localedatawrapper.hxx>
 #include <svl/eitem.hxx>

sfx2/source/doc/docfac.cxx

@@ -25,6 +25,7 @@
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>

sfx2/source/doc/docfile.cxx

@@ -64,11 +64,13 @@
 #include <com/sun/star/io/XSeekable.hpp>
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/ucb/TransferInfo.hpp>
 #include <com/sun/star/ucb/OpenCommandArgument2.hpp>
 #include <com/sun/star/ucb/OpenMode.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/security/DocumentSignatureInformation.hpp>
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
@@ -127,6 +129,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/sfxsids.hrc>
+#include <sfx2/sfxuno.hxx>
 #include <openflag.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <comphelper/propertysequence.hxx>

sfx2/source/doc/docundomanager.cxx

@@ -25,6 +25,7 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/bindings.hxx>
 #include <com/sun/star/lang/NoSupportException.hpp>
+#include <com/sun/star/lang/NotInitializedException.hpp>
 #include <svl/undo.hxx>
 #include <tools/diagnose_ex.h>
 #include <framework/undomanagerhelper.hxx>

sfx2/source/doc/guisaveas.cxx

@@ -46,6 +46,7 @@
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/io/IOException.hpp>
@@ -82,6 +83,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxuno.hxx>
 #include <sfxtypes.hxx>
 #include <alienwarn.hxx>
 

sfx2/source/doc/objmisc.cxx

@@ -99,6 +99,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/ctrlitem.hxx>
+#include <sfx2/sfxuno.hxx>
 #include <arrdecl.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/docfac.hxx>

sfx2/source/doc/objserv.cxx

@@ -97,6 +97,7 @@
 #include <sfx2/objface.hxx>
 #include <sfx2/checkin.hxx>
 #include <sfx2/infobar.hxx>
+#include <sfx2/sfxuno.hxx>
 #include <SfxRedactionHelper.hxx>
 
 #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>

sfx2/source/doc/objstor.cxx

@@ -123,6 +123,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/module.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/sfxuno.hxx>
 #include <openflag.hxx>
 #include <helper.hxx>
 #include <sfx2/event.hxx>

sfx2/source/doc/objxtor.cxx

@@ -63,6 +63,7 @@
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <svl/urihelper.hxx>
 #include <unotools/pathoptions.hxx>
@@ -93,6 +94,7 @@
 #include <sfx2/msg.hxx>
 #include <appbaslib.hxx>
 #include <sfx2/sfxbasemodel.hxx>
+#include <sfx2/sfxuno.hxx>
 #include <shellimpl.hxx>
 #include <sfx2/notebookbar/SfxNotebookBar.hxx>
 

sfx2/source/doc/ownsubfilterservice.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/io/XStream.hpp>
 

sfx2/source/doc/sfxbasemodel.cxx

@@ -32,9 +32,11 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
+#include <com/sun/star/lang/NotInitializedException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/IllegalArgumentIOException.hpp>
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
+#include <com/sun/star/frame/DoubleInitializationException.hpp>
 #include <com/sun/star/embed/XTransactionBroadcaster.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/EmbedMapUnits.hpp>
@@ -56,6 +58,7 @@
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/InvalidStateException.hpp>
+#include <com/sun/star/util/CloseVetoException.hpp>
 #include <comphelper/enumhelper.hxx>
 
 #include <cppuhelper/implbase.hxx>

sfx2/source/doc/sfxmodelfactory.cxx

@@ -22,6 +22,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 
 #include <comphelper/namedvaluecollection.hxx>
 #include <cppuhelper/implbase.hxx>

sfx2/source/doc/templatedlg.cxx

@@ -44,6 +44,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>

sfx2/source/inc/docundomanager.hxx

@@ -25,6 +25,7 @@
 #include <com/sun/star/document/XUndoManager.hpp>
 
 #include <cppuhelper/implbase.hxx>
+#include <vcl/svapp.hxx>
 
 #include <memory>
 

sfx2/source/styles/StyleManager.cxx

@@ -8,6 +8,7 @@
  */
 
 #include <sfx2/StyleManager.hxx>
+#include <sfx2/objsh.hxx>
 
 namespace sfx2
 {

sfx2/source/view/viewprn.cxx

@@ -49,6 +49,7 @@
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/strings.hrc>
+#include <sfx2/sfxuno.hxx>
 
 #include <toolkit/awt/vclxdevice.hxx>
 

sfx2/source/view/viewsh.cxx

@@ -38,6 +38,7 @@
 #include <com/sun/star/container/XContainerQuery.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/implbase.hxx>
 
 #include <osl/file.hxx>

starmath/source/cfgitem.cxx

@@ -33,6 +33,8 @@
 #include <osl/diagnose.h>
 #include <i18nlangtag/languagetag.hxx>
 
+#include <com/sun/star/beans/PropertyValue.hpp>
+
 #include <officecfg/Office/Math.hxx>
 #include "cfgitem.hxx"
 

starmath/source/register.cxx

@@ -21,6 +21,8 @@
 
 #include <sfx2/sfxmodelfactory.hxx>
 
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+
 #include "register.hxx"
 
 using namespace ::com::sun::star;

starmath/source/unofilter.cxx

@@ -12,6 +12,7 @@
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <sot/storage.hxx>
+#include <cppuhelper/supportsservice.hxx>
 
 #include <document.hxx>
 #include "mathtype.hxx"

starmath/source/unomodel.cxx

@@ -35,6 +35,7 @@
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
+#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <tools/mapunit.hxx>

svx/source/form/fmscriptingenv.cxx

@@ -37,6 +37,7 @@
 #include <tools/debug.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/compbase.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>

svx/source/gallery2/galtheme.cxx

@@ -27,6 +27,7 @@
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
+#include <osl/thread.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/vcompat.hxx>
 #include <unotools/streamwrap.hxx>

svx/source/sidebar/text/TextCharacterSpacingControl.cxx

@@ -31,6 +31,8 @@
 #include <svl/itempool.hxx>
 #include <helpids.h>
 
+#include <com/sun/star/beans/NamedValue.hpp>
+
 #define SPACING_VERY_TIGHT  -30
 #define SPACING_TIGHT       -15
 #define SPACING_NORMAL        0

svx/source/stbctrls/pszctrl.cxx

@@ -49,6 +49,7 @@
 #include <bitmaps.hlst>
 #include <unotools/localedatawrapper.hxx>
 
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 /*  [Description]
 

svx/source/stbctrls/selctrl.cxx

@@ -30,6 +30,8 @@
 #include "stbctrls.h"
 #include <bitmaps.hlst>
 
+#include <com/sun/star/beans/PropertyValue.hpp>
+
 SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item);
 
 /// Popup menu to select the selection type

svx/source/stbctrls/xmlsecctrl.cxx

@@ -42,6 +42,8 @@
 #include <bitmaps.hlst>
 #include <sal/log.hxx>
 
+#include <com/sun/star/beans/PropertyValue.hpp>
+
 SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxUInt16Item );
 
 struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl

svx/source/stbctrls/zoomctrl.cxx

@@ -39,6 +39,8 @@
 #include "modctrl_internal.hxx"
 #include <bitmaps.hlst>
 
+#include <com/sun/star/beans/PropertyValue.hpp>
+
 SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem);
 
 class ZoomPopup_Impl

svx/source/styles/CommonStylePreviewRenderer.cxx

@@ -14,6 +14,7 @@
 #include <sfx2/objsh.hxx>
 #include <svl/style.hxx>
 #include <svl/itemset.hxx>
+#include <vcl/outdev.hxx>
 
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <svx/xdef.hxx>

svx/source/tbxctrls/colrctrl.cxx

@@ -42,6 +42,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 
+#include <com/sun/star/beans/NamedValue.hpp>
+
 using namespace com::sun::star;
 
 

svx/source/tbxctrls/tbcontrl.cxx

@@ -104,6 +104,7 @@
 #include <svl/currencytable.hxx>
 #include <svtools/langtab.hxx>
 #include <cppu/unotype.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <bitmaps.hlst>

svx/source/unodraw/unoshap2.cxx

@@ -67,6 +67,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <sal/log.hxx>
+#include <cppuhelper/queryinterface.hxx>
 
 
 #include <memory>

sw/inc/docsh.hxx

@@ -20,6 +20,7 @@
 #define INCLUDED_SW_INC_DOCSH_HXX
 
 #include <memory>
+#include <vector>
 #include <rtl/ref.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <sfx2/docfac.hxx>

sw/inc/unotxdoc.hxx

@@ -77,6 +77,7 @@ class SwXDrawPage;
 class SwUnoCursor;
 class SwXDocumentPropertyHelper;
 class SfxViewFrame;
+class SfxViewShell;
 class SwPrintUIOptions;
 class SwPrintData;
 class SwRenderData;

sw/source/core/access/acccell.cxx

@@ -24,6 +24,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <vcl/svapp.hxx>
 #include <cellfrm.hxx>
 #include <tabfrm.hxx>

sw/source/core/access/accdoc.cxx

@@ -24,6 +24,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <sfx2/viewsh.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/supportsservice.hxx>

sw/source/core/access/accembedded.cxx

@@ -20,6 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
+#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <flyfrm.hxx>
 #include "accembedded.hxx"

sw/source/core/access/accnotextframe.cxx

@@ -20,6 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <frmfmt.hxx>
 #include <ndnotxt.hxx>
 #include <flyfrm.hxx>

sw/source/core/access/accpara.cxx

@@ -87,6 +87,7 @@
 #include "parachangetrackinginfo.hxx"
 #include <com/sun/star/text/TextMarkupType.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <cppuhelper/typeprovider.hxx>
 #include <svx/colorwindow.hxx>
 #include <editeng/editids.hrc>
 

sw/source/core/access/acctextframe.cxx

@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
 #include <sal/log.hxx>

sw/source/core/doc/number.cxx

@@ -58,6 +58,8 @@
 #include <IDocumentStylePoolAccess.hxx>
 #include <IDocumentState.hxx>
 
+#include <com/sun/star/beans/PropertyValue.hpp>
+
 using namespace ::com::sun::star;
 
 sal_uInt16 SwNumRule::mnRefCount = 0;