tdf#42949 Fix IWYU warnings in editeng/

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

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

82 files changed, 59 insertions, 337 deletions

diff --git a/editeng/IwyuFilter_editeng.yaml b/editeng/IwyuFilter_editeng.yaml
new file mode 100644
index 000000000000..8881e16fc348
--- /dev/null
+++ b/editeng/IwyuFilter_editeng.yaml
@@ -0,0 +1,29 @@
+---
+assumeFilename: editeng/source/editeng/impedit.cxx
+blacklist:
+    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
+    editeng/source/items/CustomPropertyField.cxx:
+    # Actually used
+    - com/sun/star/document/XDocumentProperties.hpp
+    editeng/source/misc/SvXMLAutoCorrectExport.cxx:
+    # Actually used
+    - com/sun/star/xml/sax/XDocumentHandler.hpp
+    editeng/source/uno/unotext.cxx:
+    # Needed for macro defines
+    - editeng/unoprnms.hxx
+    # Needed for UnoType call to work
+    - com/sun/star/lang/Locale.hpp
+    editeng/source/xml/xmltxtexp.cxx:
+    # Needed for UnoType call to work
+    - com/sun/star/lang/Locale.hpp
+    editeng/source/xml/xmltxtimp.cxx:
+    # Needed for macro defines
+    - editeng/unoprnms.hxx
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 3dcb3c2cbf13..2c0d54f93454 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_EDITENG_INC_EDITDOC_HXX
 #define INCLUDED_EDITENG_INC_EDITDOC_HXX
 
-#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-
 #include "editattr.hxx"
 #include "edtspell.hxx"
 #include "eerdll2.hxx"
diff --git a/editeng/inc/edtspell.hxx b/editeng/inc/edtspell.hxx
index 51e4df5e0635..0454c7bbe98c 100644
--- a/editeng/inc/edtspell.hxx
+++ b/editeng/inc/edtspell.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_EDITENG_INC_EDTSPELL_HXX
 #define INCLUDED_EDITENG_INC_EDTSPELL_HXX
 
-#include <editeng/editengdllapi.h>
 #include <editeng/splwrap.hxx>
 #include <editeng/svxacorr.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/misspellrange.hxx>
