tdf#42949 Fix IWYU warnings in include/editeng/[a-e]*

Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I81917d697adf79b1bd0de4cc262d3cd6bc8eb36f Reviewed-on: https://gerrit.libreoffice.org/70710 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-04-13 15:10:23 +02:00 · 2019-04-13 15:10:23 +02:00 · 0eaa080408
commit 0eaa080408
parent b0da0a45a6
88 changed files with 187 additions and 88 deletions
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@ -27,6 +27,7 @@
 #include <vcl/svapp.hxx>
 #include <svl/itempool.hxx>
 #include <editeng/adjustitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/fmmodel.hxx>
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@ -24,6 +24,9 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>

 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@ -50,10 +50,13 @@
 #include <vcl/settings.hxx>
 #include <i18nlangtag/languagetag.hxx>

+#include <editeng/AccessibleImageBullet.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/unoprnms.hxx>
 #include <editeng/unoipset.hxx>
 #include <editeng/outliner.hxx>
+#include <editeng/unoedprx.hxx>
+#include <editeng/unoedsrc.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>

--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@ -43,6 +43,7 @@
 #include <editeng/editeng.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/editrids.hrc>
+#include <editeng/unoedsrc.hxx>
 #include <svtools/colorcfg.hxx>


--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@ -26,6 +26,7 @@
 #include <vector>
 #include <memory>

+class EditTextObject;
 class EditEngine;
 enum class SetAttribsMode;
 enum class TransliterationFlags;
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@ -25,6 +25,7 @@
 #include <comphelper/processfactory.hxx>

 #include <svl/solar.hrc>
+#include <editeng/eeitem.hxx>
 #include <editeng/eerdll.hxx>
 #include <eerdll2.hxx>
 #include <editeng/lspcitem.hxx>
--- a/editeng/source/items/CustomPropertyField.cxx
+++ b/editeng/source/items/CustomPropertyField.cxx
@ -12,6 +12,7 @@
 #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>

 using namespace css;

--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@ -73,6 +73,7 @@
 #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>
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@ -34,6 +34,7 @@
 #include <com/sun/star/i18n/TextConversionOption.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <vcl/stdtext.hxx>
+#include <vcl/weld.hxx>
 #include <unotools/charclass.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@ -18,6 +18,7 @@
 */

 #include <comphelper/string.hxx>
+#include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@ -46,6 +46,7 @@
 #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>
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@ -809,3 +809,70 @@ blacklist:
    include/sfx2/viewsh.hxx:
    # Needed for macro 
    - class SfxViewFactory
+    include/editeng/AccessibleContextBase.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleContext.hpp
+    - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
+    - com/sun/star/accessibility/XAccessible.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    include/editeng/AccessibleImageBullet.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleComponent.hpp
+    - com/sun/star/accessibility/XAccessibleContext.hpp
+    - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
+    - com/sun/star/accessibility/XAccessible.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    include/editeng/AccessibleEditableTextPara.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleComponent.hpp
+    - com/sun/star/accessibility/XAccessibleContext.hpp
+    - com/sun/star/accessibility/XAccessibleEditableText.hpp
+    - com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp
+    - com/sun/star/accessibility/XAccessible.hpp
+    - com/sun/star/accessibility/XAccessibleHypertext.hpp
+    - com/sun/star/accessibility/XAccessibleMultiLineText.hpp
+    - com/sun/star/accessibility/XAccessibleTextAttributes.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    include/editeng/AccessibleStaticTextBase.hxx:
+    # base class has to be a complete type
+    - com/sun/star/accessibility/XAccessibleText.hpp
+    - com/sun/star/accessibility/XAccessibleTextAttributes.hpp
+    include/editeng/editerr.hxx:
+    # Needed for macro defines
+    - vcl/errcode.hxx
+    include/editeng/eeitem.hxx:
+    # Needed for macro defines
+    - svl/typedwhich.hxx
+    - class SfxBoolItem
+    - class SfxGrabBagItem
+    - class SfxInt16Item
+    - class SvxAdjustItem
+    - class SvxAutoKernItem
+    - class SvxBackgroundColorItem
+    - class SvxCaseMapItem
+    - class SvxCharReliefItem
+    - class SvxCharScaleWidthItem
+    - class SvxColorItem
+    - class SvxContourItem
+    - class SvxCrossedOutItem
+    - class SvxEmphasisMarkItem
+    - class SvxEscapementItem
+    - class SvxFontHeightItem
+    - class SvxFontItem
+    - class SvxForbiddenRuleItem
+    - class SvxFrameDirectionItem
+    - class SvxHangingPunctuationItem
+    - class SvxKerningItem
+    - class SvxLanguageItem
+    - class SvxLineSpacingItem
+    - class SvxLRSpaceItem
+    - class SvxOverlineItem
+    - class SvxPostureItem
+    - class SvXMLAttrContainerItem
+    - class SvxScriptSpaceItem
+    - class SvxShadowedItem
+    - class SvxTabStopItem
+    - class SvxULSpaceItem
+    - class SvxUnderlineItem
+    - class SvxWeightItem
+    - class SvxWordLineModeItem
--- a/include/editeng/AccessibleComponentBase.hxx
+++ b/include/editeng/AccessibleComponentBase.hxx
@ -22,11 +22,11 @@
 #define INCLUDED_EDITENG_ACCESSIBLECOMPONENTBASE_HXX


