tdf#42949 Fix IWYU warnings in include/svx/[e-g]*

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

Change-Id: I861d3f0fa15ee3b7e0e830c4fac2e5794ea4071b
Reviewed-on: https://gerrit.libreoffice.org/72213
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

37 files changed, 73 insertions, 157 deletions

diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 7b3508313651..dfc67806cc05 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -24,14 +24,13 @@
 #include <svx/sdasitm.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/awt/Size.hpp>
 #include <svl/itemset.hxx>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
+
 #include <svx/EnhancedCustomShapeFunctionParser.hxx>
 #include <tools/gen.hxx>
 #include <o3tl/typed_flags_set.hxx>
@@ -40,6 +39,9 @@
 #include <memory>
 #include <vector>
 
+namespace com::sun::star::awt { struct Point; }
+namespace com::sun::star::awt { struct Size; }
+
 class Color;
 class SdrObject;
 class SdrPathObj;
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx
index ff53f38c6bff..d284a1563e49 100644
--- a/include/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
 #include <memory>
 #include <ostream>
 #include <vector>
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index 47e033d7b1a5..ed9f1759791d 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -24,8 +24,6 @@
 #include <basegfx/vector/b3dvector.hxx>
 #include <svx/svxdllapi.h>
 
-class SvStream;
-
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem
 {
     basegfx::B3DVector  aVal;
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 58457c4952fb..5247a86d1db0 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_E3DUNDO_HXX
 
 #include <svx/svdundo.hxx>
-#include <svx/scene3d.hxx>
+#include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
 
 /************************************************************************\
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index 5d8f515eb9a9..383b72dcd337 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_EXTRUSIONBAR_HXX
 
 #include <sfx2/shell.hxx>
-#include <sfx2/module.hxx>
 #include <svx/ifaceids.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index e643874d3260..4d4980992b85 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_FILLCTRL_HXX
 
 #include <memory>
-#include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <svx/svxdllapi.h>
 #include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 9f7345cd6b19..20cfd338642f 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -29,10 +29,7 @@
 #include <vcl/layout.hxx>
 #include <svx/svxdllapi.h>
 
-#include <svx/f3dchild.hxx>
 #include <svx/dlgctl3d.hxx>
-#include <svx/dlgctrl.hxx>
-#include <svx/svdmodel.hxx>
 
 
 enum class ViewType3D
@@ -45,9 +42,6 @@ enum class ViewType3D
 };
 
 class FmFormModel;
-class VirtualDevice;
-class E3dView;
-class SdrPageView;
 class Svx3DCtrlItem;
 class SvxConvertTo3DItem;
 class SvxColorListBox;
diff --git a/include/svx/fmglob.hxx b/include/svx/fmglob.hxx
index cc8f51ce175c..35f3460f19a3 100644
--- a/include/svx/fmglob.hxx
+++ b/include/svx/fmglob.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_FMGLOB_HXX
 
 #include <com/sun/star/form/FormComponentType.hpp>
-#include <svx/svdobj.hxx>
 
 const sal_uInt16 OBJ_FM_CONTROL         =   css::form::FormComponentType::CONTROL;
                                                                     // for form components
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 6eb98eb7916d..82c98efe28c0 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -19,14 +19,14 @@
 #ifndef INCLUDED_SVX_FMGRIDCL_HXX
 #define INCLUDED_SVX_FMGRIDCL_HXX
 
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-
 #include <svx/gridctrl.hxx>
 #include <vcl/transfer.hxx>
 #include <svx/svxdllapi.h>
 #include <memory>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::container { class XIndexContainer; }
+namespace com::sun::star::container { class XNameAccess; }
 
 // FmGridHeader
 
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index 887943032594..873ad62ad43b 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -22,14 +22,13 @@
 #include <svx/svxdllapi.h>
 
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/sdbc/XRowSetListener.hpp>
 #include <com/sun/star/sdb/XRowSetSupplier.hpp>
-#include <com/sun/star/form/XReset.hpp>
+#include <com/sun/star/form/XResetListener.hpp>
 #include <com/sun/star/form/XBoundComponent.hpp>
 #include <com/sun/star/form/XLoadListener.hpp>
 #include <com/sun/star/form/XGridControl.hpp>
@@ -38,7 +37,6 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XModeSelector.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
@@ -51,6 +49,9 @@
 #include <cppuhelper/implbase10.hxx>
 #include <memory>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::uno { class XComponentContext; }
+
 class DbGridColumn;
 enum class DbGridControlNavigationBarState;
 
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 19e3fe9fba6e..98261b7d80d6 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -27,10 +27,6 @@
 class SfxObjectShell;
 class SfxItemPool;
 class FmXUndoEnvironment;
-class SfxObjectShell;
-class SbxObject;
-class SbxArray;
-class SbxValue;
 
 struct FmFormModelImplData;
 class SVX_DLLPUBLIC FmFormModel :
diff --git a/include/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx
index 50d81cc3f11c..1e3bd7f82827 100644
--- a/include/svx/fmobjfac.hxx
+++ b/include/svx/fmobjfac.hxx
@@ -23,7 +23,6 @@
 #include <tools/link.hxx>
 #include <svx/svxdllapi.h>
 
-class SdrObjFactory;
 class SdrObject;
 struct SdrObjCreatorParams;
 
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index 478c2a2ce1a3..b2d659363757 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -23,9 +23,7 @@
 #include <memory>
 #include <svx/svdpage.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/contnr.hxx>
 
-class StarBASIC;
 class FmFormModel;
 class FmFormPageImpl;   // contains a list of all forms
 
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index 2ffd180e278c..c702f0106212 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -20,15 +20,14 @@
 #ifndef INCLUDED_SVX_FMSEARCH_HXX
 #define INCLUDED_SVX_FMSEARCH_HXX
 
-#include <com/sun/star/sdbc/XResultSet.hpp>
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
 
-namespace com { namespace sun { namespace star {
-    namespace util {
-        class XNumberFormatsSupplier;
-    }
-}}}
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <vector>
+
+namespace com::sun::star::sdbc { class XResultSet; }
 
 // Helper methods
 
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 4098bff2ebda..8a2db08b267e 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -24,24 +24,23 @@
 // ***************************************************************************************************
 
 #include <memory>
+#include <rtl/ref.hxx>
 #include <sfx2/shell.hxx>
-#include <sfx2/module.hxx>
-#include <vcl/event.hxx>
+#include <vcl/outdev.hxx>
 
-#include <svx/svxids.hrc>
-#include <svx/fmview.hxx>
 #include <svx/svxdllapi.h>
-
 #include <svx/ifaceids.hxx>
+#include <svl/hint.hxx>
 
+#include <com/sun/star/uno/Reference.hxx>
 
 class FmFormModel;
 class FmFormPage;
 class FmXFormShell;
 class FmFormView;
 class SdrView;
-class SdrPage;
 class SdrUnoObj;
+class LinkParamNone;
 
 namespace com { namespace sun { namespace star { namespace form {
     class XForm;
@@ -50,6 +49,10 @@ namespace com { namespace sun { namespace star { namespace form {
     }
 } } } }
 
+namespace com::sun::star::awt { class XControl; }
+namespace com::sun::star::awt { class XControlModel; }
+template <typename Arg, typename Ret> class Link;
+
 namespace svx
 {
     class ISdrObjectFilter;
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index 4d246df20c99..194411ce174d 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -23,22 +23,23 @@
 #include <svx/fmtools.hxx>
 #include <svx/svxdllapi.h>
 
-#include <com/sun/star/awt/XCheckBox.hpp>
-#include <com/sun/star/awt/XListBox.hpp>
-#include <com/sun/star/awt/XTextComponent.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
+#include <com/sun/star/beans/XPropertyChangeListener.hpp>
 
 #include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
-#include <osl/thread.hxx>
+#include <tools/link.hxx>
 
 #include <deque>
 #include <memory>
 #include <vector>
 
+namespace com::sun::star::awt { class XCheckBox; }
+namespace com::sun::star::awt { class XListBox; }
+namespace com::sun::star::awt { class XTextComponent; }
+namespace com::sun::star::sdb { class XColumn; }
+
 enum class TransliterationFlags;
 
 /**
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 6322cc3720d0..7a0bb1ca609b 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -21,47 +21,26 @@
 
 #include <svx/svxdllapi.h>
 
-#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-#include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <com/sun/star/sdbc/XRowSet.hpp>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/sdb/XColumn.hpp>
-#include <com/sun/star/sdb/XColumnUpdate.hpp>
-#include <com/sun/star/sdb/SQLErrorEvent.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
-#include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/awt/FontSlant.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/awt/FontUnderline.hpp>
-#include <com/sun/star/awt/FontStrikeout.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/io/XObjectInputStream.hpp>
-#include <com/sun/star/io/XObjectOutputStream.hpp>
-#include <com/sun/star/io/XPersistObject.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
-#include <com/sun/star/util/XNumberFormats.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/lang/XEventListener.hpp>
 
 #include <rtl/ref.hxx>
-#include <tools/wintypes.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <cppuhelper/implbase.hxx>
 
 #include <set>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::lang { class XComponent; }
+namespace com::sun::star::lang { class XServiceInfo; }
+namespace com::sun::star::sdbc { class SQLException; }
+namespace com::sun::star::sdbc { class XRowSet; }
+namespace com::sun::star::sdb { class SQLContext; }
+namespace com::sun::star::sdb { struct SQLErrorEvent; }
 namespace vcl { class Window; }
 
 
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index cdba2883a4e5..e23d3a6efbe2 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -33,7 +33,6 @@ namespace com { namespace sun { namespace star {
 }}}
 
 class OutputDevice;
-class FmFormModel;
 class FmFormObj;
 class FmFormPage;
 class FmFormShell;
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index d998780ac03f..fe5bd8b583a4 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -20,10 +20,7 @@
 #ifndef INCLUDED_SVX_FONTLB_HXX
 #define INCLUDED_SVX_FONTLB_HXX
 
-#include <vcl/svtabbx.hxx>
 #include <vcl/svlbitm.hxx>
-#include <vcl/virdev.hxx>
-#include <svx/svxdllapi.h>
 
 
 /** A list box string item which stores its text and font. */
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 824b7104ed37..510a39c8fbd6 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -23,22 +23,16 @@
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 #include <vcl/idle.hxx>
-#include <svtools/valueset.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/ctrlitem.hxx>
-#include <svx/xenum.hxx>
-#include <svx/dlgctrl.hxx>
 #include <svx/svxdllapi.h>
-#include <svx/xtextit0.hxx>
 
-class SdrView;
-class SdrPageView;
-class SdrObject;
 class SvxColorListBox;
 
 class XFormTextAdjustItem;
 class XFormTextDistanceItem;
 class XFormTextStartItem;
+class XFormTextStyleItem;
 class XFormTextMirrorItem;
 class XFormTextHideFormItem;
 class XFormTextOutlineItem;
diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index 678ae8903cb7..a30a49661aeb 100644
--- a/include/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_FONTWORKBAR_HXX
 
 #include <sfx2/shell.hxx>
-#include <sfx2/module.hxx>
 #include <svx/ifaceids.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 0c04001cd8f7..0a6bac625e94 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -23,16 +23,12 @@
 
 #include <svx/svxdllapi.h>
 #include <svtools/valueset.hxx>
-#include <sfx2/tbxctrl.hxx>
 #include <vcl/weld.hxx>
 #include <vector>
 
-class FmFormModel;
 class SdrView;
-class SdrTextObj;
 class SdrObject;
 class SdrModel;
-class SfxBindings;
 
 namespace svx
 {
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index fa629fc24ad2..fbcf1a5d1277 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -20,19 +20,12 @@
 #ifndef INCLUDED_SVX_FRAMELINK_HXX
 #define INCLUDED_SVX_FRAMELINK_HXX
 
-#include <algorithm>
 #include <sal/types.h>
 #include <tools/color.hxx>
 #include <svx/svxdllapi.h>
-#include <vcl/outdev.hxx>
 #include <editeng/borderline.hxx>
 
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-
-class Point;
-namespace tools { class Rectangle; }
-class OutputDevice;
-namespace svx { namespace frame { class Cell; }}
+#include <memory>
 
 namespace svx {
 namespace frame {
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 9abac20cfc75..55938bde7ec6 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -20,17 +20,18 @@
 #ifndef INCLUDED_SVX_FRAMELINKARRAY_HXX
 #define INCLUDED_SVX_FRAMELINKARRAY_HXX
 
-#include <drawinglayer/processor2d/baseprocessor2d.hxx>
-#include <svx/framelink.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/rotmodit.hxx>
 #include <memory>
-#include <vector>
+
+class Color;
 
 namespace svx {
 namespace frame {
 
 struct ArrayImpl;
+class Style;
 
 /** Stores frame styles of an array of cells, supports merged ranges.
 
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index a44c6bf5c7c1..4a508eea55bd 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -24,8 +24,6 @@
 #include <editeng/frmdir.hxx>
 #include <svx/svxdllapi.h>
 
-class SvxFrameDirectionItem;
-
 namespace svx {
 
 /** This listbox contains entries to select horizontal text direction.
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 7e3bdcdf73dc..83245e1a65fc 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_SVX_FRMSEL_HXX
 
 #include <memory>
-#include <vcl/ctrl.hxx>
 #include <vcl/customweld.hxx>
-#include <vcl/bitmap.hxx>
 #include <editeng/borderline.hxx>
 #include <svx/framebordertype.hxx>
 #include <svx/svxdllapi.h>
@@ -31,10 +29,6 @@
 
 class Color;
 
-namespace editeng {
-    class SvxBorderLine;
-}
-
 enum class FrameSelFlags
 {
     NONE            = 0x0000,
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 3dba3d9a487d..a565cb087548 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -21,22 +21,16 @@
 #define INCLUDED_SVX_GALCTRL_HXX
 
 #include <vcl/graph.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/combobox.hxx>
 #include <vcl/customweld.hxx>
-#include <svl/slstitm.hxx>
 #include <vcl/transfer.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/brwbox.hxx>
 #include <vcl/GraphicObject.hxx>
-#include <svx/galmisc.hxx>
 #include <svx/svxdllapi.h>
 
 class GalleryTheme;
 class GalleryBrowser2;
+class INetURLObject;
 
 class SVX_DLLPUBLIC GalleryPreview : public vcl::Window, public DropTargetHelper, public DragSourceHelper
 {
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index a02c1f3fc9d4..717fbcf129bf 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_GALLERY_HXX
 
 #include <svx/svxdllapi.h>
-#include <tools/urlobj.hxx>
+#include <rtl/ustring.hxx>
 #include <vector>
 
 // Defines for preinstalled themes
@@ -92,14 +92,9 @@
 #define RID_GALLERY_THEME_FIRST          RID_GALLERY_THEME_3D
 #define RID_GALLERY_THEME_LAST           RID_GALLERY_THEME_TXTSHAPES
 
-class Gallery;
-class VCDrawModel;
-class FmFormModel;
 class SdrModel;
 class Graphic;
-class FmFormModel;
 class BitmapEx;
-class OutputDevice;
 
 class SVX_DLLPUBLIC GalleryExplorer
 {
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index 7738e265d278..a5cd3c04b374 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -29,8 +29,6 @@
 #include <memory>
 #include <vector>
 
-class SvStream;
-
 
 class GalleryThemeEntry
 {
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index 2af76e961509..881fd88917df 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -23,8 +23,9 @@
 #include <svl/poolitem.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
+
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::lang { class XComponent; }
 
 // property names map those from css::gallery::GalleryItem
 // with exception of "AsLink" and "FilterName"
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index c77a9bd90cd0..8f9d6ad7ad17 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -20,19 +20,19 @@
 #ifndef INCLUDED_SVX_GALMISC_HXX
 #define INCLUDED_SVX_GALMISC_HXX
 
-#include <sot/formats.hxx>
-#include <tools/urlobj.hxx>
 #include <vcl/imap.hxx>
 #include <svl/hint.hxx>
 #include <vcl/transfer.hxx>
 #include <svx/svdobj.hxx>
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/awt/XProgressMonitor.hpp>
 #include <svx/svxdllapi.h>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <memory>
 
+namespace com::sun::star::awt { class XProgressBar; }
+
+class INetURLObject;
 class GalleryTheme;
 class SotStorageStream;
 
@@ -79,8 +79,6 @@ enum class GalleryGraphicImportRet
 class SvStream;
 class Graphic;
 class FmFormModel;
-class ImageMap;
-class Gallery;
 
 GalleryGraphicImportRet  GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, OUString& rFilterName );
 bool                GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
@@ -130,7 +128,6 @@ class SVX_DLLPUBLIC GalleryProgress
     void                            Update( sal_Int32 nVal, sal_Int32 nMaxVal );
 };
 
-class Gallery;
 class GalleryTheme;
 class GraphicObject;
 
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 28d73582a091..f5bb333135aa 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -25,15 +25,13 @@
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/salctype.hxx>
-#include <vcl/weld.hxx>
 #include <svl/SfxBroadcaster.hxx>
-#include <svl/lstner.hxx>
-#include <vcl/transfer.hxx>
-#include <svx/svdmodel.hxx>
 #include <svx/galmisc.hxx>
 #include <memory>
 #include <vector>
 
+namespace weld { class ComboBox; }
+
 class SotStorage;
 class SotStorageStream;
 
@@ -58,7 +56,6 @@ class SgaObject;
 class FmFormModel;
 
 class Gallery;
-class GalleryProgress;
 
 namespace unogallery
 {
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index f2169ba9007c..a999a676a976 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_GRAFCTRL_HXX
 
 #include <svl/lstner.hxx>
-#include <svl/intitem.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 4b61d407b7e2..7a2a7fd16da0 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -22,7 +22,6 @@
 #include <vcl/ctrl.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/customweld.hxx>
-#include <vcl/weld.hxx>
 #include <svx/svxdllapi.h>
 
 #include <svx/svdview.hxx>
diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx
index cf7babc26c65..8adfac1d4116 100644
--- a/include/svx/graphichelper.hxx
+++ b/include/svx/graphichelper.hxx
@@ -21,10 +21,11 @@
 #define INCLUDED_SVX_GRAPHICHELPER_HXX
 
 #include <vcl/graph.hxx>
-#include <vcl/weld.hxx>
 #include <svx/svxdllapi.h>
 
-#include <com/sun/star/drawing/XShape.hpp>
+namespace com::sun::star::drawing { class XShape; }
+namespace weld { class Widget; }
+namespace weld { class Window; }
 
 class SVX_DLLPUBLIC GraphicHelper
 {
diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx
index 2600ee999c8c..7c24bcd38c92 100644
--- a/include/svx/grfflt.hxx
+++ b/include/svx/grfflt.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_SVX_GRFFLT_HXX
 #define INCLUDED_SVX_GRFFLT_HXX
 
-#include <vcl/GraphicObject.hxx>
 #include <svx/svxdllapi.h>
 
 enum class SvxGraphicFilterResult {
     NONE, UnsupportedGraphicType, UnsupportedSlot
 };
 
+class GraphicObject;
 class SfxRequest;
 class SfxItemSet;
 
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 60f39a39198c..6b79bf1e40e7 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -19,14 +19,7 @@
 #ifndef INCLUDED_SVX_GRIDCTRL_HXX
 #define INCLUDED_SVX_GRIDCTRL_HXX
 
-#include <com/sun/star/sdbc/XRowSet.hpp>
-#include <com/sun/star/sdbc/XRowSetListener.hpp>
-#include <com/sun/star/sdb/XRowsChangeListener.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 
@@ -34,14 +27,19 @@
 #include <tools/ref.hxx>
 #include <svtools/editbrowsebox.hxx>
 #include <osl/mutex.hxx>
-#include <comphelper/propmultiplex.hxx>
-#include <vcl/transfer.hxx>
 #include <svx/svxdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 #include <vector>
 
-class DbGridControl;
+namespace comphelper { class OPropertyChangeMultiplexer; }
+namespace com::sun::star::beans { struct PropertyChangeEvent; }
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::sdbc { class XRowSet; }
+namespace com::sun::star::sdb { class XRowsChangeListener; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XNumberFormatter; }
+
 class CursorWrapper;
 
 bool CompareBookmark(const css::uno::Any& aLeft, const css::uno::Any& aRight);