tdf#42949 Fix IWYU warnings in vcl/unx/gtk3 and gtk3_kde5/

Also recheck vcl/source after recent reworks and f-u-i updates.
Some new blacklist entries were needed for keeping existing
fw declarations in headers.

Add blacklist entries for removals causing no-pch build failures
that were reverted in:
a3b03ba1316b1ec0a9b0a3b45b96dc0a49aa9f1f
75d924db95559cff5f699bad8fe34bb0aeac0ff6
b57052ec2bbe548ca495a32b4bfce1d1c71caf33

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

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

50 files changed, 64 insertions, 195 deletions

diff --git a/vcl/IwyuFilter_vcl.yaml b/vcl/IwyuFilter_vcl.yaml
index e99d502e2739..423c06109643 100644
--- a/vcl/IwyuFilter_vcl.yaml
+++ b/vcl/IwyuFilter_vcl.yaml
@@ -25,17 +25,41 @@ blacklist:
     vcl/qa/cppunit/outdev.cxx:
     # Needed for direct member access
     - basegfx/matrix/b2dhommatrix.hxx
+    vcl/source/app/salplug.cxx:
+    # Needed on WIN32
+    - salframe.hxx
     vcl/source/app/svdata.cxx:
     # Needed on WIN32
     - com/sun/star/accessibility/MSAAService.hpp
+    - salframe.hxx
     vcl/source/app/svmain.cxx:
     # Needed on WIN32
     - desktop/exithelper.h
+    vcl/source/components/factory.cxx:
+    # Actually these are used
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    - com/sun/star/lang/XSingleServiceFactory.hpp
+    vcl/source/filter/FilterConfigItem.cxx:
+    # Needed for direct member access
+    - com/sun/star/task/XStatusIndicator.hpp
     vcl/source/filter/ipdf/pdfdocument.cxx:
     - comphelper/scopeguard.hxx
+    # Actually these are used
+    - com/sun/star/security/XCertificate.hpp
+    - vector
     vcl/source/filter/jpeg/JpegWriter.hxx:
     # Needed for direct member access
     - vcl/bitmapaccess.hxx
+    vcl/source/filter/png/pngwrite.cxx:
+    # Actually these are used
+    - com/sun/star/beans/PropertyValue.hpp
+    - com/sun/star/uno/Sequence.hxx
+    vcl/source/filter/wmf/wmfexternal.cxx:
+    # Actually these are used
+    - com/sun/star/beans/PropertyValue.hpp
+    vcl/source/font/fontselect.cxx:
+    # Needed on WIN32
+    - PhysicalFontFace.hxx
     vcl/source/fontsubset/sft.cxx:
     # OSL_BIGENDIAN is being checked
     - osl/endian.h
@@ -47,6 +71,16 @@ blacklist:
     vcl/source/gdi/salgdilayout.cxx:
     # Needed on WIN32
     - desktop/exithelper.h
+    vcl/source/helper/commandinfoprovider.cxx:
+    # Actually these are used
+    - com/sun/star/frame/XFrame.hpp
+    vcl/source/image/ImageTree.cxx:
+    # Actually these are used
+    - com/sun/star/container/XNameAccess.hpp
+    - com/sun/star/uno/Reference.hxx
+    vcl/source/treelist/headbar.cxx:
+    # Actually these are used
+    - com/sun/star/accessibility/XAccessible.hpp
     vcl/source/window/dialog.cxx:
     # comphelper::ScopeGuard is actually used
     - comphelper/scopeguard.hxx
@@ -68,6 +102,27 @@ blacklist:
     vcl/unx/generic/print/genpspgraphics.cxx:
     # Complete type needed for implicit dtor
     - vcl/fontcharmap.hxx
-    vcl/source/app/svdata.cxx:
-    # Needed on WIN32
-    - salframe.hxx
+    vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx:
+    # Actually these are used
+    - QUrl
+    - KFileWidget
+    vcl/unx/gtk3_kde5/kde5_filepicker.cxx:
+    # Actually these are used
+    - KWindowSystem
+    - KFileWidget
+    - QtCore/QDebug
+    - QtCore/QUrl
+    - QtWidgets/QCheckBox
+    - QtWidgets/QFileDialog
+    - QtWidgets/QGridLayout
+    - QtWidgets/QWidget
+    - QtWidgets/QApplication
+    vcl/unx/gtk3_kde5/kde5_lo_filepicker_main.cxx:
+    # Actually these are used
+    - QApplication
+    - QCommandLineParser
+    vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx:
+    # Actually these are used
+    - QUrl
+    - QApplication
+    - QDebug
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index c3d24c8a6994..c4c3be9699e3 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -23,7 +23,6 @@
 #include <osl/thread.hxx>
 #include <osl/module.hxx>
 
