14 files changed, 2 insertions, 37 deletions
diff --git a/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx
index f3b3babbbc0f..30410e75c66f 100644
--- a/cppcanvas/source/wrapper/basegfxfactory.cxx
+++ b/cppcanvas/source/wrapper/basegfxfactory.cxx
@@ -18,24 +18,14 @@
  */
 
 
-#include <rtl/instance.hxx>
-#include <osl/getglobalmutex.hxx>
 #include <osl/diagnose.h>
 
-#include <com/sun/star/rendering/InterpolationMode.hpp>
-
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
 
 #include <cppcanvas/basegfxfactory.hxx>
 
-#include <com/sun/star/rendering/RenderState.hpp>
-#include <com/sun/star/rendering/StringContext.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XCanvasFont.hpp>
-
-#include <canvasgraphichelper.hxx>
 
 #include "implpolypolygon.hxx"
 #include "implbitmap.hxx"
diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index adab03b81c1a..80d827de7105 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.cxx
@@ -21,8 +21,7 @@
 #include "implbitmap.hxx"
 #include "implbitmapcanvas.hxx"
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <canvas/canvastools.hxx>
+#include <osl/diagnose.h>
 
 
 using namespace ::com::sun::star;
diff --git a/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index 349e13a8188d..aa8677501dab 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XBitmap.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
 
 #include <cppcanvas/bitmap.hxx>
 #include <canvasgraphichelper.hxx>
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index 67ca17a6e3c4..506af5d1f198 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
@@ -19,10 +19,7 @@
 
 
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XBitmapCanvas.hpp>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <osl/diagnose.h>
 
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 628be99d0b38..afac7b9a8a65 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/rendering/XBitmapCanvas.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
-#include <basegfx/vector/b2dsize.hxx>
 #include <cppcanvas/bitmapcanvas.hxx>
 
 #include "implcanvas.hxx"
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index d5adeb5a0257..102902b71a14 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <rtl/ustring.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
@@ -26,7 +25,6 @@
 #include <com/sun/star/rendering/XCanvas.hpp>
 
 #include <canvas/canvastools.hxx>
-#include <cppcanvas/polypolygon.hxx>
 
 #include "implcanvas.hxx"
 
diff --git a/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 2f8da62e4f0e..e509e999678b 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.hxx
@@ -25,6 +25,7 @@
 #include <cppcanvas/canvas.hxx>
 
 #include <boost/optional.hpp>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 
 namespace basegfx
diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx
index 9aa56211474c..5d19a9e9987b 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.cxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <osl/diagnose.h>
 
 #include "implcustomsprite.hxx"
diff --git a/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index f8964a3f4763..0235e0a43803 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
 #define INCLUDED_CPPCANVAS_SOURCE_WRAPPER_IMPLCUSTOMSPRITE_HXX
 
-#include <sal/types.h>
 #include <cppcanvas/canvas.hxx>
 #include <cppcanvas/customsprite.hxx>
 #include "implsprite.hxx"
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index 755d87022529..d333d46a59d1 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -25,9 +25,6 @@
 #include <com/sun/star/rendering/PathJoinType.hpp>
 #include <com/sun/star/rendering/PathCapType.hpp>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/utils/canvastools.hxx>
-
 #include "implpolypolygon.hxx"
 #include <tools.hxx>
 
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index d6747cdd5374..e19b63c5797a 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
-#include <com/sun/star/rendering/XGraphicDevice.hpp>
 #include <com/sun/star/rendering/StrokeAttributes.hpp>
 
 #include <cppcanvas/polypolygon.hxx>
diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index aaff60db40ca..12a4a13e3b88 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -18,9 +18,6 @@
  */
 
 
-#include <com/sun/star/rendering/XSprite.hpp>
-#include <com/sun/star/rendering/XAnimatedSprite.hpp>
-
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <canvas/canvastools.hxx>
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index d9b6ee7075fc..6d42cf70f76f 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -19,8 +19,6 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/utils/canvastools.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <com/sun/star/rendering/InterpolationMode.hpp>
 #include <osl/diagnose.h>
 
 #include "implspritecanvas.hxx"
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index 3cf795fe0c42..4fe30f4324b2 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.cxx
@@ -17,23 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/instance.hxx>
-#include <osl/getglobalmutex.hxx>
 #include <osl/diagnose.h>
-#include <com/sun/star/rendering/InterpolationMode.hpp>
 #include <vcl/window.hxx>
-#include <vcl/graph.hxx>
 #include <vcl/canvastools.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <cppcanvas/vclfactory.hxx>
 
 #include "implbitmapcanvas.hxx"
 #include "implspritecanvas.hxx"
-#include "implpolypolygon.hxx"
 #include "implbitmap.hxx"
 #include <implrenderer.hxx>
-#include "implsprite.hxx"
 
 using namespace ::com::sun::star;