diff --git a/embeddedobj/IwyuFilter_embeddedobj.yaml b/embeddedobj/IwyuFilter_embeddedobj.yaml
new file mode 100644
index 000000000000..c9f9c5a02ae2
--- /dev/null
+++ b/embeddedobj/IwyuFilter_embeddedobj.yaml
@@ -0,0 +1,5 @@
+---
+assumeFilename: embeddedobj/source/commonembedding/embedobj.cxx
+blacklist:
+    embeddedobj/qa/cppunit/general.cxx:
+    - comphelper/scopeguard.hxx
diff --git a/svx/qa/unit/unodraw.cxx b/svx/qa/unit/unodraw.cxx
index b4e1b9c26b93..6d3f23175b74 100644
--- a/svx/qa/unit/unodraw.cxx
+++ b/svx/qa/unit/unodraw.cxx
@@ -14,7 +14,7 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 
 #include <comphelper/processfactory.hxx>
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx b/sw/qa/extras/uiwriter/uiwriter2.cxx
index fa2a6079c8d4..5ac978713b17 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -39,7 +39,6 @@
 #include <svl/stritem.hxx>
 #include <svx/svxids.hrc>
 #include <comphelper/lok.hxx>
-#include <comphelper/propertyvalue.hxx>
 #include <txtfrm.hxx>
 #include <redline.hxx>
 #include <view.hxx>
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index 80557c1091e2..6ace744ec1eb 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -17,8 +17,6 @@
 #include <fpdf_save.h>
 #endif
 
-#include <impgraph.hxx>
-
 #include <vcl/graph.hxx>
 #include <bitmapwriteaccess.hxx>
 #include <unotools/ucbstreamhelper.hxx>
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index deb8cf2f2032..982e06523c64 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -39,7 +39,6 @@
 #include <osl/file.hxx>
 #include <osl/process.h>
 #include <osl/thread.hxx>
-#include <comphelper/sequence.hxx>
 #include <comphelper/ofopxmlhelper.hxx>
 #include <unotools/streamwrap.hxx>