tdf#42949 Fix IWYU warnings in sw/source/core/[o-t]*/*cxx

Also drop a duplicated blacklist rule found with:
grep :$ sw/IwyuFilter_sw.yaml  | sort | uniq -cd

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ied72f3f086ed4c1eb7ff4bcdbcf8aee73ddd4f7c
Reviewed-on: https://gerrit.libreoffice.org/83250
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

68 files changed, 16 insertions, 274 deletions

diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index cece7b00d807..e4ea44292af4 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <osl/diagnose.h>
-#include <editeng/svxenum.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <numrule.hxx>
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index e4f5c2efe713..87a10e9702e9 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <algorithm>
-#include <functional>
 #include <SwNumberTree.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
diff --git a/sw/source/core/objectpositioning/anchoredobjectposition.cxx b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
index ad3f7cd8ee46..42ec72d3221a 100644
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@ -19,7 +19,6 @@
 
 #include <anchoredobjectposition.hxx>
 #include <environmentofanchoredobject.hxx>
-#include <doc.hxx>
 #include <flyfrm.hxx>
 #include <flyfrms.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
index 6e1e2256d45e..3f094d6c7d06 100644
--- a/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <anchoreddrawobject.hxx>
 #include <ascharanchoredobjectposition.hxx>
 #include <frame.hxx>
 #include <txtfrm.hxx>
 #include <flyfrms.hxx>
 #include <svx/svdobj.hxx>
-#include <dcontact.hxx>
 #include <frmfmt.hxx>
 #include <frmatr.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
index 8e00bf3c592e..b8fb4f02a7fd 100644
--- a/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
+++ b/sw/source/core/objectpositioning/environmentofanchoredobject.cxx
@@ -20,7 +20,6 @@
 #include <environmentofanchoredobject.hxx>
 #include <frame.hxx>
 #include <pagefrm.hxx>
-#include <flyfrm.hxx>
 
 using namespace objectpositioning;
 
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 89fe27e30558..402249cf8080 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -28,7 +28,6 @@
 #include <viewopt.hxx>
 #include <viewsh.hxx>
 #include <frmfmt.hxx>
-#include <IDocumentSettingAccess.hxx>
 #include <fmtsrnd.hxx>
 #include <fmtfsize.hxx>
 #include <fmtanchr.hxx>
@@ -36,12 +35,8 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <svx/svdobj.hxx>
-#include <pam.hxx>
 #include <environmentofanchoredobject.hxx>
 #include <frmatr.hxx>
-#include <frmtool.hxx>
-#include <ndtxt.hxx>
-#include <dflyobj.hxx>
 #include <fmtwrapinfluenceonobjpos.hxx>
 #include <sortedobjs.hxx>
 #include <textboxhelper.hxx>
diff --git a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
index 6d6ad30275ee..19ad5ac611f6 100644
--- a/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
@@ -26,7 +26,6 @@
 #include <fmtanchr.hxx>
 #include <fmtornt.hxx>
 #include <fmtsrnd.hxx>
-#include <IDocumentSettingAccess.hxx>
 #include <frmatr.hxx>
 #include <viewsh.hxx>
 #include <viewopt.hxx>
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 27af55bd915c..7c374297b747 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -29,9 +29,6 @@
 
 #include <sot/exchange.hxx>
 #include <tools/globname.hxx>
-#include <hintids.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <unotools/configitem.hxx>
 #include <vcl/outdev.hxx>
@@ -42,7 +39,6 @@
 #include <pam.hxx>
 #include <section.hxx>
 #include <cntfrm.hxx>
-#include <frmatr.hxx>
 #include <ndole.hxx>
 #include <viewsh.hxx>
 #include <DocumentSettingManager.hxx>
@@ -52,7 +48,6 @@
 #include <vcl/graph.hxx>
 #include <sot/formats.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <strings.hrc>
 #include <svx/charthelper.hxx>
 #include <comphelper/threadpool.hxx>
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index a95b5100ec93..6c1853e01476 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -18,15 +18,12 @@
  */
 
 #include <hintids.hxx>
-#include <swtypes.hxx>
 #include <unomid.h>
 #include <com/sun/star/style/DropCapFormat.hpp>
 #include <o3tl/any.hxx>
-#include <unostyle.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <paratr.hxx>
 #include <charfmt.hxx>
-#include <cmdid.h>
 #include <libxml/xmlwriter.h>
 #include <osl/diagnose.h>
 
diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx
index 307e3181a4c1..748f764a3b71 100644
--- a/sw/source/core/sw3io/swacorr.cxx
+++ b/sw/source/core/sw3io/swacorr.cxx
@@ -20,10 +20,8 @@
 #include <swacorr.hxx>
 #include <swblocks.hxx>
 #include <SwXMLTextBlocks.hxx>
-#include <swerror.h>
 #include <docsh.hxx>
 #include <editsh.hxx>
-#include <sot/storage.hxx>
 #include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index a46d7d67039d..943cb8c415d2 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -20,7 +20,6 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/file.hxx>
@@ -43,8 +42,6 @@
 #include <shellio.hxx>
 #include <poolfmt.hxx>
 #include <SwXMLTextBlocks.hxx>
-#include <SwXMLBlockImport.hxx>
-#include <SwXMLBlockExport.hxx>
 #include <swerror.h>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index f4880417e929..782284c0d1f4 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -24,13 +24,11 @@
 #include <svtools/unoevent.hxx>
 #include <sfx2/docfile.hxx>
 #include <tools/diagnose_ex.h>
-#include <unotools/streamwrap.hxx>
 #include <comphelper/fileformat.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/FastParser.hpp>
 #include <com/sun/star/xml/sax/FastToken.hpp>
