tdf#42949 Fix IWYU warnings in include/editeng/[f-x]*

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

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

43 files changed, 49 insertions, 133 deletions

diff --git a/include/editeng/SpellPortions.hxx b/include/editeng/SpellPortions.hxx
index bdf1207c8bb5..89b90d87f09e 100644
--- a/include/editeng/SpellPortions.hxx
+++ b/include/editeng/SpellPortions.hxx
@@ -24,13 +24,14 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/linguistic2/SingleProofreadingError.hpp>
-#include <com/sun/star/linguistic2/XProofreader.hpp>
 #include <vector>
 
 namespace com{ namespace sun{ namespace star{ namespace linguistic2{
     class XSpellAlternatives;
 }}}}
 
+namespace com::sun::star::linguistic2 { class XProofreader; }
+
 namespace svx{
 /** contains a portion of text that has the same language attributes applied
     and belongs to the same script type.
diff --git a/include/editeng/Trie.hxx b/include/editeng/Trie.hxx
index 62e2ff9110e1..87d4a54ecdb3 100644
--- a/include/editeng/Trie.hxx
+++ b/include/editeng/Trie.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_EDITENG_TRIE_HXX
 #define INCLUDED_EDITENG_TRIE_HXX
 
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <editeng/editengdllapi.h>
 #include <memory>
diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx
index e79da5b7bd30..be1e249f87bc 100644
--- a/include/editeng/eeitem.hxx
+++ b/include/editeng/eeitem.hxx
@@ -56,6 +56,8 @@ class SvxULSpaceItem;
 class SvxUnderlineItem;
 class SvxWeightItem;
 class SvxWordLineModeItem;
+class SvxBulletItem;
+class SvxNumBulletItem;
 
 /*
  * NOTE: Changes in this file will probably require
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index c9e5ae92756f..686eed994ff0 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -24,8 +24,6 @@
 #include <tools/solar.h>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxFontHeightItem -----------------------------------------------
 
 // Warning: twips values
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index 0b3dcd570f41..f3ede8d73547 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -21,10 +21,8 @@
 
 #include <editeng/editengdllapi.h>
 #include <rtl/ustring.hxx>
+#include <tools/fontenum.hxx>
 #include <svl/poolitem.hxx>
-#include <vcl/font.hxx>
-
-class SvXMLUnitConverter;
 
 /** This item describes a Font.
 */
diff --git a/include/editeng/forbiddencharacterstable.hxx b/include/editeng/forbiddencharacterstable.hxx
index 156bd85bfacd..dff3309591a2 100644
--- a/include/editeng/forbiddencharacterstable.hxx
+++ b/include/editeng/forbiddencharacterstable.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_EDITENG_FORBIDDENCHARACTERSTABLE_HXX
 #define INCLUDED_EDITENG_FORBIDDENCHARACTERSTABLE_HXX
 
-#include <salhelper/simplereferenceobject.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
 #include <editeng/editengdllapi.h>
diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index 21eae6a2a726..202f44a1bb8e 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -19,15 +19,16 @@
 #ifndef INCLUDED_EDITENG_HANGULHANJA_HXX
 #define INCLUDED_EDITENG_HANGULHANJA_HXX
 
-#include <vcl/window.hxx>
 #include <memory>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <editeng/editengdllapi.h>
 #include <i18nlangtag/mslangid.hxx>
 
+namespace com::sun::star::lang { struct Locale; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
+namespace vcl { class Font; }
+namespace weld { class Window; }
+
 
 namespace editeng
 {
diff --git a/include/editeng/hyphenzoneitem.hxx b/include/editeng/hyphenzoneitem.hxx
index 9d04c8a3b744..9f04697b83b7 100644
--- a/include/editeng/hyphenzoneitem.hxx
+++ b/include/editeng/hyphenzoneitem.hxx
@@ -22,8 +22,6 @@
 #include <svl/poolitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxHyphenZoneItem -----------------------------------------------
 
 /*  [Description]
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 25525490ca69..89666949d70c 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -22,7 +22,7 @@
 // forward ---------------------------------------------------------------
 #include <rtl/ustring.hxx>
 #include <tools/bigint.hxx>
-#include <svl/poolitem.hxx>
+#include <tools/mapunit.hxx>
 #include <editeng/editengdllapi.h>
 
 class Color;
diff --git a/include/editeng/kernitem.hxx b/include/editeng/kernitem.hxx
index 1abd3c880faa..ec2cd4638ee4 100644
--- a/include/editeng/kernitem.hxx
+++ b/include/editeng/kernitem.hxx
@@ -22,8 +22,6 @@
 #include <svl/intitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxKerningItem --------------------------------------------------
 
 // Note: Twips value
diff --git a/include/editeng/langitem.hxx b/include/editeng/langitem.hxx
index 4be285b978a7..78e19d745f18 100644
--- a/include/editeng/langitem.hxx
+++ b/include/editeng/langitem.hxx
@@ -23,8 +23,6 @@
 #include <i18nlangtag/lang.h>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxLanguageItem -------------------------------------------------
 
 /*  [Description]
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx
index f2adaa316e5c..11a07ffaa1b4 100644
--- a/include/editeng/lspcitem.hxx
+++ b/include/editeng/lspcitem.hxx
@@ -19,12 +19,11 @@
 #ifndef INCLUDED_EDITENG_LSPCITEM_HXX
 #define INCLUDED_EDITENG_LSPCITEM_HXX
 
-#include <svl/eitem.hxx>
+#include <svl/cenumitm.hxx>
+#include <tools/mapunit.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxLineSpacingItem ----------------------------------------------
 
 /*  [Description]
diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx
index a860dc2d91f0..316a2c5f9fb3 100644
--- a/include/editeng/measfld.hxx
+++ b/include/editeng/measfld.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_EDITENG_MEASFLD_HXX
 #define INCLUDED_EDITENG_MEASFLD_HXX
 
-#include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/editengdllapi.h>
 #include <com/sun/star/text/textfield/Type.hpp>
 
-class SdrMeasureObj;
-
 enum class SdrMeasureFieldKind { Value, Unit, Rotate90Blanks };
 
 class EDITENG_DLLPUBLIC SdrMeasureField: public SvxFieldData {
diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h
index 6c1e2d303041..c41b45af9cb9 100644
--- a/include/editeng/memberids.h
+++ b/include/editeng/memberids.h
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_EDITENG_MEMBERIDS_H
 #define INCLUDED_EDITENG_MEMBERIDS_H
 
-#include <svl/memberid.h>
-
 #define MID_LOCATION            0x3c
 #define MID_TRANSPARENT         0x4b
 #define MID_BG_COLOR            0x22
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index ec5671f69d7d..e758d9021cf5 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -20,16 +20,12 @@
 #define INCLUDED_EDITENG_NUMITEM_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/link.hxx>
 #include <tools/solar.h>
 #include <svl/poolitem.hxx>
 #include <editeng/svxenum.hxx>
 #include <tools/gen.hxx>
 #include <editeng/numdef.hxx>
 #include <tools/color.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <unotools/fontcvt.hxx>
 #include <editeng/editengdllapi.h>
@@ -47,6 +43,8 @@ namespace com{namespace sun{ namespace star{
     }
 }}}
 
+namespace com::sun::star::lang { struct Locale; }
+
 
 #define SVX_NO_NUM              200 // Marker for no numbering
 #define SVX_NO_NUMLEVEL         0x20
diff --git a/include/editeng/opaqitem.hxx b/include/editeng/opaqitem.hxx
index 12e3caf2c44b..17517e6c59e7 100644
--- a/include/editeng/opaqitem.hxx
+++ b/include/editeng/opaqitem.hxx
@@ -22,8 +22,6 @@
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxOpaqueItem ---------------------------------------------------
 
 
diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx
index d40e5144b494..71f962ea1abf 100644
--- a/include/editeng/orphitem.hxx
+++ b/include/editeng/orphitem.hxx
@@ -22,8 +22,6 @@
 #include <svl/intitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxOrphansItem --------------------------------------------------
 
 /*  [Description]
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 6c8dd7044916..e55b14643fd4 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -21,7 +21,6 @@
 
 #include <editeng/editdata.hxx>
 #include <editeng/editstat.hxx>
-#include <editeng/numitem.hxx>
 #include <i18nlangtag/lang.h>
 #include <rtl/ustring.hxx>
 #include <svl/SfxBroadcaster.hxx>
@@ -29,21 +28,13 @@
 #include <svl/undo.hxx>
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
-#include <tools/contnr.hxx>
-#include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/errcode.hxx>
 #include <tools/link.hxx>
-#include <svl/style.hxx>
 #include <editeng/editengdllapi.h>
-#include <com/sun/star/lang/Locale.hpp>
 
 #include <vcl/GraphicObject.hxx>
 
-#include <LibreOfficeKit/LibreOfficeKitTypes.h>
-#include <com/sun/star/uno/Reference.h>
-
-#include <rtl/ref.hxx>
 #include <editeng/svxfont.hxx>
 #include <editeng/eedata.hxx>
 #include <editeng/paragraphdata.hxx>
@@ -61,8 +52,6 @@ class EditUndo;
 class ParagraphList;
 class OutlinerParaObject;
 class SvStream;
-class SvxBulletItem;
-class SvxFont;
 class SvxSearchItem;
 class SvxFieldItem;
 namespace vcl { class Window; }
@@ -70,15 +59,11 @@ class KeyEvent;
 class MouseEvent;
 class CommandEvent;
 class MapMode;
-class OutputDevice;
-namespace tools { class PolyPolygon; }
 class SfxStyleSheetPool;
 class SfxStyleSheet;
 class SfxItemPool;
 class SfxItemSet;
-class SvxNumBulletItem;
 class SvxNumberFormat;
-class SvxLRSpaceItem;
 class EditEngine;
 class SvKeyValueIterator;
 class SvxForbiddenCharactersTable;
@@ -88,8 +73,8 @@ class OutlinerViewShell;
 enum class CharCompressType;
 enum class TransliterationFlags;
 class SvxFieldData;
-class SfxUndoManager;
 enum class PointerStyle;
+class SvxNumRule;
 
 namespace com { namespace sun { namespace star { namespace linguistic2 {
     class XSpellChecker1;
@@ -100,6 +85,7 @@ namespace svx{
     typedef std::vector<SpellPortion> SpellPortions;
 }
 namespace basegfx { class B2DPolyPolygon; }
+namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
 
 
 
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx
index 66d4527648c8..b7835f175d61 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
 #define INCLUDED_EDITENG_OVERFLOWINGTXT_HXX
 
-#include <editeng/macros.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/editdata.hxx>
 
@@ -38,7 +37,6 @@ using ::rtl::OUString;
 
 
 class OutlinerParaObject;
-class EditTextObject;
 class Outliner;
 
 
diff --git a/include/editeng/paperinf.hxx b/include/editeng/paperinf.hxx
index ba684c9b5aee..e4b08014515c 100644
--- a/include/editeng/paperinf.hxx
+++ b/include/editeng/paperinf.hxx
@@ -21,15 +21,15 @@
 
 // INCLUDE ---------------------------------------------------------------
 
-#include <vcl/print.hxx>
-#include <vcl/mapmod.hxx>
-#include <editeng/svxenum.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/mapunit.hxx>
+#include <i18nutil/paper.hxx>
+#include <tools/gen.hxx>
 #include <editeng/editengdllapi.h>
 
 // forward ---------------------------------------------------------------
 
 class Printer;
-class Size;
 
 // class SvxPaperInfo -----------------------------------------------------
 
diff --git a/include/editeng/postitem.hxx b/include/editeng/postitem.hxx
index 4df4ef628d0e..9383689cc510 100644
--- a/include/editeng/postitem.hxx
+++ b/include/editeng/postitem.hxx
@@ -19,11 +19,9 @@
 #ifndef INCLUDED_EDITENG_POSTITEM_HXX
 #define INCLUDED_EDITENG_POSTITEM_HXX
 
-#include <vcl/vclenum.hxx>
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>
-
-class SvXMLUnitConverter;
+#include <tools/fontenum.hxx>
 
 // class SvxPostureItem --------------------------------------------------
 
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index bb989e51d86b..178594ff2926 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -22,8 +22,6 @@
 #include <svl/poolitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxProtectItem --------------------------------------------------
 
 
diff --git a/include/editeng/shaditem.hxx b/include/editeng/shaditem.hxx
index 6a7298ae1274..cae821ba4b86 100644
--- a/include/editeng/shaditem.hxx
+++ b/include/editeng/shaditem.hxx
@@ -20,7 +20,9 @@
 #define INCLUDED_EDITENG_SHADITEM_HXX
 
 #include <tools/color.hxx>
-#include <svl/eitem.hxx>
+#include <tools/mapunit.hxx>
+#include <svl/cenumitm.hxx>
+
 #include <editeng/svxenum.hxx>
 #include <editeng/editengdllapi.h>
 
diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx
index 22f9ccf25a3a..15bb414e06ce 100644
--- a/include/editeng/shdditem.hxx
+++ b/include/editeng/shdditem.hxx
@@ -22,8 +22,6 @@
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxShadowedItem -------------------------------------------------
 
 /*  [Description]
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index 8e05e3c5f573..7770fcfe41b7 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -22,8 +22,6 @@
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxFormatSplitItem -------------------------------------------------
 
 /*  [Description]
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index e407f70c89be..8443b9bb437b 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 {
 }}}}
 
 namespace vcl { class Window; }
-class SdrObject;
+
 // misc functions ---------------------------------------------------------------
 
 void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( OUString &rOldText, const OUString &rNewText );
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index 311ed4cfadf7..52cae8f9faee 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -20,11 +20,8 @@
 #ifndef INCLUDED_EDITENG_SVXACORR_HXX
 #define INCLUDED_EDITENG_SVXACORR_HXX
 
-#include <com/sun/star/embed/XStorage.hpp>
-
 #include <o3tl/sorted_vector.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <tools/ref.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/time.hxx>
 #include <tools/date.hxx>
@@ -40,6 +37,8 @@ class SotStorage;
 class SvxAutoCorrect;
 class SfxObjectShell;
 namespace vcl { class Window; }
+namespace com::sun::star::embed { class XStorage; }
+namespace tools { template <typename T> class SvRef; }
 
 struct CompareSvStringsISortDtor
 {
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 8b821a5917f4..cf8862da0a9d 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -19,9 +19,7 @@
 #ifndef INCLUDED_EDITENG_SVXFONT_HXX
 #define INCLUDED_EDITENG_SVXFONT_HXX
 
-#include <limits.h>
 #include <editeng/svxenum.hxx>
-#include <i18nlangtag/lang.h>
 #include <vcl/font.hxx>
 #include <editeng/editengdllapi.h>
 
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index c9dd555d6ebe..9d01ca41a0ff 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -29,27 +29,14 @@
 #include <deque>
 #include <vector>
 #include <map>
-#include <utility>
 #include <memory>
 
 namespace vcl { class Font; }
 class Color;
-class Graphic;
-class DateTime;
 struct SvxRTFStyleType;
 class SvxRTFItemStackType;
 class SvxRTFItemStackList : public std::vector<std::unique_ptr<SvxRTFItemStackType>> {};
 
-namespace com { namespace sun { namespace star {
-    namespace document {
-        class XDocumentProperties;
-    }
-    namespace util {
-        struct DateTime;
-    }
-} } }
-
-
 // Mapper-Classes for the various requirements on Document positions
 //        Swg - NodePosition is a SwIndex, which is used internally
 // EditEngine - ULONG to list of paragraphs
diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx
index 848c23c3a081..6f71c09391ff 100644
--- a/include/editeng/twolinesitem.hxx
+++ b/include/editeng/twolinesitem.hxx
@@ -23,8 +23,6 @@
 #include <svl/poolitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
 {
     sal_Unicode cStartBracket, cEndBracket;
diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index 4bc307466317..c26790115ea6 100644
--- a/include/editeng/txtrange.hxx
+++ b/include/editeng/txtrange.hxx
@@ -26,7 +26,6 @@
 #include <memory>
 
 namespace tools { class PolyPolygon; }
-namespace tools { class Rectangle; }
 
 namespace basegfx {
     class B2DPolyPolygon;
diff --git a/include/editeng/udlnitem.hxx b/include/editeng/udlnitem.hxx
index 6e76ccb17c66..b4fef4612f80 100644
--- a/include/editeng/udlnitem.hxx
+++ b/include/editeng/udlnitem.hxx
@@ -20,13 +20,10 @@
 #define INCLUDED_EDITENG_UDLNITEM_HXX
 
 #include <svl/eitem.hxx>
-#include <vcl/vclenum.hxx>
 #include <tools/color.hxx>
 #include <tools/fontenum.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxTextLineItem ------------------------------------------------
 
 /* Value container for underline and overline font effects */
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index c3e22c9767a3..e83cb4208060 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_EDITENG_UNOEDSRC_HXX
 #define INCLUDED_EDITENG_UNOEDSRC_HXX
 
-#include <com/sun/star/accessibility/TextSegment.hpp>
-
 #include <i18nlangtag/lang.h>
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
diff --git a/include/editeng/unofdesc.hxx b/include/editeng/unofdesc.hxx
index a63f432729b2..218ce288b603 100644
--- a/include/editeng/unofdesc.hxx
+++ b/include/editeng/unofdesc.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_EDITENG_UNOFDESC_HXX
 #define INCLUDED_EDITENG_UNOFDESC_HXX
 
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/beans/PropertyState.hpp>
 #include <svl/itemset.hxx>
-#include <vcl/font.hxx>
 #include <editeng/editengdllapi.h>
 
+namespace com::sun::star::awt { struct FontDescriptor; }
+namespace vcl { class Font; }
+
 class EDITENG_DLLPUBLIC SvxUnoFontDescriptor
 {
 public:
diff --git a/include/editeng/unofield.hxx b/include/editeng/unofield.hxx
index ea3afb36517e..8eb521066347 100644
--- a/include/editeng/unofield.hxx
+++ b/include/editeng/unofield.hxx
@@ -22,9 +22,7 @@
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/text/textfield/Type.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/component.hxx>
 #include <editeng/editengdllapi.h>
@@ -32,6 +30,8 @@
 #include <editeng/mutxhelp.hxx>
 #include <memory>
 
+namespace com::sun::star::beans { class XPropertySetInfo; }
+
 class SvxUnoFieldData_Impl;
 class SfxItemPropertySet;
 class SvxFieldData;
diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx
index 7bca9673f097..d32fc76cd657 100644
--- a/include/editeng/unoipset.hxx
+++ b/include/editeng/unoipset.hxx
@@ -20,16 +20,14 @@
 #ifndef INCLUDED_EDITENG_UNOIPSET_HXX
 #define INCLUDED_EDITENG_UNOIPSET_HXX
 
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <editeng/editengdllapi.h>
 #include <svl/itemprop.hxx>
 #include <memory>
 #include <vector>
 
-class SdrItemPool;
+namespace com::sun::star::beans { class XPropertySetInfo; }
+
 class SfxItemSet;
-class SvxShape;
 struct SvxIDPropertyCombine;
 
 class EDITENG_DLLPUBLIC SvxItemPropertySet
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index 6e1b81177640..2deae37c5a13 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -20,18 +20,18 @@
 #ifndef INCLUDED_EDITENG_UNOLINGU_HXX
 #define INCLUDED_EDITENG_UNOLINGU_HXX
 
-#include <i18nlangtag/lang.h>
 #include <rtl/ustring.hxx>
-#include <com/sun/star/util/Language.hpp>
-#include <com/sun/star/linguistic2/XLinguServiceManager2.hpp>
-#include <com/sun/star/linguistic2/XLinguProperties.hpp>
-#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
-#include <com/sun/star/linguistic2/XHyphenator.hpp>
-#include <com/sun/star/linguistic2/XThesaurus.hpp>
-#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <editeng/editengdllapi.h>
 
+namespace com::sun::star::linguistic2 { class XDictionary; }
+namespace com::sun::star::linguistic2 { class XHyphenator; }
+namespace com::sun::star::linguistic2 { class XLinguProperties; }
+namespace com::sun::star::linguistic2 { class XLinguServiceManager2; }
+namespace com::sun::star::linguistic2 { class XSearchableDictionaryList; }
+namespace com::sun::star::linguistic2 { class XSpellChecker1; }
+namespace com::sun::star::linguistic2 { class XThesaurus; }
+
 class LinguMgrExitLstnr;
 
 namespace weld { class Window; }
diff --git a/include/editeng/unonrule.hxx b/include/editeng/unonrule.hxx
index bc750254ae67..fa53867bce7b 100644
--- a/include/editeng/unonrule.hxx
+++ b/include/editeng/unonrule.hxx
@@ -29,7 +29,8 @@
 #include <com/sun/star/util/XCloneable.hpp>
 #include <editeng/numitem.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
+
+namespace com::sun::star::beans { struct PropertyValue; }
 
 EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule(const SvxNumRule* pRule);
 EDITENG_DLLPUBLIC css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule();
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index c078ad6392e4..6626cfe7c9de 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -21,16 +21,13 @@
 #define INCLUDED_EDITENG_UNOTEXT_HXX
 
 #include <memory>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/text/XTextRangeMover.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -38,7 +35,6 @@
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/text/XTextAppend.hpp>
 #include <com/sun/star/text/XTextCopy.hpp>
-#include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
@@ -51,8 +47,6 @@
 #include <osl/diagnose.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <tools/link.hxx>
-#include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
 #include <svl/solar.hrc>
 #include <editeng/editdata.hxx>
@@ -62,6 +56,8 @@
 #include <editeng/memberids.h>
 
 class SvxItemPropertySet;
+struct SfxItemPropertyMapEntry;
+struct SfxItemPropertySimpleEntry;
 
 #define WID_FONTDESC                OWN_ATTR_VALUE_START
 #define WID_NUMLEVEL                OWN_ATTR_VALUE_START+1
@@ -151,12 +147,8 @@ class SvxItemPropertySet;
     {OUString(UNO_NAME_EDIT_PARA_IS_FORBIDDEN_RULES),    EE_PARA_FORBIDDENRULES,     cppu::UnoType<bool>::get(),                0 ,0 },\
     {OUString("WritingMode"),                   EE_PARA_WRITINGDIR, ::cppu::UnoType<sal_Int16>::get(),            0, 0 }
 
-class SvxEditSource;
-class SvxTextForwarder;
 class SvxFieldItem;
-class SvxTextEditSource;
 class SvxFieldData;
-struct ESelection;
 
 EDITENG_DLLPUBLIC void GetSelection( struct ESelection& rSel, SvxTextForwarder const * pForwarder ) throw();
 EDITENG_DLLPUBLIC void CheckSelection( struct ESelection& rSel, SvxTextForwarder const * pForwarder ) throw();
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 1ad67dfa7166..18d5e4f4af55 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -19,13 +19,10 @@
 #ifndef INCLUDED_EDITENG_WGHTITEM_HXX
 #define INCLUDED_EDITENG_WGHTITEM_HXX
 
-#include <vcl/vclenum.hxx>
 #include <tools/fontenum.hxx>
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxWeightItem ---------------------------------------------------
 
 /* [Description]
diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx
index 32d255731c33..c1274a20a4e0 100644
--- a/include/editeng/widwitem.hxx
+++ b/include/editeng/widwitem.hxx
@@ -22,8 +22,6 @@
 #include <svl/intitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxWidowsItem ---------------------------------------------------
 
 /*  [Description]
diff --git a/include/editeng/wrlmitem.hxx b/include/editeng/wrlmitem.hxx
index 648b2fca61e5..2ac72a1a5351 100644
--- a/include/editeng/wrlmitem.hxx
+++ b/include/editeng/wrlmitem.hxx
@@ -22,8 +22,6 @@
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>
 
-class SvXMLUnitConverter;
-
 // class SvxWordLineModeItem ---------------------------------------------
 
 /*  [Description]
diff --git a/include/editeng/xmlcnitm.hxx b/include/editeng/xmlcnitm.hxx
index 41664c404c41..d66c254523cc 100644
--- a/include/editeng/xmlcnitm.hxx
+++ b/include/editeng/xmlcnitm.hxx
@@ -24,8 +24,6 @@
 #include <editeng/editengdllapi.h>
 #include <memory>
 
-class SvXMLNamespaceMap;
-
 
 class SvXMLAttrContainerData;