diff --git a/writerperfect/inc/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx
index d35a78038228..6107af8aacfb 100644
--- a/writerperfect/inc/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -11,10 +11,9 @@
 #define INCLUDED_WRITERPERFECT_DIRECTORYSTREAM_HXX
 
 #include <librevenge-stream/librevenge-stream.h>
-
 #include <com/sun/star/uno/Reference.h>
-
 #include <writerperfectdllapi.h>
+#include <memory>
 
 namespace com
 {
@@ -57,7 +56,7 @@ public:
     virtual bool isEnd() override;
 
 private:
-    Impl *m_pImpl;
+    std::unique_ptr<Impl> m_pImpl;
 };
 
 }
diff --git a/writerperfect/inc/WPXSvInputStream.hxx b/writerperfect/inc/WPXSvInputStream.hxx
index 7de7455a6f03..e09f4f1005c1 100644
--- a/writerperfect/inc/WPXSvInputStream.hxx
+++ b/writerperfect/inc/WPXSvInputStream.hxx
@@ -11,10 +11,9 @@
 #define INCLUDED_WRITERPERFECT_WPXSVINPUTSTREAM_HXX
 
 #include <librevenge-stream/librevenge-stream.h>
-
 #include <com/sun/star/uno/Reference.h>
-
 #include <writerperfectdllapi.h>
+#include <memory>
 
 namespace com
 {
@@ -55,7 +54,7 @@ public:
     virtual bool isEnd() override;
 
 private:
-    WPXSvInputStreamImpl *mpImpl;
+    std::unique_ptr<WPXSvInputStreamImpl> mpImpl;
 };
 
 }
diff --git a/writerperfect/source/common/DirectoryStream.cxx b/writerperfect/source/common/DirectoryStream.cxx
index cfbb043de7c9..868001540884 100644
--- a/writerperfect/source/common/DirectoryStream.cxx
+++ b/writerperfect/source/common/DirectoryStream.cxx
@@ -111,7 +111,6 @@ DirectoryStream::DirectoryStream(const com::sun::star::uno::Reference<com::sun::
 
 DirectoryStream::~DirectoryStream()
 {
-    delete m_pImpl;
 }
 
 DirectoryStream *DirectoryStream::createForParent(const com::sun::star::uno::Reference<com::sun::star::ucb::XContent> &xContent)
diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx
index 52d5824530ee..a0edca0611c8 100644
--- a/writerperfect/source/common/WPXSvInputStream.cxx
+++ b/writerperfect/source/common/WPXSvInputStream.cxx
@@ -817,7 +817,6 @@ WPXSvInputStream::WPXSvInputStream(Reference< XInputStream > xStream) :
 
 WPXSvInputStream::~WPXSvInputStream()
 {
-    delete mpImpl;
 }
 
 #define BUFFER_MAX 65536