diff --git a/dbaccess/IwyuFilter_dbaccess.yaml b/dbaccess/IwyuFilter_dbaccess.yaml
index 7d0e1f9c085e..18b61f7376d8 100644
--- a/dbaccess/IwyuFilter_dbaccess.yaml
+++ b/dbaccess/IwyuFilter_dbaccess.yaml
@@ -1,18 +1,6 @@
 ---
 assumeFilename: dbaccess/source/ui/querydesign/QueryDesignView.cxx
 excludelist:
-    dbaccess/source/inc/dbu_reghelper.hxx:
-    # Needed for registrationhelper.hxx
-    - com/sun/star/lang/XSingleServiceFactory.hpp
-    - com/sun/star/lang/XMultiServiceFactory.hpp
-    - rtl/ustring.hxx
-    - cppuhelper/factory.hxx
-    dbaccess/source/inc/flt_reghelper.hxx:
-    # Needed for registrationhelper.hxx
-    - com/sun/star/lang/XSingleServiceFactory.hpp
-    - com/sun/star/lang/XMultiServiceFactory.hpp
-    - rtl/ustring.hxx
-    - cppuhelper/factory.hxx
     dbaccess/inc/strings.hrc:
     # Needed for TranslateId macro to work
     - unotools/resmgr.hxx
@@ -68,12 +56,6 @@ excludelist:
     dbaccess/source/filter/xml/xmlExport.cxx:
     # Needed for template
     - com/sun/star/frame/XModel.hpp
-    dbaccess/source/shared/flt_reghelper.cxx:
-    # Needed for weird included cxx file
-    - comphelper/sequence.hxx
-    dbaccess/source/shared/dbu_reghelper.cxx:
-    # Needed for weird included cxx file
-    - comphelper/sequence.hxx
     dbaccess/source/ui/app/AppDetailPageHelper.cxx:
     # Actually used
     - com/sun/star/sdbc/XConnection.hpp
diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx
index 39705f549574..71bf28868891 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -10,17 +10,13 @@
 #include <sal/config.h>
 #include <test/unoapi_test.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 
-#include <vcl/svapp.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx b/dbaccess/qa/extras/empty-stdlib-save.cxx
index d3b383d1fa88..ae9a9234dca9 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -9,16 +9,12 @@
 
 #include <sal/config.h>
 #include <test/unoapi_test.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 
-#include <vcl/svapp.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
diff --git a/dbaccess/qa/extras/macros-test.cxx b/dbaccess/qa/extras/macros-test.cxx
index 296c4e4b1f04..7545d6168e74 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -9,7 +9,6 @@
 
 #include <sal/config.h>
 #include <test/unoapi_test.hxx>
-#include <com/sun/star/util/XCloseable.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx
index bf6093c96875..f5e83769c645 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -9,16 +9,12 @@
 
 #include <sal/config.h>
 #include <test/unoapi_test.hxx>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 
-#include <vcl/svapp.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
diff --git a/dbaccess/qa/extras/rowsetclones.cxx b/dbaccess/qa/extras/rowsetclones.cxx
index be4e52d3cd35..0afcd5220c21 100644
--- a/dbaccess/qa/extras/rowsetclones.cxx
+++ b/dbaccess/qa/extras/rowsetclones.cxx
@@ -10,7 +10,6 @@
 #include <sal/config.h>
 #include <test/unoapi_test.hxx>
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>