editeng/IwyuFilter_editeng.yaml | 6 ++--
editeng/inc/ContentNode.hxx | 2 -
editeng/inc/ItemList.hxx | 2 -
editeng/inc/ParagraphPortion.hxx | 1
editeng/inc/TextPortion.hxx | 16 ++++--------
editeng/inc/editattr.hxx | 1
editeng/inc/editdoc.hxx | 13 ---------
editeng/inc/edtspell.hxx | 1
editeng/qa/editeng/editeng.cxx | 1
editeng/qa/unit/core-test.cxx | 8 ++++--
editeng/source/accessibility/AccessibleContextBase.cxx | 2 -
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 5 ---
editeng/source/accessibility/AccessibleHyperlink.hxx | 1
editeng/source/accessibility/AccessibleImageBullet.cxx | 3 --
editeng/source/accessibility/AccessibleImageBullet.hxx | 1
editeng/source/accessibility/AccessibleParaManager.cxx | 1
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 1
editeng/source/accessibility/AccessibleStringWrap.cxx | 3 --
editeng/source/editeng/ContentNode.cxx | 3 +-
editeng/source/editeng/EditLine.cxx | 5 ++-
editeng/source/editeng/TextPortionList.cxx | 1
editeng/source/editeng/editattr.cxx | 5 ---
editeng/source/editeng/editdbg.cxx | 1
editeng/source/editeng/editeng.cxx | 11 --------
editeng/source/editeng/editobj.cxx | 2 +
editeng/source/editeng/editobj2.hxx | 5 +++
editeng/source/editeng/editundo.hxx | 3 +-
editeng/source/editeng/eehtml.cxx | 4 +++
editeng/source/editeng/eehtml.hxx | 3 --
editeng/source/editeng/eertfpar.hxx | 3 +-
editeng/source/editeng/fieldupdater.cxx | 1
editeng/source/editeng/impedit.hxx | 4 +++
editeng/source/editeng/impedit2.cxx | 3 --
editeng/source/editeng/impedit3.cxx | 11 --------
editeng/source/editeng/textconv.hxx | 2 -
editeng/source/items/CustomPropertyField.cxx | 1
editeng/source/items/flditem.cxx | 1
editeng/source/items/paraitem.cxx | 2 -
editeng/source/items/svxfont.cxx | 2 -
editeng/source/items/textitem.cxx | 3 --
editeng/source/items/xmlcnitm.cxx | 2 -
editeng/source/misc/txtrange.cxx | 1
editeng/source/misc/unolingu.cxx | 1
editeng/source/outliner/outleeng.cxx | 1
editeng/source/outliner/outliner.cxx | 3 --
editeng/source/outliner/outlobj.cxx | 2 -
editeng/source/outliner/overflowingtxt.cxx | 3 --
editeng/source/rtf/svxrtf.cxx | 2 -
editeng/source/uno/unoforou.cxx | 2 -
editeng/source/uno/unoipset.cxx | 2 -
editeng/source/uno/unonrule.cxx | 1
editeng/source/uno/unotext2.cxx | 1
editeng/source/xml/xmltxtexp.cxx | 6 ----
editeng/source/xml/xmltxtimp.cxx | 1
54 files changed, 48 insertions(+), 124 deletions(-)
New commits:
commit f9af3767bd0572954a375cd4107ae2ab460a7de3
Author: Gabor Kelemen <gabor.kele...@collabora.com>
AuthorDate: Fri Sep 12 23:45:19 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Fri Sep 19 08:21:25 2025 +0200
tdf#146619 Run IWYU on editeng/
Change-Id: I2c124548ab312ec21558f22207952d2315f5a805
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190908
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Jenkins
diff --git a/editeng/IwyuFilter_editeng.yaml b/editeng/IwyuFilter_editeng.yaml
index 50326374a0ab..b2aa2f023301 100644
--- a/editeng/IwyuFilter_editeng.yaml
+++ b/editeng/IwyuFilter_editeng.yaml
@@ -4,9 +4,6 @@ excludelist:
editeng/source/editeng/impedit.hxx:
# Complete type needed for pointer arithmetic
- editeng/SpellPortions.hxx
- editeng/source/accessibility/AccessibleContextBase.cxx:
- # Actually used
- - com/sun/star/accessibility/XAccessibleEventListener.hpp
editeng/source/accessibility/AccessibleEditableTextPara.cxx:
# Needed for macro defines
- editeng/unoprnms.hxx
@@ -23,6 +20,9 @@ excludelist:
editeng/source/items/CustomPropertyField.cxx:
# Actually used
- com/sun/star/document/XDocumentProperties.hpp
+ editeng/source/editeng/impedit.cxx:
+ # Needed for DNDListenerContainer member access
+ - vcl/dndlistenercontainer.hxx
editeng/source/misc/SvXMLAutoCorrectExport.cxx:
# Actually used
- com/sun/star/xml/sax/XDocumentHandler.hpp
diff --git a/editeng/inc/ContentNode.hxx b/editeng/inc/ContentNode.hxx
index b802be9c87a8..8cc433cdbc29 100644
--- a/editeng/inc/ContentNode.hxx
+++ b/editeng/inc/ContentNode.hxx
@@ -25,8 +25,6 @@
#include <svl/itemset.hxx>
#include <svl/style.hxx>
#include <svl/itempool.hxx>
-#include <svl/languageoptions.hxx>
-#include <tools/lineend.hxx>
#include <memory>
#include <string_view>
diff --git a/editeng/inc/ItemList.hxx b/editeng/inc/ItemList.hxx
index a060fc6e29e7..d996ab7c17dc 100644
--- a/editeng/inc/ItemList.hxx
+++ b/editeng/inc/ItemList.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <svl/itempool.hxx>
+#include <svl/poolitem.hxx>
#include <vector>
class ItemList
diff --git a/editeng/inc/ParagraphPortion.hxx b/editeng/inc/ParagraphPortion.hxx
index 2e801a58c43d..e7e4452ced03 100644
--- a/editeng/inc/ParagraphPortion.hxx
+++ b/editeng/inc/ParagraphPortion.hxx
@@ -19,6 +19,7 @@
#pragma once
+#include "ContentNode.hxx"
#include "EditLineList.hxx"
#include "TextPortionList.hxx"
diff --git a/editeng/inc/TextPortion.hxx b/editeng/inc/TextPortion.hxx
index 2611e709ba97..805d3cbdd6f7 100644
--- a/editeng/inc/TextPortion.hxx
+++ b/editeng/inc/TextPortion.hxx
@@ -19,18 +19,14 @@
#pragma once
-#include "editattr.hxx"
-#include "edtspell.hxx"
-#include "eerdll2.hxx"
-#include <editeng/svxfont.hxx>
-#include <editeng/EPaM.hxx>
-#include <svl/itemset.hxx>
-#include <svl/style.hxx>
-#include <svl/itempool.hxx>
-#include <svl/languageoptions.hxx>
-#include <tools/lineend.hxx>
+#include <sal/types.h>
+#include <tools/gen.hxx>
+#include <tools/long.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <string.h>
+#include <memory>
+#include <utility>
#include <vector>
enum class PortionKind
diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx
index 19e52a44007d..210684d90f7f 100644
--- a/editeng/inc/editattr.hxx
+++ b/editeng/inc/editattr.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <editeng/eeitem.hxx>
#include <svl/poolitem.hxx>
#include <optional>
#include <tools/color.hxx>
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 0c4bd64be577..473e1cf4e423 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -21,34 +21,23 @@
#include <config_collab.h>
-#include "ParagraphPortionList.hxx"
#include "editattr.hxx"
-#include "edtspell.hxx"
-#include "eerdll2.hxx"
#include <editeng/svxfont.hxx>
-#include <editeng/EPaM.hxx>
#include <svl/itemset.hxx>
-#include <svl/style.hxx>
#include <svl/itempool.hxx>
#include <svl/languageoptions.hxx>
#include <tools/lineend.hxx>
-#include <o3tl/typed_flags_set.hxx>
-#include "TextPortion.hxx"
-#include "TextPortionList.hxx"
-#include "ItemList.hxx"
#include "ContentNode.hxx"
-#include "EditLineList.hxx"
#include "EditPaM.hxx"
-#include "EditSelection.hxx"
#include <cstddef>
#include <memory>
-#include <string_view>
#include <vector>
enum class TextRotation;
#if ENABLE_YRS
+#include "EditSelection.hxx"
class ImpEditEngine;
class IYrsTransactionSupplier;
typedef struct TransactionInner YTransaction;
diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx
index 5cd8a93006ca..d8eefcd1c14a 100644
--- a/editeng/inc/edtspell.hxx
+++ b/editeng/inc/edtspell.hxx
@@ -21,7 +21,6 @@
#include <editeng/splwrap.hxx>
#include <editeng/svxacorr.hxx>
-#include <editeng/svxenum.hxx>
#include <editeng/misspellrange.hxx>
diff --git a/editeng/qa/editeng/editeng.cxx b/editeng/qa/editeng/editeng.cxx
index 6c5e9e29596c..f15ffd96fa42 100644
--- a/editeng/qa/editeng/editeng.cxx
+++ b/editeng/qa/editeng/editeng.cxx
@@ -9,6 +9,7 @@
#include <test/bootstrapfixture.hxx>
+#include <editeng/eeitem.hxx>
#include <editeng/editeng.hxx>
#include <editeng/wghtitem.hxx>
#include <sfx2/app.hxx>
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 5484593ad9c5..c68727f575af 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -14,7 +14,8 @@
#include <cppunit/extensions/HelperMacros.h>
#include <editdoc.hxx>
-#include <impedit.hxx>
+#include <EditSelection.hxx>
+#include <ParagraphPortionList.hxx>
#include <sfx2/app.hxx>
#include <svl/itempool.hxx>
@@ -22,7 +23,6 @@
#include <editeng/editeng.hxx>
#include <editeng/eeitem.hxx>
#include <editeng/lspcitem.hxx>
-#include <editeng/svxacorr.hxx>
#include <editeng/unofield.hxx>
#include <editeng/wghtitem.hxx>
#include <editeng/postitem.hxx>
@@ -34,7 +34,11 @@
#include <svl/voiditem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/fhgtitem.hxx>
+#include <vcl/salgtype.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/virdev.hxx>
+#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/text/textfield/Type.hpp>
#include <memory>
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 4ac99e365bad..d61bbd2c808c 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -19,7 +19,6 @@
#include <editeng/AccessibleContextBase.hxx>
-#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
@@ -28,7 +27,6 @@
#include
<com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
#include <unotools/accessiblerelationsethelper.hxx>
-#include <comphelper/accessibleeventnotifier.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/mutex.hxx>
#include <rtl/ref.hxx>
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index a4e63a9f7e0f..27dc053b80f1 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -39,12 +39,9 @@
#include <com/sun/star/accessibility/AccessibleTextType.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <comphelper/accessibleeventnotifier.hxx>
#include <comphelper/sequenceashashmap.hxx>
-#include <cppuhelper/supportsservice.hxx>
#include <unotools/accessiblerelationsethelper.hxx>
#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
-#include <vcl/unohelp.hxx>
#include <vcl/settings.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -69,8 +66,6 @@
#include "AccessibleImageBullet.hxx"
#include <svtools/colorcfg.hxx>
-#include <editeng/editrids.hrc>
-#include <editeng/eerdll.hxx>
#include <editeng/numitem.hxx>
#include <memory>
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx
b/editeng/source/accessibility/AccessibleHyperlink.hxx
index f996b59fee9a..48370ed8e5f4 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -21,7 +21,6 @@
#include <cppuhelper/implbase.hxx>
-#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
#include <memory>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx
b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 01e0737c5c95..87e1ab03b6b1 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -23,19 +23,16 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <rtl/ustring.hxx>
-#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <comphelper/accessibleeventnotifier.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <editeng/AccessibleEditableTextPara.hxx>
#include <editeng/eerdll.hxx>
-#include <editeng/editdata.hxx>
#include <editeng/outliner.hxx>
#include <editeng/editrids.hrc>
#include <editeng/unoedsrc.hxx>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.hxx
b/editeng/source/accessibility/AccessibleImageBullet.hxx
index 4e14b66c6b15..354579773fa9 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.hxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <rtl/ref.hxx>
#include <tools/gen.hxx>
#include <comphelper/OAccessible.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx
b/editeng/source/accessibility/AccessibleParaManager.cxx
index b5ebb056968e..43804fa312f3 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -25,7 +25,6 @@
#include <o3tl/safeint.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
// Project-local header
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 837bfac740d9..a83f9b0a8823 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -40,7 +40,6 @@
// Project-local header
-#include <editeng/editdata.hxx>
#include <editeng/AccessibleStaticTextBase.hxx>
diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx
b/editeng/source/accessibility/AccessibleStringWrap.cxx
index 5461aad9f4c8..323761dafac8 100644
--- a/editeng/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -18,9 +18,6 @@
*/
-#include <algorithm>
-#include <cstdlib>
-
#include <tools/debug.hxx>
#include <utility>
#include <vcl/outdev.hxx>
diff --git a/editeng/source/editeng/ContentNode.cxx
b/editeng/source/editeng/ContentNode.cxx
index 27764b997161..56c2659c7025 100644
--- a/editeng/source/editeng/ContentNode.cxx
+++ b/editeng/source/editeng/ContentNode.cxx
@@ -19,8 +19,9 @@
#include <ContentNode.hxx>
+#include <editdoc.hxx>
+#include <editeng/eeitem.hxx>
#include <editeng/tstpitem.hxx>
-#include "impedit.hxx"
#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
diff --git a/editeng/source/editeng/EditLine.cxx
b/editeng/source/editeng/EditLine.cxx
index b43cf0a84f11..7dbd121e26e4 100644
--- a/editeng/source/editeng/EditLine.cxx
+++ b/editeng/source/editeng/EditLine.cxx
@@ -19,8 +19,9 @@
#include <EditLine.hxx>
-#include <editdoc.hxx>
-#include <algorithm>
+#include <ParagraphPortion.hxx>
+#include <TextPortion.hxx>
+#include <TextPortionList.hxx>
EditLine* EditLine::Clone() const
{
diff --git a/editeng/source/editeng/TextPortionList.cxx
b/editeng/source/editeng/TextPortionList.cxx
index ca9d68159a5a..7685e19a041a 100644
--- a/editeng/source/editeng/TextPortionList.cxx
+++ b/editeng/source/editeng/TextPortionList.cxx
@@ -19,7 +19,6 @@
#include <TextPortionList.hxx>
-#include <EditLine.hxx>
#include <osl/diagnose.h>
diff --git a/editeng/source/editeng/editattr.cxx
b/editeng/source/editeng/editattr.cxx
index 3a8b29f48e70..06ac807367af 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -19,11 +19,9 @@
#include <vcl/outdev.hxx>
-#include <svl/grabbagitem.hxx>
-#include <svl/voiditem.hxx>
#include <libxml/xmlwriter.h>
+#include <editeng/eeitem.hxx>
#include <editeng/svxfont.hxx>
-#include <editeng/flditem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/wghtitem.hxx>
@@ -39,7 +37,6 @@
#include <editeng/autokernitem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/emphasismarkitem.hxx>
-#include <editeng/charscaleitem.hxx>
#include <editeng/charreliefitem.hxx>
#include <editeng/cmapitem.hxx>
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 6acb59356320..fa83d30ba59f 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -51,7 +51,6 @@
#include <editeng/scripthintitem.hxx>
#include "impedit.hxx"
-#include <editeng/editeng.hxx>
#include <editeng/editview.hxx>
#include <editdoc.hxx>
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 70f5d04a3f9c..4c0694f8f424 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -21,11 +21,8 @@
#include <utility>
#include <comphelper/lok.hxx>
-#include <comphelper/processfactory.hxx>
#include <config_global.h>
#include <o3tl/safeint.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/weld.hxx>
#include <vcl/window.hxx>
#include <tools/stream.hxx>
@@ -49,7 +46,6 @@
#include <editeng/fhgtitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/kernitem.hxx>
-#include <editeng/lrspitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/udlnitem.hxx>
@@ -64,18 +60,11 @@
#include <sot/formats.hxx>
#include <editeng/numitem.hxx>
-#include <rtl/strbuf.hxx>
-#include <sal/log.hxx>
-#include <vcl/help.hxx>
#include <tools/lazydelete.hxx>
-#include <vcl/transfer.hxx>
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
#if OSL_DEBUG_LEVEL > 1
#include <editeng/frmdiritem.hxx>
#endif
-#include <basegfx/polygon/b2dpolygon.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 858dec873a9e..371cb90d325b 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -22,8 +22,10 @@
#include <o3tl/safeint.hxx>
#include <sal/log.hxx>
+#include <editeng/eeitem.hxx>
#include <editeng/macros.hxx>
#include <editeng/section.hxx>
+#include <editdoc.hxx>
#include "editobj2.hxx"
#include <editeng/editdata.hxx>
#include <editeng/editeng.hxx>
diff --git a/editeng/source/editeng/editobj2.hxx
b/editeng/source/editeng/editobj2.hxx
index 9dc05f078ea4..c34c2efa2743 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -22,7 +22,10 @@
#include <editeng/editobj.hxx>
#include <editeng/fieldupdater.hxx>
#include <editeng/outliner.hxx>
-#include <editdoc.hxx>
+#include <svl/itemset.hxx>
+#include <edtspell.hxx>
+#include <EditLineList.hxx>
+#include <TextPortionList.hxx>
#include <svl/sharedstring.hxx>
#include <svl/languageoptions.hxx>
diff --git a/editeng/source/editeng/editundo.hxx
b/editeng/source/editeng/editundo.hxx
index f92d21740e90..72abafdec9d5 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -21,7 +21,8 @@
#include <editdoc.hxx>
#include <editeng/editund2.hxx>
-#include <editeng/editdata.hxx>
+#include <editeng/EPaM.hxx>
+#include <editeng/ESelection.hxx>
#include <editeng/editobj.hxx>
#include <vector>
#include <memory>
diff --git a/editeng/source/editeng/eehtml.cxx
b/editeng/source/editeng/eehtml.cxx
index 6322c4b194dd..06df5006b7ee 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -19,7 +19,9 @@
#include "eehtml.hxx"
+#include <editdoc.hxx>
#include <editeng/adjustitem.hxx>
+#include <editeng/eeitem.hxx>
#include <editeng/flditem.hxx>
#include <tools/urlobj.hxx>
#include <editeng/fhgtitem.hxx>
@@ -29,6 +31,8 @@
#include <svtools/htmltokn.h>
#include <svtools/htmlkywd.hxx>
#include <tools/tenccvt.hxx>
+#include <vcl/mapmod.hxx>
+#include <vcl/outdev.hxx>
#include <editeng/editeng.hxx>
#include <utility>
diff --git a/editeng/source/editeng/eehtml.hxx
b/editeng/source/editeng/eehtml.hxx
index 9d77ebdaf68c..218bf3860446 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -19,9 +19,8 @@
#pragma once
-#include <memory>
#include <optional>
-#include <editdoc.hxx>
+#include <EditSelection.hxx>
#include <rtl/ustrbuf.hxx>
#include <svtools/parhtml.hxx>
diff --git a/editeng/source/editeng/eertfpar.hxx
b/editeng/source/editeng/eertfpar.hxx
index 19ce00ce3297..73c660bed267 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -19,8 +19,9 @@
#pragma once
#include <editeng/svxrtf.hxx>
+#include <vcl/mapmod.hxx>
-#include <editdoc.hxx>
+#include <EditSelection.hxx>
class EditEngine;
diff --git a/editeng/source/editeng/fieldupdater.cxx
b/editeng/source/editeng/fieldupdater.cxx
index 6d6fbfb28c3c..41a431a81651 100644
--- a/editeng/source/editeng/fieldupdater.cxx
+++ b/editeng/source/editeng/fieldupdater.cxx
@@ -8,6 +8,7 @@
*/
#include <memory>
+#include <editeng/eeitem.hxx>
#include <editeng/fieldupdater.hxx>
#include <editeng/flditem.hxx>
#include "editobj2.hxx"
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 96089f4299b2..606f02e6b641 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -23,6 +23,10 @@
#include "editsel.hxx"
#include "editundo.hxx"
#include "editstt2.hxx"
+#include <EditSelection.hxx>
+#include <ItemList.hxx>
+#include <ParagraphPortionList.hxx>
+#include <editeng/eeitem.hxx>
#include <editeng/editdata.hxx>
#include <editeng/SpellPortions.hxx>
#include <editeng/editeng.hxx>
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index fd27afb17b43..cab3236120f0 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -31,7 +31,6 @@
#include <editeng/txtrange.hxx>
#include <sfx2/app.hxx>
#include <sfx2/mieclip.hxx>
-#include <sfx2/viewsh.hxx>
#include <svtools/colorcfg.hxx>
#include <svl/ctloptions.hxx>
#include <unotools/securityoptions.hxx>
@@ -41,7 +40,6 @@
#include <editeng/adjustitem.hxx>
#include <editeng/frmdiritem.hxx>
#include <editeng/justifyitem.hxx>
-#include <editeng/udlnitem.hxx>
#include <editeng/scripthintitem.hxx>
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
@@ -75,7 +73,6 @@
#include <algorithm>
#include <limits>
#include <memory>
-#include <string_view>
#include <fstream>
#include <outleeng.hxx>
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index e6b92171c974..33dec6942173 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -19,12 +19,9 @@
#include <vcl/svapp.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/gdimtf.hxx>
#include <vcl/settings.hxx>
#include <vcl/window.hxx>
-#include <editeng/outliner.hxx>
#include <editeng/tstpitem.hxx>
#include <editeng/lspcitem.hxx>
#include <editeng/flditem.hxx>
@@ -70,8 +67,6 @@
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/InputSequenceChecker.hpp>
-#include <vcl/pdfextoutdevdata.hxx>
-#include <i18nlangtag/mslangid.hxx>
#include <i18nutil/kashida.hxx>
#include <comphelper/processfactory.hxx>
@@ -84,14 +79,10 @@
#include <comphelper/string.hxx>
#include <cstddef>
#include <memory>
-#include <set>
-
-#include <vcl/outdev/ScopedStates.hxx>
#include <vcl/canvastools.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
#include <drawinglayer/primitive2d/maskprimitive2d.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
@@ -99,8 +90,6 @@
#include <basegfx/color/bcolormodifier.hxx>
#include <drawinglayer/primitive2d/modifiedcolorprimitive2d.hxx>
-#include <unicode/uchar.h>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/editeng/source/editeng/textconv.hxx
b/editeng/source/editeng/textconv.hxx
index 96525a98f530..9c2a901a14bb 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -18,11 +18,11 @@
*/
#pragma once
-#include <editeng/editdata.hxx>
#include <editeng/svxenum.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <editeng/hangulhanja.hxx>
+#include <editeng/ESelection.hxx>
class EditView;
diff --git a/editeng/source/items/CustomPropertyField.cxx
b/editeng/source/items/CustomPropertyField.cxx
index 79594749c1bb..e5be98b41fc5 100644
--- a/editeng/source/items/CustomPropertyField.cxx
+++ b/editeng/source/items/CustomPropertyField.cxx
@@ -10,7 +10,6 @@
#include <editeng/CustomPropertyField.hxx>
#include <utility>
-#include <vcl/metaact.hxx>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index e28582a6d93b..70a54653b090 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -20,7 +20,6 @@
#include <osl/diagnose.h>
#include <osl/file.hxx>
#include <utility>
-#include <vcl/metaact.hxx>
#include <svl/numformat.hxx>
#include <svl/zforlist.hxx>
#include <tools/urlobj.hxx>
diff --git a/editeng/source/items/paraitem.cxx
b/editeng/source/items/paraitem.cxx
index 30adcd39a35e..58fd5be3cc60 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -27,9 +27,7 @@
#include <osl/diagnose.h>
#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
-#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
-#include <svl/itempool.hxx>
#include <svl/memberid.h>
#include <editeng/editrids.hrc>
#include <editeng/lspcitem.hxx>
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 09fb9975026b..a0145c94978f 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -23,7 +23,6 @@
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
#include <vcl/print.hxx>
-#include <tools/debug.hxx>
#include <tools/gen.hxx>
#include <tools/poly.hxx>
#include <unotools/charclass.hxx>
@@ -31,7 +30,6 @@
#include <editeng/escapementitem.hxx>
#include <editeng/smallcaps.hxx>
#include <sal/log.hxx>
-#include <limits>
static tools::Long GetTextArray( const OutputDevice* pOut, const OUString&
rStr, KernArray* pDXAry,
sal_Int32 nIndex, sal_Int32 nLen )
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index d4ef57e21a41..40cc2d3c7bb8 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -20,7 +20,6 @@
#include <com/sun/star/style/CaseMap.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/frame/status/FontHeight.hpp>
-#include <math.h>
#include <sal/log.hxx>
#include <o3tl/safeint.hxx>
#include <osl/diagnose.h>
@@ -76,7 +75,6 @@
#include <editeng/charrotateitem.hxx>
#include <editeng/charscaleitem.hxx>
#include <editeng/charreliefitem.hxx>
-#include <editeng/rubyitem.hxx>
#include <editeng/itemtype.hxx>
#include <editeng/scripthintitem.hxx>
#include <editeng/eerdll.hxx>
@@ -84,7 +82,6 @@
#include <docmodel/uno/UnoComplexColor.hxx>
#include <docmodel/color/ComplexColor.hxx>
#include <libxml/xmlwriter.h>
-#include <unordered_map>
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
diff --git a/editeng/source/items/xmlcnitm.cxx
b/editeng/source/items/xmlcnitm.cxx
index 71f75a910246..80b3a36fe078 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -19,9 +19,7 @@
#include <memory>
-#include <comphelper/servicehelper.hxx>
#include <com/sun/star/xml/AttributeData.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <o3tl/any.hxx>
#include <xmloff/xmlcnimp.hxx>
#include <xmloff/unoatrcn.hxx>
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 333abe2019df..6420907b20c5 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -19,7 +19,6 @@
#include <editeng/txtrange.hxx>
-#include <math.h>
#include <tools/poly.hxx>
#include <tools/debug.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index aa21b592edbe..f4ab6e5cf29c 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -50,7 +50,6 @@ using namespace ::linguistic;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::linguistic2;
diff --git a/editeng/source/outliner/outleeng.cxx
b/editeng/source/outliner/outleeng.cxx
index 7fda1ef47c72..457bb0b0d139 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -25,7 +25,6 @@
#include "paralist.hxx"
#include <editeng/editrids.hrc>
#include <optional>
-#include <svl/itemset.hxx>
#include <editeng/editstat.hxx>
#include "outlundo.hxx"
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index 404a3bfa299a..7c5b95a68602 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -25,7 +25,6 @@
#include <editeng/editdata.hxx>
#include <editeng/lrspitem.hxx>
-#include <math.h>
#include <svl/style.hxx>
#include <editeng/outliner.hxx>
#include "paralist.hxx"
@@ -40,7 +39,6 @@
#include <vcl/metric.hxx>
#include <editeng/numitem.hxx>
#include <editeng/adjustitem.hxx>
-#include <vcl/GraphicObject.hxx>
#include <editeng/svxfont.hxx>
#include <editeng/brushitem.hxx>
#include <svl/itempool.hxx>
@@ -48,7 +46,6 @@
#include <sal/log.hxx>
#include <o3tl/safeint.hxx>
#include <o3tl/string_view.hxx>
-#include <o3tl/temporary.hxx>
#include <osl/diagnose.h>
#include <editeng/StripPortionsHelper.hxx>
diff --git a/editeng/source/outliner/outlobj.cxx
b/editeng/source/outliner/outlobj.cxx
index 91f89a8e3e8c..d2da7beae858 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <editeng/editdata.hxx>
-
#include <editeng/outliner.hxx>
#include <editeng/outlobj.hxx>
#include <editeng/editobj.hxx>
diff --git a/editeng/source/outliner/overflowingtxt.cxx
b/editeng/source/outliner/overflowingtxt.cxx
index b54706b9f059..e175939ea7c9 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -25,9 +25,8 @@
#include <editeng/outlobj.hxx>
#include <editeng/editeng.hxx>
#include <editeng/editobj.hxx>
-#include <editeng/editdata.hxx>
-#include <editdoc.hxx>
+#include <EditSelection.hxx>
#include <utility>
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 3753d1066827..425e63e2098b 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -29,8 +29,6 @@
#include <tools/debug.hxx>
#include <comphelper/configuration.hxx>
-#include <comphelper/string.hxx>
-
#include <editeng/scriptspaceitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/svxrtf.hxx>
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index fe56a08e9086..e95fb7132500 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -25,10 +25,8 @@
#include <svl/itemset.hxx>
#include <editeng/editeng.hxx>
-#include <editeng/editdata.hxx>
#include <editeng/outliner.hxx>
#include <editeng/unoedhlp.hxx>
-#include <svl/poolitem.hxx>
#include <editeng/unoforou.hxx>
#include <editeng/outlobj.hxx>
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 0a2e379f20aa..8b425cecba4a 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <svl/itemprop.hxx>
#include <tools/UnitConversion.hxx>
#include <editeng/unoipset.hxx>
@@ -26,7 +25,6 @@
#include <o3tl/any.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
-#include <algorithm>
using namespace ::com::sun::star;
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 75f2599c59a7..c3ba8276551c 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -27,7 +27,6 @@
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/implbase1.hxx>
#include <utility>
#include <vcl/font.hxx>
#include <vcl/svapp.hxx>
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 53fb94bfa23c..402b4af44161 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <initializer_list>
-#include <string_view>
#include <o3tl/safeint.hxx>
#include <vcl/svapp.hxx>
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 4b29cd700544..5daa915cdc93 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -21,15 +21,11 @@
/** this file implements an export of a selected EditEngine content into
a xml stream. See editeng/source/inc/xmledit.hxx for interface */
#include <memory>
-#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <svl/itemprop.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <xmloff/xmlmetae.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <unotools/streamwrap.hxx>
@@ -53,8 +49,6 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::xml::sax;
using namespace cppu;
-class SvxEditEngineSourceImpl;
-
class SvxEditEngineSourceImpl : public salhelper::SimpleReferenceObject
{
private:
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index 4be391ed72dc..d5315178a677 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -30,6 +30,7 @@
#include "editsource.hxx"
#include <editxml.hxx>
#include <editdoc.hxx>
+#include <EditSelection.hxx>
#include <editeng/editeng.hxx>
#include <editeng/unotext.hxx>
#include <editeng/unoprnms.hxx>
