tdf#42949 Fix remaining IWYU warnings in include/vcl/*

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

Some new headers were added since I begun the cleanup here
Also blacklist the header from commit 403e3c04420c4d20c77427c43df52d554d7329ff

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

32 files changed, 55 insertions, 18 deletions

diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx
index f6ffe537e981..3e604e1f42e6 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -20,6 +20,7 @@
 #include <extended/AccessibleBrowseBox.hxx>
 #include <extended/AccessibleBrowseBoxTable.hxx>
 #include <extended/AccessibleBrowseBoxHeaderBar.hxx>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/accessibletableprovider.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sal/types.h>
@@ -32,7 +33,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::accessibility;
-using namespace ::svt;
 
 // Ctor/Dtor/disposing
 
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 9759737c0759..833904ff0418 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/IllegalAccessibleComponentStateException.hpp>
 #include <unotools/accessiblerelationsethelper.hxx>
+#include <vcl/window.hxx>
 #include <vcl/svapp.hxx>
 #include <sal/log.hxx>
 
@@ -36,7 +37,6 @@ using ::com::sun::star::uno::Any;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 using namespace ::comphelper;
-using namespace ::svt;
 
 
 namespace accessibility {
diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
index 3ce5479b207e..33b3ed3f7851 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx
@@ -20,13 +20,13 @@
 #include <extended/AccessibleBrowseBoxCheckBoxCell.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <vcl/accessibletableprovider.hxx>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 namespace accessibility
 {
     using namespace com::sun::star::accessibility;
     using namespace com::sun::star::uno;
     using namespace com::sun::star::accessibility::AccessibleEventId;
-    using namespace ::svt;
 
     AccessibleCheckBoxCell::AccessibleCheckBoxCell(const Reference<XAccessible >& _rxParent,
                                 vcl::IAccessibleTableProvider& _rBrowseBox,
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
index 15ba28a03a52..538a77cba2ae 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx
@@ -19,6 +19,7 @@
 
 #include <extended/AccessibleBrowseBoxHeaderBar.hxx>
 #include <vcl/accessibletableprovider.hxx>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
@@ -26,7 +27,6 @@ using ::com::sun::star::uno::Any;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
-using namespace ::svt;
 
 
 namespace accessibility {
diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
index 8037c3386e21..28dbc2d0c8f8 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx
@@ -21,13 +21,13 @@
 #include <extended/AccessibleBrowseBoxHeaderCell.hxx>
 #include <vcl/accessibletableprovider.hxx>
 #include <extended/AccessibleBrowseBox.hxx>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 namespace accessibility
 {
     using namespace ::com::sun::star::accessibility;
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::uno;
-    using namespace ::svt;
 
 AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnRowId,
                                   const Reference< XAccessible >& rxParent,
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
index c9d296bc1b49..bc25e4853305 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx
@@ -19,6 +19,7 @@
 
 #include <extended/AccessibleBrowseBoxTable.hxx>
 #include <vcl/accessibletableprovider.hxx>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 
 using ::com::sun::star::uno::Reference;
@@ -26,7 +27,6 @@ using ::com::sun::star::uno::Sequence;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
-using namespace ::svt;
 
 
 namespace accessibility {
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
index 9387b39b5ddb..9bbfcb759248 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx
@@ -21,6 +21,7 @@
 #include <vcl/accessibletableprovider.hxx>
 #include <tools/multisel.hxx>
 #include <comphelper/sequence.hxx>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 
 using css::uno::Reference;
@@ -29,7 +30,6 @@ using css::uno::Any;
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
-using namespace ::svt;
 
 
 namespace accessibility {
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 53c1a7aa2faa..908ccf1fff57 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -21,6 +21,7 @@
 #include <extended/AccessibleBrowseBoxTableCell.hxx>
 #include <vcl/accessibletableprovider.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 namespace accessibility
 {
@@ -44,7 +45,6 @@ namespace accessibility
     using namespace ::com::sun::star::uno;
     using ::com::sun::star::accessibility::XAccessible;
     using namespace ::com::sun::star::accessibility;
-    using namespace ::svt;
 
 
     // implementation of a table cell
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx
index fe050cef4c20..a61c39821d0c 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -23,6 +23,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/accessibletable.hxx>
 #include <comphelper/types.hxx>
 
diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx
index 5a870ff41814..a59f9a8d8776 100644
--- a/accessibility/source/extended/AccessibleGridControlBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlBase.cxx
@@ -19,6 +19,7 @@
 
 #include <extended/AccessibleGridControlBase.hxx>
 #include <vcl/accessibletable.hxx>
+#include <vcl/window.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <sal/types.h>
 
diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx
index b28cbdeba4c1..fbdd86d2adc1 100644
--- a/accessibility/source/extended/AccessibleGridControlHeader.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <extended/AccessibleGridControlHeader.hxx>
 #include <extended/AccessibleGridControlHeaderCell.hxx>
 #include <extended/AccessibleGridControlTableCell.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
index d2d47cbcce27..ada3507cbee0 100644
--- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <extended/AccessibleGridControlHeaderCell.hxx>
 #include <vcl/accessibletable.hxx>
 #include <extended/AccessibleGridControl.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 1711efa4efc8..75c21fb55530 100644
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <extended/AccessibleGridControlTable.hxx>
 #include <extended/AccessibleGridControlTableCell.hxx>
 #include <vcl/accessibletable.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index b34a207d1bdf..bf88eac8acc9 100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <extended/AccessibleGridControlTableBase.hxx>
 #include <vcl/accessibletable.hxx>
 #include <tools/multisel.hxx>
diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
index 1bac475d58c1..0a7290ff50ec 100644
--- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx
@@ -22,6 +22,7 @@
 #include <tools/gen.hxx>
 #include <tools/debug.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 namespace accessibility
 {
diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx
index 6240238379bf..5b22181bd6f3 100644
--- a/accessibility/source/extended/accessiblebrowseboxcell.cxx
+++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx
@@ -26,7 +26,6 @@ namespace accessibility
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::accessibility;
-    using namespace ::svt;
 
     // AccessibleBrowseBoxCell
     AccessibleBrowseBoxCell::AccessibleBrowseBoxCell(
diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx
index 4ed0b54b90bd..2bd92178de9f 100644
--- a/accessibility/source/extended/accessibletablistbox.cxx
+++ b/accessibility/source/extended/accessibletablistbox.cxx
@@ -21,6 +21,7 @@
 #include <extended/accessibletablistbox.hxx>
 #include <extended/accessibletablistboxtable.hxx>
 #include <vcl/svtabbx.hxx>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 
 namespace accessibility
diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx
index 11c926aa3cf1..fc454c75b0d0 100644
--- a/accessibility/source/extended/accessibletablistboxtable.cxx
+++ b/accessibility/source/extended/accessibletablistboxtable.cxx
@@ -23,6 +23,7 @@
 #include <extended/AccessibleBrowseBoxCheckBoxCell.hxx>
 #include <vcl/svtabbx.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 
 namespace accessibility
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx
index d6b6ece8fc5d..e57858d0048a 100644
--- a/cui/source/customize/SvxConfigPageHelper.cxx
+++ b/cui/source/customize/SvxConfigPageHelper.cxx
@@ -19,6 +19,8 @@
 
 #include <SvxConfigPageHelper.hxx>
 
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+
 #include <comphelper/random.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index ef1ba183e2ed..9cdbaff441b0 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -46,6 +46,7 @@
 #include <com/sun/star/form/XSubmitListener.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/form/runtime/FormOperations.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/ErrorCondition.hpp>
diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx
index 4605cf6983f8..67a04c52e159 100644
--- a/filter/qa/cppunit/filters-pict-test.cxx
+++ b/filter/qa/cppunit/filters-pict-test.cxx
@@ -12,6 +12,7 @@
 #include <vcl/FilterConfigItem.hxx>
 #include <test/xmltesttools.hxx>
 #include <tools/stream.hxx>
+#include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/metaactiontypes.hxx>
 
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 6a94bcdeca5f..e9f6ccf7d8fe 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -242,10 +242,16 @@ blacklist:
     include/svl/urihelper.hxx:
     # base class has to be a complete type
     - tools/link.hxx
+    include/vcl/FilterConfigItem.hxx:
+    # Needed on Windows with --disable-pch
+    - com/sun/star/beans/PropertyValue.hpp
     include/vcl/builderfactory.hxx:
     # Needed for macros
     - vcl/builder.hxx
     - vcl/vclptr.hxx
+    include/vcl/decoview.hxx:
+    # Full definition needed for VclPtr
+    - vcl/outdev.hxx
     include/vcl/devicecoordinate.hxx:
     # Needed for #if configure switch
     - basegfx/point/b2ipoint.hxx
@@ -262,6 +268,9 @@ blacklist:
     # Needed for macros
     - com/sun/star/awt/Key.hpp
     - com/sun/star/awt/KeyGroup.hpp
+    include/vcl/mtfxmldump.hxx:
+    # Full definition needed for o3tl::enumarray
+    - vcl/metaactiontypes.hxx
     include/vcl/outdevstate.hxx:
     # Full definition needed for boost::optional
     - vcl/mapmod.hxx
diff --git a/include/vcl/accessiblefactory.hxx b/include/vcl/accessiblefactory.hxx
index 8426333ecfd7..a191b0193705 100644
--- a/include/vcl/accessiblefactory.hxx
+++ b/include/vcl/accessiblefactory.hxx
@@ -21,12 +21,11 @@
 #define INCLUDED_VCL_ACCESSIBLEFACTORY_HXX
 
 #include <vcl/AccessibleBrowseBoxObjType.hxx>
-#include <vcl/accessibletableprovider.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
+#include <tools/gen.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace accessibility {
@@ -37,6 +36,11 @@ namespace com { namespace sun { namespace star {
         class XWindow;
     }
 } } }
+
+namespace vcl { class IAccessibleBrowseBox; }
+namespace vcl { class IAccessibleTabListBox; }
+namespace vcl { class IAccessibleTableProvider; }
+
 class SvHeaderTabListBox;
 class SvtIconChoiceCtrl;
 class TabBar;
diff --git a/include/vcl/accessibletable.hxx b/include/vcl/accessibletable.hxx
index d6c0dc3b7ffc..f132466c1590 100644
--- a/include/vcl/accessibletable.hxx
+++ b/include/vcl/accessibletable.hxx
@@ -20,9 +20,13 @@
 #ifndef INCLUDED_VCL_ACCESSIBLETABLE_HXX
 #define INCLUDED_VCL_ACCESSIBLETABLE_HXX
 
-#include <vcl/window.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <tools/gen.hxx>
+
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
+namespace utl { class AccessibleStateSetHelper; }
+namespace vcl { class Window; }
 
 namespace vcl { namespace table
 {
diff --git a/include/vcl/accessibletableprovider.hxx b/include/vcl/accessibletableprovider.hxx
index 982ac62c0905..03aba6d3ef6c 100644
--- a/include/vcl/accessibletableprovider.hxx
+++ b/include/vcl/accessibletableprovider.hxx
@@ -20,10 +20,11 @@
 #ifndef INCLUDED_VCL_ACCESSIBLETABLEPROVIDER_HXX
 #define INCLUDED_VCL_ACCESSIBLETABLEPROVIDER_HXX
 
-#include <vcl/window.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/AccessibleBrowseBoxObjType.hxx>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <vcl/outdev.hxx>
+
+namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
+namespace utl { class AccessibleStateSetHelper; }
 
 namespace vcl
 {
diff --git a/include/vcl/mtfxmldump.hxx b/include/vcl/mtfxmldump.hxx
index 797430d0cc6b..3bdf4d663eb9 100644
--- a/include/vcl/mtfxmldump.hxx
+++ b/include/vcl/mtfxmldump.hxx
@@ -12,11 +12,12 @@
 
 #include <sal/config.h>
 #include <vcl/dllapi.h>
-#include <vcl/gdimtf.hxx>
 #include <vcl/metaactiontypes.hxx>
 #include <o3tl/enumarray.hxx>
 
 namespace tools { class XmlWriter; }
+class GDIMetaFile;
+class SvStream;
 
 enum class MetaActionType;
 
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 822eef3e1c30..cc5b535767e2 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -20,6 +20,7 @@
 #include <svtools/brwbox.hxx>
 #include <vcl/AccessibleBrowseBoxObjType.hxx>
 #include <vcl/accessiblefactory.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <tools/multisel.hxx>
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 1e3338adc612..102e8397dd94 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -29,6 +29,7 @@
 
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
+#include <unotools/accessiblestatesethelper.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/vclevent.hxx>
 
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 4c556201eb5e..e170d185bdd9 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include <vcl/svapp.hxx>
 
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 534c608811de..d79bf4ab08f8 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
diff --git a/vcl/source/helper/svtaccessiblefactory.cxx b/vcl/source/helper/svtaccessiblefactory.cxx
index 1351309391b2..460241e121e9 100644
--- a/vcl/source/helper/svtaccessiblefactory.cxx
+++ b/vcl/source/helper/svtaccessiblefactory.cxx
@@ -27,6 +27,7 @@
 
 #include <osl/module.h>
 #include <osl/diagnose.h>
+#include <rtl/ref.hxx>
 
 namespace vcl
 {
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index e78274b74bdd..993ccc2c2580 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -24,6 +24,7 @@
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistentry.hxx>
 #include <vcl/builderfactory.hxx>
+#include <unotools/accessiblestatesethelper.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <o3tl/make_unique.hxx>