diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index 4fd12bde4a10..4a81a82c4c71 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -27,6 +27,9 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/utils/systemdependentdata.hxx>
 
+namespace basegfx
+{
+
 class ImplB2DPolyPolygon
 {
     basegfx::B2DPolygonVector                               maPolygons;
@@ -197,9 +200,6 @@ public:
     }
 };
 
-namespace basegfx
-{
-
     static o3tl::cow_wrapper<ImplB2DPolyPolygon> DEFAULT;
 
     B2DPolyPolygon::B2DPolyPolygon() :
diff --git a/include/basegfx/polygon/b2dpolypolygon.hxx b/include/basegfx/polygon/b2dpolypolygon.hxx
index 010815c8784e..f1420edef79a 100644
--- a/include/basegfx/polygon/b2dpolypolygon.hxx
+++ b/include/basegfx/polygon/b2dpolypolygon.hxx
@@ -28,22 +28,15 @@
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
 
-class ImplB2DPolyPolygon;
-
 namespace basegfx
 {
     class B2DHomMatrix;
-}
+    class ImplB2DPolyPolygon;
 
-namespace basegfx
-{
     class BASEGFX_DLLPUBLIC B2DPolyPolygon
     {
-    public:
-        typedef o3tl::cow_wrapper< ImplB2DPolyPolygon > ImplType;
-
     private:
-        ImplType                                        mpPolyPolygon;
+        o3tl::cow_wrapper<ImplB2DPolyPolygon> mpPolyPolygon;
 
     public:
         B2DPolyPolygon();