-#include <tools/link.hxx>
-#include <vcl/outdev.hxx>
 
 namespace com { namespace sun { namespace star { namespace linguistic2 {
     class XSpellChecker1;
diff --git a/editeng/inc/eerdll2.hxx b/editeng/inc/eerdll2.hxx
index 87a2670bafd4..e9f271bac447 100644
--- a/editeng/inc/eerdll2.hxx
+++ b/editeng/inc/eerdll2.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <editeng/forbiddencharacterstable.hxx>
-#include <rtl/ref.hxx>
 #include <vcl/virdev.hxx>
 
 class SfxPoolItem;
diff --git a/editeng/inc/unomodel.hxx b/editeng/inc/unomodel.hxx
index 90397c8ab9fc..a3af44cf4e3a 100644
--- a/editeng/inc/unomodel.hxx
+++ b/editeng/inc/unomodel.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_EDITENG_UNOMODEL_HXX
 #define INCLUDED_EDITENG_UNOMODEL_HXX
 
+#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index d5fb5482f111..745d7974bed8 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -11,10 +11,8 @@
 
 #include <test/bootstrapfixture.hxx>
 
-#include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <eerdll2.hxx>
 #include <editdoc.hxx>
 
 #include <sfx2/app.hxx>
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 4647f074ab76..5e95afbd2f70 100644
--- a/editeng/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -19,13 +19,7 @@
 
 #include <editeng/AccessibleComponentBase.hxx>
 
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/drawing/XShapeDescriptor.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <tools/color.hxx>
 
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx b/editeng/source/accessibility/AccessibleContextBase.cxx
index e0312f1e074b..d99cfa031d76 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -19,8 +19,6 @@
 
 #include <editeng/AccessibleContextBase.hxx>
 
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 62ba3b0f7905..297dbeef018c 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -21,11 +21,10 @@
 // Global header
 
 
-#include <limits.h>
-#include <vector>
 #include <algorithm>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 #include <editeng/flditem.hxx>
@@ -34,7 +33,6 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/i18n/Boundary.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -58,7 +56,6 @@
 #include <editeng/outliner.hxx>
 #include <editeng/unoedprx.hxx>
 #include <editeng/unoedsrc.hxx>
-#include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 
 
@@ -67,7 +64,6 @@
 
 #include <com/sun/star/beans/PropertyState.hpp>
 
-#include <editeng/unolingu.hxx>
 #include <editeng/unopracc.hxx>
 #include <editeng/AccessibleEditableTextPara.hxx>
 #include "AccessibleHyperlink.hxx"
diff --git a/editeng/source/accessibility/AccessibleHyperlink.hxx b/editeng/source/accessibility/AccessibleHyperlink.hxx
index 9895c571988e..93e6177a8706 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.hxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.hxx
@@ -20,13 +20,9 @@
 #ifndef INCLUDED_EDITENG_SOURCE_ACCESSIBILITY_ACCESSIBLEHYPERLINK_HXX
 #define INCLUDED_EDITENG_SOURCE_ACCESSIBILITY_ACCESSIBLEHYPERLINK_HXX
 
-#include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
 
 #include <memory>
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx
index ce0068071387..f3e4aa9faa2e 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -24,23 +24,19 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#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 <cppuhelper/supportsservice.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <editeng/unolingu.hxx>
 #include <editeng/AccessibleEditableTextPara.hxx>
 #include <editeng/AccessibleImageBullet.hxx>
 #include <editeng/eerdll.hxx>
 
 #include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/editrids.hrc>
 #include <editeng/unoedsrc.hxx>
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index f0d97b490b1e..737e07468096 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -23,7 +23,6 @@
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -33,9 +32,6 @@
 // Project-local header
 
 
-#include <editeng/unoedhlp.hxx>
-#include <editeng/unopracc.hxx>
-#include <editeng/unoedsrc.hxx>
 #include <editeng/AccessibleParaManager.hxx>
 #include <editeng/AccessibleEditableTextPara.hxx>
 
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 8cef86269d1d..37aaf2b80459 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -21,12 +21,10 @@
 // Global header
 
 
-#include <limits.h>
 #include <utility>
 #include <memory>
 #include <vector>
 #include <algorithm>
-#include <functional>
 #include <tools/debug.hxx>
 #include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
@@ -42,7 +40,6 @@
 
 
 #include <editeng/editdata.hxx>
-#include <editeng/unopracc.hxx>
 #include <editeng/unoedprx.hxx>
 #include <editeng/AccessibleStaticTextBase.hxx>
 #include <editeng/AccessibleEditableTextPara.hxx>
diff --git a/editeng/source/editeng/editdbg.hxx b/editeng/source/editeng/editdbg.hxx
index f9698b1898eb..f3d8347caa6b 100644
--- a/editeng/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EDITDBG_HXX
 #define INCLUDED_EDITENG_SOURCE_EDITENG_EDITDBG_HXX
 
-#include <svl/solar.hrc>
+#include <rtl/string.hxx>
 #include <stdio.h>
 
 class EditEngine;
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 72370ee0a84b..0b90d848c1dc 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -45,7 +45,6 @@
 #include <editeng/lspcitem.hxx>
 
 #include <editdoc.hxx>
-#include "editdbg.hxx"
 #include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
 #include "impedit.hxx"
@@ -55,7 +54,6 @@
 #include <osl/diagnose.h>
 
 #include <svl/grabbagitem.hxx>
-#include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <libxml/xmlwriter.h>
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index c75fcf90e5ea..c7f123fd40bc 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -25,7 +25,6 @@
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
 
-#include <svtools/ctrltool.hxx>
 #include <tools/stream.hxx>
 
 #include <editeng/svxfont.hxx>
@@ -34,15 +33,11 @@
 #include <editeng/editview.hxx>
 #include <editeng/editstat.hxx>
 #include "editdbg.hxx"
-#include <eerdll2.hxx>
 #include <editeng/eerdll.hxx>
 #include <editeng/editrids.hrc>
-#include <editeng.hxx>
-#include <editeng/acorrcfg.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/txtrange.hxx>
 #include <editeng/cmapitem.hxx>
-#include <vcl/graph.hxx>
 
 #include <editeng/autokernitem.hxx>
 #include <editeng/contouritem.hxx>
@@ -58,7 +53,6 @@
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/wrlmitem.hxx>
-#include <editeng/brushitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/charscaleitem.hxx>
@@ -68,17 +62,10 @@
 #include <sot/formats.hxx>
 
 #include <editeng/numitem.hxx>
-#include <editeng/bulletitem.hxx>
-#include <editeng/unolingu.hxx>
-#include <linguistic/lngprops.hxx>
-#include <i18nlangtag/mslangid.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <vcl/help.hxx>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
-
-#include <svl/srchdefs.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <editeng/frmdiritem.hxx>
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 9bd5859aba2b..80753a950c71 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -18,11 +18,8 @@
  */
 
 #include <memory>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 
-#include <tools/stream.hxx>
-
 #include <editeng/fieldupdater.hxx>
 #include <editeng/macros.hxx>
 #include <editeng/section.hxx>
@@ -30,19 +27,9 @@
 #include <editeng/editdata.hxx>
 #include <editattr.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/fontitem.hxx>
 #include <editeng/flditem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/tstpitem.hxx>
-#include <editeng/bulletitem.hxx>
-#include <editeng/numitem.hxx>
-#include <editeng/brushitem.hxx>
-
-#include <vcl/graph.hxx>
-#include <svl/intitem.hxx>
+
 #include <svl/sharedstringpool.hxx>
-#include <unotools/fontcvt.hxx>
-#include <tools/tenccvt.hxx>
 
 #include <libxml/xmlwriter.h>
 #include <algorithm>
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 51879edcca09..f217e4beb948 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -25,7 +25,6 @@
 #include <editeng/outliner.hxx>
 #include <editdoc.hxx>
 
-#include <unotools/fontcvt.hxx>
 #include <svl/sharedstring.hxx>
 #include <svl/languageoptions.hxx>
 
diff --git a/editeng/source/editeng/editundo.hxx b/editeng/source/editeng/editundo.hxx
index 9928aafbf88a..b22cbb5dea67 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -23,6 +23,7 @@
 #include <editdoc.hxx>
 #include <editeng/editund2.hxx>
 #include <editeng/editdata.hxx>
+#include <editeng/editobj.hxx>
 #include <vector>
 #include <memory>
 
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index d905d60bb9c3..b793a68b071f 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -33,7 +33,6 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/langtab.hxx>
 #include <tools/stream.hxx>
-#include <vcl/graphicfilter.hxx>
 
 #include <svl/srchitem.hxx>
 
@@ -56,11 +55,8 @@
 #include <editeng/unolingu.hxx>
 #include <editeng/fontitem.hxx>
 #include <unotools/lingucfg.hxx>
-#include <osl/file.hxx>
 
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/linguistic2/XDictionary.hpp>
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <linguistic/lngprops.hxx>
@@ -69,6 +65,7 @@
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
 #include <sfx2/viewsh.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index e64b052ba65c..e586a0d9d81f 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -25,12 +25,9 @@
 #include <editeng/editeng.hxx>
 #include <edtspell.hxx>
 #include <editeng/flditem.hxx>
-#include <editeng/fontitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <editeng/unolingu.hxx>
-#include <linguistic/lngprops.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/linguistic2/XDictionary.hpp>
 
 using namespace com::sun::star::uno;
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx
index 36a186c3df71..39fbbb7aa221 100644
--- a/editeng/source/editeng/eehtml.cxx
+++ b/editeng/source/editeng/eehtml.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <vcl/window.hxx>
 #include "eehtml.hxx"
 #include <editeng/adjustitem.hxx>
 #include <editeng/flditem.hxx>
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 3474bdc25be2..bfd81c40c395 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -23,9 +23,6 @@
 #include "eeobj.hxx"
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <editeng/editeng.hxx>
-#include <svl/itempool.hxx>
-#include <cppuhelper/queryinterface.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index fa28d7f5692e..9d49d871193c 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -20,11 +20,9 @@
 
 #include <unotools/resmgr.hxx>
 #include <com/sun/star/linguistic2/LanguageGuessing.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <comphelper/processfactory.hxx>
 
-#include <svl/solar.hrc>
 #include <editeng/eeitem.hxx>
 #include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
@@ -37,7 +35,6 @@
 #include <editeng/scriptspaceitem.hxx>
 #include <editeng/hngpnctitem.hxx>
 #include <editeng/forbiddenruleitem.hxx>
-#include <editeng/numdef.hxx>
 #include <svl/itempool.hxx>
 #include <svl/grabbagitem.hxx>
 #include <vcl/svapp.hxx>
diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx
index 963748f94eb6..7005a5276ff2 100644
--- a/editeng/source/editeng/eertfpar.hxx
+++ b/editeng/source/editeng/eertfpar.hxx
@@ -22,7 +22,6 @@
 #include <editeng/svxrtf.hxx>
 
 #include <editdoc.hxx>
-#include "impedit.hxx"
 
 class EditEngine;
 
diff --git a/editeng/source/editeng/fieldupdater.cxx b/editeng/source/editeng/fieldupdater.cxx
index bdb544b5d868..ec9266926bd6 100644
--- a/editeng/source/editeng/fieldupdater.cxx
+++ b/editeng/source/editeng/fieldupdater.cxx
@@ -10,7 +10,6 @@
 #include <memory>
 #include <editeng/fieldupdater.hxx>
 #include <editeng/flditem.hxx>
-#include <editeng/edtdlg.hxx>
 #include "editobj2.hxx"
 
 #include <com/sun/star/text/textfield/Type.hpp>
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index af4af364d945..2c398703bc74 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -28,8 +28,6 @@
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
-#include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
 #include <comphelper/lok.hxx>
 #include <editeng/flditem.hxx>
@@ -40,7 +38,6 @@
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <sfx2/lokhelper.hxx>
 
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 47117b0baab5..62edc065347d 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -23,17 +23,14 @@
 #include <editdoc.hxx>
 #include "editsel.hxx"
 #include "editundo.hxx"
-#include "editobj2.hxx"
 #include "editstt2.hxx"
 #include <editeng/editdata.hxx>
-#include <editeng/svxacorr.hxx>
 #include <editeng/SpellPortions.hxx>
-#include <editeng/eedata.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 #include <svtools/colorcfg.hxx>
+#include <editeng/outliner.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/gdimtf.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/vclptr.hxx>
 #include <tools/fract.hxx>
@@ -48,7 +45,6 @@
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
@@ -56,8 +52,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <i18nlangtag/lang.h>
-#include <rtl/ref.hxx>
-#include <LibreOfficeKit/LibreOfficeKitTypes.h>
 #include <o3tl/deleter.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 3d040c00435d..cd7ddad07c3e 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -24,35 +24,26 @@
 #include "impedit.hxx"
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
-#include "editdbg.hxx"
 #include <eerdll2.hxx>
 #include <editeng/eerdll.hxx>
 #include <edtspell.hxx>
 #include "eeobj.hxx"
 #include <editeng/txtrange.hxx>
-#include <svl/urlbmk.hxx>
 #include <sfx2/app.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svl/ctloptions.hxx>
 #include <unotools/securityoptions.hxx>
 #include <editeng/acorrcfg.hxx>
-#include <editeng/fhgtitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/udlnitem.hxx>
 #include <editeng/adjustitem.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include <editeng/frmdiritem.hxx>
-#include <editeng/fontitem.hxx>
 #include <editeng/justifyitem.hxx>
 
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/text/CharacterCompressionType.hpp>
 #include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
 #include <com/sun/star/system/SystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
@@ -73,7 +64,6 @@
 #include <algorithm>
 #include <memory>
 
-#include <iostream>
 #include <fstream>
 
 using namespace ::com::sun::star;
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 54a043ec2412..6e50e842d097 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -23,7 +23,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/settings.hxx>
 
-#include <editeng/adjustitem.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/flditem.hxx>
@@ -35,7 +34,6 @@
 #include <editeng/colritem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/fhgtitem.hxx>
-#include <editeng/kernitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/fontitem.hxx>
@@ -45,7 +43,6 @@
 #include <editeng/scriptspaceitem.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/justifyitem.hxx>
 
 #include <svtools/colorcfg.hxx>
 #include <svl/ctloptions.hxx>
@@ -55,9 +52,6 @@
 #include <editeng/forbiddencharacterstable.hxx>
 
 #include <unotools/configmgr.hxx>
-#include <unotools/localedatawrapper.hxx>
-
-#include <editeng/unolingu.hxx>
 
 #include <set>
 #include <math.h>
@@ -65,7 +59,6 @@
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/InputSequenceChecker.hpp>
-#include <com/sun/star/text/CharacterCompressionType.hpp>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <i18nlangtag/mslangid.hxx>
 
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index d6435f937f27..c690b35cd302 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -60,9 +60,7 @@
 #include <svtools/rtfout.hxx>
 #include <tools/stream.hxx>
 #include <edtspell.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include <editeng/unolingu.hxx>
-#include <linguistic/lngprops.hxx>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx
index cb01c05b24f3..975eddebf6ae 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -20,9 +20,7 @@
 #include <memory>
 #include "impedit.hxx"
 #include <editeng/editeng.hxx>
-#include "editdbg.hxx"
 #include <svl/hint.hxx>
-#include <editeng/lrspitem.hxx>
 #include <sfx2/app.hxx>
 
 void ImpEditEngine::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
diff --git a/editeng/source/editeng/textconv.cxx b/editeng/source/editeng/textconv.cxx
index b4bb23e9af77..ed08c698f5e6 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -21,9 +21,6 @@
 #include "impedit.hxx"
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/unolingu.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include <editeng/langitem.hxx>
 #include <editeng/fontitem.hxx>
 #include "textconv.hxx"
diff --git a/editeng/source/editeng/textconv.hxx b/editeng/source/editeng/textconv.hxx
index f4873dd26c08..1acb9a7148f5 100644
--- a/editeng/source/editeng/textconv.hxx
+++ b/editeng/source/editeng/textconv.hxx
@@ -19,12 +19,11 @@
 #ifndef INCLUDED_EDITENG_SOURCE_EDITENG_TEXTCONV_HXX
 #define INCLUDED_EDITENG_SOURCE_EDITENG_TEXTCONV_HXX
 
-#include <editeng/splwrap.hxx>
-#include <editeng/svxacorr.hxx>
+#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 <vcl/vclptr.hxx>
 
 class EditView;
 
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 2788572adcc8..769179748b40 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -17,15 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/stream.hxx>
 #include <vcl/outdev.hxx>
 
 #include <editeng/bulletitem.hxx>
 
-#include <tools/tenccvt.hxx>
-#include <tools/debug.hxx>
-#include <vcl/dibtools.hxx>
-
 SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich )
     : SfxPoolItem(_nWhich)
     , aFont(OutputDevice::GetDefaultFont( DefaultFontType::FIXED, LANGUAGE_SYSTEM, GetDefaultFontFlags::NONE ))
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 3325eec528bb..2b57402aef54 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -27,7 +27,6 @@
 #include <editeng/measfld.hxx>
 #include <editeng/unonames.hxx>
 
-#include <tools/tenccvt.hxx>
 #include <tools/debug.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 3c93e0b2266a..718e87ee2e37 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -21,24 +21,12 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/script/Converter.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/table/ShadowLocation.hpp>
-#include <com/sun/star/table/TableBorder.hpp>
 #include <com/sun/star/table/ShadowFormat.hpp>
-#include <com/sun/star/table/CellRangeAddress.hpp>
-#include <com/sun/star/table/CellContentType.hpp>
-#include <com/sun/star/table/TableOrientation.hpp>
-#include <com/sun/star/util/SortField.hpp>
-#include <com/sun/star/util/SortFieldType.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/table/BorderLineStyle.hpp>
-#include <com/sun/star/table/CellOrientation.hpp>
-#include <com/sun/star/table/CellAddress.hpp>
-#include <com/sun/star/style/PageStyleLayout.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 #include <com/sun/star/style/GraphicLocation.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/awt/Selection.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/frame/status/UpperLowerMarginScale.hpp>
@@ -50,20 +38,15 @@
 #include <sal/log.hxx>
 #include <i18nutil/unicode.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <limits.h>
 #include <comphelper/processfactory.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <tools/urlobj.hxx>
-#include <comphelper/fileformat.h>
 #include <svl/memberid.h>
-#include <svtools/borderhelper.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <tools/mapunit.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <editeng/editids.hrc>
 #include <editeng/editrids.hrc>
 #include <editeng/pbinitem.hxx>
 #include <editeng/sizeitem.hxx>
@@ -82,15 +65,13 @@
 #include <editeng/frmdiritem.hxx>
 #include <editeng/itemtype.hxx>
 #include <editeng/eerdll.hxx>
-#include <editeng/unoprnms.hxx>
 #include <editeng/memberids.h>
-#include <editeng/editerr.hxx>
 #include <libxml/xmlwriter.h>
 #include <o3tl/enumrange.hxx>
 #include <o3tl/safeint.hxx>
 #include <vcl/GraphicLoader.hxx>
 
-#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
 
 using namespace ::editeng;
 using namespace ::com::sun::star;
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index b8f2c7bdd102..7fe699cb2c36 100644
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -19,12 +19,8 @@
 
 #include <editeng/justifyitem.hxx>
 #include <editeng/memberids.h>
-#include <editeng/editrids.hrc>
 #include <editeng/eerdll.hxx>
 
-#include <tools/stream.hxx>
-#include <tools/debug.hxx>
-
 #include <com/sun/star/table/CellHoriJustify.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/table/CellJustifyMethod.hpp>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 599318fa6db9..67b4dcadafd9 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -23,24 +23,19 @@
 
 #include <editeng/numitem.hxx>
 
-#include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
-#include <com/sun/star/text/RelOrientation.hpp>
 #include <editeng/brushitem.hxx>
 #include <vcl/font.hxx>
 #include <vcl/settings.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/numdef.hxx>
-#include <editeng/eeitem.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/window.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
-#include <editeng/unolingu.hxx>
 #include <com/sun/star/text/XNumberingFormatter.hpp>
 #include <com/sun/star/text/DefaultNumberingProvider.hpp>
 #include <com/sun/star/text/XDefaultNumberingProvider.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <comphelper/fileformat.h>
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index b4d92ff45598..ebb5aecaf63f 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <limits.h>
 #include <vcl/print.hxx>
-#include <vcl/svapp.hxx>
 #include <editeng/paperinf.hxx>
 
 /*--------------------------------------------------------------------
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index c2ca935be7c5..fd20e0835d6b 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <libxml/xmlwriter.h>
-#include <comphelper/fileformat.h>
 #include <comphelper/extract.hxx>
 #include <osl/diagnose.h>
 #include <unotools/localedatawrapper.hxx>
@@ -47,12 +46,8 @@
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <editeng/memberids.h>
-#include <editeng/editids.hrc>
 #include <editeng/itemtype.hxx>
 #include <editeng/eerdll.hxx>
-#include <editeng/paperinf.hxx>
-#include <vcl/svapp.hxx>
-#include <algorithm>
 
 using namespace ::com::sun::star;
 
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 3ee013a03cf4..891f3e2ab7c0 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -23,7 +23,6 @@
 #include <tools/gen.hxx>
 #include <tools/poly.hxx>
 #include <unotools/charclass.hxx>
-#include <editeng/unolingu.hxx>
 #include <com/sun/star/i18n/KCharacterType.hpp>
 #include <editeng/svxfont.hxx>
 #include <editeng/escapementitem.hxx>
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index cff724ead921..e7e3623f69eb 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -20,10 +20,7 @@
 #include <com/sun/star/style/CaseMap.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/frame/status/FontHeight.hpp>
-#include <vcl/bitmapex.hxx>
-#include <tools/stream.hxx>
 #include <math.h>
-#include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <unotools/fontdefs.hxx>
@@ -31,39 +28,22 @@
 #include <unotools/syslocale.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/unohelp.hxx>
-#include <editeng/eeitem.hxx>
 #include <svtools/unitconv.hxx>
 
 #include <editeng/editids.hrc>
 #include <editeng/editrids.hrc>
-#include <vcl/vclenum.hxx>
-#include <tools/tenccvt.hxx>
 #include <tools/mapunit.hxx>
 
 #include <rtl/ustring.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <svl/itemset.hxx>
 
-#include <comphelper/fileformat.h>
 #include <svtools/langtab.hxx>
 #include <svl/itempool.hxx>
 #include <svtools/ctrltool.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
-#include <com/sun/star/awt/SimpleFontMetric.hpp>
-#include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
-#include <com/sun/star/awt/CharSet.hpp>
-#include <com/sun/star/awt/FontWidth.hpp>
-#include <com/sun/star/awt/XFont.hpp>
-#include <com/sun/star/awt/FontType.hpp>
-#include <com/sun/star/awt/FontUnderline.hpp>
-#include <com/sun/star/awt/FontStrikeout.hpp>
-#include <com/sun/star/awt/FontFamily.hpp>
-#include <com/sun/star/awt/FontPitch.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/text/FontEmphasis.hpp>
-#include <com/sun/star/i18n/ScriptType.hpp>
 #include <editeng/rsiditem.hxx>
 #include <editeng/memberids.h>
 #include <editeng/flstitem.hxx>
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index d81aec28069f..252c8c0556c0 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -20,10 +20,6 @@
 #include <editeng/writingmodeitem.hxx>
 #include <editeng/frmdir.hxx>
 #include <editeng/eerdll.hxx>
-#include <editeng/editrids.hrc>
-#include <osl/diagnose.h>
-
-#include <climits>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index be38d75ab5f4..5ee7c47e8d90 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -18,14 +18,12 @@
  */
 
 #include <memory>
-#include <climits>
 #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>
 #include <editeng/xmlcnitm.hxx>
-#include <tools/debug.hxx>
 #include <tools/solar.h>
 
 using namespace ::com::sun::star::uno;
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index 4dadeca36fe3..19a83eaf3bc3 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -21,6 +21,8 @@
 
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.hxx b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
index b100212da5e6..b9729de4ee2d 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.hxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.hxx
@@ -19,10 +19,7 @@
 #ifndef INCLUDED_EDITENG_SOURCE_MISC_SVXMLAUTOCORRECTEXPORT_HXX
 #define INCLUDED_EDITENG_SOURCE_MISC_SVXMLAUTOCORRECTEXPORT_HXX
 
-#include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmlexp.hxx>
-#include <xmloff/nmspmap.hxx>
-#include <xmloff/xmlnmspe.hxx>
 #include <editeng/svxacorr.hxx>
 
 class SvXMLAutoCorrectExport : public SvXMLExport
diff --git a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
index 33cd961b3398..4bdadcdcde61 100644
--- a/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx
@@ -9,7 +9,6 @@
 
 #include "SvXMLAutoCorrectTokenHandler.hxx"
 #include <xmloff/xmltoken.hxx>
-#include <com/sun/star/xml/sax/FastToken.hpp>
 #if defined __clang__
 #if __has_warning("-Wdeprecated-register")
 #pragma GCC diagnostic push
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index c2b3dbe6fe31..1d9d38da3066 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -25,7 +25,6 @@
 #include <ucbhelper/content.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/ucbhelper.hxx>
-#include <svl/urihelper.hxx>
 
 #include <editeng/svxacorr.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx b/editeng/source/misc/forbiddencharacterstable.cxx
index 563461b75c24..dc6f4d8c9d18 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -21,9 +21,6 @@
 #include <editeng/forbiddencharacterstable.hxx>
 
 #include <unotools/localedatawrapper.hxx>
-#include <editeng/unolingu.hxx>
-
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 SvxForbiddenCharactersTable::SvxForbiddenCharactersTable(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
     : m_xContext(rxContext)
diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx
index 50130a24ae2b..9db47c4b0f7b 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/i18n/XExtendedTextConversion.hpp>
 #include <com/sun/star/i18n/TextConversionType.hpp>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
-#include <com/sun/star/i18n/WordType.hpp>
 #include <vcl/weld.hxx>
 #include <unotools/charclass.hxx>
 #include <sal/log.hxx>
@@ -39,7 +38,6 @@
 #include <tools/debug.hxx>
 
 #include <editeng/edtdlg.hxx>
-#include <editeng/unolingu.hxx>
 
 #define HHC HangulHanjaConversion
 
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 0c9e23f360fc..3fabd235f3b9 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -21,12 +21,10 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/window.hxx>
 #include <svtools/langtab.hxx>
 
 #include <vcl/errinf.hxx>
 #include <editeng/unolingu.hxx>
-#include <linguistic/lngprops.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
@@ -39,7 +37,6 @@
 #include <editeng/edtdlg.hxx>
 #include <editeng/eerdll.hxx>
 #include <editeng/editrids.hrc>
-#include <editeng/editids.hrc>
 #include <editeng/editerr.hxx>
 
 #include <map>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 8160a448925f..58088523fb4e 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include <tools/urlobj.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nutil/transliteration.hxx>
@@ -33,20 +32,15 @@
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include <sot/storinfo.hxx>
 #include <svl/fstathelper.hxx>
-#include <svtools/helpopt.hxx>
 #include <svl/urihelper.hxx>
 #include <unotools/charclass.hxx>
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <unotools/collatorwrapper.hxx>
-#include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <com/sun/star/i18n/UnicodeScript.hpp>
 #include <com/sun/star/i18n/OrdinalSuffix.hpp>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/transliterationwrapper.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/string.hxx>
@@ -62,9 +56,7 @@
 #include <vcl/window.hxx>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/FastParser.hpp>
-#include <com/sun/star/xml/sax/FastToken.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
-#include <com/sun/star/xml/sax/FastTokenHandler.hpp>
 #include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <unotools/streamwrap.hxx>
 #include "SvXMLAutoCorrectImport.hxx"
@@ -77,8 +69,6 @@
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <tools/diagnose_ex.h>
 #include <xmloff/xmltoken.hxx>
-#include <vcl/help.hxx>
-#include <set>
 #include <unordered_map>
 #include <rtl/character.hxx>
 
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 712eea464024..cc4417498721 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -22,9 +22,7 @@
 #include <math.h>
 #include <tools/poly.hxx>
 #include <tools/debug.hxx>
-#include <tools/solar.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <vector>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 8aa7a229bc64..43462bda6df5 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -20,31 +20,18 @@
 
 #include <memory>
 #include <editeng/unolingu.hxx>
-#include <unotools/pathoptions.hxx>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <com/sun/star/linguistic2/DictionaryList.hpp>
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 #include <com/sun/star/linguistic2/LinguProperties.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
-#include <com/sun/star/ucb/XAnyCompareFactory.hpp>
-#include <com/sun/star/ucb/XContentAccess.hpp>
-#include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
-#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/util/DateTime.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/lingucfg.hxx>
-#include <unotools/ucbhelper.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <ucbhelper/commandenvironment.hxx>
-#include <ucbhelper/content.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <linguistic/misc.hxx>
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index fe122a91fb0a..97a622a59fa1 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -17,20 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svl/intitem.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/editview.hxx>
-#include <editeng/editdata.hxx>
 #include <editeng/eerdll.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/fhgtitem.hxx>
 
 #include <editeng/outliner.hxx>
 #include "outleeng.hxx"
 #include "paralist.hxx"
 #include <editeng/editrids.hrc>
 #include <svl/itemset.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
 #include "outlundo.hxx"
 
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index efdbc2a9bd61..ff3d1583a5f1 100644
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -18,13 +18,11 @@
  */
 
 
-#include <svl/intitem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editdata.hxx>
+#include <editeng/editund2.hxx>
 
-#include <editeng/lrspitem.hxx>
-#include <editeng/fhgtitem.hxx>
 #include <svl/style.hxx>
 #include <vcl/mapmod.hxx>
 
@@ -32,10 +30,7 @@
 
 #include <editeng/outliner.hxx>
 #include "paralist.hxx"
-#include <editeng/outlobj.hxx>
 #include "outleeng.hxx"
-#include "outlundo.hxx"
-#include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
 
 
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 71b3cf56ce1a..df08cebbc145 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -24,7 +24,6 @@
 #include <editeng/editview.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/lrspitem.hxx>
-#include <editeng/fhgtitem.hxx>
 
 #include <math.h>
 #include <svl/style.hxx>
@@ -35,17 +34,12 @@
 #include "outlundo.hxx"
 #include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
-#include <editeng/scripttypeitem.hxx>
 #include <editeng/overflowingtxt.hxx>
 #include <editeng/editobj.hxx>
 #include <svl/itemset.hxx>
-#include <svl/whiter.hxx>
 #include <vcl/metric.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/adjustitem.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/metaact.hxx>
 #include <vcl/window.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <editeng/svxfont.hxx>
@@ -55,9 +49,6 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
-// calculate if it's RTL or not
-#include <unicode/ubidi.h>
-#include <cassert>
 #include <memory>
 using std::advance;
 
diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx
index d402666d7248..8530c5dda55c 100644
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
@@ -17,18 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svl/intitem.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editview.hxx>
 #include <editeng/editdata.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/fhgtitem.hxx>
 
 #include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
-#include "outleeng.hxx"
 #include <editeng/editobj.hxx>
-#include <tools/stream.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index 76232c090dbf..c2db1a77f353 100644
--- a/editeng/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -18,14 +18,8 @@
  */
 
 
-#include <svl/intitem.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/editview.hxx>
-#include <editeng/editdata.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/fhgtitem.hxx>
-
 #include <editeng/outliner.hxx>
+#include <tools/debug.hxx>
 #include "outlundo.hxx"
 
 
diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx
index 754c79b9ae8f..68b518474b6b 100644
--- a/editeng/source/outliner/outlundo.hxx
+++ b/editeng/source/outliner/outlundo.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_EDITENG_SOURCE_OUTLINER_OUTLUNDO_HXX
 
 #include <editeng/outliner.hxx>
-#include <editeng/editdata.hxx>
 #include <editeng/editund2.hxx>
 
 class OutlinerUndoBase : public EditUndo
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 26a8f6ca2f3d..1f2fe9867304 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -20,13 +20,10 @@
 #include <memory>
 #include <com/sun/star/i18n/WordType.hpp>
 
-#include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editdata.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/fhgtitem.hxx>
 
 #include <svl/style.hxx>
 #include <svl/languageoptions.hxx>
@@ -48,6 +45,7 @@
 #include <editeng/editstat.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/editeng/source/outliner/overflowingtxt.cxx b/editeng/source/outliner/overflowingtxt.cxx
index 0ebaa6850a87..16be74813704 100644
--- a/editeng/source/outliner/overflowingtxt.cxx
+++ b/editeng/source/outliner/overflowingtxt.cxx
@@ -23,14 +23,12 @@
 #include <editeng/overflowingtxt.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
+#include <editeng/editeng.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/editdata.hxx>
 
-#include "outleeng.hxx"
 #include <editdoc.hxx>
 
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-
 
 std::unique_ptr<OutlinerParaObject> TextChainingUtils::JuxtaposeParaObject(
         css::uno::Reference< css::datatransfer::XTransferable > const & xOverflowingContent,
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index db3ec1817ea4..9bf4e555ea1f 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -28,8 +28,6 @@
 #include <tools/debug.hxx>
 #include <libxml/xmlwriter.h>
 
-#include <iterator>
-
 ParagraphData::ParagraphData()
 : nDepth( -1 )
 , mnNumberingStartValue( -1 )
diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index e2f67249cf66..7b78dfcd82b4 100644
--- a/editeng/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -26,6 +26,7 @@
 #include <memory>
 #include <vector>
 
+#include <editeng/outliner.hxx>
 #include <tools/link.hxx>
 
 class Paragraph;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 345c0da1b754..297469d85a58 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <editeng/flstitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
@@ -34,30 +33,18 @@
 #include <editeng/cmapitem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/langitem.hxx>
-#include <editeng/nhypitem.hxx>
-#include <editeng/blinkitem.hxx>
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/twolinesitem.hxx>
-#include <editeng/pbinitem.hxx>
-#include <editeng/sizeitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
-#include <editeng/prntitem.hxx>
-#include <editeng/opaqitem.hxx>
-#include <editeng/protitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
-#include <editeng/formatbreakitem.hxx>
 #include <editeng/keepitem.hxx>
-#include <editeng/lineitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
-#include <editeng/orphitem.hxx>
-#include <editeng/widwitem.hxx>
 #include <editeng/tstpitem.hxx>
-#include <editeng/pmdlitem.hxx>
 #include <editeng/spltitem.hxx>
 #include <editeng/hyphenzoneitem.hxx>
 #include <editeng/charscaleitem.hxx>
@@ -79,6 +66,8 @@
 #include <editeng/svxrtf.hxx>
 #include <editeng/editids.hrc>
 
+#include <limits.h>
+
 #define BRACELEFT   '{'
 #define BRACERIGHT  '}'
 
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 7f5fdd34ac6a..6f57a5ddd29e 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -30,18 +30,14 @@
 
 #include <comphelper/string.hxx>
 
-#include <com/sun/star/lang/Locale.hpp>
 #include <editeng/scriptspaceitem.hxx>
 #include <editeng/fontitem.hxx>
-#include <editeng/colritem.hxx>
 #include <editeng/svxrtf.hxx>
 #include <editeng/editids.hrc>
 #include <vcl/font.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <com/sun/star/document/XDocumentProperties.hpp>
-
 
 using namespace ::com::sun::star;
 
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index ce277e83e32c..8bb83f65583b 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -24,7 +24,6 @@
 #include <editeng/forbiddencharacterstable.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/svapp.hxx>
-#include <editeng/unolingu.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index a56404cc0805..b9c06cf75a81 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -21,13 +21,12 @@
 // Global header
 
 
-#include <limits.h>
 #include <utility>
 #include <memory>
 #include <vector>
 #include <algorithm>
-#include <vcl/window.hxx>
-#include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
+#include <svl/itemset.hxx>
 #include <tools/debug.hxx>
 
 
@@ -35,11 +34,8 @@
 
 
 #include <editeng/unoedprx.hxx>
-#include <editeng/unotext.hxx>
-#include <editeng/unoedhlp.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/editview.hxx>
 #include <editeng/AccessibleStringWrap.hxx>
 #include <editeng/outliner.hxx>
 
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index b94df37f0e79..3b37f8032efd 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -31,11 +31,11 @@
 #include <editeng/wrlmitem.hxx>
 #include <editeng/memberids.h>
 #include <svl/itempool.hxx>
+#include <vcl/font.hxx>
 #include <vcl/unohelp.hxx>
 #include <tools/gen.hxx>
 
 #include <editeng/unofdesc.hxx>
-#include <editeng/svxfont.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 66e2ad13a647..740f71249db8 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -19,13 +19,10 @@
 
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/text/FilenameDisplayFormat.hpp>
-#include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <svl/itemprop.hxx>
 
-#include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/CustomPropertyField.hxx>
 #include <editeng/measfld.hxx>
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index fb1236632dde..73fad9104536 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <algorithm>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <editeng/eeitem.hxx>
@@ -26,7 +25,6 @@
 
 #include <svl/itemset.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/editview.hxx>
 #include <editeng/unoedhlp.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outliner.hxx>
diff --git a/editeng/source/uno/unofored_internal.hxx b/editeng/source/uno/unofored_internal.hxx
index 34eb96903dba..6714e1395bef 100644
--- a/editeng/source/uno/unofored_internal.hxx
+++ b/editeng/source/uno/unofored_internal.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_EDITENG_SOURCE_UNO_UNFORED_INTERNAL_HXX
 #define INCLUDED_EDITENG_SOURCE_UNO_UNFORED_INTERNAL_HXX
 
+#include <editeng/editeng.hxx>
 
 SfxItemState GetSvxEditEngineItemState( EditEngine const & rEditEngine, const ESelection& rSel, sal_uInt16 nWhich );
 
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 9fb555470456..ceea8bceb67c 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <algorithm>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <svl/style.hxx>
@@ -30,10 +29,8 @@
 #include <editeng/outliner.hxx>
 #include <editeng/unoedhlp.hxx>
 #include <svl/poolitem.hxx>
-#include <editeng/eeitem.hxx>
 
 #include <editeng/unoforou.hxx>
-#include <editeng/unofored.hxx>
 #include <editeng/outlobj.hxx>
 #include "unofored_internal.hxx"
 
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index aa6f310c1987..c9d54c83e972 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -18,14 +18,11 @@
  */
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <svl/eitem.hxx>
 #include <svl/itemprop.hxx>
 #include <tools/helpers.hxx>
-#include <tools/debug.hxx>
 #include <editeng/unoipset.hxx>
-#include <editeng/editids.hrc>
-#include <editeng/editeng.hxx>
 #include <svl/itempool.hxx>
+#include <svl/solar.hrc>
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index dea25ce79a08..03c051ebaeed 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -19,11 +19,15 @@
 
 #include <sal/config.h>
 
+#include <com/sun/star/awt/FontDescriptor.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <vcl/font.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
@@ -34,8 +38,6 @@
 #include <editeng/brushitem.hxx>
 #include <editeng/unoprnms.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/unotext.hxx>
 #include <editeng/unofdesc.hxx>
 #include <editeng/unonrule.hxx>
 #include <editeng/editids.hrc>
diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx
index 9207839c711c..6b2e5b42c376 100644
--- a/editeng/source/uno/unopracc.cxx
+++ b/editeng/source/uno/unopracc.cxx
@@ -21,9 +21,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <editeng/unopracc.hxx>
 #include <editeng/unoedsrc.hxx>
 
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 475200c27af3..f0ef0c30a8eb 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/svapp.hxx>
-#include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/text/TextRangeSelection.hpp>
@@ -28,9 +27,9 @@
 
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
-#include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <rtl/instance.hxx>
+#include <tools/debug.hxx>
 
 #include <editeng/fontitem.hxx>
 #include <editeng/tstpitem.hxx>
diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx
index 2059d5bc4bd2..ef9ab680adbe 100644
--- a/editeng/source/uno/unotext2.cxx
+++ b/editeng/source/uno/unotext2.cxx
@@ -24,9 +24,6 @@
 #include <vcl/svapp.hxx>
 #include <rtl/instance.hxx>
 
-#include <editeng/eeitem.hxx>
-#include <editeng/flditem.hxx>
-#include <editeng/unofield.hxx>
 #include <editeng/unotext.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/editeng/source/uno/unoviwou.cxx b/editeng/source/uno/unoviwou.cxx
index b437c09479d0..d1d20110c75c 100644
--- a/editeng/source/uno/unoviwou.cxx
+++ b/editeng/source/uno/unoviwou.cxx
@@ -22,7 +22,6 @@
 
 #include <editeng/unoviwou.hxx>
 #include <editeng/outliner.hxx>
-#include <editeng/editeng.hxx>
 
 SvxDrawOutlinerViewForwarder::SvxDrawOutlinerViewForwarder( OutlinerView& rOutl ) :
     mrOutlinerView ( rOutl ), maTextShapeTopLeft()
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 240d80ec2505..f5303cd7b2e7 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -25,19 +25,11 @@
 #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/io/XActiveDataSource.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 <sot/storage.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <sal/log.hxx>
-#include <xmloff/xmluconv.hxx>
-#include <xmloff/xmlnmspe.hxx>
-#include <xmloff/nmspmap.hxx>
 #include <xmloff/xmlmetae.hxx>
-#include <cppuhelper/implbase4.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/streamwrap.hxx>
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index ac28c0d6b457..42c757a8b3c1 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -17,21 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/io/Pipe.hpp>
-#include <com/sun/star/io/XActiveDataControl.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/xml/sax/Parser.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <sot/storage.hxx>
 #include <svl/itemprop.hxx>
 #include <xmloff/xmlimp.hxx>
-#include <xmloff/xmlmetae.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>