diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 0cd235052705..793a0b549e55 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -62,3 +62,13 @@ blacklist:
     sw/inc/unotxdoc.hxx:
     # sw::UnoImplPtr typedef
     - unobaseclass.hxx
+    sw/inc/breakit.hxx:
+    # std::unique_ptr dtor requires complete type
+    - com/sun/star/i18n/ForbiddenCharacters.hpp
+    sw/inc/dbmgr.hxx:
+    # uno::Sequence ctor needs the complete type
+    - com/sun/star/beans/PropertyValue.hpp
+    sw/inc/dlelstnr.hxx:
+    # base class has to be a complete type
+    - com/sun/star/frame/XTerminateListener.hpp
+    - com/sun/star/linguistic2/XLinguServiceEventListener.hpp
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 046893f70803..a12d8ed7f1fb 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -22,10 +22,11 @@
 
 #include <config_features.h>
 
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <svl/itemset.hxx>
 #include <svl/ownlist.hxx>
 
+namespace com { namespace sun { namespace star { namespace embed { class XEmbeddedObject; } } } }
+
 enum class SwHtmlOptType {
     IGNORE = 0,
     TAG = 1,
diff --git a/sw/inc/UndoParagraphSignature.hxx b/sw/inc/UndoParagraphSignature.hxx
index 30b6ddbf4555..c75eb4679a67 100644
--- a/sw/inc/UndoParagraphSignature.hxx
+++ b/sw/inc/UndoParagraphSignature.hxx
@@ -23,12 +23,12 @@
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/text/XTextField.hpp>
 
-struct SwPosition;
 class SwDoc;
 
+namespace com { namespace sun { namespace star { namespace text { class XTextContent; } } } }
+namespace com { namespace sun { namespace star { namespace text { class XTextField; } } } }
+
 /// Undo/Redo Paragraph Signature.
 class SwUndoParagraphSigning : public SwUndo
 {
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index f4ed96f3fc59..12ccb97b7111 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_ACCMAP_HXX
 
 #include <cppuhelper/weakref.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <rtl/ref.hxx>
 #include <osl/mutex.hxx>
 #include <svx/IAccessibleViewForwarder.hxx>
@@ -35,7 +34,6 @@
 
 class SwAccessibleParagraph;
 class SwViewShell;
-namespace tools { class Rectangle; }
 class SwFrame;
 class SwTextFrame;
 class SwPageFrame;
@@ -55,6 +53,7 @@ class SwFEShell;
 class Fraction;
 struct PreviewPage;
 namespace vcl { class Window; }
+namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
 
 // The shape list is filled if an accessible shape is destroyed. It
 // simply keeps a reference to the accessible shape's XShape. These
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 525c896ddb35..aad3d4757caa 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -22,13 +22,13 @@
 
 #include <memory>
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include "swdllapi.h"
 
 enum class SvtScriptType;
+namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 class SW_DLLPUBLIC SwBreakIt
 {
diff --git a/sw/inc/checkit.hxx b/sw/inc/checkit.hxx
index d00485dec30a..99de92166ce3 100644
--- a/sw/inc/checkit.hxx
+++ b/sw/inc/checkit.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/uno/Reference.h>
 
-#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
+namespace com { namespace sun { namespace star { namespace i18n { class XExtendedInputSequenceChecker; } } } }
 
 // Wrapper for the XInputSequenceChecker
 class SwCheckIt
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 2f4ee8735cd5..863af57b4562 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -29,8 +29,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <memory>
 #include <vector>
@@ -45,7 +44,6 @@ namespace com{namespace sun{namespace star{
     namespace beans{
 
         class XPropertySet;
-        struct PropertyValue;
     }
     namespace sdbcx{
         class XColumnsSupplier;
@@ -56,6 +54,8 @@ namespace com{namespace sun{namespace star{
     namespace mail{
         class XSmtpService;
     }
+    namespace embed { class XStorage; }
+    namespace frame { class XStorable; }
 }}}
 namespace svx {
     class ODataAccessDescriptor;
@@ -74,7 +74,6 @@ namespace weld {
 
 class SwView;
 class SwWrtShell;
-class SfxProgress;
 class ListBox;
 class Button;
 class SvNumberFormatter;
@@ -232,7 +231,6 @@ struct SwMergeDescriptor
     }
 };
 
-class AbstractMailMergeDlg;
 class SwDoc;
 
 class SW_DLLPUBLIC SwDBManager
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 7f58e9ba2db6..87e768466f37 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -21,17 +21,16 @@
 #define INCLUDED_SW_INC_DLELSTNR_HXX
 
 #include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
-#include <com/sun/star/frame/XDesktop2.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
 #include <cppuhelper/implbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace linguistic2 {
-        class XDictionaryList;
         class XLinguServiceManager2;
         class XProofreadingIterator;
     }
     namespace frame {
-        class XTerminateListener;
+        class XDesktop2;
     }
 } } }
 
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 145267775ca2..88a510de05f7 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SW_INC_DOC_HXX
 
 // SwDoc interfaces
-#include <com/sun/star/embed/XStorage.hpp>
 #include <o3tl/deleter.hxx>
 #include <vcl/idle.hxx>
 #include "swdllapi.h"
@@ -29,13 +28,9 @@
 #include "flyenum.hxx"
 #include "flypos.hxx"
 #include "swdbdata.hxx"
-#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
-#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <sfx2/objsh.hxx>
 #include <svl/style.hxx>
 #include <editeng/numitem.hxx>
-#include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
-#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include "tox.hxx"
 #include "frmfmt.hxx"
 #include "charfmt.hxx"
@@ -51,11 +46,8 @@
 
 namespace editeng { class SvxBorderLine; }
 
-class SvxForbiddenCharactersTable;
 class SwExtTextInput;
-class DateTime;
 class EditFieldInfo;
-class Color;
 class Outliner;
 class OutputDevice;
 class Point;
@@ -68,49 +60,30 @@ class SwAutoCompleteWord;
 class SwAutoCorrExceptWord;
 class SwCellFrame;
 class SwCellStyleTable;
-class SwCharFormat;
-class SwCharFormats;
-class SwConditionTextFormatColl;
 class SwCursorShell;
 class SwCursor;
 class SwDocShell;
-class SwDocUpdateField;
-class SwDrawFrameFormat;
 class SwDrawView;
 class SwEditShell;
-class SwFieldType;
-class SwField;
-class SwTextField;
-class SwFieldTypes;
-class SwFlyFrameFormat;
-class SwFormatsBase;
 class SwFormat;
 class SwFormatINetFormat;
 class SwFormatRefMark;
-class SwFrameFormat;
-class SwFrameFormats;
 class SwFootnoteIdxs;
 class SwFootnoteInfo;
 class SwEndNoteInfo;
-class SwGrfFormatColl;
-class SwGrfFormatColls;
 class SwLineNumberInfo;
 class SwDBManager;
 class SwNodeIndex;
 class SwNodeRange;
-class SwNodes;
 class SwNumRule;
-class SwNumRuleTable;
 class SwPagePreviewPrtData;
 class SwRootFrame;
 class SwRubyListEntry;
 class SwSectionFormat;
-class SwSectionFormats;
 class SwSectionData;
 class SwSelBoxes;
 class SwTableAutoFormatTable;
 class SwTOXBaseSection;
-class SwTOXTypes;
 class SwTabCols;
 class SwTable;
 class SwTableAutoFormat;
@@ -120,14 +93,10 @@ class SwTableFormat;
 class SwTableLineFormat;
 class SwTableNode;
 class SwTextBlocks;
-class SwTextFormatColl;
-class SwTextFormatColls;
 class SwURLStateChanged;
 class SwUnoCursor;
 class SwViewShell;
-class SetGetExpField;
 class SwDrawContact;
-class SwLayouter;
 class SdrView;
 class SdrMarkList;
 class SwAuthEntry;
@@ -135,23 +104,12 @@ class SwLayoutCache;
 class IStyleAccess;
 struct SwCallMouseEvent;
 struct SwDocStat;
-struct SwHash;
 struct SwSortOptions;
 struct SwDefTOXBase_Impl;
-class SwPrintData;
 class SwPrintUIOptions;
-class SdrPageView;
 struct SwConversionArgs;
-class SwRewriter;
-class SwMsgPoolItem;
-class SwChartDataProvider;
-class SwChartLockController_Helper;
 class IGrammarContact;
-class SwPrintData;
 class SwRenderData;
-class SwPageFrame;
-class SwViewOption;
-class SwList;
 class IDocumentUndoRedo;
 class IDocumentSettingAccess;
 class IDocumentDeviceAccess;
@@ -203,21 +161,18 @@ namespace sw {
 }
 
 namespace com { namespace sun { namespace star {
-namespace i18n {
-    struct ForbiddenCharacters;    //< comes from the I18N UNO interface
-}
-namespace uno {
-    template < class > class Sequence;
-}
 namespace container {
     class XNameContainer; //< for getXForms()/isXForms()/initXForms() methods
 }
+namespace embed { class XStorage; }
+namespace linguistic2 { class XHyphenatedWord; }
+namespace linguistic2 { class XProofreadingIterator; }
+namespace linguistic2 { class XSpellChecker1; }
+namespace script { namespace vba { class XVBAEventProcessor; } }
 }}}
 
 namespace sfx2 {
-    class SvLinkSource;
     class IXmlIdRegistry;
-    class LinkManager;
 }
 
 void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem );
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index cbee1542e559..0dd2b669d0c9 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -21,7 +21,6 @@
 
 #include <memory>
 #include <rtl/ref.hxx>
-#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <sfx2/docfac.hxx>
 #include <sfx2/objsh.hxx>
@@ -34,7 +33,6 @@
 
 class SwDoc;
 class SfxDocumentInfoDialog;
-class SfxStyleSheetBasePool;
 class SfxInPlaceClient;
 class FontList;
 class SwEditShell;
@@ -47,9 +45,7 @@ class SwCursorShell;
 class SwSrcView;
 class SwPaM;
 class SwgReaderOption;
-class SwOLEObj;
 class IDocumentDeviceAccess;
-class IDocumentSettingAccess;
 class IDocumentChartDataProviderAccess;
 class SwDocShell;
 class SwDrawModel;
@@ -57,6 +53,7 @@ namespace svt
 {
 class EmbeddedObjectRef;
 }
+namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
 
 // initialize DrawModel (in form of a SwDrawModel) and DocShell (in form of a SwDocShell)
 // as needed, one or both parameters may be zero
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 2ffa595abe28..8af4d54fb95f 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -32,6 +32,7 @@ class SwAttrSetChg;
 class SwDocPosUpdate;
 class SwFormatMeta;
 class SvXMLAttrContainerItem;
+class SwMsgPoolItem;
 
 // For SwTextHints without end index the following char is added:
 
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index c61deb8dd665..a4c2009ed7f8 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -20,6 +20,7 @@
 #include "accportions.hxx"
 #include <rtl/ustring.hxx>
 #include <com/sun/star/i18n/Boundary.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <txttypes.hxx>
 
 // for portion replacement in Special()
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 0d074c956d2b..0fb524de83fe 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -19,6 +19,7 @@
 
 #include <hintids.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <fmtcntnt.hxx>
 #include <txatbase.hxx>
 #include <frmatr.hxx>
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 029867f34b37..8c426cdf7de4 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -20,6 +20,7 @@
 #include <hintids.hxx>
 #include <editeng/protitem.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <unotools/charclass.hxx>
 #include <svl/ctloptions.hxx>
 #include <swmodule.hxx>
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index a137c0feec6f..5bba95739fa4 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -77,6 +77,7 @@
 #include <editeng/formatbreakitem.hxx>
 #include <o3tl/make_unique.hxx>
 #include <com/sun/star/i18n/Boundary.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <memory>
 
 
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 4e9853581854..9f4a08b7bd42 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -20,6 +20,7 @@
 #include <config_features.h>
 
 #include <doc.hxx>
+#include <com/sun/star/script/vba/XVBAEventProcessor.hpp>
 #include <DocumentFieldsManager.hxx>
 #include <DocumentSettingManager.hxx>
 #include <DocumentDrawModelManager.hxx>
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index f4056d1d08ff..84e0fc834afd 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -47,6 +47,7 @@
 #include <frmfmt.hxx>
 
 #include <vector>
+#include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::linguistic2;
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index ef62c91b839a..e7e42b679554 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -34,6 +34,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/misccfg.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <fmtpdsc.hxx>
 #include <fmthdft.hxx>
 #include <fmtcntnt.hxx>
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 9d6027622514..07fca37917bb 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -23,6 +23,7 @@
 #include <dcontact.hxx>
 #include <proofreadingiterator.hxx>
 #include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
+#include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/random.hxx>
diff --git a/sw/source/core/doc/docruby.cxx b/sw/source/core/doc/docruby.cxx
index efa8d1592150..65ba2090dfd3 100644
--- a/sw/source/core/doc/docruby.cxx
+++ b/sw/source/core/doc/docruby.cxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 
 #include <unotools/charclass.hxx>
 
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 112d06e28173..4253cd7ec1f4 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -22,6 +22,7 @@
 #include <editeng/protitem.hxx>
 #include <tools/gen.hxx>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <fmtcntnt.hxx>
 #include <fmtanchr.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index f07debf78c41..63f026082b67 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -23,6 +23,7 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <txatbase.hxx>
 #include <txtftn.hxx>
 #include <fmtftn.hxx>
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index bcbdf0650a33..5ddf80485522 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -28,6 +28,7 @@
 #include <tgrditem.hxx>
 #include <com/sun/star/i18n/BreakType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <unotools/charclass.hxx>
 #include "porfld.hxx"
 #include <paratr.hxx>
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 494cf572e746..e01f3a07d16f 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -56,6 +56,7 @@
 #include "itrtxt.hxx"
 #include <breakit.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <editeng/lrspitem.hxx>
 #include <calbck.hxx>
 
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 519583d63f2f..906ea389e7b9 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -20,6 +20,7 @@
 #include <hintids.hxx>
 
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <vcl/graph.hxx>
 #include <editeng/brushitem.hxx>
 #include <vcl/metric.hxx>
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 337a3b9299fe..5ed0f545799e 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/CTLScriptType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <paratr.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/scripttypeitem.hxx>
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 865839bf6dc6..a1d6cd0fefab 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <i18nlangtag/mslangid.hxx>
 #include <hintids.hxx>
 #include <EnhancedPDFExportHelper.hxx>
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 1650b2ea1473..61160582db45 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -33,6 +33,7 @@
 #include <breakit.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <editeng/langitem.hxx>
 #include <charatr.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index edb3b0ef7d76..1bff97648f32 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -20,6 +20,7 @@
 #include <hintids.hxx>
 #include <editeng/unolingu.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <viewopt.hxx>
 #include <viewsh.hxx>
 #include <SwPortionHandler.hxx>
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index bbfbe071d7e1..a26aa13c2ee1 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -32,6 +32,7 @@
 #include <vcl/lazydelete.hxx>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <breakit.hxx>
 #include <paintfrm.hxx>
 #include <viewsh.hxx>
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 36aaf7d0f8c6..8bc703817a21 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -24,6 +24,7 @@
 #include <vcl/outdev.hxx>
 #include <com/sun/star/i18n/CharType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 
 #include <vcl/print.hxx>
 #include <fntcache.hxx>
diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx
index 8433d8292344..f8cbb075b8ad 100644
--- a/sw/source/core/txtnode/txatritr.cxx
+++ b/sw/source/core/txtnode/txatritr.cxx
@@ -20,6 +20,7 @@
 #include <txatritr.hxx>
 
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <fchrfmt.hxx>
 #include <charfmt.hxx>
 #include <breakit.hxx>
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 8fae25735fcb..96ada91226f7 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -72,6 +72,7 @@
 
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 
 #include <vector>
 #include <utility>
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index f9135b0a01a4..0444d89745e8 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -30,6 +30,7 @@
 #include <unicode/ubidi.h>
 #include <tools/tenccvt.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 
 #include <unotools/fontcvt.hxx>
 #include <editeng/paperinf.hxx>
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index bae87a51e518..fda60b12ce8d 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -78,6 +78,7 @@
 #include "ww8par.hxx"
 #include <breakit.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include "ww8attributeoutput.hxx"
 #include "writerhelper.hxx"
 #include "writerwordglue.hxx"
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4e405f5d5e37..b57dcf28d06f 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -114,6 +114,7 @@
 #include <fmtftntx.hxx>
 #include <breakit.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <unotools/localedatawrapper.hxx>
 #include <svx/unobrushitemhelper.hxx>
 #include <svx/xenum.hxx>
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 073a6dc760cb..909725162a79 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -119,6 +119,7 @@
 #include <com/sun/star/sdb/XDocumentDataSource.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/uri/VndSunStarPkgUrlReferenceFactory.hpp>
+#include <com/sun/star/frame/XStorable.hpp>
 
 #include <unomid.h>
 #include <unotextrange.hxx>
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 73ae25a0277d..22a770b9b0d0 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
+#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
 
 #include <com/sun/star/i18n/UnicodeScript.hpp>
 #include <com/sun/star/i18n/CalendarFieldIndex.hpp>
diff --git a/sw/source/uibase/lingu/hhcwrp.cxx b/sw/source/uibase/lingu/hhcwrp.cxx
index 2ddc37cd28da..7192e4b72265 100644
--- a/sw/source/uibase/lingu/hhcwrp.cxx
+++ b/sw/source/uibase/lingu/hhcwrp.cxx
@@ -29,6 +29,7 @@
 #include <editeng/fontitem.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/text/RubyAdjust.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <hhcwrp.hxx>
 #include "sdrhhcwrap.hxx"
 #include <doc.hxx>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 83b2da910dd4..c5c071790170 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #include <svl/aeitem.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <docary.hxx>