-#include <rtl/tencinfo.h>
 #include <sal/log.hxx>
 
 #include <tools/debug.hxx>
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 5cc57f19a822..b99a56a4fc0c 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -23,8 +23,6 @@
 
 #include <vcleventlisteners.hxx>
 
-#include <com/sun/star/accessibility/XAccessible.hpp>
-
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::accessibility::XAccessible;
 
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index b7a77541f019..3a286f026cba 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -35,7 +35,6 @@
 #include <vcl/vclstatuslistener.hxx>
 #include <vcl/uitest/uiobject.hxx>
 
-#include <strings.hrc>
 #include <bitmaps.hlst>
 #include <svdata.hxx>
 #include <window.h>
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index 2a3da888744d..cb73add6300f 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <strings.hrc>
diff --git a/vcl/source/font/PhysicalFontCollection.cxx b/vcl/source/font/PhysicalFontCollection.cxx
index 00b06f589ad8..9fbcabb95cc1 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <memory>
-#include <map>
 
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 2e477927a7b8..3b7a7ed09f7f 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -32,8 +32,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <comphelper/sequence.hxx>
 
-#include <vector>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::rtl;
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 1c79d6c9fc7f..12bfc93c0d76 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -17,11 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/stream.hxx>
-#include <tools/vcompat.hxx>
 #include <tools/gen.hxx>
-#include <tools/GenericTypeSerializer.hxx>
-#include <TypeSerializer.hxx>
 #include <vcl/gradient.hxx>
 
 Impl_Gradient::Impl_Gradient() :
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 5625ac8d8efc..ec2de64a74fe 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -22,17 +22,13 @@
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/image.hxx>
-#include <vcl/metaact.hxx>
 #include <impgraph.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <graphic/UnoGraphic.hxx>
 #include <vcl/GraphicExternalLink.hxx>
 
-#include <image.h>
-
 using namespace ::com::sun::star;
 
 namespace
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 3f7dc7f93c61..5170134cc24c 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -19,7 +19,6 @@
 
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
-#include <tools/GenericTypeSerializer.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/wall.hxx>
diff --git a/vcl/source/graphic/UnoGraphic.cxx b/vcl/source/graphic/UnoGraphic.cxx
index 447d8d451921..4fddaebd6cdb 100644
--- a/vcl/source/graphic/UnoGraphic.cxx
+++ b/vcl/source/graphic/UnoGraphic.cxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <string.h>
 
 using namespace com::sun::star;
 
diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx
index d6fdc61715e8..ad6f2457a394 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/commandinfoprovider.hxx>
-#include <vcl/graph.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/mnemonic.hxx>
 #include <comphelper/string.hxx>
diff --git a/vcl/source/window/NotebookBarAddonsMerger.cxx b/vcl/source/window/NotebookBarAddonsMerger.cxx
index f9d70181b814..814c0b6161c5 100644
--- a/vcl/source/window/NotebookBarAddonsMerger.cxx
+++ b/vcl/source/window/NotebookBarAddonsMerger.cxx
@@ -25,9 +25,7 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/toolbox.hxx>
-#include <osl/module.hxx>
 #include <vcl/OptionalBox.hxx>
-#include <sfx2/sidebar/SidebarToolBox.hxx>
 #include <vcl/IPrioritable.hxx>
 
 static const char STYLE_TEXT[] = "Text";
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 5913751b945f..ac8ee8daf4f4 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -58,7 +58,6 @@
 #include <strings.hrc>
 #include <aboutdialog.hxx>
 #include <treeglue.hxx>
-#include <tools/svlibrary.h>
 #include <tools/diagnose_ex.h>
 #include <wizdlg.hxx>
 
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index f510b38ce767..0f8ba88e61b7 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -22,9 +22,6 @@
 #include <vcl/vclmedit.hxx>
 #include <sal/log.hxx>
 
