From 3847676cf616ccce40037444e8386dec059487bf Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Sat, 18 May 2019 16:01:16 +0200
Subject: tdf#42949 Fix IWYU warnings in include/svx/[h-r]*

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

Change-Id: Ib7e1d0f7483aa8b5cab320278714f2d5f36fdbd9
Reviewed-on: https://gerrit.libreoffice.org/72534
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 include/IwyuFilter_include.yaml                  |  6 ++++++
 include/svx/EnhancedCustomShapeGeometry.hxx      |  1 +
 include/svx/EnhancedCustomShapeTypeNames.hxx     |  1 +
 include/svx/IAccessibleParent.hxx                | 11 +++++++----
 include/svx/IAccessibleViewForwarder.hxx         |  1 -
 include/svx/IAccessibleViewForwarderListener.hxx |  4 ----
 include/svx/Palette.hxx                          |  5 +++--
 include/svx/PaletteManager.hxx                   | 12 ++++++------
 include/svx/ParaLineSpacingPopup.hxx             |  4 ----
 include/svx/ParaSpacingControl.hxx               |  7 ++++---
 include/svx/ParseContext.hxx                     |  3 ++-
 include/svx/ctredlin.hxx                         | 22 +++-------------------
 include/svx/e3dundo.hxx                          |  1 +
 include/svx/extrud3d.hxx                         |  6 ++++++
 include/svx/hdft.hxx                             |  6 ++----
 include/svx/helperhittest3d.hxx                  |  1 -
 include/svx/hexcolorcontrol.hxx                  | 10 +++++-----
 include/svx/imapdlg.hxx                          | 16 +++++++++++-----
 include/svx/ipolypolygoneditorcontroller.hxx     |  1 -
 include/svx/itemwin.hxx                          |  2 --
 include/svx/lathe3d.hxx                          |  6 ++++++
 include/svx/linectrl.hxx                         |  5 -----
 include/svx/msdffdef.hxx                         |  1 -
 include/svx/numfmtsh.hxx                         |  1 -
 include/svx/numinf.hxx                           |  1 -
 include/svx/numvset.hxx                          |  4 ----
 include/svx/obj3d.hxx                            | 15 +--------------
 include/svx/objfac3d.hxx                         |  1 -
 include/svx/optgrid.hxx                          |  8 +++++---
 include/svx/pagectrl.hxx                         |  2 --
 include/svx/paraprev.hxx                         |  1 -
 include/svx/postattr.hxx                         |  1 -
 include/svx/pszctrl.hxx                          |  1 -
 include/svx/ruler.hxx                            |  2 +-
 include/svx/scene3d.hxx                          |  2 ++
 include/svx/sphere3d.hxx                         |  5 +++++
 include/svx/svddef.hxx                           |  2 ++
 37 files changed, 80 insertions(+), 98 deletions(-)

(limited to 'include')

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index e654efeffae2..353cc15d3233 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -974,3 +974,9 @@ blacklist:
     include/svx/fmtools.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XEventListener.hpp
+    include/svx/ifaceids.hxx:
+    # Keep for macro define
+    - sfx2/shell.hxx
+    include/svx/measctrl.hxx:
+    # Needed for template class
+    - svx/svdobj.hxx
diff --git a/include/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx
index 23b22b3c3e17..4d52476ad189 100644
--- a/include/svx/EnhancedCustomShapeGeometry.hxx
+++ b/include/svx/EnhancedCustomShapeGeometry.hxx
@@ -22,6 +22,7 @@
 
 #include <sal/types.h>
 #include <svx/msdffdef.hxx>
+#include <svx/svxdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 
 struct SvxMSDffVertPair
diff --git a/include/svx/EnhancedCustomShapeTypeNames.hxx b/include/svx/EnhancedCustomShapeTypeNames.hxx
index b91e1ebcd248..bf9049589341 100644
--- a/include/svx/EnhancedCustomShapeTypeNames.hxx
+++ b/include/svx/EnhancedCustomShapeTypeNames.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SVX_ENHANCEDCUSTOMSHAPETYPENAMES_HXX
 #define INCLUDED_SVX_ENHANCEDCUSTOMSHAPETYPENAMES_HXX
 #include <svx/msdffdef.hxx>
+#include <svx/svxdllapi.h>
 #include <rtl/ustring.hxx>
 
 namespace EnhancedCustomShapeTypeNames
diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx
index ab0064504296..19284a7d0ce7 100644
--- a/include/svx/IAccessibleParent.hxx
+++ b/include/svx/IAccessibleParent.hxx
@@ -20,10 +20,13 @@
 #ifndef INCLUDED_SVX_IACCESSIBLEPARENT_HXX
 #define INCLUDED_SVX_IACCESSIBLEPARENT_HXX
 
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <sal/types.h>
-#include <svx/AccessibleControlShape.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace accessibility { class AccessibleControlShape; }
+namespace com::sun::star::accessibility { class XAccessible; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::drawing { class XShape; }
+
 namespace accessibility {
 
 class AccessibleShape;
diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx
index 1b228669b7da..247e29c416d2 100644
--- a/include/svx/IAccessibleViewForwarder.hxx
+++ b/include/svx/IAccessibleViewForwarder.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_IACCESSIBLEVIEWFORWARDER_HXX
 #define INCLUDED_SVX_IACCESSIBLEVIEWFORWARDER_HXX
 
-#include <sal/types.h>
 #include <tools/gen.hxx>
 
 
diff --git a/include/svx/IAccessibleViewForwarderListener.hxx b/include/svx/IAccessibleViewForwarderListener.hxx
index b4195d1ed025..d22c0db568c8 100644
--- a/include/svx/IAccessibleViewForwarderListener.hxx
+++ b/include/svx/IAccessibleViewForwarderListener.hxx
@@ -20,13 +20,9 @@
 #ifndef INCLUDED_SVX_IACCESSIBLEVIEWFORWARDERLISTENER_HXX
 #define INCLUDED_SVX_IACCESSIBLEVIEWFORWARDERLISTENER_HXX
 
-#include <sal/types.h>
-
 
 namespace accessibility {
 
-class IAccessibleViewForwarder;
-
 /** <p>The purpose of this interface is to notify a user of an
     IAccessibleViewForwarder when that view forwarder changes its
     properties.  Such a change may be one of the following:
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index 3b9835bc739e..f66d06b30b05 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -19,11 +19,12 @@
 #ifndef INCLUDED_SVX_PALETTE_HXX
 #define INCLUDED_SVX_PALETTE_HXX
 
-#include <svx/SvxColorValueSet.hxx>
-#include <svx/xtable.hxx>
 #include <rtl/ustring.hxx>
+#include <svx/svxdllapi.h>
 
 class Color;
+class ColorValueSet;
+class SvxColorValueSet;
 
 typedef std::pair<Color, OUString> NamedColor;
 
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx
index 486edd94b4a2..e7c7cb1668bd 100644
--- a/include/svx/PaletteManager.hxx
+++ b/include/svx/PaletteManager.hxx
@@ -19,19 +19,19 @@
 #ifndef INCLUDED_SVX_PALETTEMANAGER_HXX
 #define INCLUDED_SVX_PALETTEMANAGER_HXX
 
-#include <svx/SvxColorValueSet.hxx>
 #include <svx/Palette.hxx>
 #include <rtl/ustring.hxx>
-#include <svx/tbxcolorupdate.hxx>
-
-#include <tools/urlobj.hxx>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/util/URLTransformer.hpp>
+#include <svx/xtable.hxx>
 
 #include <deque>
 #include <vector>
 #include <memory>
 
+class SvxColorValueSet;
+namespace com::sun::star::uno { class XComponentContext; }
+namespace svx { class ToolboxButtonColorUpdater; }
+namespace weld { class Window; }
+
 class SVX_DLLPUBLIC PaletteManager
 {
     const sal_uInt16        mnMaxRecentColors;
diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx
index 293253ec5f10..b6666286da24 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/include/svx/ParaLineSpacingPopup.hxx
@@ -19,12 +19,8 @@
 #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
 #define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
 
-#include <editeng/lspcitem.hxx>
-#include <vcl/EnumContext.hxx>
 #include <sfx2/tbxctrl.hxx>
-#include <svl/poolitem.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/fldunit.hxx>
 
 namespace svx {
 
diff --git a/include/svx/ParaSpacingControl.hxx b/include/svx/ParaSpacingControl.hxx
index cefcc81dee30..382c0e48bded 100644
--- a/include/svx/ParaSpacingControl.hxx
+++ b/include/svx/ParaSpacingControl.hxx
@@ -21,10 +21,11 @@
 
 #include <sfx2/tbxctrl.hxx>
 #include <svx/svxdllapi.h>
-#include <vcl/window.hxx>
 #include <com/sun/star/ui/XContextChangeEventListener.hpp>
-#include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
-#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
+
+namespace com::sun::star::ui { class XContextChangeEventMultiplexer; }
+namespace com::sun::star::ui { struct ContextChangeEventObject; }
+namespace vcl { class Window; }
 
 namespace svx {
 
diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx
index cc188ac6d99c..2f6b274ee205 100644
--- a/include/svx/ParseContext.hxx
+++ b/include/svx/ParseContext.hxx
@@ -19,10 +19,11 @@
 #ifndef INCLUDED_SVX_PARSECONTEXT_HXX
 #define INCLUDED_SVX_PARSECONTEXT_HXX
 
+#include <com/sun/star/lang/Locale.hpp>
+
 #include <connectivity/IParseContext.hxx>
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
-#include <unotools/localedatawrapper.hxx>
 #include <vector>
 
 namespace svxform
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 4114042f8f51..b6ae656d586f 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -20,27 +20,16 @@
 #ifndef INCLUDED_SVX_CTREDLIN_HXX
 #define INCLUDED_SVX_CTREDLIN_HXX
 
-#include <comphelper/string.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
-#include <svtools/simptabl.hxx>
-#include <svtools/ctrlbox.hxx>
 #include <vcl/svlbitm.hxx>
-#include <vcl/svtabbx.hxx>
-#include <vcl/treelistbox.hxx>
-#include <vcl/treelistentry.hxx>
 #include <tools/color.hxx>
-#include <tools/contnr.hxx>
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
 #include <tools/link.hxx>
 #include <tools/time.hxx>
-#include <tools/wintypes.hxx>
-#include <vcl/builder.hxx>
-#include <vcl/vclptr.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/tabctrl.hxx>
+#include <vcl/weld.hxx>
 #include <memory>
 
 namespace utl {
@@ -48,16 +37,11 @@ namespace utl {
     class TextSearch;
 }
 
-namespace vcl { class Window; }
+namespace comphelper::string { class NaturalStringSorter; }
 
-class DateField;
-class Edit;
-class FixedText;
-class ListBox;
 class Point;
 class SvViewDataEntry;
-class TimeField;
-struct SvSortData;
+class SvtCalendarBox;
 
 enum class SvxRedlinDateMode
 {
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 5247a86d1db0..1c65b64a1909 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SVX_E3DUNDO_HXX
 #define INCLUDED_SVX_E3DUNDO_HXX
 
+#include <svl/itemset.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 5e9d052552f5..deb5687f6fe7 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -20,8 +20,14 @@
 #ifndef INCLUDED_SVX_EXTRUD3D_HXX
 #define INCLUDED_SVX_EXTRUD3D_HXX
 
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/svddef.hxx>
+#include <svx/svx3ditems.hxx>
+
+class E3dDefaultAttributes;
 
 /*************************************************************************
 |*
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 2a307ec13e10..a062476931a5 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -21,16 +21,14 @@
 
 #include <sfx2/tabdlg.hxx>
 
-#include <vcl/customweld.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
 #include <svx/pagectrl.hxx>
 #include <svx/svxdllapi.h>
 #include <memory>
 
+namespace weld { class CustomWeld; }
+
 namespace svx
 {
     SVX_DLLPUBLIC bool ShowBorderBackgroundDlg(weld::Window* pParent, SfxItemSet* pBBSet);
diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx
index b9af1f24288f..e8a4a9e77aae 100644
--- a/include/svx/helperhittest3d.hxx
+++ b/include/svx/helperhittest3d.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_HELPERHITTEST3D_HXX
 
 #include <svx/svxdllapi.h>
-#include <sal/types.h>
 #include <vector>
 
 
diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx
index f47f50fb1e82..515f070717c8 100644
--- a/include/svx/hexcolorcontrol.hxx
+++ b/include/svx/hexcolorcontrol.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_SVX_HEXCOLOR_HXX
 #define INCLUDED_SVX_HEXCOLOR_HXX
 
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <vcl/weld.hxx>
-#include <sot/exchange.hxx>
-#include <sax/tools/converter.hxx>
 #include <svx/svxdllapi.h>
 #include <tools/color.hxx>
+#include <tools/link.hxx>
+
+namespace weld { class Entry; }
+
+struct ImplSVEvent;
 
 namespace weld {
 
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index d2b1cf620bf4..1630c019f0cc 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -20,19 +20,25 @@
 #ifndef INCLUDED_SVX_IMAPDLG_HXX
 #define INCLUDED_SVX_IMAPDLG_HXX
 
-#include <svtools/inettbc.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <vcl/customweld.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/status.hxx>
-#include <vcl/weld.hxx>
 #include <svx/svxdllapi.h>
 #include <memory>
 #include <vector>
 
+namespace vcl { class Window; }
+namespace weld { class Button; }
+namespace weld { class ComboBox; }
+namespace weld { class CustomWeld; }
+namespace weld { class Entry; }
+namespace weld { class Label; }
+namespace weld { class Toolbar; }
+namespace weld { class Widget; }
+namespace weld { class Window; }
+
 class ImageMap;
+class URLBox;
 
 /*************************************************************************
 |*
diff --git a/include/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx
index a65a5d868e56..4e1ef9124821 100644
--- a/include/svx/ipolypolygoneditorcontroller.hxx
+++ b/include/svx/ipolypolygoneditorcontroller.hxx
@@ -23,7 +23,6 @@
 #include <sal/config.h>
 
 #include <sal/types.h>
-#include <svx/svxdllapi.h>
 
 
 //   Defines
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index efeebed13f79..19660d21a8ea 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -19,13 +19,11 @@
 #ifndef INCLUDED_SVX_ITEMWIN_HXX
 #define INCLUDED_SVX_ITEMWIN_HXX
 
-#include <vcl/bitmap.hxx>
 #include <vcl/field.hxx>
 
 #include <svx/dlgctrl.hxx>
 #include <svx/svxdllapi.h>
 
-class XLineColorItem;
 class XLineWidthItem;
 class SfxObjectShell;
 
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index 719c369c80b4..4313e74bddb6 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -20,8 +20,14 @@
 #ifndef INCLUDED_SVX_LATHE3D_HXX
 #define INCLUDED_SVX_LATHE3D_HXX
 
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/svddef.hxx>
+#include <svx/svx3ditems.hxx>
+
+class E3dDefaultAttributes;
 
 /*************************************************************************
 |*
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index a2b1a484e18a..c1b341060f41 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -20,17 +20,12 @@
 #define INCLUDED_SVX_LINECTRL_HXX
 
 
-#include <svtools/valueset.hxx>
-#include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <svx/svxdllapi.h>
-#include <svx/xtable.hxx>
 #include <memory>
 
 class XLineStyleItem;
 class XLineDashItem;
-class SvxLineBox;
-class SvxMetricField;
 
 
 // SvxLineStyleController:
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index 4a4bd1249ce4..b722e95be8b3 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -22,7 +22,6 @@
 
 #include <limits.h>
 #include <sal/types.h>
-#include <svx/svxdllapi.h>
 
 #define DFF_COMMON_RECORD_HEADER_SIZE           8
 
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 2b7d36e5c475..5e3e54cd754c 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -26,7 +26,6 @@
 #include <svl/zforlist.hxx>
 
 #include <vector>
-#include <map>
 
 class Color;
 
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index 0702fe2e8b6e..b5bf135b1be2 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SVX_NUMINF_HXX
 #define INCLUDED_SVX_NUMINF_HXX
 
-#include <memory>
 #include <svl/poolitem.hxx>
 #include <svx/numfmtsh.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index cab7968c895a..6f0c144397db 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -21,7 +21,6 @@
 
 #include <vcl/idle.hxx>
 #include <svtools/valueset.hxx>
-#include <limits.h>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/lang/Locale.hpp>
@@ -39,9 +38,6 @@ namespace com{namespace sun{ namespace star{
     }
 }}}
 
-class SvxBrushItem;
-class SvxNumRule;
-
 enum class NumberingPageType
 {
     BULLET,
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index f1c09d611dbc..8916d145e45e 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -22,29 +22,16 @@
 
 #include <svx/svdoattr.hxx>
 #include <svx/svdobj.hxx>
-#include <svx/def3d.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/deflt3d.hxx>
-#include <vcl/bitmap.hxx>
-#include <svx/svx3ditems.hxx>
-#include <svx/xflclit.hxx>
-#include <svl/itemset.hxx>
+#include <basegfx/matrix/b3dhommatrix.hxx>
 #include <basegfx/range/b3drange.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/vector/b2enums.hxx>
 #include <svx/svxdllapi.h>
 
 // Forward declarations
-class SfxPoolItem;
-class Viewport3D;
 class E3dScene;
 
-namespace basegfx { class B3DPolyPolygon; }
 namespace sdr { namespace properties {
     class BaseProperties;
-    class E3dProperties;
     class E3dCompoundProperties;
     class E3dExtrudeProperties;
     class E3dLatheProperties;
diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx
index 8c9761e6b6d6..19f7074e4088 100644
--- a/include/svx/objfac3d.hxx
+++ b/include/svx/objfac3d.hxx
@@ -30,7 +30,6 @@
 |*
 \************************************************************************/
 
-class SdrObjFactory;
 class SdrObject;
 struct SdrObjCreatorParams;
 
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 1e4f62c92c96..df86d3240391 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -20,11 +20,13 @@
 #define INCLUDED_SVX_OPTGRID_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include <svl/eitem.hxx>
-#include <vcl/weld.hxx>
 #include <svx/svxdllapi.h>
 
-class SvxGridTabPage;
+namespace weld { class CheckButton; }
+namespace weld { class MetricSpinButton; }
+namespace weld { class SpinButton; }
+namespace weld { class ToggleButton; }
+namespace weld { class Widget; }
 
 class SVX_DLLPUBLIC SvxOptionsGrid
 {
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index 3da3950ec9ef..b5abe5c6aec6 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -20,11 +20,9 @@
 #define INCLUDED_SVX_PAGECTRL_HXX
 
 #include <vcl/customweld.hxx>
-#include <vcl/window.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 
-class SvxBoxItem;
 enum class SvxPageUsage;
 enum class SvxFrameDirection;
 
diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx
index e650173d699f..f605584ec637 100644
--- a/include/svx/paraprev.hxx
+++ b/include/svx/paraprev.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SVX_PARAPREV_HXX
 
 #include <vcl/customweld.hxx>
-#include <vcl/window.hxx>
 #include <editeng/svxenum.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index 1e5da716376e..c0b47586917b 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SVX_POSTATTR_HXX
 #define INCLUDED_SVX_POSTATTR_HXX
 
-#include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index d7c57be179fc..d22e0ba05d18 100644
--- a/include/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
@@ -23,7 +23,6 @@
 #include <sfx2/stbitem.hxx>
 #include <svx/svxdllapi.h>
 
-class  SvxSizeItem;
 struct SvxPosSizeStatusBarControl_Impl;
 
 class SVX_DLLPUBLIC SvxPosSizeStatusBarControl : public SfxStatusBarControl
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 4c914c689e9b..d69c4f672f0a 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SVX_RULER_HXX
 #define INCLUDED_SVX_RULER_HXX
 
-#include <vcl/menu.hxx>
 #include <svtools/ruler.hxx>
 #include <svl/lstner.hxx>
 #include <svx/svxdllapi.h>
@@ -27,6 +26,7 @@
 
 #include <memory>
 
+class Menu;
 class SvxProtectItem;
 class SvxRulerItem;
 class SfxBindings;
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 993cd2ef9175..b3432db5f15c 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -22,8 +22,10 @@
 
 #include <svx/camera3d.hxx>
 #include <tools/b3dtrans.hxx>
+#include <svx/svdpage.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/obj3d.hxx>
+#include <svx/svx3ditems.hxx>
 #include <memory>
 
 namespace sdr { namespace properties {
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index ae054923c9de..345ae1991782 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -20,8 +20,13 @@
 #ifndef INCLUDED_SVX_SPHERE3D_HXX
 #define INCLUDED_SVX_SPHERE3D_HXX
 
+#include <svl/intitem.hxx>
+#include <svl/itemset.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/svddef.hxx>
+
+class E3dDefaultAttributes;
 
 /**
  * SphereObject with diameter r3DSize.
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 0378eb392e10..34ed1c9dda3c 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -138,6 +138,8 @@ class SdrVertShearAllItem;
 class SdrVertShearOneItem;
 class SdrYesNoItem;
 class SfxBoolItem;
+class SfxUInt16Item;
+class SfxUInt32Item;
 class SfxStringItem;
 class SfxVoidItem;
 class Svx3DCharacterModeItem;
-- 
cgit