tdf#42949 Fix new IWYU warnings in directories [h-r]*

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

Change-Id: I886b6f446293d3b1cfbf4ae05e8dbd7fabab9f20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105510
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/helpcompiler/inc/BasCodeTagger.hxx b/helpcompiler/inc/BasCodeTagger.hxx
index d897afb..b873001 100644
--- a/helpcompiler/inc/BasCodeTagger.hxx
+++ b/helpcompiler/inc/BasCodeTagger.hxx
@@ -15,7 +15,6 @@
#include <vector>
#include <libxml/parser.h>
#include <comphelper/syntaxhighlight.hxx>
#include <helpcompiler/dllapi.h>

class LibXmlTreeWalker;

diff --git a/helpcompiler/source/HelpCompiler.cxx b/helpcompiler/source/HelpCompiler.cxx
index 678cf8e..ee4a274 100644
--- a/helpcompiler/source/HelpCompiler.cxx
+++ b/helpcompiler/source/HelpCompiler.cxx
@@ -27,8 +27,6 @@
#include <string.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/transform.h>
#include <osl/thread.hxx>
#include <chrono>
#include <rtl/character.hxx>
#include <sal/log.hxx>

diff --git a/i18npool/IwyuFilter_i18npool.yaml b/i18npool/IwyuFilter_i18npool.yaml
index 96213ac..ca60fcf 100644
--- a/i18npool/IwyuFilter_i18npool.yaml
+++ b/i18npool/IwyuFilter_i18npool.yaml
@@ -94,6 +94,12 @@ excludelist:
    - config_folders.h
    - osl/file.h
    - rtl/bootstrap.hxx
    i18npool/source/calendar/calendar_gregorian.cxx:
    # Needed for rtl::math::round
    - rtl/math.hxx
    i18npool/source/collator/collator_unicode.cxx:
    # Config options are used in #ifdef
    - config_locales.h
    i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx:
    # Actually used
    - com/sun/star/beans/PropertyValue.hpp
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index 3be0ea4e..36f145e 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -11,13 +11,10 @@
#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/WordType.hpp>
#include <o3tl/cppunittraitshelper.hxx>
#include <unotest/bootstrapfixturebase.hxx>

#include <unicode/uvernum.h>

#include <rtl/strbuf.hxx>

#include <string.h>

#include <stack>
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 8e3ef73..11149be 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -22,7 +22,6 @@
#include <cppuhelper/supportsservice.hxx>
#include <unicode/uchar.h>
#include <i18nutil/unicode.hxx>
#include <rtl/ustrbuf.hxx>

#include <com/sun/star/i18n/CharType.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index 218f8b6..659a50e 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -23,8 +23,6 @@
#include <breakiterator_th.hxx>
#include <wtt.h>

#include <string.h>

using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::i18n;
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index e8d732c..947a23c 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -22,7 +22,6 @@
#include <osl/file.h>
#include <osl/module.h>
#include <osl/mutex.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/bootstrap.hxx>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/i18n/WordType.hpp>
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index f2959f0..c3ac0d5 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.cxx
@@ -21,7 +21,6 @@
#include <calendar_gregorian.hxx>
#include <localedata.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>

#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 450e57a..3253b45 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.cxx
@@ -21,7 +21,6 @@
#include <localedata.hxx>
#include <com/sun/star/i18n/CollatorOptions.hpp>
#include <com/sun/star/i18n/LocaleData2.hpp>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <numeric>

diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index adc7669..997355f 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -21,7 +21,6 @@
#include <string.h>
#include <algorithm>
#include <memory>
#include <set>
#include <vector>
#include <o3tl/sorted_vector.hxx>

diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 076c127..ac49507 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -28,10 +28,8 @@
#include <localedata.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <string.h>
#include <rtl/instance.hxx>
#include <sal/macros.h>

diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index abeceb9..8c9e802 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -19,8 +19,6 @@

