diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
index efa3e5b46..408689661 100644
--- a/cmake/modules/BuildPlugin.cmake
+++ b/cmake/modules/BuildPlugin.cmake
@@ -5,10 +5,14 @@
 
 INCLUDE(GenQrc)
 
-MACRO(BUILD_PLUGIN PLUGIN_NAME)
-	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
+FUNCTION(BUILD_PLUGIN PLUGIN_NAME)
+	CMAKE_PARSE_ARGUMENTS(PLUGIN "" "DESTINATION;LINK;EXPORT_BASE_NAME" "MOCFILES;EMBEDDED_RESOURCES;UICFILES" ${ARGN})
 	SET(PLUGIN_SOURCES ${PLUGIN_UNPARSED_ARGUMENTS})
 
+	IF(NOT PLUGIN_DESTINATION)
+		SET(PLUGIN_DESTINATION "${PLUGIN_DIR}")
+	ENDIF()
+
 	INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}/include")
 
 	ADD_DEFINITIONS(-DPLUGIN_NAME=${PLUGIN_NAME})
@@ -56,22 +60,13 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 
 	ADD_LIBRARY(${PLUGIN_NAME} ${PLUGIN_LINK} ${PLUGIN_SOURCES} ${plugin_MOC_out} ${RCC_OUT})
 
-	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
+	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml lmms)
 
-	IF(LMMS_BUILD_WIN32)
-		TARGET_LINK_LIBRARIES(${PLUGIN_NAME} lmms)
-	ENDIF(LMMS_BUILD_WIN32)
+	INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION "${PLUGIN_DESTINATION}")
 
-	INSTALL(TARGETS ${PLUGIN_NAME} DESTINATION "${PLUGIN_DIR}")
-
-	IF(LMMS_BUILD_APPLE)
-		IF ("${PLUGIN_LINK}" STREQUAL "SHARED")
-			SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
-		ELSE()
-			SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-bundle_loader \"${CMAKE_BINARY_DIR}/lmms\"")
-		ENDIF()
-		ADD_DEPENDENCIES(${PLUGIN_NAME} lmms)
-	ENDIF(LMMS_BUILD_APPLE)
+	IF(LMMS_BUILD_APPLE AND "${PLUGIN_LINK}" STREQUAL "SHARED")
+		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+	ENDIF()
 	IF(LMMS_BUILD_WIN32 AND STRIP)
 		SET_TARGET_PROPERTIES(${PLUGIN_NAME} PROPERTIES PREFIX "")
 		ADD_CUSTOM_COMMAND(TARGET ${PLUGIN_NAME} POST_BUILD COMMAND ${STRIP} "$<TARGET_FILE:${PLUGIN_NAME}>")
@@ -89,5 +84,4 @@ MACRO(BUILD_PLUGIN PLUGIN_NAME)
 	TARGET_INCLUDE_DIRECTORIES(${PLUGIN_NAME}
 		PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
 	)
-ENDMACRO(BUILD_PLUGIN)
-
+ENDFUNCTION(BUILD_PLUGIN)
diff --git a/plugins/LadspaEffect/calf/CMakeLists.txt b/plugins/LadspaEffect/calf/CMakeLists.txt
index 4924169e4..58a40d99f 100644
--- a/plugins/LadspaEffect/calf/CMakeLists.txt
+++ b/plugins/LadspaEffect/calf/CMakeLists.txt
@@ -49,3 +49,5 @@ ENDIF()
 IF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD)
 	SET_TARGET_PROPERTIES(veal PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined")
 ENDIF()
+
+TARGET_LINK_LIBRARIES(veal lmms)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a49d3ed1e..f8cfa3c03 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -188,12 +188,15 @@ FOREACH(LIB ${LMMS_REQUIRED_LIBS})
 ENDFOREACH()
 
 
+SET_TARGET_PROPERTIES(lmms PROPERTIES
+	ENABLE_EXPORTS ON
+)
+
 # Install
 IF(NOT MSVC)
 	IF(LMMS_BUILD_WIN32)
 		SET_TARGET_PROPERTIES(lmms PROPERTIES
 			LINK_FLAGS "${LINK_FLAGS} -mwindows"
-			ENABLE_EXPORTS ON
 		)
 
 		IF(LMMS_BUILD_MSYS)
@@ -276,23 +279,15 @@ IF(NOT MSVC)
 		ENDIF()
 
 	ELSE(LMMS_BUILD_WIN32)
-		IF(NOT LMMS_BUILD_APPLE)
-			SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Wl,-E")
-		ENDIF(NOT LMMS_BUILD_APPLE)
-
 		INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}")
 		INSTALL(FILES "${CMAKE_BINARY_DIR}/lmms.1.gz" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/" PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 
 	ENDIF(LMMS_BUILD_WIN32)
 ELSE(NOT MSVC)
-		SET_TARGET_PROPERTIES(lmms PROPERTIES
-			ENABLE_EXPORTS ON
-		)
 		INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}")
 		
 				SET_TARGET_PROPERTIES(lmms PROPERTIES
 			LINK_FLAGS "${LINK_FLAGS} -mwindows"
-			ENABLE_EXPORTS ON
 		)
 
 		#CMAKE_FIND_ROOT_PATH