4 files changed, 8 insertions, 7 deletions
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 5eacb458d879..1f9bec471c8f 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -38,9 +38,9 @@
 #include <svl/solar.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
-#include "svx/impgrf.hxx"
 #include "xoutbmp.hxx"
 #include <svtools/FilterConfigItem.hxx>
+#include <svtools/filter.hxx>
 
 // -----------
 // - Defines -
@@ -327,7 +327,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
         INetURLObject   aURL( rFileName );
         Graphic         aGraphic;
         String          aExt;
-        GraphicFilter*  pFilter = GetGrfFilter();
+        GraphicFilter*  pFilter = GraphicFilter::GetGraphicFilter();
         USHORT          nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
         BOOL            bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 8f11d9a7a1ba..a301e47e5c25 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <svl/itempool.hxx>
-
+#include <editeng/memberids.hrc>
 #include <tools/stream.hxx>
 
 #include "unoapi.hxx"
@@ -55,7 +55,7 @@
 #include "xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 3051eceeee6b..ea91bc120201 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -38,7 +38,7 @@
 #include "xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/itemtype.hxx>
+#include <editeng/itemtype.hxx>
 #include <svx/xdef.hxx>
 
 #define GLOBALOVERFLOW
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index e26817bf0605..486602e28256 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -35,13 +35,14 @@
 #include <vcl/bitmapex.hxx>
 #include <toolkit/unohlp.hxx>
 #include <svl/style.hxx>
+#include <editeng/memberids.hrc>
 
 #include <svx/dialogs.hrc>
 #include "xattr.hxx"
 #include <svx/xtable.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
-#include <svx/unoprnms.hxx>
+#include <editeng/unoprnms.hxx>
 
 #include "unoapi.hxx"
 #include <svx/svdmodel.hxx>
@@ -829,7 +830,7 @@ sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
     }
     if( bSetURL )
     {
-        GraphicObject aGrafObj( CreateGraphicObjectFromURL( aURL ) );
+        GraphicObject aGrafObj( GraphicObject::CreateGraphicObjectFromURL( aURL ) );
         XOBitmap aBMP( aGrafObj );
         SetBitmapValue( aBMP );
     }