-#include <svdata.hxx>
-#include <strings.hrc>
-
 VclContainer::VclContainer(vcl::Window *pParent, WinBits nStyle)
     : Window(WindowType::CONTAINER)
     , m_bLayoutDirty(true)
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 43e281610d8c..ee277808d2e8 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -21,7 +21,6 @@
 #include "X11_clipboard.hxx"
 #include "X11_transferable.hxx"
 #include <com/sun/star/datatransfer/clipboard/RenderingCapabilities.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ref.hxx>
 
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index b0b088d8432d..52a3bd73a618 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -46,7 +46,6 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/polygon/b2dtrapezoid.hxx>
 #include <basegfx/utils/systemdependentdata.hxx>
-#include <ControlCacheKey.hxx>
 
 #undef SALGDI2_TESTTRANS
 
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 2e10ac7b0bed..d9a2d97490b1 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -20,17 +20,12 @@
 #include <salgdiimpl.hxx>
 
 #include <vcl/sysdata.hxx>
-#include <sal/log.hxx>
 
 #include <unx/saldisp.hxx>
-#include <unx/salbmp.h>
 #include <unx/salgdi.h>
-#include <unx/x11/x11gdiimpl.h>
 #include <unx/x11/xrender_peer.hxx>
 #include <salframe.hxx>
 
