9 files changed, 7 insertions, 43 deletions
diff --git a/vcl/source/graphic/GraphicLoader.cxx b/vcl/source/graphic/GraphicLoader.cxx
index 8343b513942a..b1127f541515 100644
--- a/vcl/source/graphic/GraphicLoader.cxx
+++ b/vcl/source/graphic/GraphicLoader.cxx
@@ -13,7 +13,6 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/wmf.hxx>
 
 using namespace css;
 
diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx
index 8e1b50a2c0da..49334eb51837 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -21,20 +21,14 @@
 
 #include <algorithm>
 
-#include <officecfg/Office/Common.hxx>
-#include <osl/file.hxx>
-#include <tools/vcompat.hxx>
+#include <osl/diagnose.h>
 #include <tools/fract.hxx>
 #include <tools/helpers.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-#include <unotools/tempfile.hxx>
-#include <unotools/configmgr.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/cvtgrf.hxx>
 #include <vcl/metaact.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <vcl/GraphicLoader.hxx>
+#include <vcl/outdev.hxx>
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/vcl/source/graphic/GraphicObject2.cxx b/vcl/source/graphic/GraphicObject2.cxx
index bfb31740def7..dc60db55dd3f 100644
--- a/vcl/source/graphic/GraphicObject2.cxx
+++ b/vcl/source/graphic/GraphicObject2.cxx
@@ -19,20 +19,11 @@
 
 #include <sal/config.h>
 
-#include <cstdlib>
-
-#include <vcl/bitmapaccess.hxx>
-#include <tools/poly.hxx>
+#include <tools/gen.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/window.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/animate/Animation.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/GraphicObject.hxx>
-#include <bitmapwriteaccess.hxx>
 #include <memory>
 
 struct ImplTileInfo
@@ -188,7 +179,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
 //          rVDev.SetFillCOL_WHITE );
             rVDev.SetFillColor();
             rVDev.SetLineColor( Color( 255 * nExponent / nMSBFactor, 255 - 255 * nExponent / nMSBFactor, 128 - 255 * nExponent / nMSBFactor ) );