@@ -45,7 +43,6 @@
 #include <SwXMLBlockExport.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <sfx2/event.hxx>
-#include <swevent.hxx>
 #include <swerror.h>
 
 const char XMLN_BLOCKLIST[] = "BlockList.xml";
diff --git a/sw/source/core/swg/swblocks.cxx b/sw/source/core/swg/swblocks.cxx
index d19786ac90e4..7f56710677bc 100644
--- a/sw/source/core/swg/swblocks.cxx
+++ b/sw/source/core/swg/swblocks.cxx
@@ -20,23 +20,15 @@
 #include <algorithm>
 
 #include <osl/diagnose.h>
-#include <sfx2/docfilt.hxx>
-#include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
 #include <svl/fstathelper.hxx>
 #include <svl/macitem.hxx>
 #include <unotools/charclass.hxx>
-#include <frmfmt.hxx>
 #include <doc.hxx>
-#include <docary.hxx>
 #include <pam.hxx>
 #include <shellio.hxx>
 #include <swblocks.hxx>
-#include <ndtxt.hxx>
-#include <mdiexp.hxx>
 #include <SwXMLTextBlocks.hxx>
-#include <docsh.hxx>
-#include <swunohelper.hxx>
 
 #include <swerror.h>
 
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 5a099eec65cf..07667486eb5c 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -25,7 +25,6 @@
 #include <editeng/adjustitem.hxx>
 #include <editeng/colritem.hxx>
 #include <sfx2/linkmgr.hxx>
-#include <editeng/boxitem.hxx>
 #include <fmtfsize.hxx>
 #include <fmtornt.hxx>
 #include <fmtpdsc.hxx>
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index b3e35ae2d699..f47ee6c0ec71 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -31,8 +31,8 @@
 #include <editeng/adjustitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include <tools/urlobj.hxx>
+#include <svl/languageoptions.hxx>
 #include <svl/zforlist.hxx>
 #include <swatrset.hxx>
 #include <frmatr.hxx>
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index d5252724679d..add8333894a4 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -27,7 +27,6 @@
 #include <pagefrm.hxx>
 #include <colfrm.hxx>
 #include <swtypes.hxx>
-#include <sfx2/printer.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/ulspitem.hxx>
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index d07f9f5fdf7e..4f589ca683d9 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -20,15 +20,13 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
+#include <anchoredobject.hxx>
 #include <bodyfrm.hxx>
 #include <hintids.hxx>
 #include <editeng/keepitem.hxx>
 #include <editeng/hyphenzoneitem.hxx>
 #include <pagefrm.hxx>
 #include <ndtxt.hxx>
-#include <dcontact.hxx>
-#include <dflyobj.hxx>
-#include <flyfrm.hxx>
 #include <ftnfrm.hxx>
 #include <txtftn.hxx>
 #include <fmtftn.hxx>
@@ -37,21 +35,15 @@
 #include <viewsh.hxx>
 #include <frmatr.hxx>
 #include <pam.hxx>
-#include <flyfrms.hxx>
 #include <fmtanchr.hxx>
 #include "itrform2.hxx"
 #include "widorp.hxx"
 #include "txtcache.hxx"
-#include "porrst.hxx"
 #include <blink.hxx>
-#include "porfld.hxx"
 #include <sectfrm.hxx>
-#include "pormulti.hxx"
 #include <rootfrm.hxx>
 #include <frmfmt.hxx>
 #include <sortedobjs.hxx>
-#include "portab.hxx"
-#include <editeng/lrspitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <redline.hxx>
 #include <comphelper/lok.hxx>
diff --git a/sw/source/core/text/frminf.cxx b/sw/source/core/text/frminf.cxx
index 85a4a7d1f90f..3d6234e6e1de 100644
--- a/sw/source/core/text/frminf.cxx
+++ b/sw/source/core/text/frminf.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <pam.hxx>
 #include <frminf.hxx>
 #include "itrtxt.hxx"
 
diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx
index 967925d5847c..63ee403047d9 100644
--- a/sw/source/core/text/frmpaint.cxx
+++ b/sw/source/core/text/frmpaint.cxx
@@ -19,10 +19,8 @@
 
 #include <memory>
 #include <com/sun/star/text/HoriOrientation.hpp>
-#include <hintids.hxx>
 #include <editeng/pgrditem.hxx>
 #include <editeng/lrspitem.hxx>
-#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <paratr.hxx>
 
@@ -32,10 +30,8 @@
 #include <rootfrm.hxx>
 #include <pagefrm.hxx>
 #include <viewsh.hxx>
-#include <viewimp.hxx>
 #include <viewopt.hxx>
 #include <frmatr.hxx>
-#include <frmtool.hxx>
 #include <txtfrm.hxx>
 #include "itrpaint.hxx"
 #include "txtpaint.hxx"
@@ -45,7 +41,6 @@
 #include <swmodule.hxx>
 #include <tabfrm.hxx>
 #include <numrule.hxx>
-#include <SwGrammarMarkUp.hxx>
 #include <wrong.hxx>
 
 #include <EnhancedPDFExportHelper.hxx>
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 7d2f4a3b1010..0118f7479f83 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -19,13 +19,10 @@
 
 #include <editeng/unolingu.hxx>
 #include <breakit.hxx>
-#include <dlelstnr.hxx>
-#include <swmodule.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include "guess.hxx"
 #include "inftxt.hxx"
 #include <pagefrm.hxx>
-#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <com/sun/star/i18n/BreakType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 697a9e9b0cd0..7958200cd457 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -26,7 +26,6 @@
 #include <sfx2/printer.hxx>
 #include <sal/log.hxx>
 #include <editeng/hyphenzoneitem.hxx>
-#include <editeng/escapementitem.hxx>
 #include <editeng/hngpnctitem.hxx>
 #include <editeng/scriptspaceitem.hxx>
 #include <editeng/brushitem.hxx>
