tdf#42949 Fix some more Include What You Use warnings

Change-Id: I2040315707674dc99a37aedb96ac61dca274c13a
Reviewed-on: https://gerrit.libreoffice.org/47348
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

7 files changed, 9 insertions, 5 deletions

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 181764bf4607..882243ff9d06 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -83,6 +83,7 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <o3tl/make_unique.hxx>
 #include <svl/grabbagitem.hxx>
+#include "rtfexport.hxx"
 
 using namespace ::com::sun::star;
 using namespace sw::util;
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 66393e9525f3..a29621aa42d7 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -24,17 +24,16 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 
 #include "attributeoutputbase.hxx"
-#include "rtfexport.hxx"
 #include "rtfstringbuffer.hxx"
 
 #include <rtl/strbuf.hxx>
-#include <svx/xenum.hxx>
 
 #include <boost/optional.hpp>
 
 class SwGrfNode;
 class SwOLENode;
 class SwFlyFrameFormat;
+class RtfExport;
 
 /// The class that has handlers for various resource types when exporting as RTF
 class RtfAttributeOutput : public AttributeOutputBase
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index e98751b1b976..61ed96720ae5 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "rtfexport.hxx"
+
 #include "rtfexportfilter.hxx"
 #include "rtfsdrexport.hxx"
 #include "rtfattributeoutput.hxx"
@@ -36,7 +38,6 @@
 #include <swmodule.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include "ww8par.hxx"
 #include <comphelper/string.hxx>
 #include <svtools/rtfkeywd.hxx>
 #include <filter/msfilter/rtfutil.hxx>
@@ -49,6 +50,8 @@
 #include <fmtmeta.hxx>
 #include <o3tl/make_unique.hxx>
 #include <IDocumentSettingAccess.hxx>
+#include <fmtfsize.hxx>
+#include <ndtxt.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 65d143595252..fce00510105c 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -22,8 +22,8 @@
 
 #include <docsh.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include <editsh.hxx>
 #include <unotxdoc.hxx>
+#include <viewsh.hxx>
 
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 1a898b0906ab..83c1b0b08185 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -33,6 +33,7 @@
 #include <textboxhelper.hxx>
 #include <dcontact.hxx>
 #include <algorithm>
+#include "rtfexport.hxx"
 
 using namespace css;
 
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx
index 894089e9ce39..c2c33de4aca2 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -26,7 +26,6 @@
 
 #include <map>
 #include <memory>
-#include <set>
 
 #include "wrtww8.hxx"
 
diff --git a/sw/source/filter/ww8/rtfstringbuffer.cxx b/sw/source/filter/ww8/rtfstringbuffer.cxx
index a84c5846da4a..b50ffc31e5e9 100644
--- a/sw/source/filter/ww8/rtfstringbuffer.cxx
+++ b/sw/source/filter/ww8/rtfstringbuffer.cxx
@@ -8,6 +8,7 @@
 
 #include "rtfstringbuffer.hxx"
 #include "rtfattributeoutput.hxx"
+#include "rtfexport.hxx"
 
 RtfStringBufferValue::RtfStringBufferValue() = default;