diff --git a/distrho/src/DistrhoPluginVST2.cpp b/distrho/src/DistrhoPluginVST2.cpp
index e8af1507..35ed3d1e 100644
--- a/distrho/src/DistrhoPluginVST2.cpp
+++ b/distrho/src/DistrhoPluginVST2.cpp
@@ -42,6 +42,7 @@
 #define VST_FORCE_DEPRECATED 0
 
 #include <clocale>
+#include <list>
 #include <map>
 #include <string>
 
@@ -1635,6 +1636,20 @@ static void vst_processReplacingCallback(AEffect* effect, float** inputs, float*
 #undef validPlugin
 #undef vstObjectPtr
 
+static struct Cleanup {
+    std::list<AEffect*> effects;
+
+    ~Cleanup()
+    {
+        for (std::list<AEffect*>::iterator it = effects.begin(), end = effects.end(); it != end; ++it)
+        {
+            AEffect* const effect = *it;
+            delete (VstObject*)effect->object;
+            delete effect;
+        }
+    }
+} sCleanup;
+
 // -----------------------------------------------------------------------
 
 END_NAMESPACE_DISTRHO
@@ -1714,12 +1729,13 @@ const AEffect* VSTPluginMain(audioMasterCallback audioMaster)
     effect->processReplacing = vst_processReplacingCallback;
 
     // pointers
-    VstObject* const obj(new VstObject());
+    VstObject* const obj = new VstObject();
     obj->audioMaster = audioMaster;
     obj->plugin      = nullptr;
 
     // done
     effect->object = obj;
+    sCleanup.effects.push_back(effect);
 
     return effect;
 }