[Libreoffice-commits] core.git: chart2/source cui/source editeng/source filter/source include/editeng include/IwyuFilter_include.yaml include/svx sc/source sd/source sfx2/source svx/source sw/qa sw/source

Gabor Kelemen (via logerrit) logerrit at kemper.freedesktop.org
Tue Apr 23 10:13:40 UTC 2019


 chart2/source/controller/inc/ChartController.hxx            |    1 
 cui/source/dialogs/SpellDialog.cxx                          |    4 ++
 cui/source/dialogs/hyphen.cxx                               |    2 +
 cui/source/options/optdict.cxx                              |    2 +
 cui/source/options/optgdlg.cxx                              |    1 
 cui/source/options/optlingu.cxx                             |    3 +
 editeng/source/accessibility/AccessibleEditableTextPara.cxx |    1 
 editeng/source/editeng/editview.cxx                         |    2 +
 editeng/source/editeng/edtspell.cxx                         |    1 
 editeng/source/items/numitem.cxx                            |    1 
 editeng/source/items/paperinf.cxx                           |    1 
 editeng/source/items/paraitem.cxx                           |    1 
 editeng/source/misc/splwrap.cxx                             |    5 +++
 editeng/source/misc/svxacorr.cxx                            |    2 +
 editeng/source/misc/unolingu.cxx                            |    1 
 editeng/source/rtf/rtfitem.cxx                              |    1 
 editeng/source/rtf/svxrtf.cxx                               |    1 
 editeng/source/uno/unofdesc.cxx                             |    1 
 editeng/source/uno/unofield.cxx                             |    1 
 editeng/source/uno/unonrule.cxx                             |    1 
 editeng/source/uno/unotext.cxx                              |    3 +
 editeng/source/xml/xmltxtexp.cxx                            |    1 
 filter/source/msfilter/svdfppt.cxx                          |    1 
 include/IwyuFilter_include.yaml                             |   20 ++++++++++++
 include/editeng/SpellPortions.hxx                           |    3 +
 include/editeng/Trie.hxx                                    |    1 
 include/editeng/eeitem.hxx                                  |    2 +
 include/editeng/fhgtitem.hxx                                |    2 -
 include/editeng/fontitem.hxx                                |    4 --
 include/editeng/forbiddencharacterstable.hxx                |    1 
 include/editeng/hangulhanja.hxx                             |   11 +++---
 include/editeng/hyphenzoneitem.hxx                          |    2 -
 include/editeng/itemtype.hxx                                |    2 -
 include/editeng/kernitem.hxx                                |    2 -
 include/editeng/langitem.hxx                                |    2 -
 include/editeng/lspcitem.hxx                                |    5 +--
 include/editeng/measfld.hxx                                 |    3 -
 include/editeng/memberids.h                                 |    2 -
 include/editeng/numitem.hxx                                 |    6 +--
 include/editeng/opaqitem.hxx                                |    2 -
 include/editeng/orphitem.hxx                                |    2 -
 include/editeng/outliner.hxx                                |   18 +---------
 include/editeng/overflowingtxt.hxx                          |    2 -
 include/editeng/paperinf.hxx                                |    8 ++--
 include/editeng/postitem.hxx                                |    4 --
 include/editeng/protitem.hxx                                |    2 -
 include/editeng/shaditem.hxx                                |    4 +-
 include/editeng/shdditem.hxx                                |    2 -
 include/editeng/spltitem.hxx                                |    2 -
 include/editeng/splwrap.hxx                                 |    2 -
 include/editeng/svxacorr.hxx                                |    5 +--
 include/editeng/svxfont.hxx                                 |    2 -
 include/editeng/svxrtf.hxx                                  |   13 -------
 include/editeng/twolinesitem.hxx                            |    2 -
 include/editeng/txtrange.hxx                                |    1 
 include/editeng/udlnitem.hxx                                |    3 -
 include/editeng/unoedsrc.hxx                                |    2 -
 include/editeng/unofdesc.hxx                                |    6 +--
 include/editeng/unofield.hxx                                |    4 +-
 include/editeng/unoipset.hxx                                |    6 +--
 include/editeng/unolingu.hxx                                |   18 +++++-----
 include/editeng/unonrule.hxx                                |    3 +
 include/editeng/unotext.hxx                                 |   12 +------
 include/editeng/wghtitem.hxx                                |    3 -
 include/editeng/widwitem.hxx                                |    2 -
 include/editeng/wrlmitem.hxx                                |    2 -
 include/editeng/xmlcnitm.hxx                                |    2 -
 include/svx/sdtfchim.hxx                                    |    1 
 sc/source/ui/app/transobj.cxx                               |    1 
 sc/source/ui/drawfunc/fuins2.cxx                            |    1 
 sc/source/ui/unoobj/PivotTableDataProvider.cxx              |    1 
 sc/source/ui/unoobj/docuno.cxx                              |    1 
 sc/source/ui/view/cellsh1.cxx                               |    1 
 sd/source/core/text/textapi.cxx                             |    3 +
 sd/source/ui/func/fuconcs.cxx                               |    1 
 sd/source/ui/func/fuconrec.cxx                              |    1 
 sd/source/ui/unoidl/unomodel.cxx                            |    1 
 sd/source/ui/unoidl/unopage.cxx                             |    1 
 sd/source/ui/view/drtxtob.cxx                               |    2 +
 sd/source/ui/view/drtxtob1.cxx                              |    1 
 sfx2/source/doc/objxtor.cxx                                 |    1 
 svx/source/dialog/langbox.cxx                               |    1 
 svx/source/form/navigatortree.cxx                           |    1 
 svx/source/form/typemap.cxx                                 |    1 
 svx/source/table/cell.cxx                                   |    1 
 sw/qa/extras/uiwriter/uiwriter.cxx                          |    1 
 sw/source/core/edit/edlingu.cxx                             |    3 +
 sw/source/core/fields/authfld.cxx                           |    2 +
 sw/source/core/fields/textapi.cxx                           |    1 
 sw/source/core/text/inftxt.cxx                              |    2 +
 sw/source/core/unocore/unocrsrhelper.cxx                    |    1 
 sw/source/core/unocore/unodraw.cxx                          |    1 
 sw/source/core/unocore/unosett.cxx                          |    1 
 sw/source/ui/envelp/mailmrge.cxx                            |    1 
 sw/source/uibase/lingu/olmenu.cxx                           |    1 
 sw/source/uibase/shells/annotsh.cxx                         |    3 +
 sw/source/uibase/shells/drwtxtex.cxx                        |    2 +
 sw/source/uibase/shells/drwtxtsh.cxx                        |    1 
 sw/source/uibase/shells/textsh1.cxx                         |    1 
 sw/source/uibase/uiview/view2.cxx                           |    1 
 sw/source/uibase/uiview/viewling.cxx                        |    2 +
 101 files changed, 151 insertions(+), 134 deletions(-)

