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>

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>
b93769c6 · Gabor Kelemen · Miklos Vajna · 49c87270 · b93769c6 · b93769c6
Kaydet (Commit) b93769c6 authored Eki 05, 2018 tarafından Gabor Kelemen Kaydeden (comit) Miklos Vajna Eki 15, 2018
59 changed files
--- 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>

--- 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
 {

--- 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>

--- 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>

--- 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>


--- 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>

--- 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)

--- 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>

--- 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

--- 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;

--- 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;

--- 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>

--- 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>


--- 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
--- 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

--- 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
 {

--- 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>



--- 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
 {

--- 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
 {

--- 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>


--- 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>

--- 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;

--- 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
 {

--- 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
 {

--- 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

--- 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

--- 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;

--- 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

--- 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

--- 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

--- 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;

--- 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
 {

--- 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>

--- 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

--- 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

--- 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

--- 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

--- 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>



--- 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

--- 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

--- 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

--- 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;


--- 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;

--- 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
 {

--- 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>


--- 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

--- 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>



--- 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

--- 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

--- 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;

--- 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>

--- 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>

--- 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>

--- 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;

--- 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;

--- 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>

--- 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

--- 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>

--- 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>