tdf#42949 Fix IWYU warnings in vcl/source/[a-e]*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I386e913f9002eed164c26137a0e184993d010b86
Reviewed-on: https://gerrit.libreoffice.org/74090
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

60 files changed, 17 insertions, 189 deletions

diff --git a/vcl/IwyuFilter_vcl.yaml b/vcl/IwyuFilter_vcl.yaml
index 8a5d8bba470e..8af2d192987a 100644
--- a/vcl/IwyuFilter_vcl.yaml
+++ b/vcl/IwyuFilter_vcl.yaml
@@ -25,3 +25,9 @@ blacklist:
     vcl/qa/cppunit/outdev.cxx:
     # Needed for direct member access
     - basegfx/matrix/b2dhommatrix.hxx
+    vcl/source/app/svdata.cxx:
+    # Needed on WIN32
+    - com/sun/star/accessibility/MSAAService.hpp
+    vcl/source/app/svmain.cxx:
+    # Needed on WIN32
+    - desktop/exithelper.h
diff --git a/vcl/inc/impfontcache.hxx b/vcl/inc/impfontcache.hxx
index df0dc0c61344..7e752da1fe5e 100644
--- a/vcl/inc/impfontcache.hxx
+++ b/vcl/inc/impfontcache.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_VCL_INC_IMPFONTCACHE_HXX
 #define INCLUDED_VCL_INC_IMPFONTCACHE_HXX
 
-#include <unordered_map>
 #include <boost/functional/hash.hpp>
 
+#include <rtl/ref.hxx>
 #include <o3tl/lru_map.hxx>
 #include <tools/gen.hxx>
-#include <vcl/vcllayout.hxx>
+#include <vcl/glyphitem.hxx>
 
 #include "fontselect.hxx"
 
diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx
index 37af008d036e..69e30240d2cd 100644
--- a/vcl/source/animate/Animation.cxx
+++ b/vcl/source/animate/Animation.cxx
@@ -24,8 +24,7 @@
 #include <sal/log.hxx>
 
 #include <vcl/animate/Animation.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/window.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/BitmapColorQuantizationFilter.hxx>
 
diff --git a/vcl/source/animate/AnimationBitmap.cxx b/vcl/source/animate/AnimationBitmap.cxx
index 4747ce15ee13..7ebaf98d9ec5 100644
--- a/vcl/source/animate/AnimationBitmap.cxx
+++ b/vcl/source/animate/AnimationBitmap.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 #include <o3tl/underlyingenumvalue.hxx>
-#include <rtl/crc.h>
 #include <vcl/animate/AnimationBitmap.hxx>
 
 BitmapChecksum AnimationBitmap::GetChecksum() const
diff --git a/vcl/source/app/IconThemeScanner.cxx b/vcl/source/app/IconThemeScanner.cxx
index 9ffc84d9bc12..0e290eaf0617 100644
--- a/vcl/source/app/IconThemeScanner.cxx
+++ b/vcl/source/app/IconThemeScanner.cxx
@@ -14,12 +14,9 @@
 
 #include <vcl/IconThemeScanner.hxx>
 
-#include <config_folders.h>
 #include <osl/file.hxx>