New commits:
commit 3667031eb27620f86b7c1e281eae3543ef98175c
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Fri Apr 19 14:38:04 2019 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Apr 23 12:12:46 2019 +0200

    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 at collabora.com>

diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index d7e374857ba0..eb4cad46b540 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -27,6 +27,7 @@
 #include <vcl/timer.hxx>
 
 #include <cppuhelper/implbase.hxx>
+#include <salhelper/simplereferenceobject.hxx>
 
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/ui/XContextMenuInterception.hpp>
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 2f6f8f61c4e4..6a052b287961 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -42,6 +42,10 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XServiceDisplayName.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
+#include <com/sun/star/linguistic2/XDictionary.hpp>
+#include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
+#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
+#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <sfx2/app.hxx>
 #include <vcl/help.hxx>
 #include <vcl/graph.hxx>
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 50cb920f871d..8cd7d38f24ec 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -19,6 +19,8 @@
 
 #include <hyphen.hxx>
 
+#include <com/sun/star/linguistic2/XLinguProperties.hpp>
+
 #include <editeng/splwrap.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/unolingu.hxx>
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 4f67e6f2e405..fb0a329fe020 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -23,6 +23,8 @@
 #include <sfx2/sfxuno.hxx>
 #include <svl/eitem.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
+#include <com/sun/star/linguistic2/XDictionary.hpp>
+#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <comphelper/string.hxx>
 #include <tools/debug.hxx>
 #include <unotools/collatorwrapper.hxx>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 50a85c8ee9bc..46bd0996cca1 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -83,6 +83,7 @@
 #include <com/sun/star/container/XSet.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/office/Quickstart.hpp>
