11 files changed, 11 insertions, 48 deletions
diff --git a/connectivity/IwyuFilter_connectivity.yaml b/connectivity/IwyuFilter_connectivity.yaml
index 7b5cba571001..969f545b3240 100644
--- a/connectivity/IwyuFilter_connectivity.yaml
+++ b/connectivity/IwyuFilter_connectivity.yaml
@@ -71,3 +71,5 @@ blacklist:
     connectivity/source/drivers/odbc/OTools.cxx:
     # OSL_BIGENDIAN is being checked
     - osl/endian.h
+    connectivity/source/drivers/writer/WDatabaseMetaData.cxx:
+    - com/sun/star/text/XTextDocument.hpp
diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index b347d5726d8d..c4c6b30dfc63 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -14,7 +14,6 @@
 #include <svtools/rtfkeywd.hxx>
 #include <rtl/character.hxx>
 #include <tools/stream.hxx>
-#include <sot/stg.hxx>
 #include <sot/storage.hxx>
 
 namespace
diff --git a/svx/qa/unit/sdr.cxx b/svx/qa/unit/sdr.cxx
index a83ad564f33f..18cfd8400ab9 100644
--- a/svx/qa/unit/sdr.cxx
+++ b/svx/qa/unit/sdr.cxx
@@ -11,11 +11,9 @@
 #include <unotest/macros_test.hxx>
 #include <test/xmltesttools.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
 
 #include <drawinglayer/tools/primitive2dxmldump.hxx>
 #include <rtl/ustring.hxx>
diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 860950e24c04..be357a95d7c0 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -742,3 +742,9 @@ blacklist:
     sw/source/ui/vba/vbatabstops.cxx:
     # Actually needed
     - com/sun/star/beans/XPropertySet.hpp
+    sw/source/filter/rtf/swparrtf.cxx:
+    - com/sun/star/frame/XModel.hpp
+    sw/source/filter/ww8/docxtablestyleexport.cxx:
+    - com/sun/star/frame/XModel.hpp
+    sw/source/filter/ww8/rtfexport.cxx:
+    - com/sun/star/frame/XModel.hpp
diff --git a/sw/qa/core/frmedt/frmedt.cxx b/sw/qa/core/frmedt/frmedt.cxx
index 87d482eaa09e..c737187887c9 100644
--- a/sw/qa/core/frmedt/frmedt.cxx
+++ b/sw/qa/core/frmedt/frmedt.cxx
@@ -19,7 +19,6 @@
 #include <drawdoc.hxx>
 #include <dcontact.hxx>
 #include <frameformats.hxx>
-#include <pagefrm.hxx>
 
 static char const DATA_DIRECTORY[] = "/sw/qa/core/frmedt/data/";
 
diff --git a/sw/qa/core/objectpositioning/objectpositioning.cxx b/sw/qa/core/objectpositioning/objectpositioning.cxx
index a000f1c80634..d0431764b5ba 100644
--- a/sw/qa/core/objectpositioning/objectpositioning.cxx
+++ b/sw/qa/core/objectpositioning/objectpositioning.cxx
@@ -11,18 +11,7 @@
 
 #include <com/sun/star/text/VertOrientation.hpp>
 
-#include <comphelper/classids.hxx>
-#include <svtools/embedhlp.hxx>
-#include <svx/svdpage.hxx>
-#include <tools/globname.hxx>
-#include <unotest/bootstrapfixturebase.hxx>
-#include <vcl/gdimtf.hxx>
-
 #include <wrtsh.hxx>
-#include <fmtanchr.hxx>
-#include <IDocumentDrawModelAccess.hxx>
-#include <drawdoc.hxx>
-#include <dcontact.hxx>
 
 static char const DATA_DIRECTORY[] = "/sw/qa/core/objectpositioning/data/";
 
diff --git a/sw/qa/core/txtnode/txtnode.cxx b/sw/qa/core/txtnode/txtnode.cxx
index c51bdefcfb42..0638fe742ff3 100644
--- a/sw/qa/core/txtnode/txtnode.cxx
+++ b/sw/qa/core/txtnode/txtnode.cxx
@@ -9,19 +9,8 @@
 
 #include <swmodeltestbase.hxx>
 
-#include <comphelper/classids.hxx>
-#include <svtools/embedhlp.hxx>
-#include <svx/svdpage.hxx>
-#include <tools/globname.hxx>
-#include <unotest/bootstrapfixturebase.hxx>
 #include <vcl/gdimtf.hxx>
 
-#include <wrtsh.hxx>
-#include <fmtanchr.hxx>
-#include <IDocumentDrawModelAccess.hxx>
-#include <drawdoc.hxx>
-#include <dcontact.hxx>
-
 static char const DATA_DIRECTORY[] = "/sw/qa/core/txtnode/data/";
 
 /// Covers sw/source/core/txtnode/ fixes.
diff --git a/sw/qa/uibase/dochdl/dochdl.cxx b/sw/qa/uibase/dochdl/dochdl.cxx
index 07e50a78df36..26f8fe502e50 100644
--- a/sw/qa/uibase/dochdl/dochdl.cxx
+++ b/sw/qa/uibase/dochdl/dochdl.cxx
@@ -9,23 +9,9 @@
 
 #include <swmodeltestbase.hxx>
 
-#include <sfx2/dispatch.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <vcl/GraphicObject.hxx>
-#include <svx/svdpage.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/adjustitem.hxx>
-#include <editeng/outlobj.hxx>
-#include <editeng/editobj.hxx>
 #include <vcl/transfer.hxx>
 
-#include <IDocumentContentOperations.hxx>
-#include <cmdid.h>
-#include <fmtanchr.hxx>
-#include <view.hxx>
 #include <wrtsh.hxx>
-#include <IDocumentDrawModelAccess.hxx>
-#include <drawdoc.hxx>
 #include <swdtflvr.hxx>
 
 /// Covers sw/source/uibase/dochdl/ fixes.
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 2738e96b403f..d6b0fc79b21a 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -17,7 +17,7 @@
 #include <osl/thread.h>
 #include <sal/log.hxx>
 #include <rtl/tencinfo.h>
-#include <tools/mapunit.hxx>
+#include <tools/UnitConversion.hxx>
 
 #include <ooxml/resourceids.hxx>
 
diff --git a/writerperfect/IwyuFilter_writerperfect.yaml b/writerperfect/IwyuFilter_writerperfect.yaml
index 221ae69eacdb..86b497dfffa0 100644
--- a/writerperfect/IwyuFilter_writerperfect.yaml
+++ b/writerperfect/IwyuFilter_writerperfect.yaml
@@ -198,3 +198,5 @@ blacklist:
     writerperfect/source/writer/EPUBExportFilter.cxx:
     # Actually used
     - com/sun/star/uno/XComponentContext.hpp
+    writerperfect/source/writer/EPUBPackage.cxx:
+    - com/sun/star/embed/XStorage.hpp
diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx
index 0cb37346cc92..4a5b7af616c1 100644
--- a/xmloff/qa/unit/style.cxx
+++ b/xmloff/qa/unit/style.cxx
@@ -11,15 +11,8 @@
 #include <unotest/macros_test.hxx>
 
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 
-#include <comphelper/embeddedobjectcontainer.hxx>
-#include <comphelper/propertyvalue.hxx>
-#include <comphelper/scopeguard.hxx>
-#include <comphelper/storagehelper.hxx>
-#include <officecfg/Office/Common.hxx>
-
 using namespace ::com::sun::star;
 
 char const DATA_DIRECTORY[] = "/xmloff/qa/unit/data/";