#include "textsearch.hxx"
#include "levdis.hxx"
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/util/SearchAlgorithms2.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
@@ -30,7 +28,6 @@
#include <com/sun/star/i18n/CharacterClassification.hpp>
#include <com/sun/star/i18n/KCharacterType.hpp>
#include <com/sun/star/i18n/Transliteration.hpp>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
#include <i18nutil/transliteration.hxx>
diff --git a/io/IwyuFilter_io.yaml b/io/IwyuFilter_io.yaml
index 42fd7e3..88e7eb0 100644
--- a/io/IwyuFilter_io.yaml
+++ b/io/IwyuFilter_io.yaml
@@ -1,5 +1,5 @@
---
assumeFilename: io/source/services.cxx
assumeFilename: io/source/stm/odata.cxx
excludelist:
    io/source/connector/connector.hxx:
    # Base class needs full type
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index b63f1a3..7ba8752 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -18,8 +18,6 @@
 */


#include <sal/log.hxx>

#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/io/NotConnectedException.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
diff --git a/jvmfwk/IwyuFilter_jvmfwk.yaml b/jvmfwk/IwyuFilter_jvmfwk.yaml
index 68943cc..bfca82b 100644
--- a/jvmfwk/IwyuFilter_jvmfwk.yaml
+++ b/jvmfwk/IwyuFilter_jvmfwk.yaml
@@ -24,6 +24,7 @@ excludelist:
    jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx:
    # Needed on WIN32
    - o3tl/char16_t2wchar_t.hxx
    - string_view
    # Don't replace with URE impl. detail
    - osl/thread.hxx
    # Don't replace with bits/types, needed for sig_atomic_t
@@ -31,3 +32,5 @@ excludelist:
    jvmfwk/plugins/sunmajor/pluginlib/util.cxx:
    # Needed on MACOSX
    - config_folders.h
    # Don't replace with URE impl. detail
    - osl/module.hxx
diff --git a/jvmfwk/inc/fwkbase.hxx b/jvmfwk/inc/fwkbase.hxx
index 6428083..04f432b 100644
--- a/jvmfwk/inc/fwkbase.hxx
+++ b/jvmfwk/inc/fwkbase.hxx
@@ -22,6 +22,7 @@
#include <sal/config.h>

#include <optional>
#include <vector>

#include <rtl/ustring.hxx>
#include "libxmlutil.hxx"
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
index a67d342..bb70a15 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx
@@ -11,7 +11,6 @@
#include <gdk/gdkkeysyms.h>

#include <iostream>
#include <sstream>

#include <LibreOfficeKit/LibreOfficeKitGtk.h>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 466a1cc..2a4b90c 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -14,7 +14,6 @@
#include <vector>
#include <string>
#include <sstream>
#include <iostream>
#include <mutex>
#include <boost/property_tree/json_parser.hpp>

diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index b60df05..4803dd3 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -51,7 +51,6 @@
#include "convdic.hxx"
#include "convdicxml.hxx"
#include <linguistic/misc.hxx>
#include "defs.hxx"

using namespace std;
using namespace utl;
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index d15fe83..ed26c81 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -28,7 +28,6 @@
#include <i18nlangtag/lang.h>

#include <memory>
#include <set>
#include <unordered_map>

// text conversion dictionary extension
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 9efd7e9..fd291e2 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/linguistic2/ConversionDictionaryType.hpp>
#include <com/sun/star/linguistic2/XConversionDictionaryList.hpp>
#include <com/sun/star/uno/Reference.h>
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index d29a2bc..001a028 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -42,8 +42,6 @@
#include <com/sun/star/linguistic2/LinguServiceManager.hpp>
#include <com/sun/star/linguistic2/XSpellChecker1.hpp>

#include "defs.hxx"

#include <algorithm>


diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 3fa38b3..c0f5f80 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -32,7 +32,6 @@
#include <comphelper/sequence.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/linguistic2/DictionaryEventFlags.hpp>
#include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp>
@@ -41,7 +40,6 @@
#include <unotools/resmgr.hxx>
#include <sal/log.hxx>

