Remove some unused includes

Mostly com/sun/star/frame/Desktop.hpp is unused after inheriting from UnoApiTest. Change-Id: Ifba307353a11a14e033a230a291314bee86b51c8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143190 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-11-23 20:22:00 +01:00 · 2022-11-23 20:22:00 +01:00 · c130063895
commit c130063895
parent 8ba1c4e273
56 changed files with 10 additions and 118 deletions
--- a/cppcanvas/qa/extras/emfplus/emfplus.cxx
+++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx
@ -7,13 +7,10 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <com/sun/star/frame/Desktop.hpp>
+#include <test/unoapi_test.hxx>

-#include <comphelper/processfactory.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxbasemodel.hxx>
-#include <test/unoapi_test.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
 #include <vcl/gdimtf.hxx>
--- a/embeddedobj/qa/cppunit/general.cxx
+++ b/embeddedobj/qa/cppunit/general.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/embed/XStorage.hpp>

 #include <comphelper/embeddedobjectcontainer.hxx>
--- a/filter/IwyuFilter_filter.yaml
+++ b/filter/IwyuFilter_filter.yaml
@ -4,9 +4,6 @@ excludelist:
    filter/source/graphicfilter/icgm/cgm.cxx:
    # OSL_BIGENDIAN is being checked
    - osl/endian.h
-    filter/source/graphicfilter/ieps/ieps.cxx:
-    # Needed on WIN32
-    - o3tl/char16_t2wchar_t.hxx
    filter/source/msfilter/mscodec.cxx:
    # Actually used
    - com/sun/star/beans/NamedValue.hpp
--- a/filter/qa/pdf.cxx
+++ b/filter/qa/pdf.cxx
@ -11,7 +11,6 @@

 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/xml/crypto/SEInitializer.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
--- a/filter/qa/unit/svg.cxx
+++ b/filter/qa/unit/svg.cxx
@ -9,11 +9,8 @@

 #include <sal/config.h>

-#include <string_view>
-
 #include <test/unoapixml_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
--- a/filter/qa/unit/textfilterdetect.cxx
+++ b/filter/qa/unit/textfilterdetect.cxx
@ -10,7 +10,6 @@
 #include <test/unoapi_test.hxx>

 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/sheet/XCellRangesAccess.hpp>
--- a/oox/qa/unit/drawingml.cxx
+++ b/oox/qa/unit/drawingml.cxx
@ -16,8 +16,6 @@
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
@ -32,8 +30,6 @@
 #include <com/sun/star/table/XCellRange.hpp>

 #include <comphelper/sequenceashashmap.hxx>
-#include <unotools/mediadescriptor.hxx>
-#include <unotools/tempfile.hxx>

 using namespace ::com::sun::star;

--- a/oox/qa/unit/export.cxx
+++ b/oox/qa/unit/export.cxx
@ -9,12 +9,6 @@

 #include <test/unoapixml_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-
-#include <unotools/mediadescriptor.hxx>
-#include <unotools/tempfile.hxx>
-
 using namespace ::com::sun::star;

 namespace
--- a/oox/qa/unit/mathml.cxx
+++ b/oox/qa/unit/mathml.cxx
@ -10,7 +10,6 @@
 #include <test/unoapi_test.hxx>

 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/frame/Desktop.hpp>

 using namespace ::com::sun::star;

--- a/oox/qa/unit/shape.cxx
+++ b/oox/qa/unit/shape.cxx
@ -9,15 +9,14 @@

 #include <sal/config.h>

-#include <string_view>
-
 #include <test/unoapi_test.hxx>

+#include <string_view>
+
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/XTextRange.hpp>

--- a/oox/qa/unit/vml.cxx
+++ b/oox/qa/unit/vml.cxx
@ -9,8 +9,6 @@

 #include <sal/config.h>

-#include <string_view>
-
 #include <test/unoapi_test.hxx>

 #include <com/sun/star/beans/XPropertySet.hpp>
@ -20,7 +18,6 @@
 #include <com/sun/star/drawing/PolygonKind.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/drawing/ColorMode.hpp>