-            rVDev.DrawEllipse( Rectangle(aTileInfo.aNextTileTopLeft.X(), aTileInfo.aTileTopLeft.Y(),
+            rVDev.DrawEllipse( tools::Rectangle(aTileInfo.aNextTileTopLeft.X(), aTileInfo.aTileTopLeft.Y(),
                                          aTileInfo.aNextTileTopLeft.X() - 1 + (aTileInfo.nTilesEmptyX/nMSBFactor)*aTileInfo.aTileSizePixel.Width(),
                                          aTileInfo.aTileTopLeft.Y() + aTileInfo.aTileSizePixel.Height() - 1) );
 #endif
@@ -206,7 +197,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
             }
 
 #ifdef DBG_TEST
-            rVDev.DrawEllipse( Rectangle(aTileInfo.aTileTopLeft.X(), aTileInfo.aNextTileTopLeft.Y(),
+            rVDev.DrawEllipse( tools::Rectangle(aTileInfo.aTileTopLeft.X(), aTileInfo.aNextTileTopLeft.Y(),
                                          aTileInfo.aTileTopLeft.X() + aTileInfo.aTileSizePixel.Width() - 1,
                                          aTileInfo.aNextTileTopLeft.Y() - 1 + (aTileInfo.nTilesEmptyY/nMSBFactor)*aTileInfo.aTileSizePixel.Height()) );
 #endif
@@ -272,7 +263,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent
 //  rVDev.SetFillCOL_WHITE );
     rVDev.SetFillColor();
     rVDev.SetLineColor( Color( 255 * nExponent / nMSBFactor, 255 - 255 * nExponent / nMSBFactor, 128 - 255 * nExponent / nMSBFactor ) );
-    rVDev.DrawRect( Rectangle((rTileInfo.aTileTopLeft.X())*rTileSizePixel.Width(),
+    rVDev.DrawRect( tools::Rectangle((rTileInfo.aTileTopLeft.X())*rTileSizePixel.Width(),
                               (rTileInfo.aTileTopLeft.Y())*rTileSizePixel.Height(),
                               (rTileInfo.aNextTileTopLeft.X())*rTileSizePixel.Width()-1,
                               (rTileInfo.aNextTileTopLeft.Y())*rTileSizePixel.Height()-1) );
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 3ddec0ae280b..1370b15c0811 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -19,8 +19,6 @@
 
 #include <graphic/Manager.hxx>
 #include <impgraph.hxx>
-#include <vcl/lazydelete.hxx>
-#include <vcl/svapp.hxx>
 #include <sal/log.hxx>
 
 #include <officecfg/Office/Common.hxx>
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index 8b4f1fa79d89..331e24167aff 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -21,10 +21,8 @@
 
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <svl/itemprop.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/graphic/GraphicType.hpp>
diff --git a/vcl/source/graphic/UnoGraphicObject.cxx b/vcl/source/graphic/UnoGraphicObject.cxx
index fa03a52813bc..86bb100ed3f2 100644
--- a/vcl/source/graphic/UnoGraphicObject.cxx
+++ b/vcl/source/graphic/UnoGraphicObject.cxx
@@ -21,11 +21,9 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/graphic/XGraphicObject.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <vcl/GraphicObject.hxx>
-#include <rtl/ref.hxx>
 
 using namespace css;
 
diff --git a/vcl/source/graphic/UnoGraphicProvider.cxx b/vcl/source/graphic/UnoGraphicProvider.cxx
index eed36dbc0fe6..907b81316050 100644
--- a/vcl/source/graphic/UnoGraphicProvider.cxx
+++ b/vcl/source/graphic/UnoGraphicProvider.cxx
@@ -22,15 +22,11 @@
 #include <vcl/metaact.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/imagerepository.hxx>
-#include <unotools/resmgr.hxx>
 #include <tools/fract.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/wmf.hxx>
 #include <vcl/wmfexternal.hxx>
-#include <svl/solar.hrc>
 #include <vcl/virdev.hxx>
-#include <vcl/settings.hxx>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/graphic/XGraphicProvider2.hpp>
 #include <com/sun/star/io/XStream.hpp>
@@ -46,11 +42,9 @@
 #include <graphic/UnoGraphicDescriptor.hxx>
 #include <graphic/UnoGraphic.hxx>
 #include <rtl/ref.hxx>
-#include <vcl/GraphicObject.hxx>
 #include <vcl/dibtools.hxx>
 #include <comphelper/sequence.hxx>
 #include <memory>
-#include <svtools/ehdl.hxx>
 
 using namespace com::sun::star;
 
diff --git a/vcl/source/graphic/UnoGraphicTransformer.cxx b/vcl/source/graphic/UnoGraphicTransformer.cxx
index 13e1adbee114..30fd389b9485 100644
--- a/vcl/source/graphic/UnoGraphicTransformer.cxx
+++ b/vcl/source/graphic/UnoGraphicTransformer.cxx
@@ -21,16 +21,9 @@
 #include <graphic/UnoGraphicTransformer.hxx>
 
 #include <vcl/graph.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/image.hxx>
-#include <vcl/metaact.hxx>
-#include <svl/solar.hrc>
-#include <vcl/virdev.hxx>
-#include <vcl/bitmapaccess.hxx>
+#include <vcl/BitmapColor.hxx>
 #include <vcl/BitmapDuoToneFilter.hxx>
 
-#include <com/sun/star/text/GraphicCrop.hpp>
-
 using namespace com::sun::star;
 
 namespace unographic {
diff --git a/vcl/source/graphic/grfattr.cxx b/vcl/source/graphic/grfattr.cxx
index 923c2ea9e55a..88d0852afe60 100644
--- a/vcl/source/graphic/grfattr.cxx
+++ b/vcl/source/graphic/grfattr.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <tools/vcompat.hxx>
 #include <vcl/GraphicObject.hxx>