sw: fix some IWYU warnings

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

45 files changed, 59 insertions, 25 deletions

diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 70e29236bd31..236df3a9f01c 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -23,6 +23,7 @@
 #include "hintids.hxx"
 #include "format.hxx"
 #include <svl/poolitem.hxx>
+#include <svx/swframetypes.hxx>
 
 #include <memory>
 
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index e302123e2f0c..ac2611966953 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -22,6 +22,7 @@
 #include <memory>
 #include "node.hxx"
 
+class Size;
 namespace tools { class PolyPolygon; }
 
 // SwNoTextNode
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 6f1f4bef8ef1..ac3ac8da46c9 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -19,10 +19,8 @@
 #ifndef INCLUDED_SW_INC_PAM_HXX
 #define INCLUDED_SW_INC_PAM_HXX
 
-#include <stddef.h>
 #include <sal/types.h>
 #include <tools/mempool.hxx>
-#include "cshtyp.hxx"
 #include "ring.hxx"
 #include "index.hxx"
 #include "ndindex.hxx"
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 7afb4eb00070..cc1c98862fc3 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -26,7 +26,6 @@
 #include "swatrset.hxx"
 #include "format.hxx"
 #include "charfmt.hxx"
-#include "swtypes.hxx"
 #include <editeng/adjustitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/spltitem.hxx>
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 025ea9fc0b89..40ef1257ccd9 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_POOLFMT_HXX
 
 #include <limits.h>
-#include <tools/solar.h>
 #include <editeng/frmdir.hxx>
 #include <i18nlangtag/lang.h>
 
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 982faa671569..1e20f47e9df4 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -21,16 +21,16 @@
 
 #include "swrect.hxx"
 #include "fmtfld.hxx"
-#include "redline.hxx"
 #include <cstddef>
-#include <vector>
-#include <vcl/window.hxx>
+#include <vcl/vclptr.hxx>
 #include "SidebarWindowsTypes.hxx"
 
 class SfxBroadcaster;
 class SwRootFrame;
 class SwPostItMgr;
 class SwEditWin;
+class SwFrame;
+class SvxLanguageItem;
 namespace sw { namespace annotation {
     class SwAnnotationWin;
 } }
