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>

38 files changed, 16 insertions, 55 deletions

diff --git a/toolkit/IwyuFilter_toolkit.yaml b/toolkit/IwyuFilter_toolkit.yaml
index 386154c6c90e..6606014d2958 100644
--- 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
diff --git a/toolkit/inc/awt/animatedimagespeer.hxx b/toolkit/inc/awt/animatedimagespeer.hxx
index 71861f8b3e38..839e249b3ff8 100644
--- a/toolkit/inc/awt/animatedimagespeer.hxx
+++ b/toolkit/inc/awt/animatedimagespeer.hxx
@@ -29,8 +29,6 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <memory>
-
 namespace toolkit
 {
 
diff --git a/toolkit/inc/awt/vclxbitmap.hxx b/toolkit/inc/awt/vclxbitmap.hxx
index 97475d7000c8..6cf8928e06c4 100644
--- 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>
diff --git a/toolkit/inc/awt/vclxgraphics.hxx b/toolkit/inc/awt/vclxgraphics.hxx
index 68902084ff24..ff697ead31b4 100644
--- 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>
diff --git a/toolkit/inc/awt/vclxregion.hxx b/toolkit/inc/awt/vclxregion.hxx
index 4ba3211cc2c7..70b79990c0b3 100644
--- 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>
diff --git a/toolkit/inc/awt/vclxwindows.hxx b/toolkit/inc/awt/vclxwindows.hxx
index c5f157aef9f8..21950271e95e 100644
--- 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>
diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx
index ea4f959b853e..d5233cc54d52 100644
--- 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; }
diff --git a/toolkit/inc/controls/animatedimages.hxx b/toolkit/inc/controls/animatedimages.hxx
index 0afd921f478a..a341447c5366 100644
--- 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; }
diff --git a/toolkit/inc/controls/controlmodelcontainerbase.hxx b/toolkit/inc/controls/controlmodelcontainerbase.hxx
index 768474ffd116..1bbc3f301b16 100644
--- 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>
diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx
index 097aa37bc04e..cef129cf4517 100644
--- 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
diff --git a/toolkit/inc/helper/servicenames.hxx b/toolkit/inc/helper/servicenames.hxx
index cd888c94d2eb..7fb7ab2a573c 100644
--- 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: */
diff --git a/toolkit/inc/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx
index 29c87099a83b..31940ec4c462 100644
--- 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>
diff --git a/toolkit/qa/cppunit/EventContainer.cxx b/toolkit/qa/cppunit/EventContainer.cxx
index e5921f2fe404..7e2cb15157b6 100644
--- 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>
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index d6dc140f6f28..b542b564b8f0 100644
--- 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>
diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx
index 477a1f093be0..4e3f0b2df965 100644
--- 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;
diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx
index e094a28d29c0..17111311dfbb 100644
--- 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>
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 2d6cbe6a7c63..5b83b9e62047 100644
--- 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>
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index b524de4d1a5d..e84fe338c5b6 100644
--- 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>
diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 0475bf525999..a8409a5cf7da 100644
--- 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>
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 3eda26c81236..b17f32c2aebc 100644
--- 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>
diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index ce94e6bb6af1..c7d80bf43633 100644
--- 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>
 
diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx
index a3e6268d5991..d9abedecfd54 100644
--- 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>
 
 
 
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index f84e836de29c..761cd10c2674 100644
--- 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>
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index e9e563956b6b..8c84ba6bb1ce 100644
--- 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>
diff --git a/toolkit/source/controls/filectrl.cxx b/toolkit/source/controls/filectrl.cxx
index 0827f9127d47..68fa61a02509 100644
--- 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>
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 83359a614b58..c4a8ad276d35 100644
--- 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>
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index afa3e54157b0..24eb0cb58bb0 100644
--- 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>
 
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 8df570b64109..15c5cd7f1f3f 100644
--- 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>
 
diff --git a/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index 119a77c9a497..c900d6d155a4 100644
--- 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>
diff --git a/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 5a4f65b60925..43fd80f1702c 100644
--- 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>
 
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index 968cfc5cc25d..9fd764212997 100644
--- 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>
 
diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index d9272c60fc66..ffcd520a4992 100644
--- 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>
 
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 143b866aeb30..a62ac19a1487 100644
--- 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>
 
diff --git a/toolkit/source/hatchwindow/documentcloser.cxx b/toolkit/source/hatchwindow/documentcloser.cxx
index 2eceee0d9c4c..42201691fac4 100644
--- 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>
diff --git a/toolkit/source/hatchwindow/hatchwindowfactory.cxx b/toolkit/source/hatchwindow/hatchwindowfactory.cxx
index 7a06cc747d35..3e50db64ee82 100644
--- 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"
 
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index 9061d3ec7bce..094a2fdf1950 100644
--- 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>
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index e7b7d7b18991..825672fd20a1 100644
--- 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";
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 5d5ce94a9b8f..6a12b915b4aa 100644
--- 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;