cui/source/inc/dbregister.hxx                           |    1 +
 cui/source/inc/macroass.hxx                             |    1 +
 cui/source/tabpages/grfpage.cxx                         |    1 +
 include/IwyuFilter_include.yaml                         |    3 +++
 include/editeng/AccessibleContextBase.hxx               |    1 -
 include/filter/msfilter/escherex.hxx                    |    1 -
 include/sfx2/LokControlHandler.hxx                      |    5 ++++-
 include/sfx2/basedlgs.hxx                               |    2 --
 include/sfx2/dinfdlg.hxx                                |    1 -
 include/sfx2/lokcallback.hxx                            |    2 --
 include/sfx2/lokcharthelper.hxx                         |    2 +-
 include/sfx2/printopt.hxx                               |    1 -
 include/sfx2/sfxstatuslistener.hxx                      |    1 -
 include/sfx2/viewsh.hxx                                 |    1 -
 include/svl/cjkoptions.hxx                              |    1 -
 include/svl/currencytable.hxx                           |    1 -
 include/svl/hint.hxx                                    |    1 -
 include/svl/itemprop.hxx                                |    2 --
 include/svl/languageoptions.hxx                         |    2 --
 include/svl/numformat.hxx                               |    8 +++++++-
 include/svl/setitem.hxx                                 |    1 -
 include/svl/zforlist.hxx                                |   14 --------------
 include/svtools/editbrowsebox.hxx                       |    1 -
 include/svtools/filechangedchecker.hxx                  |    3 ---
 include/svtools/helpids.h                               |    2 ++
 include/svtools/printoptions.hxx                        |    2 --
 include/svtools/svparser.hxx                            |    1 -
 include/svx/dlgutil.hxx                                 |    2 +-
 include/svx/e3dsceneupdater.hxx                         |    1 -
 include/svx/fillctrl.hxx                                |    1 -
 include/svx/pageitem.hxx                                |    2 --
 include/svx/sdr/contact/viewcontactofsdrobj.hxx         |    3 ---
 include/svx/sdr/contact/viewobjectcontactredirector.hxx |    2 +-
 include/svx/svdglue.hxx                                 |    2 --
 include/svx/svdtext.hxx                                 |    2 --
 include/svx/svxitems.hrc                                |    1 +
 include/svx/unoshape.hxx                                |    1 -
 include/svx/xflasit.hxx                                 |    2 --
 include/svx/xlnasit.hxx                                 |    2 --
 include/svx/xmleohlp.hxx                                |    2 --
 include/tools/b3dtrans.hxx                              |    1 -
 include/tools/degree.hxx                                |    1 -
 include/tools/vcompat.hxx                               |    1 -
 include/tools/wldcrd.hxx                                |    1 -
 include/unotools/VersionConfig.hxx                      |    1 -
 include/unotools/ZipPackageHelper.hxx                   |    1 -
 include/unotools/charclass.hxx                          |    1 -
 include/unotools/compatibility.hxx                      |    2 --
 include/unotools/dynamicmenuoptions.hxx                 |    1 -
 include/unotools/historyoptions.hxx                     |    1 -
 include/unotools/linguprops.hxx                         |    2 ++
 include/unotools/localedatawrapper.hxx                  |    1 -
 include/unotools/securityoptions.hxx                    |    1 -
 include/unotools/viewoptions.hxx                        |    1 -
 include/vcl/BitmapPalette.hxx                           |    1 -
 include/vcl/accessibletableprovider.hxx                 |    2 +-
 include/vcl/animate/Animation.hxx                       |    1 +
 include/vcl/bitmapex.hxx                                |    1 -
 include/vcl/devicecoordinate.hxx                        |    1 -
 include/vcl/filter/SvmReader.hxx                        |    1 -
 include/vcl/filter/SvmWriter.hxx                        |    1 -
 include/vcl/print.hxx                                   |    2 --
 include/vcl/rendercontext/DrawModeFlags.hxx             |    1 +
 include/vcl/rendercontext/State.hxx                     |    1 -
 include/vcl/test/GraphicsRenderTests.hxx                |    2 --
 include/vcl/uitest/uiobject.hxx                         |    1 +
 include/vcl/unohelp2.hxx                                |    1 -
 include/vcl/vcllayout.hxx                               |    2 --
 include/xmloff/DashStyle.hxx                            |    1 -
 include/xmloff/GradientStyle.hxx                        |    1 -
 include/xmloff/HatchStyle.hxx                           |    1 -
 include/xmloff/ImageStyle.hxx                           |    1 -
 include/xmloff/MarkerStyle.hxx                          |    1 -
 include/xmloff/families.hxx                             |    2 ++
 include/xmloff/odffields.hxx                            |    2 ++
 sc/source/core/tool/compare.cxx                         |    1 +
 sc/source/core/tool/doubleref.cxx                       |    1 +
 sc/source/core/tool/interpr4.cxx                        |    1 +
 sc/source/ui/drawfunc/drtxtob.cxx                       |    1 +
 sc/source/ui/view/editsh.cxx                            |    1 +
 sc/source/ui/view/viewutil.cxx                          |    1 +
 sw/source/core/bastyp/init.cxx                          |    1 +
 sw/source/core/unocore/unosrch.cxx                      |    1 +
 sw/source/filter/ww8/wrtww8.hxx                         |    1 +
 sw/source/ui/inc/mmresultdialogs.hxx                    |    1 +
 vcl/backendtest/GraphicsRenderTests.cxx                 |    1 +
 vcl/source/animate/AnimationBitmap.cxx                  |    1 +
 vcl/source/bitmap/BitmapPopArtFilter.cxx                |    1 +
 vcl/source/filter/png/pngwrite.cxx                      |    1 +
 89 files changed, 47 insertions(+), 95 deletions(-)

