tdf#42949 Fix IWYU warnings in include/basegfx/*

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

Change-Id: Ifd59a5d93cfe7dc232891a681002014cd825035a
Reviewed-on: https://gerrit.libreoffice.org/61546
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

59 files changed, 72 insertions, 67 deletions

diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx
index e26fb922f5b6..c62c189142f3 100644
--- a/basegfx/source/matrix/b2dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b2dhommatrixtools.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/range/b2drange.hxx>
 
 #include <osl/diagnose.h>
 #include <rtl/ustring.hxx>
diff --git a/basegfx/source/matrix/b3dhommatrixtools.cxx b/basegfx/source/matrix/b3dhommatrixtools.cxx
index 02dfe63d6741..d6b9d32ef773 100644
--- a/basegfx/source/matrix/b3dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b3dhommatrixtools.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <basegfx/matrix/b3dhommatrixtools.hxx>
+#include <com/sun/star/drawing/HomogenMatrix.hpp>
 
 namespace basegfx
 {
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx
index c24a78f579b8..a7041e2053fc 100644
--- a/basegfx/source/polygon/b2dpolygontriangulator.cxx
+++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx
@@ -20,6 +20,7 @@
 #include <basegfx/polygon/b2dpolygontriangulator.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index d2bfd082d321..067c70ff3eb1 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -20,6 +20,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <o3tl/clamp.hxx>
 #include <osl/diagnose.h>
+#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index 1bba1a9e03a1..f59d1f16bb21 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -20,6 +20,7 @@
 #include <basegfx/polygon/b2dtrapezoid.hxx>
 #include <basegfx/range/b1drange.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index 2059d91bdef6..963685ea1fb0 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -20,6 +20,7 @@
 #include <osl/diagnose.h>
 #include <basegfx/polygon/b3dpolygontools.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
+#include <basegfx/polygon/b3dpolypolygon.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/range/b3drange.hxx>
 #include <basegfx/point/b2dpoint.hxx>
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
index 3b9b15b93890..db0654df266b 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -28,6 +28,7 @@
 #include <basegfx/matrix/b3dhommatrix.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
+#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
 
 // predefines
 #define nMinSegments sal_uInt32(1)
diff --git a/basegfx/source/raster/rasterconvert3d.cxx b/basegfx/source/raster/rasterconvert3d.cxx
index 3ed2a1a250bc..ef9ba7dd8bbe 100644
--- a/basegfx/source/raster/rasterconvert3d.cxx
+++ b/basegfx/source/raster/rasterconvert3d.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <basegfx/raster/rasterconvert3d.hxx>
+#include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
 #include <basegfx/point/b3dpoint.hxx>
diff --git a/basegfx/test/SvgPathImportExport.cxx b/basegfx/test/SvgPathImportExport.cxx
index fe2c6f500d0a..d84f02b0c36e 100644
--- a/basegfx/test/SvgPathImportExport.cxx
+++ b/basegfx/test/SvgPathImportExport.cxx
@@ -23,6 +23,7 @@
 #include <cppunit/plugin/TestPlugIn.h>
 
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 
 namespace basegfx
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index c31bdc2d3e49..abb108449034 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/geometry/AffineMatrix2D.hpp>
 #include <com/sun/star/geometry/RealRectangle2D.hpp>
 #include <rtl/instance.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 
 
 using namespace com::sun::star;
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx
index 96baa396d9cd..e65371a2cb6b 100644
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/geometry/RealRectangle3D.hpp>
 #include <basegfx/utils/canvastools.hxx>
 #include <rtl/instance.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 
 
 using namespace com::sun::star;
diff --git a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
index 89d85486e289..c0f08389509d 100644
--- a/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygonprimitive3d.cxx
@@ -20,6 +20,7 @@
 #include <drawinglayer/primitive3d/polygonprimitive3d.hxx>
 #include <basegfx/polygon/b3dpolygontools.hxx>
 #include <basegfx/utils/canvastools.hxx>
+#include <basegfx/polygon/b3dpolypolygon.hxx>
 #include <basegfx/polygon/b3dpolypolygontools.hxx>
 #include <drawinglayer/primitive3d/polygontubeprimitive3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 529fe44e46dd..2158e48b0cc6 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -25,6 +25,7 @@
 #include <tools/solar.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <vector>
 
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 81b3bc048b9e..d9b864fd6fb4 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -201,3 +201,11 @@ blacklist:
     include/comphelper/uno3.hxx:
     # Needed for macro
     - comphelper/sequence.hxx
+    include/basegfx/polygon/b2dpolygontools.hxx:
+    # Needed for template
+    - o3tl/typed_flags_set.hxx
+    include/basegfx/utils/unopolypolygon.hxx:
+    # base class has to be a complete type
+    - com/sun/star/lang/XServiceInfo.hpp
+    - com/sun/star/rendering/XBezierPolyPolygon2D.hpp
+    - com/sun/star/rendering/XLinePolyPolygon2D.hpp
diff --git a/include/basegfx/basegfxdllapi.h b/include/basegfx/basegfxdllapi.h
index d26c0029b859..2aadbc3a4219 100644
--- a/include/basegfx/basegfxdllapi.h
+++ b/include/basegfx/basegfxdllapi.h
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_BASEGFX_BASEGFXDLLAPI_H
 #define INCLUDED_BASEGFX_BASEGFXDLLAPI_H
 
+#include <sal/types.h>
+
 #if defined BASEGFX_STATICLIBRARY
 
 #define BASEGFX_DLLPUBLIC
diff --git a/include/basegfx/color/bcolor.hxx b/include/basegfx/color/bcolor.hxx
index 9722e88c5b65..6a6c6886acb6 100644
--- a/include/basegfx/color/bcolor.hxx
+++ b/include/basegfx/color/bcolor.hxx
@@ -25,13 +25,9 @@
 #include <ostream>
 
 #include <basegfx/tuple/b3dtuple.hxx>
-#include <vector>
 #include <basegfx/basegfxdllapi.h>
 #include <o3tl/clamp.hxx>
 
-namespace com { namespace sun { namespace star { namespace rendering {
-    class XGraphicDevice;
-}}}}
 
 namespace basegfx
 {
diff --git a/include/basegfx/color/bcolortools.hxx b/include/basegfx/color/bcolortools.hxx
index ad19d07c5125..fd0fa803c10a 100644
--- a/include/basegfx/color/bcolortools.hxx
+++ b/include/basegfx/color/bcolortools.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BASEGFX_COLOR_BCOLORTOOLS_HXX
 #define INCLUDED_BASEGFX_COLOR_BCOLORTOOLS_HXX
 
-#include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
 
 
diff --git a/include/basegfx/matrix/b2dhommatrixtools.hxx b/include/basegfx/matrix/b2dhommatrixtools.hxx
index 6061e68cc811..db7c6af24139 100644
--- a/include/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b2dhommatrixtools.hxx
@@ -23,9 +23,11 @@
 #include <sal/types.h>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/vector/b2dvector.hxx>
-#include <basegfx/range/b2drange.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/basegfxdllapi.h>
 
+namespace basegfx { class B2DRange; }
 
 namespace basegfx
 {
diff --git a/include/basegfx/matrix/b3dhommatrixtools.hxx b/include/basegfx/matrix/b3dhommatrixtools.hxx
index 16debfad981b..1ea0d80c14e5 100644
--- a/include/basegfx/matrix/b3dhommatrixtools.hxx
+++ b/include/basegfx/matrix/b3dhommatrixtools.hxx
@@ -20,9 +20,22 @@
 #ifndef INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIXTOOLS_HXX
 #define INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIXTOOLS_HXX
 
-#include <sal/types.h>
+#include <basegfx/basegfxdllapi.h>
 #include <basegfx/matrix/b3dhommatrix.hxx>
-#include <com/sun/star/drawing/HomogenMatrix.hpp>
+
+namespace com
+{
+namespace sun
+{
+namespace star
+{
+namespace drawing
+{
+struct HomogenMatrix;
+}
+}
+}
+}
 
 namespace basegfx
 {
diff --git a/include/basegfx/pixel/bpixel.hxx b/include/basegfx/pixel/bpixel.hxx
index 6ea620b0037c..453b253a6f1a 100644
--- a/include/basegfx/pixel/bpixel.hxx
+++ b/include/basegfx/pixel/bpixel.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_BASEGFX_PIXEL_BPIXEL_HXX
 
 #include <sal/types.h>
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/basegfxdllapi.h>
 
diff --git a/include/basegfx/polygon/b2dlinegeometry.hxx b/include/basegfx/polygon/b2dlinegeometry.hxx
index b1b35cb70c4f..d798fff18cd9 100644
--- a/include/basegfx/polygon/b2dlinegeometry.hxx
+++ b/include/basegfx/polygon/b2dlinegeometry.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BASEGFX_POLYGON_B2DLINEGEOMETRY_HXX
 #define INCLUDED_BASEGFX_POLYGON_B2DLINEGEOMETRY_HXX
 
-#include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/include/basegfx/polygon/b2dpolygon.hxx b/include/basegfx/polygon/b2dpolygon.hxx
index 353e7130f5ed..b27a56ed27d2 100644
--- a/include/basegfx/polygon/b2dpolygon.hxx
+++ b/include/basegfx/polygon/b2dpolygon.hxx
@@ -21,21 +21,19 @@
 #define INCLUDED_BASEGFX_POLYGON_B2DPOLYGON_HXX
 
 #include <ostream>
+#include <vector>
 
 #include <sal/types.h>
 #include <o3tl/cow_wrapper.hxx>
 #include <basegfx/vector/b2enums.hxx>
-#include <basegfx/range/b2drange.hxx>
 #include <basegfx/basegfxdllapi.h>
 
 class ImplB2DPolygon;
-class SalGraphicsImpl;
 
 namespace basegfx
 {
-    class B2DPolygon;
     class B2DPoint;
-    class B2DVector;
+    class B2DRange;
     class B2DHomMatrix;
     class B2DCubicBezier;
     class SystemDependentData;
diff --git a/include/basegfx/polygon/b2dpolygontools.hxx b/include/basegfx/polygon/b2dpolygontools.hxx
index 62430d323cef..2f5641bb1581 100644
--- a/include/basegfx/polygon/b2dpolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolygontools.hxx
@@ -23,7 +23,6 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontriangulator.hxx>
 #include <com/sun/star/drawing/PointSequence.hpp>
@@ -33,6 +32,8 @@
 #include <o3tl/typed_flags_set.hxx>
 
 
+namespace basegfx { class B2DPolyPolygon; }
+
 // Definitions for the cut flags used from the findCut methods
 enum class CutFlagValue
 {
diff --git a/include/basegfx/polygon/b2dpolygontriangulator.hxx b/include/basegfx/polygon/b2dpolygontriangulator.hxx
index 7ecb819b3241..40bd8117e423 100644
--- a/include/basegfx/polygon/b2dpolygontriangulator.hxx
+++ b/include/basegfx/polygon/b2dpolygontriangulator.hxx
@@ -20,9 +20,13 @@
 #ifndef INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
 #define INCLUDED_BASEGFX_POLYGON_B2DPOLYGONTRIANGULATOR_HXX
 
-#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/basegfxdllapi.h>
 
+#include <vector>
+
+namespace basegfx { class B2DPolyPolygon; }
 
 namespace basegfx
 {
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx b/include/basegfx/polygon/b2dpolypolygontools.hxx
index b14d003be4a4..d1f37202d622 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -21,16 +21,15 @@
 #define INCLUDED_BASEGFX_POLYGON_B2DPOLYPOLYGONTOOLS_HXX
 
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2dvector.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b3dpolypolygon.hxx>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <vector>
 #include <set>
 #include <basegfx/basegfxdllapi.h>
 
 
+namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonBezierCoords; } } } }
+
 namespace basegfx
 {
     // predefinitions
diff --git a/include/basegfx/polygon/b2dtrapezoid.hxx b/include/basegfx/polygon/b2dtrapezoid.hxx
index a4d8e1d77733..6333d2d17876 100644
--- a/include/basegfx/polygon/b2dtrapezoid.hxx
+++ b/include/basegfx/polygon/b2dtrapezoid.hxx
@@ -21,11 +21,13 @@
 #define INCLUDED_BASEGFX_POLYGON_B2DTRAPEZOID_HXX
 
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <vector>
 #include <basegfx/basegfxdllapi.h>
 
 
+namespace basegfx { class B2DPolyPolygon; }
+namespace basegfx { class B2DPoint; }
+
 namespace basegfx
 {
     // class to hold a single trapezoid
diff --git a/include/basegfx/polygon/b3dpolygon.hxx b/include/basegfx/polygon/b3dpolygon.hxx
index 47eefd498597..2851e8f47d4a 100644
--- a/include/basegfx/polygon/b3dpolygon.hxx
+++ b/include/basegfx/polygon/b3dpolygon.hxx
@@ -28,7 +28,6 @@ class ImplB3DPolygon;
 
 namespace basegfx
 {
-    class B3DPolygon;
     class B3DPoint;
     class B3DHomMatrix;
     class B3DVector;
diff --git a/include/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx
index c097f86961c0..2e37b64e2516 100644
--- a/include/basegfx/polygon/b3dpolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolygontools.hxx
@@ -22,12 +22,12 @@
 
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/vector/b3dvector.hxx>
-#include <basegfx/polygon/b3dpolypolygon.hxx>
-#include <basegfx/vector/b2enums.hxx>
 #include <vector>
 #include <basegfx/basegfxdllapi.h>
 
 
+namespace basegfx { class B3DPolyPolygon; }
+
 namespace basegfx
 {
     // predefinitions
diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx b/include/basegfx/polygon/b3dpolypolygontools.hxx
index b3905137a123..fbaf07e70581 100644
--- a/include/basegfx/polygon/b3dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolypolygontools.hxx
@@ -20,15 +20,13 @@
 #ifndef INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGONTOOLS_HXX
 #define INCLUDED_BASEGFX_POLYGON_B3DPOLYPOLYGONTOOLS_HXX
 
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/point/b3dpoint.hxx>
-#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
-#include <vector>
 #include <basegfx/basegfxdllapi.h>
 
 
+namespace com { namespace sun { namespace star { namespace drawing { struct PolyPolygonShape3D; } } } }
+
 namespace basegfx
 {
     // predefinitions
diff --git a/include/basegfx/range/b1drange.hxx b/include/basegfx/range/b1drange.hxx
index 7b0d22869559..9e71b2b21928 100644
--- a/include/basegfx/range/b1drange.hxx
+++ b/include/basegfx/range/b1drange.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_BASEGFX_RANGE_B1DRANGE_HXX
 
 #include <basegfx/range/basicrange.hxx>
-#include <basegfx/basegfxdllapi.h>
 
 
 namespace basegfx
diff --git a/include/basegfx/range/b2dpolyrange.hxx b/include/basegfx/range/b2dpolyrange.hxx
index bfd36303a16c..e6de924057df 100644
--- a/include/basegfx/range/b2dpolyrange.hxx
+++ b/include/basegfx/range/b2dpolyrange.hxx
@@ -27,7 +27,6 @@
 
 namespace basegfx
 {
-    class B2DTuple;
     class B2DRange;
     class B2DPolyPolygon;
     class B2DHomMatrix;
diff --git a/include/basegfx/range/b2ibox.hxx b/include/basegfx/range/b2ibox.hxx
index ab80e9c186e5..6fb26abc7d04 100644
--- a/include/basegfx/range/b2ibox.hxx
+++ b/include/basegfx/range/b2ibox.hxx
@@ -21,14 +21,9 @@
 #define INCLUDED_BASEGFX_RANGE_B2IBOX_HXX
 
 #include <ostream>
-#include <vector>
 
-#include <basegfx/point/b2ipoint.hxx>
-#include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/tuple/b2ituple.hxx>
-#include <basegfx/tuple/b2i64tuple.hxx>
 #include <basegfx/range/basicbox.hxx>
-#include <basegfx/basegfxdllapi.h>
 
 namespace basegfx
 {
diff --git a/include/basegfx/range/b2irange.hxx b/include/basegfx/range/b2irange.hxx
index a8a95d69ceed..b6bb8e92cb9f 100644
--- a/include/basegfx/range/b2irange.hxx
+++ b/include/basegfx/range/b2irange.hxx
@@ -24,7 +24,6 @@
 #include <vector>
 
 #include <basegfx/point/b2ipoint.hxx>
-#include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/tuple/b2ituple.hxx>
 #include <basegfx/tuple/b2i64tuple.hxx>
 #include <basegfx/range/basicrange.hxx>
diff --git a/include/basegfx/range/basicbox.hxx b/include/basegfx/range/basicbox.hxx
index a4535b15cde3..2453f7e08462 100644
--- a/include/basegfx/range/basicbox.hxx
+++ b/include/basegfx/range/basicbox.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_BASEGFX_RANGE_BASICBOX_HXX
 
 #include <basegfx/range/basicrange.hxx>
-#include <basegfx/basegfxdllapi.h>
 
 
 namespace basegfx
diff --git a/include/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx
index a9fc6a123d1e..6c370fe61459 100644
--- a/include/basegfx/raster/bzpixelraster.hxx
+++ b/include/basegfx/raster/bzpixelraster.hxx
@@ -20,13 +20,9 @@
 #ifndef INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
 #define INCLUDED_BASEGFX_RASTER_BZPIXELRASTER_HXX
 
-#include <basegfx/basegfxdllapi.h>
 #include <basegfx/pixel/bpixel.hxx>
-#include <basegfx/raster/bzpixelraster.hxx>
-#include <osl/diagnose.h>
 #include <sal/types.h>
 #include <memory>
-#include <algorithm>
 #include <string.h>
 
 namespace basegfx
diff --git a/include/basegfx/raster/rasterconvert3d.hxx b/include/basegfx/raster/rasterconvert3d.hxx
index 75d578029104..19c93770dd11 100644
--- a/include/basegfx/raster/rasterconvert3d.hxx
+++ b/include/basegfx/raster/rasterconvert3d.hxx
@@ -28,7 +28,6 @@
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/basegfxdllapi.h>
 
 namespace basegfx
diff --git a/include/basegfx/tuple/b2dtuple.hxx b/include/basegfx/tuple/b2dtuple.hxx
index cba49bf0325c..b0297b5f0a6c 100644
--- a/include/basegfx/tuple/b2dtuple.hxx
+++ b/include/basegfx/tuple/b2dtuple.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
-#include <algorithm>
 #include <basegfx/basegfxdllapi.h>
 
 namespace basegfx
diff --git a/include/basegfx/tuple/b2i64tuple.hxx b/include/basegfx/tuple/b2i64tuple.hxx
index ae3ec5f5a969..a47a82e1db2a 100644
--- a/include/basegfx/tuple/b2i64tuple.hxx
+++ b/include/basegfx/tuple/b2i64tuple.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_BASEGFX_TUPLE_B2I64TUPLE_HXX
 
 #include <sal/types.h>
-#include <basegfx/tuple/b2dtuple.hxx>
 #include <basegfx/basegfxdllapi.h>
 
 
diff --git a/include/basegfx/tuple/b2ituple.hxx b/include/basegfx/tuple/b2ituple.hxx
index f8df10fe2851..25e81d1ceab2 100644
--- a/include/basegfx/tuple/b2ituple.hxx
+++ b/include/basegfx/tuple/b2ituple.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_BASEGFX_TUPLE_B2ITUPLE_HXX
 
 #include <sal/types.h>
-#include <basegfx/numeric/ftools.hxx>
-#include <algorithm>
 #include <basegfx/basegfxdllapi.h>
 
 namespace basegfx
diff --git a/include/basegfx/tuple/b3dtuple.hxx b/include/basegfx/tuple/b3dtuple.hxx
index 643663bf8a05..6767d5142476 100644
--- a/include/basegfx/tuple/b3dtuple.hxx
+++ b/include/basegfx/tuple/b3dtuple.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/types.h>
 #include <basegfx/numeric/ftools.hxx>
-#include <algorithm>
 #include <basegfx/basegfxdllapi.h>
 
 namespace basegfx
diff --git a/include/basegfx/tuple/b3ituple.hxx b/include/basegfx/tuple/b3ituple.hxx
index 84ebb919cf78..913b4d847ce0 100644
--- a/include/basegfx/tuple/b3ituple.hxx
+++ b/include/basegfx/tuple/b3ituple.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_BASEGFX_TUPLE_B3ITUPLE_HXX
 
 #include <sal/types.h>
-#include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/basegfxdllapi.h>
 
 namespace basegfx
diff --git a/include/basegfx/utils/b2dclipstate.hxx b/include/basegfx/utils/b2dclipstate.hxx
index a6d12ba41d7b..66fe72d9506c 100644
--- a/include/basegfx/utils/b2dclipstate.hxx
+++ b/include/basegfx/utils/b2dclipstate.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BASEGFX_UTILS_B2DCLIPSTATE_HXX
 #define INCLUDED_BASEGFX_UTILS_B2DCLIPSTATE_HXX
 
-#include <sal/types.h>
 #include <o3tl/cow_wrapper.hxx>
 #include <basegfx/basegfxdllapi.h>
 
@@ -28,8 +27,6 @@
 namespace basegfx
 {
     class B2DRange;
-    class B2DPolyRange;
-    class B2DPolygon;
     class B2DPolyPolygon;
     class B2DHomMatrix;
 
diff --git a/include/basegfx/utils/canvastools.hxx b/include/basegfx/utils/canvastools.hxx
index 688dcd797df3..fa2ad145c154 100644
--- a/include/basegfx/utils/canvastools.hxx
+++ b/include/basegfx/utils/canvastools.hxx
@@ -29,12 +29,10 @@ namespace com { namespace sun { namespace star { namespace geometry
 {
     struct AffineMatrix2D;
     struct AffineMatrix3D;
-    struct Matrix2D;
     struct RealPoint2D;
     struct RealSize2D;
     struct RealRectangle2D;
     struct RealRectangle3D;
-    struct IntegerPoint2D;
     struct IntegerSize2D;
     struct IntegerRectangle2D;
     struct RealBezierSegment2D;
@@ -48,8 +46,6 @@ namespace com { namespace sun { namespace star { namespace rendering
 
 namespace com { namespace sun { namespace star { namespace awt
 {
-    struct Point;
-    struct Size;
     struct Rectangle;
 } } } }
 
@@ -61,9 +57,7 @@ namespace basegfx
     class B2DPoint;
     class B2DRange;
     class B3DRange;
-    class B2IBox;
     class B2IVector;
-    class B2IPoint;
     class B2IRange;
     class B2DPolygon;
     class B2DPolyPolygon;
diff --git a/include/basegfx/utils/gradienttools.hxx b/include/basegfx/utils/gradienttools.hxx
index 6c754d4ed686..5714fc1802f1 100644
--- a/include/basegfx/utils/gradienttools.hxx
+++ b/include/basegfx/utils/gradienttools.hxx
@@ -21,14 +21,11 @@
 #define INCLUDED_BASEGFX_UTILS_GRADIENTTOOLS_HXX
 
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/range/b2drange.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/basegfxdllapi.h>
 
-#include <vector>
-#include <algorithm>
+namespace basegfx { class B2DRange; }
 
 namespace basegfx
 {
diff --git a/include/basegfx/utils/keystoplerp.hxx b/include/basegfx/utils/keystoplerp.hxx
index 57f0b0fe2579..551e31bcf65a 100644
--- a/include/basegfx/utils/keystoplerp.hxx
+++ b/include/basegfx/utils/keystoplerp.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BASEGFX_UTILS_KEYSTOPLERP_HXX
 #define INCLUDED_BASEGFX_UTILS_KEYSTOPLERP_HXX
 
-#include <basegfx/numeric/ftools.hxx>
 #include <vector>
 #include <basegfx/basegfxdllapi.h>
 
diff --git a/include/basegfx/utils/lerp.hxx b/include/basegfx/utils/lerp.hxx
index 8dd3ca50435f..3e1c272128f1 100644
--- a/include/basegfx/utils/lerp.hxx
+++ b/include/basegfx/utils/lerp.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_BASEGFX_UTILS_LERP_HXX
 #define INCLUDED_BASEGFX_UTILS_LERP_HXX
 
-#include <sal/types.h>
-
 namespace basegfx
 {
     namespace utils
diff --git a/include/basegfx/utils/zoomtools.hxx b/include/basegfx/utils/zoomtools.hxx
index 533f25883e75..b8a72551589a 100644
--- a/include/basegfx/utils/zoomtools.hxx
+++ b/include/basegfx/utils/zoomtools.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_BASEGFX_UTILS_ZOOMTOOLS_HXX
 #define INCLUDED_BASEGFX_UTILS_ZOOMTOOLS_HXX
 
-#include <sal/types.h>
 #include <basegfx/basegfxdllapi.h>
 
 
diff --git a/include/basegfx/vector/b2enums.hxx b/include/basegfx/vector/b2enums.hxx
index 2253d21cca9e..3793e6844b84 100644
--- a/include/basegfx/vector/b2enums.hxx
+++ b/include/basegfx/vector/b2enums.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_BASEGFX_VECTOR_B2ENUMS_HXX
 #define INCLUDED_BASEGFX_VECTOR_B2ENUMS_HXX
 
-#include <sal/types.h>
-
 namespace basegfx
 {
     /** Descriptor for the mathematical orientations of two 2D Vectors
diff --git a/include/basegfx/vector/b2ivector.hxx b/include/basegfx/vector/b2ivector.hxx
index fab0e8cd3eac..df7c651ef57a 100644
--- a/include/basegfx/vector/b2ivector.hxx
+++ b/include/basegfx/vector/b2ivector.hxx
@@ -23,7 +23,6 @@
 #include <ostream>
 
 #include <basegfx/tuple/b2ituple.hxx>
-#include <basegfx/vector/b2enums.hxx>
 #include <basegfx/basegfxdllapi.h>
 
 namespace basegfx
diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx
index 46c030409415..2a6d13c6bd28 100644
--- a/sc/source/ui/inc/rfindlst.hxx
+++ b/sc/source/ui/inc/rfindlst.hxx
@@ -25,6 +25,8 @@
 #include <address.hxx>
 #include <tools/solar.h>
 
+#include <vector>
+
 struct ScRangeFindData
 {
     ScRange    aRef;
diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
index 7e0e80dcfbf5..6b9d6d50fb41 100644
--- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sdr/primitive2d/sdrcaptionprimitive2d.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <drawinglayer/primitive2d/groupprimitive2d.hxx>
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index b589d6156fb3..7143b91a635e 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -20,6 +20,7 @@
 #include <sdr/primitive2d/sdrcustomshapeprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <drawinglayer/primitive2d/groupprimitive2d.hxx>
 #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
index aa6589abec40..21c41439a90d 100644
--- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx
@@ -20,6 +20,7 @@
 #include <sdr/primitive2d/sdrellipseprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <drawinglayer/primitive2d/groupprimitive2d.hxx>
 #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
index 509eaaf92bad..8efd59bba6be 100644
--- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx
@@ -23,6 +23,7 @@
 #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 
 using namespace com::sun::star;
diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
index 9d1b2c667d7d..b8acf2355687 100644
--- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx
@@ -24,6 +24,7 @@
 #include <svx/sdr/primitive2d/svx_primitivetypes2d.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 
 using namespace com::sun::star;
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index cf165fbdb1fa..1f1b0e6e5169 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
+#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/style/BreakType.hpp>
diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx
index 3bb31edd030b..5dca8ae709b7 100644
--- a/sw/source/ui/vba/vbadocument.hxx
+++ b/sw/source/ui/vba/vbadocument.hxx
@@ -27,6 +27,8 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <cppuhelper/implbase.hxx>
 
+#include <vector>
+
 typedef cppu::ImplInheritanceHelper< VbaDocumentBase, ooo::vba::word::XDocument, ooo::vba::XSinkCaller > SwVbaDocument_BASE;
 
 class SwVbaDocument : public SwVbaDocument_BASE
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index a286811d4e52..a8f9a7a1dbff 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -82,6 +82,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <o3tl/safeint.hxx>
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 4a554125c796..4d639478938f 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -55,6 +55,7 @@
 #include <xmloff/attrlist.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/numeric/ftools.hxx>