diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index e6e18611451d..b57a219127e3 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implpolypolygon.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-11-26 21:01:35 $
+ *  last change: $Author: vg $ $Date: 2005-03-10 13:31:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,11 +63,11 @@
 #include <rtl/math.hxx>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_PATHJOINTYPE_HPP_
-#include <drafts/com/sun/star/rendering/PathJoinType.hpp>
+#ifndef _COM_SUN_STAR_RENDERING_PATHJOINTYPE_HPP_
+#include <com/sun/star/rendering/PathJoinType.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_PATHCAPTYPE_HPP_
-#include <drafts/com/sun/star/rendering/PathCapType.hpp>
+#ifndef _COM_SUN_STAR_RENDERING_PATHCAPTYPE_HPP_
+#include <com/sun/star/rendering/PathCapType.hpp>
 #endif
 
 #ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX
@@ -81,7 +81,7 @@
 #include <tools.hxx>
 
 
-using namespace ::drafts::com::sun::star;
+using namespace ::com::sun::star;
 using namespace ::com::sun::star;
 
 
diff --git a/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index 793bc7358eb3..b2d9457087e3 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implpolypolygon.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-11-26 21:01:47 $
+ *  last change: $Author: vg $ $Date: 2005-03-10 13:31:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,23 +65,23 @@
 #ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX_
 #include <com/sun/star/uno/Reference.hxx>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__
-#include <drafts/com/sun/star/rendering/XPolyPolygon2D.hpp>
+#ifndef _COM_SUN_STAR_RENDERING_XPOLYPOLYGON2D_HPP__
+#include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__
-#include <drafts/com/sun/star/rendering/XGraphicDevice.hpp>
+#ifndef _COM_SUN_STAR_RENDERING_XGRAPHICDEVICE_HPP__
+#include <com/sun/star/rendering/XGraphicDevice.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_STROKEATTRIBUTES_HPP__
-#include <drafts/com/sun/star/rendering/StrokeAttributes.hpp>
+#ifndef _COM_SUN_STAR_RENDERING_STROKEATTRIBUTES_HPP__
+#include <com/sun/star/rendering/StrokeAttributes.hpp>
 #endif
 
 #include <cppcanvas/polypolygon.hxx>
 #include <canvasgraphichelper.hxx>
 
-namespace drafts { namespace com { namespace sun { namespace star { namespace rendering
+namespace com { namespace sun { namespace star { namespace rendering
 {
     struct RealPoint2D;
-} } } } }
+} } } }
 
 
 namespace cppcanvas
@@ -94,7 +94,7 @@ namespace cppcanvas
         public:
             ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas,
                              const ::com::sun::star::uno::Reference<
-                                 ::drafts::com::sun::star::rendering::XPolyPolygon2D >& rPolyPoly );
+                                 ::com::sun::star::rendering::XPolyPolygon2D >& rPolyPoly );
 
             virtual ~ImplPolyPolygon();
 
@@ -112,16 +112,16 @@ namespace cppcanvas
             virtual bool            draw() const;
 
             virtual ::com::sun::star::uno::Reference<
-                ::drafts::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const;
+                ::com::sun::star::rendering::XPolyPolygon2D > getUNOPolyPolygon() const;
 
         private:
             // default: disabled copy/assignment
             ImplPolyPolygon(const ImplPolyPolygon&);
             ImplPolyPolygon& operator= ( const ImplPolyPolygon& );
 
-            const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::rendering::XPolyPolygon2D >   mxPolyPoly;
+            const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D >   mxPolyPoly;
 
-            ::drafts::com::sun::star::rendering::StrokeAttributes                                           maStrokeAttributes;
+            ::com::sun::star::rendering::StrokeAttributes                                           maStrokeAttributes;
 
             ::com::sun::star::uno::Sequence< double >                                                       maFillColor;
             ::com::sun::star::uno::Sequence< double >                                                       maStrokeColor;
diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index e00c4f9e4fcc..4314c3ea7bab 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implsprite.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-11-26 21:02:02 $
+ *  last change: $Author: vg $ $Date: 2005-03-10 13:31:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,11 +59,11 @@
  *
  ************************************************************************/
 
-#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XSPRITE_HPP_
-#include <drafts/com/sun/star/rendering/XSprite.hpp>
+#ifndef _COM_SUN_STAR_RENDERING_XSPRITE_HPP_
+#include <com/sun/star/rendering/XSprite.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_XANIMATEDSPRITE_HPP_
-#include <drafts/com/sun/star/rendering/XAnimatedSprite.hpp>
+#ifndef _COM_SUN_STAR_RENDERING_XANIMATEDSPRITE_HPP_
+#include <com/sun/star/rendering/XAnimatedSprite.hpp>
 #endif
 
 #ifndef _BGFX_TOOLS_CANVASTOOLS_HXX
@@ -80,7 +80,7 @@
 #include <implsprite.hxx>
 
 
-using namespace ::drafts::com::sun::star;
+using namespace ::com::sun::star;
 using namespace ::com::sun::star;
 
 namespace cppcanvas
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index 3930628c9d2d..5b3adb4e708a 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implspritecanvas.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2004-11-26 21:02:29 $
+ *  last change: $Author: vg $ $Date: 2005-03-10 13:32:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,15 +66,15 @@
 #include <basegfx/tools/canvastools.hxx>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_RENDERING_INTERPOLATIONMODE_HPP_
-#include <drafts/com/sun/star/rendering/InterpolationMode.hpp>
+#ifndef _COM_SUN_STAR_RENDERING_INTERPOLATIONMODE_HPP_
+#include <com/sun/star/rendering/InterpolationMode.hpp>
 #endif
 
 #include <implspritecanvas.hxx>
 #include <implcustomsprite.hxx>
 
 
-using namespace ::drafts::com::sun::star;
+using namespace ::com::sun::star;
 using namespace ::com::sun::star;
 
 namespace cppcanvas