--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@ -22,7 +22,6 @@
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
-#include <svx/svdtrans.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
@ -30,6 +29,7 @@
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <drawingml/textbody.hxx>
 #include <drawingml/textbodyproperties.hxx>
+#include <tools/helpers.hxx>

 #include <optional>

--- a/sd/qa/filter/eppt/eppt.cxx
+++ b/sd/qa/filter/eppt/eppt.cxx
@ -12,13 +12,10 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XMasterPageTarget.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/util/Color.hpp>

-#include <unotools/mediadescriptor.hxx>
-#include <unotools/tempfile.hxx>
 #include <test/xmldocptr.hxx>
+#include <comphelper/sequenceashashmap.hxx>

 using namespace ::com::sun::star;

--- a/sfx2/qa/cppunit/doc.cxx
+++ b/sfx2/qa/cppunit/doc.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>

--- a/sfx2/qa/cppunit/view.cxx
+++ b/sfx2/qa/cppunit/view.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/drawing/XDrawView.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

--- a/svx/qa/unit/core.cxx
+++ b/svx/qa/unit/core.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>

 #include <comphelper/storagehelper.hxx>
--- a/svx/qa/unit/sdr.cxx
+++ b/svx/qa/unit/sdr.cxx
@ -11,7 +11,6 @@

 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/frame/Desktop.hpp>

 #include <drawinglayer/tools/primitive2dxmldump.hxx>
 #include <rtl/ustring.hxx>
--- a/svx/qa/unit/styles.cxx
+++ b/svx/qa/unit/styles.cxx
@ -10,7 +10,6 @@
 #include <test/unoapi_test.hxx>

 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XMasterPageTarget.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
--- a/svx/qa/unit/svdraw.cxx
+++ b/svx/qa/unit/svdraw.cxx
@ -12,8 +12,6 @@
 #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/frame/XStorable.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
@ -26,7 +24,6 @@
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/unopage.hxx>
 #include <svx/svdview.hxx>
@ -36,7 +33,6 @@
 #include <sfx2/viewsh.hxx>
 #include <svl/itempool.hxx>
 #include <svx/svdomedia.hxx>
-#include <unotools/mediadescriptor.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>

 #include <sdr/contact/objectcontactofobjlistpainter.hxx>
--- a/svx/qa/unit/table.cxx
+++ b/svx/qa/unit/table.cxx
@ -11,7 +11,6 @@

 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/frame/Desktop.hpp>

 #include <drawinglayer/tools/primitive2dxmldump.hxx>
 #include <rtl/ustring.hxx>
--- a/svx/qa/unit/unodraw.cxx
+++ b/svx/qa/unit/unodraw.cxx
@ -11,7 +11,6 @@

 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#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/XControlModel.hpp>
--- a/svx/qa/unit/xml.cxx
+++ b/svx/qa/unit/xml.cxx
@ -11,7 +11,6 @@

 #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/beans/XPropertySet.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>

--- a/svx/qa/unit/xoutdev.cxx
+++ b/svx/qa/unit/xoutdev.cxx
@ -9,13 +9,11 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>

 #include <sal/types.h>
 #include <tools/stream.hxx>
-#include <unotest/directories.hxx>
 #include <unotools/tempfile.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
--- a/sw/qa/core/crsr/crsr.cxx
+++ b/sw/qa/core/crsr/crsr.cxx
@ -19,7 +19,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <svl/srchitem.hxx>
 #include <vcl/scheduler.hxx>
-#include <comphelper/propertyvalue.hxx>

 #include <docsh.hxx>
 #include <unotxdoc.hxx>
--- a/sw/qa/core/draw/draw.cxx
+++ b/sw/qa/core/draw/draw.cxx
@ -10,7 +10,6 @@
 #include <swmodeltestbase.hxx>

 #include <svx/svdpage.hxx>
-#include <unotools/mediadescriptor.hxx>

 #include <IDocumentDrawModelAccess.hxx>
 #include <docsh.hxx>
@ -19,7 +18,6 @@
 #include <frameformats.hxx>
 #include <textboxhelper.hxx>