+#include <com/sun/star/linguistic2/XLinguProperties.hpp>
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index d146b997d4c4..5be9468fef0d 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -42,6 +42,9 @@
 #include <com/sun/star/linguistic2/XHyphenator.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/linguistic2/XAvailableLocales.hpp>
+#include <com/sun/star/linguistic2/XDictionary.hpp>
+#include <com/sun/star/linguistic2/XDictionaryList.hpp>
+#include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <com/sun/star/lang/XServiceDisplayName.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 2cac6e765340..14d67b5c2ccc 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #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>
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 57b0acd3b258..0e2dcfd55751 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -59,6 +59,8 @@
 #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>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 97d37b315586..9d6b86f6d414 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -31,6 +31,7 @@
 #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;
 using namespace com::sun::star::beans;
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 4d727743cf12..ddb1aa11926f 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -41,6 +41,7 @@
 #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>
 #include <comphelper/processfactory.hxx>
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 07ab725f1591..b4d92ff45598 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -18,6 +18,7 @@
  */
 
 #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 4803a532609d..3bd1449b7c0e 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -29,6 +29,7 @@
 #include <unotools/syslocale.hxx>
 #include <tools/mapunit.hxx>
 #include <svl/itempool.hxx>
+#include <svl/memberid.h>
 #include <editeng/editrids.hrc>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 7fae402aa6b8..0d657c9009f6 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -28,6 +28,11 @@
 #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>
+#include <com/sun/star/linguistic2/XHyphenator.hpp>
+#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
+#include <com/sun/star/linguistic2/XDictionary.hpp>
 
 #include <editeng/svxenum.hxx>
 #include <editeng/splwrap.hxx>
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index cfd4ca6f655e..32c2dce2f9c6 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -21,6 +21,8 @@
 #include <string_view>
 #include <sal/config.h>
 
+#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
+#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>
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 15cd2bdf6eba..a96deb381edd 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -28,6 +28,7 @@
 #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>
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 95742ae622ca..218124a009e4 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -74,6 +74,7 @@
 #include <svl/itempool.hxx>
 #include <svl/itemiter.hxx>
 #include <sal/log.hxx>
+#include <vcl/font.hxx>
 
 #include <editeng/svxrtf.hxx>
 #include <editeng/editids.hrc>
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 380cf5d1cc86..2063ee16b728 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -35,6 +35,7 @@
 #include <editeng/colritem.hxx>
 #include <editeng/svxrtf.hxx>
 #include <editeng/editids.hrc>
+#include <vcl/font.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/editeng/source/uno/unofdesc.cxx b/editeng/source/uno/unofdesc.cxx
index d669fd6dc074..b94df37f0e79 100644
--- a/editeng/source/uno/unofdesc.cxx
+++ b/editeng/source/uno/unofdesc.cxx
@@ -20,6 +20,7 @@
 
 #include <editeng/eeitem.hxx>
 #include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/awt/FontDescriptor.hpp>
 
 #include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index ea19e3e5e5aa..dbae6e36ccd3 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -23,6 +23,7 @@
 #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>
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index 27dbecfe9108..4ed69af5c922 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <cppuhelper/supportsservice.hxx>
+#include <vcl/font.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/GraphicObject.hxx>
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 1f31fcbccf00..d37b4fdaebec 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -22,6 +22,9 @@
 #include <com/sun/star/text/ControlCharacter.hpp>
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/text/TextRangeSelection.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
 
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 3a3490ba82b5..4696bfdc6fcc 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -23,6 +23,7 @@
 #include <memory>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
+#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 770138117f05..5b74dafd011b 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -82,6 +82,7 @@
 #include <editeng/lspcitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lrspitem.hxx>
+#include <editeng/numitem.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <svx/svditer.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 7d09debc7b5f..24243b9ef476 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -900,3 +900,23 @@ blacklist:
     - class SvxUnderlineItem
     - class SvxWeightItem
     - class SvxWordLineModeItem
