diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx
index b397d0cdd728..8a38132e97a6 100644
--- a/vcl/workben/fftester.cxx
+++ b/vcl/workben/fftester.cxx
@@ -43,16 +43,11 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/configuration.hxx>
 #include <vcl/dibtools.hxx>
-#include <vcl/event.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/filter/PngImageReader.hxx>
-#include <vcl/filter/SvmReader.hxx>
 #include <vcl/font/EOTConverter.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/wmf.hxx>
-#include <vcl/wrkwin.hxx>
-#include <fltcall.hxx>
 #include <filter/TiffReader.hxx>
 #include <filter/TgaReader.hxx>
 #include <filter/PictReader.hxx>
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 956e070e5c9d..f68ffd870c21 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -20,22 +20,16 @@
 
 #include <math.h>
 
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/UniversalContentBroker.hpp>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
-#include <osl/file.hxx>
 #include <sal/log.hxx>
 #include <tools/stream.hxx>
-#include <vcl/builder.hxx>
-#include <vcl/toolkit/button.hxx>
-#include <vcl/toolkit/dialog.hxx>
 #include <vcl/toolkit/fixed.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/image.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/vclmain.hxx>
 #include <vcl/wrkwin.hxx>
diff --git a/vcl/workben/listfonts.cxx b/vcl/workben/listfonts.cxx
index f15abddee5d1..59df274d8fa6 100644
--- a/vcl/workben/listfonts.cxx
+++ b/vcl/workben/listfonts.cxx
@@ -8,7 +8,6 @@
  */
 
 #include <osl/file.hxx>
-#include <osl/process.h>
 #include <rtl/textenc.h>
 #include <sal/main.h>
 #include <comphelper/processfactory.hxx>
@@ -21,7 +20,6 @@
 #include <vcl/font/Feature.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/vclmain.hxx>
 #include <vcl/wrkwin.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/vcl/workben/listglyphs.cxx b/vcl/workben/listglyphs.cxx
index f9dac2f4a97e..67c182636957 100644
--- a/vcl/workben/listglyphs.cxx
+++ b/vcl/workben/listglyphs.cxx
@@ -8,20 +8,15 @@
  */
 
 #include <osl/file.hxx>
-#include <osl/process.h>
-#include <rtl/textenc.h>
 #include <sal/main.h>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/diagnose_ex.hxx>
-#include <tools/degree.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
 
-#include <vcl/font/Feature.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/vclmain.hxx>
 #include <vcl/wrkwin.hxx>
 
 #include <font/LogicalFontInstance.hxx>
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index 4475815194c4..587dc7ca3c21 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -10,23 +10,16 @@
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/ucb/UniversalContentBroker.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 
 #include <vcl/vclmain.hxx>
-#include <vcl/layout.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/wmf.hxx>
 
 #include <comphelper/diagnose_ex.hxx>
-#include <tools/urlobj.hxx>
 #include <tools/stream.hxx>
-#include <tools/vcompat.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/virdev.hxx>
 #include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <osl/process.h>
diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index af216ee1155f..f991334ceb51 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 1c6f9a9c3361..fa6da5b1dfb0 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/gradient.hxx>
@@ -40,10 +39,6 @@
 #include <vcl/vclptr.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
-#include <rtl/ustrbuf.hxx>
-
-#include <math.h>
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace cppu;
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index 7d40251a46e3..d5f4e126c41a 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -9,12 +9,8 @@
 
 #include <sal/config.h>
 
-#include <memory>
 #include <thread>
 
-#include <config_features.h>
-
-#include <math.h>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 
@@ -22,9 +18,6 @@
 #include <comphelper/random.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
-#include <com/sun/star/ucb/UniversalContentBroker.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -37,14 +30,10 @@
 #include <salhelper/thread.hxx>
 
 #include <comphelper/diagnose_ex.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/stream.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <vcl/toolkit/button.hxx>
-#include <vcl/toolkit/combobox.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/toolkit/floatwin.hxx>
 #include <vcl/help.hxx>
@@ -54,7 +43,6 @@
 #include <vcl/bitmap/BitmapEmbossGreyFilter.hxx>
 #include <vcl/BitmapWriteAccess.hxx>
 
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 
 #include <framework/desktop.hxx>