diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp
index 5c09917d1..6a5fc6dd9 100644
--- a/source/backend/engine/CarlaEngine.cpp
+++ b/source/backend/engine/CarlaEngine.cpp
@@ -29,6 +29,7 @@
 #include "CarlaPlugin.hpp"
 
 #include "CarlaBackendUtils.hpp"
+#include "CarlaEngineUtils.hpp"
 #include "CarlaStateUtils.hpp"
 
 #include <cmath>
diff --git a/source/backend/engine/CarlaEngineBridge.cpp b/source/backend/engine/CarlaEngineBridge.cpp
index e9a15fbd1..aca00f298 100644
--- a/source/backend/engine/CarlaEngineBridge.cpp
+++ b/source/backend/engine/CarlaEngineBridge.cpp
@@ -20,11 +20,12 @@
 #endif
 
 #include "CarlaEngineInternal.hpp"
-#include "CarlaBackendUtils.hpp"
-#include "CarlaMIDI.h"
+#include "CarlaPlugin.hpp"
 
+#include "CarlaBackendUtils.hpp"
 #include "CarlaBridgeUtils.hpp"
 #include "CarlaShmUtils.hpp"
+#include "CarlaMIDI.h"
 
 #include "jackbridge/JackBridge.hpp"
 
diff --git a/source/backend/engine/CarlaEngineInternal.hpp b/source/backend/engine/CarlaEngineInternal.hpp
index 7fe54d3fe..6e756a8b7 100644
--- a/source/backend/engine/CarlaEngineInternal.hpp
+++ b/source/backend/engine/CarlaEngineInternal.hpp
@@ -23,6 +23,7 @@
 #include "CarlaEngineThread.hpp"
 
 #include "CarlaMutex.hpp"
+#include "LinkedList.hpp"
 
 // -----------------------------------------------------------------------
 // Engine helper macro, sets lastError and returns false/NULL
diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp
index 8aea82f3b..8d511fa1a 100644
--- a/source/backend/plugin/CarlaPlugin.cpp
+++ b/source/backend/plugin/CarlaPlugin.cpp
@@ -59,9 +59,9 @@ struct ParamSymbol {
 
 // -----------------------------------------------------------------------
 
-CarlaPlugin* CarlaPlugin::newGIG(const Initializer& init, const bool use16Outs)
+CarlaPlugin* CarlaPlugin::newFileGIG(const Initializer& init, const bool use16Outs)
 {
-    carla_debug("CarlaPlugin::newGIG({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
+    carla_debug("CarlaPlugin::newFileGIG({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
 #ifdef WANT_LINUXSAMPLER
     return newLinuxSampler(init, "GIG", use16Outs);
 #else
@@ -73,9 +73,9 @@ CarlaPlugin* CarlaPlugin::newGIG(const Initializer& init, const bool use16Outs)
 #endif
 }
 
-CarlaPlugin* CarlaPlugin::newSF2(const Initializer& init, const bool use16Outs)
+CarlaPlugin* CarlaPlugin::newFileSF2(const Initializer& init, const bool use16Outs)
 {
-    carla_debug("CarlaPlugin::newSF2({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
+    carla_debug("CarlaPlugin::newFileSF2({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
 #if defined(WANT_FLUIDSYNTH)
     return newFluidSynth(init, use16Outs);
 #elif defined(WANT_LINUXSAMPLER)
@@ -89,17 +89,14 @@ CarlaPlugin* CarlaPlugin::newSF2(const Initializer& init, const bool use16Outs)
 #endif
 }
 
-CarlaPlugin* CarlaPlugin::newSFZ(const Initializer& init, const bool use16Outs)
+CarlaPlugin* CarlaPlugin::newFileSFZ(const Initializer& init)
 {
-    carla_debug("CarlaPlugin::newSFZ({%p, \"%s\", \"%s\", \"%s\"}, %s)", init.engine, init.filename, init.name, init.label, bool2str(use16Outs));
+    carla_debug("CarlaPlugin::newFileSFZ({%p, \"%s\", \"%s\", \"%s\"})", init.engine, init.filename, init.name, init.label);
 #ifdef WANT_LINUXSAMPLER
-    return newLinuxSampler(init, "SFZ", use16Outs);
+    return newLinuxSampler(init, "SFZ", false);
 #else
     init.engine->setLastError("SFZ support not available");
     return nullptr;
-
-    // unused
-    (void)use16Outs;
 #endif
 }
 
diff --git a/source/backend/plugin/CsoundPlugin.cpp b/source/backend/plugin/CsoundPlugin.cpp
index f1d1adafd..ede9c7dc9 100644
--- a/source/backend/plugin/CsoundPlugin.cpp
+++ b/source/backend/plugin/CsoundPlugin.cpp
@@ -79,6 +79,8 @@ CARLA_BACKEND_END_NAMESPACE
 
 #endif
 
+// -----------------------------------------------------------------------
+
 CARLA_BACKEND_START_NAMESPACE
 
 CarlaPlugin* CarlaPlugin::newCsound(const Initializer& init)
@@ -110,4 +112,12 @@ CarlaPlugin* CarlaPlugin::newCsound(const Initializer& init)
 #endif
 }
 
+CarlaPlugin* CarlaPlugin::newFileCSD(const Initializer& init)
+{
+    carla_debug("CarlaPlugin::newFileCSD({%p, \"%s\", \"%s\", \"%s\"})", init.engine, init.filename, init.name, init.label);
+    return newCsound(init);
+}
+
 CARLA_BACKEND_END_NAMESPACE
+
+// -----------------------------------------------------------------------
diff --git a/source/bridges/CarlaBridgePlugin.cpp b/source/bridges/CarlaBridgePlugin.cpp
index fae47183f..48984d733 100644
--- a/source/bridges/CarlaBridgePlugin.cpp
+++ b/source/bridges/CarlaBridgePlugin.cpp
@@ -23,6 +23,7 @@
 
 #include "CarlaBackendUtils.hpp"
 #include "CarlaBridgeUtils.hpp"
+#include "CarlaMIDI.h"
 
 //#include "juce_core.h"
 
diff --git a/source/bridges/Makefile b/source/bridges/Makefile
index 13c129bc2..4c33b8177 100644
--- a/source/bridges/Makefile
+++ b/source/bridges/Makefile
@@ -368,6 +368,7 @@ OBJS_NATIVE  = CarlaBridgePlugin__native.o \
 # carla-engine
 OBJS_NATIVE += \
 	../backend/engine/CarlaEngine__native.o \
+	../backend/engine/CarlaEngineInternal__native.o \
 	../backend/engine/CarlaEngineOsc__native.o \
 	../backend/engine/CarlaEngineThread__native.o \
 	../backend/engine/CarlaEngineJack__native.o \
@@ -376,6 +377,7 @@ OBJS_NATIVE += \
 # carla-plugin
 OBJS_NATIVE += \
 	../backend/plugin/CarlaPlugin__native.o \
+	../backend/plugin/CarlaPluginInternal__native.o \
 	../backend/plugin/CarlaPluginThread__native.o \
 	../backend/plugin/NativePlugin__native.o \
 	../backend/plugin/LadspaPlugin__native.o \
@@ -383,8 +385,8 @@ OBJS_NATIVE += \
 	../backend/plugin/Lv2Plugin__native.o \
 	../backend/plugin/VstPlugin__native.o \
 	../backend/plugin/AuPlugin__native.o \
-	../backend/plugin/JucePlugin__native.o \
 	../backend/plugin/CsoundPlugin__native.o \
+	../backend/plugin/JucePlugin__native.o \
 	../backend/plugin/FluidSynthPlugin__native.o \
 	../backend/plugin/LinuxSamplerPlugin__native.o