-#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
-#include <com/sun/star/awt/XFocusListener.hpp>
 #include <editeng/editengdllapi.h>

+namespace com::sun::star::accessibility { class XAccessible; }
+
 namespace accessibility {

 /** @descr
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@ -23,22 +23,15 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
-#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
-#include <com/sun/star/accessibility/AccessibleEventObject.hpp>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/weak.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <osl/mutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <editeng/editengdllapi.h>

+namespace com::sun::star::accessibility { class XAccessibleStateSet; }
+namespace com::sun::star::accessibility { class XAccessibleRelationSet; }
+namespace com::sun::star::accessibility { struct AccessibleEventObject; }

 namespace accessibility {

--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@ -22,11 +22,8 @@

 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <cppuhelper/interfacecontainer.hxx>

 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@ -37,13 +34,19 @@
 #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
 #include <com/sun/star/accessibility/XAccessibleHypertext.hpp>
 #include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp>
+#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>

 #include <comphelper/accessibletexthelper.hxx>
 #include <editeng/AccessibleParaManager.hxx>
-#include <editeng/AccessibleImageBullet.hxx>
-#include <editeng/unoedprx.hxx>
+#include <editeng/editdata.hxx>
 #include <editeng/editengdllapi.h>

+class SvxViewForwarder;
+class MapMode;
+class SvxAccessibleTextAdapter;
+class SvxAccessibleTextEditViewAdapter;
+namespace accessibility { class AccessibleImageBullet; }
+
 namespace accessibility
 {
    typedef ::cppu::WeakComponentImplHelper< css::accessibility::XAccessible,
--- a/include/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
@ -21,18 +21,18 @@
 #define INCLUDED_EDITENG_ACCESSIBLEIMAGEBULLET_HXX

 #include <tools/gen.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase.hxx>

-#include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <editeng/AccessibleParaManager.hxx>
-#include <editeng/unoedsrc.hxx>
+
+class SvxEditSource;
+class SvxTextForwarder;
+class SvxViewForwarder;

 namespace accessibility
 {
--- a/include/editeng/AccessibleParaManager.hxx
+++ b/include/editeng/AccessibleParaManager.hxx
@ -21,15 +21,16 @@
 #define INCLUDED_EDITENG_ACCESSIBLEPARAMANAGER_HXX

 #include <vector>
-#include <algorithm>
 #include <utility>
 #include <tools/gen.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <rtl/ref.hxx>
 #include <editeng/editengdllapi.h>

+namespace com::sun::star::accessibility { class XAccessible; }
+
 class SvxEditSourceAdapter;

 namespace accessibility
--- a/include/editeng/AccessibleStaticTextBase.hxx
+++ b/include/editeng/AccessibleStaticTextBase.hxx
@ -24,15 +24,14 @@
 #include <tools/gen.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
 #include <com/sun/star/accessibility/TextSegment.hpp>
 #include <editeng/editengdllapi.h>

+namespace com::sun::star::accessibility { class XAccessible; }

 class SvxEditSource;
-class SvxEditViewForwarder;

 namespace accessibility
 {
--- a/include/editeng/CustomPropertyField.hxx
+++ b/include/editeng/CustomPropertyField.hxx
@ -14,10 +14,10 @@
 #include <editeng/editengdllapi.h>

 #include <editeng/flditem.hxx>
-#include <editeng/eeitem.hxx>

 #include <com/sun/star/text/textfield/Type.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
+
+namespace com::sun::star::document { class XDocumentProperties; }


 namespace editeng
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@ -19,13 +19,11 @@
 #ifndef INCLUDED_EDITENG_ADJUSTITEM_HXX
 #define INCLUDED_EDITENG_ADJUSTITEM_HXX

-#include <svl/eitem.hxx>
+#include <svl/cenumitm.hxx>
+#include <svl/poolitem.hxx>
 #include <editeng/svxenum.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/editengdllapi.h>

-class SvXMLUnitConverter;
-
 // class SvxAdjustItem ---------------------------------------------------

 /*
--- a/include/editeng/autokernitem.hxx
+++ b/include/editeng/autokernitem.hxx
@ -22,8 +22,6 @@
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>

-class SvXMLUnitConverter;
-
 // class SvxAutoKernItem -------------------------------------------------

 /*
--- a/include/editeng/blinkitem.hxx
+++ b/include/editeng/blinkitem.hxx
@ -23,8 +23,6 @@
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>

-class SvXMLUnitConverter;
-
 // class SvxBlinkItem -------------------------------------------------

 /*
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@ -23,10 +23,12 @@
 #include <com/sun/star/table/BorderLineStyle.hpp>

 #include <tools/color.hxx>
-#include <svl/poolitem.hxx>
+#include <tools/mapunit.hxx>
 #include <editeng/editengdllapi.h>
 #include <svtools/borderline.hxx>

+class IntlWrapper;
+
 // Line defaults in twips (former Writer defaults):

 #define DEF_LINE_WIDTH_0        1
--- a/include/editeng/boxitem.hxx
+++ b/include/editeng/boxitem.hxx
@ -21,13 +21,14 @@
 #define INCLUDED_EDITENG_BOXITEM_HXX

 #include <svl/poolitem.hxx>
-#include <editeng/borderline.hxx>
 #include <editeng/editengdllapi.h>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>


+namespace editeng { class SvxBorderLine; }
+
 // class SvxBoxItem ------------------------------------------------------

 /*  [Description]
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@ -21,8 +21,6 @@

 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
-#include <vcl/wall.hxx>
-#include <tools/link.hxx>
 #include <unotools/securityoptions.hxx>
 #include <editeng/editengdllapi.h>
 #include <memory>
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@ -23,8 +23,6 @@
 #include <editeng/svxenum.hxx>
 #include <editeng/editengdllapi.h>

-class SvXMLUnitConverter;
-
 // class SvxCaseMapItem --------------------------------------------------

 /*  [Description]
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@ -23,8 +23,6 @@
 #include <tools/color.hxx>
 #include <editeng/editengdllapi.h>

-class SvXMLUnitConverter;
-
 #define VERSION_USEAUTOCOLOR    1

 /** SvxColorItem item describes a color.
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@ -19,13 +19,10 @@
 #ifndef INCLUDED_EDITENG_CROSSEDOUTITEM_HXX
 #define INCLUDED_EDITENG_CROSSEDOUTITEM_HXX

-#include <vcl/vclenum.hxx>
 #include <tools/fontenum.hxx>
 #include <svl/eitem.hxx>
 #include <editeng/editengdllapi.h>

-class SvXMLUnitConverter;
-
 // class SvxCrossedOutItem -----------------------------------------------

 /*  [Description]
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@ -26,11 +26,9 @@
 #include <memory>
 #include <ostream>

-class SfxItemSet;
 class SfxPoolItem;
 template<typename T> class SvParser;
 class SvxFieldItem;
-class SvxRTFItemStackType;
 enum class HtmlTokenId : sal_Int16;

 enum class EETextFormat { Text = 0x20, Rtf, Html = 0x32, Xml };
@ -84,13 +82,6 @@ EDITENG_DLLPUBLIC extern const size_t EE_APPEND;

 #define EDITUNDO_USER               200

-class EditView;
-class EditEngine;
-class ImpEditView;
-class ImpEditEngine;
-class EditTextObject;
-class SfxStyleSheet;
-
 struct EPosition
 {
    sal_Int32   nPara;
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@ -20,22 +20,20 @@
 #ifndef INCLUDED_EDITENG_EDITENG_HXX
 #define INCLUDED_EDITENG_EDITENG_HXX

-#include <rtl/ref.hxx>
 #include <memory>
 #include <vector>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>

-#include <svl/style.hxx>
 #include <svl/typedwhich.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/editstat.hxx>
+#include <editeng/editobj.hxx>
 #include <editeng/editengdllapi.h>
 #include <i18nlangtag/lang.h>

 #include <tools/lineend.hxx>
-#include <tools/link.hxx>

 #include <editeng/eedata.hxx>
 #include <o3tl/typed_flags_set.hxx>
@ -44,6 +42,7 @@
 #include <functional>

 namespace boost { template <class T> class optional; }
+template <typename Arg, typename Ret> class Link;

 namespace com { namespace sun { namespace star {
  namespace linguistic2 {
@ -86,9 +85,7 @@ class Size;
 class Point;
 namespace tools { class Rectangle; }
 class SvStream;
-class OutputDevice;
 namespace vcl { class Window; }
-class SfxPoolItem;
 class SvKeyValueIterator;
 class SvxForbiddenCharactersTable;
 class SvxNumberFormat;
@ -101,13 +98,13 @@ class EditLine;
 class InternalEditStatus;
 class EditSelectionEngine;
 class EditDoc;
-struct PasteOrDropInfos;
 class Range;
 struct EPaM;
 class DeletedNodeInfo;
 class ParaPortionList;
 enum class CharCompressType;
 enum class TransliterationFlags;
+class LinkParamNone;

 /** values for:
       SfxItemSet GetAttribs( const ESelection& rSel, EditEngineAttribs nOnlyHardAttrib = EditEngineAttribs::All );
@ -141,7 +138,6 @@ enum class SetAttribsMode {
    NONE, WholeWord, Edge
 };

-class SdrObject;
 class EDITENG_DLLPUBLIC EditEngine
 {
    friend class EditView;
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@ -22,8 +22,6 @@

 #include <svl/style.hxx>
 #include <svl/itempool.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/editdata.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/macros.hxx>
 #include <svl/languageoptions.hxx>
@ -36,8 +34,8 @@
 class SfxItemSet;
 class SvxFieldItem;
 class SvxFieldData;
-class SvStream;
 enum class OutlinerMode;
+struct EECharAttrib;

 namespace editeng {

--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@ -21,8 +21,6 @@
 #define INCLUDED_EDITENG_EDITSTAT_HXX

 #include <rtl/ustring.hxx>
-#include <tools/solar.h>
-#include <i18nlangtag/lang.h>
 #include <o3tl/typed_flags_set.hxx>

 enum class EEControlBits
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@ -23,22 +23,19 @@
 #include <memory>
 #include <com/sun/star/i18n/WordType.hpp>

-#include <svl/style.hxx>
 #include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
-#include <tools/link.hxx>
-#include <vcl/cursor.hxx>
 #include <vcl/errcode.hxx>
-#include <vcl/event.hxx>
+#include <vcl/vclptr.hxx>
 #include <editeng/editstat.hxx>
 #include <svl/languageoptions.hxx>
-#include <LibreOfficeKit/LibreOfficeKitTypes.h>
 #include <editeng/editdata.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <editeng/editengdllapi.h>


+class EditTextObject;
 class EditEngine;
 class ImpEditEngine;
 class ImpEditView;
@ -49,13 +46,11 @@ namespace vcl { class Window; }
 class KeyEvent;
 class MouseEvent;
 class CommandEvent;
-namespace tools { class Rectangle; }
-class Pair;
-class Point;
-class Range;
 class SvStream;
 class SvKeyValueIterator;
 class SfxStyleSheet;
+class SfxItemSet;
+namespace vcl { class Cursor; }
 namespace vcl { class Font; }
 class FontList;
 class OutputDevice;
@ -73,7 +68,8 @@ namespace linguistic2 {
    class XLanguageGuessing;
 }
 }}}
-namespace basegfx { class B2DRange; }
+
+template <typename Arg, typename Ret> class Link;

 enum class ScrollRangeCheck
 {
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@ -20,12 +20,9 @@
 #define INCLUDED_EDITENG_EDTDLG_HXX

 #include <rtl/ustring.hxx>
-#include <tools/link.hxx>
 #include <editeng/editengdllapi.h>
 #include <i18nlangtag/lang.h>
-#include <com/sun/star/uno/Reference.hxx>
 #include <vcl/abstdlg.hxx>
-#include <vcl/weld.hxx>
 #include <editeng/hangulhanja.hxx>

 namespace com { namespace sun { namespace star { namespace linguistic2
@ -34,10 +31,17 @@ namespace com { namespace sun { namespace star { namespace linguistic2
    class XHyphenator;
 } } } }

+template <typename Arg, typename Ret> class Link;
+
 namespace vcl { class Window; }
 class SvxSpellWrapper;
-class Button;
-class CheckBox;
+class LinkParamNone;
+
+namespace weld { class Button; }
+namespace weld { class ToggleButton; }
+namespace weld { class Window; }
+
+

 class AbstractThesaurusDialog : public VclAbstractDialog
 {
--- a/include/editeng/emphasismarkitem.hxx
+++ b/include/editeng/emphasismarkitem.hxx
@ -19,12 +19,10 @@
 #ifndef INCLUDED_EDITENG_EMPHASISMARKITEM_HXX
 #define INCLUDED_EDITENG_EMPHASISMARKITEM_HXX

-#include <vcl/vclenum.hxx>
+#include <tools/fontenum.hxx>
 #include <svl/intitem.hxx>
 #include <editeng/editengdllapi.h>

-class SvXMLUnitConverter;
-
 // class SvxEmphasisMarkItem ----------------------------------------------

 /* [Description]
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@ -19,12 +19,10 @@
 #ifndef INCLUDED_EDITENG_ESCAPEMENTITEM_HXX
 #define INCLUDED_EDITENG_ESCAPEMENTITEM_HXX

-#include <svl/eitem.hxx>
+#include <svl/cenumitm.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/editengdllapi.h>

-class SvXMLUnitConverter;
-
 // class SvxEscapementItem -----------------------------------------------

 #define DFLT_ESC_SUPER   33     // 1/3
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@ -54,6 +54,7 @@
 #include <array>
 #include <memory>
 #include <map>
+#include <climits>

 class ScDocument;

--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@ -26,6 +26,7 @@
 #include <drwlayer.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdoole2.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/crossedoutitem.hxx>
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@ -71,8 +71,10 @@
 #include <formula/IFunctionDescription.hxx>

 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>

--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@ -19,6 +19,7 @@

 #include <attarray.hxx>
 #include <scitems.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
 #include <editeng/shaditem.hxx>
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@ -18,6 +18,7 @@
 */

 #include <scitems.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/justifyitem.hxx>
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@ -29,6 +29,7 @@
 #include <svtools/colorcfg.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/crossedoutitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/emphasismarkitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/fontitem.hxx>
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@ -21,6 +21,7 @@
 #include <scitems.hxx>
 #include <editeng/eeitem.hxx>
 #include <i18nlangtag/mslangid.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/editdata.hxx>
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@ -29,6 +29,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
+#include <editeng/borderline.hxx>
 #include <editeng/langitem.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/fileformat.h>
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@ -28,6 +28,7 @@
 #include <vcl/font.hxx>
 #include <svl/languageoptions.hxx>
 #include <scitems.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
 #include <editeng/brushitem.hxx>
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@ -33,6 +33,7 @@
 #include <editeng/shdditem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <svx/algitem.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
 #include <svx/rotmodit.hxx>
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@ -33,6 +33,7 @@
 #include <editeng/postitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/wghtitem.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/justifyitem.hxx>
 #include <sfx2/objsh.hxx>
--- a/sc/source/filter/lotus/lotattr.cxx
+++ b/sc/source/filter/lotus/lotattr.cxx
@ -20,6 +20,7 @@
 #include <memory>
 #include <lotattr.hxx>

+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/colritem.hxx>
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@ -48,6 +48,7 @@
 #include <editeng/escapementitem.hxx>
 #include <editeng/shdditem.hxx>
 #include <editeng/eeitem.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/lineitem.hxx>
 #include <editeng/brushitem.hxx>
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@ -70,6 +70,7 @@
 #include <cellvalue.hxx>

 #include <svl/stritem.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/flditem.hxx>

--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@ -60,6 +60,7 @@
 #include <xmloff/xmlimppr.hxx>
 #include <svl/zforlist.hxx>
 #include <svx/svdocapt.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/colritem.hxx>
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@ -24,6 +24,7 @@
 #include <svx/clipfmtitem.hxx>
 #include <editeng/contouritem.hxx>
 #include <editeng/crossedoutitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/escapementitem.hxx>
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@ -19,6 +19,7 @@

 #include <editeng/adjustitem.hxx>
 #include <svx/fontwork.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/writingmodeitem.hxx>
 #include <sfx2/bindings.hxx>
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@ -27,6 +27,7 @@
 #include <editeng/fhgtitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxdlg.hxx>
+#include <vcl/cursor.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>

--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@ -23,6 +23,7 @@

 #include <vcl/svapp.hxx>
 #include <svx/algitem.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <editeng/editeng.hxx>
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@ -23,6 +23,7 @@
 #include <editeng/adjustitem.hxx>
 #include <sot/storage.hxx>
 #include <svx/algitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editstat.hxx>
 #include <editeng/flditem.hxx>
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@ -28,6 +28,7 @@
 #include <editeng/scripttypeitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/printer.hxx>
+#include <vcl/cursor.hxx>
 #include <vcl/settings.hxx>

 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@ -26,6 +26,7 @@
 #include <svx/dialogs.hrc>
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmshell.hxx>
--- a/sc/source/ui/view/tabvwsh8.cxx
+++ b/sc/source/ui/view/tabvwsh8.cxx
@ -18,6 +18,7 @@
 */

 #include <scitems.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>

 #include <tabvwsh.hxx>
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@ -21,6 +21,7 @@
 #include <editeng/eeitem.hxx>

 #include <sfx2/app.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/fontitem.hxx>
 #include <editeng/scripttypeitem.hxx>
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@ -10,6 +10,7 @@
 #include "sdmodeltestbase.hxx"
 #include <Outliner.hxx>
 #include <svl/stritem.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/ulspitem.hxx>
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@ -14,6 +14,7 @@
 #include "sdmodeltestbase.hxx"

 #include <svl/stritem.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/editobj.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/ulspitem.hxx>
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@ -20,6 +20,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/string.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/editids.hrc>
 #include <editeng/editobj.hxx>
 #include <editeng/editview.hxx>
@ -49,6 +50,7 @@
 #include <DrawViewShell.hxx>
 #include <pres.hxx>
 #include <navigatr.hxx>
+#include <vcl/cursor.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/vclevent.hxx>

--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@ -37,6 +37,7 @@
 #include <vcl/imaprect.hxx>
 #include <vcl/imapcirc.hxx>
 #include <vcl/imappoly.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
 #include <svx/svdopath.hxx>
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@ -23,6 +23,7 @@
 #include <svx/svxids.hrc>

 #include <i18nlangtag/mslangid.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@ -21,6 +21,7 @@

 #include <svx/svxids.hrc>

+#include <editeng/eeitem.hxx>
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/unolingu.hxx>
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@ -33,6 +33,7 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/scanner/XScannerManager2.hpp>
+#include <com/sun/star/document/XDocumentProperties.hpp>

 #include <comphelper/processfactory.hxx>
 #include <comphelper/scopeguard.hxx>
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@ -21,6 +21,7 @@
 #include <helpids.h>

 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 #include <vcl/settings.hxx>

 #include <editeng/editview.hxx>
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@ -52,6 +52,7 @@
 #include <svx/svxdlg.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <vcl/commandevent.hxx>
+#include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@ -25,6 +25,7 @@
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@ -58,6 +58,7 @@

 #include <editeng/unoedhlp.hxx>
 #include <editeng/unopracc.hxx>
+#include <editeng/unoedprx.hxx>
 #include <editeng/AccessibleParaManager.hxx>
 #include <editeng/AccessibleEditableTextPara.hxx>
 #include <svx/svdmodel.hxx>
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@ -28,6 +28,7 @@
 #include <vcl/svapp.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
--- a/svx/source/dialog/ClassificationEditView.cxx
+++ b/svx/source/dialog/ClassificationEditView.cxx
@ -12,6 +12,7 @@
 #include <svx/ClassificationField.hxx>

 #include <vcl/builder.hxx>
+#include <vcl/cursor.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@ -29,6 +29,7 @@
 #include <svx/svdoutl.hxx>
 #include <editeng/writingmodeitem.hxx>
 #include <svx/svdmodel.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/xflclit.hxx>
 #include <editeng/adjustitem.hxx>
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@ -31,6 +31,7 @@
 #include <com/sun/star/uno/Sequence.hxx>

 #include <editeng/boxitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/lineitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/xmlcnitm.hxx>
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@ -30,6 +30,7 @@
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/editstat.hxx>
 #include <tools/helpers.hxx>
 #include <svx/sdtfchim.hxx>
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@ -29,6 +29,7 @@

 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>

 #include <vcl/svapp.hxx>

--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@ -48,6 +48,7 @@
 #include <svx/unoshprp.hxx>
 #include <svx/unoshape.hxx>
 #include <editeng/editobj.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/charrotateitem.hxx>
 #include <svx/xflbstit.hxx>
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@ -21,6 +21,7 @@
 #include <tblrwcl.hxx>
 #include <swtblfmt.hxx>
 #include <algorithm>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <osl/diagnose.h>

--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@ -22,6 +22,7 @@

 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <editeng/borderline.hxx>
+#include <svl/poolitem.hxx>
 #include <swtypes.hxx>
 #include <swrect.hxx>
 #include <calbck.hxx>
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@ -23,6 +23,7 @@
 #include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
+#include <svl/poolitem.hxx>
 #include <editeng/svxfont.hxx>
 #include <swtypes.hxx>
 #include "drawfont.hxx"
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@ -37,6 +37,7 @@
 #include <editeng/brushitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/fhgtitem.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lrspitem.hxx>
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@ -27,6 +27,7 @@

 #include <memory>
 #include <vector>
+#include <climits>

 class SwTableBox;
 class SwTableLine;
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@ -19,6 +19,7 @@

 #include <memory>
 #include <hintids.hxx>
+#include <editeng/borderline.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/brushitem.hxx>
 #include <tools/fract.hxx>
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@ -49,6 +49,7 @@


 class SvxBrushItem;
+class EditTextObject;

 // some forward declarations
 class SwWW8AttrIter;
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@ -33,6 +33,7 @@
 #include <unotools/syslocale.hxx>
 #include <svl/languageoptions.hxx>

+#include <editeng/eeitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/langitem.hxx>
--- a/sw/source/uibase/ribbar/concustomshape.cxx
+++ b/sw/source/uibase/ribbar/concustomshape.cxx
@ -27,6 +27,7 @@
 #include <svx/sdtaaitm.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdocapt.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/outlobj.hxx>
 #include <cmdid.h>
 #include <view.hxx>
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@ -31,6 +31,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
+#include <editeng/eeitem.hxx>
 #include <editeng/flstitem.hxx>
 #include <editeng/spltitem.hxx>
 #include <editeng/lrspitem.hxx>