-#include <ControlCacheKey.hxx>
-
 extern "C"
 {
     static Bool GraphicsExposePredicate( Display*, XEvent* pEvent, const XPointer pFrameWindow )
diff --git a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx b/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
index 90cb06ef0647..ddcc20f2037a 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
@@ -18,9 +18,7 @@
  */
 
 #include <unx/gtk/atkbridge.hxx>
-#include <unx/gtk/gtkframe.hxx>
 
-#include "atkfactory.hxx"
 #include "atkutil.hxx"
 
 bool InitAtkBridge()
diff --git a/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx b/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
index 49d3eb9ccfc9..f240c32324c6 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
@@ -21,7 +21,6 @@
 #include "atktextattributes.hxx"
 
 #include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
-#include <com/sun/star/accessibility/TextSegment.hpp>
 
 #include <string.h>
 
diff --git a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
index c30bc638bced..4a7d41638479 100644
--- a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
@@ -35,7 +35,6 @@
 #include "atkwrapper.hxx"
 #include <vcl/svapp.hxx>
 
-#include <rtl/ref.hxx>
 #include <sal/log.hxx>
 
 #define DEBUG_ATK_LISTENER 0
diff --git a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
index 0ba7fd561862..52f0a34cd3a2 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
@@ -37,8 +37,6 @@
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 
 #include <i18nlangtag/languagetag.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/outdev.hxx>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
index ef2f941e526a..e1526b5af5cf 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <rtl/ref.hxx>
 #include <sal/log.hxx>
 
 #include <vcl/svapp.hxx>
@@ -44,9 +43,6 @@
 #include "atkwrapper.hxx"
 #include "atkutil.hxx"
 
-#include <gtk/gtk.h>
-#include <config_version.h>
-
 #include <cassert>
 #include <set>
 
diff --git a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
index cd439022cf2a..a4eb72add4b4 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
@@ -26,47 +26,28 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleText.hpp>
-#include <com/sun/star/accessibility/XAccessibleTextMarkup.hpp>
-#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext2.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp>
 #include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 #include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
 #include <com/sun/star/accessibility/XAccessibleImage.hpp>
-#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
 #include <com/sun/star/accessibility/XAccessibleHypertext.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <com/sun/star/awt/XExtendedToolkit.hpp>
-#include <com/sun/star/awt/XTopWindow.hpp>
-#include <com/sun/star/awt/XTopWindowListener.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/beans/Property.hpp>
-
-#include <rtl/ref.hxx>
+
 #include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/queryinterface.hxx>
 
 #include "atkwrapper.hxx"
 #include "atkregistry.hxx"
 #include "atklistener.hxx"
 #include "atktextattributes.hxx"
 
-#include <string.h>
 #include <vector>
 
 using namespace ::com::sun::star;
diff --git a/vcl/unx/gtk3/cairo_gtk3_cairo.cxx b/vcl/unx/gtk3/cairo_gtk3_cairo.cxx
index 5f0e0b7a136f..4b5f7358d070 100644
--- a/vcl/unx/gtk3/cairo_gtk3_cairo.cxx
+++ b/vcl/unx/gtk3/cairo_gtk3_cairo.cxx
@@ -7,15 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <utility>
-
 #include "cairo_gtk3_cairo.hxx"
 
 #include <vcl/sysdata.hxx>
-#include <vcl/bitmap.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/window.hxx>
-#include <basegfx/vector/b2isize.hxx>
 
 #include <unx/gtk/gtkgdi.hxx>
 
diff --git a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
index f333702761b0..54444d8997c6 100644
--- a/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
+++ b/vcl/unx/gtk3/cairo_gtk3_cairo.hxx
@@ -12,8 +12,6 @@
 
 #include <sal/config.h>
 
-#include <sal/types.h>
-
 #include <vcl/cairo.hxx>
 
 class GtkSalGraphics;
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
index d95f58035aad..1892155527bc 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFilePicker.cxx
@@ -31,12 +31,10 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/SystemDependent.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <osl/diagnose.h>
-#include <osl/process.h>
 #include <rtl/process.h>
 #include <sal/log.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
index 13df53994dee..bb940cf5fcfb 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkFolderPicker.cxx
@@ -27,18 +27,12 @@
 
 #include <com/sun/star/awt/Toolkit.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <vcl/svapp.hxx>
 #include <unx/gtk/gtkinst.hxx>
 #include "SalGtkFolderPicker.hxx"
 #include <sal/log.hxx>
 
-#include <string.h>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::lang;
diff --git a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
index 7db114069651..e3c27f1379dd 100644
--- a/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk3/fpicker/SalGtkPicker.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <rtl/process.h>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/unx/gtk3/fpicker/resourceprovider.cxx b/vcl/unx/gtk3/fpicker/resourceprovider.cxx
index 818018b4a7e5..178374de6186 100644
--- a/vcl/unx/gtk3/fpicker/resourceprovider.cxx
+++ b/vcl/unx/gtk3/fpicker/resourceprovider.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
-#include <unotools/resmgr.hxx>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
diff --git a/vcl/unx/gtk3/gtk3gloactiongroup.cxx b/vcl/unx/gtk3/gtk3gloactiongroup.cxx
index 08ab8e90e980..88189f34e23e 100644
--- a/vcl/unx/gtk3/gtk3gloactiongroup.cxx
+++ b/vcl/unx/gtk3/gtk3gloactiongroup.cxx
@@ -10,8 +10,6 @@
 #include <unx/gtk/gtksalmenu.hxx>
 
 #include <unx/gtk/gloactiongroup.h>
-#include <unx/gtk/gtkinst.hxx>
-#include <unx/gtk/gtkframe.hxx>
 
 #include <sal/log.hxx>
 
diff --git a/vcl/unx/gtk3/gtk3glomenu.cxx b/vcl/unx/gtk3/gtk3glomenu.cxx
index f14ab27b737b..d6ac0d0a89ae 100644
--- a/vcl/unx/gtk3/gtk3glomenu.cxx
+++ b/vcl/unx/gtk3/gtk3glomenu.cxx
@@ -7,9 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <string.h>
-
-#include <unx/gtk/gtksalmenu.hxx>
 #include <unx/gtk/glomenu.h>
 
 struct GLOMenu
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index f15f099ab646..e1c19825de3c 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -18,14 +18,9 @@
  */
 
 #include <unistd.h>
-#include <fcntl.h>
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <limits.h>
-#include <errno.h>
-#include <poll.h>
 #if defined(FREEBSD) || defined(NETBSD)
 #include <sys/types.h>
 #include <sys/time.h>
@@ -34,27 +29,14 @@
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtkframe.hxx>
-#include <unx/gtk/gtksalmenu.hxx>
-#include <unx/salobj.h>
-#include <unx/geninst.h>
 #include <bitmaps.hlst>
 #include <cursor_hotspots.hxx>
 #include <osl/thread.h>
 #include <osl/process.h>
 
-#include <unx/i18n_im.hxx>
-#include <unx/i18n_xkb.hxx>
-#include <unx/wmadaptor.hxx>
-
 #include <vcl/svapp.hxx>
-#include <vcl/BitmapTools.hxx>
 #include <sal/log.hxx>
 
-#ifdef GDK_WINDOWING_X11
-#  include <gdk/gdkx.h>
-#endif
-
-#include <cppuhelper/exc_hlp.hxx>
 #include <chrono>
 
 
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5eb9cfa951e3..deeaac3140cd 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -25,16 +25,8 @@
 #include <unx/gtk/hudawareness.h>
 #include <vcl/event.hxx>
 #include <vcl/keycodes.hxx>
-#include <unx/wmadaptor.hxx>
-#include <unx/sm.hxx>
-#include <unx/salbmp.h>
-#include <unx/genprn.h>
 #include <unx/geninst.h>
 #include <headless/svpgdi.hxx>
-#include <o3tl/runtimetooustring.hxx>
-#include <osl/file.hxx>
-#include <rtl/bootstrap.hxx>
-#include <rtl/process.h>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/floatwin.hxx>
@@ -42,28 +34,18 @@
 #include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 #include <vcl/settings.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <config_gio.h>
 
 #include <gtk/gtk.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/Xatom.h>
 #include <unx/gtk/gtkbackend.hxx>
 
-#include <dlfcn.h>
 #include <window.h>
-#include <strings.hrc>
-#include <bitmaps.hlst>
-#include <sal/macros.h>
 
-#include <basegfx/range/b2ibox.hxx>
 #include <basegfx/vector/b2ivector.hxx>
 
 #include <algorithm>
-#include <glib/gprintf.h>
 
 #if OSL_DEBUG_LEVEL > 1
 #  include <cstdio>
@@ -74,13 +56,10 @@
 #include <cstdlib>
 #include <cmath>
 
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
 #include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 
-#include <config_folders.h>
-
 #define IS_WIDGET_REALIZED gtk_widget_get_realized
 #define IS_WIDGET_MAPPED   gtk_widget_get_mapped
 
diff --git a/vcl/unx/gtk3/gtk3gtkobject.cxx b/vcl/unx/gtk3/gtk3gtkobject.cxx
index 400f82ad47a3..6e98f6ca0f11 100644
--- a/vcl/unx/gtk3/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/gtk3gtkobject.cxx
@@ -23,11 +23,10 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
+#include <unx/gtk/gtkbackend.hxx>
 #include <unx/gtk/gtkobject.hxx>
 #include <unx/gtk/gtkframe.hxx>
 #include <unx/gtk/gtkdata.hxx>
-#include <unx/gtk/gtkinst.hxx>
-#include <unx/gtk/gtkgdi.hxx>
 
 GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow )
         : m_pSocket(nullptr)
