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

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

Change-Id: I1c68650bb93f918d7ff38491ffedf9af96d80b52
Reviewed-on: https://gerrit.libreoffice.org/78083
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

53 files changed, 16 insertions, 196 deletions

diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 4cdfafc47c98..0b80ae609177 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -453,3 +453,6 @@ blacklist:
     sw/source/uibase/sidebar/PageMarginUtils.hxx:
     # Needed for std::abs
     - cmath
+    sw/source/core/crsr/paminit.cxx:
+    # Needed for linker visibility of extern functions
+    - cshtyp.hxx
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 12762fa4a5d5..b71a38596e92 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -39,9 +39,7 @@
 #include "acccell.hxx"
 
 #include <cfloat>
-#include <limits.h>
 
-#include <ndtxt.hxx>
 #include <editeng/brushitem.hxx>
 #include <swatrset.hxx>
 #include <frmatr.hxx>
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 69e9587988c8..b11cb6cf8329 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -43,14 +42,12 @@
 #include <flyfrm.hxx>
 #include <dflyobj.hxx>
 #include <pam.hxx>
-#include <viewimp.hxx>
 #include <accmap.hxx>
 #include "accfrmobjslist.hxx"
 #include "acccontext.hxx"
 #include <svx/AccessibleShape.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "accpara.hxx"
 #include <PostItMgr.hxx>
 
 using namespace sw::access;
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 35b345d517f8..434746a923f3 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <sfx2/viewsh.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <viewsh.hxx>
@@ -36,16 +35,12 @@
 #include <strings.hrc>
 #include <pagefrm.hxx>
 
-#include <editeng/brushitem.hxx>
 #include <swatrset.hxx>
-#include <frmatr.hxx>
-#include <unostyle.hxx>
 #include <docsh.hxx>
 #include <crsrsh.hxx>
 #include <fesh.hxx>
 #include <fmtclds.hxx>
 #include <flyfrm.hxx>
-#include <colfrm.hxx>
 #include <txtfrm.hxx>
 #include <sectfrm.hxx>
 #include <section.hxx>
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index eb63f192f02c..9804cbc0b27e 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <flyfrm.hxx>
@@ -27,8 +26,6 @@
 #include <cntfrm.hxx>
 #include <notxtfrm.hxx>
 #include <ndole.hxx>
-#include <doc.hxx>
-#include <docsh.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 876e8c278364..2a96b0149f30 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
 #include <ftnfrm.hxx>
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 5f95c9163d28..bca511eb0cfa 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -17,22 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hintids.hxx>
 #include <editeng/brushitem.hxx>
 #include <flyfrm.hxx>
-#include <rootfrm.hxx>
-#include <txtfrm.hxx>
 #include <sectfrm.hxx>
 #include <section.hxx>
 #include <viewsh.hxx>
 #include <viewopt.hxx>
-#include <doc.hxx>
 #include <frmatr.hxx>
 #include <pagefrm.hxx>
 #include <pagedesc.hxx>
-#include <fmtanchr.hxx>
 #include <fldbas.hxx>
-#include <dcontact.hxx>
 #include <accmap.hxx>
 #include "accfrmobjslist.hxx"
 #include "accfrmobjmap.hxx"
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index 9b344b5a2b35..2040f0c76e11 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -24,9 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <frmfmt.hxx>
-#include <ndnotxt.hxx>
 #include <flyfrm.hxx>
-#include <cntfrm.hxx>
 #include <fmtcntnt.hxx>
 #include <ndindex.hxx>
 #include <fesh.hxx>
@@ -35,11 +33,9 @@
 #include "accframebase.hxx"
 
 #include <crsrsh.hxx>
-#include <txtfrm.hxx>
 #include <notxtfrm.hxx>
 #include <ndtxt.hxx>
 #include <undobj.hxx>
-#include <dcontact.hxx>
 #include <fmtanchr.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index 5923eb11f2a4..c4bae0b8f0b8 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -33,8 +33,6 @@
 #include <fmtanchr.hxx>
 #include <dcontact.hxx>
 