@@ -36,13 +35,9 @@
 #include <editeng/shaditem.hxx>
 
 #include <SwSmartTagMgr.hxx>
-#include <linguistic/lngprops.hxx>
-#include <editeng/unolingu.hxx>
 #include <breakit.hxx>
 #include <editeng/forbiddenruleitem.hxx>
 #include <paintfrm.hxx>
-#include <txatbase.hxx>
-#include <fmtinfmt.hxx>
 #include <swmodule.hxx>
 #include <vcl/svapp.hxx>
 #include <viewsh.hxx>
@@ -64,12 +59,8 @@
 #include <wrong.hxx>
 #include <doc.hxx>
 #include <pam.hxx>
-#include <SwGrammarMarkUp.hxx>
 #include <numrule.hxx>
 #include <EnhancedPDFExportHelper.hxx>
-#include <docufld.hxx>
-#include <frmfmt.hxx>
-#include <unomid.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::linguistic2;
diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index f32bc444712e..6c511f63f429 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -17,17 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/outdev.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <doc.hxx>
 
-#include <frame.hxx>
-#include <paratr.hxx>
 #include "itrtxt.hxx"
 #include "porglue.hxx"
 #include "porlay.hxx"
 #include "porfly.hxx"
-#include "pordrop.hxx"
 #include "pormulti.hxx"
 #include "portab.hxx"
 #include <memory>
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 1aed86e50a55..586e6c613627 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -23,9 +23,7 @@
 
 #include <hintids.hxx>
 #include <editeng/charscaleitem.hxx>
-#include <txtatr.hxx>
 #include <svl/itemiter.hxx>
-#include <sfx2/printer.hxx>
 #include <svx/svdobj.hxx>
 #include <vcl/svapp.hxx>
 #include <fmtanchr.hxx>
@@ -38,14 +36,12 @@
 #include <frmfmt.hxx>
 #include <fmtfld.hxx>
 #include <doc.hxx>
-#include <IDocumentSettingAccess.hxx>
-#include <IDocumentDeviceAccess.hxx>
 #include <IDocumentLayoutAccess.hxx>
+#include <txatbase.hxx>
 #include <viewsh.hxx>
 #include <rootfrm.hxx>
 #include <docary.hxx>
 #include <ndtxt.hxx>
-#include <dcontact.hxx>
 #include <fldbas.hxx>
 #include <pam.hxx>
 #include "itratr.hxx"
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 5806f06e3b76..09eb33c11606 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -17,22 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <ndtxt.hxx>
 #include <doc.hxx>
-#include <frmfmt.hxx>
 #include <paratr.hxx>
 #include <flyfrm.hxx>
 #include <pam.hxx>
 #include <swselectionlist.hxx>
 #include <sortedobjs.hxx>
-#include <editeng/protitem.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/lrspitem.hxx>
-#include <editeng/borderline.hxx>
 #include <frmatr.hxx>
-#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <pagefrm.hxx>
@@ -40,7 +35,6 @@
 #include "itrtxt.hxx"
 #include <txtfrm.hxx>
 #include <flyfrms.hxx>
-#include "porglue.hxx"
 #include "porfld.hxx"
 #include "porfly.hxx"
 #include "pordrop.hxx"
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index d8fa076085fc..927e6fae0b45 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -22,7 +22,6 @@
 #include <memory>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <editeng/lspcitem.hxx>
-#include <dcontact.hxx>
 #include <txtflcnt.hxx>
 #include <txtftn.hxx>
 #include <flyfrms.hxx>
@@ -45,12 +44,9 @@
 #include "porftn.hxx"
 #include "porhyph.hxx"
 #include "pordrop.hxx"
-#include "guess.hxx"
 #include <blink.hxx>
-#include <ftnfrm.hxx>
 #include "redlnitr.hxx"
 #include <pagefrm.hxx>
-#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <doc.hxx>
 #include "pormulti.hxx"
@@ -59,7 +55,6 @@
 #include <IDocumentSettingAccess.hxx>
 #include <IMark.hxx>
 #include <IDocumentMarkAccess.hxx>
-#include <svl/zforlist.hxx>
 
 #include <vector>
 
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index c56842f6a174..0e9b3d4dfa58 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -18,38 +18,21 @@
  */
 
 #include <hintids.hxx>
-#include <flyfrm.hxx>
 #include <viewopt.hxx>
-#include <txtatr.hxx>
 #include <tools/multisel.hxx>
-#include <editeng/escapementitem.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <txtinet.hxx>
-#include <fchrfmt.hxx>
-#include <frmatr.hxx>
-#include <sfx2/printer.hxx>
-#include <fmtfld.hxx>
-#include <fldbas.hxx>
-#include <rootfrm.hxx>
 #include <pagefrm.hxx>
-#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 
 #include <EnhancedPDFExportHelper.hxx>
 #include <IDocumentSettingAccess.hxx>
 
-#include <flyfrms.hxx>
 #include <viewsh.hxx>
 #include "itrpaint.hxx"
 #include <txtfrm.hxx>
-#include <txtfly.hxx>
 #include <swfont.hxx>
 #include "txtpaint.hxx"
 #include "portab.hxx"
-#include "porfly.hxx"
-#include "porfld.hxx"
-#include <frmfmt.hxx>
 #include <txatbase.hxx>
 #include <charfmt.hxx>
 #include "redlnitr.hxx"
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index 5a9976bead8d..c536287e1731 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ndtxt.hxx>
-#include <flyfrm.hxx>
 #include <txatbase.hxx>
 #include <paratr.hxx>
 #include <vcl/outdev.hxx>