diff --git a/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
index b1a8b9c66d13..04a9533e6d10 100644
--- a/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
+++ b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
@@ -7,10 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <cassert>
-
-#include <rtl/ustring.hxx>
-
 #include <unx/gtk/gtkprintwrapper.hxx>
 
 namespace vcl
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 6fb544de2642..6602534f5882 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -9,15 +9,12 @@
 
 #include <unx/gtk/gtksalmenu.hxx>
 
-#include <unx/gendata.hxx>
-#include <unx/saldisp.hxx>
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/glomenu.h>
 #include <unx/gtk/gloactiongroup.h>
 #include <vcl/floatwin.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/pngwrite.hxx>
-#include <unx/gtk/gtkinst.hxx>
 
 #include <sal/log.hxx>
 #include <tools/stream.hxx>
diff --git a/vcl/unx/gtk3/gtk3gtksys.cxx b/vcl/unx/gtk3/gtk3gtksys.cxx
index daf332b29d30..379c87343ae8 100644
--- a/vcl/unx/gtk3/gtk3gtksys.cxx
+++ b/vcl/unx/gtk3/gtk3gtksys.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <string.h>
-#include <gmodule.h>
 #include <gtk/gtk.h>
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtksys.hxx>
diff --git a/vcl/unx/gtk3/gtk3hudawareness.cxx b/vcl/unx/gtk3/gtk3hudawareness.cxx
index 0aa5878a1afe..79ade04b4ee1 100644
--- a/vcl/unx/gtk3/gtk3hudawareness.cxx
+++ b/vcl/unx/gtk3/gtk3hudawareness.cxx
@@ -9,7 +9,6 @@
 
 #include <string.h>
 
-#include <unx/gtk/gtksalmenu.hxx>
 #include <unx/gtk/hudawareness.h>
 
 struct HudAwarenessHandle
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index bddcc85bc8e9..57fff4c6a473 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -13,7 +13,6 @@
 
 #include <config_cairo_canvas.h>
 
-#include <basegfx/range/b2ibox.hxx>
 #include <unx/gtk/gtkframe.hxx>
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/gtkinst.hxx>
diff --git a/vcl/unx/gtk3/gtk3salprn-gtk.cxx b/vcl/unx/gtk3/gtk3salprn-gtk.cxx
index aeb9b1de246c..7d214a70afcc 100644
--- a/vcl/unx/gtk3/gtk3salprn-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salprn-gtk.cxx
@@ -23,24 +23,13 @@
 #include <gtk/gtk.h>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
