diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcac2ce1d..30b5ee220 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -399,26 +399,20 @@ IF(GIT_FOUND)
 		TIMEOUT 1)
 ENDIF(GIT_FOUND)
 
-SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}")
-
 # embedded resources stuff
 IF(WIN32 OR WIN64)
 	# compile buildtools native
 	SET(BIN2RES_CPP "${CMAKE_SOURCE_DIR}/buildtools/bin2res.cpp")
 	SET(BIN2RES "${CMAKE_BINARY_DIR}/bin2res")
-	ADD_CUSTOM_COMMAND(OUTPUT "${BIN2RES}" COMMAND g++ ARGS "\"${BIN2RES_CPP}\"" -o "\"${BIN2RES}\"" DEPENDS "${BIN2RES_CPP}")
+	ADD_CUSTOM_TARGET(bin2res COMMAND g++ "\"${BIN2RES_CPP}\"" -o "\"${BIN2RES}\"" DEPENDS "${BIN2RES_CPP}")
 ELSE(WIN32 OR WIN64)
 	ADD_EXECUTABLE(bin2res buildtools/bin2res.cpp)
 	GET_TARGET_PROPERTY(BIN2RES bin2res LOCATION)
 ENDIF(WIN32 OR WIN64)
 
-SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
-
 # we somehow have to make LMMS-binary depend on MOC-files
 ADD_FILE_DEPENDENCIES("${CMAKE_BINARY_DIR}/lmmsconfig.h")
 
-ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS "${BIN2RES}")
-
 # set up apple vars before traversing into data/scripts
 SET(MACOSX_BUNDLE_ICON_FILE "lmms.icns")
 SET(MACOSX_BUNDLE_GUI_IDENTIFIER "LMMS")
@@ -439,10 +433,10 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 # make sub-directories
+ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(plugins)
 ADD_SUBDIRECTORY(data)
 ADD_SUBDIRECTORY(doc)
-ADD_SUBDIRECTORY(src)
 
 ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/lmms.1.gz" COMMAND gzip -c "\"${CMAKE_SOURCE_DIR}/lmms.1\"" > "\"${CMAKE_BINARY_DIR}/lmms.1.gz\"" DEPENDS "${CMAKE_SOURCE_DIR}/lmms.1" COMMENT "Generating lmms.1.gz")
 
diff --git a/cmake/modules/BuildPlugin.cmake b/cmake/modules/BuildPlugin.cmake
index ea53486be..b12d05b5a 100644
--- a/cmake/modules/BuildPlugin.cmake
+++ b/cmake/modules/BuildPlugin.cmake
@@ -23,28 +23,28 @@ ENDMACRO(LIST_CONTAINS)
 MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
   SET(DEFAULT_ARGS)
   FOREACH(arg_name ${arg_names})
-    SET(${prefix}_${arg_name})
+	SET(${prefix}_${arg_name})
   ENDFOREACH(arg_name)
   FOREACH(option ${option_names})
-    SET(${prefix}_${option} FALSE)
+	SET(${prefix}_${option} FALSE)
   ENDFOREACH(option)
 
   SET(current_arg_name DEFAULT_ARGS)
   SET(current_arg_list)
   FOREACH(arg ${ARGN})
-    LIST_CONTAINS(is_arg_name ${arg} ${arg_names})
-    IF (is_arg_name)
-      SET(${prefix}_${current_arg_name} ${current_arg_list})
-      SET(current_arg_name ${arg})
-      SET(current_arg_list)
-    ELSE (is_arg_name)
-      LIST_CONTAINS(is_option ${arg} ${option_names})
-      IF (is_option)
+	LIST_CONTAINS(is_arg_name ${arg} ${arg_names})
+	IF (is_arg_name)
+	  SET(${prefix}_${current_arg_name} ${current_arg_list})
+	  SET(current_arg_name ${arg})
+	  SET(current_arg_list)
+	ELSE (is_arg_name)
+	  LIST_CONTAINS(is_option ${arg} ${option_names})
+	  IF (is_option)
 	SET(${prefix}_${arg} TRUE)
-      ELSE (is_option)
+	  ELSE (is_option)
 	SET(current_arg_list ${current_arg_list} ${arg})
-      ENDIF (is_option)
-    ENDIF (is_arg_name)
+	  ENDIF (is_option)
+	ENDIF (is_arg_name)
   ENDFOREACH(arg)
   SET(${prefix}_${current_arg_name} ${current_arg_list})
 ENDMACRO(PARSE_ARGUMENTS)
