4 files changed, 7 insertions, 6 deletions
diff --git a/vcl/inc/controldata.hxx b/vcl/inc/controldata.hxx
index b4028026c49e..5554afc951dd 100644
--- a/vcl/inc/controldata.hxx
+++ b/vcl/inc/controldata.hxx
@@ -26,7 +26,7 @@ namespace vcl
 {
     struct ImplControlData
     {
-        mutable ControlLayoutData*  mpLayoutData;
+        mutable std::unique_ptr<ControlLayoutData>  mpLayoutData;
         VclPtr<OutputDevice>        mpReferenceDevice;
 
         ImplControlData()
@@ -37,7 +37,6 @@ namespace vcl
 
         ~ImplControlData()
         {
-            delete mpLayoutData;
         }
     };
 
diff --git a/vcl/inc/impbmp.hxx b/vcl/inc/impbmp.hxx
index 4d365a7cb5c2..dd607fccc2f6 100644
--- a/vcl/inc/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
@@ -37,7 +37,8 @@ class Bitmap;
 class ImpBitmap
 {
 private:
-    SalBitmap*          mpSalBitmap;
+    std::unique_ptr<SalBitmap>
+                        mpSalBitmap;
 
 public:
                         ImpBitmap();
@@ -49,7 +50,7 @@ public:
 
     bool                ImplIsEqual(const ImpBitmap& rBmp) const;
 
-    SalBitmap*          ImplGetSalBitmap() const { return mpSalBitmap; }
+    SalBitmap*          ImplGetSalBitmap() const { return mpSalBitmap.get(); }
 
     bool                ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
     bool                ImplCreate( const ImpBitmap& rImpBitmap );
diff --git a/vcl/inc/opengl/x11/salvd.hxx b/vcl/inc/opengl/x11/salvd.hxx
index d8e6d6a9a1a5..ea4f5c8f5d1b 100644
--- a/vcl/inc/opengl/x11/salvd.hxx
+++ b/vcl/inc/opengl/x11/salvd.hxx
@@ -23,7 +23,8 @@ class X11SalGraphics;
 class X11OpenGLSalVirtualDevice : public SalVirtualDevice
 {
     SalDisplay       *mpDisplay;
-    X11SalGraphics   *mpGraphics;
+    std::unique_ptr<X11SalGraphics>
+                      mpGraphics;
     bool              mbGraphics;         // is Graphics used
     SalX11Screen      mnXScreen;
     int               mnWidth;
diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h
index 5a9786fd1cd8..e79fd1fd56d4 100644
--- a/vcl/inc/unx/geninst.h
+++ b/vcl/inc/unx/geninst.h
@@ -75,7 +75,7 @@ class VCL_DLLPUBLIC SalGenericInstance : public SalInstance
 {
 protected:
     bool           mbPrinterInit;
-    SalYieldMutex *mpSalYieldMutex;
+    std::unique_ptr<SalYieldMutex> mpSalYieldMutex;
 
 public:
     SalGenericInstance( SalYieldMutex* pMutex )