-#include <com/sun/star/sheet/XSpreadsheet.hpp>
-#include <com/sun/star/sheet/XSpreadsheetView.hpp>
 #include <com/sun/star/view/PrintableState.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
 
 #include <officecfg/Office/Common.hxx>
 
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
-#include <unotools/streamwrap.hxx>
-
 #include <cstring>
 #include <map>
 
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index 68c31d9561ad..eec532d4091a 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -22,27 +22,19 @@
 
 #include "gtk3_kde5_filepicker.hxx"
 
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ControlActions.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <osl/mutex.hxx>
-
-#include <fpicker/strings.hrc>
+#include <sal/log.hxx>
+#include <vcl/svapp.hxx>
 
 #include "FPServiceInfo.hxx"
 
 #undef Region
 
-#include <unx/geninst.h>
-
 #include <strings.hrc>
 
 using namespace ::com::sun::star;
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.hxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.hxx
index 740382d9ec49..7ce391004894 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.hxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.hxx
@@ -27,15 +27,10 @@
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <osl/conditn.hxx>
 #include <osl/mutex.hxx>
 
-#include <rtl/ustrbuf.hxx>
-
 #include "gtk3_kde5_filepicker_ipc.hxx"
 
-#include <functional>
-
 typedef ::cppu::WeakComponentImplHelper<css::ui::dialogs::XFilePicker3,
                                         css::ui::dialogs::XFilePickerControlAccess
                                         // TODO css::ui::dialogs::XFilePreview
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index 6ca43ee3a78e..80c15938bdaf 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -21,11 +21,6 @@
 
 #undef Region
 
-#include <unx/geninst.h>
-
-#include <strings.hrc>
-
-#include <future>
 #include <system_error>
 
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
@@ -38,11 +33,11 @@
 #include <osl/process.h>
 
 #include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <unx/gtk/gtkdata.hxx>
 
 #include <boost/filesystem/path.hpp>
 
+#include <svdata.hxx>
+
 using namespace ::com::sun::star::ui::dialogs;
 
 // helper functions
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx
index b1a8770c5165..e24fb92de023 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx
@@ -19,14 +19,8 @@
 
 #pragma once
 
-#include <cppuhelper/compbase.hxx>
-
-#include <osl/conditn.hxx>
-#include <osl/mutex.hxx>
 #include <osl/process.h>
 
-#include <rtl/ustrbuf.hxx>
-
 #include "filepicker_ipc_commands.hxx"
 
 #include <functional>
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx
index fcfe9f51d685..fa0b562cc81c 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx
@@ -19,13 +19,6 @@
 
 #include "gtk3_kde5_folderpicker.hxx"
 
-#include <com/sun/star/awt/Toolkit.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <vcl/svapp.hxx>
 
 #include <strings.hrc>
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.hxx b/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.hxx
index fed9f0bc5a12..9801a072acc4 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.hxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <list>
-#include <memory>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index 4fba409eb615..064c696953cb 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -26,8 +26,6 @@
 
 #include <QtCore/QDebug>
 #include <QtCore/QUrl>
-#include <QtGui/QClipboard>
-#include <QtGui/QWindow>
 #include <QtWidgets/QCheckBox>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QGridLayout>
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
index 1e0eacd7ff48..7f0bfff985b5 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
@@ -19,9 +19,7 @@
 
 #include "kde5_filepicker_ipc.hxx"
 
-#include <QSocketNotifier>
 #include <QUrl>
-#include <QThread>
 #include <QApplication>
 #include <QDebug>
 
@@ -29,8 +27,6 @@
 
 #include "kde5_filepicker.hxx"
 
-#include <rtl/ustring.h>
-
 void readIpcArg(std::istream& stream, QString& string)
 {
     const auto buffer = readIpcStringArg(stream);
diff --git a/vcl/unx/gtk3_kde5/kde5_lo_filepicker_main.cxx b/vcl/unx/gtk3_kde5/kde5_lo_filepicker_main.cxx
index d25af0afee70..4e73e9ee45e1 100644
--- a/vcl/unx/gtk3_kde5/kde5_lo_filepicker_main.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_lo_filepicker_main.cxx
@@ -21,7 +21,6 @@
 #include "kde5_filepicker_ipc.hxx"
 
 #include <QApplication>
-#include <QDebug>
 #include <QCommandLineParser>
 
 #include <config_version.h>