tdf#42949: clean up includes in include/svx/[a-c]* with iwyu

Change-Id: I7768f4dbe9892c4264cb16eed87497894aa7494e
Reviewed-on: https://gerrit.libreoffice.org/26582
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

53 files changed, 382 insertions, 105 deletions

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 9db35dd09b5f..9b4eb01f2b61 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -39,6 +39,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
+#include <svtools/svlbitm.hxx>
 #include "svtools/treelistentry.hxx"
 
 #define HHC editeng::HangulHanjaConversion
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index fb529346de18..23d35c487b53 100644
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -23,6 +23,7 @@
 #include "thesdlg.hxx"
 
 #include <svtools/ehdl.hxx>
+#include <svtools/svlbitm.hxx>
 #include <svx/checklbx.hxx>
 #include <vcl/button.hxx>
 #include <vcl/combobox.hxx>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 84fd5090593c..0d5638979904 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -47,6 +47,7 @@
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <unotools/extendedsecurityoptions.hxx>
+#include <svtools/svlbitm.hxx>
 #include <svtools/treelistbox.hxx>
 #include "svtools/treelistentry.hxx"
 #include <svtools/langhelp.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 66f06e456487..1c17f37ea850 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -40,6 +40,7 @@
 #include <sfx2/sfxsids.hrc>
 #include <svl/eitem.hxx>
 #include <svl/languageoptions.hxx>
+#include <svtools/svlbitm.hxx>
 #include <svx/SmartTagMgr.hxx>
 #include <com/sun/star/smarttags/XSmartTagRecognizer.hpp>
 #include <com/sun/star/smarttags/XSmartTagAction.hpp>
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 3a95896d96fa..01ccd70dedb2 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -19,6 +19,7 @@
 
 #include "borderconn.hxx"
 #include <svx/frmsel.hxx>
+#include <svx/svxids.hrc>
 #include "editeng/lineitem.hxx"
 #include <editeng/boxitem.hxx>
 #include <svx/algitem.hxx>
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 3515fbdacbb9..a3c28a5da164 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -20,18 +20,39 @@
 #ifndef INCLUDED_SVX_ACCESSIBLECONTROLSHAPE_HXX
 #define INCLUDED_SVX_ACCESSIBLECONTROLSHAPE_HXX
 
-#include <svx/AccessibleShape.hxx>
+#include <exception>
 
-#include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
-#include <com/sun/star/util/XModeChangeBroadcaster.hpp>
+#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/util/XModeChangeListener.hpp>
 #include <comphelper/uno3.hxx>
