Recheck modules t* with IWYU

See tdf#42949 for motivation Change-Id: I109fa07d52721fd10354de07a2ed995ffa2f27c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132369 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-03-31 23:57:29 +02:00 · 2022-03-31 23:57:29 +02:00 · 52ef78f492
commit 52ef78f492
parent f628a7dbae
65 changed files with 51 additions and 106 deletions
--- a/test/qa/cppunit/test_xpath.cxx
+++ b/test/qa/cppunit/test_xpath.cxx
@ -9,7 +9,10 @@

 #include <sal/types.h>
 #include <test/xmltesttools.hxx>
-#include <unotest/bootstrapfixturebase.hxx>
+
+#include <cppunit/TestFixture.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/plugin/TestPlugIn.h>

 class TestXPath : public CppUnit::TestFixture, public XmlTestTools
 {
--- a/test/source/diff/diff.cxx
+++ b/test/source/diff/diff.cxx
@ -17,14 +17,13 @@
 #include <set>
 #include <sstream>
 #include <cassert>
+#include <cmath>
 #include <vector>

 #if USE_CPPUNIT
 #include <cppunit/TestAssert.h>
 #endif

-#include <rtl/math.hxx>
-
 namespace {

 struct tolerance
--- a/testtools/IwyuFilter_testtools.yaml
+++ b/testtools/IwyuFilter_testtools.yaml
@ -0,0 +1,17 @@
+---
+assumeFilename: testtools/source/bridgetest/cppobj.cxx
+excludelist:
+    testtools/source/bridgetest/currentcontextchecker.hxx:
+    # Actually used
+    - test/testtools/bridgetest/XCurrentContextChecker.hpp
+    testtools/source/bridgetest/bridgetest.cxx:
+    # Needed for fw decl
+    - com/sun/star/lang/XSingleComponentFactory.hpp
+    # Actually used
+    - test/testtools/bridgetest/BadConstructorArguments.hpp
+    testtools/source/bridgetest/cppobj.cxx:
+    # Actually used
+    - test/testtools/bridgetest/XMulti.hpp
+    testtools/source/bridgetest/constructors.cxx:
+    # Actually used
+    - test/testtools/bridgetest/TestEnum.hpp
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@ -26,7 +26,6 @@
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
 #include <osl/diagnose.hxx>
-#include <osl/time.h>
 #include <sal/types.h>
 #include <typelib/typedescription.hxx>
 #include <uno/dispatcher.hxx>
@ -40,7 +39,6 @@
 #include <cppuhelper/supportsservice.hxx>

 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMain.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/bridge/UnoUrlResolver.hpp>
@ -52,7 +50,6 @@
 #include <test/testtools/bridgetest/TestPolyStruct.hpp>
 #include <test/testtools/bridgetest/XBridgeTest.hpp>
 #include <test/testtools/bridgetest/XBridgeTest2.hpp>
-#include <test/testtools/bridgetest/XMulti.hpp>

 #include "currentcontextchecker.hxx"
 #include "multi.hxx"
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@ -23,7 +23,6 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Type.hxx>
@ -34,8 +33,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/weak.hxx>
-#include <rtl/string.h>
-#include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <test/testtools/bridgetest/BadConstructorArguments.hpp>
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <stdio.h>
 #include <utility>

 #include <cppu/unotype.hxx>
@ -25,7 +24,6 @@
 #include <osl/diagnose.hxx>
 #include <osl/thread.hxx>
 #include <osl/mutex.hxx>
-#include <osl/time.h>

 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/factory.hxx>
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@ -24,13 +24,11 @@

 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/XCurrentContext.hpp>
 #include <cppu/unotype.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 #include <osl/diagnose.hxx>
-#include <rtl/string.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <test/testtools/bridgetest/XCurrentContextChecker.hpp>
--- a/testtools/source/bridgetest/currentcontextchecker.hxx
+++ b/testtools/source/bridgetest/currentcontextchecker.hxx
@ -22,7 +22,6 @@

 #include <sal/config.h>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.hxx>
 #include <sal/types.h>
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@ -22,7 +22,6 @@

 #include "multi.hxx"

-#include <rtl/string.hxx>
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>

--- a/testtools/source/bridgetest/multi.hxx
+++ b/testtools/source/bridgetest/multi.hxx
@ -23,7 +23,6 @@
 #include <sal/config.h>

 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
--- a/toolkit/IwyuFilter_toolkit.yaml
+++ b/toolkit/IwyuFilter_toolkit.yaml
@ -64,7 +64,7 @@ excludelist:
    - com/sun/star/script/XScriptEventsSupplier.hpp
    - com/sun/star/util/XCloneable.hpp
    # Needed for template classes
-    - toolkit/controls/geometrycontrolmodel_impl.hxx
+    - controls/geometrycontrolmodel_impl.hxx
    toolkit/inc/controls/roadmapcontrol.hxx:
    # base class has to be a complete type
    - com/sun/star/awt/XItemEventBroadcaster.hpp
@ -89,3 +89,15 @@ excludelist:
    - com/sun/star/container/XContainer.hpp
    - com/sun/star/container/XIdentifierContainer.hpp
    - toolkit/controls/unocontrolbase.hxx
+    toolkit/source/controls/animatedimages.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySetInfo.hpp
+    toolkit/source/awt/vclxwindow.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    toolkit/source/hatchwindow/hatchwindow.cxx:
+    # Actually used
+    - com/sun/star/embed/XHatchWindowController.hpp
+    toolkit/source/helper/servicenames.cxx:
+    # Needed for extern
+    - helper/servicenames.hxx
--- a/toolkit/inc/awt/animatedimagespeer.hxx
+++ b/toolkit/inc/awt/animatedimagespeer.hxx
@ -29,8 +29,6 @@

 #include <cppuhelper/implbase.hxx>

-#include <memory>
-
 namespace toolkit
 {

--- a/toolkit/inc/awt/vclxbitmap.hxx
+++ b/toolkit/inc/awt/vclxbitmap.hxx
@ -21,7 +21,6 @@

 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/awt/XDisplayBitmap.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/util/XAccounting.hpp>
 #include <comphelper/servicehelper.hxx>
--- a/toolkit/inc/awt/vclxgraphics.hxx
+++ b/toolkit/inc/awt/vclxgraphics.hxx
@ -25,11 +25,9 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <vcl/font.hxx>
 #include <vcl/rendercontext/RasterOp.hxx>
-#include <vcl/vclenum.hxx>
 #include <vcl/vclptr.hxx>

 #include <com/sun/star/awt/XGraphics2.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>

 #include <memory>
--- a/toolkit/inc/awt/vclxregion.hxx
+++ b/toolkit/inc/awt/vclxregion.hxx
@ -21,7 +21,6 @@


 #include <com/sun/star/awt/XRegion.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
--- a/toolkit/inc/awt/vclxwindows.hxx
+++ b/toolkit/inc/awt/vclxwindows.hxx
@ -33,7 +33,6 @@
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Date.hpp>

-#include <svl/numuno.hxx>
 #include <tools/lineend.hxx>

 #include <awt/vclxtopwindow.hxx>
--- a/toolkit/inc/controls/accessiblecontrolcontext.hxx
+++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx
@ -23,7 +23,7 @@
 #include <comphelper/accimplaccess.hxx>
 #include <comphelper/uno3.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <vcl/vclptr.hxx>
+#include <rtl/ref.hxx>

 namespace vcl { class Window; }
 namespace com::sun::star::awt { class XWindow; }
--- a/toolkit/inc/controls/animatedimages.hxx
+++ b/toolkit/inc/controls/animatedimages.hxx
@ -22,7 +22,6 @@
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <com/sun/star/awt/XAnimatedImages.hpp>
 #include <cppuhelper/implbase1.hxx>
-#include <memory>

 namespace com::sun::star::container { class XContainerListener; }
 namespace com::sun::star::uno { class XComponentContext; }
--- a/toolkit/inc/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/controls/controlmodelcontainerbase.hxx
@ -34,7 +34,6 @@
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <controls/unocontrolcontainer.hxx>
 #include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/awt/tab/XTabPageModel.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <comphelper/interfacecontainer3.hxx>
--- a/toolkit/inc/helper/msgbox.hxx
+++ b/toolkit/inc/helper/msgbox.hxx
@ -20,6 +20,7 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <helper/btndlg.hxx>
 #include <vcl/toolkit/fixed.hxx>
+#include <vcl/toolkit/vclmedit.hxx>

 // Window-Bits for MessageBoxen
 enum class MessBoxStyle
--- a/toolkit/inc/helper/servicenames.hxx
+++ b/toolkit/inc/helper/servicenames.hxx
@ -19,8 +19,6 @@

 #pragma once

-#include <sal/types.h>
-
 extern const char szServiceName_UnoControlDialog[];

 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--- a/toolkit/inc/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx
@ -20,7 +20,6 @@
 #ifndef INCLUDED_TOOLKIT_INC_HELPER_UNOPROPERTYARRAYHELPER_HXX
 #define INCLUDED_TOOLKIT_INC_HELPER_UNOPROPERTYARRAYHELPER_HXX

-#include <toolkit/dllapi.h>
 #include <cppuhelper/propshlp.hxx>

 #include <vector>
--- a/toolkit/qa/cppunit/EventContainer.cxx
+++ b/toolkit/qa/cppunit/EventContainer.cxx
@ -9,10 +9,10 @@

 #include <test/bootstrapfixture.hxx>

-#include <com/sun/star/awt/UnoControlDialog.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/script/XScriptEventsSupplier.hpp>
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@ -30,7 +30,6 @@
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <o3tl/safeint.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 #include <vcl/toolkit/throbber.hxx>
--- a/toolkit/source/awt/stylesettings.hxx
+++ b/toolkit/source/awt/stylesettings.hxx
@ -26,8 +26,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <tools/link.hxx>

-#include <memory>
-
 namespace osl
 {
    class Mutex;
--- a/toolkit/source/awt/vclxbitmap.cxx
+++ b/toolkit/source/awt/vclxbitmap.cxx
@ -18,8 +18,6 @@
 */

 #include <awt/vclxbitmap.hxx>
-#include <toolkit/helper/macros.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <tools/stream.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/BitmapTools.hxx>
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@ -26,13 +26,9 @@
 #include <toolkit/awt/vclxfont.hxx>
 #include <awt/vclxbitmap.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/helper/macros.hxx>
-#include <cppuhelper/queryinterface.hxx>

 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
-#include <vcl/print.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/metric.hxx>
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@ -24,8 +24,6 @@
 #include <comphelper/sequence.hxx>
 #include <toolkit/awt/vclxfont.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <toolkit/helper/macros.hxx>
-#include <cppuhelper/queryinterface.hxx>

 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.cxx
@ -21,9 +21,7 @@
 #include <memory>
 #include <awt/vclxgraphics.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
-#include <toolkit/helper/macros.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <cppuhelper/queryinterface.hxx>

 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@ -19,14 +19,12 @@

 #include <toolkit/awt/vclxmenu.hxx>
 #include <toolkit/helper/convert.hxx>
-#include <helper/servicenames.hxx>
 #include <toolkit/helper/vclunohelper.hxx>

 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <osl/mutex.hxx>
 #include <tools/debug.hxx>
 #include <vcl/dialoghelper.hxx>
 #include <vcl/graph.hxx>
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.cxx
@ -26,9 +26,7 @@
 #include <vcl/jobset.hxx>
 #include <vcl/oldprintadaptor.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/window.hxx>

-#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>

--- a/toolkit/source/awt/vclxregion.cxx
+++ b/toolkit/source/awt/vclxregion.cxx
@ -18,10 +18,8 @@
 */

 #include <awt/vclxregion.hxx>
-#include <toolkit/helper/macros.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>
-#include <cppuhelper/queryinterface.hxx>



--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@ -31,8 +31,6 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/system/SystemShellExecute.hpp>
-#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/resource/XStringResourceResolver.hpp>
 #include <com/sun/star/awt/ImageScaleMode.hpp>
 #include <com/sun/star/awt/XItemList.hpp>
@ -44,7 +42,6 @@
 #include <awt/vclxwindows.hxx>
 #include <controls/filectrl.hxx>
 #include <controls/svmedit.hxx>
-#include <svl/zforlist.hxx>
 #include <vcl/toolkit/button.hxx>
 #include <vcl/toolkit/fmtfield.hxx>
 #include <vcl/graph.hxx>
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@ -43,7 +43,6 @@
 #include <unordered_map>

 #include <vcl/tabctrl.hxx>
-#include <toolkit/awt/vclxwindows.hxx>
 #include <toolkit/controls/unocontrols.hxx>

 #include <awt/vclxwindows.hxx>
--- a/toolkit/source/controls/filectrl.cxx
+++ b/toolkit/source/controls/filectrl.cxx
@ -23,7 +23,6 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.h>
-#include <osl/diagnose.h>
 #include <svl/svlresid.hxx>
 #include <svl/svl.hrc>
 #include <tools/diagnose_ex.h>
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@ -19,7 +19,6 @@

 #include <controls/formattedcontrol.hxx>
 #include <toolkit/helper/property.hxx>
-#include <helper/servicenames.hxx>

 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@ -35,7 +35,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <o3tl/safeint.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>

--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@ -21,7 +21,6 @@
 #include <controls/roadmapcontrol.hxx>
 #include <controls/roadmapentry.hxx>
 #include <toolkit/helper/property.hxx>
-#include <helper/servicenames.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>

--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@ -23,7 +23,6 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>

 #include <controls/stdtabcontroller.hxx>
-#include <helper/servicenames.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/macros.hxx>
 #include <cppuhelper/supportsservice.hxx>
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.cxx
@ -22,7 +22,6 @@

 #include <controls/stdtabcontrollermodel.hxx>
 #include <toolkit/helper/macros.hxx>
-#include <helper/servicenames.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/queryinterface.hxx>

--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@ -19,13 +19,11 @@

 #include <controls/tkscrollbar.hxx>
 #include <toolkit/helper/property.hxx>
-#include <helper/servicenames.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>

 #include <toolkit/awt/vclxwindows.hxx>
-#include <vcl/window.hxx>

 #include <helper/unopropertyarrayhelper.hxx>

--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.cxx
@ -20,7 +20,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <controls/unocontrolcontainermodel.hxx>
 #include <toolkit/helper/property.hxx>
-#include <helper/servicenames.hxx>

 #include <helper/unopropertyarrayhelper.hxx>

--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@ -32,7 +32,6 @@
 #include <controls/formattedcontrol.hxx>
 #include <toolkit/controls/unocontrols.hxx>
 #include <toolkit/helper/property.hxx>
-#include <helper/servicenames.hxx>
 #include <toolkit/helper/macros.hxx>

 // for introspection
@ -43,7 +42,6 @@
 #include <comphelper/propertyvalue.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/window.hxx>

 #include <algorithm>

--- a/toolkit/source/hatchwindow/documentcloser.cxx
+++ b/toolkit/source/hatchwindow/documentcloser.cxx
@ -28,7 +28,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/interfacecontainer4.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/dialoghelper.hxx>
 #include <vcl/window.hxx>
--- a/toolkit/source/hatchwindow/hatchwindowfactory.cxx
+++ b/toolkit/source/hatchwindow/hatchwindowfactory.cxx
@ -24,7 +24,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/window.hxx>

 #include "hatchwindow.hxx"

--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@ -39,7 +39,6 @@

 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/pdfextoutdevdata.hxx>
-#include <vcl/outdev.hxx>

 #include <algorithm>
 #include <iterator>
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.cxx
@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <sal/types.h>
 #include <helper/servicenames.hxx>

 const char szServiceName_UnoControlDialog[] = "stardiv.vcl.control.Dialog";
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@ -29,8 +29,6 @@
 #include <toolkit/dllapi.h>
 #include <vcl/menu.hxx>

-#include <tools/debug.hxx>
-
 #include <helper/unowrapper.hxx>

 using namespace ::com::sun::star;
--- a/tools/IwyuFilter_tools.yaml
+++ b/tools/IwyuFilter_tools.yaml
@ -7,12 +7,20 @@ excludelist:
    - cppunit/plugin/TestPlugIn.h
    - tools/pathutils.hxx
    - cwchar
+    tools/qa/cppunit/test_cpu_runtime_detection_AVX2_check.cxx:
+    # Needed for LO_AVX2_AVAILABLE case
+    - sal/types.h
+    - tools/simdsupport.hxx
+    - stdlib.h
+    tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx:
+    # Needed for LO_SSSE3_AVAILABLE case
+    - tools/simdsupport.hxx
+    - stdlib.h
    tools/source/debug/debug.cxx:
    # Needed for linker visibility
    - tools/diagnose_ex.h
-    tools/source/generic/poly.cxx:
-    # OSL_BIGENDIAN is being checked
-    - osl/endian.h
+    # Keep for commented out "if defined __GLIBCXX__" path
+    - cxxabi.h
    tools/source/misc/extendapplicationenvironment.cxx:
    # Needed on MACOSX
    - config_folders.h
--- a/tools/qa/cppunit/test_100mm2twips.cxx
+++ b/tools/qa/cppunit/test_100mm2twips.cxx
@ -22,7 +22,6 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>

-#include <tools/helpers.hxx>
 #include <tools/UnitConversion.hxx>

 class UnitConversionTest : public CppUnit::TestFixture
--- a/tools/qa/cppunit/test_cpu_runtime_detection_AVX2.cxx
+++ b/tools/qa/cppunit/test_cpu_runtime_detection_AVX2.cxx
@ -7,13 +7,10 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <tools/simdsupport.hxx>
 #include "test_cpu_runtime_detection_x86_checks.hxx"

-#include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>

 #include <tools/cpuid.hxx>

--- a/tools/qa/cppunit/test_cpu_runtime_detection_SSE2.cxx
+++ b/tools/qa/cppunit/test_cpu_runtime_detection_SSE2.cxx
@ -7,14 +7,10 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <tools/simdsupport.hxx>
-
 #include "test_cpu_runtime_detection_x86_checks.hxx"

-#include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>

 #include <tools/cpuid.hxx>

--- a/tools/qa/cppunit/test_cpu_runtime_detection_SSE2_check.cxx
+++ b/tools/qa/cppunit/test_cpu_runtime_detection_SSE2_check.cxx
@ -7,7 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <sal/types.h>
 #include <tools/simdsupport.hxx>

 #include <stdlib.h>
--- a/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3.cxx
+++ b/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3.cxx
@ -7,14 +7,10 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <tools/simdsupport.hxx>
-
 #include "test_cpu_runtime_detection_x86_checks.hxx"

-#include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>

 #include <tools/cpuid.hxx>

--- a/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx
+++ b/tools/qa/cppunit/test_cpu_runtime_detection_SSSE3_check.cxx
@ -7,7 +7,6 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

-#include <sal/types.h>
 #include <tools/simdsupport.hxx>

 #include <stdlib.h>
--- a/tools/qa/cppunit/test_cpuid.cxx
+++ b/tools/qa/cppunit/test_cpuid.cxx
@ -10,7 +10,6 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
 #include <tools/cpuid.hxx>
 #include <rtl/ustring.hxx>

--- a/tools/qa/cppunit/test_json_writer.cxx
+++ b/tools/qa/cppunit/test_json_writer.cxx
@ -9,13 +9,10 @@

 #include <sal/config.h>

-#include <cstdlib>
-
 #include <cppunit/extensions/HelperMacros.h>
 #include <o3tl/deleter.hxx>
 #include <test/bootstrapfixture.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/stream.hxx>
 #include <tools/json_writer.hxx>

 namespace
--- a/tools/qa/cppunit/test_xmlwriter.cxx
+++ b/tools/qa/cppunit/test_xmlwriter.cxx
@ -9,7 +9,6 @@

 #include <cppunit/extensions/HelperMacros.h>
 #include <test/bootstrapfixture.hxx>
-#include <rtl/ustring.hxx>
 #include <tools/stream.hxx>
 #include <tools/XmlWriter.hxx>

--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@ -52,9 +52,6 @@
 #include <osl/thread.h>
 #include <rtl/strbuf.hxx>

-#include <cstdlib>
-#include <typeinfo>
-
 #include <tools/diagnose_ex.h>

 #if defined __GLIBCXX__
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@ -19,7 +19,6 @@

 #include <tools/fract.hxx>
 #include <tools/debug.hxx>
-#include <tools/stream.hxx>
 #include <o3tl/safeint.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@ -18,14 +18,12 @@
 */

 #include <sal/config.h>
-#include <sal/log.hxx>
+#include <rtl/string.hxx>

 #include <algorithm>
-#include <cassert>
-#include <sstream>
+#include <tuple>
 #include <o3tl/safeint.hxx>
 #include <tools/gen.hxx>
-#include <tools/stream.hxx>

 OString Pair::toString() const
 {
--- a/tools/source/generic/point.cxx
+++ b/tools/source/generic/point.cxx
@ -18,7 +18,6 @@
 */

 #include <tools/gen.hxx>
-#include <basegfx/numeric/ftools.hxx>

 void Point::RotateAround( Point& rPoint,
                          Degree10 nOrientation ) const
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@ -38,9 +38,7 @@

 #include <memory>
 #include <vector>
-#include <iterator>
 #include <algorithm>
-#include <cstdlib>
 #include <cstring>
 #include <limits.h>
 #include <cmath>
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.cxx
@ -22,7 +22,6 @@
 #include <cassert>

 #include <sal/types.h>
-#include <rtl/strbuf.hxx>
 #include <tools/inetmsg.hxx>
 #include <tools/inetstrm.hxx>

--- a/tools/source/misc/json_writer.cxx
+++ b/tools/source/misc/json_writer.cxx
@ -9,7 +9,6 @@

 #include <tools/json_writer.hxx>
 #include <stdio.h>
-#include <algorithm>
 #include <cstring>
 #include <rtl/math.hxx>