diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index f0fc1ef2a297..1a53a2de24bd 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -281,9 +281,6 @@ excludelist:
     - com/sun/star/io/XOutputStream.hpp
     - com/sun/star/io/XStream.hpp
     - com/sun/star/io/XTruncate.hpp
-    include/sax/fshelper.hxx:
-    # base class has to be a complete type
-    - com/sun/star/xml/sax/XFastAttributeList.hpp
     include/sax/fastattribs.hxx:
     # base class has to be a complete type
     - com/sun/star/xml/sax/XFastAttributeList.hpp
@@ -424,13 +421,8 @@ excludelist:
     - com/sun/star/lang/XInitialization.hpp
     - com/sun/star/lang/XServiceInfo.hpp
     - com/sun/star/lang/XUnoTunnel.hpp
-    - com/sun/star/xml/sax/XExtendedDocumentHandler.hpp
     - com/sun/star/xml/sax/XFastDocumentHandler.hpp
     - com/sun/star/xml/sax/XFastParser.hpp
-    include/svtools/asynclink.hxx:
-    # unique_ptr needs complete type
-    - osl/mutex.hxx
-    - vcl/idle.hxx
     include/svtools/cliplistener.hxx:
     # base class has to be a complete type
     - com/sun/star/datatransfer/clipboard/XClipboardListener.hpp
@@ -572,7 +564,6 @@ excludelist:
     # base class has to be a complete type
     - com/sun/star/container/XNamed.hpp
     - com/sun/star/lang/XServiceInfo.hpp
-    - com/sun/star/sdbcx/XDataDescriptorFactory.hpp
     include/drawinglayer/primitive2d/baseprimitive2d.hxx:
     # base class has to be a complete type
     - com/sun/star/graphic/XPrimitive2D.hpp
@@ -618,7 +609,6 @@ excludelist:
     - com/sun/star/rdf/XDocumentMetadataAccess.hpp
     - com/sun/star/document/XDocumentRecovery.hpp
     - com/sun/star/document/XUndoManagerSupplier.hpp
-    - com/sun/star/document/XEventBroadcaster.hpp
     - com/sun/star/document/XDocumentEventBroadcaster.hpp
     - com/sun/star/lang/XEventListener.hpp
     - com/sun/star/document/XEventsSupplier.hpp
diff --git a/include/comphelper/xmlencode.hxx b/include/comphelper/xmlencode.hxx
index 160de5c9cf42..9fbf18f8b711 100644
--- a/include/comphelper/xmlencode.hxx
+++ b/include/comphelper/xmlencode.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
 
 namespace comphelper::string
 {
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index a1a68e337e5e..e441812a9999 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX
 #define INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX
 
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/broadcasthelper.hxx>
 #include <connectivity/CommonTools.hxx>
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 74e2ed4e3254..5006a584d352 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SAX_FSHELPER_HXX
 #define INCLUDED_SAX_FSHELPER_HXX
 
-#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index de7661104451..9a07c16c0c23 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/document/XDocumentRecovery2.hpp>
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/document/XShapeEventBroadcaster.hpp>
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx
index ae5139e3206b..ee45d0151d82 100644
--- a/include/svtools/asynclink.hxx
+++ b/include/svtools/asynclink.hxx
@@ -22,7 +22,6 @@
 #include <config_options.h>
 #include <svtools/svtdllapi.h>
 #include <tools/link.hxx>
-#include <vcl/idle.hxx>
 #include <mutex>
 
 class Timer;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index b4616056c4ec..cac67404450b 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -29,8 +29,8 @@
 #include <o3tl/deleter.hxx>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
+#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XImporter.hpp>