-#include <rtl/bootstrap.hxx>
 #include <salhelper/linkhelper.hxx>
 #include <unotools/pathoptions.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/IconThemeInfo.hxx>
 
 namespace vcl {
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index c4e60fd2d3b1..0ed454f2911b 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -9,7 +9,6 @@
 
 #include <vcl/IconThemeSelector.hxx>
 
-#include <vcl/IconThemeScanner.hxx>
 #include <vcl/IconThemeInfo.hxx>
 #include <config_mpl.h>
 
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index 093a72b40151..2906061061ca 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -27,7 +27,6 @@
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/pngread.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/vectorgraphicdata.hxx>
 
 namespace {
     bool loadPng( const OUString & rPath, BitmapEx &rBitmap)
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index bd87814b31c6..cfeeeaf5d9ae 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -21,24 +21,13 @@
 
 #ifndef NDEBUG
 
-#include <limits.h>
-
 #include <tools/debug.hxx>
-#include <tools/lineend.hxx>
-#include <sal/log.hxx>
-
-#include <vcl/svapp.hxx>
-#include <vcl/event.hxx>
-#include <vcl/threadex.hxx>
 
 #include <svdata.hxx>
 #include <dbggui.hxx>
 
 #include <salinst.hxx>
 
-#include <algorithm>
-#include <memory>
-
 using namespace ::com::sun::star;
 
 static void ImplDbgTestSolarMutex()
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 657588f3beda..a84f07386d58 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -27,8 +27,6 @@
 
 #include <vcl/i18nhelp.hxx>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
 using namespace ::com::sun::star;
 
 vcl::I18nHelper::I18nHelper(  const css::uno::Reference< css::uno::XComponentContext >& rxContext, const LanguageTag& rLanguageTag )
diff --git a/vcl/source/app/idle.cxx b/vcl/source/app/idle.cxx
index c8b6bb153445..a9a509775a7b 100644
--- a/vcl/source/app/idle.cxx
+++ b/vcl/source/app/idle.cxx
@@ -19,8 +19,6 @@
 
 #include <vcl/idle.hxx>
 #include <vcl/scheduler.hxx>
-#include <svdata.hxx>
-#include <saltimer.hxx>
 
 Idle::Idle( bool bAuto, const sal_Char *pDebugName )
     : Timer( bAuto, pDebugName )
diff --git a/vcl/source/app/salplug.cxx b/vcl/source/app/salplug.cxx
index 03c011ab7c75..4ec54849b21c 100644
--- a/vcl/source/app/salplug.cxx
+++ b/vcl/source/app/salplug.cxx
@@ -18,13 +18,11 @@
  */
 
 #include <osl/module.hxx>
-#include <osl/process.h>
 
 #include <rtl/bootstrap.hxx>
 #include <rtl/process.h>
 #include <sal/log.hxx>
 
-#include <salframe.hxx>
 #include <salinst.hxx>
 #include <config_vclplug.h>
 #include <desktop/crashreport.hxx>
@@ -33,8 +31,6 @@
 #include <headless/svpinst.hxx>
 #include <printerinfomanager.hxx>
 #include <unx/desktops.hxx>
-#include <unx/gensys.h>
-#include <unx/gendata.hxx>
 
 #include <unistd.h>
 #else
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index c1ec3fc2488e..a8a199463418 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -2176,9 +2176,6 @@ public:
     }
 };
 