-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/text/XTextFramesSupplier.hpp>

--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@ -17,7 +17,6 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
 #include <comphelper/propertyvalue.hxx>
-#include <unotools/mediadescriptor.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/wghtitem.hxx>

--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@ -13,7 +13,6 @@
 #include <com/sun/star/linguistic2/XHyphenator.hpp>

 #include <comphelper/scopeguard.hxx>
-#include <comphelper/propertysequence.hxx>
 #include <comphelper/sequence.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <editeng/unolingu.hxx>
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@ -14,7 +14,6 @@
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <comphelper/propertysequence.hxx>
-#include <unotools/mediadescriptor.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <vcl/scheduler.hxx>
 #include <vcl/settings.hxx>
--- a/sw/qa/filter/html/html.cxx
+++ b/sw/qa/filter/html/html.cxx
@ -9,7 +9,6 @@

 #include <swmodeltestbase.hxx>

-#include <comphelper/propertyvalue.hxx>
 #include <vcl/gdimtf.hxx>

 #include <docsh.hxx>
--- a/sw/qa/unit/swmodeltestbase.cxx
+++ b/sw/qa/unit/swmodeltestbase.cxx
@ -12,21 +12,14 @@
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>

-#include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
-#include <officecfg/Office/Common.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <sfx2/app.hxx>
-#include <unotools/mediadescriptor.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <vcl/filter/PDFiumLibrary.hxx>

 #include <IDocumentLayoutAccess.hxx>
 #include <docsh.hxx>
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@ -36,7 +36,6 @@
 #include <editeng/memberids.h>
 #include <svx/svdoashp.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/svdogrp.hxx>
 #include <svl/itemiter.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <sal/log.hxx>
--- a/sw/source/core/unocore/unolinebreak.cxx
+++ b/sw/source/core/unocore/unolinebreak.cxx
@ -20,7 +20,6 @@
 #include <unolinebreak.hxx>

 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <sal/log.hxx>
 #include <svl/listener.hxx>
--- a/vcl/IwyuFilter_vcl.yaml
+++ b/vcl/IwyuFilter_vcl.yaml
@ -10,12 +10,6 @@ excludelist:
    vcl/inc/headless/svpinst.hxx:
    # Don't propose hxx -> h change in URE libs
    - osl/thread.hxx
-    vcl/inc/opengl/RenderList.hxx:
-    # Don't replace with impl. details
-    - glm/glm.hpp
-    vcl/inc/opengl/VertexUtils.hxx:
-    # Don't replace with impl. details
-    - glm/gtx/norm.hpp
    vcl/inc/unx/gendata.hxx:
    # Don't propose hxx -> h change in URE libs
    - osl/socket.hxx
@ -53,9 +47,6 @@ excludelist:
    vcl/source/filter/wmf/wmfexternal.cxx:
    # Actually these are used
    - com/sun/star/beans/PropertyValue.hpp
-    vcl/source/font/fontselect.cxx:
-    # Needed on WIN32
-    - PhysicalFontFace.hxx
    vcl/source/fontsubset/sft.cxx:
    # OSL_BIGENDIAN is being checked
    - osl/endian.h
--- a/vcl/qa/cppunit/gen/gen.cxx
+++ b/vcl/qa/cppunit/gen/gen.cxx
@ -7,13 +7,10 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <com/sun/star/frame/Desktop.hpp>
+#include <test/unoapi_test.hxx>

-#include <comphelper/processfactory.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxbasemodel.hxx>
-#include <test/unoapi_test.hxx>
 #include <vcl/BitmapReadAccess.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/virdev.hxx>
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@ -9,7 +9,6 @@

 #include <vcl/filter/pdfdocument.hxx>
 #include <pdf/pdfcompat.hxx>
-#include <config_features.h>

 #include <map>
 #include <memory>
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@ -18,7 +18,6 @@

 #include <vcl/filter/PDFiumLibrary.hxx>
 #include <sal/log.hxx>
-#include <o3tl/string_view.hxx>

 using namespace com::sun::star;

