diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
index d0e3fa17a..bcc89222c 100644
--- a/cmake/modules/BuildPlugin.cmake
+++ b/cmake/modules/BuildPlugin.cmake
@@ -50,11 +50,11 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 		SET(QT_LIBRARIES "${QT_OVERRIDE_LIBRARIES}")
 	ENDIF()
 
-	IF ("${PLUGIN_LINK}" STREQUAL "SHARED")
-	  ADD_LIBRARY(${PLUGIN_NAME} SHARED ${PLUGIN_SOURCES} ${plugin_MOC_out} ${RCC_OUT})
-	ELSE ()
-	  ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES} ${plugin_MOC_out} ${RCC_OUT})
-	ENDIF ()
+	IF (NOT PLUGIN_LINK)
+		SET(PLUGIN_LINK "MODULE")
+	ENDIF()
+
+	ADD_LIBRARY(${PLUGIN_NAME} ${PLUGIN_LINK} ${PLUGIN_SOURCES} ${plugin_MOC_out} ${RCC_OUT})
 
 	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 21c174d0b..0f7e59443 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -11,6 +11,7 @@ ENDIF()
 
 INCLUDE_DIRECTORIES(
 	${SAMPLERATE_INCLUDE_DIRS}
+	"${CMAKE_BINARY_DIR}/src"
 )
 
 SET(PLUGIN_LIST "" CACHE STRING "List of plug-ins to build")
@@ -75,8 +76,8 @@ IF("${PLUGIN_LIST}" STREQUAL "")
 		stereo_enhancer
 		stereo_matrix
 		stk
-		vestige
 		vst_base
+		vestige
 		VstEffect
 		watsyn
 		waveshaper
diff --git a/plugins/GigPlayer/GigPlayer.cpp b/plugins/GigPlayer/GigPlayer.cpp
index 938cd10b1..66212427c 100644
--- a/plugins/GigPlayer/GigPlayer.cpp
+++ b/plugins/GigPlayer/GigPlayer.cpp
@@ -53,7 +53,7 @@
 #include "LcdSpinBox.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {
diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp
index aceea2d41..f9959a205 100644
--- a/plugins/LadspaEffect/LadspaEffect.cpp
+++ b/plugins/LadspaEffect/LadspaEffect.cpp
@@ -44,6 +44,7 @@
 
 #include "embed.h"
 
+#include "plugin_export.h"
 
 extern "C"
 {
diff --git a/plugins/ReverbSC/ReverbSC.cpp b/plugins/ReverbSC/ReverbSC.cpp
index bae59471c..3d56fd0d0 100644
--- a/plugins/ReverbSC/ReverbSC.cpp
+++ b/plugins/ReverbSC/ReverbSC.cpp
@@ -24,6 +24,7 @@
 #include "ReverbSC.h"
 
 #include "embed.h"
+#include "plugin_export.h"
 
 #define DB2LIN(X) pow(10, X / 20.0f);
 
diff --git a/plugins/VstEffect/CMakeLists.txt b/plugins/VstEffect/CMakeLists.txt
index ec05a14ea..78d8e6483 100644
--- a/plugins/VstEffect/CMakeLists.txt
+++ b/plugins/VstEffect/CMakeLists.txt
@@ -12,8 +12,7 @@ ENDIF()
 
 BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControlDialog.h VstEffectControls.h EMBEDDED_RESOURCES *.png)
 SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes")
-TARGET_LINK_LIBRARIES(vsteffect -lvstbase)
-ADD_DEPENDENCIES(vsteffect vstbase)
+TARGET_LINK_LIBRARIES(vsteffect vstbase)
 
 ENDIF(LMMS_SUPPORT_VST)
 
diff --git a/plugins/VstEffect/VstEffect.cpp b/plugins/VstEffect/VstEffect.cpp
index ed05a82a0..1a22176cd 100644
--- a/plugins/VstEffect/VstEffect.cpp
+++ b/plugins/VstEffect/VstEffect.cpp
@@ -32,7 +32,7 @@
 #include "VstSubPluginFeatures.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {
diff --git a/plugins/Xpressive/Xpressive.cpp b/plugins/Xpressive/Xpressive.cpp
index 8c9aa1532..5e500a744 100644
--- a/plugins/Xpressive/Xpressive.cpp
+++ b/plugins/Xpressive/Xpressive.cpp
@@ -48,6 +48,8 @@
 
 #include "ExprSynth.h"
 
+#include "plugin_export.h"
+
 extern "C" {
 
 Plugin::Descriptor PLUGIN_EXPORT xpressive_plugin_descriptor = { STRINGIFY(
diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp
index 82f365ec1..44a535100 100644
--- a/plugins/monstro/Monstro.cpp
+++ b/plugins/monstro/Monstro.cpp
@@ -37,6 +37,7 @@
 
 #include "embed.h"
 
+#include "plugin_export.h"
 
 extern "C"
 {
diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp
index 2339587b5..8f5ae6b36 100644
--- a/plugins/organic/organic.cpp
+++ b/plugins/organic/organic.cpp
@@ -42,7 +42,7 @@
 
 #include "embed.h"
 
-
+#include "plugin_export.h"
 
 
 extern "C"
diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp
index 93867983d..bef1324f5 100644
--- a/plugins/sf2_player/sf2_player.cpp
+++ b/plugins/sf2_player/sf2_player.cpp
@@ -46,7 +46,7 @@
 #include "LcdSpinBox.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {
diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp
index ce3960832..2eb46be56 100644
--- a/plugins/sid/sid_instrument.cpp
+++ b/plugins/sid/sid_instrument.cpp
@@ -42,6 +42,7 @@
 #include "ToolTip.h"
 
 #include "embed.h"
+#include "plugin_export.h"
 
 #define C64_PAL_CYCLES_PER_SEC  985248
 
diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp
index 964e1ddd2..9c138aaa9 100644
--- a/plugins/stk/mallets/mallets.cpp
+++ b/plugins/stk/mallets/mallets.cpp
@@ -41,7 +41,7 @@
 #include "Mixer.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {
diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp
index 95a2c428a..f33a90428 100644
--- a/plugins/vibed/vibed.cpp
+++ b/plugins/vibed/vibed.cpp
@@ -40,7 +40,7 @@
 #include "Song.h"
 
 #include "embed.h"
-
+#include "plugin_export.h"
 
 extern "C"
 {
diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp
index 7ec345ff0..8a5d2fa11 100644
--- a/plugins/zynaddsubfx/ZynAddSubFx.cpp
+++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp
@@ -47,8 +47,7 @@
 #include "ControllerConnection.h"
 
 #include "embed.h"
-
-
+#include "plugin_export.h"
 
 extern "C"
 {