19 files changed, 7 insertions, 25 deletions
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index e33acec69b15..23a877c25f60 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ref.hxx>
 #include <svx/svxdllapi.h>
-#include <tools/long.hxx>
 
 namespace com::sun::star
 {
diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx
index f95859044b28..6d7ba41398b4 100644
--- a/include/svx/ColorSets.hxx
+++ b/include/svx/ColorSets.hxx
@@ -11,11 +11,8 @@
 #ifndef INCLUDED_SVX_COLORSETS_HXX
 #define INCLUDED_SVX_COLORSETS_HXX
 
-#include <rtl/ustring.hxx>
-#include <sal/log.hxx>
 #include <svx/svxdllapi.h>
 #include <docmodel/theme/ColorSet.hxx>
-#include <optional>
 
 namespace svx
 {
diff --git a/include/svx/constructhelper.hxx b/include/svx/constructhelper.hxx
index 928e6b1d3c68..34f1a4f6df06 100644
--- a/include/svx/constructhelper.hxx
+++ b/include/svx/constructhelper.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygontriangulator.hxx>
 #include <svx/svxdllapi.h>
 #include <tools/long.hxx>
 #include <unotools/resmgr.hxx>
diff --git a/include/svx/dialog/ThemeDialog.hxx b/include/svx/dialog/ThemeDialog.hxx
index 9536bdb38d84..5b534ea4785a 100644
--- a/include/svx/dialog/ThemeDialog.hxx
+++ b/include/svx/dialog/ThemeDialog.hxx
@@ -12,10 +12,8 @@
 #include <svx/svxdllapi.h>
 #include <vcl/weld.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/theme/IThemeColorChanger.hxx>
 #include <svx/dialog/ThemeColorEditDialog.hxx>
 #include <svx/dialog/ThemeColorValueSet.hxx>
-#include <functional>
 
 namespace model
 {
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 5d6449e63cee..16873e7b3e17 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -24,6 +24,7 @@
 #include <vcl/weld.hxx>
 #include <svl/itemset.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/obj3d.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 #include <memory>
 
diff --git a/include/svx/extedit.hxx b/include/svx/extedit.hxx
index 04fd9dfb8e54..39d8dba7959a 100644
--- a/include/svx/extedit.hxx
+++ b/include/svx/extedit.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_SVX_EXTEDIT_HXX
 
 #include <svx/svxdllapi.h>
+#include <svx/svdograf.hxx>
 #include <svl/lstner.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index f978b70b546e..a7ffb7289797 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -45,7 +45,6 @@
 #include <toolkit/controls/unocontrol.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/interfacecontainer4.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase10.hxx>
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index 19e8f10b73a5..03eb8424561c 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -26,7 +26,6 @@
 #include <svx/svxdllapi.h>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
-#include <rtl/ustrbuf.hxx>
 
 enum class HyperDialogEvent {
     NONE                = 0x0000,
diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx
index 5ccc030b3b2b..3e9b90ea0060 100644
--- a/include/svx/ofaitem.hxx
+++ b/include/svx/ofaitem.hxx
@@ -22,6 +22,7 @@
 #include <svl/poolitem.hxx>
 #include <rtl/ref.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/xtable.hxx>
 
 class SVX_DLLPUBLIC OfaPtrItem final : public SfxPoolItem
 {
@@ -37,7 +38,6 @@ public:
     void*                    GetValue() const { return pPtr; }
 };
 
-class XColorList;
 class SVX_DLLPUBLIC OfaXColorListItem final : public SfxPoolItem
 {
  private:
diff --git a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
index 93ebdcfde7f2..13d1ccd64246 100644
--- a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx
@@ -23,8 +23,6 @@
 #include <drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx>
 #include <svx/framelink.hxx>
 
-#include <memory>
-
 // predefines
 
 namespace drawinglayer::primitive2d
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index bb02fc271f52..91b9ca7ce7b2 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -29,7 +29,6 @@
 #include <svx/svdview.hxx>
 #include <optional>
 #include <unotools/weakref.hxx>
-#include <memory>
 
 struct ImplSVEvent;
 class SdrView;
diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
index 6caf6487417b..09931e89e1cd 100644
--- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
+++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx
@@ -19,15 +19,14 @@
 #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREATRANSPARENCYGRADIENTPOPUP_HXX
 #define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREATRANSPARENCYGRADIENTPOPUP_HXX
 
+#include <basegfx/utils/bgradient.hxx>
 #include <vcl/weld.hxx>
 #include <svtools/toolbarmenu.hxx>
-#include <basegfx/utils/gradienttools.hxx>
 
 class XFillFloatTransparenceItem;
 
 namespace svx::sidebar
 {
-class AreaTransparencyGradientControl;
 class AreaPropertyPanelBase;
 
 class AreaTransparencyGradientPopup final : public WeldToolbarPopup
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 61c8a34867cf..bcff88d33809 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -23,7 +23,6 @@
 #include <editeng/outliner.hxx>
 #include <svx/svxdllapi.h>
 #include <tools/link.hxx>
-#include <tools/fract.hxx>
 #include <svx/svdobj.hxx>
 #include <svl/whichranges.hxx>
 #include <unotools/syslocale.hxx>
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 9c02d7e0bd64..631a5973bb7b 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -20,6 +20,7 @@
 
 #include <memory>
 #include <com/sun/star/uno/Any.hxx>
+#include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/outdev.hxx>
@@ -33,9 +34,6 @@
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
 #include <unotools/resmgr.hxx>
-#include <unotools/weakref.hxx>
-#include <osl/diagnose.h>
-#include <typeinfo>
 
 #include <unordered_set>
 
diff --git a/include/svx/theme/ThemeColorChangerCommon.hxx b/include/svx/theme/ThemeColorChangerCommon.hxx
index d60d9c1ba7fb..febc34ae3873 100644
--- a/include/svx/theme/ThemeColorChangerCommon.hxx
+++ b/include/svx/theme/ThemeColorChangerCommon.hxx
@@ -10,9 +10,7 @@
 #pragma once
 
 #include <svx/svxdllapi.h>
-#include <svx/theme/IThemeColorChanger.hxx>
 #include <docmodel/theme/ColorSet.hxx>
-#include <svx/svdpage.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdview.hxx>
 #include <svl/undo.hxx>
diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx
index 331a8e4ae67e..01269e6fd844 100644
--- a/include/svx/unopool.hxx
+++ b/include/svx/unopool.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_UNOPOOL_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <comphelper/propertysethelper.hxx>
 #include <comphelper/compbase.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index 382a8dbd38f1..fd7fa350e65a 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SVX_UNOPROV_HXX
 #define INCLUDED_SVX_UNOPROV_HXX
 
-#include <config_options.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <svl/itemprop.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 964156f1a60f..3c8fa07bd99e 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -51,10 +51,10 @@
 #include <editeng/unotext.hxx>
 
 #include <svx/svdobj.hxx>
+#include <unotools/weakref.hxx>
 
 #include <comphelper/servicehelper.hxx>
 
-#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase12.hxx>
 
 class SfxItemSet;
diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx
index 965d10195146..26941279490c 100644
--- a/include/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_XCOLIT_HXX
 
 #include <tools/color.hxx>
-#include <editeng/colritem.hxx>
 #include <docmodel/color/ComplexColor.hxx>
 
 #include <svx/svxdllapi.h>