-#include <pam.hxx>
-
 #include <vcl/window.hxx>
 
 namespace sw { namespace access {
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index bdf3af7452b6..f088ff8fd419 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -18,17 +18,13 @@
  */
 
 #include "accfrmobjmap.hxx"
-#include "accframe.hxx"
 #include <accmap.hxx>
 #include "acccontext.hxx"
 
 #include <viewsh.hxx>
 #include <doc.hxx>
 #include <IDocumentDrawModelAccess.hxx>
-#include <frmfmt.hxx>
 #include <pagefrm.hxx>
-#include <txtfrm.hxx>
-#include <node.hxx>
 #include <sortedobjs.hxx>
 #include <anchoredobject.hxx>
 
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 0599050baf19..d6d115d78066 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -19,7 +19,6 @@
 
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <flyfrm.hxx>
 #include <fmturl.hxx>
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 90e954d994c7..e998b5c0e74d 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
 #include <hffrm.hxx>
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index fbade55b8569..74f9ac443eeb 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -26,7 +26,6 @@
 #include <swurl.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/svapp.hxx>
-#include <ndtxt.hxx>
 #include <txtinet.hxx>
 #include "accpara.hxx"
 #include "acchyperlink.hxx"
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b5f2c615961b..1516853e1fb1 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <rtl/ref.hxx>
-#include <rtl/strbuf.hxx>
-#include <sal/log.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <vcl/window.hxx>
 #include <svx/svdmodel.hxx>
@@ -55,7 +53,6 @@
 #include <IDocumentDrawModelAccess.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
 #include <svx/ShapeTypeHandler.hxx>
-#include <vcl/svapp.hxx>
 #include <svx/SvxShapeTypes.hxx>
 #include <svx/svdpage.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 1eb5faf01be0..b35cf64a78b6 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -20,21 +20,17 @@
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <frmfmt.hxx>
 #include <ndnotxt.hxx>
 #include <flyfrm.hxx>
-#include <cntfrm.hxx>
 #include <notxtfrm.hxx>
 #include <hints.hxx>
 #include "accnotextframe.hxx"
 #include <fmturl.hxx>
 #include "accnotexthyperlink.hxx"
-#include <vcl/imap.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
-#include <doc.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index 9f7ebd5d7470..5fbe826c92cc 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -22,8 +22,6 @@
 #include <comphelper/accessiblekeybindinghelper.hxx>
 #include <swurl.hxx>
 #include <vcl/svapp.hxx>
-#include <ndtxt.hxx>
-#include <txtinet.hxx>
 #include <frmfmt.hxx>
 
 #include "accnotexthyperlink.hxx"
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 2ba612b0e335..e6388c145f0b 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/window.hxx>
-#include <vcl/svapp.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index f8ad27d96077..389adb8c5b0b 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -32,7 +32,6 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -51,18 +50,14 @@
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include <unotools/charclass.hxx>
 #include <unocrsr.hxx>
 #include <unoport.hxx>
 #include <doc.hxx>
 #include <IDocumentRedlineAccess.hxx>
-#include <txtatr.hxx>
 #include "acchyperlink.hxx"
 #include "acchypertextdata.hxx"
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
-#include <section.hxx>
-#include <doctxm.hxx>
 #include <comphelper/accessibletexthelper.hxx>
 #include <algorithm>
 #include <docufld.hxx>
@@ -78,9 +73,7 @@
 #include <wrong.hxx>
 #include <editeng/brushitem.hxx>
 #include <swatrset.hxx>
-#include <frmatr.hxx>
 #include <unosett.hxx>
-#include <paratr.hxx>
 #include <unomap.hxx>
 #include <unoprnms.hxx>
 #include <com/sun/star/text/WritingMode2.hpp>
@@ -94,7 +87,6 @@
 #include <editeng/editids.hrc>
 
 #include <reffld.hxx>
-#include <expfld.hxx>
 #include <flddat.hxx>
 #include "../../uibase/inc/fldmgr.hxx"
 #include <fldbas.hxx>      // SwField
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index 30efc92cc61d..367630cdbd4e 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -32,28 +32,11 @@
 
 // for GetWordBoundary(...), GetSentenceBoundary(...):
 #include <breakit.hxx>
-#include <ndtxt.hxx>
 #include <txtfrm.hxx>
 
 // for FillSpecialPos(...)
 #include <crstate.hxx>
 
-// for SwAccessibleContext::GetResource()
-#include "acccontext.hxx"
-
-// for Post-It replacement text:
-#include <txatbase.hxx>
-#include <fmtfld.hxx>
-#include <fldbas.hxx>
-#include <docufld.hxx>
-
-// for in-line graphics replacement:
-#include <ndindex.hxx>
-#include <ndnotxt.hxx>
-#include <fmtflcnt.hxx>
-#include <frmfmt.hxx>
-#include <fmtcntnt.hxx>
-
 using namespace ::com::sun::star;
 
 using i18n::Boundary;
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index 0bb2131e15d4..28026690c81e 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <strings.hrc>
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 681110f6e924..64f7fed7bd01 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 #include <algorithm>
 #include <vector>
-#include <set>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -33,19 +31,16 @@
 #include <vcl/svapp.hxx>
 #include <frmfmt.hxx>
 #include <tabfrm.hxx>
-#include <rowfrm.hxx>
 #include <cellfrm.hxx>
 #include <swtable.hxx>
 #include <crsrsh.hxx>
 #include <viscrs.hxx>
 #include <hints.hxx>
-#include <fesh.hxx>
 #include "accfrmobjslist.hxx"
 #include <accmap.hxx>
 #include <strings.hrc>
 #include "acctable.hxx"
 
-#include <layfrm.hxx>
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 
 #include <editeng/brushitem.hxx>
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index df805c3ed080..6d98e5b32daa 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -25,6 +25,10 @@
 #include <vector>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
 
+#include <svl/poolitem.hxx>
+
+#include <calbck.hxx>
+
 #include "acccontext.hxx"
 
 class SwTabFrame;
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index eff9c3c1e782..44a5b37d7e05 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -28,12 +28,10 @@
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <frmfmt.hxx>
 #include <flyfrm.hxx>
 #include <accmap.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
-#include <doc.hxx>
 #include <hints.hxx>
 #include "acctextframe.hxx"
 
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index ac99ac2fc9ff..f0fa52017d38 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -21,7 +21,6 @@
 #include <cellatr.hxx>
 #include <doc.hxx>
 #include <float.h>
-#include <format.hxx>
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <node.hxx>
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 10655bd5b62d..50180ce53eec 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -25,9 +25,7 @@
 #include <format.hxx>
 #include <hintids.hxx>
 #include <hints.hxx>
-#include <paratr.hxx>
 #include <swcache.hxx>
-#include <swtblfmt.hxx>
 #include <frmatr.hxx>
 #include <svl/grabbagitem.hxx>
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 91ab13c4d426..96784aeabe03 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -18,11 +18,11 @@
  */
 
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <editeng/scripttypeitem.hxx>
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <ndtxt.hxx>
 #include <swtypes.hxx>
+#include <svl/languageoptions.hxx>
 #include <vcl/outdev.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index dc7ef136561f..14931ed3b4cf 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -21,18 +21,12 @@
 
 #include <cellatr.hxx>
 #include <charfmt.hxx>
-#include <cmdid.h>
 #include <doc.hxx>
 #include <IDocumentListsAccess.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/brushitem.hxx>
-#include <editeng/lineitem.hxx>
-#include <editeng/boxitem.hxx>
 #include <editeng/editeng.hxx>
 #include <fmtanchr.hxx>
 #include <fmtpdsc.hxx>
 #include <hintids.hxx>
-#include <istyleaccess.hxx>
 #include <list.hxx>
 #include <node.hxx>
 #include <numrule.hxx>
@@ -40,7 +34,6 @@
 #include <paratr.hxx>
 #include <osl/diagnose.h>
 #include <svl/whiter.hxx>
-#include <svx/xtable.hxx>
 
 #include <svx/svdpool.hxx>
 #include <svx/sxenditm.hxx>
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index fe1e9e49ca77..964e9a37d5b2 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -23,8 +23,7 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/BreakIterator.hpp>
-#include <editeng/unolingu.hxx>
-#include <editeng/scripttypeitem.hxx>
+#include <svl/languageoptions.hxx>
 #include <unicode/uchar.h>
 #include <unotools/localedatawrapper.hxx>
 #include <algorithm>
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 123b02b1ff1e..a2140e497ce2 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -27,7 +27,6 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <cstdlib>
-#include <dbfld.hxx>
 #include <dbmgr.hxx>
 #include <docfld.hxx>
 #include <docstat.hxx>
@@ -35,14 +34,13 @@
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentStatistics.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/scripttypeitem.hxx>
-#include <editeng/unolingu.hxx>
 #include <expfld.hxx>
 #include <hintids.hxx>
 #include <o3tl/temporary.hxx>
-#include <osl/diagnose.hxx>
+#include <osl/diagnose.h>
 #include <rtl/math.hxx>
 #include <shellres.hxx>
+#include <svl/languageoptions.hxx>
 #include <svl/zforlist.hxx>
 #include <swmodule.hxx>
 #include <swtypes.hxx>
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index f32d37f5d41d..6c6d462ab331 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -23,7 +23,6 @@
 #include <cellatr.hxx>
 #include <checkit.hxx>
 #include <cmdid.h>
-#include <fesh.hxx>
 #include <comphelper/processfactory.hxx>
 #include <doc.hxx>
 #include <editeng/acorrcfg.hxx>
@@ -74,7 +73,6 @@
 #include <editeng/twolinesitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/udlnitem.hxx>
-#include <editeng/unolingu.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/widwitem.hxx>
 #include <editeng/wrlmitem.hxx>
@@ -113,15 +111,12 @@
 #include <hfspacingitem.hxx>
 #include <hintids.hxx>
 #include <init.hxx>
-#include <pam.hxx>
 #include <paratr.hxx>
 #include <proofreadingiterator.hxx>
 #include <editeng/editids.hrc>
 #include <svx/svxids.hrc>
 #include <rtl/instance.hxx>
 #include <svl/macitem.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xflgrit.hxx>
 #include <svx/sdtaitm.hxx>
 #include <swcalwrp.hxx>
 #include <SwStyleNameMapper.hxx>
@@ -132,7 +127,6 @@
 #include <unotools/charclass.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include <unotools/syslocale.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sw/source/core/bastyp/proofreadingiterator.cxx b/sw/source/core/bastyp/proofreadingiterator.cxx
index b0f75471d942..7d09b1676ccd 100644
--- a/sw/source/core/bastyp/proofreadingiterator.cxx
+++ b/sw/source/core/bastyp/proofreadingiterator.cxx
@@ -14,7 +14,6 @@
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <sal/types.h>
 #include <vcl/svapp.hxx>
 
 #include <proofreadingiterator.hxx>
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 443e267b9006..2227000051a5 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -20,7 +20,6 @@
 #include <swcache.hxx>
 
 #include <o3tl/safeint.hxx>
-#include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index b66e0d85f9e1..1d53e6e7a71e 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -23,9 +23,6 @@
 #include <tools/stream.hxx>
 #endif
 
-#include <math.h>
-#include <stdlib.h>
-
 SwRect::SwRect( const tools::Rectangle &rRect ) :
     m_Point( rRect.Left(), rRect.Top() )
 {
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index c86f93fa1a94..620f4bab771a 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -18,31 +18,10 @@
  */
 
 #include <swtypes.hxx>
-#include <rtl/ustring.hxx>
 
-#include <bodyfrm.hxx>
-#include <cellfrm.hxx>
-#include <colfrm.hxx>
 #include <editeng/unolingu.hxx>
-#include <fntcache.hxx>
-#include <frmfmt.hxx>
-#include <frmtool.hxx>
-#include <hffrm.hxx>
-#include <ndtxt.hxx>
-#include <pagefrm.hxx>
-#include <rowfrm.hxx>
-#include <sectfrm.hxx>
-#include <swatrset.hxx>
-#include <swfntcch.hxx>
-#include <swtable.hxx>
-#include <swtblfmt.hxx>
-#include <tabfrm.hxx>
-#include <txtfrm.hxx>
-#include <UndoDelete.hxx>
-#include <UndoInsert.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
-#include <viscrs.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/crsr/DateFormFieldButton.cxx b/sw/source/core/crsr/DateFormFieldButton.cxx
index af3d70cbc7a6..4ecaf15dbfba 100644
--- a/sw/source/core/crsr/DateFormFieldButton.cxx
+++ b/sw/source/core/crsr/DateFormFieldButton.cxx
@@ -9,20 +9,11 @@
 
 #include <DateFormFieldButton.hxx>
 #include <edtwin.hxx>
-#include <basegfx/color/bcolortools.hxx>
-#include <viewopt.hxx>
 #include <bookmrk.hxx>
 #include <vcl/floatwin.hxx>
-#include <vcl/event.hxx>
-#include <vcl/lstbox.hxx>
-#include <xmloff/odffields.hxx>
-#include <IMark.hxx>
-#include <view.hxx>
-#include <docsh.hxx>
-#include <strings.hrc>
 #include <vcl/calendar.hxx>
 #include <tools/date.hxx>
-#include <svx/numfmtsh.hxx>
+#include <svl/zforlist.hxx>
 
 class SwDatePickerDialog : public FloatingWindow
 {
diff --git a/sw/source/core/crsr/DropDownFormFieldButton.cxx b/sw/source/core/crsr/DropDownFormFieldButton.cxx
index 1114a1a97d40..7a42bf7c853f 100644
--- a/sw/source/core/crsr/DropDownFormFieldButton.cxx
+++ b/sw/source/core/crsr/DropDownFormFieldButton.cxx
@@ -9,11 +9,8 @@
 
 #include <DropDownFormFieldButton.hxx>
 #include <edtwin.hxx>
-#include <basegfx/color/bcolortools.hxx>
-#include <viewopt.hxx>
 #include <bookmrk.hxx>
 #include <vcl/floatwin.hxx>
-#include <vcl/event.hxx>
 #include <vcl/lstbox.hxx>
 #include <xmloff/odffields.hxx>
 #include <IMark.hxx>
diff --git a/sw/source/core/crsr/FormFieldButton.cxx b/sw/source/core/crsr/FormFieldButton.cxx
index b69fab1d86d1..162d03f43224 100644
--- a/sw/source/core/crsr/FormFieldButton.cxx
+++ b/sw/source/core/crsr/FormFieldButton.cxx
@@ -8,19 +8,11 @@
  */
 
 #include <DropDownFormFieldButton.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <edtwin.hxx>
 #include <basegfx/color/bcolortools.hxx>
-#include <viewopt.hxx>
 #include <bookmrk.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/event.hxx>
-#include <vcl/lstbox.hxx>
-#include <IMark.hxx>
-#include <view.hxx>
-#include <docsh.hxx>
-#include <strings.hrc>
 
 FormFieldButton::FormFieldButton(SwEditWin* pEditWin, sw::mark::Fieldmark& rFieldmark)
     : MenuButton(pEditWin, WB_DIALOGCONTROL)
diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx
index 4a54c3970897..9741f276906e 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -20,7 +20,6 @@
 #include <annotationmark.hxx>
 
 #include <doc.hxx>
-#include <IDocumentMarkAccess.hxx>
 #include <IDocumentFieldsAccess.hxx>
 #include <IDocumentState.hxx>
 #include <fldbas.hxx>
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index e1230a94a7bd..c6b6af26d12b 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <bookmrk.hxx>
-#include <IDocumentMarkAccess.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <IDocumentLinksAdministration.hxx>
 #include <IDocumentState.hxx>
@@ -27,9 +26,7 @@
 #include <ndtxt.hxx>
 #include <pam.hxx>
 #include <swserv.hxx>
-#include <svl/listener.hxx>
 #include <sfx2/linkmgr.hxx>
-#include <swtypes.hxx>
 #include <UndoBookmark.hxx>
 #include <unobookmark.hxx>
 #include <xmloff/odffields.hxx>
@@ -37,10 +34,10 @@
 #include <comphelper/random.hxx>
 #include <comphelper/anytostring.hxx>
 #include <sal/log.hxx>
+#include <svl/zforlist.hxx>
 #include <edtwin.hxx>
 #include <DateFormFieldButton.hxx>
 #include <DropDownFormFieldButton.hxx>
-#include <svx/numfmtsh.hxx>
 #include <DocumentContentOperationsManager.hxx>
 
 using namespace ::sw::mark;
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 41a119792efc..f59aa81989fb 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -17,19 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#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>
-#include <viscrs.hxx>
 #include "callnk.hxx"
 #include <crsrsh.hxx>
 #include <doc.hxx>
 #include <frmfmt.hxx>
 #include <txtfrm.hxx>
-#include <tabfrm.hxx>
 #include <rowfrm.hxx>
 #include <fmtfsize.hxx>
 #include <ndtxt.hxx>
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 4ef45857a496..64581cb66096 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
 
 #include <tools/solar.h>
+#include <ndtyp.hxx>
 
 class SwCursorShell;
 class SwTextNode;
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 2d786cdfee6f..a9175808de85 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -21,9 +21,7 @@
 #include <ndtxt.hxx>
 #include <rootfrm.hxx>
 #include <txtfrm.hxx>
-#include <docary.hxx>
 #include <IMark.hxx>
-#include "callnk.hxx"
 #include <swcrsr.hxx>
 #include <IDocumentMarkAccess.hxx>
 #include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index a7e8c7b93025..d5fa25e5d592 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -21,9 +21,7 @@
 #include <com/sun/star/text/XTextRange.hpp>
 
 #include <hintids.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/srchdlg.hxx>
-#include <editeng/frmdiritem.hxx>
 #include <sfx2/viewsh.hxx>
 #include <SwSmartTagMgr.hxx>
 #include <doc.hxx>
@@ -38,7 +36,6 @@
 #include <flyfrm.hxx>
 #include <dview.hxx>
 #include <viewopt.hxx>
-#include <frmtool.hxx>
 #include <crsrsh.hxx>
 #include <tabfrm.hxx>
 #include <txtfrm.hxx>
@@ -57,10 +54,8 @@
 #include <unotextrange.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <numrule.hxx>
 #include <IGrammarContact.hxx>
 #include <comphelper/flagguard.hxx>
-#include <globals.hrc>
 #include <strings.hrc>
 #include <IDocumentLayoutAccess.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
@@ -68,6 +63,7 @@
 #include <comphelper/sequence.hxx>
 #include <sfx2/lokhelper.hxx>
 #include <editeng/editview.hxx>
+#include <editeng/frmdir.hxx>
 #include <sal/log.hxx>
 #include <PostItMgr.hxx>
 #include <DocumentSettingManager.hxx>
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index c77dc2065979..9c3064f272eb 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -24,22 +24,18 @@
 #include <i18nutil/searchopt.hxx>
 #include <unotools/syslocale.hxx>
 #include <hintids.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/whiter.hxx>
-#include <editeng/formatbreakitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/fontitem.hxx>
 #include <fmtpdsc.hxx>
 #include <txatbase.hxx>
-#include <fchrfmt.hxx>
 #include <charfmt.hxx>
+#include <crsrsh.hxx>
 #include <doc.hxx>
 #include <IDocumentUndoRedo.hxx>
 #include <IDocumentState.hxx>
 #include <swcrsr.hxx>
-#include <editsh.hxx>
 #include <ndtxt.hxx>
 #include <pamtyp.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index 3125dd5e2aa3..a04850284433 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <doc.hxx>
 #include <pamtyp.hxx>
 #include <pam.hxx>
 #include <txtfrm.hxx>
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index 75f49de135c3..683904754e5a 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/util/SearchResult.hpp>
 #include <comphelper/lok.hxx>
-#include <vcl/svapp.hxx>
 #include <svx/svdview.hxx>
 #include <svl/srchitem.hxx>
 #include <sfx2/sfxsids.hrc>
@@ -32,7 +31,6 @@
 #include <txatritr.hxx>
 #include <fldbas.hxx>
 #include <fmtfld.hxx>
-#include <txtatr.hxx>
 #include <txtfld.hxx>
 #include <txtfrm.hxx>
 #include <rootfrm.hxx>
@@ -51,7 +49,6 @@
 #include <breakit.hxx>
 #include <docsh.hxx>
 #include <PostItMgr.hxx>
-#include <viewsh.hxx>
 #include <view.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 2fb3c5c9006b..ebef14e1ca3b 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -22,7 +22,6 @@
 #include <string_view>
 
 #include <tools/gen.hxx>
-#include <hintids.hxx>
 #include <editeng/protitem.hxx>
 #include <cntfrm.hxx>
 #include <pagefrm.hxx>
@@ -34,7 +33,6 @@
 #include <txtfrm.hxx>
 #include <fmtcntnt.hxx>
 #include <frmatr.hxx>
-#include <swtable.hxx>
 #include <flyfrm.hxx>
 #include <fmteiro.hxx>
 #include <section.hxx>
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index 5ac1997f8d00..e557131d5255 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <crsrsh.hxx>
-#include <doc.hxx>
 #include <layfrm.hxx>
 #include <cntfrm.hxx>
 #include <swcrsr.hxx>
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 4de4450e54f2..00aa045f7f5d 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -17,18 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/svdmodel.hxx>
-#include <svx/svdpage.hxx>
 #include <crsrsh.hxx>
 #include <doc.hxx>
 #include <pagefrm.hxx>
 #include <cntfrm.hxx>
 #include <ftnfrm.hxx>
-#include <viewimp.hxx>
 #include <swcrsr.hxx>
-#include <dflyobj.hxx>
 #include <ndtxt.hxx>
-#include <flyfrm.hxx>
 #include <txtfrm.hxx>
 #include <txtftn.hxx>
 #include <ftnidx.hxx>
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index a517f79e85e0..e6181791584f 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -18,25 +18,19 @@
  */
 
 #include <hintids.hxx>
-#include <vcl/svapp.hxx>
-#include <editeng/protitem.hxx>
 #include <crsrsh.hxx>
 #include <doc.hxx>
 #include <cntfrm.hxx>
 #include <editsh.hxx>
 #include <pam.hxx>
 #include <swtable.hxx>
-#include <docary.hxx>
-#include <frmatr.hxx>
 #include <frmfmt.hxx>
 #include <viscrs.hxx>
 #include "callnk.hxx"
 #include <tabfrm.hxx>
 #include <ndtxt.hxx>
 #include <shellres.hxx>
-#include <cellatr.hxx>
 #include <cellfrm.hxx>
-#include <rowfrm.hxx>
 #include <IDocumentLayoutAccess.hxx>
 #include <svx/srchdlg.hxx>
 
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index e2e165f3f28f..15176de29952 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -21,7 +21,6 @@
 
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/settings.hxx>
 #include <viewopt.hxx>
 #include <frmtool.hxx>
@@ -33,13 +32,9 @@
 #include <dview.hxx>
 #include <rootfrm.hxx>
 #include <txtfrm.hxx>
-#include <docary.hxx>
-#include <extinput.hxx>
 #include <ndtxt.hxx>
 #include <txtfld.hxx>
 #include <scriptinfo.hxx>
-#include <mdiexp.hxx>
-#include <wrtsh.hxx>
 #include <view.hxx>
 #include <IDocumentLayoutAccess.hxx>
 
@@ -50,7 +45,6 @@
 #include "overlayrangesoutline.hxx"
 
 #include <memory>
-#include <boost/property_tree/json_parser.hpp>
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
diff --git a/sw/source/core/inc/DateFormFieldButton.hxx b/sw/source/core/inc/DateFormFieldButton.hxx
index 4c38f1a5779b..8d0e4d6c4123 100644
--- a/sw/source/core/inc/DateFormFieldButton.hxx
+++ b/sw/source/core/inc/DateFormFieldButton.hxx
@@ -10,8 +10,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_DATEFORMEFIELDBUTTO_HXX
 #define INCLUDED_SW_SOURCE_CORE_TEXT_DATEFORMEFIELDBUTTO_HXX
 
-#include <vcl/menubtn.hxx>
-#include <swrect.hxx>
 #include "FormFieldButton.hxx"
 
 class SwEditWin;
diff --git a/sw/source/core/inc/DropDownFormFieldButton.hxx b/sw/source/core/inc/DropDownFormFieldButton.hxx
index ab1004cc8119..a19470498579 100644
--- a/sw/source/core/inc/DropDownFormFieldButton.hxx
+++ b/sw/source/core/inc/DropDownFormFieldButton.hxx
@@ -10,8 +10,6 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_TEXT_DROPDOWNFORMEFIELDBUTTO_HXX
 #define INCLUDED_SW_SOURCE_CORE_TEXT_DROPDOWNFORMEFIELDBUTTO_HXX
 
-#include <vcl/menubtn.hxx>
-#include <swrect.hxx>
 #include "FormFieldButton.hxx"
 
 class SwEditWin;