diff --git a/corona.cpp b/corona.cpp
index 1e9fdb3a2..8fc51f008 100644
--- a/corona.cpp
+++ b/corona.cpp
@@ -56,6 +56,15 @@ public:
           engineExplorerAction(0)
     {
     }
+
+    ~Private()
+    {
+        delete layout;
+        while (!applets.isEmpty()) {
+            delete applets.takeFirst();
+        }
+    }
+
     bool immutable;
     Applet::List applets;
     FormFactor formFactor;
@@ -112,9 +121,7 @@ void Corona::init()
 
 Corona::~Corona()
 {
-    while (!d->applets.isEmpty()) {
-        delete d->applets.takeFirst();
-    }
+    delete d;
 }
 
 Location Corona::location() const
diff --git a/dataenginemanager.cpp b/dataenginemanager.cpp
index 8c573d97f..d2d919c61 100644
--- a/dataenginemanager.cpp
+++ b/dataenginemanager.cpp
@@ -39,25 +39,29 @@ class DataEngineManager::Private
 {
     public:
         Private()
-            : null(0)
+            : nullEng(0)
         {}
 
         ~Private()
         {
-            delete null;
+            foreach (Plasma::DataEngine* engine, m_engines) {
+                delete engine;
+            }
+            m_engines.clear();
+            delete nullEng;
         }
 
         DataEngine* nullEngine()
         {
-            if (!null) {
-                null = new NullEngine;
+            if (!nullEng) {
+                nullEng = new NullEngine;
             }
 
-            return null;
+            return nullEng;
         }
 
         DataEngine::Dict m_engines;
-        DataEngine* null;
+        DataEngine* nullEng;
 };
 
 class DataEngineManagerSingleton
@@ -80,10 +84,7 @@ DataEngineManager::DataEngineManager()
 
 DataEngineManager::~DataEngineManager()
 {
-    foreach (Plasma::DataEngine* engine, d->m_engines) {
-        delete engine;
-    }
-    d->m_engines.clear();
+    delete d;
 }
 
 Plasma::DataEngine* DataEngineManager::dataEngine(const QString& name) const
diff --git a/svg.cpp b/svg.cpp
index 44e7fa0f8..6bb09bf5d 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -191,7 +191,7 @@ Svg::Svg(const QString& imagePath, QObject* parent)
 
 Svg::~Svg()
 {
-
+    delete d;
 }
 
 void Svg::paint(QPainter* painter, const QPointF& point, const QString& elementID)
diff --git a/theme.cpp b/theme.cpp
index 6a86d3b28..46f7d24b8 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -60,6 +60,7 @@ Theme::Theme(QObject* parent)
 
 Theme::~Theme()
 {
+    delete d;
 }
 
 QString Theme::themeName() const
diff --git a/widgets/lineedit.cpp b/widgets/lineedit.cpp
index 10c498e5e..3c825c35a 100644
--- a/widgets/lineedit.cpp
+++ b/widgets/lineedit.cpp
@@ -37,6 +37,7 @@ LineEdit::LineEdit(QGraphicsItem *parent, QGraphicsScene *scene)
 
 LineEdit::~LineEdit()
 {
+    delete d;
 }
 
 void LineEdit::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
diff --git a/widgets/vboxlayout.cpp b/widgets/vboxlayout.cpp
index fca66ff6e..c1e1e7c2a 100644
--- a/widgets/vboxlayout.cpp
+++ b/widgets/vboxlayout.cpp
@@ -47,6 +47,8 @@ VBoxLayout::~VBoxLayout()
     foreach (LayoutItem *l, d->childList) {
         l->resetLayout();
     }
+
+    delete d;
 }
 
 Qt::Orientations VBoxLayout::expandingDirections() const