+#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svx/AccessibleShape.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt {
-    class XControl;
-} } } }
+namespace com { namespace sun { namespace star {
+    namespace accessibility { class XAccessible; }
+    namespace accessibility { class XAccessibleContext; }
+    namespace accessibility { struct AccessibleEventObject; }
+    namespace accessibility { class XAccessibleRelationSet; }
+    namespace awt { class XControl; }
+    namespace beans { class XPropertySet; }
+    namespace beans { class XPropertySetInfo; }
+    namespace beans { struct PropertyChangeEvent; }
+    namespace container { struct ContainerEvent; }
+    namespace lang { class XComponent; }
+    namespace lang { class XTypeProvider; }
+    namespace uno { class XAggregation; }
+    namespace util { struct ModeChangeEvent; }
+} } }
 
 namespace comphelper
 {
@@ -41,6 +62,9 @@ namespace comphelper
 class SdrObject;
 namespace accessibility {
 
+    class AccessibleShapeInfo;
+    class AccessibleShapeTreeInfo;
+
     typedef ::cppu::ImplHelper4 <   css::beans::XPropertyChangeListener
                                 ,   css::util::XModeChangeListener
                                                 ,   css::container::XContainerListener
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index b8f539b80f3f..1d4e7a5e5339 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -20,12 +20,23 @@
 #ifndef INCLUDED_SVX_ACCESSIBLEGRAPHICSHAPE_HXX
 #define INCLUDED_SVX_ACCESSIBLEGRAPHICSHAPE_HXX
 
-#include <svx/AccessibleShape.hxx>
+#include <exception>
+
 #include <com/sun/star/accessibility/XAccessibleImage.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Type.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svx/AccessibleShape.hxx>
 #include <svx/svxdllapi.h>
 
 namespace accessibility {
 
+class AccessibleShapeInfo;
+class AccessibleShapeTreeInfo;
+
 /** @descr
         This class makes graphic shapes accessible.  With respect to its
         base class AccessibleShape it supports the additional
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index fa06ef72a8f4..997d3dd98b8b 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -20,13 +20,29 @@
 #ifndef INCLUDED_SVX_ACCESSIBLEOLESHAPE_HXX
 #define INCLUDED_SVX_ACCESSIBLEOLESHAPE_HXX
 
-#include <svx/AccessibleShape.hxx>
+#include <exception>
 
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Type.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svx/AccessibleShape.hxx>
 #include <svx/svxdllapi.h>
 
+namespace com { namespace sun { namespace star {
+    namespace accessibility { class XAccessibleKeyBinding; }
+} } }
+
 namespace accessibility {
 
+class AccessibleShapeInfo;
+class AccessibleShapeTreeInfo;
+
 /** @descr
         This class makes OLE objects accessible.  With respect to its
         base class AccessibleShape it supports the additional
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 08c6150d74e6..8835cfaa9d7d 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -21,33 +21,55 @@
 #ifndef INCLUDED_SVX_ACCESSIBLESHAPE_HXX
 #define INCLUDED_SVX_ACCESSIBLESHAPE_HXX
 
-#include <editeng/AccessibleContextBase.hxx>
-#include <editeng/AccessibleComponentBase.hxx>
-#include <svx/IAccessibleViewForwarderListener.hxx>
-#include <com/sun/star/document/XEventListener.hpp>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
+#include <exception>
+
+#include <com/sun/star/accessibility/TextSegment.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <com/sun/star/accessibility/XAccessibleText.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
 #include <com/sun/star/accessibility/XAccessibleGroupPosition.hpp>
-#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
 #include <com/sun/star/accessibility/XAccessibleHypertext.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/document/XEventListener.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <svx/AccessibleTextHelper.hxx>
+#include <editeng/AccessibleContextBase.hxx>
+#include <editeng/AccessibleComponentBase.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svx/AccessibleShapeTreeInfo.hxx>
+#include <svx/IAccessibleViewForwarderListener.hxx>
 #include <svx/svxdllapi.h>
-#include <svx/ChildrenManager.hxx>
+
+namespace com { namespace sun { namespace star {
+    namespace accessibility { class XAccessible; }
+    namespace accessibility { class XAccessibleEventListener; }
+    namespace accessibility { class XAccessibleHyperlink; }
+    namespace accessibility { class XAccessibleRelationSet; }
+    namespace accessibility { class XAccessibleStateSet; }
+    namespace beans { struct PropertyValue; }
+    namespace document { struct EventObject; }
+    namespace drawing { class XShape; }
+    namespace uno { class XInterface; }
+} } }
 
 class SdrObject;
 
 namespace accessibility {
 
 class AccessibleShapeInfo;
-class AccessibleShapeTreeInfo;
+class AccessibleTextHelper;
+class ChildrenManager;
 class IAccessibleParent;
+class IAccessibleViewForwarder;
 
 /** This base class provides a base implementation for all shapes.  For more
     detailed documentation about the methods refer to the descriptions of
diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx
index d81529e8de0f..d40251c41237 100644
--- a/include/svx/AccessibleShapeInfo.hxx
+++ b/include/svx/AccessibleShapeInfo.hxx
@@ -20,13 +20,18 @@
 #ifndef INCLUDED_SVX_ACCESSIBLESHAPEINFO_HXX
 #define INCLUDED_SVX_ACCESSIBLESHAPEINFO_HXX
 
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <svx/IAccessibleParent.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <svx/svxdllapi.h>
 
+namespace com { namespace sun { namespace star {
+    namespace accessibility { class XAccessible; }
+    namespace drawing { class XShape; }
+} } }
+
 namespace accessibility {
 
+class IAccessibleParent;
+
 /** @descr
         This class is a container for the information specific for a single
         shape that is passed to the constructor of that shape.  It allows to
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx
index df3d39a097ce..1377ebab7258 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -20,19 +20,23 @@
 #ifndef INCLUDED_SVX_ACCESSIBLESHAPETREEINFO_HXX
 #define INCLUDED_SVX_ACCESSIBLESHAPETREEINFO_HXX
 
-#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <svx/IAccessibleViewForwarder.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <svx/svxdllapi.h>
 #include <vcl/vclptr.hxx>
 
+namespace com { namespace sun { namespace star {
+    namespace accessibility { class XAccessibleComponent; }
+    namespace document { class XEventBroadcaster; }
+    namespace frame { class XController; }
+} } }
+
 class SdrView;
 namespace vcl { class Window; }
 
 namespace accessibility {
 
+class IAccessibleViewForwarder;
+
 /** This class bundles all information that is passed down the tree of
     accessible shapes so that each shape has access to that info.
 
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index f156397ef6c9..3a8f04f523ee 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -21,18 +21,19 @@
 #define INCLUDED_SVX_ACCESSIBLETEXTHELPER_HXX
 
 #include <memory>
-#include <sal/types.h>
-#include <tools/gen.hxx>
+#include <vector>
+
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
-#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
+#include <sal/types.h>
 #include <svx/svxdllapi.h>
 
+namespace com { namespace sun { namespace star {
+    namespace accessibility { class XAccessible; }
+    namespace accessibility { class XAccessibleEventListener; }
+    namespace awt { struct Point; }
+} } }
 
-class SvxTextForwarder;
-class SvxViewForwarder;
+class Point;
 class SvxEditSource;
 
 namespace accessibility
diff --git a/include/svx/ActionDescriptionProvider.hxx b/include/svx/ActionDescriptionProvider.hxx
index 7c1082b3a6d3..204c4f6e9e0d 100644
--- a/include/svx/ActionDescriptionProvider.hxx
+++ b/include/svx/ActionDescriptionProvider.hxx
@@ -20,9 +20,8 @@
 #ifndef INCLUDED_SVX_ACTIONDESCRIPTIONPROVIDER_HXX
 #define INCLUDED_SVX_ACTIONDESCRIPTIONPROVIDER_HXX
 
-#include <svx/svxdllapi.h>
-
 #include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 
 
 /** This class provides localized descriptions for some basic actions done with objects.
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
index 86ce359568ba..872e3f7eb9d7 100644
--- a/include/svx/AffineMatrixItem.hxx
+++ b/include/svx/AffineMatrixItem.hxx
@@ -19,9 +19,14 @@
 #ifndef INCLUDED_SVX_AFFINEMATRIXITEM_HXX
 #define INCLUDED_SVX_AFFINEMATRIXITEM_HXX
 
-#include <svx/svxdllapi.h>
-#include <svl/poolitem.hxx>
 #include <com/sun/star/geometry/AffineMatrix2D.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <sal/types.h>
+#include <svl/poolitem.hxx>
+#include <svx/svxdllapi.h>
+
+class SfxItemPool;
+class SvStream;
 
 class SVX_DLLPUBLIC AffineMatrixItem : public SfxPoolItem
 {
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index c9803116f703..2d1ada85d863 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -22,17 +22,25 @@
 
 #include <sal/config.h>
 
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
 #include <rtl/ref.hxx>
 #include <svx/IAccessibleViewForwarderListener.hxx>
-#include <svx/AccessibleShapeTreeInfo.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
 #include <svx/svxdllapi.h>
 
+namespace com { namespace sun { namespace star {
+     namespace accessibility { class XAccessible; }
+     namespace drawing { class XShape; }
+     namespace drawing { class XShapes; }
+} } }
+
 namespace accessibility {
 
 class AccessibleContextBase;
+class AccessibleShapeTreeInfo;
 class ChildrenManagerImpl;
+class IAccessibleViewForwarder;
 
 /** The AccessibleChildrenManager class acts as a cache of the
     accessible objects of the currently visible shapes of a draw page and as
diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index a05097b3a825..586a180342c9 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -11,9 +11,11 @@
 #ifndef INCLUDED_SVX_COLORSETS_HXX
 #define INCLUDED_SVX_COLORSETS_HXX
 
-#include <svx/svxdllapi.h>
 #include <vector>
+
 #include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svx/svxdllapi.h>
 #include <tools/color.hxx>
 
 namespace svx
diff --git a/include/svx/CommonStyleManager.hxx b/include/svx/CommonStyleManager.hxx
index d28ccdd83e6c..7cd8a0a90bd5 100644
--- a/include/svx/CommonStyleManager.hxx
+++ b/include/svx/CommonStyleManager.hxx
@@ -11,10 +11,12 @@
 #define INCLUDED_SVX_COMMONSTYLEMANAGER_HXX
 
 #include <sfx2/StyleManager.hxx>
-
-#include <vcl/outdev.hxx>
+#include <sfx2/StylePreviewRenderer.hxx>
 #include <svx/svxdllapi.h>
-#include <rsc/rscsfx.hxx>
+
+class OutputDevice;
+class SfxObjectShell;
+class SfxStyleSheetBase;
 
 namespace svx
 {
diff --git a/include/svx/CommonStylePreviewRenderer.hxx b/include/svx/CommonStylePreviewRenderer.hxx
index dc5ed5038317..fe30c2277eb3 100644
--- a/include/svx/CommonStylePreviewRenderer.hxx
+++ b/include/svx/CommonStylePreviewRenderer.hxx
@@ -10,12 +10,18 @@
 #ifndef INCLUDED_SVX_COMMONSTYLEPREVIEWRENDERER_HXX
 #define INCLUDED_SVX_COMMONSTYLEPREVIEWRENDERER_HXX
 
-#include <vcl/outdev.hxx>
-#include <rsc/rscsfx.hxx>
-#include <editeng/svxfont.hxx>
-#include <svx/svxdllapi.h>
+#include <memory>
 
+#include <sfx2/objsh.hxx>
 #include <sfx2/StylePreviewRenderer.hxx>
+#include <svx/svxdllapi.h>
+#include <rtl/ustring.hxx>
+#include <tools/color.hxx>
+#include <tools/gen.hxx>
+
+class OutputDevice;
+class SfxStyleSheetBase;
+class SvxFont;
 
 namespace svx
 {
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 05feaab75582..e54b8ccf4e39 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -19,12 +19,16 @@
 #ifndef INCLUDED_SVX_ALGITEM_HXX
 #define INCLUDED_SVX_ALGITEM_HXX
 
-#include <svx/svxids.hrc>
+#include <com/sun/star/uno/Any.hxx>
+#include <editeng/svxenum.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include <svl/poolitem.hxx>
 #include <svl/eitem.hxx>
-#include <editeng/svxenum.hxx>
 #include <svx/svxdllapi.h>
 
+class IntlWrapper;
+class SfxItemPool;
 class SvStream;
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem<SvxCellOrientation>
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index c5066834d250..7231742d4753 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -19,15 +19,30 @@
 #ifndef INCLUDED_SVX_BMPMASK_HXX
 #define INCLUDED_SVX_BMPMASK_HXX
 
+#include <sal/types.h>
+#include <sfx2/childwin.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/dockwin.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/group.hxx>
-#include <vcl/graph.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/xtable.hxx>
+#include <tools/color.hxx>
+#include <vcl/animate.hxx>
+#include <vcl/bitmap.hxx>
+#include <vcl/bitmapex.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/graph.hxx>
+#include <vcl/vclptr.hxx>
+
+namespace vcl { class Window; }
 
-#include <svx/dlgctrl.hxx>
+class CheckBox;
+class ColorLB;
+class MetricField;
+class PushButton;
+class SfxBindings;
+class SfxModule;
+class ToolBox;
 
 /*************************************************************************
 |*
diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx
index b6fd288edd97..e263acc32120 100644
--- a/include/svx/camera3d.hxx
+++ b/include/svx/camera3d.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SVX_CAMERA3D_HXX
 #define INCLUDED_SVX_CAMERA3D_HXX
 
+#include <basegfx/point/b3dpoint.hxx>
+#include <sal/types.h>
 #include <svx/viewpt3d.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 36ece5e8cc7a..ca48018229f4 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -19,18 +19,33 @@
 #ifndef INCLUDED_SVX_CHARMAP_HXX
 #define INCLUDED_SVX_CHARMAP_HXX
 
-#include <vcl/ctrl.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/vclptr.hxx>
 #include <map>
 #include <memory>
+
+#include <sal/types.h>
 #include <rtl/ref.hxx>
 #include <svx/svxdllapi.h>
+#include <tools/gen.hxx>
+#include <tools/link.hxx>
+#include <vcl/ctrl.hxx>
+#include <vcl/event.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/metric.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
+
+namespace com { namespace sun { namespace star {
+    namespace accessibility { class XAccessible; }
+} } }
+
+namespace vcl { class Font; }
 
 #define COLUMN_COUNT    16
 #define ROW_COUNT        8
 
+class CommandEvent;
+class ScrollBar;
+
 namespace svx
 {
     struct SvxShowCharSetItem;
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index 526fe1914bdc..f7c70bd192cf 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -20,13 +20,18 @@
 #ifndef INCLUDED_SVX_CHARTHELPER_HXX
 #define INCLUDED_SVX_CHARTHELPER_HXX
 
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <basegfx/range/b2drange.hxx>
-#include <svx/svxdllapi.h>
+#include <com/sun/star/uno/Reference.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
+#include <sal/types.h>
+#include <svx/svxdllapi.h>
+
+namespace com { namespace sun { namespace star {
+    namespace chart2 { class XDiagram; }
+    namespace embed { class XEmbeddedObject; }
+    namespace frame { class XModel; }
+} } }
+
+namespace basegfx { class B2DRange; }
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC ChartHelper
 {
diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index d744c8f33f65..b096573280b0 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -19,10 +19,19 @@
 #ifndef INCLUDED_SVX_CHECKLBX_HXX
 #define INCLUDED_SVX_CHECKLBX_HXX
 
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include <svtools/treelistbox.hxx>
-#include <svtools/svlbitm.hxx>
-
 #include <svx/svxdllapi.h>
+#include <tools/contnr.hxx>
+#include <tools/solar.h>
+#include <tools/wintypes.hxx>
+#include <vcl/event.hxx>
+#include <vcl/window.hxx>
+
+class Image;
+class SvLBoxButtonData;
+class SvTreeListEntry;
 
 // class SvxCheckListBox -------------------------------------------------
 
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index a285fd6996d7..9e29747f06c6 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -19,9 +19,17 @@
 #ifndef INCLUDED_SVX_CHRTITEM_HXX
 #define INCLUDED_SVX_CHRTITEM_HXX
 
+#include <com/sun/star/uno/Any.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include <svl/eitem.hxx>
+#include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
 
+class IntlWrapper;
+class SfxItemPool;
+class SvStream;
+
 enum class SvxChartTextOrder
 {
     SideBySide,
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index bbbfa2d85a2a..135498be439e 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -20,15 +20,15 @@
 #ifndef INCLUDED_SVX_CLIPBOARDCTL_HXX
 #define INCLUDED_SVX_CLIPBOARDCTL_HXX
 
+#include <sal/types.h>
 #include <sfx2/tbxctrl.hxx>
-#include <sfx2/ctrlitem.hxx>
 #include <svl/poolitem.hxx>
-
-
 #include <svx/svxdllapi.h>
+#include <vcl/vclptr.hxx>
 
 class PopupMenu;
-class SvxClipboardFormatItem;
+class SfxModule;
+class ToolBox;
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl
 {
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index 6d4fcb493a94..9863836d9c0a 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -19,12 +19,17 @@
 #ifndef INCLUDED_SVX_CLIPFMTITEM_HXX
 #define INCLUDED_SVX_CLIPFMTITEM_HXX
 
+#include <climits>
+#include <memory>
+
+#include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include <sot/formats.hxx>
 #include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
-#include <memory>
 
+class SfxItemPool;
 struct SvxClipboardFormatItem_Impl;
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxClipboardFormatItem : public SfxPoolItem
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index c3b8eaf18b86..752bdd1065aa 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -19,16 +19,26 @@
 #ifndef INCLUDED_SVX_COLRCTRL_HXX
 #define INCLUDED_SVX_COLRCTRL_HXX
 
+#include <sal/types.h>
 #include <sfx2/dockwin.hxx>
-#include <sfx2/childwin.hxx>
-#include <svx/SvxColorValueSet.hxx>
-#include <svtools/transfer.hxx>
 #include <svl/lstner.hxx>
-#include <svx/svxdllapi.h>
+#include <svtools/transfer.hxx>
+#include <svtools/valueset.hxx>
+#include <svx/SvxColorValueSet.hxx>
 #include <svx/xtable.hxx>
+#include <tools/gen.hxx>
+#include <tools/link.hxx>
+#include <tools/wintypes.hxx>
+#include <vcl/event.hxx>
 #include <vcl/vclptr.hxx>
 
-class SvData;
+namespace vcl { class Window; }
+
+class CommandEvent;
+class SfxBindings;
+class SfxBroadcaster;
+class SfxChildWindow;
+class SfxHint;
 
 /*************************************************************************
 |*
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index 361a7185e6c8..4499b190777d 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -19,17 +19,30 @@
 #ifndef INCLUDED_SVX_COMPRESSGRAPHICDIALOG_HXX
 #define INCLUDED_SVX_COMPRESSGRAPHICDIALOG_HXX
 
+#include <sal/types.h>
+#include <svx/svxdllapi.h>
+#include <tools/gen.hxx>
+#include <tools/link.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/slider.hxx>
-#include <sfx2/bindings.hxx>
-#include <svx/svxdllapi.h>
-
+#include <vcl/vclptr.hxx>
+
+namespace vcl { class Window; }
+
+class Button;
+class CheckBox;
+class ComboBox;
+class Edit;
+class FixedText;
+class ListBox;
+class NumericField;
+class PushButton;
+class RadioButton;
 class SdrGrafObj;
+class SfxBindings;
+class Slider;
+class SvStream;
 
 class SAL_WARN_UNUSED SVX_DLLPUBLIC CompressGraphicsDialog : public ModalDialog
 {
diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx
index 2bdc9eeddc34..b3b1b54da9f1 100644
--- a/include/svx/connctrl.hxx
+++ b/include/svx/connctrl.hxx
@@ -19,8 +19,15 @@
 #ifndef INCLUDED_SVX_CONNCTRL_HXX
 #define INCLUDED_SVX_CONNCTRL_HXX
 
-#include <vcl/ctrl.hxx>
+#include <sal/types.h>
 #include <svx/svxdllapi.h>
+#include <tools/gen.hxx>
+#include <tools/wintypes.hxx>
+#include <vcl/ctrl.hxx>
+#include <vcl/event.hxx>
+#include <vcl/outdev.hxx>
+
+namespace vcl { class Window; }
 
 class SfxItemSet;
 class SdrEdgeObj;
diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx
index bbb7d5d7dba8..15cc8a9ca895 100644
--- a/include/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
@@ -20,10 +20,18 @@
 #ifndef INCLUDED_SVX_CONTDLG_HXX
 #define INCLUDED_SVX_CONTDLG_HXX
 
+#include "sal/types.h"
+
 #include <sfx2/basedlgs.hxx>
-#include <sfx2/ctrlitem.hxx>
 #include <sfx2/childwin.hxx>
 #include <svx/svxdllapi.h>
+#include <tools/poly.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
+
+class Rectangle;
+class SfxBindings;
+class SfxModule;
 
 /*************************************************************************
 |*
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 3396bcf27707..aaacfd23954b 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -20,21 +20,46 @@
 #ifndef INCLUDED_SVX_CTREDLIN_HXX
 #define INCLUDED_SVX_CTREDLIN_HXX
 
-#include <svtools/headbar.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svx/svxdllapi.h>
 #include <svtools/simptabl.hxx>
 #include <svtools/svlbitm.hxx>
 #include <svtools/svtabbx.hxx>
+#include <svtools/treelistbox.hxx>
 #include <svtools/treelistentry.hxx>
+#include <tools/color.hxx>
+#include <tools/contnr.hxx>
+#include <tools/date.hxx>
 #include <tools/datetime.hxx>
-#include <vcl/button.hxx>
-#include <vcl/combobox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
+#include <tools/link.hxx>
+#include <tools/time.hxx>
+#include <tools/wintypes.hxx>
+#include <vcl/builder.hxx>
+#include <vcl/image.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/vclptr.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
-#include <unotools/textsearch.hxx>
-#include <svx/svxdllapi.h>
+
+namespace utl {
+    class SearchParam;
+    class TextSearch;
+}
+
+namespace vcl { class Window; }
+
+class Button;
+class CheckBox;
+class DateField;
+class Edit;
+class FixedText;
+class ListBox;
+class Point;
+class PushButton;
+class SvViewDataEntry;
+class TimeField;
+struct SvSortData;
 
 enum class SvxRedlinDateMode
 {
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index dc9f34d36784..ef4a303eae78 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -20,10 +20,19 @@
 #ifndef INCLUDED_SVX_CUBE3D_HXX
 #define INCLUDED_SVX_CUBE3D_HXX
 
+#include <basegfx/point/b3dpoint.hxx>
+#include <basegfx/vector/b3dvector.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 #include <svx/obj3d.hxx>
+#include <svx/svdobj.hxx>
 #include <svx/svxdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
+namespace sdr { namespace contact { class ViewContact; } }
+
+class E3dDefaultAttributes;
+
 /*************************************************************************
 |*
 |*                                                              |
diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx
index 68e144d9059d..3d93a4f18e0f 100644
--- a/sc/inc/chgviset.hxx
+++ b/sc/inc/chgviset.hxx
@@ -20,14 +20,11 @@
 #define INCLUDED_SC_INC_CHGVISET_HXX
 
 #include <tools/datetime.hxx>
+#include <unotools/textsearch.hxx>
 #include <svx/ctredlin.hxx>
 #include "rangelst.hxx"
 #include "scdllapi.h"
 
-namespace utl {
-    class TextSearch;
-}
-
 class ScDocument;
 
 class SC_DLLPUBLIC ScChangeViewSettings
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index f146fd45a41d..be2bdb1789e8 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -54,6 +54,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/drawing/ShapeCollection.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -67,6 +68,7 @@
 #include <svx/AccessibleShape.hxx>
 #include <svx/AccessibleShapeTreeInfo.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
+#include <svx/IAccessibleParent.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index f6a550aee408..18e19a7e557c 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -45,6 +45,8 @@
 #include <svx/svdobj.hxx>
 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/AccessibleShape.hxx>
+#include <svx/IAccessibleParent.hxx>
+#include <svx/IAccessibleViewForwarder.hxx>
 #include <svx/ShapeTypeHandler.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <svx/unoshape.hxx>
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index dba72366b4aa..9023b0f296a3 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <svtools/fmtfield.hxx>
+#include <svtools/svlbitm.hxx>
 #include <svtools/treelistentry.hxx>
 #include "document.hxx"
 
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 1864415b6aaa..061d358edf6a 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -15,6 +15,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/timer.hxx>
+#include <svtools/svlbitm.hxx>
 #include <svx/checklbx.hxx>
 
 #include <memory>
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 28aeba7e0889..88575bd8bb2b 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -27,6 +27,7 @@
 #include <vcl/msgbox.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/localedatawrapper.hxx>
+#include <svtools/svlbitm.hxx>
 #include <svtools/treelistentry.hxx>
 #include <o3tl/make_unique.hxx>
 
diff --git a/sd/source/ui/accessibility/AccessiblePageShape.cxx b/sd/source/ui/accessibility/AccessiblePageShape.cxx
index 643bc125925b..43513cfdb810 100644
--- a/sd/source/ui/accessibility/AccessiblePageShape.cxx
+++ b/sd/source/ui/accessibility/AccessiblePageShape.cxx
@@ -19,6 +19,8 @@
 
 #include "AccessiblePageShape.hxx"
 #include <svx/AccessibleShapeInfo.hxx>
+#include <svx/IAccessibleViewForwarder.hxx>
+#include <tools/gen.hxx>
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 8a48a98faa6c..d8d2e43773d9 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -22,10 +22,12 @@
 #include "svx/DescriptionGenerator.hxx"
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/reflection/ProxyFactory.hpp>
+#include <com/sun/star/util/XModeChangeBroadcaster.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <comphelper/processfactory.hxx>
@@ -33,6 +35,7 @@
 #include <comphelper/types.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/accessiblerelationsethelper.hxx>
+#include <svx/IAccessibleParent.hxx>
 #include <svx/svdouno.hxx>
 #include "svx/unoapi.hxx"
 #include <svx/ShapeTypeHandler.hxx>
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 0d65b418349e..31c4690f5b97 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -24,6 +24,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdmodel.hxx>
 
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <cppuhelper/queryinterface.hxx>
 
 using namespace ::accessibility;
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index bdabe2cb26cf..996fff3283fc 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -35,6 +35,10 @@
 #include <editeng/outlobj.hxx>
 #include <rtl/ref.hxx>
 #include <editeng/unoedsrc.hxx>
+#include <svx/AccessibleTextHelper.hxx>
+#include <svx/ChildrenManager.hxx>
+#include <svx/IAccessibleParent.hxx>
+#include <svx/IAccessibleViewForwarder.hxx>
 #include <svx/unoshtxt.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index b3674b56f1d9..6ef89c027654 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -24,8 +24,12 @@
 #include "ChildrenManagerImpl.hxx"
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
+#include <svx/IAccessibleViewForwarder.hxx>
 #include <vcl/svapp.hxx>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <comphelper/uno3.hxx>
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index a23a15aeedcb..79c554b7d65a 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -26,6 +26,7 @@
 #include <editeng/AccessibleContextBase.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <osl/mutex.hxx>
+#include <tools/gen.hxx>
 #include <vector>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 6d80e21f4463..7b03438ff273 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <unotools/accessiblestatesethelper.hxx>
+#include <vcl/scrbar.hxx>
 #include <vcl/svapp.hxx>
 #include <stdio.h>
 #include <svx/charmap.hxx>
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index eebc880f2540..df7b77d36522 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -19,7 +19,9 @@
 
 #include <vcl/wrkwin.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/field.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/toolbox.hxx>
 #include <svtools/valueset.hxx>
 #include <svl/eitem.hxx>
 #include <sfx2/dispatch.hxx>
@@ -27,6 +29,7 @@
 
 #include <svx/colorbox.hxx>
 #include <svx/dialmgr.hxx>
+#include <svx/dlgctrl.hxx>
 #include <svx/bmpmask.hxx>
 #include <svx/dialogs.hrc>
 #include <bmpmask.hrc>
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 4ae00bfa5624..59e268df1d02 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -23,6 +23,7 @@
 #include <tools/helpers.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/eitem.hxx>
+#include <sfx2/ctrlitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svtools/miscopt.hxx>
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 3e3789e13dfc..1ba75a6d0e41 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <svtools/svlbitm.hxx>
 #include <svtools/treelistentry.hxx>
 #include <svx/checklbx.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 17a577c91bff..8da722a22b0a 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -18,11 +18,14 @@
  */
 
 #include <dlgunit.hxx>
+#include <vcl/fixed.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/lstbox.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/slider.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/sdgcpitm.hxx>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index f8d9cf14be58..79bdc8465bc3 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -19,7 +19,9 @@
 
 #include <o3tl/make_unique.hxx>
 #include <vcl/dialog.hxx>
+#include <vcl/field.hxx>
 #include <vcl/layout.hxx>
+#include <vcl/lstbox.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/module.hxx>
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index f44fd59ccb8b..d34cb90a5bd1 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -34,6 +34,7 @@
 #include <unotools/accessiblestatesethelper.hxx>
 #include <comphelper/string.hxx>
 #include <editeng/outlobj.hxx>
+#include <svx/IAccessibleViewForwarder.hxx>
 #include <svx/unoshtxt.hxx>
 #include <svx/svdotext.hxx>
 #include <o3tl/make_unique.hxx>
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 5bc41b44b0bf..399a96f6c2a7 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
+#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <osl/mutex.hxx>