diff --git a/source/backend/engine/CarlaEngine_patchbay.cpp b/source/backend/engine/CarlaEngine_patchbay.cpp
index d1c4ff595..627a3d8f6 100644
--- a/source/backend/engine/CarlaEngine_patchbay.cpp
+++ b/source/backend/engine/CarlaEngine_patchbay.cpp
@@ -146,7 +146,7 @@ EnginePatchbayBuffers::~EnginePatchbayBuffers()
     clear();
 }
 
-void clear()
+void EnginePatchbayBuffers::clear()
 {
 }
 
diff --git a/source/backend/plugin/CarlaPluginInternal.cpp b/source/backend/plugin/CarlaPluginInternal.cpp
index 4474a25dd..9096eb9ff 100644
--- a/source/backend/plugin/CarlaPluginInternal.cpp
+++ b/source/backend/plugin/CarlaPluginInternal.cpp
@@ -106,9 +106,9 @@ void CarlaPluginProtectedData::postponeRtEvent(const PluginPostRtEventType type,
 
 static LibCounter sLibCounter;
 
-void* CarlaPluginProtectedData::libError(const char* const filename)
+const char* CarlaPluginProtectedData::libError(const char* const filename)
 {
-    lib_error(lib, filename);
+    return lib_error(filename);
 }
 
 bool CarlaPluginProtectedData::libOpen(const char* const filename)
diff --git a/source/backend/plugin/CarlaPluginInternal.hpp b/source/backend/plugin/CarlaPluginInternal.hpp
index 3c185c5d8..9c3f6d0a0 100644
--- a/source/backend/plugin/CarlaPluginInternal.hpp
+++ b/source/backend/plugin/CarlaPluginInternal.hpp
@@ -786,81 +786,19 @@ struct CarlaPluginProtectedData {
     // -------------------------------------------------------------------
     // Buffer functions
 
-    void clearBuffers()
-    {
-        if (latencyBuffers != nullptr)
-        {
-            CARLA_ASSERT(audioIn.count > 0);
-
-            for (uint32_t i=0; i < audioIn.count; ++i)
-            {
-                CARLA_SAFE_ASSERT_CONTINUE(latencyBuffers[i] != nullptr);
-
-                delete[] latencyBuffers[i];
-                latencyBuffers[i] = nullptr;
-            }
-
-            delete[] latencyBuffers;
-            latencyBuffers = nullptr;
-            latency = 0;
-        }
-        else
-        {
-            CARLA_ASSERT(latency == 0);
-        }
-
-        audioIn.clear();
-        audioOut.clear();
-        param.clear();
-        event.clear();
-    }
+    void clearBuffers();
 
-    void recreateLatencyBuffers()
-    {
-        if (latencyBuffers != nullptr)
-        {
-            CARLA_ASSERT(audioIn.count > 0);
-
-            for (uint32_t i=0; i < audioIn.count; ++i)
-            {
-                CARLA_SAFE_ASSERT_CONTINUE(latencyBuffers[i] != nullptr);
-
-                delete[] latencyBuffers[i];
-                latencyBuffers[i] = nullptr;
-            }
-
-            delete[] latencyBuffers;
-            latencyBuffers = nullptr;
-        }
-
-        if (audioIn.count > 0 && latency > 0)
-        {
-            latencyBuffers = new float*[audioIn.count];
-
-            for (uint32_t i=0; i < audioIn.count; ++i)
-            {
-                latencyBuffers[i] = new float[latency];
-                FLOAT_CLEAR(latencyBuffers[i], latency);
-            }
-        }
-    }
+    void recreateLatencyBuffers();
 
     // -------------------------------------------------------------------
     // Post-poned events
 
-    void postponeRtEvent(const PluginPostRtEventType type, const int32_t value1, const int32_t value2, const float value3)
-    {
-        CARLA_SAFE_ASSERT_RETURN(type != kPluginPostRtEventNull,);
-
-        PluginPostRtEvent event = { type, value1, value2, value3 };
-
-        postRtEvents.appendRT(event);
-    }
+    void postponeRtEvent(const PluginPostRtEventType type, const int32_t value1, const int32_t value2, const float value3);
 
     // -------------------------------------------------------------------
     // Library functions, see CarlaPlugin.cpp
 
-    void libError(const char* const filename);
+    const char* libError(const char* const filename);
 
     bool  libOpen(const char* const filename);
     bool  libClose();
diff --git a/source/backend/plugin/LadspaPlugin.cpp b/source/backend/plugin/LadspaPlugin.cpp
index c5751355c..bb431681a 100644
--- a/source/backend/plugin/LadspaPlugin.cpp
+++ b/source/backend/plugin/LadspaPlugin.cpp
@@ -1373,7 +1373,7 @@ public:
 
         if (! pData->libOpen(filename))
         {
-            pData->engine->setLastError(lib_error(filename));
+            pData->engine->setLastError(pData->libError(filename));
             return false;
         }
 
diff --git a/source/backend/plugin/Makefile b/source/backend/plugin/Makefile
index 288f0da5e..689ef1519 100644
--- a/source/backend/plugin/Makefile
+++ b/source/backend/plugin/Makefile
@@ -10,6 +10,7 @@ include ../Makefile.mk
 
 OBJS = \
 	CarlaPlugin.cpp.o \
+	CarlaPluginInternal.cpp.o \
 	CarlaPluginThread.cpp.o \
 	BridgePlugin.cpp.o \
 	NativePlugin.cpp.o \
diff --git a/source/backend/standalone/CarlaStandalone.cpp b/source/backend/standalone/CarlaStandalone.cpp
index ec569e7d6..31a340d4e 100644
--- a/source/backend/standalone/CarlaStandalone.cpp
+++ b/source/backend/standalone/CarlaStandalone.cpp
@@ -19,6 +19,7 @@
 // Check carla_stderr2("Engine is not running"); <= prepend func name and args
 
 #include "CarlaHost.h"
+#include "CarlaMIDI.h"
 #include "CarlaNative.h"
 
 #include "CarlaEngine.hpp"