13 files changed, 15 insertions, 0 deletions
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)
 {