@@ -26,13 +25,11 @@
 
 #include "pormulti.hxx"
 #include <pagefrm.hxx>
-#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include "porfld.hxx"
 
 #include "itrtxt.hxx"
 #include <txtfrm.hxx>
-#include "porfly.hxx"
 
 void SwTextIter::CtorInitTextIter( SwTextFrame *pNewFrame, SwTextInfo *pNewInf )
 {
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index 6a43962550da..7e1f91493c39 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -19,12 +19,6 @@
 
 #include <noteurl.hxx>
 
-#include <swtypes.hxx>
-#include <osl/diagnose.h>
-#include <vcl/outdev.hxx>
-#include <vcl/imaprect.hxx>
-#include <vcl/imap.hxx>
-
 // Global variable
 SwNoteURL *pNoteURL = nullptr;
 
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 3c42df910be4..a6e69a82e64c 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -35,12 +35,10 @@
 #include <frmatr.hxx>
 #include <frmtool.hxx>
 #include <viewsh.hxx>
-#include <docsh.hxx>
 #include <doc.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <rootfrm.hxx>
 #include <breakit.hxx>
-#include "porrst.hxx"
 #include "porftn.hxx"
 #include <accessibilityoptions.hxx>
 #include <editeng/lrspitem.hxx>
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 7c23bb17cae7..d785a9f3c74d 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -27,14 +27,10 @@
 #include <viewsh.hxx>
 #include <textboxhelper.hxx>
 
-#include <vcl/outdev.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/ulspitem.hxx>
 #include <sal/log.hxx>
 #include <fmtanchr.hxx>
 #include <fmtflcnt.hxx>
 #include <fmtornt.hxx>
-#include <frmatr.hxx>
 #include <flyfrms.hxx>
 #include <txatbase.hxx>
 #include "porfly.hxx"
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 2b0db4e6a86a..55de11a6d723 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -18,9 +18,7 @@
  */
 
 #include <swrect.hxx>
-#include <paratr.hxx>
 #include <viewopt.hxx>
-#include <SwPortionHandler.hxx>
 #include "porglue.hxx"
 #include "inftxt.hxx"
 #include "porlay.hxx"
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index e16619663f48..b4212904b18c 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -20,7 +20,6 @@
 #include "porlay.hxx"
 #include "itrform2.hxx"
 #include "porglue.hxx"
-#include "porexp.hxx"
 #include <blink.hxx>
 #include "redlnitr.hxx"
 #include "porfly.hxx"
@@ -37,19 +36,14 @@
 #include <paratr.hxx>
 #include <sal/log.hxx>
 #include <editeng/adjustitem.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include <editeng/charhiddenitem.hxx>
-#include <vcl/outdev.hxx>
 #include <svl/asiancfg.hxx>
-#include <editeng/blinkitem.hxx>
+#include <svl/languageoptions.hxx>
 #include <tools/multisel.hxx>
 #include <unotools/charclass.hxx>
-#include <i18nlangtag/mslangid.hxx>
 #include <charfmt.hxx>
-#include <fchrfmt.hxx>
 #include <docary.hxx>
 #include <redline.hxx>
-#include <section.hxx>
 #include <calbck.hxx>
 #include <doc.hxx>
 #include <swscanner.hxx>
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index e34ff7333d40..9c3355448fc7 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -22,9 +22,7 @@
 
 #include "porlin.hxx"
 #include "inftxt.hxx"
-#include "portxt.hxx"
 #include "pormulti.hxx"
-#include "porglue.hxx"
 #include <blink.hxx>
 #if OSL_DEBUG_LEVEL > 0
 
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index c2c0cbed33e8..340af76d0510 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -25,14 +25,10 @@
 #include <editeng/twolinesitem.hxx>
 #include <editeng/charrotateitem.hxx>
 #include <vcl/outdev.hxx>
-#include <fmtfld.hxx>
-#include <fldbas.hxx>
 #include <txatbase.hxx>
 #include <fmtruby.hxx>
 #include <txtatr.hxx>
 #include <charfmt.hxx>
-#include <txtinet.hxx>
-#include <fchrfmt.hxx>
 #include <layfrm.hxx>
 #include <SwPortionHandler.hxx>
 #include "pormulti.hxx"
@@ -42,10 +38,8 @@
 #include "itrform2.hxx"
 #include "porfld.hxx"
 #include "porglue.hxx"
-#include <breakit.hxx>
 #include <pagefrm.hxx>
 #include <rowfrm.hxx>
-#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <swtable.hxx>
 #include <fmtfsize.hxx>
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 3ec7042502a4..6f5398812d32 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
-#include <sfx2/printer.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/escapementitem.hxx>
@@ -39,7 +37,6 @@
 #include <pagedesc.hxx>
 #include <frmatr.hxx>
 #include "redlnitr.hxx"
-#include "porfly.hxx"
 #include "atrhndl.hxx"
 #include <rootfrm.hxx>
 
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 3a0ddd46d068..d40b4d12226c 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -27,17 +27,11 @@
 #include "porlay.hxx"
 #include "inftxt.hxx"
 #include "guess.hxx"
-#include "porglue.hxx"
-#include "portab.hxx"
 #include "porfld.hxx"
 #include <pagefrm.hxx>
 #include <tgrditem.hxx>
-#include <wrong.hxx>
-#include <viewsh.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentMarkAccess.hxx>
-#include <viewopt.hxx>
-#include <editeng/borderline.hxx>
 
 #include <IMark.hxx>
 #include <pam.hxx>
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 045603417850..39868efa72d3 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -27,7 +27,7 @@
 #include <scriptinfo.hxx>
 #include <swmodule.hxx>
 #include <redline.hxx>
-#include <txtatr.hxx>
+#include <txatbase.hxx>
 #include <docary.hxx>
 #include "itratr.hxx"
 #include <ndtxt.hxx>
@@ -36,7 +36,6 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <rootfrm.hxx>
 #include <breakit.hxx>
-#include <vcl/keycodes.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/settings.hxx>
 #include <txtfrm.hxx>
@@ -44,7 +43,6 @@
 #include <vcl/svapp.hxx>
 #include "redlnitr.hxx"
 #include <extinput.hxx>
-#include <sfx2/printer.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 6fa6702baebc..db4f09a19e45 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <hintids.hxx>
-#include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <paratr.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index c5d1816200df..eb95ed9453e1 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -32,15 +32,12 @@
 #include <viewopt.hxx>
 #include <flyfrm.hxx>
 #include <viewimp.hxx>
-#include <txtatr.hxx>
 #include <swfont.hxx>
 #include <swmodule.hxx>
-#include <fntcache.hxx>
 #include "porfld.hxx"
 #include "porftn.hxx"
 #include "porref.hxx"
 #include "portox.hxx"
-#include "porhyph.hxx"
 #include "porfly.hxx"
 #include "itrform2.hxx"
 #include <chpfld.hxx>
@@ -48,7 +45,6 @@
 #include <expfld.hxx>
 #include <docufld.hxx>
 #include <pagedesc.hxx>
-#include "pormulti.hxx"
 #include <fmtmeta.hxx>
 #include <reffld.hxx>
 #include <flddat.hxx>
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 51befd6f2878..47bc91729b0b 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -18,46 +18,39 @@
  */
 
 #include <vcl/outdev.hxx>
-#include <vcl/virdev.hxx>
 
-#include <dcontact.hxx>
 #include <pagefrm.hxx>
 #include <rootfrm.hxx>
 #include <pam.hxx>
+#include <swfont.hxx>
 #include <swregion.hxx>
 #include <dflyobj.hxx>
+#include <drawfont.hxx>
 #include <flyfrm.hxx>
+#include <flyfrms.hxx>
 #include <fmtornt.hxx>
 #include <frmatr.hxx>
 #include <frmtool.hxx>
-#include "porfly.hxx"
-#include "porfld.hxx"
+#include <ndtxt.hxx>
 #include <txtfly.hxx>
 #include "txtpaint.hxx"
-#include <txtatr.hxx>
 #include <notxtfrm.hxx>
 #include <fmtcnct.hxx>
-#include "inftxt.hxx"
 #include <svx/obj3d.hxx>
 #include <editeng/txtrange.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
-#include <editeng/lspcitem.hxx>
 #include <fmtsrnd.hxx>
 #include <fmtanchr.hxx>
 #include <frmfmt.hxx>
 #include <pagedesc.hxx>
-#include <tgrditem.hxx>
 #include <sortedobjs.hxx>
-#include <layouter.hxx>
 #include <IDocumentDrawModelAccess.hxx>
-#include <IDocumentLayoutAccess.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <svx/svdoedge.hxx>
 
 #ifdef DBG_UTIL
 #include <viewsh.hxx>
-#include <viewopt.hxx>
 #include <doc.hxx>
 #endif
 
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 028db9511c08..ad6b1943dbcd 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -20,12 +20,8 @@
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <svl/ctloptions.hxx>
-#include <sfx2/printer.hxx>
-#include <sfx2/sfxuno.hxx>
-#include <editeng/langitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/lrspitem.hxx>
-#include <editeng/ulspitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/pgrditem.hxx>
 #include <editeng/rsiditem.hxx>
@@ -41,22 +37,18 @@
 #include <viewsh.hxx>
 #include <pam.hxx>
 #include <ndtxt.hxx>
-#include <txtatr.hxx>
 #include <paratr.hxx>
 #include <viewopt.hxx>
-#include <dflyobj.hxx>
 #include <flyfrm.hxx>
 #include <tabfrm.hxx>
 #include <frmatr.hxx>
 #include <frmtool.hxx>
-#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <dbg_lay.hxx>
 #include <fmtfld.hxx>
 #include <fmtftn.hxx>
 #include <txtfld.hxx>
 #include <txtftn.hxx>
-#include <charatr.hxx>
 #include <ftninfo.hxx>
 #include <fmtline.hxx>
 #include <txtfrm.hxx>
@@ -75,9 +67,6 @@
 #include <fmtflcnt.hxx>
 #include <fmtcntnt.hxx>
 #include <numrule.hxx>
-#include <swtable.hxx>
-#include <fldupde.hxx>
-#include <docufld.hxx>
 #include <IGrammarContact.hxx>
 #include <calbck.hxx>
 #include <ftnidx.hxx>
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 5c17be3cbdb3..436580128f74 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -23,19 +23,15 @@
 #include <pagefrm.hxx>
 #include <rootfrm.hxx>
 #include <ndtxt.hxx>
-#include <txtatr.hxx>
 #include <SwPortionHandler.hxx>
 #include <txtftn.hxx>
 #include <flyfrm.hxx>
 #include <fmtftn.hxx>
 #include <ftninfo.hxx>
 #include <charfmt.hxx>
-#include <dflyobj.hxx>
 #include <rowfrm.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/charrotateitem.hxx>
-#include <breakit.hxx>
-#include <com/sun/star/i18n/ScriptType.hpp>
 #include <tabfrm.hxx>
 #include <sortedobjs.hxx>
 
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 615c287d1be9..215cc019b89b 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <breakit.hxx>
-#include <hintids.hxx>
 #include <editeng/unolingu.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
@@ -29,7 +28,6 @@
 #include "inftxt.hxx"
 #include "itrform2.hxx"
 #include "guess.hxx"
-#include <splargs.hxx>
 #include <rootfrm.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index bd52450f444a..e1155bc228e8 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -21,17 +21,6 @@
 #include <fntcache.hxx>
 #include <swfntcch.hxx>
 #include <txtfrm.hxx>
-#include "txtcache.hxx"
-#include "porlay.hxx"
-#include "porglue.hxx"
-#include "porexp.hxx"
-#include "porrst.hxx"
-#include "portab.hxx"
-#include "porfly.hxx"
-#include "portox.hxx"
-#include "porref.hxx"
-#include "porftn.hxx"
-#include "porhyph.hxx"
 #include "pordrop.hxx"
 #include <blink.hxx>
 #include <init.hxx>
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
index c2fded221827..a38cbe048d44 100644
--- a/sw/source/core/text/txttab.cxx
+++ b/sw/source/core/text/txttab.cxx
@@ -19,12 +19,10 @@
 
 #include <hintids.hxx>
 #include <comphelper/string.hxx>
-#include <editeng/lrspitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <doc.hxx>
-#include <frmatr.hxx>
 #include <SwPortionHandler.hxx>
 
 #include <viewopt.hxx>
@@ -32,7 +30,6 @@
 #include "inftxt.hxx"
 #include "itrform2.hxx"
 #include <txtfrm.hxx>
-#include <numrule.hxx>
 #include "porfld.hxx"
 #include <memory>
 
diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx
index 904744c6bf02..74d085c319f0 100644
--- a/sw/source/core/text/widorp.cxx
+++ b/sw/source/core/text/widorp.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
-
 #include <layfrm.hxx>
 #include <ftnboss.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 2f8fd90e1d62..d9c2336613f0 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -17,13 +17,10 @@
 #include <cellfrm.hxx>
 #include <hffrm.hxx>
 #include <rootfrm.hxx>
-#include <editsh.hxx>
 #include <ndtxt.hxx>
-#include "porlin.hxx"
-#include "porlay.hxx"
-#include "portxt.hxx"
 #include <sortedobjs.hxx>
 #include <swfont.hxx>
+#include <txttypes.hxx>
 #include <anchoredobject.hxx>
 #include <libxml/xmlwriter.h>
 #include <SwPortionHandler.hxx>
diff --git a/sw/source/core/tox/ToxLinkProcessor.cxx b/sw/source/core/tox/ToxLinkProcessor.cxx
index bc2a6450d7f8..c86cde923fef 100644
--- a/sw/source/core/tox/ToxLinkProcessor.cxx
+++ b/sw/source/core/tox/ToxLinkProcessor.cxx
@@ -14,8 +14,6 @@
 #include <ndtxt.hxx>
 #include <sal/log.hxx>
 
-#include <stdexcept>
-
 namespace sw {
 
 void
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx b/sw/source/core/tox/ToxTextGenerator.cxx
index dae424c596eb..9a92776160eb 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -28,14 +28,10 @@
 #include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
-#include <fmtinfmt.hxx>
 #include <ndtxt.hxx>
-#include <pagedesc.hxx>
 #include <tox.hxx>
 #include <txmsrt.hxx>
 #include <fmtautofmt.hxx>
-#include <DocumentSettingManager.hxx>
-#include <SwStyleNameMapper.hxx>
 #include <swatrset.hxx>
 #include <ToxWhitespaceStripper.hxx>
 #include <ToxLinkProcessor.hxx>
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index f1df646e6bf0..59f841dab111 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -19,7 +19,6 @@
 
 #include <hintids.hxx>
 #include <swtypes.hxx>
-#include <txtatr.hxx>
 #include <ndtxt.hxx>
 #include <txttxmrk.hxx>
 #include <tox.hxx>
@@ -28,9 +27,7 @@
 #include <docary.hxx>
 #include <paratr.hxx>
 #include <editeng/tstpitem.hxx>
-#include <SwStyleNameMapper.hxx>
 #include <hints.hxx>
-#include <functional>
 #include <calbck.hxx>
 
 #include <o3tl/optional.hxx>
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index 1c383a757ae0..058d83b8db79 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -20,7 +20,6 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/i18n/IndexEntrySupplier.hpp>
 #include <toxwrap.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index aeb0f36f6a3d..8b362c33ff48 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -18,33 +18,27 @@
  */
 
 #include <unotools/charclass.hxx>
-#include <com/sun/star/i18n/CollatorOptions.hpp>
-#include <editeng/unolingu.hxx>
 #include <txtfld.hxx>
 #include <doc.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <IDocumentMarkAccess.hxx>
-#include <docary.hxx>
 #include <cntfrm.hxx>
 #include <txtfrm.hxx>
 #include <rootfrm.hxx>
 #include <modeltoviewhelper.hxx>
 #include <node.hxx>
-#include <frmatr.hxx>
 #include <pam.hxx>
 #include <txttxmrk.hxx>
 #include <frmfmt.hxx>
 #include <fmtfld.hxx>
 #include <txmsrt.hxx>
 #include <ndtxt.hxx>
-#include <txtatr.hxx>
 #include <swtable.hxx>
 #include <expfld.hxx>
 #include <authfld.hxx>
 #include <toxwrap.hxx>
 
 #include <strings.hrc>
-#include <numrule.hxx>
 #include <reffld.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx
index bb26450cc31b..d957bfbcc273 100644
--- a/sw/source/core/txtnode/SwGrammarContact.cxx
+++ b/sw/source/core/txtnode/SwGrammarContact.cxx
@@ -24,8 +24,6 @@
 #include <ndtxt.hxx>
 #include <SwGrammarMarkUp.hxx>
 #include <txtfrm.hxx>
-#include <rootfrm.hxx>
-#include <viewsh.hxx>
 
 namespace {
 
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx
index fba15a6107f9..a0f1b83f2cfc 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -33,7 +33,6 @@
 #include <ddefld.hxx>
 #include <usrfld.hxx>
 #include <expfld.hxx>
-#include <swfont.hxx>
 #include <ndtxt.hxx>
 #include <calc.hxx>
 #include <hints.hxx>
@@ -42,6 +41,7 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <fieldhint.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 
 // constructor for default item in attribute-pool
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index 1509c0cf3d40..3fcb11019402 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <hintids.hxx>
-#include <cntfrm.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <IDocumentLayoutAccess.hxx>
@@ -29,7 +28,6 @@
 #include <fmtflcnt.hxx>
 #include <txtflcnt.hxx>
 #include <fmtanchr.hxx>
-#include <swfont.hxx>
 #include <txtfrm.hxx>
 #include <flyfrms.hxx>
 #include <objectformatter.hxx>
diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx
index e9c9709a9ae5..548ef6131e7c 100644
--- a/sw/source/core/txtnode/atrftn.cxx
+++ b/sw/source/core/txtnode/atrftn.cxx
@@ -28,7 +28,6 @@
 #include <txtftn.hxx>
 #include <ftnidx.hxx>
 #include <ftninfo.hxx>
-#include <swfont.hxx>
 #include <ndtxt.hxx>
 #include <poolfmt.hxx>
 #include <ftnfrm.hxx>
diff --git a/sw/source/core/txtnode/atrref.cxx b/sw/source/core/txtnode/atrref.cxx
index dadbebf56993..d9078b5e5f98 100644
--- a/sw/source/core/txtnode/atrref.cxx
+++ b/sw/source/core/txtnode/atrref.cxx
@@ -22,7 +22,6 @@
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <txtrfmrk.hxx>
-#include <swfont.hxx>
 
 SwFormatRefMark::~SwFormatRefMark( )
 {
diff --git a/sw/source/core/txtnode/atrtox.cxx b/sw/source/core/txtnode/atrtox.cxx
index 0569cc7e03fc..613956be9979 100644
--- a/sw/source/core/txtnode/atrtox.cxx
+++ b/sw/source/core/txtnode/atrtox.cxx
@@ -19,9 +19,7 @@
 
 #include <doc.hxx>
 #include <txttxmrk.hxx>
-#include <swfont.hxx>
 #include <tox.hxx>
-#include <ndtxt.hxx>
 
 SwTextTOXMark::SwTextTOXMark( SwTOXMark& rAttr,
             sal_Int32 const nStartPos, sal_Int32 const*const pEnd)
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index 376908cdbc8a..31a64a9ed5cd 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -22,10 +22,8 @@
 #include <poolfmt.hxx>
 #include <unomid.h>
 
-#include <basic/sbxvar.hxx>
 #include <o3tl/any.hxx>
 #include <svl/macitem.hxx>
-#include <svl/stritem.hxx>
 #include <svl/stylepool.hxx>
 #include <fmtautofmt.hxx>
 #include <fchrfmt.hxx>
@@ -34,7 +32,6 @@
 #include <fmtruby.hxx>
 #include <charfmt.hxx>
 #include <hints.hxx>
-#include <unostyle.hxx>
 #include <unoevent.hxx>
 #include <com/sun/star/text/RubyAdjust.hpp>
 #include <com/sun/star/text/RubyPosition.hpp>
@@ -42,7 +39,6 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
-#include <cmdid.h>
 #include <com/sun/star/uno/Any.h>
 #include <SwStyleNameMapper.hxx>
 
@@ -51,7 +47,6 @@
 #include <doc.hxx>
 #include <unometa.hxx>
 #include <docsh.hxx>
-#include <svl/zforlist.hxx>
 #include <osl/diagnose.h>
 
 #include <algorithm>
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 7ced0397cd17..871cce1a50ca 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -21,11 +21,9 @@
 #include <sal/config.h>
 
 #include <cstdint>
-#include <cstdlib>
 
 #include <i18nlangtag/mslangid.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/print.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
@@ -41,10 +39,8 @@
 #include <IDocumentSettingAccess.hxx>
 #include <swfont.hxx>
 #include <wrong.hxx>
-#include <dbg_lay.hxx>
 #include <txtfrm.hxx>
 #include <pagefrm.hxx>
-#include <pagedesc.hxx>
 #include <tgrditem.hxx>
 #include <scriptinfo.hxx>
 #include <editeng/brushitem.hxx>
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 09695fa0c74d..e253e3bd5681 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
-#include <editeng/cmapitem.hxx>
 #include <editeng/svxfont.hxx>
 
 #include <vcl/outdev.hxx>
@@ -26,7 +24,6 @@
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 
-#include <vcl/print.hxx>
 #include <fntcache.hxx>
 #include <swfont.hxx>
 #include <breakit.hxx>
diff --git a/sw/source/core/txtnode/ndhints.cxx b/sw/source/core/txtnode/ndhints.cxx
index 6c73067fcdea..afa77e41de10 100644
--- a/sw/source/core/txtnode/ndhints.cxx
+++ b/sw/source/core/txtnode/ndhints.cxx
@@ -19,7 +19,6 @@
 
 #include <editeng/rsiditem.hxx>
 #include <sal/log.hxx>
-#include <svl/eitem.hxx>
 #include <txatbase.hxx>
 #include <ndhints.hxx>
 #include <txtatr.hxx>
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 6adb0a93dcf6..d71378ebeff4 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -23,20 +23,15 @@
 #include <comphelper/lok.hxx>
 #include <comphelper/string.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/formatbreakitem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/rsiditem.hxx>
-#include <editeng/tstpitem.hxx>
-#include <svl/urihelper.hxx>
-#include <svl/ctloptions.hxx>
 #include <sal/log.hxx>
-#include <swmodule.hxx>
+#include <anchoredobject.hxx>
 #include <txtfld.hxx>
 #include <txtinet.hxx>
+#include <fmtanchr.hxx>
 #include <fmtinfmt.hxx>
-#include <fmtpdsc.hxx>
-#include <txtatr.hxx>
 #include <fmtrfmrk.hxx>
 #include <txttxmrk.hxx>
 #include <fchrfmt.hxx>
@@ -44,7 +39,6 @@
 #include <fmtflcnt.hxx>
 #include <fmtfld.hxx>
 #include <frmatr.hxx>
-#include <charatr.hxx>
 #include <ftnidx.hxx>
 #include <ftninfo.hxx>
 #include <fmtftn.hxx>
@@ -63,23 +57,18 @@
 #include <paratr.hxx>
 #include <txtfrm.hxx>
 #include <ftnfrm.hxx>
-#include <ftnboss.hxx>
 #include <rootfrm.hxx>
-#include <pagedesc.hxx>
 #include <expfld.hxx>
 #include <section.hxx>
 #include <mvsave.hxx>
 #include <swcache.hxx>
 #include <SwGrammarMarkUp.hxx>
-#include <dcontact.hxx>
 #include <redline.hxx>
-#include <doctxm.hxx>
 #include <IMark.hxx>
 #include <scriptinfo.hxx>
 #include <istyleaccess.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <numrule.hxx>
-#include <swtable.hxx>
 #include <docsh.hxx>
 #include <SwNodeNum.hxx>
 #include <svl/intitem.hxx>
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 55284ce3d275..b398fa8f8d81 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -21,12 +21,9 @@
 
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <vcl/outdev.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <editeng/unolingu.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/wrlmitem.hxx>
 #include <editeng/blinkitem.hxx>
-#include <editeng/nhypitem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/cmapitem.hxx>
 #include <editeng/langitem.hxx>
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index f6c0b771b52a..70ee13a679a9 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -20,19 +20,14 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
-#include <DocumentSettingManager.hxx>
 #include <DocumentContentOperationsManager.hxx>
 #include <hintids.hxx>
 #include <editeng/xmlcnitm.hxx>
 #include <editeng/rsiditem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/itemiter.hxx>
-#include <svl/stylepool.hxx>
-#include <editeng/fontitem.hxx>
+#include <editeng/charhiddenitem.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/emphasismarkitem.hxx>
-#include <editeng/charscaleitem.hxx>
-#include <editeng/charrotateitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <txtinet.hxx>
 #include <txtflcnt.hxx>
@@ -50,7 +45,6 @@
 #include <txtftn.hxx>
 #include <txtfld.hxx>
 #include <txtannotationfld.hxx>
-#include <charatr.hxx>
 #include <charfmt.hxx>
 #include <frmfmt.hxx>
 #include <ftnidx.hxx>
@@ -73,9 +67,7 @@
 #include <expfld.hxx>
 #include <usrfld.hxx>
 #include <poolfmt.hxx>
-#include <swfont.hxx>
 #include <istyleaccess.hxx>
-#include <dcontact.hxx>
 #include <docsh.hxx>
 #include <algorithm>
 #include <map>
diff --git a/sw/source/core/txtnode/txatbase.cxx b/sw/source/core/txtnode/txatbase.cxx
index e0293d61d881..be497b5b8889 100644
--- a/sw/source/core/txtnode/txatbase.cxx
+++ b/sw/source/core/txtnode/txatbase.cxx
@@ -22,7 +22,6 @@
 #include <svl/itempool.hxx>
 #include <txatbase.hxx>
 #include <fmtfld.hxx>
-#include <docufld.hxx>
 
 SwTextAttr::SwTextAttr( SfxPoolItem& rAttr, sal_Int32 nStart )
     : m_pAttr( &rAttr )
diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx
index 07d6747f6470..bfd4cb080a14 100644
--- a/sw/source/core/txtnode/txtatr2.cxx
+++ b/sw/source/core/txtnode/txtatr2.cxx
@@ -20,9 +20,6 @@
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <osl/diagnose.h>
-#include <sfx2/objsh.hxx>
-#include <editeng/xmlcnitm.hxx>
-#include <editeng/twolinesitem.hxx>
 #include <txtinet.hxx>
 #include <txtatr.hxx>
 #include <fchrfmt.hxx>
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 5c599d78afab..5880d2f03396 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -20,19 +20,17 @@
 #include <hintids.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/itemiter.hxx>
+#include <svl/languageoptions.hxx>
 #include <editeng/splwrap.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include <editeng/hangulhanja.hxx>
 #include <i18nutil/transliteration.hxx>
 #include <SwSmartTagMgr.hxx>
-#include <linguistic/lngprops.hxx>
 #include <officecfg/Office/Writer.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/charclass.hxx>
 #include <sal/log.hxx>
-#include <dlelstnr.hxx>
 #include <swmodule.hxx>
 #include <splargs.hxx>
 #include <viewopt.hxx>
@@ -42,10 +40,8 @@
 #include <IDocumentLayoutAccess.hxx>
 #include <docsh.hxx>
 #include <txtfld.hxx>
-#include <fmtfld.hxx>
 #include <txatbase.hxx>
 #include <charatr.hxx>
-#include <fldbas.hxx>
 #include <pam.hxx>
 #include <hints.hxx>
 #include <ndtxt.hxx>
@@ -55,7 +51,6 @@
 #include <swscanner.hxx>
 
 #include <breakit.hxx>
-#include <crstate.hxx>
 #include <UndoOverwrite.hxx>
 #include <txatritr.hxx>
 #include <redline.hxx>
@@ -70,8 +65,6 @@
 #include <unicode/uchar.h>
 #include <DocumentSettingManager.hxx>
 
-#include <unomid.h>
-
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>