--- a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
@ -10,7 +10,6 @@
 #include <test/unoapi_test.hxx>

 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/style/BreakType.hpp>
--- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
@ -13,7 +13,6 @@
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
--- a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
--- a/writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx
@ -13,7 +13,6 @@

 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>

 using namespace com::sun::star;
--- a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
@ -10,7 +10,6 @@
 #include <test/unoapi_test.hxx>

 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>

 using namespace ::com::sun::star;
--- a/writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfdispatchsymbol.cxx
@ -9,10 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>

 using namespace ::com::sun::star;
--- a/writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfdispatchvalue.cxx
@ -10,7 +10,6 @@
 #include <test/unoapi_test.hxx>

 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>

--- a/writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl.cxx
@ -11,7 +11,6 @@

 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
--- a/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/ColorMode.hpp>
--- a/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx
@ -11,7 +11,6 @@

 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>

 using namespace ::com::sun::star;
--- a/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtftokenizer.cxx
@ -9,7 +9,6 @@

 #include <test/unoapi_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>

 using namespace ::com::sun::star;
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@ -9,12 +9,13 @@

 #include <sal/config.h>

+#include <test/unoapixml_test.hxx>
+
 #include <string_view>

 #include <libepubgen/libepubgen.h>

 #include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/packages/zip/ZipFileAccess.hpp>
@ -22,7 +23,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/string.hxx>
 #include <o3tl/safeint.hxx>
-#include <test/unoapixml_test.hxx>
 #include <unotools/docinfohelper.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/tempfile.hxx>
--- a/xmloff/qa/unit/draw.cxx
+++ b/xmloff/qa/unit/draw.cxx
@ -11,8 +11,6 @@

 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeMetalType.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
@ -25,9 +23,8 @@

 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequence.hxx>
-#include <unotools/mediadescriptor.hxx>
+#include <comphelper/sequenceashashmap.hxx>
 #include <unotools/tempfile.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <unotools/saveopt.hxx>
 #include <svx/unopage.hxx>
 #include <svx/svdpage.hxx>
--- a/xmloff/qa/unit/style.cxx
+++ b/xmloff/qa/unit/style.cxx
@ -9,22 +9,13 @@

 #include <sal/config.h>

-#include <string_view>
-
 #include <test/unoapixml_test.hxx>

-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>

-#include <comphelper/propertysequence.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <unotools/mediadescriptor.hxx>
-#include <unotools/saveopt.hxx>
-#include <unotools/tempfile.hxx>
-#include <unotools/ucbstreamhelper.hxx>
 #include <rtl/character.hxx>

 using namespace ::com::sun::star;
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@ -11,7 +11,6 @@

 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/BibliographyDataType.hpp>
@ -22,7 +21,6 @@
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <unotools/tempfile.hxx>
-#include <unotools/ucbstreamhelper.hxx>

 using namespace ::com::sun::star;

--- a/xmlsecurity/IwyuFilter_xmlsecurity.yaml
+++ b/xmlsecurity/IwyuFilter_xmlsecurity.yaml
@ -68,9 +68,6 @@ excludelist:
    - com/sun/star/security/XCertificate.hpp
    - com/sun/star/lang/XUnoTunnel.hpp
    - com/sun/star/lang/XServiceInfo.hpp
-    xmlsecurity/source/gpg/GpgComponentFactory.cxx:
-    # Silence warning due to incorrect include path
-    - com/sun/star/lang/XSingleServiceFactory.hpp
    xmlsecurity/source/gpg/SecurityEnvironment.hxx:
    # Base class needs complete type
    - com/sun/star/xml/crypto/XSecurityEnvironment.hpp
--- a/xmlsecurity/source/helper/documentsignaturemanager.cxx
+++ b/xmlsecurity/source/helper/documentsignaturemanager.cxx
@ -25,7 +25,7 @@
 #include <com/sun/star/embed/StorageFormats.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/io/TempFile.hpp>
+#include <com/sun/star/io/XTempFile.hpp>
 #include <com/sun/star/io/XTruncate.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/xml/crypto/SEInitializer.hpp>