tdf#42949 Fix IWYU warnings in sw/inc/*

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

- Also fix .h / .hrc files
- Remove a bit of duplication from the .yaml file

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

10 files changed, 9 insertions, 29 deletions

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 28a13ea71abd..b7076905d66f 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -21,7 +21,7 @@
 #define INCLUDED_SW_INC_CMDID_H
 
 #include <sfx2/sfxsids.hrc>
-#include "unomid.h"
+#include <svl/solar.hrc>
 
 #define FN_FILE                 SID_SW_START
 #define FN_EDIT                 (SID_SW_START +  100)
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 47c4e0420300..086df8534373 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_DBUI_HRC
 #define INCLUDED_SW_INC_DBUI_HRC
 
-#include "rcid.hrc"
+#include <utility>
 
 #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index 1fc6e757452c..ab06a6d8a01d 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.hxx
@@ -24,8 +24,6 @@
 #include <vcl/commandevent.hxx>
 #include <vector>
 
-class CommandExtTextInputData;
-
 class SwExtTextInput : public SwPaM
 {
     std::vector<ExtTextInputAttr> aAttrs;
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index ff3aa9f9b32b..9e54f07060e6 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX
 #define INCLUDED_SW_INC_FMTFOLLOWTEXTFLOW_HXX
 
-#include <sal/log.hxx>
 #include <svl/eitem.hxx>
 #include "hintids.hxx"
 #include "format.hxx"
diff --git a/sw/inc/helpids.h b/sw/inc/helpids.h
index 163480a9746c..ad9c82557dcb 100644
--- a/sw/inc/helpids.h
+++ b/sw/inc/helpids.h
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_SW_INC_HELPIDS_H
 #define INCLUDED_SW_INC_HELPIDS_H
 
-#include "swcommands.h"
-#include <svx/svxcommands.h>
-
 #define HID_EDIT_WIN                                            "SW_HID_EDIT_WIN"
 
 #define HID_NAVI_DRAG_HYP                                       "SW_HID_NAVI_DRAG_HYP"
diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h
index 840542fe8043..87505ff00080 100644
--- a/sw/inc/swerror.h
+++ b/sw/inc/swerror.h
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SW_INC_SWERROR_H
 #define INCLUDED_SW_INC_SWERROR_H
 
-#include <vcl/errcode.hxx>
-
 // Import & Export
 #define ERR_SWG_FILE_FORMAT_ERROR       ErrCode(ErrCodeArea::Sw, ErrCodeClass::Read, 1 )
 #define ERR_SWG_READ_ERROR              ErrCode(ErrCodeArea::Sw, ErrCodeClass::Read, 2 )
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index 4d60d9614630..5f2470f87b9d 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -20,19 +20,14 @@
 #define INCLUDED_SW_INC_UNOSTYLE_HXX
 
 #include <svl/style.hxx>
-#include <svl/lstner.hxx>
 #include "unocoll.hxx"
-#include "unomap.hxx"
+#include "tblafmt.hxx"
 #include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/style/XStyleLoader.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/document/XEventsSupplier.hpp>
 #include "calbck.hxx"
 
 #include <com/sun/star/style/XAutoStyleFamily.hpp>
@@ -43,17 +38,11 @@
 #include <memory>
 #include <map>
 
+namespace com { namespace sun { namespace star { namespace document { class XEventsSupplier; } } } }
+
 class SwDocShell;
-class SfxItemPropertySet;
-class SwXStyle;
-class SwStyleProperties_Impl;
 class SwAutoStylesEnumImpl;
-class IStyleAccess;
 class SfxItemSet;
-namespace sw
-{
-    class XStyleFamily;
-};
 
 class SwXStyleFamilies :  public cppu::WeakImplHelper
 <
@@ -240,7 +229,6 @@ protected:
 
 };
 
-class SwTableAutoFormat;
 typedef std::map<OUString, sal_Int32> CellStyleNameMap;
 
 /// A text table style is a uno api wrapper for a SwTableAutoFormat
@@ -336,7 +324,6 @@ public:
     static css::uno::Reference<css::style::XStyle> CreateXTextTableStyle(SwDocShell* pDocShell, const OUString& rTableAutoFormatName);
 };
 
-class SwBoxAutoFormat;
 /// A text cell style is a uno api wrapper for a SwBoxAutoFormat core class
 class SwXTextCellStyle : public cppu::WeakImplHelper
 <
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index bf33086b75a8..bc4d7176fd8a 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -55,7 +55,6 @@
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/uno/XAggregation.hpp>
 #include <o3tl/deleter.hxx>
 #include <rtl/ref.hxx>
 #include <svx/fmdmod.hxx>
@@ -85,6 +84,8 @@ class SfxItemPropertySet;
 namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
 namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
 namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XAggregation; } } } }
+
 namespace com { namespace sun { namespace star { namespace util { class XReplaceDescriptor; } } } }
 
 typedef cppu::WeakImplHelper
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index c4586edb104c..6b9ade855bcc 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -72,7 +72,6 @@ namespace vcl
 {
     typedef OutputDevice RenderContext;
 }
-namespace weld { class Dialog; }
 
 // Define for flags needed in ctor or layers below.
 // Currently the Preview flag is needed for DrawPage.
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 332e190c0761..49a9cc9035bb 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -21,12 +21,13 @@
 
 #include <config_features.h>
 
-#include <svx/sdr/overlay/overlayobject.hxx>
 #include <vcl/cursor.hxx>
 #include "swcrsr.hxx"
 #include "swrect.hxx"
 #include "swregion.hxx"
 
+namespace sdr { namespace overlay { class OverlayObject; } }
+
 class SwCursorShell;
 class SfxViewShell;