New commits:
commit fbe169fa17adb832704ada89ae6d889ad31ae502
Author:     Gabor Kelemen <[email protected]>
AuthorDate: Wed Dec 22 17:14:40 2021 +0100
Commit:     Thorsten Behrens <[email protected]>
CommitDate: Fri Dec 24 01:44:48 2021 +0100

    Recheck include/[s-x]* with IWYU
    
    See tdf#42949 for motivation
    
    Change-Id: Iaebddd648c52c175da17d2a55a1e8de82c213f4d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127330
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <[email protected]>

diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 3e8b592228bb..b9455507c3a4 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <rtl/ustring.hxx>
+#include <tools/solar.h>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
 
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index ea365b225747..ba3c1de11717 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -29,6 +29,7 @@
 
 class SfxMacroTabPage_;
 class SfxMacroTabPage_Impl;
+class Timer;
 
 class SfxMacroTabPage final : public SfxTabPage
 {
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 905415f70928..9fd58548516e 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -32,6 +32,7 @@
 #include <svx/svxids.hrc>
 #include <strings.hrc>
 #include <vcl/fieldvalues.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/unitconv.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index f56ed368c98b..758ba37a60cb 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -928,6 +928,9 @@ excludelist:
     - com/sun/star/text/WritingMode.hpp
     - com/sun/star/graphic/XGraphic.hpp
     - com/sun/star/drawing/QRCode.hpp
+    - com/sun/star/text/XTextColumns.hpp
+    - com/sun/star/drawing/BarCode.hpp
+    - editeng/unoprnms.hxx
     - svx/svddef.hxx
     include/svx/xdef.hxx:
     # Needed for macro defines
diff --git a/include/editeng/AccessibleContextBase.hxx 
b/include/editeng/AccessibleContextBase.hxx
index 6b1321a03f05..3955a1bbfeee 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <osl/mutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <editeng/editengdllapi.h>
diff --git a/include/filter/msfilter/escherex.hxx 
b/include/filter/msfilter/escherex.hxx
index da62cb52f957..b4fdad459da9 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -37,7 +37,6 @@
 #include <svx/svdtypes.hxx>
 #include <svx/msdffdef.hxx>
 #include <tools/gen.hxx>
-#include <tools/solar.h>
 #include <tools/stream.hxx>
 #include <vcl/mapmod.hxx>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/include/sfx2/LokControlHandler.hxx 
b/include/sfx2/LokControlHandler.hxx
index cb48e9eb355b..c422afc979cc 100644
--- a/include/sfx2/LokControlHandler.hxx
+++ b/include/sfx2/LokControlHandler.hxx
@@ -9,8 +9,11 @@
 
 #pragma once
 
-#include <sfx2/dllapi.h>
+#include <sfx2/lokhelper.hxx>
+#include <svx/svditer.hxx>
 #include <svx/svdouno.hxx>
+#include <tools/UnitConversion.hxx>
+#include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/XControl.hpp>
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index c8c1bdad8a40..c198f12dbc3b 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -22,7 +22,6 @@
 #include <memory>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <sal/types.h>
 #include <vcl/weld.hxx>
 
 class SfxTabPage;
@@ -30,7 +29,6 @@ class SfxBindings;
 class SfxChildWindow;
 struct SfxChildWinInfo;
 class SfxItemSet;
-class Timer;
 struct WhichRangesContainer;
 
 class SFX2_DLLPUBLIC SfxDialogController : public weld::GenericDialogController
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 40cbd82c7762..fc7ebbfd4f2d 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -30,7 +30,6 @@
 
 #include <svl/numformat.hxx>
 #include <svl/stritem.hxx>
-#include <svl/zforlist.hxx>
 #include <svtools/ctrlbox.hxx>
 
 #include <vcl/idle.hxx>
diff --git a/include/sfx2/lokcallback.hxx b/include/sfx2/lokcallback.hxx
index 6f59402d0cec..32b6c08f865b 100644
--- a/include/sfx2/lokcallback.hxx
+++ b/include/sfx2/lokcallback.hxx
@@ -11,8 +11,6 @@
 
 #include <sal/types.h>
 
-#include <vector>
-
 namespace tools
 {
 class Rectangle;
diff --git a/include/sfx2/lokcharthelper.hxx b/include/sfx2/lokcharthelper.hxx
index 319af8c35da5..26f14b4c3129 100644
--- a/include/sfx2/lokcharthelper.hxx
+++ b/include/sfx2/lokcharthelper.hxx
@@ -13,10 +13,10 @@
 #include <sfx2/dllapi.h>
 #include <tools/gen.hxx>
 #include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
 
 namespace com::sun::star::frame { class XController; }
 namespace com::sun::star::frame { class XDispatch; }
-namespace vcl { class Window; }
 
 class SfxViewShell;
 class VirtualDevice;
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 2bdc6a9c2011..ef7fd4683a7d 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -24,7 +24,6 @@
 #include <sfx2/dllapi.h>
 #include <sfx2/tabdlg.hxx>
 #include <sal/types.h>
-#include <vcl/print.hxx>
 #include <vcl/printer/Options.hxx>
 
 class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage final : public SfxTabPage
diff --git a/include/sfx2/sfxstatuslistener.hxx 
b/include/sfx2/sfxstatuslistener.hxx
index 52d553e766f6..384d5ac19e3f 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SFX2_SFXSTATUSLISTENER_HXX
 #define INCLUDED_SFX2_SFXSTATUSLISTENER_HXX
 
-#include <config_options.h>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
 #include <svl/poolitem.hxx>
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 54d962450e8f..d3faf93eadc3 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -31,7 +31,6 @@
 #include <vcl/errcode.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <vcl/vclptr.hxx>
-#include <LibreOfficeKit/LibreOfficeKitTypes.h>
 #include <editeng/outliner.hxx>
 #include <functional>
 #include <unordered_set>
diff --git a/include/svl/cjkoptions.hxx b/include/svl/cjkoptions.hxx
index ba679006e8f5..9ac227541b91 100644
--- a/include/svl/cjkoptions.hxx
+++ b/include/svl/cjkoptions.hxx
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <svl/svldllapi.h>
-#include <unotools/options.hxx>
 
 namespace SvtCJKOptions
 {
diff --git a/include/svl/currencytable.hxx b/include/svl/currencytable.hxx
index f7573f48b80b..a990ba4e00f9 100644
--- a/include/svl/currencytable.hxx
+++ b/include/svl/currencytable.hxx
@@ -14,7 +14,6 @@
 #include <svl/zforlist.hxx>
 
 #include <vector>
-#include <memory>
 
 class SVL_DLLPUBLIC NfCurrencyTable
 {
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index ef1343a49fc8..3db9889a53fb 100644
--- a/include/svl/hint.hxx
+++ b/include/svl/hint.hxx
@@ -22,7 +22,6 @@
 #include <ostream>
 #include <string>
 
-#include <sal/types.h>
 #include <svl/svldllapi.h>
 
 enum class SfxHintId {
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index d6461558abde..12954a1324b0 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -25,8 +25,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <svl/itemset.hxx>
 #include <svl/svldllapi.h>
-#include <vector>
-#include <unordered_map>
 #include <o3tl/sorted_vector.hxx>
 #include <string_view>
 
diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx
index a7f229c69025..d0a5d982ffca 100644
--- a/include/svl/languageoptions.hxx
+++ b/include/svl/languageoptions.hxx
@@ -22,9 +22,7 @@
 #include <svl/svldllapi.h>
 #include <sal/types.h>
 #include <o3tl/typed_flags_set.hxx>
-#include <unotools/options.hxx>
 #include <i18nlangtag/lang.h>
-#include <memory>
 
 // class SvtLanguageOptions 
----------------------------------------------------
 
diff --git a/include/svl/numformat.hxx b/include/svl/numformat.hxx
index 2cbfeb9cd171..e002349b2dad 100644
--- a/include/svl/numformat.hxx
+++ b/include/svl/numformat.hxx
@@ -23,10 +23,16 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <i18nlangtag/lang.h>
 #include <tools/link.hxx>
+#include <svl/nfkeytab.hxx>
+#include <svl/ondemand.hxx>
 #include <svl/zforlist.hxx>
 #include <unotools/charclass.hxx>
-#include <optional>
 
+#include <map>
+
+class Color;
+class ImpSvNumberformatScan;
+class ImpSvNumberInputScan;
 class SvNumberFormatterRegistry_Impl;
 class NfCurrencyTable;
 
diff --git a/include/svl/setitem.hxx b/include/svl/setitem.hxx
index 11154d4dfa3d..8a7c39f08ea0 100644
--- a/include/svl/setitem.hxx
+++ b/include/svl/setitem.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/config.h>
 
-#include <optional>
 #include <svl/poolitem.hxx>
 #include <svl/itemset.hxx>
 
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index f332d8405470..0020d8fde6a3 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -27,26 +27,12 @@
 #include <i18nlangtag/lang.h>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <unotools/localedatawrapper.hxx>
-#include <tools/link.hxx>
-#include <svl/ondemand.hxx>
-#include <svl/nfkeytab.hxx>
 
 #include <unordered_map>
-#include <memory>
 
-namespace com::sun::star::i18n { class XNumberFormatCode; }
 namespace com::sun::star::i18n { struct Currency; }
-namespace com::sun::star::i18n { struct NumberFormatCode; }
 
-class Date;
-class Color;
-class CharClass;
-class CalendarWrapper;
-
-class ImpSvNumberformatScan;
-class ImpSvNumberInputScan;
 class SvNumberformat;
-namespace com::sun::star::uno { class XComponentContext; }
 
 #define SV_COUNTRY_LANGUAGE_OFFSET     10000  // Max count of formats per 
country/language
 #define SV_MAX_COUNT_STANDARD_FORMATS  100    // Max count of builtin default 
formats per CL
diff --git a/include/svtools/editbrowsebox.hxx 
b/include/svtools/editbrowsebox.hxx
index 6d253cb2245a..9b7ac148150a 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <config_options.h>
 #include <memory>
 #include <svtools/svtdllapi.h>
 #include <tools/ref.hxx>
diff --git a/include/svtools/filechangedchecker.hxx 
b/include/svtools/filechangedchecker.hxx
index a6f86eab8f92..d63d146688c6 100644
--- a/include/svtools/filechangedchecker.hxx
+++ b/include/svtools/filechangedchecker.hxx
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <config_options.h>
 #include <svtools/svtdllapi.h>
 
 #include <osl/time.h>
@@ -18,8 +17,6 @@
 
 #include <functional>
 
-class Timer;
-
 /** Periodically checks if a file has been modified
 
     Instances of this class setup a vcl timer to occasionally wake up
diff --git a/include/svtools/helpids.h b/include/svtools/helpids.h
index eb24d2301f7d..d6b1da9e7623 100644
--- a/include/svtools/helpids.h
+++ b/include/svtools/helpids.h
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <rtl/string.hxx>
+
 inline constexpr OStringLiteral HID_FILEDLG_LINK_CB = 
"SVT_HID_FILEDLG_LINK_CB";
 inline constexpr OStringLiteral HID_FILEDLG_PREVIEW_CB = 
"SVT_HID_FILEDLG_PREVIEW_CB";
 inline constexpr OStringLiteral HID_FILEDLG_STANDARD = 
"SVT_HID_FILEDLG_STANDARD";
diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx
index 1223814a84b3..9fe4c4dcefa6 100644
--- a/include/svtools/printoptions.hxx
+++ b/include/svtools/printoptions.hxx
@@ -19,9 +19,7 @@
 
 #pragma once
 
-#include <config_options.h>
 #include <svtools/svtdllapi.h>
-#include <sal/types.h>
 
 namespace vcl::printer { class Options; }
 
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index d54b4a972f15..391b7e9a9521 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -25,7 +25,6 @@
 #include <tools/long.hxx>
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
-#include <vector>
 #include <memory>
 
 template<typename T> struct SvParser_Impl;
diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx
index f4ab804bf7f9..f8b53c0a56f8 100644
--- a/include/svx/dlgutil.hxx
+++ b/include/svx/dlgutil.hxx
@@ -22,7 +22,7 @@
 
 #include <tools/fldunit.hxx>
 #include <svx/svxdllapi.h>
-#include <vcl/outdev.hxx>
+#include <vcl/rendercontext/DrawModeFlags.hxx>
 
 class SfxItemSet;
 
diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx
index 1baf43249a83..bcb6d92fa8de 100644
--- a/include/svx/e3dsceneupdater.hxx
+++ b/include/svx/e3dsceneupdater.hxx
@@ -22,7 +22,6 @@
 
 #include <svx/svxdllapi.h>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
-#include <memory>
 #include <optional>
 
 class SdrObject;
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index 0e5f73923f9b..978f63e359e8 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -25,7 +25,6 @@
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/weldutils.hxx>
 #include <svx/svxdllapi.h>
-#include <com/sun/star/drawing/FillStyle.hpp>
 
 class XFillStyleItem;
 class XFillColorItem;
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index bd47facb530a..9b3fadc6146c 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -21,8 +21,6 @@
 
 #include <sal/config.h>
 
-#include <memory>
-
 #include <svl/setitem.hxx>
 #include <svx/svxdllapi.h>
 #include <editeng/svxenum.hxx>
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx 
b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index 65b353f41be4..d7c432643f92 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -22,12 +22,9 @@
 
 #include <sal/types.h>
 #include <svx/sdr/contact/viewcontact.hxx>
-#include <svx/sdtakitm.hxx>
 #include <svx/svxdllapi.h>
 
 class SdrObject;
-class GeoStat;
-class Bitmap;
 
 namespace sdr::contact {
 
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx 
b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index a61c6d5cc1c9..100d2ad87841 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
 
 #include <svx/svxdllapi.h>
-#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
+#include <drawinglayer/primitive2d/Primitive2DVisitor.hxx>
 
 namespace sdr::contact {
 
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index 1bca84ca319f..3c70ebeac3c4 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -23,13 +23,11 @@
 #include <tools/gen.hxx>
 #include <tools/degree.hxx>
 #include <svx/svxdllapi.h>
-#include <memory>
 #include <vector>
 #include <o3tl/typed_flags_set.hxx>
 
 namespace vcl { class Window; }
 class OutputDevice;
-class SvStream;
 class SdrObject;
 
 
diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx
index 727273454905..f8e6a40da8b7 100644
--- a/include/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
@@ -23,8 +23,6 @@
 #include <svx/sdr/properties/defaultproperties.hxx>
 #include <svx/svxdllapi.h>
 #include <tools/weakbase.hxx>
-#include <memory>
-#include <optional>
 
 class OutlinerParaObject;
 class SdrOutliner;
diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc
index 2e5d5cf8b8e2..d42194497144 100644
--- a/include/svx/svxitems.hrc
+++ b/include/svx/svxitems.hrc
@@ -24,6 +24,7 @@
 #include <svx/svxitems.hrc>
 #include <svx/svxids.hrc>
 #include <editeng/editids.hrc>
+#include <unotools/resmgr.hxx>
 #include <utility>
 
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const 
*>(u8##String))
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 381a2a723b90..fab12be594ad 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -46,7 +46,6 @@
 #include <tools/weakbase.hxx>
 #include <svl/lstner.hxx>
 #include <editeng/unoipset.hxx>
-#include <osl/mutex.hxx>
 #include <svx/svxdllapi.h>
 #include <rtl/ref.hxx>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx
index e263f09dc0c1..e3780a31d0a8 100644
--- a/include/svx/xflasit.hxx
+++ b/include/svx/xflasit.hxx
@@ -22,8 +22,6 @@
 
 #include <sal/config.h>
 
-#include <memory>
-
 #include <svl/setitem.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx
index 09dc3d36af24..e388c29658de 100644
--- a/include/svx/xlnasit.hxx
+++ b/include/svx/xlnasit.hxx
@@ -22,8 +22,6 @@
 
 #include <sal/config.h>
 
-#include <memory>
-
 #include <svl/setitem.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index 38ea69ffa053..aa3c6764ebde 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -22,7 +22,6 @@
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <osl/mutex.hxx>
 #include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
@@ -31,7 +30,6 @@
 #include <rtl/ref.hxx>
 #include <tools/stream.hxx>
 #include <map>
-#include <memory>
 #include <optional>
 
 enum class SvXMLEmbeddedObjectHelperMode
diff --git a/include/tools/b3dtrans.hxx b/include/tools/b3dtrans.hxx
index b12cb7a655cb..2f6752e0848a 100644
--- a/include/tools/b3dtrans.hxx
+++ b/include/tools/b3dtrans.hxx
@@ -22,7 +22,6 @@
 
 #define ZBUFFER_DEPTH_RANGE         (double(256L * 256L * 256L))
 
-#include <config_options.h>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <tools/gen.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/include/tools/degree.hxx b/include/tools/degree.hxx
index 1f2b2e2f8853..560f9b115fce 100644
--- a/include/tools/degree.hxx
+++ b/include/tools/degree.hxx
@@ -17,7 +17,6 @@
 #include <cstdlib>
 #include <math.h>
 #include <numeric>
-#include <utility>
 
 template <int N> struct FractionTag;
 // 1/Nth fraction of a degree
diff --git a/include/tools/vcompat.hxx b/include/tools/vcompat.hxx
index 0b90a8f2b41c..39cd0cd0bd29 100644
--- a/include/tools/vcompat.hxx
+++ b/include/tools/vcompat.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_TOOLS_VCOMPAT_HXX
 
 #include <tools/toolsdllapi.h>
-#include <config_options.h>
 
 inline sal_uInt32 COMPAT_FORMAT(char char1, char char2, char char3, char char4)
 {
diff --git a/include/tools/wldcrd.hxx b/include/tools/wldcrd.hxx
index dfb1e9d87bc3..fdbefcc4d2ea 100644
--- a/include/tools/wldcrd.hxx
+++ b/include/tools/wldcrd.hxx
@@ -24,7 +24,6 @@
 #include <string_view>
 
 #include <tools/toolsdllapi.h>
-#include <osl/thread.h>
 #include <rtl/ustring.hxx>
 
 class SAL_WARN_UNUSED TOOLS_DLLPUBLIC WildCard
diff --git a/include/unotools/VersionConfig.hxx 
b/include/unotools/VersionConfig.hxx
index c3bdeea48fea..f94dfe564b3d 100644
--- a/include/unotools/VersionConfig.hxx
+++ b/include/unotools/VersionConfig.hxx
@@ -9,7 +9,6 @@
  */
 #pragma once
 
-#include <officecfg/Office/Common.hxx>
 #include <officecfg/Setup.hxx>
 #include <unotools/configmgr.hxx>
 
diff --git a/include/unotools/ZipPackageHelper.hxx 
b/include/unotools/ZipPackageHelper.hxx
index 69eb7205cd8a..7ac35b801e9f 100644
--- a/include/unotools/ZipPackageHelper.hxx
+++ b/include/unotools/ZipPackageHelper.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_UNOTOOLS_ZIPPACKAGEHELPER_HXX
 #define INCLUDED_UNOTOOLS_ZIPPACKAGEHELPER_HXX
 
-#include <config_options.h>
 #include <unotools/unotoolsdllapi.h>
 
 #include <com/sun/star/uno/XInterface.hpp>
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index f3c81a18e51b..4405d810875b 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/i18n/ParseResult.hpp>
 #include <com/sun/star/i18n/UnicodeScript.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <mutex>
 
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::i18n { class XCharacterClassification; }
diff --git a/include/unotools/compatibility.hxx 
b/include/unotools/compatibility.hxx
index 15f8b59dfee8..c5dc3fb14746 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
 #define INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
 
-#include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <unotools/options.hxx>
 #include <unotools/unotoolsdllapi.h>
@@ -27,7 +26,6 @@
 #include <memory>
 #include <vector>
 
-namespace com::sun::star::beans { struct PropertyValue; }
 namespace osl { class Mutex; }
 
 
/*-************************************************************************************************************
diff --git a/include/unotools/dynamicmenuoptions.hxx 
b/include/unotools/dynamicmenuoptions.hxx
index d1c1c7249af1..b046f7dbda07 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_UNOTOOLS_DYNAMICMENUOPTIONS_HXX
 
 #include <unotools/unotoolsdllapi.h>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <vector>
 
diff --git a/include/unotools/historyoptions.hxx 
b/include/unotools/historyoptions.hxx
index 088b2f51dc26..dccc8101cf89 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <unotools/unotoolsdllapi.h>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <optional>
diff --git a/include/unotools/linguprops.hxx b/include/unotools/linguprops.hxx
index 6beae72149ac..9cc88e82d7f4 100644
--- a/include/unotools/linguprops.hxx
+++ b/include/unotools/linguprops.hxx
@@ -18,6 +18,8 @@
  */
 #pragma once
 
+#include <rtl/ustring.hxx>
+
 #ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-variable"
diff --git a/include/unotools/localedatawrapper.hxx 
b/include/unotools/localedatawrapper.hxx
index 6593e96dcaaa..46a657356085 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -32,7 +32,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/unotoolsdllapi.h>
 #include <memory>
-#include <map>
 #include <string_view>
 
 namespace com::sun::star::uno { class XComponentContext; }
diff --git a/include/unotools/securityoptions.hxx 
b/include/unotools/securityoptions.hxx
index 332ba457fc4d..0cae239c11cb 100644
--- a/include/unotools/securityoptions.hxx
+++ b/include/unotools/securityoptions.hxx
@@ -21,7 +21,6 @@
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <memory>
 #include <vector>
 #include <unordered_map>
 
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 46f3ea326860..734c9cada7bb 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <unotools/options.hxx>
 
 namespace com::sun::star::beans { struct NamedValue; }
 namespace com::sun::star::container { class XNameAccess; }
diff --git a/include/vcl/BitmapPalette.hxx b/include/vcl/BitmapPalette.hxx
index 53de5276b282..d470dfbb5521 100644
--- a/include/vcl/BitmapPalette.hxx
+++ b/include/vcl/BitmapPalette.hxx
@@ -22,7 +22,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/BitmapColor.hxx>
 #include <vcl/checksum.hxx>
-#include <vector>
 #include <o3tl/cow_wrapper.hxx>
 
 class ImplBitmapPalette;
diff --git a/include/vcl/accessibletableprovider.hxx 
b/include/vcl/accessibletableprovider.hxx
index 32817b135352..cf7a0d097425 100644
--- a/include/vcl/accessibletableprovider.hxx
+++ b/include/vcl/accessibletableprovider.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_VCL_ACCESSIBLETABLEPROVIDER_HXX
 
 #include <vcl/AccessibleBrowseBoxObjType.hxx>
-#include <vcl/outdev.hxx>
+#include <vcl/window.hxx>
 
 namespace com::sun::star::accessibility { class XAccessible; }
 namespace utl { class AccessibleStateSetHelper; }
diff --git a/include/vcl/animate/Animation.hxx 
b/include/vcl/animate/Animation.hxx
index 8c187723e78f..94cefee2e570 100644
--- a/include/vcl/animate/Animation.hxx
+++ b/include/vcl/animate/Animation.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_VCL_ANIMATE_ANIMATION_HXX
 #define INCLUDED_VCL_ANIMATE_ANIMATION_HXX
 
+#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/timer.hxx>
 #include <vcl/animate/AnimationBitmap.hxx>
diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx
index f623fe86dd18..f847c9f6dcb2 100644
--- a/include/vcl/bitmapex.hxx
+++ b/include/vcl/bitmapex.hxx
@@ -25,7 +25,6 @@
 #include <vcl/Scanline.hxx>
 #include <tools/color.hxx>
 #include <tools/degree.hxx>
-#include <tools/solar.h>
 
 #include <sal/types.h>
 
diff --git a/include/vcl/devicecoordinate.hxx b/include/vcl/devicecoordinate.hxx
index acece32cc204..4532b51429e0 100644
--- a/include/vcl/devicecoordinate.hxx
+++ b/include/vcl/devicecoordinate.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_VCL_DEVICE_COORDINATE_HXX
 
 #include <config_vcl.h>
-#include <tools/long.hxx>
 
 #if VCL_FLOAT_DEVICE_PIXEL
 #include <basegfx/point/b2dpoint.hxx>
diff --git a/include/vcl/filter/SvmReader.hxx b/include/vcl/filter/SvmReader.hxx
index cac9ffdab52c..d16a775e37d4 100644
--- a/include/vcl/filter/SvmReader.hxx
+++ b/include/vcl/filter/SvmReader.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <memory>
 #include <vcl/gdimtf.hxx>
 
 class SvStream;
diff --git a/include/vcl/filter/SvmWriter.hxx b/include/vcl/filter/SvmWriter.hxx
index 4d0a15ed6078..ef8cf8c523b5 100644
--- a/include/vcl/filter/SvmWriter.hxx
+++ b/include/vcl/filter/SvmWriter.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <memory>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index 83f4170c241c..918c205af65b 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -22,8 +22,6 @@
 
 #include <sal/config.h>
 
-#include <config_options.h>
-
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
diff --git a/include/vcl/rendercontext/DrawModeFlags.hxx 
b/include/vcl/rendercontext/DrawModeFlags.hxx
index 9ea4888eb265..edfa27626a9a 100644
--- a/include/vcl/rendercontext/DrawModeFlags.hxx
+++ b/include/vcl/rendercontext/DrawModeFlags.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <sal/types.h>
 #include <o3tl/typed_flags_set.hxx>
 
 enum class DrawModeFlags : sal_uInt32
diff --git a/include/vcl/rendercontext/State.hxx 
b/include/vcl/rendercontext/State.hxx
index 99460e390814..a433dbd8fb05 100644
--- a/include/vcl/rendercontext/State.hxx
+++ b/include/vcl/rendercontext/State.hxx
@@ -29,7 +29,6 @@
 #include <vcl/font.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/region.hxx>
-#include <vcl/vclenum.hxx>
 
 #include <memory>
 #include <optional>
diff --git a/include/vcl/test/GraphicsRenderTests.hxx 
b/include/vcl/test/GraphicsRenderTests.hxx
index 480cd73f5358..3002dfebbcbf 100644
--- a/include/vcl/test/GraphicsRenderTests.hxx
+++ b/include/vcl/test/GraphicsRenderTests.hxx
@@ -11,9 +11,7 @@
 
 #include <vcl/bitmap.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/graphicfilter.hxx>
 #include <vcl/test/TestResult.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include <vector>
 
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index b4df10a40c9e..c46218d68423 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -17,6 +17,7 @@
 #include <vcl/vclevent.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/dllapi.h>
+#include <vcl/window.hxx>
 
 #include <set>
 
diff --git a/include/vcl/unohelp2.hxx b/include/vcl/unohelp2.hxx
index c4aad4c606b1..978c31ecf8f6 100644
--- a/include/vcl/unohelp2.hxx
+++ b/include/vcl/unohelp2.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/IDialogRenderable.hxx>
 
diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx
index 6ea9bc61bfbb..ce82d56f274a 100644
--- a/include/vcl/vcllayout.hxx
+++ b/include/vcl/vcllayout.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <sal/log.hxx>
-
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <tools/gen.hxx>
 #include <tools/degree.hxx>
diff --git a/include/xmloff/DashStyle.hxx b/include/xmloff/DashStyle.hxx
index 38cda5c426f0..da31f66c0af9 100644
--- a/include/xmloff/DashStyle.hxx
+++ b/include/xmloff/DashStyle.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_DASHSTYLE_HXX
 #define INCLUDED_XMLOFF_DASHSTYLE_HXX
 
-#include <config_options.h>
 #include <rtl/ustring.hxx>
 #include <xmloff/dllapi.h>
 
diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index 9ac9427994cb..8c4c4c686cd3 100644
--- a/include/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_GRADIENTSTYLE_HXX
 #define INCLUDED_XMLOFF_GRADIENTSTYLE_HXX
 
-#include <config_options.h>
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <rtl/ustring.hxx>
diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx
index 85ec02ac488d..76e9ae621aa1 100644
--- a/include/xmloff/HatchStyle.hxx
+++ b/include/xmloff/HatchStyle.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_HATCHSTYLE_HXX
 #define INCLUDED_XMLOFF_HATCHSTYLE_HXX
 
-#include <config_options.h>
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <rtl/ustring.hxx>
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index add8482d1ce2..15b1a845a005 100644
--- a/include/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_IMAGESTYLE_HXX
 #define INCLUDED_XMLOFF_IMAGESTYLE_HXX
 
-#include <config_options.h>
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <rtl/ustring.hxx>
diff --git a/include/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx
index 70e58cad83b9..33b39a6bd199 100644
--- a/include/xmloff/MarkerStyle.hxx
+++ b/include/xmloff/MarkerStyle.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_MARKERSTYLE_HXX
 #define INCLUDED_XMLOFF_MARKERSTYLE_HXX
 
-#include <config_options.h>
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <rtl/ustring.hxx>
diff --git a/include/xmloff/families.hxx b/include/xmloff/families.hxx
index 05e355a3ce7d..bc2e315c036a 100644
--- a/include/xmloff/families.hxx
+++ b/include/xmloff/families.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_XMLOFF_FAMILIES_HXX
 #define INCLUDED_XMLOFF_FAMILIES_HXX
 
+#include <rtl/ustring.hxx>
+
 /** These defines determine the unique ids for XML style-families
     used in the SvXMLAutoStylePoolP.
  */
diff --git a/include/xmloff/odffields.hxx b/include/xmloff/odffields.hxx
index 8a0b103ba9b8..8dd75e038189 100644
--- a/include/xmloff/odffields.hxx
+++ b/include/xmloff/odffields.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_XMLOFF_ODFFIELDS_HXX
 #define INCLUDED_XMLOFF_ODFFIELDS_HXX
 
+#include <rtl/ustring.hxx>
+
 inline constexpr OUStringLiteral ODF_FORMTEXT = 
u"vnd.oasis.opendocument.field.FORMTEXT";
 #define ODF_FORMFIELD_DEFAULT_LENGTH 5
 
diff --git a/sc/source/core/tool/compare.cxx b/sc/source/core/tool/compare.cxx
index 48bf4642fe05..58ed51f65f44 100644
--- a/sc/source/core/tool/compare.cxx
+++ b/sc/source/core/tool/compare.cxx
@@ -24,6 +24,7 @@
 
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/textsearch.hxx>
+#include <unotools/transliterationwrapper.hxx>
 #include <rtl/math.hxx>
 #include <osl/diagnose.h>
 
diff --git a/sc/source/core/tool/doubleref.cxx 
b/sc/source/core/tool/doubleref.cxx
index 11263659de94..4ef076003e0f 100644
--- a/sc/source/core/tool/doubleref.cxx
+++ b/sc/source/core/tool/doubleref.cxx
@@ -29,6 +29,7 @@
 #include <svl/sharedstringpool.hxx>
 #include <osl/diagnose.h>
 #include <unotools/charclass.hxx>
+#include <unotools/transliterationwrapper.hxx>
 
 #include <memory>
 #include <utility>
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 5842da0b8089..28ceba647ccf 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -31,6 +31,7 @@
 #include <basic/sbx.hxx>
 #include <basic/sbxobj.hxx>
 #include <basic/sbuno.hxx>
+#include <osl/thread.h>
 #include <svl/numformat.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/sharedstringpool.hxx>
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx 
b/sc/source/ui/drawfunc/drtxtob.cxx
index 9303380ca494..2643fefc208a 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -20,6 +20,7 @@
 #include <comphelper/string.hxx>
 #include <scitems.hxx>
 
+#include <i18nutil/transliteration.hxx>
 #include <editeng/adjustitem.hxx>
 #include <svx/clipfmtitem.hxx>
 #include <editeng/contouritem.hxx>
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index c7e7dabd1ee5..c75739ed79df 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -21,6 +21,7 @@
 #include <scitems.hxx>
 #include <editeng/eeitem.hxx>
 #include <i18nutil/unicode.hxx>
+#include <i18nutil/transliteration.hxx>
 
 #include <svx/clipfmtitem.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx
index 2d6751c0606e..65d0c836d340 100644
--- a/sc/source/ui/view/viewutil.cxx
+++ b/sc/source/ui/view/viewutil.cxx
@@ -24,6 +24,7 @@
 #include <editeng/fontitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/scripttypeitem.hxx>
+#include <i18nutil/transliteration.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
 #include <svl/cjkoptions.hxx>
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 8a82d99fc4b2..999a672360eb 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -77,6 +77,7 @@
 #include <editeng/widwitem.hxx>
 #include <editeng/wrlmitem.hxx>
 #include <editeng/xmlcnitm.hxx>
+#include <i18nutil/transliteration.hxx>
 #include <editsh.hxx>
 #include <fchrfmt.hxx>
 #include <fmtanchr.hxx>
diff --git a/sw/source/core/unocore/unosrch.cxx 
b/sw/source/core/unocore/unosrch.cxx
index ce3776fd92af..91ddb3432dbd 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -35,6 +35,7 @@
 #include <svl/itemprop.hxx>
 #include <svl/itempool.hxx>
 #include <memory>
+#include <unordered_map>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 875625576a14..bd960da05d7a 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SW_SOURCE_FILTER_WW8_WRTWW8_HXX
 
 #include <sot/storage.hxx>
+#include <svl/nfkeytab.hxx>
 #include <tools/solar.h>
 #include <tools/gen.hxx>
 #include <editeng/editdata.hxx>
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx 
b/sw/source/ui/inc/mmresultdialogs.hxx
index 11744fd5fb07..a5b96cf27175 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -27,6 +27,7 @@
 class SwMailMergeWizard;
 class SfxPrinter;
 class SwSendMailDialog;
+class Timer;
 namespace com::sun::star::mail { class XMailMessage; }
 
 
diff --git a/vcl/backendtest/GraphicsRenderTests.cxx 
b/vcl/backendtest/GraphicsRenderTests.cxx
index 1c794b246669..554d73f43553 100644
--- a/vcl/backendtest/GraphicsRenderTests.cxx
+++ b/vcl/backendtest/GraphicsRenderTests.cxx
@@ -11,6 +11,7 @@
 #include <test/outputdevice.hxx>
 #include <unotools/bootstrap.hxx>
 #include <vcl/test/GraphicsRenderTests.hxx>
+#include <vcl/graphicfilter.hxx>
 #include <tools/stream.hxx>
 
 #include <svdata.hxx>
diff --git a/vcl/source/animate/AnimationBitmap.cxx 
b/vcl/source/animate/AnimationBitmap.cxx
index af4b1bb78556..8dfb466e18a1 100644
--- a/vcl/source/animate/AnimationBitmap.cxx
+++ b/vcl/source/animate/AnimationBitmap.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/config.h>
 #include <o3tl/underlyingenumvalue.hxx>
+#include <tools/solar.h>
 #include <vcl/animate/AnimationBitmap.hxx>
 
 BitmapChecksum AnimationBitmap::GetChecksum() const
diff --git a/vcl/source/bitmap/BitmapPopArtFilter.cxx 
b/vcl/source/bitmap/BitmapPopArtFilter.cxx
index a575a4e06f5a..5d5a6ee256ba 100644
--- a/vcl/source/bitmap/BitmapPopArtFilter.cxx
+++ b/vcl/source/bitmap/BitmapPopArtFilter.cxx
@@ -8,6 +8,7 @@
  *
  */
 
+#include <tools/solar.h>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/BitmapPopArtFilter.hxx>
diff --git a/vcl/source/filter/png/pngwrite.cxx 
b/vcl/source/filter/png/pngwrite.cxx
index 0554a314e83c..b4bc3fa8b60b 100644
--- a/vcl/source/filter/png/pngwrite.cxx
+++ b/vcl/source/filter/png/pngwrite.cxx
@@ -25,6 +25,7 @@
 
 #include <limits>
 #include <rtl/crc.h>
+#include <tools/solar.h>
 #include <tools/zcodec.hxx>
 #include <tools/stream.hxx>
 #include <vcl/BitmapReadAccess.hxx>

Reply via email to