sw: fix some IWYU warnings

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

44 files changed, 52 insertions, 37 deletions

diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 7cc7a356899e..7aa0a23df4b4 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -33,6 +33,7 @@ class SwObjPositioningInProgress;
 
 class SwFrameFormat;
 class SwFormatAnchor;
+enum class RndStdIds;
 
 /** wrapper class for the positioning of Writer fly frames and drawing objects
 
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 9bc2e3b90a0b..4a8c40e8903f 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -21,6 +21,7 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
+#include <tools/solar.h>
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/util/Date.hpp>
 #include "swdllapi.h"
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index eb04a2ab9b3b..145267775ca2 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -174,6 +174,7 @@ class SetGetExpFields;
 struct SwInsertTableOptions;
 enum class SvMacroItemId : sal_uInt16;
 enum class SvxFrameDirection;
+enum class RndStdIds;
 
 namespace sw { namespace mark {
     class MarkManager;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 67be27486aea..43c37323f29a 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -52,6 +52,7 @@ class SotDataObject;
 class SwFrameFormat;
 struct SwSortOptions;
 class SdrMarkList;
+enum class RndStdIds;
 
 namespace svx
 {
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 2885b150e655..7b8d70962350 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -22,7 +22,6 @@
 #include <memory>
 #include "swdllapi.h"
 #include <rtl/ustring.hxx>
-#include <vcl/bitmap.hxx>
 
 struct SW_DLLPUBLIC ShellResource
 {
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 50c3e7ae6973..f5813c9ee9b7 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_SPLARGS_HXX
 
 #include <i18nlangtag/lang.h>
-#include <tools/solar.h>
 #include <tools/gen.hxx>
 
 #include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
@@ -28,7 +27,6 @@
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 
 #include <functional>
-#include <limits.h>
 
 class SwTextFrame;
 class SwTextNode;
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index d11d882052b5..c0c1c232c20c 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -20,19 +20,12 @@
 #define INCLUDED_SW_INC_SWABSTDLG_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
 #include <sfx2/sfxdlg.hxx>
-#include <svx/svxdlg.hxx>
-#include <vcl/syswin.hxx>
-#include "globals.hrc"
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include "itabenum.hxx"
 #include <boost/optional.hpp>
 #include "dbmgr.hxx"
 #include <cnttab.hxx>
@@ -73,6 +66,7 @@ class SwChildWinWrapper;
 struct SfxChildWinInfo;
 class SwTOXMark;
 struct SwDocStat;
+struct SwInsertTableOptions;
 enum class SwBorderModes;
 enum class SwCharDlgMode;
 enum class SfxStyleFamily;
diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx
index 08140ffb4d20..fc39a81a72bc 100644
--- a/sw/inc/swacorr.hxx
+++ b/sw/inc/swacorr.hxx
@@ -25,9 +25,10 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/embed/XStorage.hpp>
 
-#include <SwXMLTextBlocks.hxx>
 #include "swdllapi.h"
 
+class SwXMLTextBlocks;
+
 class SW_DLLPUBLIC SwAutoCorrect : public SvxAutoCorrect
 {
     using  SvxAutoCorrect::PutText;
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index a6021e5bcac2..7392b33f09b5 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -18,7 +18,6 @@
  */
 #ifndef INCLUDED_SW_INC_SWATRSET_HXX
 #define INCLUDED_SW_INC_SWATRSET_HXX
-#include <tools/solar.h>
 #include <tools/mempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx
index cb59ddd28699..00711143736d 100644
--- a/sw/inc/swcalwrp.hxx
+++ b/sw/inc/swcalwrp.hxx
@@ -21,9 +21,13 @@
 #define INCLUDED_SW_INC_SWCALWRP_HXX
 
 #include <i18nlangtag/lang.h>
-#include <rtl/ustring.hxx>
 #include <unotools/calendarwrapper.hxx>