diff --git a/sw/inc/proofreadingiterator.hxx b/sw/inc/proofreadingiterator.hxx
index 953efcf3b7af..003a922bbc10 100644
--- a/sw/inc/proofreadingiterator.hxx
+++ b/sw/inc/proofreadingiterator.hxx
@@ -12,8 +12,7 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/uno/Reference.hxx>
-#include <sal/types.h>
+#include <com/sun/star/uno/Reference.h>
 
 namespace com { namespace sun { namespace star {
     namespace linguistic2 { class XProofreadingIterator; }
diff --git a/sw/inc/rdfhelper.hxx b/sw/inc/rdfhelper.hxx
index 5ec56b8a1935..18ddd87127d7 100644
--- a/sw/inc/rdfhelper.hxx
+++ b/sw/inc/rdfhelper.hxx
@@ -16,7 +16,7 @@
 
 #include "swdllapi.h"
 
-#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Reference.h>
 
 class SwTextNode;
 
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 3540a6d36be0..958882bad2fb 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -23,7 +23,6 @@
 #include <rtl/ustring.hxx>
 
 #include "pam.hxx"
-#include "swtable.hxx"
 
 #include "IDocumentRedlineAccess.hxx"
 
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index fc17a76e0403..e152899ec87a 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -19,9 +19,8 @@
 #ifndef INCLUDED_SW_INC_RING_HXX
 #define INCLUDED_SW_INC_RING_HXX
 
-#include "swdllapi.h"
-#include "swtypes.hxx"
 #include <utility>
+#include <sal/types.h>
 #include <iterator>
 #include <type_traits>
 #include <boost/iterator/iterator_facade.hpp>
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx
index 9f58b06ac6f0..b025686daae3 100644
--- a/sw/inc/rubylist.hxx
+++ b/sw/inc/rubylist.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SW_INC_RUBYLIST_HXX
 #define INCLUDED_SW_INC_RUBYLIST_HXX
 
-#include "swtypes.hxx"
 #include "fmtruby.hxx"
 
 class SwRubyListEntry
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 5cbd0f502639..c6f1c63dd214 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -23,24 +23,16 @@
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <sfx2/docfile.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <sot/formats.hxx>
 #include <sot/storage.hxx>
-#include <svtools/parhtml.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
 #include <tools/ref.hxx>
 #include <rtl/ref.hxx>
+#include <osl/thread.h>
 #include "swdllapi.h"
-#include "swtypes.hxx"
 #include "docfac.hxx"
-#include "iodetect.hxx"
-#include "IMark.hxx"
 
-class SfxFilterContainer;
-class SfxFilter;
 class SfxItemPool;
 class SfxItemSet;
 class SfxMedium;
@@ -54,6 +46,13 @@ class SwPaM;
 class SwTextBlocks;
 struct SwPosition;
 struct Writer_Impl;
+namespace sw
+{
+namespace mark
+{
+class IMark;
+}
+}
 
 // Defines the count of chars at which a paragraph read via ASCII/W4W-Reader
 // is forced to wrap. It has to be always greater than 200!!!
@@ -96,8 +95,6 @@ public:
 
 // Base class of possible options for a special reader.
 class Reader;
-// Calls reader with its options, document, cursor etc.
-class SwReader;
 // SwRead is pointer to the read-options base class.
 typedef Reader *SwRead;
 
@@ -136,6 +133,7 @@ public:
         { ResetAllFormatsOnly(); aASCIIOpts.Reset(); }
 };
 
+// Calls reader with its options, document, cursor etc.
 class SW_DLLPUBLIC SwReader: public SwDocFac
 {
     SvStream* pStrm;
diff --git a/sw/qa/extras/txtexport/txtexport.cxx b/sw/qa/extras/txtexport/txtexport.cxx
index 2213f53b34b7..e7e6163a8dae 100644
--- a/sw/qa/extras/txtexport/txtexport.cxx
+++ b/sw/qa/extras/txtexport/txtexport.cxx
@@ -15,6 +15,7 @@
 #include <shellio.hxx>
 #include <unotextrange.hxx>
 #include <usrpref.hxx>
+#include <iodetect.hxx>
 
 class TxtImportTest : public SwModelTestBase
 {
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index a5c9282d3121..703232b9cb8c 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -113,7 +113,9 @@
 #include <vcl/scheduler.hxx>
 #include <config_features.h>
 #include <sfx2/watermarkitem.hxx>
+#include <sfx2/fcontnr.hxx>
 #include <fmthdft.hxx>
+#include <iodetect.hxx>
 
 static char const DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data/";
 
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index 0495bd7cdc17..c5d5124fc9f3 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -19,6 +19,7 @@
 
 #include <pam.hxx>
 #include <pamtyp.hxx>
+#include <cshtyp.hxx>
 
 static SwMoveFnCollection aFwrd = {
     /* fnNd         */  &GoNext,
diff --git a/sw/source/core/doc/docglbl.cxx b/sw/source/core/doc/docglbl.cxx
index f0315919c54b..4484ff45dd2c 100644
--- a/sw/source/core/doc/docglbl.cxx
+++ b/sw/source/core/doc/docglbl.cxx
@@ -47,6 +47,7 @@
 #include <doctxm.hxx>
 #include <poolfmt.hxx>
 #include <calbck.hxx>
+#include <iodetect.hxx>
 #include <memory>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index 98f6288bba39..1969f720ffc2 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -35,6 +35,7 @@
 #include <shellio.hxx>
 #include <acorrect.hxx>
 #include <swerror.h>
+#include <iodetect.hxx>
 
 void SwEditShell::InsertGlossary( SwTextBlocks& rGlossary, const OUString& rStr )
 {
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index 8f26608090fd..fd951fb7d825 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -21,6 +21,7 @@
 #include <unofldmid.h>
 #include <strings.hrc>
 #include <o3tl/any.hxx>
+#include <swtypes.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index a336f4da8787..4b815acd94cd 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -104,6 +104,7 @@
 #include <memory>
 #include <unoparaframeenum.hxx>
 #include <unoparagraph.hxx>
+#include <iodetect.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/profilezone.hxx>
 
diff --git a/sw/source/filter/ascii/parasc.cxx b/sw/source/filter/ascii/parasc.cxx
index 9c038e776fec..d511424dba6d 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -43,6 +43,7 @@
 #include <strings.hrc>
 #include <mdiexp.hxx>
 #include <poolfmt.hxx>
+#include <iodetect.hxx>
 
 #include <vcl/metric.hxx>
 
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 1805094a13c8..c90fc94ddb34 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -53,6 +53,7 @@
 #include <swfltopt.hxx>
 #include <swerror.h>
 #include <swdll.hxx>
+#include <iodetect.hxx>
 #include <osl/module.hxx>
 #include <comphelper/processfactory.hxx>
 #include <rtl/bootstrap.hxx>
diff --git a/sw/source/filter/docx/swdocxreader.cxx b/sw/source/filter/docx/swdocxreader.cxx
index 20113ec459db..604afd23bcfa 100644
--- a/sw/source/filter/docx/swdocxreader.cxx
+++ b/sw/source/filter/docx/swdocxreader.cxx
@@ -40,6 +40,7 @@
 #include <unotxdoc.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotextrange.hxx>
+#include <sfx2/docfile.hxx>
 #define AUTOTEXT_GALLERY "autoTxt"
 
 using namespace css;
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index 6c195203a3d5..81ed85ae016c 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -33,6 +33,7 @@
 #include <poolfmt.hxx>
 #include <ndtxt.hxx>
 #include <paratr.hxx>
+#include <pam.hxx>
 
 #include "htmlnum.hxx"
 #include "wrthtml.hxx"
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 385d41f58e01..c124ae46027f 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -24,6 +24,7 @@
 #include <rtl/tencinfo.h>
 #include <vcl/wrkwin.hxx>
 #include <sfx2/linkmgr.hxx>
+#include <sfx2/docfile.hxx>
 
 #include <svtools/htmlcfg.hxx>
 #include <svtools/htmltokn.h>
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index bcec0644d13a..c29738838cb4 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -58,6 +58,7 @@ class SwHTMLNumRuleInfo;
 class SwHTMLPosFlyFrames;
 class SwTextFootnote;
 enum class HtmlPosition;
+enum class HtmlTokenId : sal_Int16;
 
 extern SwAttrFnTab aHTMLAttrFnTab;
 
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5e14913bb865..5340916cd5a9 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -90,6 +90,7 @@
 #include <o3tl/make_unique.hxx>
 #include <svl/grabbagitem.hxx>
 #include <frmatr.hxx>
+#include <swtable.hxx>
 #include "rtfexport.hxx"
 
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index cb354fecd8f1..f6dcdf3cecf8 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -60,6 +60,8 @@
 #include <ndtxt.hxx>
 #include <numrule.hxx>
 #include <frmatr.hxx>
+#include <swtable.hxx>
+#include <IMark.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index c7448f42fbd2..92a310a69e0e 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -100,6 +100,7 @@
 #include <unotools/saveopt.hxx>
 #include <o3tl/enumrange.hxx>
 #include <o3tl/enumarray.hxx>
+#include <sfx2/docfile.hxx>
 
 #include <algorithm>
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index c1b77dad4d26..7d6819593646 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -90,6 +90,7 @@
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/text/RubyPosition.hpp>
 #include <oox/export/vmlexport.hxx>
+#include <sfx2/docfile.hxx>
 
 #include "sprmids.hxx"
 
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 08f31d800dd5..25814a8e7b9d 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -111,6 +111,7 @@
 #include <filter/msfilter/svxmsbas.hxx>
 #include <rtl/random.h>
 #include <vcl/svapp.hxx>
+#include <sfx2/docfilt.hxx>
 #include "WW8Sttbf.hxx"
 #include <editeng/charrotateitem.hxx>
 #include "WW8FibData.hxx"
@@ -118,6 +119,7 @@
 #include <fmtclds.hxx>
 #include <rdfhelper.hxx>
 #include <fmtclbl.hxx>
+#include <iodetect.hxx>
 
 using namespace css;
 using namespace sw::util;
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 2faa25b2fa52..c678921485d2 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -127,6 +127,13 @@ class XEmbeddedObject;
 typedef std::map<const css::embed::XEmbeddedObject*, sal_Int32> WW8OleMap;
 struct WW8_PdAttrDesc;
 class SvxBrushItem;
+namespace sw
+{
+namespace mark
+{
+class IFieldmark;
+}
+}
 
 #define GRF_MAGIC_1 0x12    // 3 magic bytes for PicLocFc attribute
 #define GRF_MAGIC_2 0x34
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index dc6c41deeffb..55d2992bb9e8 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -128,6 +128,7 @@
 #endif
 
 #include <svx/hlnkitem.hxx>
+#include <sfx2/docfile.hxx>
 #include <swdll.hxx>
 #include "WW8Sttbf.hxx"
 #include "WW8FibData.hxx"
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 7781364550b8..605f00914006 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -25,6 +25,7 @@
 #include <fmtornt.hxx>
 #include <fmtsrnd.hxx>
 #include <editeng/lrspitem.hxx>
+#include <swtable.hxx>
 
 #include "ww8scan.hxx"
 #include "ww8par.hxx"
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index fbe1fa1a88b0..ce4c456db3d0 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -54,6 +54,7 @@
 #include <osl/file.hxx>
 #include <vcl/settings.hxx>
 #include <unoprnms.hxx>
+#include <iodetect.hxx>
 
 #include <dbui.hrc>
 #include <unomid.h>
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 262d10ab5e58..708f4718b6e9 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -72,6 +72,7 @@
 #include <strings.hrc>
 #include <unomid.h>
 #include <comphelper/string.hxx>
+#include <iodetect.hxx>
 
 using namespace svt;
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 8a8ed5f41d7e..6479ad71b3c5 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -70,6 +70,7 @@
 #include <memory>
 
 #include <strings.hrc>
+#include <iodetect.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index be9438ceae71..aa6dc0c65ab6 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -126,6 +126,7 @@
 #include <sfx2/Metadatable.hxx>
 #include <calbck.hxx>
 #include <dbmgr.hxx>
+#include <iodetect.hxx>
 
 #include <sal/log.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 3f72351acd3d..33f942256ff9 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -131,6 +131,7 @@
 #include <watermarkdialog.hxx>
 
 #include <ndtxt.hxx>
+#include <iodetect.hxx>
 
 #include <memory>
 
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 225dbc2c50b0..ef7227e71c94 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -138,6 +138,7 @@
 #include <dbfld.hxx>
 #include <IDocumentState.hxx>
 #include <imaildsplistener.hxx>
+#include <iodetect.hxx>
 
 #include <memory>
 #include <comphelper/propertysequence.hxx>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 34fe1fa3855a..0031d74c1604 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -125,6 +125,7 @@
 #include <calbck.hxx>
 #include <fmtmeta.hxx>
 #include <itabenum.hxx>
+#include <iodetect.hxx>
 
 #include <vcl/GraphicNativeTransform.hxx>
 #include <vcl/GraphicNativeMetadata.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 5e10465cb92a..6f81e9912c70 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -32,6 +32,7 @@
 
 #include <cmdid.h>
 #include <AnnotationWin.hxx>
+#include <swtypes.hxx>
 
 namespace sw { namespace annotation {
 
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 38493c9587b8..0fbd7315e4a4 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -56,6 +56,7 @@
 #include <wrtsh.hxx>
 #include <shellres.hxx>
 #include <AnnotationWin.hxx>
+#include <redline.hxx>
 #include <memory>
 
 namespace sw { namespace sidebarwindows {
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index e62da4f1b4f4..5001363ad2fc 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -37,6 +37,7 @@
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/string.hxx>
 #include <o3tl/make_unique.hxx>
+#include <sfx2/docfile.hxx>
 
 namespace sw { namespace sidebar {
 
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 871b24520a6f..b5b477f56587 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -67,6 +67,7 @@
 #include <mailmergehelper.hxx>
 
 #include <unomid.h>
+#include <iodetect.hxx>
 
 #include <memory>
 
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index ef3ed6b4d431..4c442911c6eb 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -179,6 +179,7 @@
 #include <SwSpellDialogChildWindow.hxx>
 #include <memory>
 #include <fchrfmt.hxx>
+#include <redline.hxx>
 
 #define TWIPS_PER_PIXEL 15