tdf#42949 Fix IWYU warnings in include/sfx2/[e-M]*

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

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

23 files changed, 65 insertions, 106 deletions

diff --git a/include/sfx2/emojicontrol.hxx b/include/sfx2/emojicontrol.hxx
index d759de4725b4..132fe247b774 100644
--- a/include/sfx2/emojicontrol.hxx
+++ b/include/sfx2/emojicontrol.hxx
@@ -12,14 +12,13 @@
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <vcl/button.hxx>
 #include <vcl/tabctrl.hxx>
-#include <vcl/tabpage.hxx>
 #include <sfx2/tbxctrl.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
 
 #define TAB_FONT_SIZE 15
 
+namespace com::sun::star::frame { class XFrame; }
+
 class EmojiView;
 class ThumbnailViewItem;
 enum class FILTER_CATEGORY;
diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx
index 471df173e802..40d25ef57934 100644
--- a/include/sfx2/emojipopup.hxx
+++ b/include/sfx2/emojipopup.hxx
@@ -23,8 +23,6 @@
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/dllapi.h>
 
-#include <functional>
-
 class SFX2_DLLPUBLIC EmojiPopup : public SfxToolBoxControl
 {
 public:
diff --git a/include/sfx2/emojiview.hxx b/include/sfx2/emojiview.hxx
index 6c311d740e0a..8a08e1d8c75d 100644
--- a/include/sfx2/emojiview.hxx
+++ b/include/sfx2/emojiview.hxx
@@ -18,8 +18,6 @@
 #define ITEM_PADDING 5
 #define ITEM_MAX_TEXT_LENGTH 10
 
-class EmojiViewItem;
-
 enum class FILTER_CATEGORY
 {
     PEOPLE,
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index 8a797d3379e1..46208943b210 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.hxx
@@ -29,10 +29,11 @@
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/view/PrintableState.hpp>
 
+namespace com::sun::star::beans { struct PropertyValue; }
+
 /**
   these values get stored in streams in a 16-bit value
 */
@@ -230,8 +231,6 @@ public:
                         { return xViewController; }
 };
 
-class Printer;
-
 class SfxPrintingHint : public SfxViewEventHint
 {
     css::view::PrintableState const mnPrintableState;
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 86769b324f95..efd330260f53 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -22,16 +22,13 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
 #include <sfx2/event.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <svl/macitem.hxx>
+#include <svl/poolitem.hxx>
 #include <memory>
 #include <vector>
 
 class SfxObjectShell;
-class SvxMacroTableDtor;
+class SvxMacro;
 
 struct SFX2_DLLPUBLIC SfxEventName
 {
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index 091599e82b9f..6d62f8cfa561 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.hxx
@@ -22,24 +22,22 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <svl/poolitem.hxx>
-#include <vcl/window.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/link.hxx>
+#include <comphelper/documentconstants.hxx>
+#include <sot/formats.hxx>
 
-#include <sfx2/docfilt.hxx>
-
-#include <tools/ref.hxx>
 #include <memory>
 
-namespace vcl { class Window; }
+namespace com::sun::star::beans { struct NamedValue; }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::uno { template <typename > class Sequence; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 class ErrCode;
 class SfxFilter;
-class SfxObjectFactory;
 class SfxMedium;
 class SfxFilterContainer_Impl;
-class SfxFrame;
 
 
 class SFX2_DLLPUBLIC SfxFilterContainer
@@ -97,7 +95,6 @@ public:
     std::shared_ptr<const SfxFilter>    GetAnyFilter( SfxFilterFlags nMustg=SfxFilterFlags::NONE, SfxFilterFlags nDont=SFX_FILTER_NOTINSTALLED ) const;
 };
 
-class SfxFilterContainer_Impl;
 class SFX2_DLLPUBLIC SfxFilterMatcherIter
 
 {
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 2e2104eeb7fc..42d6b53c0cfb 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -22,18 +22,16 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
+#include <comphelper/documentconstants.hxx>
+#include <tools/link.hxx>
 #include <vcl/errcode.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/weld.hxx>
-#include <sfx2/sfxuno.hxx>
-#include <sfx2/docfilt.hxx>
+#include <o3tl/typed_flags_set.hxx>
 
 #include <memory>
+#include <vector>
 
 namespace com
 {
@@ -46,7 +44,6 @@ namespace com
                 namespace dialogs
                 {
                     class XFilePicker3;
-                    class XFilePickerListener;
                     struct FilePickerEvent;
                     struct DialogClosedEvent;
                 }
@@ -55,8 +52,13 @@ namespace com
     }
 }
 
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace weld { class Window; }
+
+class Graphic;
+class SfxFilter;
 class SfxItemSet;
-namespace vcl { class Window; }
 
 enum class FileDialogFlags {
     NONE              = 0x00,
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 9a3a96a91520..4878bcd460d7 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.hxx
@@ -39,20 +39,10 @@ namespace com
     {
         namespace star
         {
-            namespace awt
-            {
-                class XWindow;
-            }
             namespace frame
             {
                 class XFrame;
-                class XFrameLoader;
                 class XController;
-                class XDispatchProviderInterceptor;
-            }
-            namespace beans
-            {
-                struct PropertyValue;
             }
         }
     }
@@ -61,16 +51,11 @@ namespace com
 class SvBorder;
 class SfxWorkWindow;
 namespace vcl { class Window; }
-class SfxFrame;
 class SfxFrame_Impl;
 class SfxObjectShell;
-class SfxObjectFactory;
 class SfxViewFrame;
 class SfxFrameDescriptor;
-class SfxFrameSetDescriptor;
-class SfxDispatcher;
 namespace tools { class Rectangle; }
-class SfxRequest;
 class SystemWindow;
 
 typedef ::std::vector<OUString> TargetList;
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx
index 99e26280bebb..196a2ccc9356 100644
--- a/include/sfx2/frmdescr.hxx
+++ b/include/sfx2/frmdescr.hxx
@@ -23,7 +23,6 @@
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <sfx2/sfxsids.hrc>
 #include <tools/gen.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index 4ca4a30f04c5..cb1fb6a2335c 100644
--- a/include/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
@@ -23,11 +23,9 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 
-#include <sfx2/frmdescr.hxx>
 #include <sfx2/sfxhtml.hxx>
 
-class SfxFrameHTMLParser;
-class SfxMedium;
+class SfxFrameDescriptor;
 
 class SFX2_DLLPUBLIC SfxFrameHTMLParser : public SfxHTMLParser
 {
diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index da44dc92968a..4b827a7c97ad 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
@@ -22,15 +22,8 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
+#include <rtl/ustring.hxx>
 
-#include <sfx2/frmdescr.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <svtools/parhtml.hxx>
-#include <svtools/htmlout.hxx>
-#include <svtools/htmlkywd.hxx>
-
-class SfxFrame;
 class SvStream;
 
 namespace com { namespace sun { namespace star {
@@ -39,6 +32,9 @@ namespace com { namespace sun { namespace star {
     }
 } } }
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+
 class SFX2_DLLPUBLIC SfxFrameHTMLWriter
 {
     SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm,
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index 97aaf8db6f8d..eb4c2c825651 100644
--- a/include/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.hxx
@@ -22,15 +22,15 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/embed/Aspects.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <rtl/ref.hxx>
 
 #include <tools/gen.hxx>
 
-#include <sfx2/objsh.hxx>
 #include <vcl/window.hxx>
+#include <vcl/errcode.hxx>
+
+namespace com::sun::star::embed { class XEmbeddedObject; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 class SfxInPlaceClient_Impl;
 class SfxViewShell;
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index 128dd47e4462..2646d2d61cdd 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -29,7 +29,6 @@
 
 class SfxObjectShell;
 class Graphic;
-class Size;
 
 namespace com { namespace sun { namespace star {
     namespace lang {
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index b0323cb11696..fe6706544b20 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.hxx
@@ -22,9 +22,8 @@
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 
-#include <tools/link.hxx>
 #include <tools/ref.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 
 namespace com { namespace sun { namespace star { namespace uno
@@ -32,9 +31,9 @@ namespace com { namespace sun { namespace star { namespace uno
     class Any;
 }}}}
 namespace weld { class Window; }
-namespace rtl {
-    class OUString;
-}
+
+template <typename Arg, typename Ret> class Link;
+namespace com::sun::star::io { class XInputStream; }
 
 #ifndef ADVISEMODE_NODATA
 // Must be the same value as Ole2 ADVF_*
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 09f14b3a1723..19ade2d601b0 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.hxx
@@ -19,13 +19,13 @@
 #ifndef INCLUDED_SFX2_LNKBASE_HXX
 #define INCLUDED_SFX2_LNKBASE_HXX
 
-#include <com/sun/star/io/XInputStream.hpp>
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <sfx2/linksrc.hxx>
-#include <sot/exchange.hxx>
+#include <sot/formats.hxx>
 #include <tools/ref.hxx>
+#include <tools/link.hxx>
 #include <memory>
 
 namespace com { namespace sun { namespace star { namespace uno
@@ -33,6 +33,8 @@ namespace com { namespace sun { namespace star { namespace uno
     class Any;
 }}}}
 
+namespace com::sun::star::io { class XInputStream; }
+
 enum class SfxLinkUpdateMode {
     NONE   = 0,
     // Ole2 compatible and persistent
@@ -45,7 +47,6 @@ namespace sfx2
 
 struct ImplBaseLinkData;
 class LinkManager;
-class SvLinkSource;
 class FileDialogHelper;
 
 #ifndef OBJECT_DDE_EXTERN
diff --git a/include/sfx2/lokcharthelper.hxx b/include/sfx2/lokcharthelper.hxx
index 92c57217f621..85b0baf66e1a 100644
--- a/include/sfx2/lokcharthelper.hxx
+++ b/include/sfx2/lokcharthelper.hxx
@@ -14,8 +14,8 @@
 #include <tools/gen.hxx>
 #include <vcl/window.hxx>
 
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::frame { class XDispatch; }
 
 class SfxViewShell;
 class VirtualDevice;
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index 62c024508de1..e874ee256412 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -16,8 +16,6 @@
 #include <cstddef>
 #include <rtl/string.hxx>
 
-class SfxViewShell;
-
 class SFX2_DLLPUBLIC SfxLokHelper
 {
 public:
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index e28b148a9523..8ee361cd7908 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.hxx
@@ -19,15 +19,19 @@
 #ifndef INCLUDED_SFX2_MAILMODELAPI_HXX
 #define INCLUDED_SFX2_MAILMODELAPI_HXX
 
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
-#include <tools/link.hxx>
 #include <vector>
 #include <memory>
 
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::frame { class XFrame; }
+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; }
+
 // class AddressList_Impl ------------------------------------------------
 typedef ::std::vector< OUString > AddressList_Impl;
 
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 8433237da033..86764728d8de 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -21,17 +21,20 @@
 
 #include <sfx2/styfitem.hxx>
 #include <sfx2/tabdlg.hxx>
-#include <vcl/weld.hxx>
 #include <memory>
 
+namespace weld { class Button; }
+namespace weld { class CheckButton; }
+namespace weld { class ComboBox; }
+namespace weld { class Entry; }
+namespace weld { class Label; }
+namespace weld { class Widget; }
+
 /* expected:
     SID_TEMPLATE_NAME   :   In: StringItem, Name of Template
     SID_TEMPLATE_FAMILY :   In: Family of Template
 */
 
-class SfxStyleFamilyItem;
-class SfxStyleSheetBase;
-
 class SfxManageStyleSheetPage final : public SfxTabPage
 {
     SfxStyleSheetBase *pStyle;
diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx
index 8fa29baa4ae6..103f93a3f68e 100644
--- a/include/sfx2/mieclip.hxx
+++ b/include/sfx2/mieclip.hxx
@@ -23,12 +23,8 @@
 #include <memory>
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
-#include <sal/types.h>
 #include <sfx2/dllapi.h>
-
-class SvStream;
-class SotDataObject;
-class SvData;
+#include <tools/stream.hxx>
 
 class SFX2_DLLPUBLIC MSE40HTMLClipFormatObj
 {
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 5709e4a90fbb..c4ad3d89aebf 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -21,29 +21,24 @@
 
 #include <memory>
 #include <sal/config.h>
-#include <sfx2/app.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/shell.hxx>
 #include <sfx2/styfitem.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <svtools/imgdef.hxx>
+#include <vcl/tabpage.hxx>
 #include <sal/types.h>
 #include <tools/fldunit.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-class SfxBindings;
 class SfxObjectFactory;
-class ModalDialog;
-class SfxObjectFactory;
-class SfxModule;
 class SfxModule_Impl;
 class SfxSlotPool;
-struct SfxChildWinContextFactory;
 struct SfxChildWinFactory;
 struct SfxStbCtrlFactory;
 struct SfxTbxCtrlFactory;
 class SfxTabPage;
-namespace vcl { class Window; }
+class SfxTbxCtrlFactArr_Impl;
+class SfxStbCtrlFactArr_Impl;
+class SfxChildWinFactArr_Impl;
 
 namespace com { namespace sun { namespace star { namespace frame {
     class XFrame;
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 6634584558b6..7f9eb2de916b 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -31,9 +31,6 @@
 #include <climits>
 
 class SfxItemPool;
-class SfxItemSet;
-class SfxPoolItem;
-class SfxRequest;
 
 enum class SfxSlotMode {
     NONE            =    0x0000L, // default
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index ea5650506414..357d86d67bed 100644
--- a/include/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
@@ -23,13 +23,12 @@
 #include <sal/config.h>
 #include <sal/types.h>
 #include <sfx2/dllapi.h>
-#include <sfx2/msg.hxx>
 #include <sfx2/groupid.hxx>
-#include <memory>
 #include <vector>
 
 class SfxInterface;
 class SfxSlot;
+class SfxViewFrame;
 
 class SFX2_DLLPUBLIC SfxSlotPool
 {