-#include <salhelper/singletonref.hxx>
+#include <comphelper/processfactory.hxx>
+
+namespace salhelper
+{
+template <typename> class SingletonRef;
+}
 
 class SwCalendarWrapper : public CalendarWrapper
 {
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index 546014168399..5149bec8fbf8 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.hxx
@@ -18,14 +18,14 @@
  */
 #ifndef INCLUDED_SW_INC_SWCLI_HXX
 #define INCLUDED_SW_INC_SWCLI_HXX
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-
-#include <svtools/embedhlp.hxx>
-
 #include <sfx2/ipclient.hxx>
 
 class SwView;
 class SwEditWin;
+namespace svt
+{
+class EmbeddedObjectRef;
+}
 
 class SwOleClient : public SfxInPlaceClient
 {
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index bbe3ac688f8a..1723f5e1bb0b 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_INC_SWCRSR_HXX
 #define INCLUDED_SW_INC_SWCRSR_HXX
 
-#include <com/sun/star/i18n/WordType.hpp>
-
 #include "pam.hxx"
 #include "tblsel.hxx"
 #include "cshtyp.hxx"
diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx
index 9a47e89990d5..362c8f733138 100644
--- a/sw/inc/swdbdata.hxx
+++ b/sw/inc/swdbdata.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_INC_SWDBDATA_HXX
 #define INCLUDED_SW_INC_SWDBDATA_HXX
 
-#include <tools/solar.h>
+#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 // contains the description of a data source
diff --git a/sw/inc/swdll.hxx b/sw/inc/swdll.hxx
index 4af803ac0d20..9cc9b3c8bfe0 100644
--- a/sw/inc/swdll.hxx
+++ b/sw/inc/swdll.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_INC_SWDLL_HXX
 #define INCLUDED_SW_INC_SWDLL_HXX
 
-#include <sfx2/module.hxx>
-
 #include "swdllapi.h"
 
 namespace sw { class Filters; }
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index a618d8ca7f74..c63a0770babb 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SW_INC_SWEVENT_HXX
 #define INCLUDED_SW_INC_SWEVENT_HXX
 
-#include <sfx2/event.hxx>
-#include <tools/solar.h>
 #include "calbck.hxx"
 #include "frmfmt.hxx"
 #include "hints.hxx"
@@ -40,7 +38,6 @@
 #define     STR_SW_EVENT_FRM_RESIZE           11
 #define     STR_SW_EVENT_FRM_MOVE             12
 
-class SwFrameFormat;
 class SwFormatINetFormat;
 class IMapObject;
 
diff --git a/sw/inc/swfltopt.hxx b/sw/inc/swfltopt.hxx
index 1091d28756a3..00115a087f4c 100644
--- a/sw/inc/swfltopt.hxx
+++ b/sw/inc/swfltopt.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SW_INC_SWFLTOPT_HXX
 #define INCLUDED_SW_INC_SWFLTOPT_HXX
 
+#include "swdllapi.h"
 #include <unotools/configitem.hxx>
 
 class SW_DLLPUBLIC SwFilterOptions : public utl::ConfigItem
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 6ccb758d0bfa..fea95f2c93f3 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -20,13 +20,13 @@
 #define INCLUDED_SW_INC_SWSERV_HXX
 
 #include <sfx2/linksrc.hxx>
-#include "IMark.hxx"
 
 class SwSectionNode;
 class SwBaseLink;
 class SwTableNode;
 struct SwPosition;
 class SwPaM;
+namespace sw { namespace mark { class IMark; } }
 
 class SwServerObject final : public ::sfx2::SvLinkSource
 {
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 4422b214c29f..613f258fe192 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -19,28 +19,20 @@
 #ifndef INCLUDED_SW_INC_SWTYPES_HXX
 #define INCLUDED_SW_INC_SWTYPES_HXX
 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
-#include <tools/mapunit.hxx>
-#include "SwGetPoolIdFromName.hxx"
 
 #include <limits.h>
 #include <com/sun/star/uno/Reference.h>
 #include "swdllapi.h"
-#include <i18nlangtag/languagetag.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <svx/swframetypes.hxx>
+#include <i18nlangtag/lang.h>
 
 namespace com { namespace sun { namespace star {
     namespace linguistic2{
-        class XDictionaryList;
         class XLinguProperties;
         class XSpellChecker1;
         class XHyphenator;
         class XThesaurus;
     }
-    namespace beans{
-        class XPropertySet;
-    }
 }}}
 namespace utl{
     class TransliterationWrapper;
@@ -51,8 +43,8 @@ class SwPathFinder;
 class Graphic;
 class OutputDevice;
 class CharClass;
-class LocaleDataWrapper;
 class CollatorWrapper;
+class LanguageTag;
 
 typedef long SwTwips;
 #define INVALID_TWIPS   LONG_MAX
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index f642735c33c1..33fc1debfded 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -10,6 +10,8 @@
 #include <sal/config.h>
 #include <test/bootstrapfixture.hxx>
 
+#include <com/sun/star/i18n/WordType.hpp>
+
 #include <rtl/strbuf.hxx>
 #include <osl/file.hxx>
 
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index 50e1a47d6beb..d05f8d115c81 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
+#include <com/sun/star/text/TextContentAnchorType.hpp>
 
 #include <ftninfo.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 9ef300b9bac0..236621d1f88e 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -114,6 +114,7 @@
 #include <config_features.h>
 #include <sfx2/watermarkitem.hxx>
 #include <sfx2/fcontnr.hxx>
+#include <sfx2/docfile.hxx>
 #include <fmthdft.hxx>
 #include <iodetect.hxx>
 
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index 8f3387d303bf..ab640d848931 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
+#include <com/sun/star/text/TextContentAnchorType.hpp>
 
 #include <ftninfo.hxx>
 #include <pagedesc.hxx>
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index aece5124d461..c747d3da2d99 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -127,6 +127,7 @@
 #include <vcl/mapmod.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <salhelper/singletonref.hxx>
 #include <viscrs.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 25ad91c0fba2..2252685f4309 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -60,6 +60,7 @@
 #include <tgrditem.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/syslocale.hxx>
+#include <svx/swframetypes.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx
index 22f4f8bfe575..cc3bff0306d4 100644
--- a/sw/source/core/docnode/swbaslnk.cxx
+++ b/sw/source/core/docnode/swbaslnk.cxx
@@ -29,6 +29,7 @@
 #include <editeng/boxitem.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/linkmgr.hxx>
+#include <sfx2/event.hxx>
 #include <svtools/soerr.hxx>
 #include <fmtfsize.hxx>
 #include <fmtanchr.hxx>
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index 77098f9c08aa..98f01ecaafd9 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -21,6 +21,8 @@
 
 #include <tools/datetime.hxx>
 #include <o3tl/sorted_vector.hxx>
+#include <vcl/errcode.hxx>
+#include <rtl/ref.hxx>
 
 class SwPaM;
 class SwDoc;
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 66c13b4a5e39..18e7d95970f2 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -40,6 +40,7 @@
 #include <SwXMLBlockImport.hxx>
 #include <SwXMLBlockExport.hxx>
 #include <xmloff/xmlnmspe.hxx>
+#include <sfx2/event.hxx>
 #include <swevent.hxx>
 #include <swerror.h>
 
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index 86128e2a8d4c..13e8ddc61aa6 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -28,6 +28,7 @@
 #include <fmtinfmt.hxx>
 #include <svl/macitem.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <sfx2/event.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 4b815acd94cd..18047a1ca874 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -101,6 +101,7 @@
 #include <SwStyleNameMapper.hxx>
 #include <sortopt.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
 #include <memory>
 #include <unoparaframeenum.hxx>
 #include <unoparagraph.hxx>
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 25814a8e7b9d..7c4fd5b2cf55 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -114,6 +114,7 @@
 #include <sfx2/docfilt.hxx>
 #include "WW8Sttbf.hxx"
 #include <editeng/charrotateitem.hxx>
+#include <svx/swframetypes.hxx>
 #include "WW8FibData.hxx"
 #include <numrule.hxx>
 #include <fmtclds.hxx>
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index 605f00914006..de22c001a9da 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 <svx/swframetypes.hxx>
 #include <swtable.hxx>
 
 #include "ww8scan.hxx"
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index f2c34c8f21c1..472c68a584eb 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -126,6 +126,7 @@
 
 #include <sfx2/fcontnr.hxx>
 #include <svx/ClassificationDialog.hxx>
+#include <svtools/embedhlp.hxx>
 
 #include <swabstdlg.hxx>
 #include <watermarkdialog.hxx>
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx
index 92ec03527b71..bb6df864bb55 100644
--- a/sw/source/uibase/dochdl/gloshdl.cxx
+++ b/sw/source/uibase/dochdl/gloshdl.cxx
@@ -51,6 +51,7 @@
 #include <vcl/lstbox.hxx>
 
 #include <editeng/acorrcfg.hxx>
+#include <sfx2/event.hxx>
 #include <swabstdlg.hxx>
 
 #include <IDocumentFieldsAccess.hxx>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 53728e07eb11..41e841646bae 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -155,6 +155,9 @@
 #include <rootfrm.hxx>
 
 #include <unotools/syslocaleoptions.hxx>
+#include <i18nlangtag/mslangid.hxx>
+#include <salhelper/singletonref.hxx>
+#include <sfx2/event.hxx>
 #include <memory>
 
 using namespace sw::mark;
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index 2ecbd2c2f9d6..e15e4a5664c9 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -26,6 +26,7 @@
 #include <sfx2/lnkbase.hxx>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <o3tl/typed_flags_set.hxx>
+#include <svx/swframetypes.hxx>
 #include <memory>
 
 class Graphic;
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 556e0570a395..51fd466b81fc 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -27,6 +27,7 @@
 #include "navmgr.hxx"
 #include <boost/optional.hpp>
 #include <o3tl/typed_flags_set.hxx>
+#include <svx/swframetypes.hxx>
 
 namespace vcl { class Window; }
 class SbxArray;
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 181bb8c72ead..ffa11114c8e8 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -75,6 +75,7 @@
 #include <swabstdlg.hxx>
 
 #include <svx/dialogs.hrc>
+#include <svx/svxdlg.hxx>
 
 #include <docsh.hxx>
 #include <svx/drawitem.hxx>
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index fe367a81c2cd..e65646e48443 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -61,6 +61,7 @@
 #include <strings.hrc>
 #include <sfx2/app.hxx>
 #include <svx/dialogs.hrc>
+#include <sfx2/event.hxx>
 #include <swabstdlg.hxx>
 #include <doc.hxx>
 #include <app.hrc>
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 790cf3442d77..2b9780d853ea 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -107,6 +107,7 @@ using namespace ::com::sun::star;
 #include <IDocumentDrawModelAccess.hxx>
 #include <drawdoc.hxx>
 #include <svtools/embedhlp.hxx>
+#include <sfx2/event.hxx>
 
 SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell)
 
diff --git a/sw/source/uibase/table/tablemgr.cxx b/sw/source/uibase/table/tablemgr.cxx
index d848cbbca003..5f49fa04bf57 100644
--- a/sw/source/uibase/table/tablemgr.cxx
+++ b/sw/source/uibase/table/tablemgr.cxx
@@ -27,6 +27,7 @@
 #include <sot/storage.hxx>
 #include <comphelper/classids.hxx>
 #include <svx/charthelper.hxx>
+#include <svtools/embedhlp.hxx>
 
 #include <edtwin.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx
index c533427b67ca..4d896b52792b 100644
--- a/sw/source/uibase/uiview/swcli.cxx
+++ b/sw/source/uibase/uiview/swcli.cxx
@@ -27,6 +27,7 @@
 #include <swcli.hxx>
 #include <cmdid.h>
 #include <cfgitems.hxx>
+#include <svtools/embedhlp.hxx>
 
 #include <toolkit/helper/vclunohelper.hxx>
 
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index 0695185d2fa2..bad0b82dfefb 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -24,6 +24,7 @@
 #include <svl/macitem.hxx>
 #include <unotools/charclass.hxx>
 #include <editeng/scripttypeitem.hxx>
+#include <sfx2/event.hxx>
 #include <cmdid.h>
 #include <view.hxx>
 #include <basesh.hxx>
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 6bbc5821f881..59962673e9ef 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -102,6 +102,7 @@
 
 #include <sfx2/msgpool.hxx>
 #include <comphelper/lok.hxx>
+#include <svtools/embedhlp.hxx>
 #include <memory>
 
 using namespace sw::mark;
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 2d8c629ee947..d038cf89f1ba 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -63,6 +63,7 @@
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
+#include <sfx2/event.hxx>
 
 void SwWrtShell::Insert(SwField const &rField)
 {