bin/find-unneeded-includes | 8 ++++++++
vcl/IwyuFilter_vcl.yaml | 19 ++++++++++++-------
vcl/inc/qt5/QtX11Support.hxx | 2 +-
vcl/qt5/QtAccessibleEventListener.cxx | 1 -
vcl/qt5/QtAccessibleWidget.cxx | 2 --
vcl/qt5/QtBitmap.cxx | 3 ---
vcl/qt5/QtBuilder.cxx | 4 +---
vcl/qt5/QtClipboard.cxx | 2 --
vcl/qt5/QtCustomStyle.cxx | 3 ++-
vcl/qt5/QtData.cxx | 1 -
vcl/qt5/QtDragAndDrop.cxx | 4 ----
vcl/qt5/QtFilePicker.cxx | 7 -------
vcl/qt5/QtFont.cxx | 1 -
vcl/qt5/QtFontFace.cxx | 4 ----
vcl/qt5/QtFrame.cxx | 5 -----
vcl/qt5/QtGraphics_Controls.cxx | 1 -
vcl/qt5/QtGraphics_GDI.cxx | 3 ---
vcl/qt5/QtInstance.cxx | 2 --
vcl/qt5/QtInstanceEntryTreeView.cxx | 2 --
vcl/qt5/QtInstanceLabel.cxx | 2 --
vcl/qt5/QtInstanceLevelBar.cxx | 2 --
vcl/qt5/QtInstanceMenu.cxx | 1 -
vcl/qt5/QtInstanceWidget.cxx | 1 -
vcl/qt5/QtInstance_Print.cxx | 5 -----
vcl/qt5/QtMenu.cxx | 1 -
vcl/qt5/QtObject.cxx | 1 -
vcl/qt5/QtSvpGraphics.cxx | 3 ---
vcl/qt5/QtSvpSurface.cxx | 3 ---
vcl/qt5/QtTimer.cxx | 1 -
vcl/qt5/QtTransferable.cxx | 2 --
vcl/qt5/QtWidget.cxx | 6 +-----
vcl/qt5/QtX11Support.cxx | 3 ---
vcl/qt5/QtXAccessible.cxx | 7 -------
33 files changed, 25 insertions(+), 87 deletions(-)
New commits:
commit 6cf20bff7284f3c72fa74c3427115c61edecbe08
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Sun Jun 1 12:41:44 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Mon Jun 2 15:37:47 2025 +0200
find-unneeded-includes: handle IWYU warnings about Qt headers
Second try after https://gerrit.libreoffice.org/c/core/+/179708
Skip all QT headers in the form of QtLib/QClass, clean the
vcl/qt5 dir from LO-internal headers
Change-Id: Icf9edd1f617adc06dcb6ba6bcc4aa0debc275ab1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186107
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes
index 100ee38c6672..fc1473ccf0e8 100755
--- a/bin/find-unneeded-includes
+++ b/bin/find-unneeded-includes
@@ -105,6 +105,14 @@ def ignoreRemoval(include, toAdd, absFileName,
moduleRules, noexclude):
if include == k and v in toAdd:
return True
+ # Most Qt headers are used as <QtLib/QClass> and IWYU suggests
+ # them to be replaced with QtLib/qclass.h, these could be skipped
+ # BUT: Several Qt 6 minor versions are supported,
+ # making testing of false positives over-expensive
+ # so just skip all those headers for now
+ if include.startswith("Qt") and '/' in include:
+ return True
+
# 3rd-party, non-self-contained headers.
if include == "libepubgen/libepubgen.h" and
"libepubgen/libepubgen-decls.h" in toAdd:
return True
diff --git a/vcl/IwyuFilter_vcl.yaml b/vcl/IwyuFilter_vcl.yaml
index 28f96567caf8..dd85fbbe767a 100644
--- a/vcl/IwyuFilter_vcl.yaml
+++ b/vcl/IwyuFilter_vcl.yaml
@@ -100,13 +100,6 @@ excludelist:
# 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
@@ -119,3 +112,15 @@ excludelist:
vcl/qa/cppunit/filter/ipdf/ipdf.cxx:
- prewin.h
- postwin.h
+ vcl/qt5/QtAccessibleWidget.cxx:
+ # Needed for QT 6.9
+ - com/sun/star/accessibility/XAccessibleContext2.hpp
+ # Needed for QT 6.8
+ - com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp
+ # Actually used
+ - com/sun/star/accessibility/XAccessibleContext.hpp
+ vcl/qt5/QtInstance.cxx:
+ # Needed for EMSCRIPTEN build
+ - o3tl/temporary.hxx
+ - o3tl/unreachable.hxx
+ - comphelper/emscriptenthreading.hxx
diff --git a/vcl/inc/qt5/QtX11Support.hxx b/vcl/inc/qt5/QtX11Support.hxx
index d96c26a2eec4..e07ec7666f0b 100644
--- a/vcl/inc/qt5/QtX11Support.hxx
+++ b/vcl/inc/qt5/QtX11Support.hxx
@@ -11,7 +11,7 @@
#include <string_view>
-#include <xcb/xcb.h>
+#include <xcb/xproto.h>
class QtX11Support final
{
diff --git a/vcl/qt5/QtAccessibleEventListener.cxx
b/vcl/qt5/QtAccessibleEventListener.cxx
index b160b47e3093..dea9cd35401f 100644
--- a/vcl/qt5/QtAccessibleEventListener.cxx
+++ b/vcl/qt5/QtAccessibleEventListener.cxx
@@ -19,7 +19,6 @@
#include <QtAccessibleEventListener.hxx>
#include <QtAccessibleRegistry.hxx>
-#include <QtTools.hxx>
#include <sal/log.hxx>
diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx
index 835b1ad7f883..0ced72c74ee3 100644
--- a/vcl/qt5/QtAccessibleWidget.cxx
+++ b/vcl/qt5/QtAccessibleWidget.cxx
@@ -50,12 +50,10 @@
#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
#include <com/sun/star/accessibility/XAccessibleText.hpp>
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <comphelper/AccessibleImplementationHelper.hxx>
-#include <o3tl/any.hxx>
#include <sal/log.hxx>
#include <vcl/accessibility/AccessibleTextAttributeHelper.hxx>
#include <vcl/qt/QtUtils.hxx>
diff --git a/vcl/qt5/QtBitmap.cxx b/vcl/qt5/QtBitmap.cxx
index 235f94715e04..a69ee562046b 100644
--- a/vcl/qt5/QtBitmap.cxx
+++ b/vcl/qt5/QtBitmap.cxx
@@ -25,9 +25,6 @@
#include <QtCore/QVector>
#include <QtGui/QColor>
-#include <o3tl/safeint.hxx>
-#include <sal/log.hxx>
-#include <tools/helpers.hxx>
#include <svdata.hxx>
#include <salinst.hxx>
diff --git a/vcl/qt5/QtBuilder.cxx b/vcl/qt5/QtBuilder.cxx
index 0d97fb2f5154..c41a24c25e9e 100644
--- a/vcl/qt5/QtBuilder.cxx
+++ b/vcl/qt5/QtBuilder.cxx
@@ -11,13 +11,11 @@
#include <QtDoubleSpinBox.hxx>
#include <QtExpander.hxx>
-#include <QtInstanceLinkButton.hxx>
#include <QtInstanceMenu.hxx>
#include <QtInstanceMessageDialog.hxx>
#include <QtInstanceNotebook.hxx>
-#include <QtTools.hxx>
+#include <QtHyperlinkLabel.hxx>
-#include <rtl/ustrbuf.hxx>
#include <vcl/qt/QtUtils.hxx>
#include <QtCore/QSortFilterProxyModel>
diff --git a/vcl/qt5/QtClipboard.cxx b/vcl/qt5/QtClipboard.cxx
index 3ca3d74d2992..8ffe0c0bc5fb 100644
--- a/vcl/qt5/QtClipboard.cxx
+++ b/vcl/qt5/QtClipboard.cxx
@@ -11,7 +11,6 @@
#include <QtClipboard.hxx>
#include <QtClipboard.moc>
-#include <comphelper/diagnose_ex.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <sal/log.hxx>
@@ -19,7 +18,6 @@
#include <QtInstance.hxx>
#include <QtTransferable.hxx>
-#include <QtTools.hxx>
#include <cassert>
#include <map>
diff --git a/vcl/qt5/QtCustomStyle.cxx b/vcl/qt5/QtCustomStyle.cxx
index 26678ea530cc..06948147d037 100644
--- a/vcl/qt5/QtCustomStyle.cxx
+++ b/vcl/qt5/QtCustomStyle.cxx
@@ -9,9 +9,10 @@
#include <IconThemeSelector.hxx>
#include <QtCustomStyle.hxx>
-#include <QtFrame.hxx>
+#include <QtTools.hxx>
#include <QtWidgets/qdrawutil.h>
#include <QtWidgets/QApplication>
+#include <vcl/svapp.hxx>
#include <vcl/themecolors.hxx>
#include <vcl/qt/QtUtils.hxx>
diff --git a/vcl/qt5/QtData.cxx b/vcl/qt5/QtData.cxx
index 18e08892477f..767cc0714f7a 100644
--- a/vcl/qt5/QtData.cxx
+++ b/vcl/qt5/QtData.cxx
@@ -31,7 +31,6 @@
#include <bitmaps.hlst>
#include <cursor_hotspots.hxx>
-#include <unx/glyphcache.hxx>
QtData::QtData()
: GenericUnixSalData()
diff --git a/vcl/qt5/QtDragAndDrop.cxx b/vcl/qt5/QtDragAndDrop.cxx
index 53761064ccb4..7da39b9da213 100644
--- a/vcl/qt5/QtDragAndDrop.cxx
+++ b/vcl/qt5/QtDragAndDrop.cxx
@@ -8,16 +8,12 @@
*
*/
-#include <com/sun/star/awt/MouseButton.hpp>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <cppuhelper/supportsservice.hxx>
-#include <sal/log.hxx>
#include <QtDragAndDrop.hxx>
#include <QtFrame.hxx>
#include <QtTransferable.hxx>
-#include <QtWidget.hxx>
#include <QtGui/QDrag>
diff --git a/vcl/qt5/QtFilePicker.cxx b/vcl/qt5/QtFilePicker.cxx
index 788b452f4b2b..adf23cb134ca 100644
--- a/vcl/qt5/QtFilePicker.cxx
+++ b/vcl/qt5/QtFilePicker.cxx
@@ -24,8 +24,6 @@
#include <QtFilePicker.moc>
#include <QtFrame.hxx>
-#include <QtTools.hxx>
-#include <QtWidget.hxx>
#include <QtInstance.hxx>
#include <QtXWindow.hxx>
@@ -33,18 +31,14 @@
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/TerminationVetoException.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp>
-#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/supportsservice.hxx>
-#include <rtl/process.h>
#include <sal/log.hxx>
#include <vcl/qt/QtUtils.hxx>
#include <vcl/toolkit/unowrap.hxx>
@@ -65,7 +59,6 @@
#include <QtWidgets/QPushButton>
#include <QtWidgets/QWidget>
-#include <unx/geninst.h>
#include <fpicker/strings.hrc>
#include <utility>
diff --git a/vcl/qt5/QtFont.cxx b/vcl/qt5/QtFont.cxx
index c7b5b75c2841..dc7dabb606f2 100644
--- a/vcl/qt5/QtFont.cxx
+++ b/vcl/qt5/QtFont.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <QtFont.hxx>
-#include <QtTools.hxx>
#include <vcl/qt/QtUtils.hxx>
diff --git a/vcl/qt5/QtFontFace.cxx b/vcl/qt5/QtFontFace.cxx
index 0ab744136d73..44a517c616a7 100644
--- a/vcl/qt5/QtFontFace.cxx
+++ b/vcl/qt5/QtFontFace.cxx
@@ -19,15 +19,11 @@
#include <sal/config.h>
-#include <unotools/fontdefs.hxx>
-
#include <QtFontFace.hxx>
#include <QtFont.hxx>
#include <QtTools.hxx>
#include <font/LogicalFontInstance.hxx>
-#include <font/FontSelectPattern.hxx>
-#include <font/PhysicalFontCollection.hxx>
#include <QtGui/QFont>
#include <QtGui/QFontDatabase>
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 6572320e7f80..b5b08ccae65b 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -17,20 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <IconThemeSelector.hxx>
#include <QtCustomStyle.hxx>
#include <QtFrame.hxx>
#include <QtFrame.moc>
#include <QtData.hxx>
#include <QtDragAndDrop.hxx>
-#include <QtFontFace.hxx>
#include <QtGraphics.hxx>
#include <QtInstance.hxx>
#include <QtMainWindow.hxx>
-#include <QtMenu.hxx>
#include <QtSvpGraphics.hxx>
-#include <QtSystem.hxx>
#include <QtTransferable.hxx>
#if CHECK_ANY_QT_USING_X11
#include <QtX11Support.hxx>
@@ -60,7 +56,6 @@
#include <window.h>
#include <vcl/qt/QtUtils.hxx>
-#include <vcl/syswin.hxx>
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
diff --git a/vcl/qt5/QtGraphics_Controls.cxx b/vcl/qt5/QtGraphics_Controls.cxx
index e88135f2f86f..f405c07d8ac5 100644
--- a/vcl/qt5/QtGraphics_Controls.cxx
+++ b/vcl/qt5/QtGraphics_Controls.cxx
@@ -28,7 +28,6 @@
#include <QtInstance.hxx>
#include <QtTools.hxx>
#include <QtGraphicsBase.hxx>
-#include <vcl/decoview.hxx>
#include <scrollbarvalue.hxx>
/**
diff --git a/vcl/qt5/QtGraphics_GDI.cxx b/vcl/qt5/QtGraphics_GDI.cxx
index 5f411e2ebf30..4cc10454ce6b 100644
--- a/vcl/qt5/QtGraphics_GDI.cxx
+++ b/vcl/qt5/QtGraphics_GDI.cxx
@@ -22,14 +22,11 @@
#include <QtBitmap.hxx>
#include <QtPainter.hxx>
-#include <sal/log.hxx>
-
#include <QtGui/QPainter>
#include <numeric>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <o3tl/string_view.hxx>
QtGraphicsBackend::QtGraphicsBackend(QtFrame* pFrame, QImage* pQImage)
: m_pFrame(pFrame)
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index c32ec7128d29..34692e7a719e 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -53,10 +53,8 @@
#include <vclpluginapi.h>
#include <tools/debug.hxx>
#include <comphelper/emscriptenthreading.hxx>
-#include <comphelper/flagguard.hxx>
#include <config_emscripten.h>
#include <config_vclplug.h>
-#include <dndhelper.hxx>
#include <vcl/qt/QtUtils.hxx>
#include <vcl/sysdata.hxx>
#include <sal/log.hxx>
diff --git a/vcl/qt5/QtInstanceEntryTreeView.cxx
b/vcl/qt5/QtInstanceEntryTreeView.cxx
index b7883becbfa0..ece912b845ef 100644
--- a/vcl/qt5/QtInstanceEntryTreeView.cxx
+++ b/vcl/qt5/QtInstanceEntryTreeView.cxx
@@ -10,8 +10,6 @@
#include <QtInstanceEntryTreeView.hxx>
#include <QtInstanceEntryTreeView.moc>
-#include <QtInstanceBuilder.hxx>
-
#include <QtWidgets/QCompleter>
QtInstanceEntryTreeView::QtInstanceEntryTreeView(QWidget* pContainer,
QLineEdit* pLineEdit,
diff --git a/vcl/qt5/QtInstanceLabel.cxx b/vcl/qt5/QtInstanceLabel.cxx
index 92329cbb4df5..48ecbe47a811 100644
--- a/vcl/qt5/QtInstanceLabel.cxx
+++ b/vcl/qt5/QtInstanceLabel.cxx
@@ -10,8 +10,6 @@
#include <QtInstanceLabel.hxx>
#include <QtInstanceLabel.moc>
-#include <vcl/qt/QtUtils.hxx>
-
QtInstanceLabel::QtInstanceLabel(QLabel* pLabel)
: QtInstanceWidget(pLabel)
, m_pLabel(pLabel)
diff --git a/vcl/qt5/QtInstanceLevelBar.cxx b/vcl/qt5/QtInstanceLevelBar.cxx
index 039b207b651f..ecf6c0f02338 100644
--- a/vcl/qt5/QtInstanceLevelBar.cxx
+++ b/vcl/qt5/QtInstanceLevelBar.cxx
@@ -10,8 +10,6 @@
#include <QtInstanceLevelBar.hxx>
#include <QtInstanceLevelBar.moc>
-#include <vcl/qt/QtUtils.hxx>
-
QtInstanceLevelBar::QtInstanceLevelBar(QProgressBar* pProgressBar)
: QtInstanceWidget(pProgressBar)
, m_pProgressBar(pProgressBar)
diff --git a/vcl/qt5/QtInstanceMenu.cxx b/vcl/qt5/QtInstanceMenu.cxx
index 1effb5913667..d7f15d3e6f12 100644
--- a/vcl/qt5/QtInstanceMenu.cxx
+++ b/vcl/qt5/QtInstanceMenu.cxx
@@ -11,7 +11,6 @@
#include <QtInstanceMenu.moc>
#include <QtInstance.hxx>
-#include <QtTools.hxx>
#include <vcl/svapp.hxx>
#include <vcl/qt/QtUtils.hxx>
diff --git a/vcl/qt5/QtInstanceWidget.cxx b/vcl/qt5/QtInstanceWidget.cxx
index d60b37dafadf..1d296cc33cb7 100644
--- a/vcl/qt5/QtInstanceWidget.cxx
+++ b/vcl/qt5/QtInstanceWidget.cxx
@@ -13,7 +13,6 @@
#include <QtInstanceContainer.hxx>
#include <i18nlangtag/languagetag.hxx>
-#include <vcl/event.hxx>
#include <vcl/transfer.hxx>
#include <vcl/qt/QtUtils.hxx>
diff --git a/vcl/qt5/QtInstance_Print.cxx b/vcl/qt5/QtInstance_Print.cxx
index 5719e6702994..1040cf5a63c5 100644
--- a/vcl/qt5/QtInstance_Print.cxx
+++ b/vcl/qt5/QtInstance_Print.cxx
@@ -24,14 +24,9 @@
#include <QtInstance.hxx>
#include <QtPrinter.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/timer.hxx>
-#include <vcl/QueueInfo.hxx>
#include <printerinfomanager.hxx>
-#include <jobset.h>
#include <print.h>
-#include <salptype.hxx>
#include <unx/genpspgraphics.h>
diff --git a/vcl/qt5/QtMenu.cxx b/vcl/qt5/QtMenu.cxx
index 0a8942015948..815404df75f2 100644
--- a/vcl/qt5/QtMenu.cxx
+++ b/vcl/qt5/QtMenu.cxx
@@ -35,7 +35,6 @@
#include <o3tl/safeint.hxx>
#include <vcl/svapp.hxx>
-#include <sal/log.hxx>
#include <strings.hrc>
#include <bitmaps.hlst>
diff --git a/vcl/qt5/QtObject.cxx b/vcl/qt5/QtObject.cxx
index a62be8f57d65..ced1a663f8cc 100644
--- a/vcl/qt5/QtObject.cxx
+++ b/vcl/qt5/QtObject.cxx
@@ -21,7 +21,6 @@
#include <QtObject.moc>
#include <QtFrame.hxx>
-#include <QtWidget.hxx>
#include <QtCore/QLibraryInfo>
#include <QtGui/QGuiApplication>
diff --git a/vcl/qt5/QtSvpGraphics.cxx b/vcl/qt5/QtSvpGraphics.cxx
index 16677fe0cf88..78bf9fc82b11 100644
--- a/vcl/qt5/QtSvpGraphics.cxx
+++ b/vcl/qt5/QtSvpGraphics.cxx
@@ -8,9 +8,6 @@
*/
#include <sal/config.h>
-#include <sal/log.hxx>
-#include <salbmp.hxx>
-#include <o3tl/string_view.hxx>
#include <config_cairo_canvas.h>
diff --git a/vcl/qt5/QtSvpSurface.cxx b/vcl/qt5/QtSvpSurface.cxx
index f2af352f8ae1..827f923baa1b 100644
--- a/vcl/qt5/QtSvpSurface.cxx
+++ b/vcl/qt5/QtSvpSurface.cxx
@@ -14,10 +14,7 @@
#include <QtSvpGraphics.hxx>
#include <vcl/sysdata.hxx>
-#include <vcl/bitmap.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/window.hxx>
-#include <basegfx/vector/b2isize.hxx>
namespace
{
diff --git a/vcl/qt5/QtTimer.cxx b/vcl/qt5/QtTimer.cxx
index 78856d104281..690a3920341d 100644
--- a/vcl/qt5/QtTimer.cxx
+++ b/vcl/qt5/QtTimer.cxx
@@ -28,7 +28,6 @@
#include <config_emscripten.h>
#include <config_vclplug.h>
#include <vcl/svapp.hxx>
-#include <sal/log.hxx>
#include <svdata.hxx>
diff --git a/vcl/qt5/QtTransferable.cxx b/vcl/qt5/QtTransferable.cxx
index edea493a8a11..e4cdd7d3466c 100644
--- a/vcl/qt5/QtTransferable.cxx
+++ b/vcl/qt5/QtTransferable.cxx
@@ -11,7 +11,6 @@
#include <QtTransferable.hxx>
#include <QtTransferable.moc>
-#include <comphelper/sequence.hxx>
#include <sal/log.hxx>
#include <o3tl/string_view.hxx>
#include <tools/debug.hxx>
@@ -20,7 +19,6 @@
#include <QtWidgets/QApplication>
#include <QtInstance.hxx>
-#include <QtTools.hxx>
#include <cassert>
diff --git a/vcl/qt5/QtWidget.cxx b/vcl/qt5/QtWidget.cxx
index c08d4bcca010..84170a87efad 100644
--- a/vcl/qt5/QtWidget.cxx
+++ b/vcl/qt5/QtWidget.cxx
@@ -21,10 +21,7 @@
#include <QtWidget.moc>
#include <QtFrame.hxx>
-#include <QtGraphics.hxx>
#include <QtInstance.hxx>
-#include <QtMainWindow.hxx>
-#include <QtSvpGraphics.hxx>
#include <QtTransferable.hxx>
#include <QtTools.hxx>
@@ -45,7 +42,6 @@
#include <QtWidgets/QToolTip>
#include <QtWidgets/QWidget>
-#include <cairo.h>
#include <vcl/commandevent.hxx>
#include <vcl/event.hxx>
#include <vcl/qt/QtUtils.hxx>
@@ -53,7 +49,7 @@
#include <window.h>
#include <comphelper/diagnose_ex.hxx>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
#if CHECK_ANY_QT_USING_X11
diff --git a/vcl/qt5/QtX11Support.cxx b/vcl/qt5/QtX11Support.cxx
index 041f87b0ddfd..4444984dcab7 100644
--- a/vcl/qt5/QtX11Support.cxx
+++ b/vcl/qt5/QtX11Support.cxx
@@ -9,11 +9,8 @@
#include <QtX11Support.hxx>
-#include <config_vclplug.h>
-
#include <QtCore/QVersionNumber>
-#include <QtInstance.hxx>
#include <QtTools.hxx>
#if CHECK_QT5_USING_X11
diff --git a/vcl/qt5/QtXAccessible.cxx b/vcl/qt5/QtXAccessible.cxx
index 56cc2b7e60e0..87fd0a2dd310 100644
--- a/vcl/qt5/QtXAccessible.cxx
+++ b/vcl/qt5/QtXAccessible.cxx
@@ -10,13 +10,6 @@
#include <QtXAccessible.hxx>
#include <QtXAccessible.moc>
-#include <QtFrame.hxx>
-#include <QtTools.hxx>
-#include <QtWidget.hxx>
-
-#include <com/sun/star/accessibility/XAccessible.hpp>
-
-#include <sal/log.hxx>
#include <utility>
using namespace css::accessibility;