#include "defs.hxx"
#include "dlistimp.hxx"
#include "dicimp.hxx"
#include "lngopt.hxx"
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 19864c9..ad2c377 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -40,13 +40,11 @@
#include <com/sun/star/text/XFlatParagraph.hpp>
#include <com/sun/star/text/XFlatParagraphIterator.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>

#include <sal/config.h>
#include <sal/log.hxx>
#include <o3tl/safeint.hxx>
#include <osl/conditn.hxx>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 290b658..e5f3a44 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -29,7 +29,6 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>

using namespace utl;
using namespace osl;
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 23a2e2c..5dd758e 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/deployment/ExtensionManager.hpp>
#include <com/sun/star/container/XContentEnumerationAccess.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/linguistic2/XSupportedLocales.hpp>
diff --git a/oox/IwyuFilter_oox.yaml b/oox/IwyuFilter_oox.yaml
index 5698da5..d652ce1 100644
--- a/oox/IwyuFilter_oox.yaml
+++ b/oox/IwyuFilter_oox.yaml
@@ -7,6 +7,9 @@ excludelist:
    oox/source/core/filterbase.cxx:
    # Actually used
    - comphelper/scopeguard.hxx
    oox/source/core/fragmenthandler2.cxx:
    # Needed for template
    - com/sun/star/frame/XModel.hpp
    oox/source/core/xmlfilterbase.cxx:
    # Actually used
    - com/sun/star/xml/sax/XFastSAXSerializable.hpp
@@ -50,6 +53,9 @@ excludelist:
    # Actually used
    - com/sun/star/graphic/XGraphic.hpp
    - com/sun/star/style/ParagraphAdjust.hpp
    oox/source/drawingml/textrun.cxx:
    # Actually used
    - com/sun/star/frame/XModel.hpp
    oox/source/drawingml/chart/axisconverter.cxx:
    # Actually used
    - com/sun/star/chart2/XCoordinateSystem.hpp
@@ -135,9 +141,25 @@ excludelist:
    oox/source/ppt/pptimport.cxx:
    # Actually used
    - comphelper/scopeguard.hxx
    oox/source/ppt/pptshape.cxx:
    # Needed for template
    - com/sun/star/frame/XModel.hpp
    - com/sun/star/drawing/XDrawPage.hpp
    oox/source/ppt/presPropsfragmenthandler.cxx:
    # Needed for template
    - com/sun/star/frame/XModel.hpp
    oox/source/ppt/slidepersist.cxx:
    # Needed for template
    - com/sun/star/frame/XModel.hpp
    oox/source/ppt/slidetransition.cxx:
    # Actually used
    - com/sun/star/animations/XTransitionFilter.hpp
    oox/source/shape/ShapeFilterBase.cxx:
    # Needed for template
    - com/sun/star/frame/XModel.hpp
    oox/qa/unit/shape.cxx:
    # Needed for rtl::math::round
    - rtl/math.hxx
    oox/source/shape/ShapeContextHandler.cxx:
    # Actually used
    - com/sun/star/xml/dom/XDocument.hpp
diff --git a/oox/inc/drawingml/hatchmap.hxx b/oox/inc/drawingml/hatchmap.hxx
index f0621f8..64e2722 100644
--- a/oox/inc/drawingml/hatchmap.hxx
+++ b/oox/inc/drawingml/hatchmap.hxx
@@ -10,6 +10,8 @@
#include <com/sun/star/drawing/Hatch.hpp>
#include <oox/token/tokens.hxx>

#include <tools/color.hxx>

using namespace com::sun::star;
using namespace oox;

diff --git a/oox/qa/unit/vba_encryption.cxx b/oox/qa/unit/vba_encryption.cxx
index 326711c..0797cc0 100644
--- a/oox/qa/unit/vba_encryption.cxx
+++ b/oox/qa/unit/vba_encryption.cxx
@@ -12,7 +12,6 @@
#include <cppunit/TestFixture.h>

#include <oox/ole/vbaexport.hxx>
#include <algorithm>