+    - class SvxBulletItem
+    - class SvxNumBulletItem
+    include/editeng/UnoForbiddenCharsTable.hxx:
+    # base class has to be a complete type
+    - com/sun/star/i18n/XForbiddenCharacters.hpp
+    - com/sun/star/linguistic2/XSupportedLocales.hpp
+    include/editeng/unonrule.hxx:
+    # base class has to be a complete type
+    - com/sun/star/container/XIndexReplace.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/lang/XUnoTunnel.hpp
+    - com/sun/star/ucb/XAnyCompare.hpp
+    - com/sun/star/util/XCloneable.hpp
+    include/editeng/unotext.hxx:
+    # Needed for macro defines
+    - com/sun/star/container/XIndexReplace.hpp
+    - com/sun/star/awt/FontSlant.hpp
+    - com/sun/star/awt/FontDescriptor.hpp
+    - com/sun/star/style/LineSpacing.hpp
+    - com/sun/star/style/TabStop.hpp
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;
 
diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx
index 037277214cb6..e00d3be87167 100644
--- a/include/svx/sdtfchim.hxx
+++ b/include/svx/sdtfchim.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SVX_SDTFCHIM_HXX
 #define INCLUDED_SVX_SDTFCHIM_HXX
 
+#include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
 
 class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 70b6e705df32..3a9faa1bcae3 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -31,6 +31,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <sot/storage.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/jobset.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 3cc2b4c57b15..ce2860bd149a 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sot/exchange.hxx>
diff --git a/sc/source/ui/unoobj/PivotTableDataProvider.cxx b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
index e6e4ce88d626..52c657e8d3db 100644
--- a/sc/source/ui/unoobj/PivotTableDataProvider.cxx
+++ b/sc/source/ui/unoobj/PivotTableDataProvider.cxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/sheet/XMembersSupplier.hpp>
 
 #include <com/sun/star/chart/ChartDataChangeEvent.hpp>
+#include <com/sun/star/container/XNamed.hpp>
 
 #include <unordered_map>
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6712e11f9a2c..ae2d063fcfcb 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -55,6 +55,7 @@
 
 #include <float.h>
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/sheet/XNamedRanges.hpp>
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 4f672a4c2aa9..7dc9a5e456ef 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -101,6 +101,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/bootstrap.hxx>
 
 #include <memory>
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 205a2b225e4e..2bf1177f0abd 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -18,6 +18,8 @@
  */
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/text/XTextField.hpp>
 
 #include <textapi.hxx>
 #include <drawdoc.hxx>
@@ -32,7 +34,6 @@
 #include <svx/svdundo.hxx>
 
 namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } }
-namespace com { namespace sun { namespace star { namespace text { class XTextField; } } } }
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::text;
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 60fa3e6f64dc..7af006896a84 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -41,6 +41,7 @@
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <editeng/adjustitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/sdasitm.hxx>
 #include <svx/svdoashp.hxx>
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 6bc0f3a658a8..4016f31e1174 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -42,6 +42,7 @@
 #include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <editeng/adjustitem.hxx>
+#include <editeng/eeitem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xfillit.hxx>
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ed83fd956bec..5dbde18870a3 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <com/sun/star/embed/Aspects.hpp>
 
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 7cf3e87c4a6c..5c638c3125d5 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <com/sun/star/presentation/AnimationSpeed.hpp>
 #include <com/sun/star/view/PaperOrientation.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/profilezone.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 8e6751e59df3..eb24ff617932 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -22,6 +22,8 @@
 
 #include <svx/svxids.hrc>
 
+#include <com/sun/star/linguistic2/XThesaurus.hpp>
+
 #include <i18nlangtag/mslangid.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/ulspitem.hxx>
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 4bcac2adf563..4cfe98f8431a 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -29,6 +29,7 @@
 #include <editeng/ulspitem.hxx>
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
+#include <editeng/numitem.hxx>
 #include <vcl/vclenum.hxx>
 #include <sfx2/app.hxx>
 #include <svl/whiter.hxx>
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 96c1584bc193..375b3919d291 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -23,6 +23,7 @@
 #include <map>
 
 #include <cppuhelper/implbase.hxx>