@@ -64,7 +64,7 @@ MACRO(BUILD_PLUGIN)
 		ADD_CUSTOM_COMMAND(OUTPUT ${ER_H}
 			COMMAND ${BIN2RES}
 			ARGS ${PLUGIN_EMBEDDED_RESOURCES} > ${ER_H}
-			DEPENDS ${BIN2RES})
+			DEPENDS bin2res)
 	ENDIF(ER_LEN)
 
 	IF(QT5)
@@ -80,18 +80,21 @@ MACRO(BUILD_PLUGIN)
 	ENDFOREACH(f)
 
 	IF(LMMS_BUILD_APPLE)
-	        LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
-        	LINK_LIBRARIES(${QT_LIBRARIES})
+			LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
+			LINK_LIBRARIES(${QT_LIBRARIES})
 	ENDIF(LMMS_BUILD_APPLE)
 	IF(LMMS_BUILD_WIN32)
-	        LINK_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
-        	LINK_LIBRARIES(-llmms ${QT_LIBRARIES})
+			LINK_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+			LINK_LIBRARIES(${QT_LIBRARIES})
 	ENDIF(LMMS_BUILD_WIN32)
 
 	ADD_LIBRARY(${PLUGIN_NAME} MODULE ${PLUGIN_SOURCES} ${plugin_MOC_out})
 	IF(QT5)
-	TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
+		TARGET_LINK_LIBRARIES(${PLUGIN_NAME} Qt5::Widgets Qt5::Xml)
 	ENDIF()
+	IF(LMMS_BUILD_WIN32)
+		TARGET_LINK_LIBRARIES(${PLUGIN_NAME} lmms)
+	ENDIF(LMMS_BUILD_WIN32)
 
 	INSTALL(TARGETS ${PLUGIN_NAME} LIBRARY DESTINATION "${PLUGIN_DIR}")
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a39271d21..3446bc3e5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,7 @@ SET(LMMS_SRCS "")
 SET(LMMS_UIS "")
 
 SET(CMAKE_AUTOMOC ON)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(gui)
@@ -30,6 +31,10 @@ IF(WIN32)
 				DEPENDS "${CMAKE_BINARY_DIR}/lmms.rc")
 ENDIF()
 
+SET(lmms_EMBEDDED_RESOURCES "${CMAKE_SOURCE_DIR}/AUTHORS" "${CMAKE_SOURCE_DIR}/COPYING" "${CONTRIBUTORS}")
+SET(LMMS_ER_H "${CMAKE_CURRENT_BINARY_DIR}/embedded_resources.h")
+ADD_CUSTOM_COMMAND(OUTPUT "${LMMS_ER_H}" COMMAND "${BIN2RES}" ARGS ${lmms_EMBEDDED_RESOURCES} > "\"${LMMS_ER_H}\"" DEPENDS bin2res)
+
 # Paths relative to lmms executable
 FILE(RELATIVE_PATH LIB_DIR_RELATIVE "/${BIN_DIR}" "/${LIB_DIR}")
 FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE "/${BIN_DIR}" "/${PLUGIN_DIR}")
@@ -63,6 +68,7 @@ ADD_EXECUTABLE(lmms
 	${LMMS_SRCS}
 	${LMMS_INCLUDES}
 	${LMMS_UI_OUT}
+	${LMMS_ER_H}
 	"${WINRC}"
 )
 
@@ -94,7 +100,6 @@ IF(QT5)
 ENDIF()
 
 
-
 #
 # rules for building localizations
 #
@@ -123,9 +128,10 @@ ENDFOREACH(_item ${qm_targets})
 
 # Install
 IF(LMMS_BUILD_WIN32)
-
-	SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows")
-	ADD_CUSTOM_COMMAND(TARGET lmms POST_BUILD COMMAND "${STRIP}" "\"${CMAKE_BINARY_DIR}/lmms.exe\"")
+	SET_TARGET_PROPERTIES(lmms PROPERTIES
+		LINK_FLAGS "${LINK_FLAGS} -mwindows"
+		ENABLE_EXPORTS ON)
+	ADD_CUSTOM_COMMAND(TARGET lmms POST_BUILD COMMAND "${STRIP}" "$<TARGET_FILE:lmms>")
 
 	INSTALL(TARGETS lmms RUNTIME DESTINATION "${BIN_DIR}")
 	INSTALL(FILES