-#include <vcl/pngwrite.hxx>
-#include <tools/stream.hxx>
-
 IMPL_LINK(SalInstanceLinkButton, ClickHdl, FixedHyperlink&, rButton, void)
 {
     m_aOrigClickHdl.Call(rButton);
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 4f6e483a0958..8ada1de6fe3a 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -41,14 +41,11 @@
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/i18nhelp.hxx>
-#include <vcl/ImageTree.hxx>
 #include <vcl/configsettings.hxx>
-#include <vcl/gradient.hxx>
 #include <vcl/outdev.hxx>
 
 #include <unotools/fontcfg.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <unotools/collatorwrapper.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/syslocale.hxx>
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 6258d34e024b..5c4e6157cb9b 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -19,21 +19,17 @@
 
 #include <config_features.h>
 
-#include <osl/module.h>
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
 #include <osl/module.hxx>
 
 #include <rtl/tencinfo.h>
-#include <rtl/instance.hxx>
 #include <sal/log.hxx>
 
 #include <tools/debug.hxx>
 #include <tools/time.hxx>
 #include <tools/stream.hxx>
 
-#include <i18nlangtag/mslangid.hxx>
-
 #include <unotools/configmgr.hxx>
 #include <unotools/syslocaleoptions.hxx>
 
@@ -51,12 +47,9 @@
 #include <vcl/toolkit/unowrap.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/scheduler.hxx>
-#include <vcl/unohelp.hxx>
-#include <vcl/lazydelete.hxx>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLWrapper.hxx>
 #endif
-#include <saltimer.hxx>
 
 #include <salinst.hxx>
 #include <salframe.hxx>
@@ -74,9 +67,6 @@
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/awt/XToolkit.hpp>
-#include <com/sun/star/uno/XNamingService.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/lok.hxx>
 #include <comphelper/solarmutex.hxx>
 #include <osl/process.h>
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 2a3fd1162528..936ddf596852 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -21,17 +21,12 @@
 
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
-#include <rtl/process.h>
 #include <tools/diagnose_ex.h>
-#include <tools/gen.hxx>
 #include <unotools/resmgr.hxx>
-#include <uno/current_context.hxx>
 #include <sal/log.hxx>
 
-#include <vcl/button.hxx>
 #include <vcl/configsettings.hxx>
 #include <vcl/dockwin.hxx>
-#include <vcl/layout.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/print.hxx>
 #include <vcl/settings.hxx>
@@ -43,21 +38,15 @@
 #include <helpwin.hxx>
 #include <vcl/dialog.hxx>
 #include <salinst.hxx>
-#include <salframe.hxx>
 #include <salgdi.hxx>
 #include <svdata.hxx>
-#include <window.h>
 #include <salimestatus.hxx>
 #include <salsys.hxx>
-#include <strings.hrc>
 #include <units.hrc>
 #include <print.h>
 
 #include <com/sun/star/accessibility/MSAAService.hpp>
 
-#include <officecfg/Office/Common.hxx>
-
-#include <config_folders.h>
 #include <config_features.h>
 #if HAVE_FEATURE_OPENGL
 #include <vcl/opengl/OpenGLContext.hxx>
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 64395164e8ba..c6aa48702357 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -27,9 +27,6 @@
 
 #include <desktop/exithelper.h>
 
-#include <tools/debug.hxx>
-#include <unotools/resmgr.hxx>
-
 #include <comphelper/processfactory.hxx>
 #include <comphelper/asyncnotification.hxx>
 #include <i18nlangtag/mslangid.hxx>
@@ -43,7 +40,6 @@
 #include <vcl/ImageTree.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/toolkit/unowrap.hxx>
-#include <vcl/commandinfoprovider.hxx>
 #include <vcl/configsettings.hxx>
 #include <vcl/lazydelete.hxx>
 #include <vcl/embeddedfontshelper.hxx>
@@ -67,29 +63,22 @@
 #include <jni.h>
 #endif
 
+#include <impfontcache.hxx>
 #include <salinst.hxx>
-#include <salwtype.hxx>
 #include <svdata.hxx>
 #include <vcl/svmain.hxx>
 #include <dbggui.hxx>
 #include <accmgr.hxx>
-#include <outdev.h>
-#include <fontinstance.hxx>
 #include <PhysicalFontCollection.hxx>
 #include <print.h>
-#include <salgdi.hxx>
 #include <salsys.hxx>
 #include <saltimer.hxx>
 #include <salimestatus.hxx>
 #include <displayconnectiondispatch.hxx>
 
 #include <config_features.h>
-#if HAVE_FEATURE_OPENGL
-#include <vcl/opengl/OpenGLContext.hxx>
-#endif
 
 #include <osl/process.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 4e64c8806500..262c935522c6 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -18,10 +18,8 @@
  */
 
 #include <sal/log.hxx>
-#include <tools/time.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/scheduler.hxx>
-#include <saltimer.hxx>
 #include <schedulerimpl.hxx>
 
 void Timer::SetDeletionFlags()
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index e85fd67eae02..6d9e6f31abe5 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -20,10 +20,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
 
-#include <svdata.hxx>
 #include <osl/diagnose.h>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/i18n/BreakIterator.hpp>
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 211ee5d7cc91..5cc57f19a822 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -21,7 +21,6 @@
 #include <vcl/window.hxx>
 #include <vcl/menu.hxx>
 
-#include <svdata.hxx>
 #include <vcleventlisteners.hxx>
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx
index 258f30991d7e..3db6b43e2c76 100644
--- a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx
+++ b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx
@@ -8,10 +8,8 @@
  *
  */
 
-#include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/BitmapAlphaClampFilter.hxx>
-#include <vcl/bitmapaccess.hxx>
 
 #include <bitmapwriteaccess.hxx>
 
diff --git a/vcl/source/bitmap/BitmapColorizeFilter.cxx b/vcl/source/bitmap/BitmapColorizeFilter.cxx
index c102f9acf94e..343642b77a6f 100644
--- a/vcl/source/bitmap/BitmapColorizeFilter.cxx
+++ b/vcl/source/bitmap/BitmapColorizeFilter.cxx
@@ -10,9 +10,6 @@
 
 #include <tools/color.hxx>
 #include <tools/helpers.hxx>
-#include <basegfx/color/bcolortools.hxx>
-
-#include <vcl/bitmapaccess.hxx>
 
 #include <bitmapwriteaccess.hxx>
 #include <BitmapColorizeFilter.hxx>
diff --git a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
index 7ccbe1b450d2..94e0c6e02f80 100644
--- a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
+++ b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx
@@ -8,8 +8,6 @@
  *
  */
 
-#include <basegfx/color/bcolortools.hxx>
-
 #include <tools/helpers.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/vcl/source/bitmap/BitmapDisabledImageFilter.cxx b/vcl/source/bitmap/BitmapDisabledImageFilter.cxx
index 6c13e6133f32..5ade2451a438 100644
--- a/vcl/source/bitmap/BitmapDisabledImageFilter.cxx
+++ b/vcl/source/bitmap/BitmapDisabledImageFilter.cxx
@@ -8,8 +8,6 @@
  *
  */
 
-#include <basegfx/color/bcolortools.hxx>
-
 #include <vcl/bitmapaccess.hxx>
 
 #include <bitmapwriteaccess.hxx>
diff --git a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
index 71888f43ca25..c264dcd1382a 100644
--- a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
+++ b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx
@@ -8,8 +8,6 @@
  *
  */
 
-#include <basegfx/color/bcolortools.hxx>
-
 #include <tools/helpers.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/vcl/source/bitmap/BitmapMedianFilter.cxx b/vcl/source/bitmap/BitmapMedianFilter.cxx
index a8a6e7c9f233..60edc557a9de 100644
--- a/vcl/source/bitmap/BitmapMedianFilter.cxx
+++ b/vcl/source/bitmap/BitmapMedianFilter.cxx
@@ -8,8 +8,6 @@
  *
  */
 
-#include <basegfx/color/bcolortools.hxx>
-
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/bitmap/BitmapPopArtFilter.cxx b/vcl/source/bitmap/BitmapPopArtFilter.cxx
index 6f83ad47c566..621f95fe9c46 100644
--- a/vcl/source/bitmap/BitmapPopArtFilter.cxx
+++ b/vcl/source/bitmap/BitmapPopArtFilter.cxx
@@ -10,13 +10,10 @@
 
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapPopArtFilter.hxx>
 
 #include <bitmapwriteaccess.hxx>
 
-#include <cstdlib>
-
 BitmapEx BitmapPopArtFilter::execute(BitmapEx const& rBitmapEx) const
 {
     Bitmap aBitmap(rBitmapEx.GetBitmap());
diff --git a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
index 402e90441c4e..58d5e381087d 100644
--- a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx
@@ -8,8 +8,6 @@
  *
  */
 
-#include <basegfx/color/bcolortools.hxx>
-
 #include <tools/helpers.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
index ae066cc66cf6..1d21ed9e1279 100644
--- a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
+++ b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx
@@ -16,8 +16,6 @@
 #include <bitmapwriteaccess.hxx>
 #include <bitmap/Octree.hxx>
 
-#include <cstdlib>
-
 BitmapEx BitmapSimpleColorQuantizationFilter::execute(BitmapEx const& aBitmapEx) const
 {
     Bitmap aBitmap = aBitmapEx.GetBitmap();
diff --git a/vcl/source/bitmap/BitmapSmoothenFilter.cxx b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
index fbc464d880ca..67cea0cb3dfa 100644
--- a/vcl/source/bitmap/BitmapSmoothenFilter.cxx
+++ b/vcl/source/bitmap/BitmapSmoothenFilter.cxx
@@ -8,15 +8,11 @@
  *
  */
 
-#include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapGaussianSeparableBlurFilter.hxx>
 #include <vcl/BitmapSeparableUnsharpenFilter.hxx>
 #include <vcl/BitmapSmoothenFilter.hxx>
 
-#include <bitmapwriteaccess.hxx>
-
 BitmapEx BitmapSmoothenFilter::execute(BitmapEx const& rBitmapEx) const
 {
     BitmapEx aBitmapEx(rBitmapEx);
diff --git a/vcl/source/bitmap/BitmapSolarizeFilter.cxx b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
index 179868aa5e2d..bd7518b4cabf 100644
--- a/vcl/source/bitmap/BitmapSolarizeFilter.cxx
+++ b/vcl/source/bitmap/BitmapSolarizeFilter.cxx
@@ -10,7 +10,6 @@
 
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/BitmapSolarizeFilter.hxx>
 
 #include <bitmapwriteaccess.hxx>
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 531a49bc9cc5..4fbecf3fc47e 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -23,7 +23,6 @@
 
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
 
-#include <unotools/resmgr.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
@@ -34,7 +33,6 @@
 #endif
 #include <tools/diagnose_ex.h>
 #include <tools/fract.hxx>
-#include <tools/helpers.hxx>
 #include <tools/stream.hxx>
 #include <bitmapwriteaccess.hxx>
 
diff --git a/vcl/source/bitmap/Octree.cxx b/vcl/source/bitmap/Octree.cxx
index 592d17c1d469..e92e8aff7a7e 100644
--- a/vcl/source/bitmap/Octree.cxx
+++ b/vcl/source/bitmap/Octree.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <limits.h>
-
-#include <rtl/alloc.h>
 #include <vcl/bitmapaccess.hxx>
 
 #include <bitmap/Octree.hxx>
diff --git a/vcl/source/bitmap/bitmapfilter.cxx b/vcl/source/bitmap/bitmapfilter.cxx
index bd4079abf9e7..58a01f1fb007 100644
--- a/vcl/source/bitmap/bitmapfilter.cxx
+++ b/vcl/source/bitmap/bitmapfilter.cxx
@@ -11,7 +11,6 @@
 #include <vcl/BitmapFilter.hxx>
 #include <vcl/animate/Animation.hxx>
 
-#include <algorithm>
 #include <sal/log.hxx>
 
 BitmapFilter::BitmapFilter() {}
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index b9a76444378e..2b81c889a52c 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -29,11 +29,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
 #include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index 55dd003d1a21..7bfa54f7a84e 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/ustrbuf.hxx>
-#include <uno/dispatcher.h>
-#include <uno/mapping.hxx>
 #include <cppuhelper/factory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index 659671ded659..e6d5202ef80e 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 2c3b20744783..6e0e70346215 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -17,13 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/lineend.hxx>
 #include <tools/poly.hxx>
 
 #include <vcl/image.hxx>
-#include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
@@ -42,7 +39,6 @@
 #include <svdata.hxx>
 #include <window.h>
 #include <controldata.hxx>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 
 #include <comphelper/dispatchcommand.hxx>
diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx
index 526112f485ed..22d3d9f56ab3 100644
--- a/vcl/source/control/calendar.cxx
+++ b/vcl/source/control/calendar.cxx
@@ -17,18 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/strbuf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/decoview.hxx>
-#include <vcl/floatwin.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
 #include <vcl/commandevent.hxx>
-#include <comphelper/processfactory.hxx>
 #include <unotools/calendarwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <com/sun/star/i18n/Weekdays.hpp>
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 31f8a0373f52..aee7037e60fe 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -22,16 +22,13 @@
 #include <set>
 
 #include <comphelper/string.hxx>
-#include <vcl/decoview.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <sal/log.hxx>
 
-#include <svdata.hxx>
 #include <listbox.hxx>
 #include <controldata.hxx>
 #include <comphelper/lok.hxx>
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index eee49fc35df0..8b3237c7c9c7 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -20,9 +20,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
 #include <vcl/ctrl.hxx>
-#include <vcl/floatwin.hxx>
 #include <vcl/decoview.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/logger.hxx>
 #include <sal/log.hxx>
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 926bc3193a7a..8485dfcd41af 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -17,11 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/IDialogRenderable.hxx>
-#include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/cursor.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/weld.hxx>
@@ -38,10 +35,8 @@
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
-#include <cppuhelper/weak.hxx>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
@@ -50,7 +45,6 @@
 #include <com/sun/star/i18n/InputSequenceChecker.hpp>
 #include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 
 #include <com/sun/star/uno/Any.hxx>
 
@@ -63,7 +57,6 @@
 #include <sal/log.hxx>
 
 #include <i18nlangtag/languagetag.hxx>
-#include <vcl/unohelp.hxx>
 #include <vcl/unohelp2.hxx>
 
 #include <officecfg/Office/Common.hxx>
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 1e82fed403c8..3239d419ac9e 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -32,7 +32,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <strings.hrc>
 #include <svdata.hxx>
 
 #include <i18nutil/unicode.hxx>
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index bb2ea4db56ee..faeadcfb481f 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -33,11 +33,7 @@
 
 #include <svdata.hxx>
 
-#include <i18nlangtag/mslangid.hxx>
-
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
-#include <com/sun/star/i18n/KCharacterType.hpp>
 
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/calendarwrapper.hxx>
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 699de1534e11..237f2f30e304 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -20,14 +20,11 @@
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/ImageTree.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
 #include <comphelper/string.hxx>
 #include <sal/log.hxx>
 #include <controldata.hxx>
-#include <window.h>
 
 #define FIXEDLINE_TEXT_BORDER    4
 
diff --git a/vcl/source/control/fmtfield.cxx b/vcl/source/control/fmtfield.cxx
index dc584833cc07..0f91c1ea723c 100644
--- a/vcl/source/control/fmtfield.cxx
+++ b/vcl/source/control/fmtfield.cxx
@@ -22,19 +22,12 @@
 #include <comphelper/string.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 #include <svl/zformat.hxx>
 #include <vcl/fmtfield.hxx>
 #include <vcl/weld.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/util/SearchOptions.hpp>
-#include <com/sun/star/util/SearchAlgorithms.hpp>
-#include <com/sun/star/util/SearchResult.hpp>
-#include <com/sun/star/util/SearchFlags.hpp>
 #include <unotools/syslocale.hxx>
 #include <map>
 #include <rtl/math.hxx>
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 0dff697a6391..7e6fca11b0eb 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/event.hxx>
 #include <vcl/imgctrl.hxx>
 
 #include <com/sun/star/awt/ImageScaleMode.hpp>
diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index 037fe20299f5..528b5c1788c0 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -23,19 +23,14 @@
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
 #include <vcl/scrbar.hxx>
-#include <vcl/help.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/unohelp.hxx>
 #include <vcl/i18nhelp.hxx>
 
 #include <listbox.hxx>
 #include <controldata.hxx>
 #include <svdata.hxx>
 #include <window.h>
-#include <impglyphitem.hxx>
 
-#include <com/sun/star/i18n/XCollator.hpp>
-#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
 #include <rtl/instance.hxx>
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index e991978d71ab..cafebbdb4cb8 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -19,13 +19,8 @@
 
 
 #include <vcl/commandevent.hxx>
-#include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
 #include <sal/log.hxx>
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 863e50ece96e..6505df620c10 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -26,11 +26,8 @@
 #include <sal/log.hxx>
 
 #include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/longcurr.hxx>
 
-#include <svdata.hxx>
-
 #include <unotools/localedatawrapper.hxx>
 
 using namespace ::comphelper;
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index ccf336a46375..dce93cd4c35d 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -17,14 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/decoview.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/event.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/menubtn.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
 void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle )
diff --git a/vcl/source/control/notebookbar.cxx b/vcl/source/control/notebookbar.cxx
index 8682e7f743ba..8ea1a51d5989 100644
--- a/vcl/source/control/notebookbar.cxx
+++ b/vcl/source/control/notebookbar.cxx
@@ -8,13 +8,12 @@
  */
 
 #include <vcl/layout.hxx>
-#include <vcl/tabctrl.hxx>
 #include <vcl/notebookbar.hxx>
+#include <vcl/syswin.hxx>
 #include <vcl/taskpanelist.hxx>
-#include <cppuhelper/queryinterface.hxx>
+#include <vcl/NotebookbarContextControl.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/processfactory.hxx>
-#include <vcl/vclevent.hxx>
 #include <rtl/bootstrap.hxx>
 #include <osl/file.hxx>
 #include <config_folders.h>
@@ -276,4 +275,4 @@ void NotebookBar::UpdatePersonaSettings()
     PersonaSettings = aAllSettings;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index b20711d5e2f8..221664f7d9ae 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -22,10 +22,8 @@
 #include <vcl/scrbar.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/vclevent.hxx>
 
-#include <svdata.hxx>
-
-#include <rtl/string.hxx>
 #include <sal/log.hxx>
 
 /*  #i77549#
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 190cb218b6be..9f51159dd7f0 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -33,8 +33,6 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/uitest/uiobject.hxx>
-#include <vcl/builderfactory.hxx>
-#include <strings.hrc>
 #include <bitmaps.hlst>
 
 #include <controldata.hxx>
diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx
index 5b4dc1b570d5..50621a523637 100644
--- a/vcl/source/control/throbber.cxx
+++ b/vcl/source/control/throbber.cxx
@@ -29,7 +29,6 @@
 #include <comphelper/processfactory.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
 
 #include <limits>
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx
index 303bc79295e5..70396be8435e 100644
--- a/vcl/source/edit/textdat2.hxx
+++ b/vcl/source/edit/textdat2.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_VCL_SOURCE_EDIT_TEXTDAT2_HXX
 
 #include <vcl/seleng.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/idle.hxx>
+#include <vcl/textdata.hxx>
 
 #include <cstddef>
 #include <limits>
diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx
index bca776388ee0..1c54fbbfbf81 100644
--- a/vcl/source/edit/textdoc.cxx
+++ b/vcl/source/edit/textdoc.cxx
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include "textdoc.hxx"
-#include <stdlib.h>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index b6835dbc07a2..0e61271a1ae4 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -31,12 +31,10 @@
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/edit.hxx>
+#include <vcl/virdev.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
-
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
@@ -53,7 +51,6 @@
 #include <vcl/unohelp.hxx>
 
 #include <vcl/svapp.hxx>
-#include <vcl/metric.hxx>
 
 #include <unicode/ubidi.h>
 
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 404dbd8bb388..622d42241789 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -39,11 +39,9 @@
 
 #include <sal/log.hxx>
 #include <sot/formats.hxx>
-#include <svl/urlbmk.hxx>
 
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <vcl/unohelp.hxx>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
@@ -54,8 +52,6 @@
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 
 #include <vcl/edit.hxx>
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index faa8e18061a5..702932278bc1 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -23,7 +23,6 @@
 #include <vcl/builder.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/vclmedit.hxx>
 #include <vcl/xtextedt.hxx>
@@ -34,7 +33,6 @@
 #include <svl/lstner.hxx>
 #include <vcl/uitest/uiobject.hxx>
 
-#include <strings.hrc>
 #include <vcl/scrbar.hxx>
 #include <vcl/settings.hxx>
 #include <osl/diagnose.h>
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index ba045916e471..4d11f275b361 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -19,12 +19,11 @@
 
 #include <i18nutil/searchopt.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <vcl/textdata.hxx>
 #include <vcl/xtextedt.hxx>
-#include <vcl/textview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/textsearch.hxx>
-#include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/util/SearchFlags.hpp>
 
 using namespace ::com::sun::star;