class TestVbaEncryption : public CppUnit::TestFixture
{
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index d1d1e82..1eb6fdd 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -20,7 +20,6 @@
#include <oox/core/xmlfilterbase.hxx>

#include <cstdio>
#include <set>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/Pair.hpp>
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index feec8de..7dd6530 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -16,17 +16,10 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/packages/XPackageEncryption.hpp>
#include <oox/ole/olestorage.hxx>
#include <oox/helper/binaryinputstream.hxx>
#include <filter/msfilter/mscodec.hxx>

#include <com/sun/star/task/PasswordRequestMode.hpp>
#include <comphelper/docpasswordrequest.hxx>
#include <comphelper/stillreadwriteinteraction.hxx>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/task/PasswordContainer.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>

#include <sal/log.hxx>

diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx
index 35ba44c..04a4ea7 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -23,7 +23,6 @@
#include <drawingml/textbodycontext.hxx>
#include <drawingml/chart/datasourcecontext.hxx>
#include <drawingml/chart/titlemodel.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index fe19a55..3efd648 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/drawing/BitmapMode.hpp>
#include <com/sun/star/drawing/ColorMode.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/Hatch.hpp>
#include <com/sun/star/drawing/RectanglePoint.hpp>
#include <com/sun/star/graphic/XGraphicTransformer.hpp>
#include <oox/helper/graphichelper.hxx>
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index f13cbca..491f79e 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -27,7 +27,6 @@
#include <drawingml/chart/typegroupconverter.hxx>

#include <cstdio>
#include <iterator>

#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/chart/XChartDocument.hpp>
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 00f9429..41b6fc8 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -72,7 +72,6 @@
#include <svx/unoapi.hxx>
#include <oox/export/chartexport.hxx>
#include <oox/mathml/export.hxx>
#include <drawingml/presetgeometrynames.hxx>
#include <basegfx/numeric/ftools.hxx>

using namespace ::css;
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index cadb439..3bc994a 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -47,7 +47,6 @@ using ::com::sun::star::text::WritingMode;
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
#include <sal/log.hxx>
#include <tools/long.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/propertynames.hxx>
using ::com::sun::star::uno::Any;
diff --git a/pyuno/IwyuFilter_pyuno.yaml b/pyuno/IwyuFilter_pyuno.yaml
index 7711412..c39a799 100644
--- a/pyuno/IwyuFilter_pyuno.yaml
+++ b/pyuno/IwyuFilter_pyuno.yaml
@@ -28,6 +28,8 @@ excludelist:
    - config_folders.h
    # Needed for direct member access
    - com/sun/star/container/XHierarchicalNameAccess.hpp
    # Needed for template
    - com/sun/star/script/XInvocation2.hpp
    pyuno/zipcore/python.cxx:
    # Needed on WIN32
    - tools/pathutils.hxx
diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index a92a538..a8722dd 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -31,7 +31,6 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/bootstrap.hxx>

#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/factory.hxx>

#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
index 25ae588..60bb6b3 100644
--- a/pyuno/source/module/pyuno.cxx
+++ b/pyuno/source/module/pyuno.cxx
@@ -22,7 +22,6 @@
#include <algorithm>
#include <cassert>

#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>

#include <typelib/typedescription.hxx>
diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx
index 7cd879f..b833970 100644
--- a/pyuno/source/module/pyuno_except.cxx
+++ b/pyuno/source/module/pyuno_except.cxx
@@ -18,8 +18,6 @@
 */
#include "pyuno_impl.hxx"

#include <rtl/ustrbuf.hxx>

#include <typelib/typedescription.hxx>
#include <com/sun/star/script/CannotConvertException.hpp>

diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx
index a5b127d..747e759 100644
--- a/pyuno/source/module/pyuno_struct.cxx
+++ b/pyuno/source/module/pyuno_struct.cxx
@@ -19,8 +19,6 @@

#include <sal/config.h>

#include <rtl/strbuf.hxx>

#include <com/sun/star/beans/UnknownPropertyException.hpp>
#include <com/sun/star/beans/XMaterialHolder.hpp>
#include <com/sun/star/script/CannotConvertException.hpp>
diff --git a/pyuno/source/module/pyuno_type.cxx b/pyuno/source/module/pyuno_type.cxx
index a6c1bc4..7a919c9 100644
--- a/pyuno/source/module/pyuno_type.cxx
+++ b/pyuno/source/module/pyuno_type.cxx
@@ -20,8 +20,6 @@

#include <o3tl/any.hxx>

#include <rtl/strbuf.hxx>

#include <typelib/typedescription.hxx>


diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx
index e4630db..8080704 100644
--- a/reportdesign/inc/UndoEnv.hxx
+++ b/reportdesign/inc/UndoEnv.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/report/XSection.hpp>

#include <memory>
#include <cppuhelper/implbase.hxx>
#include <svl/lstner.hxx>
#include "dllapi.h"
#include "RptPage.hxx"
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index d836213..7cca719 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/report/XShape.hpp>
#include <com/sun/star/report/XFixedLine.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
#include <sal/log.hxx>
#include <osl/diagnose.h>
#include <strings.hxx>
#include "xmlTable.hxx"
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index 0535358..da62a8a 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -25,7 +25,6 @@
#include <xmloff/xmlstyle.hxx>
#include <xmloff/prstylei.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include <sal/log.hxx>
#include "xmlEnums.hxx"
#include "xmlCell.hxx"
#include "xmlTable.hxx"
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index 184ed5d..dfb773c 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -20,7 +20,6 @@
#include "xmlfilter.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnamespace.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>

namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index ba803f1..1c1331b 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -21,7 +21,6 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnamespace.hxx>
#include <strings.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>

namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index c66453c..0a921f3 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -36,7 +36,6 @@
#include <unotools/datetime.hxx>
#include <com/sun/star/util/DateTime.hpp>
#include <rtl/math.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>

#define TYPE_DATE       1
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index af5e322..e81e783 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -45,8 +45,6 @@
#include <osl/diagnose.h>
#include <tools/color.hxx>

#include <iterator>

#define DEFAULT_LINE_WIDTH 2

namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index 716f055..eff2ef7 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -21,7 +21,6 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnamespace.hxx>
#include "xmlHelper.hxx"
#include <sal/log.hxx>
#include <osl/diagnose.h>

namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 8ef64ff..88551c9 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -20,7 +20,6 @@
#include "xmlfilter.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnamespace.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>


diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index bc08b77..a47a7ba 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -20,7 +20,6 @@
#include "xmlfilter.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnamespace.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>

namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 951e939..15ea2ac 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -28,7 +28,6 @@
#include "xmlEnums.hxx"
#include <com/sun/star/report/GroupOn.hpp>
#include <com/sun/star/report/KeepTogether.hpp>
#include <sal/log.hxx>
#include <osl/diagnose.h>

namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index 64cb935..2dfd0ac 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -23,7 +23,6 @@
#include <xmloff/xmlnamespace.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <sal/log.hxx>


namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index b719019..47adb6c 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -25,7 +25,6 @@
#include "xmlComponent.hxx"
#include "xmlCondPrtExpr.hxx"
#include "xmlFormatCondition.hxx"
#include <sal/log.hxx>
#include <osl/diagnose.h>

namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index a32b6ec..fb7d443 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -24,7 +24,6 @@
#include "xmlHelper.hxx"
#include <com/sun/star/report/ReportPrintOption.hpp>
#include "xmlTable.hxx"
#include <sal/log.hxx>
#include <osl/diagnose.h>


diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 3a882dc..55179cc 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -34,7 +34,6 @@
#include <strings.hxx>
#include <com/sun/star/report/XShape.hpp>
#include <com/sun/star/report/XFixedLine.hpp>
#include <sal/log.hxx>
#include <osl/diagnose.h>

#include <numeric>
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 487ee30..39d518f 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/document/XGraphicStorageHandler.hpp>
#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
@@ -42,7 +41,6 @@
#include <xmloff/namespacemap.hxx>
#include <xmloff/XMLFontStylesContext.hxx>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>

#include <comphelper/genericpropertyset.hxx>