diff --git a/unotest/IwyuFilter_unotest.yaml b/unotest/IwyuFilter_unotest.yaml
new file mode 100644
index 000000000000..c4f80bf0e645
--- /dev/null
+++ b/unotest/IwyuFilter_unotest.yaml
@@ -0,0 +1,2 @@
+---
+assumeFilename: unotest/source/cpp/officeconnection.cxx
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx
index 9f0f0766807a..4b93b1d6de94 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -10,7 +10,6 @@
 #include <sal/config.h>
 
 #include <unotest/bootstrapfixturebase.hxx>
-#include <rtl/bootstrap.hxx>
 #include <comphelper/processfactory.hxx>
 #include <basic/sbstar.hxx>
 
diff --git a/unotest/source/cpp/getargument.cxx b/unotest/source/cpp/getargument.cxx
index 61277f8a849a..007cc775b7d7 100644
--- a/unotest/source/cpp/getargument.cxx
+++ b/unotest/source/cpp/getargument.cxx
@@ -21,7 +21,6 @@
 
 #include <osl/diagnose.h>
 #include <rtl/bootstrap.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 
 #include "getargument.hxx"
diff --git a/unotest/source/cpp/getargument.hxx b/unotest/source/cpp/getargument.hxx
index f0a1954229b7..97f2b89f32d1 100644
--- a/unotest/source/cpp/getargument.hxx
+++ b/unotest/source/cpp/getargument.hxx
@@ -22,6 +22,8 @@
 
 #include <sal/config.h>
 
+#include <rtl/ustring.hxx>
+
 namespace test {
 
 namespace detail {
diff --git a/unotest/source/cpp/gettestargument.cxx b/unotest/source/cpp/gettestargument.cxx
index 39e4fe23f7dc..93ba6dbe639d 100644
--- a/unotest/source/cpp/gettestargument.cxx
+++ b/unotest/source/cpp/gettestargument.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <unotest/gettestargument.hxx>
 
diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx
index 5b5804c309ab..20c56950fcaf 100644
--- a/unotest/source/cpp/macros_test.cxx
+++ b/unotest/source/cpp/macros_test.cxx
@@ -11,14 +11,12 @@
 
 #include <vector>
 
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/DispatchHelper.hpp>
 
 #include <basic/basrdll.hxx>
 #include <cppunit/TestAssert.h>
-#include <rtl/ustrbuf.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx
index c85ad7b72e5f..f89465b2c492 100644
--- a/unotest/source/cpp/officeconnection.cxx
+++ b/unotest/source/cpp/officeconnection.cxx
@@ -30,7 +30,6 @@
 #include <osl/test/uniquepipename.hxx>
 #include <osl/time.h>
 #include <sal/macros.h>
-#include <sal/types.h>
 #include <unotest/officeconnection.hxx>
 #include <unotest/toabsolutefileurl.hxx>
 
diff --git a/unotest/source/cpp/toabsolutefileurl.cxx b/unotest/source/cpp/toabsolutefileurl.cxx
index 27091a986d13..ea8b6f66c22b 100644
--- a/unotest/source/cpp/toabsolutefileurl.cxx
+++ b/unotest/source/cpp/toabsolutefileurl.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <osl/file.hxx>
 #include <osl/process.h>
 #include <rtl/ustring.hxx>
diff --git a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
index 56d6da9f3e4e..5ad175b9d0ef 100644
--- a/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
+++ b/unotest/source/cpp/unobootstrapprotector/unobootstrapprotector.cxx
@@ -17,29 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <limits>
-#include <string>
-#include <iostream>
-
 #include <com/sun/star/uno/Exception.hpp>
 
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/exc_hlp.hxx>
-#include <cppunit/Message.h>
-#include <osl/thread.h>
-#include <rtl/string.hxx>
-#include <rtl/ustring.h>
-#include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-#include <cppunittester/protectorfactory.hxx>
+#include <cppunit/Protector.h>
 
 namespace {
 
diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index 2230f8465671..36da0debf56d 100644
--- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <string>
-#include <iostream>
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Exception.hpp>
@@ -26,11 +25,10 @@
 #include <cppunit/Message.h>
 #include <osl/thread.h>
 #include <rtl/string.hxx>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 
-#include <cppunittester/protectorfactory.hxx>
+#include <cppunit/Protector.h>
 
 namespace {