+#include <cppuhelper/weakref.hxx>
 
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 0591f9ed6426..1890d6a0e110 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/linguistic2/XAvailableLocales.hpp>
+#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <linguistic/misc.hxx>
 #include <rtl/ustring.hxx>
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index e73c2ccf662d..244b9d5b5407 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -48,6 +48,7 @@
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <svx/sdrpaintwindow.hxx>
 
 #include <svx/svxdlg.hxx>
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index 23ac73f9821b..9db75349d3e1 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -23,6 +23,7 @@
 #include <sfx2/msg.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
+#include <svl/memberid.h>
 #include <editeng/wghtitem.hxx>
 #include <editeng/udlnitem.hxx>
 #include <editeng/crossedoutitem.hxx>
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 8f941022388c..acbd9fabd305 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/table/TableBorder.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
+#include <com/sun/star/lang/Locale.hpp>
 
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index cbea1be91236..21138677443b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -91,6 +91,7 @@
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <o3tl/deleter.hxx>
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index 4a5d39addb27..ee2f62b0fa2d 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -19,8 +19,11 @@
 
 #include <com/sun/star/linguistic2/ProofreadingResult.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
+#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
+#include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <com/sun/star/text/XFlatParagraph.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <o3tl/any.hxx>
 
 #include <unoflatpara.hxx>
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index fa21aa81643d..7d86f12541a0 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -45,6 +45,8 @@
 #include <calbck.hxx>
 #include <unomid.h>
 
+#include <com/sun/star/beans/PropertyValues.hpp>
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::lang;
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 2b10349ba7c5..fc753afea143 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/text/XTextField.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/lang/Locale.hpp>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index d94fd1cca717..6556bb2757af 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/linguistic2/XHyphenator.hpp>
+
 #include <unotools/linguprops.hxx>
 #include <unotools/lingucfg.hxx>
 #include <hintids.hxx>
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index d2c57b119166..b02320be05d0 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <memory>
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 0c406018e557..b6536f0397e1 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -65,6 +65,7 @@
 #include <comphelper/profilezone.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <svx/scene3d.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <fmtwrapinfluenceonobjpos.hxx>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 08e2787b4f9e..3a8e27b15774 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -50,6 +50,7 @@
 #include <com/sun/star/text/FootnoteNumbering.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/style/LineNumberPosition.hpp>
+#include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index bdde9b8cd9d6..1e8a91eba344 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/frame/Frame.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 6e5cbc4b0fdd..7f6be927500a 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -87,6 +87,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/system/SystemShellExecute.hpp>
+#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index fa51bbaedac0..79990b849654 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -23,6 +23,9 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/linguistic2/XThesaurus.hpp>
 
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nutil/transliteration.hxx>
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx
index 3c4032cf316b..6043349c54b9 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -18,6 +18,8 @@
  */
 
 
+#include <com/sun/star/linguistic2/XThesaurus.hpp>
+
 #include <comphelper/string.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index ebd0e711d6bf..aae01e315673 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -45,6 +45,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/propertysequence.hxx>
 #include <swtypes.hxx>
 #include <view.hxx>
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 630a0476715a..44575df241ad 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/linguistic2/XThesaurus.hpp>
 
 #include <hintids.hxx>
 #include <cmdid.h>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 5213a01de635..a4b5cd620fbe 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -28,6 +28,7 @@
 #include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
+#include <com/sun/star/linguistic2/XDictionary.hpp>
 #include <officecfg/Office/Common.hxx>
 #include <svl/aeitem.hxx>
 #include <SwStyleNameMapper.hxx>
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 9e9d30b09f0b..72a68784be73 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/linguistic2/ProofreadingResult.hpp>
+#include <com/sun/star/linguistic2/XLinguProperties.hpp>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
 #include <linguistic/lngprops.hxx>
 #include <comphelper/lok.hxx>
@@ -75,6 +76,7 @@
 #include <com/sun/star/awt/PopupMenuDirection.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 


More information about the Libreoffice-commits mailing list