tdf#42949 Fix IWYU warnings in vcl/inc/*

Platform-specific subdirs are left alone:
android, ios, osx, quartz, win

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

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

103 files changed, 95 insertions, 175 deletions

diff --git a/vcl/IwyuFilter_vcl.yaml b/vcl/IwyuFilter_vcl.yaml
new file mode 100644
index 000000000000..180bfa2901e0
--- /dev/null
+++ b/vcl/IwyuFilter_vcl.yaml
@@ -0,0 +1,24 @@
+---
+assumeFilename: vcl/source/app/svapp.cxx
+blacklist:
+    vcl/inc/salusereventlist.hxx:
+    # Don't propose hxx -> h change in URE libs
+    - osl/thread.hxx
+    vcl/inc/headless/svpgdi.hxx:
+    # OSL_BIGENDIAN is being checked
+    - osl/endian.h
+    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
+    vcl/inc/unx/saldisp.hxx:
+    # Don't replace with generated header
+    - epoxy/glx.h
diff --git a/vcl/backendtest/outputdevice/polyline_b2d.cxx b/vcl/backendtest/outputdevice/polyline_b2d.cxx
index d6b9886b41ee..b59685c7a817 100644
--- a/vcl/backendtest/outputdevice/polyline_b2d.cxx
+++ b/vcl/backendtest/outputdevice/polyline_b2d.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <test/outputdevice.hxx>
+#include <vcl/bitmapex.hxx>
 
 namespace vcl
 {
diff --git a/vcl/inc/FileDefinitionWidgetDraw.hxx b/vcl/inc/FileDefinitionWidgetDraw.hxx
index a5b95c8fad6a..9ce2122299d1 100644
--- a/vcl/inc/FileDefinitionWidgetDraw.hxx
+++ b/vcl/inc/FileDefinitionWidgetDraw.hxx
@@ -11,8 +11,7 @@
 #ifndef INCLUDED_VCL_INC_FILEDEFINITIONWIDGETDRAW_HXX
 #define INCLUDED_VCL_INC_FILEDEFINITIONWIDGETDRAW_HXX
 
-#include <vcl/dllapi.h>
-#include "widgetdraw/WidgetDefinitionReader.hxx"
+#include "widgetdraw/WidgetDefinition.hxx"
 #include "salgdi.hxx"
 #include "WidgetDrawInterface.hxx"
 
diff --git a/vcl/inc/WidgetThemeLibraryTypes.hxx b/vcl/inc/WidgetThemeLibraryTypes.hxx
index a00a867d7887..b3270bf23eb8 100644
--- a/vcl/inc/WidgetThemeLibraryTypes.hxx
+++ b/vcl/inc/WidgetThemeLibraryTypes.hxx
@@ -11,8 +11,6 @@
 #ifndef INCLUDED_VCL_INC_WIDGETTHEMETYPES_HXX
 #define INCLUDED_VCL_INC_WIDGETTHEMETYPES_HXX
 
-#include <cstdint>
-
 #include <o3tl/typed_flags_set.hxx>
 
 /**
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index a7c912bfc3c8..a22ba4346582 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -23,11 +23,9 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
 #include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/XBitmapPalette.hpp>
 
 #include <vcl/bitmapex.hxx>
-#include <vcl/bitmapaccess.hxx>
 
 namespace vcl
 {
diff --git a/vcl/inc/displayconnectiondispatch.hxx b/vcl/inc/displayconnectiondispatch.hxx
index ff12478b7bea..c9fda47397d0 100644
--- a/vcl/inc/displayconnectiondispatch.hxx
+++ b/vcl/inc/displayconnectiondispatch.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/awt/XDisplayConnection.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
-#include <rtl/ref.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <vector>
 
diff --git a/vcl/inc/dndeventdispatcher.hxx b/vcl/inc/dndeventdispatcher.hxx
index a6af677350df..afd11ce07074 100644
--- a/vcl/inc/dndeventdispatcher.hxx
+++ b/vcl/inc/dndeventdispatcher.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
 
-#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <vcl/window.hxx>
 
diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx
index 55203844d1bb..7ddc0c5c2730 100644
--- a/vcl/inc/factory.hxx
+++ b/vcl/inc/factory.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
-#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace lang {
diff --git a/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx b/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx
index 01fbf6bfc091..693c3e59641b 100644
--- a/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx
+++ b/vcl/inc/font/OpenTypeFeatureDefinitonList.hxx
@@ -13,7 +13,6 @@
 #include <vcl/dllapi.h>
 #include <vcl/font/Feature.hxx>
 #include <rtl/instance.hxx>
-#include <memory>
 #include <vector>
 #include <unordered_map>
 
diff --git a/vcl/inc/fontattributes.hxx b/vcl/inc/fontattributes.hxx
index 358f9bc62af5..352ea10e3a1c 100644
--- a/vcl/inc/fontattributes.hxx
+++ b/vcl/inc/fontattributes.hxx
@@ -23,7 +23,6 @@
 #include <vcl/dllapi.h>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
-#include <vcl/vclenum.hxx>
 #include <tools/fontenum.hxx>
 
 
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx
index a0f700c925fc..7c4c6d371804 100644
--- a/vcl/inc/fontinstance.hxx
+++ b/vcl/inc/fontinstance.hxx
@@ -23,17 +23,17 @@
 #include "fontselect.hxx"
 #include "impfontmetricdata.hxx"
 
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <tools/gen.hxx>
 #include <tools/fontenum.hxx>
 #include <vcl/glyphitem.hxx>
-#include <vcl/vcllayout.hxx>
 
 #include <unordered_map>
 #include <memory>
 
-#include <hb-ot.h>
+#include <hb.h>
 
 class ConvertChar;
 class ImplFontCache;
diff --git a/vcl/inc/fontselect.hxx b/vcl/inc/fontselect.hxx
index e021f7a0c775..7df7dd93072a 100644
--- a/vcl/inc/fontselect.hxx
+++ b/vcl/inc/fontselect.hxx
@@ -21,12 +21,11 @@
 #define INCLUDED_VCL_INC_FONTSELECT_HXX
 
 #include <i18nlangtag/lang.h>
-#include <rtl/ref.hxx>
+#include <vcl/vclenum.hxx>
 
 #include "fontattributes.hxx"
 
 #include <ostream>
-#include <unordered_map>
 
 namespace vcl { class Font; }
 
diff --git a/vcl/inc/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index 76551c29d89d..54fa2094684f 100644
--- a/vcl/inc/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -24,7 +24,8 @@
 #include <tools/gen.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-#include "sallayout.hxx"
+#include <vcl/dllapi.h>
+#include <vcl/glyphitem.hxx>
 
 namespace vcl { struct TrueTypeFont; }         ///< SFT's idea of a TTF font
 
diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
index d6c0d718f8af..a756450caf28 100644
--- a/vcl/inc/graphic/Manager.hxx
+++ b/vcl/inc/graphic/Manager.hxx
@@ -15,13 +15,9 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/animate/Animation.hxx>
 #include <vcl/vectorgraphicdata.hxx>
-#include <vcl/metaact.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/GraphicExternalLink.hxx>
 
-#include <officecfg/Office/Common.hxx>
-#include <unotools/configmgr.hxx>
-
 #include <memory>
 #include <mutex>
 #include <chrono>
diff --git a/vcl/inc/graphic/UnoGraphic.hxx b/vcl/inc/graphic/UnoGraphic.hxx
index e0ec65d83a31..0bef26bcbd86 100644
--- a/vcl/inc/graphic/UnoGraphic.hxx
+++ b/vcl/inc/graphic/UnoGraphic.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_SOURCE_GRAPHIC_GRAPHIC_HXX
 #define INCLUDED_VCL_SOURCE_GRAPHIC_GRAPHIC_HXX
 
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
diff --git a/vcl/inc/graphic/UnoGraphicTransformer.hxx b/vcl/inc/graphic/UnoGraphicTransformer.hxx
index 7814c3707597..785efdcd11b9 100644
--- a/vcl/inc/graphic/UnoGraphicTransformer.hxx
+++ b/vcl/inc/graphic/UnoGraphicTransformer.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_SOURCE_GRAPHIC_TRANSFORMER_HXX
 
 #include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/graphic/XGraphicTransformer.hpp>
 
 namespace unographic {
diff --git a/vcl/inc/headless/CustomWidgetDraw.hxx b/vcl/inc/headless/CustomWidgetDraw.hxx
index caa809e62f28..7abd8445ddbe 100644
--- a/vcl/inc/headless/CustomWidgetDraw.hxx
+++ b/vcl/inc/headless/CustomWidgetDraw.hxx
@@ -16,7 +16,6 @@
 #include <WidgetThemeLibrary.hxx>
 #include <headless/svpgdi.hxx>
 #include <vcl/settings.hxx>
-#include <memory>
 
 namespace vcl
 {
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index d97c0fee128e..ff35c4c1615f 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_HEADLESS_SVPBMP_HXX
 
 #include <sal/config.h>
-#include <tools/solar.h>
 
 #include <salbmp.hxx>
 
diff --git a/vcl/inc/headless/svpdummies.hxx b/vcl/inc/headless/svpdummies.hxx
index 0b7ddf89b15a..ddcc7d7e3860 100644
--- a/vcl/inc/headless/svpdummies.hxx
+++ b/vcl/inc/headless/svpdummies.hxx
@@ -23,8 +23,6 @@
 #include <vcl/sysdata.hxx>
 #include <unx/gensys.h>
 #include <salobj.hxx>
-#include <salimestatus.hxx>
-#include <salsys.hxx>
 
 class SalGraphics;
 
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index c997d7716f04..bf48b07005a9 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
 
 #include <vcl/sysdata.hxx>
-#include <basegfx/range/b2ibox.hxx>
 
 #include <salframe.hxx>
 
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 73d80da6deb8..5a4f0bc5b88c 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -26,7 +26,6 @@
 
 #include <osl/endian.h>
 #include <vcl/sysdata.hxx>
-#include <vcl/metric.hxx>
 #include <config_cairo_canvas.h>
 
 #include <salgdi.hxx>
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 6ea4016aa980..546a374750c6 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -20,21 +20,17 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
 
-#include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 #include <osl/conditn.hxx>
 #include <salinst.hxx>
-#include <salwtype.hxx>
 #include <saltimer.hxx>
 #include <salusereventlist.hxx>
 #include <unx/geninst.h>
 #include <unx/genprn.h>
 
-#include <list>
 #include <condition_variable>
 
 #include <sys/time.h>
-#include <time.h>
 
 #define VIRTUAL_DESKTOP_WIDTH 1024
 #define VIRTUAL_DESKTOP_HEIGHT 768
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index a7572af2f2e3..8971441422d4 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -20,13 +20,8 @@
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
 #define INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
 
-#include <vcl/jobdata.hxx>
-#include <unx/printergfx.hxx>
-#include <unx/printerjob.hxx>
 #include <unx/genprn.h>
 
-#include <vclpluginapi.h>
-
 class SvpSalInfoPrinter : public PspSalInfoPrinter
 {
 public:
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index c5acc06f782a..455ea209ccb4 100644
--- a/vcl/inc/image.h
+++ b/vcl/inc/image.h
@@ -22,9 +22,6 @@
 
 #include <vcl/bitmapex.hxx>
 
-#include <unordered_map>
-#include <vector>
-
 class ImplImage
 {
 private:
diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx
index 1405d8da0c29..7f4301d97778 100644
--- a/vcl/inc/impfont.hxx
+++ b/vcl/inc/impfont.hxx
@@ -22,10 +22,12 @@
 
 #include <rtl/ustring.hxx>
 #include <tools/color.hxx>
+#include <tools/fontenum.hxx>
+#include <tools/gen.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <vcl/vclenum.hxx>
+#include <vcl/fntstyle.hxx>
 
-#include "fontinstance.hxx"
+#include "fontselect.hxx"
 
 /* The following class is extraordinarily similar to FontAttributes. */
 
diff --git a/vcl/inc/impgraph.hxx b/vcl/inc/impgraph.hxx
index ce6ad8616e92..1b0a273d845d 100644
--- a/vcl/inc/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_INC_IMPGRAPH_HXX
 
 #include <vcl/GraphicExternalLink.hxx>
+#include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
 #include "graphic/Manager.hxx"
 
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index 4c23f3a2637f..40dde5a94cdb 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/dllapi.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <vcl/ImageTree.hxx>
 
diff --git a/vcl/inc/opengl/LineRenderUtils.hxx b/vcl/inc/opengl/LineRenderUtils.hxx
index 4ffeae25dd0a..aa8d8e637902 100644
--- a/vcl/inc/opengl/LineRenderUtils.hxx
+++ b/vcl/inc/opengl/LineRenderUtils.hxx
@@ -11,7 +11,6 @@
 #ifndef INCLUDED_VCL_INC_OPENGL_LINERENDERUTILS_H
 #define INCLUDED_VCL_INC_OPENGL_LINERENDERUTILS_H
 
-#include <opengl/VertexUtils.hxx>
 #include <opengl/RenderList.hxx>
 
 namespace vcl
diff --git a/vcl/inc/opengl/RenderList.hxx b/vcl/inc/opengl/RenderList.hxx
index cd8787c824e1..bb46206ea7ff 100644
--- a/vcl/inc/opengl/RenderList.hxx
+++ b/vcl/inc/opengl/RenderList.hxx
@@ -15,9 +15,9 @@
 
 #include <glm/glm.hpp>
 
-#include <vcl/opengl/OpenGLHelper.hxx>
 #include <vcl/salgtype.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <opengl/texture.hxx>
 
diff --git a/vcl/inc/opengl/VertexUtils.hxx b/vcl/inc/opengl/VertexUtils.hxx
index 4d4fd12a116a..910b8725a1e9 100644
--- a/vcl/inc/opengl/VertexUtils.hxx
+++ b/vcl/inc/opengl/VertexUtils.hxx
@@ -14,7 +14,7 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <epoxy/gl.h>
 #include <glm/gtx/norm.hpp>
-#include <vcl/salgtype.hxx>
+#include <tools/color.hxx>
 #include <vector>
 
 namespace vcl
diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index bc4dc90b9605..ad00ff486b8f 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -22,12 +22,10 @@
 
 #include <vcl/opengl/OpenGLContext.hxx>
 
-#include <vcl/salbtype.hxx>
 #include <opengl/texture.hxx>
 
 #include <salbmp.hxx>
 
-#include <deque>
 #include <memory>
 
 struct  BitmapBuffer;
diff --git a/vcl/inc/opengl/watchdog.hxx b/vcl/inc/opengl/watchdog.hxx
index dc7a16cb8c21..a675894c4ff3 100644
--- a/vcl/inc/opengl/watchdog.hxx
+++ b/vcl/inc/opengl/watchdog.hxx
@@ -11,10 +11,9 @@
 #define INCLUDED_VCL_INC_OPENGL_WATCHDOG_H
 
 #include <sal/config.h>
-#include <sal/types.h>
-#include <rtl/ref.hxx>
 #include <salhelper/thread.hxx>
 #include <atomic>
+#include <vector>
 
 struct WatchdogTimingsValues
 {
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 9c888ae62906..b5be8792a982 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -26,7 +26,6 @@
 #include "regionband.hxx"
 #include "salgeom.hxx"
 #include "salgdiimpl.hxx"
-#include "opengl/framebuffer.hxx"
 #include "opengl/program.hxx"
 #include "opengl/texture.hxx"
 #include "opengl/RenderList.hxx"
diff --git a/vcl/inc/outdata.hxx b/vcl/inc/outdata.hxx
index e6aa49175f55..9764a6cda33d 100644
--- a/vcl/inc/outdata.hxx
+++ b/vcl/inc/outdata.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_OUTDATA_HXX
 
 #include <tools/color.hxx>
-#include <vcl/salgtype.hxx>
 
 inline bool ImplIsColorTransparent( Color aColor )
 {
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 0fbfcb62bcc1..d034bbd3b2a1 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -20,19 +20,15 @@
 #ifndef VCL_INC_NEWPRINTDLG_HXX
 #define VCL_INC_NEWPRINTDLG_HXX
 
-#include <vcl/dllapi.h>
-
 #include <vcl/print.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
-#include <vcl/prgsbar.hxx>
 #include <vcl/field.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/tabctrl.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/weld.hxx>
 
 namespace vcl {
     class PrintDialog;
diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
index 825e1c11d81e..3ac76a91dde5 100644
--- a/vcl/inc/printerinfomanager.hxx
+++ b/vcl/inc/printerinfomanager.hxx
@@ -28,8 +28,7 @@
 #include <vcl/dllapi.h>
 #include <vcl/jobdata.hxx>
 #include <vcl/prntypes.hxx>
-#include <osl/file.hxx>
-#include "unx/helper.hxx"
+#include <osl/time.h>
 
 #include <cstdio>
 
diff --git a/vcl/inc/qt5/Qt5SvpSurface.hxx b/vcl/inc/qt5/Qt5SvpSurface.hxx
index 196e2bbfa22c..f319aa56f352 100644
--- a/vcl/inc/qt5/Qt5SvpSurface.hxx
+++ b/vcl/inc/qt5/Qt5SvpSurface.hxx
@@ -11,8 +11,6 @@
 
 #include <sal/config.h>
 
-#include <sal/types.h>
-
 #include <vcl/cairo.hxx>
 
 class Qt5SvpGraphics;
diff --git a/vcl/inc/qt5/Qt5System.hxx b/vcl/inc/qt5/Qt5System.hxx
index 0d51bb29f358..aac0248c5005 100644
--- a/vcl/inc/qt5/Qt5System.hxx
+++ b/vcl/inc/qt5/Qt5System.hxx
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include <vcl/sysdata.hxx>
 #include <unx/gensys.h>
 
 class Qt5System : public SalGenericSystem
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 5b020f617c4d..bd2f061cb310 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -23,8 +23,8 @@
 #include <tools/gen.hxx>
 #include <tools/solar.h>
 #include <vcl/checksum.hxx>
-#include <vcl/salbtype.hxx>
-
+#include <vcl/BitmapAccessMode.hxx>
+#include <vcl/BitmapBuffer.hxx>
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 
 struct BitmapBuffer;
diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index 48af524fb683..85911718815a 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INC_SALDATABASIC_HXX
 #define INCLUDED_VCL_INC_SALDATABASIC_HXX
 
-#include <osl/module.h>
 #include <vcl/dllapi.h>
 
 #include "svdata.hxx"
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index d7b45f5fcf97..a8c2d87969d0 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_VCL_INC_SALGDI_HXX
 #define INCLUDED_VCL_INC_SALGDI_HXX
 
-#include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 
 #include "impfontmetricdata.hxx"
@@ -32,7 +31,6 @@
 #include <config_cairo_canvas.h>
 
 #include <map>
-#include <set>
 #include <vector>
 
 class PhysicalFontCollection;
diff --git a/vcl/inc/salgdiimpl.hxx b/vcl/inc/salgdiimpl.hxx
index aafeded45dcc..d58750f93ea9 100644
--- a/vcl/inc/salgdiimpl.hxx
+++ b/vcl/inc/salgdiimpl.hxx
@@ -22,15 +22,11 @@
 
 #include <vcl/dllapi.h>
 
-#include <rtl/ustring.hxx>
-
 #include <tools/color.hxx>
 #include <tools/poly.hxx>
-#include <tools/solar.h>
 
 #include <vcl/salgtype.hxx>
 #include <vcl/region.hxx>
-#include <vcl/salnativewidgets.hxx>
 
 #include <com/sun/star/drawing/LineCap.hpp>
 
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index 4acb0315de4c..db1ae606a593 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -22,10 +22,8 @@
 
 #include <sal/types.h>
 #include <rtl/ref.hxx>
-#include <tools/solar.h>
 #include <vcl/dllapi.h>
 #include <vcl/salgtype.hxx>
-#include <osl/thread.hxx>
 #include <vcl/vclenum.hxx>
 
 #include "backend/BackendCapabilities.hxx"
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 535838aae645..06300760f60e 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_SALLAYOUT_HXX
 
 #include <iostream>
-#include <list>
 #include <memory>
 #include <vector>
 
diff --git a/vcl/inc/salptype.hxx b/vcl/inc/salptype.hxx
index dce4e40fd1b9..9d09c869a697 100644
--- a/vcl/inc/salptype.hxx
+++ b/vcl/inc/salptype.hxx
@@ -23,7 +23,6 @@
 #include <sal/config.h>
 
 #include <o3tl/typed_flags_set.hxx>
-#include <sal/types.h>
 
 enum class JobSetFlags : sal_uInt16 {
     ORIENTATION  = 1,
diff --git a/vcl/inc/saltimer.hxx b/vcl/inc/saltimer.hxx
index 8c849a8c9c2e..69545ac96b87 100644
--- a/vcl/inc/saltimer.hxx
+++ b/vcl/inc/saltimer.hxx
@@ -23,7 +23,6 @@
 #include <sal/config.h>
 #include <vcl/dllapi.h>
 #include "salwtype.hxx"
-#include <iostream>
 
 /*
  * note: there will be only a single instance of SalTimer
diff --git a/vcl/inc/salusereventlist.hxx b/vcl/inc/salusereventlist.hxx
index 1222b8751807..f2856c8d443d 100644
--- a/vcl/inc/salusereventlist.hxx
+++ b/vcl/inc/salusereventlist.hxx
@@ -25,8 +25,6 @@
 #include <osl/mutex.hxx>
 #include <osl/thread.hxx>
 
-#include <assert.h>
-
 #include <list>
 #include <unordered_set>
 
diff --git a/vcl/inc/scrptrun.h b/vcl/inc/scrptrun.h
index 46a5c08f3ab5..097f6302f38d 100644
--- a/vcl/inc/scrptrun.h
+++ b/vcl/inc/scrptrun.h
@@ -39,8 +39,6 @@
 
 #include <sal/config.h>
 
-#include <sal/types.h>
-#include <unicode/utypes.h>
 #include <unicode/uobject.h>
 #include <unicode/uscript.h>
 #include <vector>
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 52207bb48d02..fbf570b27adb 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -40,11 +40,6 @@
 #ifndef INCLUDED_VCL_INC_SFT_HXX
 #define INCLUDED_VCL_INC_SFT_HXX
 
-#ifdef UNX
-#include <sys/types.h>
-#include <unistd.h>
-#endif
-
 #include <vcl/dllapi.h>
 #include <vcl/fontcapabilities.hxx>
 #include <i18nlangtag/lang.h>
diff --git a/vcl/inc/svmconverter.hxx b/vcl/inc/svmconverter.hxx
index 1ab17424dd65..7240ef57c71c 100644
--- a/vcl/inc/svmconverter.hxx
+++ b/vcl/inc/svmconverter.hxx
@@ -21,11 +21,8 @@
 #define INCLUDED_VCL_INC_SVMCONVERTER_HXX
 
 #include <vcl/dllapi.h>
-#include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 
-#include <stack>
-
 #define GDI_PIXEL_ACTION                1
 #define GDI_POINT_ACTION                2
 #define GDI_LINE_ACTION                 3
diff --git a/vcl/inc/test/outputdevice.hxx b/vcl/inc/test/outputdevice.hxx
index 54dccb325eda..966cd2b6b09c 100644
--- a/vcl/inc/test/outputdevice.hxx
+++ b/vcl/inc/test/outputdevice.hxx
@@ -12,8 +12,6 @@
 #define INCLUDED_VCL_OUTDEVTESTS_HXX
 
 #include <vcl/virdev.hxx>
-#include <vcl/bitmapaccess.hxx>
-#include <vcl/bitmapex.hxx>
 
 namespace vcl {
 namespace test {
diff --git a/vcl/inc/unx/XIM.h b/vcl/inc/unx/XIM.h
index 7c2a224dfb05..d2fcd9c0ea50 100644
--- a/vcl/inc/unx/XIM.h
+++ b/vcl/inc/unx/XIM.h
@@ -20,7 +20,6 @@
 #define INCLUDED_VCL_INC_UNX_XIM_H
 
 #include <X11/Xlib.h>
-#include <X11/Xresource.h>
 
 #ifndef XIMCallback1
 typedef int (*XIMProc1)(XIC, XPointer, XPointer);
diff --git a/vcl/inc/unx/cairotextrender.hxx b/vcl/inc/unx/cairotextrender.hxx
index ca9cfcd8da80..2881785dcbff 100644
--- a/vcl/inc/unx/cairotextrender.hxx
+++ b/vcl/inc/unx/cairotextrender.hxx
@@ -20,12 +20,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
 #define INCLUDED_VCL_INC_UNX_CAIROTEXTRENDER_HXX
 
-#include <vcl/region.hxx>
-
 #include <textrender.hxx>
 
-#include <deque>
-
 class FreetypeFont;
 class GlyphCache;
 typedef struct _cairo cairo_t;
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index 2283880c0b2d..9fd153938705 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_UNX_CUPSMGR_HXX
 
 #include <printerinfomanager.hxx>
-#include <osl/module.h>
 #include <osl/thread.h>
 #include <osl/mutex.hxx>
 
diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx
index c5ea38ce4f54..a3e26197b05f 100644
--- a/vcl/inc/unx/fc_fontoptions.hxx
+++ b/vcl/inc/unx/fc_fontoptions.hxx
@@ -20,11 +20,7 @@
 #ifndef INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
 #define INCLUDED_VCL_INC_UNX_FC_FONTOPTIONS_HXX
 
-#include <rtl/ustring.hxx>
-#include <tools/gen.hxx>
-#include <vcl/dllapi.h>
-#include <vcl/vclenum.hxx>
-#include <vcl/fntstyle.hxx>
+#include <rtl/string.hxx>
 
 typedef struct _FcPattern   FcPattern;
 class FontConfigFontOptions
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 0ce8ff437c69..88187efeb384 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -20,23 +20,19 @@
 #ifndef INCLUDED_VCL_INC_FONTMANAGER_HXX
 #define INCLUDED_VCL_INC_FONTMANAGER_HXX
 
+#include <tools/fontenum.hxx>
 #include <vcl/dllapi.h>
-#include <unx/helper.hxx>
+#include <vcl/glyphitem.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/vclenum.hxx>
 #include <com/sun/star/lang/Locale.hpp>
-#include <sallayout.hxx>
 #include <unx/fc_fontoptions.hxx>
 
-#include <list>
 #include <map>
 #include <set>
 #include <memory>
 #include <vector>
 #include <unordered_map>
 
-#include <config_gio.h>
-
 /*
  *  some words on metrics: every length returned by PrintFontManager and
  *  friends are PostScript afm style, that is they are 1/1000 font height
diff --git a/vcl/inc/unx/gendisp.hxx b/vcl/inc/unx/gendisp.hxx
index 2d5bc12fcadf..a6188e27a16e 100644
--- a/vcl/inc/unx/gendisp.hxx
+++ b/vcl/inc/unx/gendisp.hxx
@@ -20,13 +20,8 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
 #define INCLUDED_VCL_INC_GENERIC_GENDISP_HXX
 
-#include <sal/types.h>
-#include <osl/mutex.h>
-#include <osl/conditn.hxx>
 #include <salwtype.hxx>
 #include <vcl/dllapi.h>
-#include <list>
-#include <vector>
 #include <salusereventlist.hxx>
 
 class SalFrame;
diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h
index ba795485fff6..95992ec383fc 100644
--- a/vcl/inc/unx/geninst.h
+++ b/vcl/inc/unx/geninst.h
@@ -22,9 +22,6 @@
 
 #include <memory>
 #include <comphelper/solarmutex.hxx>
-#include <tools/solar.h>
-#include <osl/thread.hxx>
-#include <vclpluginapi.h>
 #include <salinst.hxx>
 #include <saldatabasic.hxx>
 #include <unx/genprn.h>
diff --git a/vcl/inc/unx/genprn.h b/vcl/inc/unx/genprn.h
index a8ad4fb062c1..9f382e178a20 100644
--- a/vcl/inc/unx/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -24,7 +24,6 @@
 #include <unx/printergfx.hxx>
 #include <unx/printerjob.hxx>
 #include <salprn.hxx>
-#include <vclpluginapi.h>
 
 class GenPspGraphics;
 class VCL_DLLPUBLIC PspSalInfoPrinter : public SalInfoPrinter
diff --git a/vcl/inc/unx/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 393f7fc181b3..1f938d20bd3e 100644
--- a/vcl/inc/unx/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
@@ -26,7 +26,6 @@
 #include <unx/fontmanager.hxx>
 #include <salgdi.hxx>
 #include <sallayout.hxx>
-#include <vclpluginapi.h>
 
 class PhysicalFontFace;
 class PhysicalFontCollection;
diff --git a/vcl/inc/unx/gensys.h b/vcl/inc/unx/gensys.h
index 5d42e7989487..6da0b17b8af9 100644
--- a/vcl/inc/unx/gensys.h
+++ b/vcl/inc/unx/gensys.h
@@ -21,8 +21,6 @@
 #define INCLUDED_VCL_INC_GENERIC_GENSYS_H
 
 #include <salsys.hxx>
-#include <salframe.hxx>
-#include <vclpluginapi.h>
 #include <vector>
 
 /*
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index bc4d038b15b1..a566f628012c 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -21,21 +21,18 @@
 #define INCLUDED_VCL_INC_GENERIC_GLYPHCACHE_HXX
 
 #include <memory>
-#include <ft2build.h>
+#include <freetype/config/ftheader.h>
 #include FT_FREETYPE_H
 #include FT_GLYPH_H
 
-#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <tools/gen.hxx>
 #include <tools/solar.h>
 #include <vcl/dllapi.h>
-#include <vcl/metric.hxx>
+#include <vcl/outdev.hxx>
 
-#include <sallayout.hxx>
 #include <fontattributes.hxx>
-#include <fontselect.hxx>
+#include <fontinstance.hxx>
 #include <impfontmetricdata.hxx>
-#include <hb-ot.h>
 
 #include <unordered_map>
 
diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h
index 97d9db837683..4028f76dc52e 100644
--- a/vcl/inc/unx/gtk/gloactiongroup.h
+++ b/vcl/inc/unx/gtk/gloactiongroup.h
@@ -11,7 +11,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
 #define INCLUDED_VCL_INC_UNX_GTK_GLOACTIONGROUP_H
 
-#include <gio/gio.h>
+#include <glib-object.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/vcl/inc/unx/helper.hxx b/vcl/inc/unx/helper.hxx
index c02d9578426f..ac018b37419e 100644
--- a/vcl/inc/unx/helper.hxx
+++ b/vcl/inc/unx/helper.hxx
@@ -22,9 +22,6 @@
 
 #include <vector>
 
-#include <vcl/dllapi.h>
-#include <vcl/vclevent.hxx>
-
 #include <rtl/ustring.hxx>
 
 
diff --git a/vcl/inc/unx/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 3a98941714ee..9a879596c6f8 100644
--- a/vcl/inc/unx/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -24,8 +24,6 @@
 #include <salimestatus.hxx>
 #include <vcl/vclptr.hxx>
 
-#include <vector>
-
 class SalFrame;
 class WorkWindow;
 class ListBox;
diff --git a/vcl/inc/unx/pixmap.hxx b/vcl/inc/unx/pixmap.hxx
index 81144a2cda10..bc7f34612e4d 100644
--- a/vcl/inc/unx/pixmap.hxx
+++ b/vcl/inc/unx/pixmap.hxx
@@ -10,10 +10,8 @@
 #ifndef INCLUDED_VCL_INC_UNX_PIXMAP_HXX
 #define INCLUDED_VCL_INC_UNX_PIXMAP_HXX
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+#include <X11/X.h>
 
-#include <tools/gen.hxx>
 #include <unx/saltype.h>
 #include <vclpluginapi.h>
 
diff --git a/vcl/inc/unx/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index e6e32e461f9b..a8f0dc0ab7c2 100644
--- a/vcl/inc/unx/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
@@ -20,11 +20,12 @@
 #ifndef INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
 #define INCLUDED_VCL_INC_GENERIC_PRINTERGFX_HXX
 
-#include <unx/helper.hxx>
-#include <sallayout.hxx>
 #include <osl/file.hxx>
 #include <tools/gen.hxx>
-#include <vclpluginapi.h>
+#include <vcl/dllapi.h>
+#include <vcl/glyphitem.hxx>
+
+#include <impglyphitem.hxx>
 
 #include <list>
 #include <vector>
diff --git a/vcl/inc/unx/printerjob.hxx b/vcl/inc/unx/printerjob.hxx
index 7052a1416e37..9fe4a3db4945 100644
--- a/vcl/inc/unx/printerjob.hxx
+++ b/vcl/inc/unx/printerjob.hxx
@@ -22,7 +22,6 @@
 
 #include <vcl/jobdata.hxx>
 #include <osl/file.hxx>
-#include <rtl/string.hxx>
 
 #include <vector>
 
diff --git a/vcl/inc/unx/salbmp.h b/vcl/inc/unx/salbmp.h
index 832831660dd0..f889d44349f1 100644
--- a/vcl/inc/unx/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -21,13 +21,11 @@
 #define INCLUDED_VCL_INC_UNX_SALBMP_H
 
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
 #include <vcl/salgtype.hxx>
 #include <unx/saldisp.hxx>
 #include <salbmp.hxx>
 #include <vclpluginapi.h>
-#include <list>
 
 struct  BitmapBuffer;
 class   BitmapPalette;
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index eed9619608ed..3201c6e70700 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -21,29 +21,15 @@
 #define INCLUDED_VCL_INC_UNX_SALDATA_HXX
 
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
 #include <unx/saldisp.hxx>
-#include <unx/salunx.h>
-#include <vcl/salgtype.hxx>
-#include <salframe.hxx>
-#include <unx/salinst.h>
 #include <unx/gendata.hxx>
-#include <osl/module.h>
 #include <vclpluginapi.h>
 
 class SalXLib;
 class SalDisplay;
 class SalPrinter;
 
-#if defined LINUX || defined NETBSD || defined AIX || \
-    defined FREEBSD || defined OPENBSD || defined DRAGONFLY || \
-    defined ANDROID
-#include <pthread.h>
-#else
-typedef unsigned int pthread_t;
-#endif
-
 class VCLPLUG_GEN_PUBLIC X11SalData : public GenericUnixSalData
 {
     struct XErrorStackEntry
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index eda1ed863523..7d721253e4d0 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -27,17 +27,14 @@ class   SalXLib;
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/extensions/Xrender.h>
+#include <X11/extensions/render.h>
 #include <epoxy/glx.h>
 
 #include <rtl/string.hxx>
-#include <unx/salunx.h>
 #include <unx/saltype.h>
 #include <vcl/opengl/OpenGLContext.hxx>
-#include <vcl/salgtype.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <sal/types.h>
-#include <osl/mutex.h>
 #include <cassert>
 #include <list>
 #include <unordered_map>
diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h
index 0452efb6c916..7a67f92db49d 100644
--- a/vcl/inc/unx/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -21,9 +21,7 @@
 #define INCLUDED_VCL_INC_UNX_SALFRAME_H
 
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
-#include <unx/salunx.h>
 #include <unx/saltype.h>
 #include <unx/saldisp.hxx>
 #include <unx/screensaverinhibitor.hxx>
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 697a76eb2fd0..9ef55fb3827f 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -20,13 +20,11 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALINST_H
 #define INCLUDED_VCL_INC_UNX_SALINST_H
 
-#include <osl/thread.hxx>
 #include <vclpluginapi.h>
 #include <salinst.hxx>
 #include <unx/geninst.h>
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
+#include <X11/X.h>
 
 namespace com { namespace sun { namespace star { namespace datatransfer {
     namespace clipboard { class XClipboard; }
diff --git a/vcl/inc/unx/salunx.h b/vcl/inc/unx/salunx.h
index 5dfae767c804..b70f45769d7c 100644
--- a/vcl/inc/unx/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_VCL_INC_UNX_SALUNX_H
 #define INCLUDED_VCL_INC_UNX_SALUNX_H
 
-#include <unx/salunxtime.h>
-
 inline long Divide( long nDividend, long nDivisor )
 { return (nDividend + nDivisor/2) / nDivisor; }
 
diff --git a/vcl/inc/unx/screensaverinhibitor.hxx b/vcl/inc/unx/screensaverinhibitor.hxx
index a1042da33a54..fc85b187d22d 100644
--- a/vcl/inc/unx/screensaverinhibitor.hxx
+++ b/vcl/inc/unx/screensaverinhibitor.hxx
@@ -11,10 +11,7 @@
 #define INCLUDED_VCL_INC_UNX_SCREENSAVERINHIBITOR_HXX
 
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#if !defined(__sun) && !defined(AIX)
-#include <X11/extensions/dpms.h>
-#endif
+#include <X11/Xmd.h>
 
 #include <rtl/ustring.hxx>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index 6ebc983ab768..7df7ca25cd19 100644
--- a/vcl/inc/unx/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -24,7 +24,6 @@
 #include <tools/gen.hxx>
 
 #include <X11/Xlib.h>
-#include <X11/Xutil.h>
 
 #include <vclpluginapi.h>
 #include "salframe.h"
diff --git a/vcl/inc/unx/x11/x11sys.hxx b/vcl/inc/unx/x11/x11sys.hxx
index 1dc4a76726de..085a36d7718f 100644
--- a/vcl/inc/unx/x11/x11sys.hxx
+++ b/vcl/inc/unx/x11/x11sys.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_VCL_INC_UNX_X11_X11SYS_HXX
 
 #include <unx/gensys.h>
-#include <osl/thread.hxx>
 #include <vclpluginapi.h>
 
 class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalGenericSystem
diff --git a/vcl/inc/unx/x11/xrender_peer.hxx b/vcl/inc/unx/x11/xrender_peer.hxx
index 05312bfcb3e5..bbf51c9ea709 100644
--- a/vcl/inc/unx/x11/xrender_peer.hxx
+++ b/vcl/inc/unx/x11/xrender_peer.hxx
@@ -25,8 +25,7 @@
 struct _XTrap; // on some older systems this is not declared within Xrender.h
 #include <X11/extensions/Xrender.h>
 
-#include <vcl/salgtype.hxx>
-#include <osl/module.h>
+#include <tools/color.hxx>
 
 
 class XRenderPeer
diff --git a/vcl/inc/widgetdraw/WidgetDefinition.hxx b/vcl/inc/widgetdraw/WidgetDefinition.hxx
index c8b4fca5fd3f..40a688f7a28a 100644
--- a/vcl/inc/widgetdraw/WidgetDefinition.hxx
+++ b/vcl/inc/widgetdraw/WidgetDefinition.hxx
@@ -18,7 +18,6 @@
 #include <unordered_map>
 #include <vector>
 #include <cstddef>
-#include <functional>
 #include <boost/functional/hash.hpp>
 #include <vcl/salnativewidgets.hxx>
 
diff --git a/vcl/opengl/LineRenderUtils.cxx b/vcl/opengl/LineRenderUtils.cxx
index e62d884b3b6e..61d0dc38457c 100644
--- a/vcl/opengl/LineRenderUtils.cxx
+++ b/vcl/opengl/LineRenderUtils.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <opengl/LineRenderUtils.hxx>
+#include <opengl/VertexUtils.hxx>
 
 namespace vcl
 {
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 9d42d03149a5..1914a4f6f60a 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <openglgdiimpl.hxx>
+#include <opengl/framebuffer.hxx>
 
 #include <vcl/gradient.hxx>
 #include <vcl/idle.hxx>
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 2fbd40da73b2..b0d1188519c2 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -10,6 +10,7 @@
 #include <memory>
 #include <thread>
 #include <opengl/win/gdiimpl.hxx>
+#include <vcl/opengl/OpenGLHelper.hxx>
 
 #include <sal/log.hxx>
 #include <comphelper/windowserrorstring.hxx>
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index d087a1595ac6..6258d34e024b 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -21,7 +21,7 @@
 
 #include <osl/module.h>
 #include <osl/file.hxx>
-#include <osl/thread.h>
+#include <osl/thread.hxx>
 #include <osl/module.hxx>
 
 #include <rtl/tencinfo.h>
diff --git a/vcl/source/font/fontinstance.cxx b/vcl/source/font/fontinstance.cxx
index bcbbe6d94d9d..0d5e6444a50c 100644
--- a/vcl/source/font/fontinstance.cxx
+++ b/vcl/source/font/fontinstance.cxx
@@ -18,6 +18,8 @@
  */
 
 
+#include <hb-ot.h>
+
 #include <svdata.hxx>
 #include <fontinstance.hxx>
 #include <impfontcache.hxx>
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 90c519385bd2..0ecf733a328d 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -20,6 +20,7 @@
 #include <memory>
 
 #include <hb-icu.h>
+#include <hb-ot.h>
 
 #include <sallayout.hxx>
 
diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 393fab87c7b0..9c91681d1817 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <FileDefinitionWidgetDraw.hxx>
+#include <widgetdraw/WidgetDefinitionReader.hxx>
 
 #include <sal/config.h>
 #include <svdata.hxx>
diff --git a/vcl/source/gdi/svmconverter.cxx b/vcl/source/gdi/svmconverter.cxx
index 71c7c5c7b26f..7c019534ffe1 100644
--- a/vcl/source/gdi/svmconverter.cxx
+++ b/vcl/source/gdi/svmconverter.cxx
@@ -29,12 +29,14 @@
 #include <vcl/virdev.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/lineinfo.hxx>
+#include <vcl/metaact.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
 #include <svmconverter.hxx>
 #include <memory>
+#include <stack>
 
 // Inlines
 static void ImplReadRect( SvStream& rIStm, tools::Rectangle& rRect )
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index c85bbc53c6dc..7a03f85468dd 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -23,6 +23,9 @@
 #include <vcl/svapp.hxx>
 #include <sal/log.hxx>
 
+#include <officecfg/Office/Common.hxx>
+#include <unotools/configmgr.hxx>
+
 using namespace css;
 
 namespace vcl
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index 65fb116ae047..31cc27a572cc 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -21,6 +21,7 @@
 #include <i18nlangtag/lang.h>
 
 #include <unotools/configmgr.hxx>
+#include <vcl/metric.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/print.hxx>
 #include <vcl/sysdata.hxx>
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index fb3092739ffc..5fe146448f23 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -31,6 +31,7 @@
 #include <tools/debug.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metric.hxx>
 #include <vcl/textrectinfo.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bitmapaccess.hxx>
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index c1365e887526..52a4c7e8e97a 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -32,8 +32,10 @@
 #include <vcl/help.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/tabpage.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/virdev.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/lstbox.hxx>
 #include <jobset.h>
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index decdaa50177e..e0ee680251ad 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -43,6 +43,7 @@
 
 #include <unx/saldisp.hxx>
 #include <unx/saldata.hxx>
+#include <unx/salunxtime.h>
 #include <unx/sm.hxx>
 #include <unx/i18n_im.hxx>
 #include <unx/i18n_xkb.hxx>
@@ -54,6 +55,7 @@
 #include <salinst.hxx>
 #include <saltimer.hxx>
 
+#include <osl/diagnose.h>
 #include <osl/signal.h>
 #include <osl/thread.h>
 #include <rtl/strbuf.hxx>
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index d0b04b13f1e6..d2f94a73622c 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -64,6 +64,7 @@
 #include <unx/salframe.h>
 #include <vcl/keycodes.hxx>
 #include <unx/salbmp.h>
+#include <osl/diagnose.h>
 #include <osl/mutex.h>
 #include <unx/salobj.h>
 #include <unx/sm.hxx>
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index e16f13a87f68..d56f6f728e79 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -26,6 +26,7 @@
 #include <unx/salunx.h>
 #include <unx/saldata.hxx>
 #include <unx/saldisp.hxx>
+#include <unx/salinst.h>
 #include <unx/geninst.h>
 #include <unx/genpspgraphics.h>
 #include <unx/salframe.h>
diff --git a/vcl/unx/generic/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx
index 639c37a98335..df5e32aa2d2e 100644
--- a/vcl/unx/generic/app/saltimer.cxx
+++ b/vcl/unx/generic/app/saltimer.cxx
@@ -23,6 +23,7 @@
 #include <unistd.h>
 
 #include <unx/salunx.h>
+#include <unx/salunxtime.h>
 #include <unx/saldisp.hxx>
 #include <unx/saltimer.h>
 #include <unx/salinst.h>
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index e13eb0a82716..b518493a967d 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <unx/fontmanager.hxx>
+#include <unx/helper.hxx>
 #include <impfont.hxx>
 #include <comphelper/sequence.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 7c6f40641887..fd0cdc6a1bb9 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -31,6 +31,7 @@
 #include <svdata.hxx>
 #include <unx/geninst.h>
 #include <unx/gendata.hxx>
+#include <unx/helper.hxx>
 #include <vcl/strhelper.hxx>
 #include <vcl/ppdparser.hxx>
 #include <vcl/embeddedfontshelper.hxx>
diff --git a/vcl/unx/generic/printer/cpdmgr.cxx b/vcl/unx/generic/printer/cpdmgr.cxx
index fe3b44918d16..4861daac500b 100644
--- a/vcl/unx/generic/printer/cpdmgr.cxx
+++ b/vcl/unx/generic/printer/cpdmgr.cxx
@@ -22,6 +22,7 @@
 #include <unx/cpdmgr.hxx>
 
 #include <osl/diagnose.h>
+#include <osl/file.hxx>
 #include <osl/thread.h>
 
 #include <rtl/ustrbuf.hxx>
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 503ca6c4b224..34da816abb28 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -28,6 +28,7 @@
 
 #include <osl/thread.h>
 #include <osl/diagnose.h>
+#include <osl/file.hxx>
 #include <osl/conditn.hxx>
 
 #include <rtl/ustrbuf.hxx>
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index f70141c9e16c..21cad665bf25 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -23,6 +23,7 @@
 
 #include <unx/cpdmgr.hxx>
 #include <unx/cupsmgr.hxx>
+#include <unx/helper.hxx>
 #include <vcl/strhelper.hxx>
 
 #include <saldatabasic.hxx>
@@ -36,6 +37,7 @@
 #include <sal/macros.h>
 #include <sal/log.hxx>
 
+#include <osl/file.hxx>
 #include <osl/thread.hxx>
 #include <osl/mutex.hxx>
 #include <osl/process.h>
diff --git a/vcl/unx/generic/window/screensaverinhibitor.cxx b/vcl/unx/generic/window/screensaverinhibitor.cxx
index 4b9253d6869e..d597cdb619ff 100644
--- a/vcl/unx/generic/window/screensaverinhibitor.cxx
+++ b/vcl/unx/generic/window/screensaverinhibitor.cxx
@@ -14,6 +14,10 @@
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
+#if !defined(__sun) && !defined(AIX)
+#include <X11/extensions/dpms.h>
+#endif
+
 #include <config_gio.h>
 
 #if ENABLE_GIO
diff --git a/vcl/unx/gtk/gtksys.cxx b/vcl/unx/gtk/gtksys.cxx
index bad2285576d5..373459589429 100644
--- a/vcl/unx/gtk/gtksys.cxx
+++ b/vcl/unx/gtk/gtksys.cxx
@@ -22,6 +22,7 @@
 #include <gtk/gtk.h>
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtksys.hxx>
+#include <osl/module.h>
 
 GtkSalSystem *GtkSalSystem::GetSingleton()
 {
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index 0de96d2be4ca..17929b296581 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -9,6 +9,7 @@
 
 #include <sal/config.h>
 #include <sal/log.hxx>
+#include <osl/module.h>
 
 #include <config_cairo_canvas.h>