7 files changed, 23 insertions, 10 deletions
diff --git a/basctl/source/inc/dlgedfac.hxx b/basctl/source/inc/dlgedfac.hxx
index d63dae851df2..6e8af7d6fded 100644
--- a/basctl/source/inc/dlgedfac.hxx
+++ b/basctl/source/inc/dlgedfac.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_BASCTL_SOURCE_INC_DLGEDFAC_HXX
 
 #include <svx/svdobj.hxx>
+#include <tools/link.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 
 namespace basctl
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 21789af47db2..1502a4fe5cc9 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -26,18 +26,13 @@
 #include <rtl/ustring.hxx>
 #include <svl/lstner.hxx>
 #include <svl/poolitem.hxx>
-#include <svx/svdsob.hxx>
 #include <svx/svdtypes.hxx>
-#include <svx/svdglue.hxx>
-#include <svx/xdash.hxx>
-#include <svx/xpoly.hxx>
 #include <svx/xenum.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/shapeproperty.hxx>
 #include <tools/weakbase.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/mapmod.hxx>
-#include <vcl/timer.hxx>
+#include <tools/mapunit.hxx>
+#include <tools/gen.hxx>
 
 // forward declarations
 
@@ -70,6 +65,19 @@ class SdrVirtObj;
 class SdrDragView;
 class SdrObjUserDataList;
 class SdrObjPlusData;
+class SdrGluePoint;
+class SdrGluePointList;
+class SetOfByte;
+class OutputDevice;
+class Fraction;
+class Link;
+
+namespace basegfx {
+
+class B2DPolyPolygon;
+class B2DHomMatrix;
+
+}
 
 namespace sdr
 {
diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx
index 1f3c146856cc..864dd36d6c5d 100644
--- a/reportdesign/source/ui/inc/dlgedfac.hxx
+++ b/reportdesign/source/ui/inc/dlgedfac.hxx
@@ -22,6 +22,7 @@
 
 
 #include <svx/svdobj.hxx>
+#include <tools/link.hxx>
 
 namespace rptui
 {
diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx
index 6f1389468878..edfcf9b9425d 100644
--- a/sc/inc/userdat.hxx
+++ b/sc/inc/userdat.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_SC_INC_USERDAT_HXX
 
 #include <svx/svdobj.hxx>
+#include <tools/link.hxx>
 #include <svtools/imap.hxx>
 #include "global.hxx"
 #include "address.hxx"
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 86632964acb1..5494b1f3c3c1 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -25,7 +25,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
 #include <svx/svdobj.hxx>
-
+#include <svx/xdash.hxx>
 
 // Forward Declarations
 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 025903a67bf4..3ff4238eabb8 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -129,6 +129,8 @@
 #include <svx/xlntrit.hxx>
 #include <svx/xlnwtit.hxx>
 #include <svx/xpoly.hxx>
+#include <svx/svdglue.hxx>
+#include <svx/svdsob.hxx>
 #include <rtl/strbuf.hxx>
 #include <svdoopengl.hxx>
 #include <svdobjplusdata.hxx>
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index 60b958ffaf3d..2baa1a6b6b33 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -641,7 +641,7 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
                 aPageRect = GetPageFrm()->Prt().SVRect();
             else
                 aPageRect = GetPageFrm( )->GetBoundRect( ).SVRect();
-            nTargetWidth = aPageRect.GetWidth( ) * GetDrawObj( )->GetRelativeWidth( ).get( );
+            nTargetWidth = aPageRect.GetWidth( ) * (*GetDrawObj( )->GetRelativeWidth());
         }
 
         long nTargetHeight = aCurrObjRect.GetHeight( );
@@ -653,7 +653,7 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
                 aPageRect = GetPageFrm()->Prt().SVRect();
             else
                 aPageRect = GetPageFrm( )->GetBoundRect( ).SVRect();
-            nTargetHeight = aPageRect.GetHeight( ) * GetDrawObj( )->GetRelativeHeight( ).get( );
+            nTargetHeight = aPageRect.GetHeight( ) * (*GetDrawObj( )->GetRelativeHeight());
         }
 
         if ( nTargetWidth != aCurrObjRect.GetWidth( ) || nTargetHeight != aCurrObjRect.GetHeight( ) )