diff --git a/CMakeLists.txt b/CMakeLists.txt
index da67517e9..dac61e2f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,6 @@ OPTION(WANT_WINMM	"Include WinMM MIDI support" OFF)
 IF(LMMS_BUILD_APPLE)
         SET(WANT_ALSA OFF)
 	SET(WANT_PULSEAUDIO OFF)
-	SET(WANT_SWH OFF)
 	SET(WANT_VST OFF)
 	SET(STATUS_ALSA "<not supported on this platform>")
 	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
@@ -388,6 +387,18 @@ ELSE(WIN32)
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DPIC")
 ENDIF(WIN32)
 
+# set up apple vars before traversing into data/scripts
+SET(MACOSX_BUNDLE_ICON_FILE "lmms.icns")
+SET(MACOSX_BUNDLE_GUI_IDENTIFIER "LMMS")
+SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION}")
+SET(MACOSX_BUNDLE_BUNDLE_NAME "LMMS")
+SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION}")
+SET(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION}")
+SET(MACOSX_BUNDLE_COPYRIGHT "Tobias Doerffel, 2008-2010")
+SET(MACOSX_BUNDLE_MIMETYPE "application/x-lmms-project")
+SET(MACOSX_BUNDLE_MIMETYPE_ICON "project.icns")
+SET(MACOSX_BUNDLE_MIMETYPE_ID "net.sourceforge.lmms")
+SET(MACOSX_BUNDLE_PROJECT_URL "http://lmms.sourceforge.net")
 
 
 # make sub-directories
@@ -656,14 +667,6 @@ IF(WIN64)
 		InstallDir \\\"\\\$PROGRAMFILES64\\\\${CPACK_PACKAGE_INSTALL_DIRECTORY}\\\"")
 ENDIF(WIN64)
 
-SET(MACOSX_BUNDLE_ICON_FILE "${CMAKE_SOURCE_DIR}/data/themes/default/icon.png")
-SET(MACOSX_BUNDLE_GUI_IDENTIFIER "LMMS")
-SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION}")
-SET(MACOSX_BUNDLE_BUNDLE_NAME "LMMS")
-SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION}")
-SET(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION}")
-SET(MACOSX_BUNDLE_COPYRIGHT "Tobias Doerffel, 2008-2010")
-
 SET(CPACK_SOURCE_GENERATOR "TBZ2")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "lmms-${VERSION}")
 INCLUDE(CPack)
diff --git a/README b/README
index 095e55a4d..80e38a000 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-LMMS 1.0.0
+LMMS 1.0.2
 ===========
 
 Copyright (c) 2004-2014 by LMMS developers
@@ -93,13 +93,9 @@ can be found at
 http://lmms.sourceforge.net
 
 
-Details on development can be found at
+Details on development can be found in the Wiki:
 
-http://lmms.sourceforge.net/development.php
-
-or in the Wiki:
-
-http://lmms.sourceforge.net/wiki/
+https://github.com/LMMS/lmms/wiki
 
 Before coding a new big feature, please ALWAYS post your idea and suggestions
 about your feature and about the intended implementation to the
diff --git a/cmake/modules/FindWine.cmake b/cmake/modules/FindWine.cmake
index 0a349cb25..a665a46e2 100644
--- a/cmake/modules/FindWine.cmake
+++ b/cmake/modules/FindWine.cmake
@@ -8,7 +8,8 @@
 #
 
 FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine)
-FIND_LIBRARY(WINE_LIBRARY NAMES wine)
+FIND_LIBRARY(WINE_LIBRARY NAMES wine PATH_SUFFIXES wine)
+FIND_PROGRAM(WINE_CXX NAMES wineg++)
 
 set(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} )
 set(WINE_LIBRARIES ${WINE_LIBRARY} )
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 58af25ce0..d762f619b 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -5,6 +5,7 @@ ADD_SUBDIRECTORY(projects)
 ADD_SUBDIRECTORY(samples)
 ADD_SUBDIRECTORY(themes)
 ADD_SUBDIRECTORY(wavetables)
+ADD_SUBDIRECTORY(scripts)
 
 IF(LMMS_BUILD_LINUX)
    INSTALL(FILES themes/default/icon.png DESTINATION "${DATA_DIR}/pixmaps" RENAME lmms.png)
@@ -18,3 +19,6 @@ IF(LMMS_BUILD_WIN32)
    INSTALL(FILES ${RAWWAVES} DESTINATION "${DATA_DIR}/stk/rawwaves")
 ENDIF(LMMS_BUILD_WIN32)
 
+IF(LMMS_BUILD_APPLE)
+	CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/data/lmms.plist.in" "${CMAKE_INSTALL_PREFIX}/Info.plist")
+ENDIF(LMMS_BUILD_APPLE)
diff --git a/data/lmms.plist.in b/data/lmms.plist.in
new file mode 100644
index 000000000..d5fcf7e2b
--- /dev/null
+++ b/data/lmms.plist.in
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+
+    <key>CFBundleIconFile</key>
+    <string>@MACOSX_BUNDLE_ICON_FILE@</string>
+
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+
+    <key>CFBundleGetInfoString</key>
+    <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@ @MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
+
+<!--
+    #############################################################
+    #    Apple Creator Code Registered Application Signatures   #
+    #############################################################
+    #    Company:       LMMS Foundation                         #
+    #    Registrant:    tres.finocchiaro@gmail.com              #
+    #    ASCII Code:    LMMS                                    #
+    #    HEX:           4C4D4D53                                #
+    #############################################################
+    #    Contact Apple Developer Support at cfreg@apple.com     #
+    #    with any requested changes                             #
+    #############################################################
+-->
+    <key>CFBundleSignature</key>
+    <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@</string>
+
+    <key>CFBundleExecutable</key>
+    <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@</string>
+
+    <key>CFBundleVersion</key>
+    <string>@MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
+
+    <key>CFBundleShortVersionString</key>
+    <string>@MACOSX_BUNDLE_LONG_VERSION_STRING@</string>
+
+    <key>CFBundleName</key>
+    <string>@MACOSX_BUNDLE_BUNDLE_NAME@</string>
+
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+
+    <key>CFBundleIdentifier</key>
+    <string>@MACOSX_BUNDLE_MIMETYPE_ID@</string>
+
+    <key>CFBundleDocumentTypes</key>
+    <array>
+    
+      <dict>
+        <key>CFBundleTypeExtensions</key>
+          <array>
+            <string>mmpz</string>
+          </array>
+        <key>CFBundleTypeIconFile</key>
+        <string>@MACOSX_BUNDLE_MIMETYPE_ICON@</string>
+        <key>CFBundleTypeName</key>
+        <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@ Project</string>
+        <key>CFBundleTypeOSTypes</key>
+           <array>
+             <string>mmpz</string>
+           </array>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeMIMETypes</key>
+        <array>
+           <string>@MACOSX_BUNDLE_MIMETYPE@</string>
+        </array>
+      </dict>
+      
+      <dict>
+        <key>CFBundleTypeExtensions</key>
+          <array>
+            <string>mmp</string>
+          </array>
+        <key>CFBundleTypeIconFile</key>
+        <string>@MACOSX_BUNDLE_MIMETYPE_ICON@</string>
+        <key>CFBundleTypeName</key>
+        <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@ Project (uncompressed)</string>
+        <key>CFBundleTypeOSTypes</key>
+           <array>
+             <string>mmp</string>
+           </array>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeMIMETypes</key>
+        <array>
+           <string>@MACOSX_BUNDLE_MIMETYPE@</string>
+        </array>
+      </dict>
+      
+    </array>
+
+    <key>UTExportedTypeDeclarations</key>
+        <array>
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>@MACOSX_BUNDLE_MIMETYPE_ID@.mmpz</string>
+                <key>UTTypeReferenceURL</key>
+                <string>@MACOSX_BUNDLE_PROJECT_URL@</string>
+                <key>UTTypeDescription</key>
+                <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@ Project</string>
+                <key>UTTypeIconFile</key>
+                <string>@MACOSX_BUNDLE_MIMETYPE_ICON@</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.data</string>
+                </array>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>mmpz</string>
+                    </array>
+                </dict>
+            </dict>
+
+            <dict>
+                <key>UTTypeIdentifier</key>
+                <string>@MACOSX_BUNDLE_MIMETYPE_ID@.mmp</string>
+                <key>UTTypeReferenceURL</key>
+                <string>@MACOSX_BUNDLE_PROJECT_URL@</string>
+                <key>UTTypeDescription</key>
+                <string>@MACOSX_BUNDLE_GUI_IDENTIFIER@ Project (uncompressed)</string>
+                <key>UTTypeIconFile</key>
+                <string>@MACOSX_BUNDLE_MIMETYPE_ICON@</string>
+                <key>UTTypeConformsTo</key>
+                <array>
+                    <string>public.xml</string>
+                    <string>public.data</string>
+                </array>
+                <key>UTTypeTagSpecification</key>
+                <dict>
+                    <key>public.filename-extension</key>
+                    <array>
+                        <string>mmp</string>
+                    </array>
+                </dict>
+            </dict>
+        </array>
+  </dict>
+</plist>
diff --git a/data/project.icns b/data/project.icns
new file mode 100644
index 000000000..930afc217
Binary files /dev/null and b/data/project.icns differ
diff --git a/data/scripts/CMakeLists.txt b/data/scripts/CMakeLists.txt
new file mode 100644
index 000000000..405b5f65c
--- /dev/null
+++ b/data/scripts/CMakeLists.txt
@@ -0,0 +1,13 @@
+SET(BUILD_ROOT "${CMAKE_CURRENT_BINARY_DIR}/../../")
+IF(LMMS_BUILD_APPLE)
+   CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/data/scripts/create_apple_bundle.sh.in"
+      "${BUILD_ROOT}/create_apple_bundle.sh" @ONLY)
+   CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/data/scripts/create_apple_dmg.sh.in"
+      "${BUILD_ROOT}/create_apple_dmg.sh" @ONLY)
+   # Add execute permissions to bundle script
+   SET(CHMOD_CMD "chmod")
+   SET(CHMOD_ARG1 "u+x")
+   SET(CHMOD_ARG2 "${BUILD_ROOT}/create_apple_bundle.sh")
+   EXECUTE_PROCESS(COMMAND ${CHMOD_CMD} ${CHMOD_ARG1} ${CHMOD_ARG2})
+   INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${BUILD_ROOT}/create_apple_bundle.sh)")
+ENDIF(LMMS_BUILD_APPLE)
\ No newline at end of file
diff --git a/data/scripts/create_apple_bundle.sh.in b/data/scripts/create_apple_bundle.sh.in
new file mode 100644
index 000000000..8b335cb0d
--- /dev/null
+++ b/data/scripts/create_apple_bundle.sh.in
@@ -0,0 +1,121 @@
+#!/bin/bash
+#title         :create_applet_installer.sh
+#description   :Creates Apple ".app" bundle for LMMS
+#author        :Tres Finocchiaro
+#date          :20140504
+#version       :1.1
+#usage         :bash create_applet_installer.sh
+#notes         :See also https://github.com/LMMS
+#notes         :Troubleshooting try: export DYLD_PRINT_LIBRARIES=1; export VERBOSE=1;
+#requires      :deploymacqt
+#=========================================================================================
+ 
+# MacPorts Location
+MACPORTS=/opt/local
+ 
+ # LMMS project root directory (extracted source)
+CMAKE_SRC=@CMAKE_SOURCE_DIR@
+ 
+# LMMS compiled (install) resources
+CMAKE_INSTALL=@CMAKE_INSTALL_PREFIX@
+ 
+# LMMS working build directory
+CMAKE_BUILD=$(cd @CMAKE_CURRENT_BINARY_DIR@/../..; pwd)
+
+# STK rawwaves directory
+STK_RAWWAVE=${HOME}/stk-*/rawwaves
+ 
+# Place to create ".app" bundle
+APP=${HOME}/Desktop/LMMS.app
+ 
+# MacPorts installs libreadline with wrong permissions
+LIBREADLINE=${MACPORTS}/lib/libreadline.6.2.dylib
+
+# The DMG packager script location
+DMG_SCRIPT_SRC=${CMAKE_BUILD}/create_apple_dmg.sh
+DMG_SCRIPT_DST=${HOME}/Desktop/create_apple_dmg.sh
+ 
+#=========================================================================================
+
+MSG_COLOR='\x1B[1;36m'
+COLOR_RESET='\x1B[0m'
+echo -e "${MSG_COLOR}\n\nCreating App Bundle \"${APP}\"...${COLOR_RESET}"
+ 
+# Check for u+w permissions on libreadline
+CHECKREADLINE=$(stat -f "%p" $LIBREADLINE)
+CHECKREADLINE=${CHECKREADLINE:3:1}
+if [ "${CHECKREADLINE}" != "7" ]
+then
+  echo -e "\n\n\t\t\t\t***********\n\t\t\t\t* WARNING *\n\t\t\t\t***********"
+  echo -e "File ${LIBREADLINE} is not marked as user writable."
+  echo -e "This will break macdeployqt's linking process after it is copied."
+  echo -e "A sudo password is required to elevate and fix using chmod u+w."
+  echo -e "\nPLEASE ENTER SUDO PASSWORD:"
+  sudo chmod u+w "${MACPORTS}/lib/libreadline.6.2.dylib"
+fi
+ 
+# Remove any old .app bundles
+rm -Rf ${APP}
+ 
+# Create new bundle, copy our built code to it
+mkdir -p ${APP}
+cd ${CMAKE_INSTALL}
+mkdir ${APP}/Contents
+cp -R * ${APP}/Contents
+ 
+# Manually copy STK rawwaves
+mkdir -p ${APP}/Contents/share/stk/rawwaves
+cp ${STK_RAWWAVE}/*.raw ${APP}/Contents/share/stk/rawwaves
+ 
+# Make all libraries writable for macdeployqt
+cd ${APP}
+find . -type f -print0 | xargs -0 chmod u+w
+ 
+# Move lmms binary to the proper location
+mkdir -p ${APP}/Contents/MacOS
+mv ${APP}/Contents/bin/lmms ${APP}/Contents/MacOS
+rm -rf ${APP}/Contents/bin
+ 
+# Move libraries to proper locations
+mkdir -p ${APP}/Contents/Frameworks
+mv ${APP}/Contents/lib/lmms/libZynAddSubFxCore.dylib \
+   ${APP}/Contents/Frameworks/libZynAddSubFxCore.dylib
+   
+mv ${APP}/Contents/lib/lmms/RemoteZynAddSubFx \
+   ${APP}/Contents/MacOS/RemoteZynAddSubFx
+ 
+# Fix more Zyn Linking issues
+install_name_tool -change libZynAddSubFxCore.dylib \
+   @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \
+   ${APP}/Contents/lib/lmms/libzynaddsubfx.so
+ 
+install_name_tool -change ${CMAKE_BUILD}/plugins/zynaddsubfx/libZynAddSubFxCore.dylib \
+   @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \
+   ${APP}/Contents/MacOS/RemoteZynAddSubFx
+ 
+# Build a list of shared objects in target/lib/lmms
+for file in  ${APP}/Contents/lib/lmms/*.so; do
+   _executables="${_executables} -executable=${APP}/Contents/lib/lmms/${file##*/}"
+done
+ 
+# Build a list of shared objects in target/lib/lmms/ladspa
+for file in  ${APP}/Contents/lib/lmms/ladspa/*.so; do
+_executables="${_executables} -executable=${APP}/Contents/lib/lmms/ladspa/${file##*/}"
+done
+ 
+# Additional binaries that require linking
+_executables="${_executables} -executable=${APP}/Contents/MacOS/RemoteZynAddSubFx"
+_executables="${_executables} -executable=${APP}/Contents/Frameworks/libZynAddSubFxCore.dylib"
+ 
+# Build our App Package using "macdeployqt"
+macdeployqt ${APP} $_executables
+ 
+# OS X Specific Artwork
+cp ${CMAKE_SRC}/data/*.icns ${APP}/Contents/Resources/
+ 
+# Done.  Ready to build DMG
+echo -e "\nFinished.\n\nYou may run LMMS from the Desktop."
+echo -e "\nTo create an Apple DMG Package run ${MSG_COLOR}\"${DMG_SCRIPT_DST}\"${COLOR_RESET}.\n"
+echo -e "(Note: You can drag/drop the script directly into this terminal window.)\n"
+cp ${DMG_SCRIPT_SRC} ${DMG_SCRIPT_DST}
+chmod +x ${DMG_SCRIPT_DST}
diff --git a/data/scripts/create_apple_dmg.sh b/data/scripts/create_apple_dmg.sh.in
old mode 100755
new mode 100644
similarity index 97%
rename from data/scripts/create_apple_dmg.sh
rename to data/scripts/create_apple_dmg.sh.in
index be50c2b81..eb77b75bb
--- a/data/scripts/create_apple_dmg.sh
+++ b/data/scripts/create_apple_dmg.sh.in
@@ -10,10 +10,10 @@ if [ -d "$dir" ]; then
 fi
 
 # set up your app name, version number, and background image file name
-APP_NAME="LMMS"
-VERSION="1.0.0"
+APP_NAME="@MACOSX_BUNDLE_BUNDLE_NAME@"
+VERSION="@MACOSX_BUNDLE_LONG_VERSION_STRING@"
 DMG_BACKGROUND_IMG="dmg_branding.png"
-cp $HOME/lmms/data/$DMG_BACKGROUND_IMG .
+cp "@CMAKE_SOURCE_DIR@/data/${DMG_BACKGROUND_IMG}" .
 
 # you should not need to change these
 APP_LOWERCASE=$(echo $APP_NAME|tr '[:upper:]' '[:lower:]')
diff --git a/data/scripts/create_apple_installer.sh b/data/scripts/create_apple_installer.sh
deleted file mode 100755
index 70f1c151c..000000000
--- a/data/scripts/create_apple_installer.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-#title         :create_applet_installer.sh
-#description   :Creates Apple ".app" bundle for LMMS
-#author        :Tres Finocchiaro
-#date          :20140331
-#version       :1.0
-#usage         :bash create_applet_installer.sh
-#notes         :See also https://github.com/LMMS
-#notes         :Troubleshooting try: export DYLD_PRINT_LIBRARIES=1
-#requires      :deploymacqt
-#=========================================================================================
-
-# MacPorts Location
-MACPORTS=/opt/local
- 
- # LMMS source directory
-CMAKE_SRC=$HOME/lmms
- 
-# LMMS compiled resources
-CMAKE_INSTALL=$CMAKE_SRC/target
-
-# LMMS source build directory
-CMAKE_BUILD=$CMAKE_SRC/build
-
-
-
-# Place to create ".app" bundle
-APP=$HOME/Desktop/LMMS.app
-
-# MacPorts installs libreadline with wrong permissions
-LIBREADLINE=$MACPORTS/lib/libreadline.6.2.dylib
-
-#=========================================================================================
-
-echo -e "\n\nRunning..."
-
-# Check for u+w permissions on libreadline
-_perm=`stat -f "%p" $LIBREADLINE`
-_perm=${_perm:3:1}
-if [ ${_perm} != "7" ]
-then
-  echo -e "\n\n\t\t\t\t***********\n\t\t\t\t* WARNING *\n\t\t\t\t***********"
-  echo -e "File $LIBREADLINE is not marked as user writable."
-  echo -e "This will break macdeployqt's linking process after it is copied."
-  echo -e "A sudo password is required to elevate and fix using chmod u+w."
-  echo -e "\nPLEASE ENTER SUDO PASSWORD:"
-  sudo chmod u+w $MACPORTS/lib/libreadline.6.2.dylib
-fi
-
-# Remove any old .app bundles
-rm -Rf $APP
-
-# Create new bundle, copy our built code to it
-mkdir -p $APP
-cd $CMAKE_INSTALL
-mkdir $APP/Contents
-cp -R * $APP/Contents
-
-# Make all libraries writable for macdeployqt
-cd $APP
-find . -type f -print0 | xargs -0 chmod u+w
-
-# Move lmms binary to the proper location
-mkdir -p $APP/Contents/MacOS
-mv $APP/Contents/bin/lmms $APP/Contents/MacOS
-rmdir $APP/Contents/bin
-
-# Move libraries to proper locations
-mkdir -p $APP/Contents/Frameworks
-mv $APP/Contents/lib/lmms/libZynAddSubFxCore.dylib \
-   $APP/Contents/Frameworks/libZynAddSubFxCore.dylib
-   
-mv $APP/Contents/lib/lmms/RemoteZynAddSubFx \
-   $APP/Contents/MacOS/RemoteZynAddSubFx
-
-# Fix more Zyn Linking issues
-# install_name_tool -change $CMAKE_INSTALL/lib/lmms/libZynAddSubFxCore.dylib \
-#   @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \
-#   $APP/Contents/lib/lmms/libzynaddsubfx.so
-
-install_name_tool -change libZynAddSubFxCore.dylib \
-   @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \
-   $APP/Contents/lib/lmms/libzynaddsubfx.so
-
-install_name_tool -change $CMAKE_BUILD/plugins/zynaddsubfx/libZynAddSubFxCore.dylib \
-   @loader_path/../../Frameworks/libZynAddSubFxCore.dylib \
-   $APP/Contents/MacOS/RemoteZynAddSubFx
-
-# Build a list of shared objects in target/lib/lmms
-for file in  $APP/Contents/lib/lmms/*.so; do
-   _executables="$_executables -executable=$APP/Contents/lib/lmms/${file##*/}"
-done
-
-# Build a list of shared objects in target/lib/lmms/ladspa
-for file in  $APP/Contents/lib/lmms/ladspa/*.so; do
-   _executables="$_executables -executable=$APP/Contents/lib/lmms/ladspa/${file##*/}"
-done
- 
-# Additional binaries that require linking
-_executables="$_executables -executable=$APP/Contents/MacOS/RemoteZynAddSubFx"
-_executables="$_executables -executable=$APP/Contents/Frameworks/libZynAddSubFxCore.dylib"
-
-# Build our App Package using "macdeployqt"
-macdeployqt $APP $_executables
-
-# OS X Specific Artwork
-cp $CMAKE_SRC/data/lmms.icns $APP/Contents/Resources/
-
-# Create "Info.plist" using lmms.icns file, http://iconverticons.com/online/)
-echo -e "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > "$APP/Contents/Info.plist"
-echo -e "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\"" >> "$APP/Contents/Info.plist"
-echo -e "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" >> "$APP/Contents/Info.plist"
-echo -e "   <plist version=\"1.0\">" >> "$APP/Contents/Info.plist"
-echo -e "   <dict>" >> "$APP/Contents/Info.plist"
-echo -e "      <key>CFBundleIconFile</key>" >> "$APP/Contents/Info.plist"
-echo -e "      <string>lmms.icns</string>" >> "$APP/Contents/Info.plist"
-echo -e "   </dict>" >> "$APP/Contents/Info.plist"
-echo -e "</plist>" >> "$APP/Contents/Info.plist"
-
-# Done.  Ready to build DMG
-echo -e "\nFinished.\n\nPlease run \"create_apple_dmg.sh\" from the Desktop to build the installer.\n"
-echo -e "Note: You can drag/drop it into this terminal window.)\n"
-cp $CMAKE_SRC/data/scripts/create_apple_dmg.sh $HOME/Desktop/
-chmod +x $HOME/Desktop/create_apple_dmg.sh
diff --git a/include/PianoRoll.h b/include/PianoRoll.h
index f8ca1212b..20b17e2b8 100644
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -54,6 +54,9 @@ class PianoRoll : public QWidget, public SerializingObject
 {
 	Q_OBJECT
 public:
+	/*! \brief Resets settings to default when e.g. creating a new project */
+	void reset();
+
 	void setCurrentPattern( pattern * _new_pattern );
 
 	inline void stopRecording()
diff --git a/lmms.rc.in b/lmms.rc.in
index b86fb503c..620a7dfd5 100644
--- a/lmms.rc.in
+++ b/lmms.rc.in
@@ -2,7 +2,7 @@ lmmsicon ICON data/lmms.ico
 #include <windows.h>
 
 VS_VERSION_INFO	VERSIONINFO
-  FILEVERSION	1,0,0,0
+  FILEVERSION	1,0,2,0
   FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
   FILEOS	VOS_NT_WINDOWS32
   FILETYPE	VFT_APP
diff --git a/plugins/LadspaEffect/swh/alias_1407.c b/plugins/LadspaEffect/swh/alias_1407.c
index cbc0fdd50..444d9ed28 100644
--- a/plugins/LadspaEffect/swh/alias_1407.c
+++ b/plugins/LadspaEffect/swh/alias_1407.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1;
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_
 #endif
@@ -44,7 +44,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -161,7 +161,7 @@ static void runAddingAlias(LADSPA_Handle instance, unsigned long sample_count) {
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/allpass_1895.c b/plugins/LadspaEffect/swh/allpass_1895.c
index 192684794..062f4e32f 100644
--- a/plugins/LadspaEffect/swh/allpass_1895.c
+++ b/plugins/LadspaEffect/swh/allpass_1895.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1;
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_
 #endif
@@ -127,7 +127,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -1088,7 +1088,7 @@ static void runAddingAllpass_c(LADSPA_Handle instance, unsigned long sample_coun
 	plugin_data->write_phase = write_phase;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/am_pitchshift_1433.c b/plugins/LadspaEffect/swh/am_pitchshift_1433.c
index 94b919942..adc5f3029 100644
--- a/plugins/LadspaEffect/swh/am_pitchshift_1433.c
+++ b/plugins/LadspaEffect/swh/am_pitchshift_1433.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -66,7 +66,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -359,7 +359,7 @@ static void runAddingAmPitchshift(LADSPA_Handle instance, unsigned long sample_c
     *(plugin_data->latency) = delay_ofs/2;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/amp_1181.c b/plugins/LadspaEffect/swh/amp_1181.c
index c042c34b4..2bf8dd3d8 100644
--- a/plugins/LadspaEffect/swh/amp_1181.c
+++ b/plugins/LadspaEffect/swh/amp_1181.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -47,7 +47,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -154,7 +154,7 @@ static void runAddingAmp(LADSPA_Handle instance, unsigned long sample_count) {
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/bandpass_a_iir_1893.c b/plugins/LadspaEffect/swh/bandpass_a_iir_1893.c
index 8bf97c185..c477a4b88 100644
--- a/plugins/LadspaEffect/swh/bandpass_a_iir_1893.c
+++ b/plugins/LadspaEffect/swh/bandpass_a_iir_1893.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -51,7 +51,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -188,7 +188,7 @@ static void runAddingBandpass_a_iir(LADSPA_Handle instance, unsigned long sample
 	iir_process_buffer_1s_5(iirf, gt, input, output, sample_count,0);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/bandpass_iir_1892.c b/plugins/LadspaEffect/swh/bandpass_iir_1892.c
index 6207f6049..4f160c4f0 100644
--- a/plugins/LadspaEffect/swh/bandpass_iir_1892.c
+++ b/plugins/LadspaEffect/swh/bandpass_iir_1892.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -58,7 +58,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -244,7 +244,7 @@ static void runAddingBandpass_iir(LADSPA_Handle instance, unsigned long sample_c
 	iir_process_buffer_ns_5(iirf, gt, input, output, sample_count,RUN_ADDING);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/bode_shifter_1431.c b/plugins/LadspaEffect/swh/bode_shifter_1431.c
index 5601a0eb1..597864a18 100644
--- a/plugins/LadspaEffect/swh/bode_shifter_1431.c
+++ b/plugins/LadspaEffect/swh/bode_shifter_1431.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -92,7 +92,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -365,7 +365,7 @@ static void runAddingBodeShifter(LADSPA_Handle instance, unsigned long sample_co
 	*(plugin_data->latency) = 99;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
index 215a92871..067e17c21 100644
--- a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
+++ b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -99,7 +99,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -393,7 +393,7 @@ static void runAddingBodeShifterCV(LADSPA_Handle instance, unsigned long sample_
 	*(plugin_data->latency) = 99;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/butterworth_1902.c b/plugins/LadspaEffect/swh/butterworth_1902.c
index ba6f4cafb..74bd6d489 100644
--- a/plugins/LadspaEffect/swh/butterworth_1902.c
+++ b/plugins/LadspaEffect/swh/butterworth_1902.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -89,7 +89,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -497,7 +497,7 @@ static void runAddingButthigh_iir(LADSPA_Handle instance, unsigned long sample_c
 	iir_process_buffer_1s_5(iirf, gt, input, output, sample_count,0);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/chebstortion_1430.c b/plugins/LadspaEffect/swh/chebstortion_1430.c
index 946abaf15..baa5d9694 100644
--- a/plugins/LadspaEffect/swh/chebstortion_1430.c
+++ b/plugins/LadspaEffect/swh/chebstortion_1430.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -86,7 +86,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -314,7 +314,7 @@ static void runAddingChebstortion(LADSPA_Handle instance, unsigned long sample_c
 	plugin_data->count = count;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/comb_1190.c b/plugins/LadspaEffect/swh/comb_1190.c
index 05fe340c2..7f72b8cd7 100644
--- a/plugins/LadspaEffect/swh/comb_1190.c
+++ b/plugins/LadspaEffect/swh/comb_1190.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -55,7 +55,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -251,7 +251,7 @@ static void runAddingComb(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->last_offset = offset;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/comb_1887.c b/plugins/LadspaEffect/swh/comb_1887.c
index 00da7270d..81a7268bd 100644
--- a/plugins/LadspaEffect/swh/comb_1887.c
+++ b/plugins/LadspaEffect/swh/comb_1887.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -125,7 +125,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -1094,7 +1094,7 @@ static void runAddingComb_c(LADSPA_Handle instance, unsigned long sample_count)
 	plugin_data->write_phase = write_phase;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/comb_splitter_1411.c b/plugins/LadspaEffect/swh/comb_splitter_1411.c
index bd1c4c714..1ffb152d7 100644
--- a/plugins/LadspaEffect/swh/comb_splitter_1411.c
+++ b/plugins/LadspaEffect/swh/comb_splitter_1411.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -55,7 +55,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -255,7 +255,7 @@ static void runAddingCombSplitter(LADSPA_Handle instance, unsigned long sample_c
 	plugin_data->last_offset = offset;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/const_1909.c b/plugins/LadspaEffect/swh/const_1909.c
index 9e91cc41b..3bfc221ef 100644
--- a/plugins/LadspaEffect/swh/const_1909.c
+++ b/plugins/LadspaEffect/swh/const_1909.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -45,7 +45,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -171,7 +171,7 @@ static void runAddingConst(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->last_amp = amp;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/crossover_dist_1404.c b/plugins/LadspaEffect/swh/crossover_dist_1404.c
index 80053a214..fdffacf68 100644
--- a/plugins/LadspaEffect/swh/crossover_dist_1404.c
+++ b/plugins/LadspaEffect/swh/crossover_dist_1404.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -49,7 +49,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -187,7 +187,7 @@ static void runAddingCrossoverDist(LADSPA_Handle instance, unsigned long sample_
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/dc_remove_1207.c b/plugins/LadspaEffect/swh/dc_remove_1207.c
index 099e5daf6..76593f8ca 100644
--- a/plugins/LadspaEffect/swh/dc_remove_1207.c
+++ b/plugins/LadspaEffect/swh/dc_remove_1207.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -44,7 +44,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -166,7 +166,7 @@ static void runAddingDcRemove(LADSPA_Handle instance, unsigned long sample_count
 	plugin_data->otm1 = otm1;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/decay_1886.c b/plugins/LadspaEffect/swh/decay_1886.c
index 29c1b8daf..da878478b 100644
--- a/plugins/LadspaEffect/swh/decay_1886.c
+++ b/plugins/LadspaEffect/swh/decay_1886.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -53,7 +53,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -247,7 +247,7 @@ static void runAddingDecay(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->y = y;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/decimator_1202.c b/plugins/LadspaEffect/swh/decimator_1202.c
index bcf7a8004..2975605bd 100644
--- a/plugins/LadspaEffect/swh/decimator_1202.c
+++ b/plugins/LadspaEffect/swh/decimator_1202.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -53,7 +53,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -240,7 +240,7 @@ static void runAddingDecimator(LADSPA_Handle instance, unsigned long sample_coun
 	plugin_data->count = count;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/declip_1195.c b/plugins/LadspaEffect/swh/declip_1195.c
index 3f5d5a5df..f25417976 100644
--- a/plugins/LadspaEffect/swh/declip_1195.c
+++ b/plugins/LadspaEffect/swh/declip_1195.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -48,7 +48,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -160,7 +160,7 @@ static void runAddingDeclip(LADSPA_Handle instance, unsigned long sample_count)
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/delay_1898.c b/plugins/LadspaEffect/swh/delay_1898.c
index b1c7cb239..998c1bbbd 100644
--- a/plugins/LadspaEffect/swh/delay_1898.c
+++ b/plugins/LadspaEffect/swh/delay_1898.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -98,7 +98,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -862,7 +862,7 @@ static void runAddingDelay_c(LADSPA_Handle instance, unsigned long sample_count)
 	plugin_data->write_phase = write_phase;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/delayorama_1402.c b/plugins/LadspaEffect/swh/delayorama_1402.c
index 3949b0643..a0cb2a861 100644
--- a/plugins/LadspaEffect/swh/delayorama_1402.c
+++ b/plugins/LadspaEffect/swh/delayorama_1402.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -90,7 +90,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -668,7 +668,7 @@ static void runAddingDelayorama(LADSPA_Handle instance, unsigned long sample_cou
 	plugin_data->last_out = out;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/diode_1185.c b/plugins/LadspaEffect/swh/diode_1185.c
index cd488f199..cfc2d22d4 100644
--- a/plugins/LadspaEffect/swh/diode_1185.c
+++ b/plugins/LadspaEffect/swh/diode_1185.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -44,7 +44,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -185,7 +185,7 @@ static void runAddingDiode(LADSPA_Handle instance, unsigned long sample_count) {
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/divider_1186.c b/plugins/LadspaEffect/swh/divider_1186.c
index 4dbd7310b..cf9fad685 100644
--- a/plugins/LadspaEffect/swh/divider_1186.c
+++ b/plugins/LadspaEffect/swh/divider_1186.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -50,7 +50,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -249,7 +249,7 @@ static void runAddingDivider(LADSPA_Handle instance, unsigned long sample_count)
 	plugin_data->out = out;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/dj_eq_1901.c b/plugins/LadspaEffect/swh/dj_eq_1901.c
index 2184ae1cd..950eedad4 100644
--- a/plugins/LadspaEffect/swh/dj_eq_1901.c
+++ b/plugins/LadspaEffect/swh/dj_eq_1901.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -85,7 +85,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -463,7 +463,7 @@ static void runAddingDj_eq(LADSPA_Handle instance, unsigned long sample_count) {
 	*(plugin_data->latency) = 3; //XXX is this right?
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/dj_flanger_1438.c b/plugins/LadspaEffect/swh/dj_flanger_1438.c
index c15564b6f..b970886a9 100644
--- a/plugins/LadspaEffect/swh/dj_flanger_1438.c
+++ b/plugins/LadspaEffect/swh/dj_flanger_1438.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -63,7 +63,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -366,7 +366,7 @@ static void runAddingDjFlanger(LADSPA_Handle instance, unsigned long sample_coun
 	plugin_data->buffer_pos = buffer_pos;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/dyson_compress_1403.c b/plugins/LadspaEffect/swh/dyson_compress_1403.c
index f7bb71556..22cc0fa94 100644
--- a/plugins/LadspaEffect/swh/dyson_compress_1403.c
+++ b/plugins/LadspaEffect/swh/dyson_compress_1403.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -130,7 +130,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -776,7 +776,7 @@ static void runAddingDysonCompress(LADSPA_Handle instance, unsigned long sample_
 	plugin_data->extra_maxlevel = extra_maxlevel;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/fad_delay_1192.c b/plugins/LadspaEffect/swh/fad_delay_1192.c
index 89f496a84..85d0c3dee 100644
--- a/plugins/LadspaEffect/swh/fad_delay_1192.c
+++ b/plugins/LadspaEffect/swh/fad_delay_1192.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -57,7 +57,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -299,7 +299,7 @@ static void runAddingFadDelay(LADSPA_Handle instance, unsigned long sample_count
 	plugin_data->last_in = last_in;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/fast_lookahead_limiter_1913.c b/plugins/LadspaEffect/swh/fast_lookahead_limiter_1913.c
index 33007e1b9..8295e2298 100644
--- a/plugins/LadspaEffect/swh/fast_lookahead_limiter_1913.c
+++ b/plugins/LadspaEffect/swh/fast_lookahead_limiter_1913.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -81,7 +81,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -573,7 +573,7 @@ static void runAddingFastLookaheadLimiter(LADSPA_Handle instance, unsigned long
 	*(plugin_data->latency) = delay;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/flanger_1191.c b/plugins/LadspaEffect/swh/flanger_1191.c
index cb91cadba..e542316fd 100644
--- a/plugins/LadspaEffect/swh/flanger_1191.c
+++ b/plugins/LadspaEffect/swh/flanger_1191.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -63,7 +63,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -435,7 +435,7 @@ static void runAddingFlanger(LADSPA_Handle instance, unsigned long sample_count)
 	plugin_data->old_d_base = new_d_base;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/foldover_1213.c b/plugins/LadspaEffect/swh/foldover_1213.c
index 76119b5b3..8f2ad857e 100644
--- a/plugins/LadspaEffect/swh/foldover_1213.c
+++ b/plugins/LadspaEffect/swh/foldover_1213.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -46,7 +46,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -166,7 +166,7 @@ static void runAddingFoldover(LADSPA_Handle instance, unsigned long sample_count
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/foverdrive_1196.c b/plugins/LadspaEffect/swh/foverdrive_1196.c
index d00eb052c..94306d01e 100644
--- a/plugins/LadspaEffect/swh/foverdrive_1196.c
+++ b/plugins/LadspaEffect/swh/foverdrive_1196.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -44,7 +44,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -155,7 +155,7 @@ static void runAddingFoverdrive(LADSPA_Handle instance, unsigned long sample_cou
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/freq_tracker_1418.c b/plugins/LadspaEffect/swh/freq_tracker_1418.c
index fff203f92..831c6de15 100644
--- a/plugins/LadspaEffect/swh/freq_tracker_1418.c
+++ b/plugins/LadspaEffect/swh/freq_tracker_1418.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -52,7 +52,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -240,7 +240,7 @@ static void runAddingFreqTracker(LADSPA_Handle instance, unsigned long sample_co
 	plugin_data->cross_time = cross_time;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/gate_1410.c b/plugins/LadspaEffect/swh/gate_1410.c
index fddd78fc0..d6fdf7da8 100644
--- a/plugins/LadspaEffect/swh/gate_1410.c
+++ b/plugins/LadspaEffect/swh/gate_1410.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -76,7 +76,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -433,7 +433,7 @@ static void runAddingGate(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->hold_count = hold_count;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/giant_flange_1437.c b/plugins/LadspaEffect/swh/giant_flange_1437.c
index 967334c6e..dd2031806 100644
--- a/plugins/LadspaEffect/swh/giant_flange_1437.c
+++ b/plugins/LadspaEffect/swh/giant_flange_1437.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -77,7 +77,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -501,7 +501,7 @@ static void runAddingGiantFlange(LADSPA_Handle instance, unsigned long sample_co
 	plugin_data->buffer_pos = buffer_pos;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/gong_1424.c b/plugins/LadspaEffect/swh/gong_1424.c
index deca3cd9e..ea2f4161d 100644
--- a/plugins/LadspaEffect/swh/gong_1424.c
+++ b/plugins/LadspaEffect/swh/gong_1424.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -105,7 +105,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -608,7 +608,7 @@ static void runAddingGong(LADSPA_Handle instance, unsigned long sample_count) {
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/gong_beater_1439.c b/plugins/LadspaEffect/swh/gong_beater_1439.c
index e6e1803c8..26f967a11 100644
--- a/plugins/LadspaEffect/swh/gong_beater_1439.c
+++ b/plugins/LadspaEffect/swh/gong_beater_1439.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -58,7 +58,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -301,7 +301,7 @@ static void runAddingGongBeater(LADSPA_Handle instance, unsigned long sample_cou
 	plugin_data->imp_level = imp_level;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/gsm_1215.c b/plugins/LadspaEffect/swh/gsm_1215.c
index b2ed56c5d..279e2b1c1 100644
--- a/plugins/LadspaEffect/swh/gsm_1215.c
+++ b/plugins/LadspaEffect/swh/gsm_1215.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -70,7 +70,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -387,7 +387,7 @@ static void runAddingGsm(LADSPA_Handle instance, unsigned long sample_count) {
 	*(plugin_data->latency) = 160 * resamp;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/gverb_1216.c b/plugins/LadspaEffect/swh/gverb_1216.c
index 0bf339fd7..d7e5a9214 100644
--- a/plugins/LadspaEffect/swh/gverb_1216.c
+++ b/plugins/LadspaEffect/swh/gverb_1216.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -74,7 +74,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -283,7 +283,7 @@ static void runAddingGverb(LADSPA_Handle instance, unsigned long sample_count) {
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/hard_limiter_1413.c b/plugins/LadspaEffect/swh/hard_limiter_1413.c
index ba958b442..ab1ab0f62 100644
--- a/plugins/LadspaEffect/swh/hard_limiter_1413.c
+++ b/plugins/LadspaEffect/swh/hard_limiter_1413.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -52,7 +52,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -187,7 +187,7 @@ static void runAddingHardLimiter(LADSPA_Handle instance, unsigned long sample_co
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/harmonic_gen_1220.c b/plugins/LadspaEffect/swh/harmonic_gen_1220.c
index 9509a5b55..26c19630f 100644
--- a/plugins/LadspaEffect/swh/harmonic_gen_1220.c
+++ b/plugins/LadspaEffect/swh/harmonic_gen_1220.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -97,7 +97,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -367,7 +367,7 @@ static void runAddingHarmonicGen(LADSPA_Handle instance, unsigned long sample_co
 	plugin_data->otm1 = otm1;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/hermes_filter_1200.c b/plugins/LadspaEffect/swh/hermes_filter_1200.c
index 2d3bb5197..a15d7c9e8 100644
--- a/plugins/LadspaEffect/swh/hermes_filter_1200.c
+++ b/plugins/LadspaEffect/swh/hermes_filter_1200.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -300,7 +300,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -1403,7 +1403,7 @@ static void runAddingHermesFilter(LADSPA_Handle instance, unsigned long sample_c
 	plugin_data->lfo2_phase = lfo2_phase;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/highpass_iir_1890.c b/plugins/LadspaEffect/swh/highpass_iir_1890.c
index 09e3688a7..e0bca2a14 100644
--- a/plugins/LadspaEffect/swh/highpass_iir_1890.c
+++ b/plugins/LadspaEffect/swh/highpass_iir_1890.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -52,7 +52,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -189,7 +189,7 @@ static void runAddingHighpass_iir(LADSPA_Handle instance, unsigned long sample_c
 	iir_process_buffer_ns_5(iirf, gt, input, output, sample_count,RUN_ADDING);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/hilbert_1440.c b/plugins/LadspaEffect/swh/hilbert_1440.c
index 0009d7948..4a6546b27 100644
--- a/plugins/LadspaEffect/swh/hilbert_1440.c
+++ b/plugins/LadspaEffect/swh/hilbert_1440.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -83,7 +83,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -233,7 +233,7 @@ static void runAddingHilbert(LADSPA_Handle instance, unsigned long sample_count)
 	*(plugin_data->latency) = 99;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/imp_1199.c b/plugins/LadspaEffect/swh/imp_1199.c
index 599bedb81..62c2deff3 100644
--- a/plugins/LadspaEffect/swh/imp_1199.c
+++ b/plugins/LadspaEffect/swh/imp_1199.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -99,8 +99,10 @@ inline void impulse2freq(int id, float *imp, unsigned int length, fftw_real *out
   for (i=0; i<length; i++) {
     impulse_time[i] = imp[i];
   }
-  for (; i<fftl; i++) {
-    impulse_time[i] = 0.0f;
+  
+  int last = i;
+  for (i = 0; i<fftl; i++) {
+    if (i >=last) impulse_time[i] = 0.0f;
   }
 #ifdef FFTW3
   fftwf_execute(tmp_plan);
@@ -143,7 +145,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -520,7 +522,7 @@ static void runAddingImp(LADSPA_Handle instance, unsigned long sample_count) {
 	*(plugin_data->latency) = SEG_LENGTH;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/impulse_1885.c b/plugins/LadspaEffect/swh/impulse_1885.c
index 398aea098..e4ebd2d41 100644
--- a/plugins/LadspaEffect/swh/impulse_1885.c
+++ b/plugins/LadspaEffect/swh/impulse_1885.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -49,7 +49,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -186,7 +186,7 @@ static void runAddingImpulse_fc(LADSPA_Handle instance, unsigned long sample_cou
 	plugin_data->phase = phase;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/impulses/all.h b/plugins/LadspaEffect/swh/impulses/all.h
index cf597bfeb..3355f327f 100644
--- a/plugins/LadspaEffect/swh/impulses/all.h
+++ b/plugins/LadspaEffect/swh/impulses/all.h
@@ -24,7 +24,11 @@
 #include "impulses/20-matchless-chieftain-sm57.h"
 #include "impulses/21-matchless-chieftain-sm57-off.h"
 
+#ifdef __clang__
+void mk_imps(fftw_real **impulse_freq)
+#else
 inline void mk_imps(fftw_real **impulse_freq)
+#endif
 {
 	int c = 0;
 	MK_IMP(unit);
diff --git a/plugins/LadspaEffect/swh/inv_1429.c b/plugins/LadspaEffect/swh/inv_1429.c
index cbc51f548..1a38faff6 100644
--- a/plugins/LadspaEffect/swh/inv_1429.c
+++ b/plugins/LadspaEffect/swh/inv_1429.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -42,7 +42,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -138,7 +138,7 @@ static void runAddingInv(LADSPA_Handle instance, unsigned long sample_count) {
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/karaoke_1409.c b/plugins/LadspaEffect/swh/karaoke_1409.c
index 4c2f7355e..4c3091f77 100644
--- a/plugins/LadspaEffect/swh/karaoke_1409.c
+++ b/plugins/LadspaEffect/swh/karaoke_1409.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -48,7 +48,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -181,7 +181,7 @@ static void runAddingKaraoke(LADSPA_Handle instance, unsigned long sample_count)
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/latency_1914.c b/plugins/LadspaEffect/swh/latency_1914.c
index 56d0365b6..5744a2086 100644
--- a/plugins/LadspaEffect/swh/latency_1914.c
+++ b/plugins/LadspaEffect/swh/latency_1914.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -50,7 +50,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -173,7 +173,7 @@ static void runAddingArtificialLatency(LADSPA_Handle instance, unsigned long sam
 	*(plugin_data->latency) = (float)delay_fr;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/lcr_delay_1436.c b/plugins/LadspaEffect/swh/lcr_delay_1436.c
index 8e0c60243..5ae8db3bc 100644
--- a/plugins/LadspaEffect/swh/lcr_delay_1436.c
+++ b/plugins/LadspaEffect/swh/lcr_delay_1436.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -83,7 +83,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -540,7 +540,7 @@ static void runAddingLcrDelay(LADSPA_Handle instance, unsigned long sample_count
 	plugin_data->buffer_pos = buffer_pos;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/lowpass_iir_1891.c b/plugins/LadspaEffect/swh/lowpass_iir_1891.c
index 782f9e39f..be1c806c1 100644
--- a/plugins/LadspaEffect/swh/lowpass_iir_1891.c
+++ b/plugins/LadspaEffect/swh/lowpass_iir_1891.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -53,7 +53,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -191,7 +191,7 @@ static void runAddingLowpass_iir(LADSPA_Handle instance, unsigned long sample_co
 	iir_process_buffer_ns_5(iirf, gt, input, output, sample_count,RUN_ADDING);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/ls_filter_1908.c b/plugins/LadspaEffect/swh/ls_filter_1908.c
index 6dc3ef2e8..97c366a40 100644
--- a/plugins/LadspaEffect/swh/ls_filter_1908.c
+++ b/plugins/LadspaEffect/swh/ls_filter_1908.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -54,7 +54,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -209,7 +209,7 @@ static void runAddingLsFilter(LADSPA_Handle instance, unsigned long sample_count
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/matrix_ms_st_1421.c b/plugins/LadspaEffect/swh/matrix_ms_st_1421.c
index dd153866e..2fddf9311 100644
--- a/plugins/LadspaEffect/swh/matrix_ms_st_1421.c
+++ b/plugins/LadspaEffect/swh/matrix_ms_st_1421.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -48,7 +48,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -173,7 +173,7 @@ static void runAddingMatrixMSSt(LADSPA_Handle instance, unsigned long sample_cou
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/matrix_spatialiser_1422.c b/plugins/LadspaEffect/swh/matrix_spatialiser_1422.c
index f041630b3..7812ddfff 100644
--- a/plugins/LadspaEffect/swh/matrix_spatialiser_1422.c
+++ b/plugins/LadspaEffect/swh/matrix_spatialiser_1422.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -107,7 +107,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -331,7 +331,7 @@ static void runAddingMatrixSpatialiser(LADSPA_Handle instance, unsigned long sam
 	plugin_data->current_s_gain = current_s_gain;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/matrix_st_ms_1420.c b/plugins/LadspaEffect/swh/matrix_st_ms_1420.c
index c41c76210..8c97c7cb9 100644
--- a/plugins/LadspaEffect/swh/matrix_st_ms_1420.c
+++ b/plugins/LadspaEffect/swh/matrix_st_ms_1420.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -46,7 +46,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -162,7 +162,7 @@ static void runAddingMatrixStMS(LADSPA_Handle instance, unsigned long sample_cou
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/mbeq_1197.c b/plugins/LadspaEffect/swh/mbeq_1197.c
index 09b51f1fb..a9bea01fe 100644
--- a/plugins/LadspaEffect/swh/mbeq_1197.c
+++ b/plugins/LadspaEffect/swh/mbeq_1197.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -120,7 +120,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -659,7 +659,7 @@ static void runAddingMbeq(LADSPA_Handle instance, unsigned long sample_count) {
 	*(plugin_data->latency) = fft_latency;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/mod_delay_1419.c b/plugins/LadspaEffect/swh/mod_delay_1419.c
index 67e1a0337..b27a7612e 100644
--- a/plugins/LadspaEffect/swh/mod_delay_1419.c
+++ b/plugins/LadspaEffect/swh/mod_delay_1419.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -53,7 +53,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -229,7 +229,7 @@ static void runAddingModDelay(LADSPA_Handle instance, unsigned long sample_count
 	plugin_data->write_ptr = write_ptr;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/multivoice_chorus_1201.c b/plugins/LadspaEffect/swh/multivoice_chorus_1201.c
index 81f4ae8a2..5f69bf04e 100644
--- a/plugins/LadspaEffect/swh/multivoice_chorus_1201.c
+++ b/plugins/LadspaEffect/swh/multivoice_chorus_1201.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -74,7 +74,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -527,7 +527,7 @@ static void runAddingMultivoiceChorus(LADSPA_Handle instance, unsigned long samp
 	plugin_data->delay_pos = delay_pos;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/notch_iir_1894.c b/plugins/LadspaEffect/swh/notch_iir_1894.c
index 9f075f3f4..396e44fa2 100644
--- a/plugins/LadspaEffect/swh/notch_iir_1894.c
+++ b/plugins/LadspaEffect/swh/notch_iir_1894.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -58,7 +58,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -244,7 +244,7 @@ static void runAddingNotch_iir(LADSPA_Handle instance, unsigned long sample_coun
 	iir_process_buffer_ns_5(iirf2, second, input, output, sample_count, 1); /* add to first buffer */
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/phasers_1217.c b/plugins/LadspaEffect/swh/phasers_1217.c
index 0d4cae64a..14673e360 100644
--- a/plugins/LadspaEffect/swh/phasers_1217.c
+++ b/plugins/LadspaEffect/swh/phasers_1217.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -175,7 +175,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -1030,7 +1030,7 @@ static void runAddingAutoPhaser(LADSPA_Handle instance, unsigned long sample_cou
 	plugin_data->ym1 = ym1;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/pitch_scale_1193.c b/plugins/LadspaEffect/swh/pitch_scale_1193.c
index be797e48e..c811a84bc 100644
--- a/plugins/LadspaEffect/swh/pitch_scale_1193.c
+++ b/plugins/LadspaEffect/swh/pitch_scale_1193.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -54,7 +54,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -241,7 +241,7 @@ static void runAddingPitchScale(LADSPA_Handle instance, unsigned long sample_cou
 	                                OVER_SAMP);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/pitch_scale_1194.c b/plugins/LadspaEffect/swh/pitch_scale_1194.c
index 4e22de6df..747c16ea6 100644
--- a/plugins/LadspaEffect/swh/pitch_scale_1194.c
+++ b/plugins/LadspaEffect/swh/pitch_scale_1194.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -54,7 +54,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -225,7 +225,7 @@ static void runAddingPitchScaleHQ(LADSPA_Handle instance, unsigned long sample_c
 	                                / OVER_SAMP);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/plate_1423.c b/plugins/LadspaEffect/swh/plate_1423.c
index 644aac7bf..0127bb6f0 100644
--- a/plugins/LadspaEffect/swh/plate_1423.c
+++ b/plugins/LadspaEffect/swh/plate_1423.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -60,7 +60,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -295,7 +295,7 @@ static void runAddingPlate(LADSPA_Handle instance, unsigned long sample_count) {
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/pointer_cast_1910.c b/plugins/LadspaEffect/swh/pointer_cast_1910.c
index 264821ad8..464fb1b64 100644
--- a/plugins/LadspaEffect/swh/pointer_cast_1910.c
+++ b/plugins/LadspaEffect/swh/pointer_cast_1910.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -59,7 +59,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -221,7 +221,7 @@ static void runAddingPointerCastDistortion(LADSPA_Handle instance, unsigned long
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/rate_shifter_1417.c b/plugins/LadspaEffect/swh/rate_shifter_1417.c
index fc2501e98..750f82972 100644
--- a/plugins/LadspaEffect/swh/rate_shifter_1417.c
+++ b/plugins/LadspaEffect/swh/rate_shifter_1417.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -51,7 +51,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -235,7 +235,7 @@ static void runAddingRateShifter(LADSPA_Handle instance, unsigned long sample_co
 	plugin_data->write_ptr = write_ptr;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/retro_flange_1208.c b/plugins/LadspaEffect/swh/retro_flange_1208.c
index 5a4124bfd..5df5cc338 100644
--- a/plugins/LadspaEffect/swh/retro_flange_1208.c
+++ b/plugins/LadspaEffect/swh/retro_flange_1208.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -78,7 +78,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -492,7 +492,7 @@ static void runAddingRetroFlange(LADSPA_Handle instance, unsigned long sample_co
 	plugin_data->z2 = z2;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/revdelay_1605.c b/plugins/LadspaEffect/swh/revdelay_1605.c
index e8846fc79..1b014b902 100644
--- a/plugins/LadspaEffect/swh/revdelay_1605.c
+++ b/plugins/LadspaEffect/swh/revdelay_1605.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -65,7 +65,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -421,7 +421,7 @@ static void runAddingRevdelay(LADSPA_Handle instance, unsigned long sample_count
 	plugin_data->write_phase = write_phase;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/ringmod_1188.c b/plugins/LadspaEffect/swh/ringmod_1188.c
index 531081d93..5c4c16b39 100644
--- a/plugins/LadspaEffect/swh/ringmod_1188.c
+++ b/plugins/LadspaEffect/swh/ringmod_1188.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -76,7 +76,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -429,7 +429,7 @@ static void runAddingRingmod_1i1o1l(LADSPA_Handle instance, unsigned long sample
 	plugin_data->offset = offset;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/satan_maximiser_1408.c b/plugins/LadspaEffect/swh/satan_maximiser_1408.c
index d9b3c4fa3..913711574 100644
--- a/plugins/LadspaEffect/swh/satan_maximiser_1408.c
+++ b/plugins/LadspaEffect/swh/satan_maximiser_1408.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -56,7 +56,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -255,7 +255,7 @@ static void runAddingSatanMaximiser(LADSPA_Handle instance, unsigned long sample
 	plugin_data->buffer_pos = buffer_pos;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/sc1_1425.c b/plugins/LadspaEffect/swh/sc1_1425.c
index 0a94773e2..8a5e143ef 100644
--- a/plugins/LadspaEffect/swh/sc1_1425.c
+++ b/plugins/LadspaEffect/swh/sc1_1425.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -68,7 +68,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -344,7 +344,7 @@ static void runAddingSc1(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->count = count;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/sc2_1426.c b/plugins/LadspaEffect/swh/sc2_1426.c
index dd7a20d94..a95abd777 100644
--- a/plugins/LadspaEffect/swh/sc2_1426.c
+++ b/plugins/LadspaEffect/swh/sc2_1426.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -70,7 +70,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -355,7 +355,7 @@ static void runAddingSc2(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->count = count;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/sc3_1427.c b/plugins/LadspaEffect/swh/sc3_1427.c
index f7f4ceba5..e89609bf5 100644
--- a/plugins/LadspaEffect/swh/sc3_1427.c
+++ b/plugins/LadspaEffect/swh/sc3_1427.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -76,7 +76,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -402,7 +402,7 @@ static void runAddingSc3(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->count = count;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/sc4_1882.c b/plugins/LadspaEffect/swh/sc4_1882.c
index 63493383b..5ac873302 100644
--- a/plugins/LadspaEffect/swh/sc4_1882.c
+++ b/plugins/LadspaEffect/swh/sc4_1882.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -80,7 +80,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -445,7 +445,7 @@ static void runAddingSc4(LADSPA_Handle instance, unsigned long sample_count) {
 	*(plugin_data->gain_red) = lin2db(gain);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/sc4m_1916.c b/plugins/LadspaEffect/swh/sc4m_1916.c
index e9a07a0d2..ee9a952a5 100644
--- a/plugins/LadspaEffect/swh/sc4m_1916.c
+++ b/plugins/LadspaEffect/swh/sc4m_1916.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -76,7 +76,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -409,7 +409,7 @@ static void runAddingSc4m(LADSPA_Handle instance, unsigned long sample_count) {
 	*(plugin_data->gain_red) = lin2db(gain);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/se4_1883.c b/plugins/LadspaEffect/swh/se4_1883.c
index f3de1ec88..585d474e0 100644
--- a/plugins/LadspaEffect/swh/se4_1883.c
+++ b/plugins/LadspaEffect/swh/se4_1883.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -80,7 +80,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -441,7 +441,7 @@ static void runAddingSe4(LADSPA_Handle instance, unsigned long sample_count) {
 	*(plugin_data->gain_exp) = lin2db(gain);
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/shaper_1187.c b/plugins/LadspaEffect/swh/shaper_1187.c
index 039367216..f036a57fb 100644
--- a/plugins/LadspaEffect/swh/shaper_1187.c
+++ b/plugins/LadspaEffect/swh/shaper_1187.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -44,7 +44,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -175,7 +175,7 @@ static void runAddingShaper(LADSPA_Handle instance, unsigned long sample_count)
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/sifter_1210.c b/plugins/LadspaEffect/swh/sifter_1210.c
index 891e56ee1..8adcdbd27 100644
--- a/plugins/LadspaEffect/swh/sifter_1210.c
+++ b/plugins/LadspaEffect/swh/sifter_1210.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -33,7 +33,11 @@ void _init(); // forward declaration
 
 inline int partition(LADSPA_Data array[], int left, int right);
 
+#ifdef __clang__
+void q_sort(LADSPA_Data array[], int left, int right) {
+#else
 inline void q_sort(LADSPA_Data array[], int left, int right) {
+#endif
         float pivot = partition(array, left, right);
 
         if (left < pivot) {
@@ -92,7 +96,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -355,7 +359,7 @@ static void runAddingSifter(LADSPA_Handle instance, unsigned long sample_count)
 	plugin_data->b2ptr = b2ptr;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/sin_cos_1881.c b/plugins/LadspaEffect/swh/sin_cos_1881.c
index fd5e440b3..500b6808b 100644
--- a/plugins/LadspaEffect/swh/sin_cos_1881.c
+++ b/plugins/LadspaEffect/swh/sin_cos_1881.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -52,7 +52,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -207,7 +207,7 @@ static void runAddingSinCos(LADSPA_Handle instance, unsigned long sample_count)
 	plugin_data->last_om = target_om;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/single_para_1203.c b/plugins/LadspaEffect/swh/single_para_1203.c
index 75977a38c..d189c2682 100644
--- a/plugins/LadspaEffect/swh/single_para_1203.c
+++ b/plugins/LadspaEffect/swh/single_para_1203.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -53,7 +53,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -207,7 +207,7 @@ static void runAddingSinglePara(LADSPA_Handle instance, unsigned long sample_cou
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/sinus_wavewrapper_1198.c b/plugins/LadspaEffect/swh/sinus_wavewrapper_1198.c
index 8703d2ba1..02be6d68a 100644
--- a/plugins/LadspaEffect/swh/sinus_wavewrapper_1198.c
+++ b/plugins/LadspaEffect/swh/sinus_wavewrapper_1198.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -44,7 +44,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -159,7 +159,7 @@ static void runAddingSinusWavewrapper(LADSPA_Handle instance, unsigned long samp
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/smooth_decimate_1414.c b/plugins/LadspaEffect/swh/smooth_decimate_1414.c
index a6f13853f..532b84b0a 100644
--- a/plugins/LadspaEffect/swh/smooth_decimate_1414.c
+++ b/plugins/LadspaEffect/swh/smooth_decimate_1414.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -53,7 +53,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -240,7 +240,7 @@ static void runAddingSmoothDecimate(LADSPA_Handle instance, unsigned long sample
 	plugin_data->buffer_pos = buffer_pos;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/split_1406.c b/plugins/LadspaEffect/swh/split_1406.c
index 80bc268cd..48c9f7117 100644
--- a/plugins/LadspaEffect/swh/split_1406.c
+++ b/plugins/LadspaEffect/swh/split_1406.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -44,7 +44,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -155,7 +155,7 @@ static void runAddingSplit(LADSPA_Handle instance, unsigned long sample_count) {
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/step_muxer_1212.c b/plugins/LadspaEffect/swh/step_muxer_1212.c
index da231a58a..94dc51e73 100644
--- a/plugins/LadspaEffect/swh/step_muxer_1212.c
+++ b/plugins/LadspaEffect/swh/step_muxer_1212.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -70,7 +70,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -397,7 +397,7 @@ static void runAddingStepMuxer(LADSPA_Handle instance, unsigned long sample_coun
 	plugin_data->last_clock = last_clock;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/surround_encoder_1401.c b/plugins/LadspaEffect/swh/surround_encoder_1401.c
index c11188657..c0f970e7e 100644
--- a/plugins/LadspaEffect/swh/surround_encoder_1401.c
+++ b/plugins/LadspaEffect/swh/surround_encoder_1401.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -90,7 +90,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -317,7 +317,7 @@ static void runAddingSurroundEncoder(LADSPA_Handle instance, unsigned long sampl
 	plugin_data->buffer_pos = buffer_pos;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/svf_1214.c b/plugins/LadspaEffect/swh/svf_1214.c
index f17a353ef..24117d757 100644
--- a/plugins/LadspaEffect/swh/svf_1214.c
+++ b/plugins/LadspaEffect/swh/svf_1214.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -130,7 +130,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -293,7 +293,7 @@ static void runAddingSvf(LADSPA_Handle instance, unsigned long sample_count) {
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/tape_delay_1211.c b/plugins/LadspaEffect/swh/tape_delay_1211.c
index d31a494d1..5338dadfa 100644
--- a/plugins/LadspaEffect/swh/tape_delay_1211.c
+++ b/plugins/LadspaEffect/swh/tape_delay_1211.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -79,7 +79,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -476,7 +476,7 @@ static void runAddingTapeDelay(LADSPA_Handle instance, unsigned long sample_coun
 	plugin_data->z2 = z2;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/transient_1206.c b/plugins/LadspaEffect/swh/transient_1206.c
index c2be769f4..6e63fd526 100644
--- a/plugins/LadspaEffect/swh/transient_1206.c
+++ b/plugins/LadspaEffect/swh/transient_1206.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -63,7 +63,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -370,7 +370,7 @@ static void runAddingTransient(LADSPA_Handle instance, unsigned long sample_coun
 	plugin_data->slow_buffer_sum = slow_buffer_sum;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/triple_para_1204.c b/plugins/LadspaEffect/swh/triple_para_1204.c
index e2ee41361..8d3e63f3f 100644
--- a/plugins/LadspaEffect/swh/triple_para_1204.c
+++ b/plugins/LadspaEffect/swh/triple_para_1204.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -77,7 +77,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -368,7 +368,7 @@ static void runAddingTriplePara(LADSPA_Handle instance, unsigned long sample_cou
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/util/waveguide_nl.h b/plugins/LadspaEffect/swh/util/waveguide_nl.h
index 64a322278..398518eb0 100644
--- a/plugins/LadspaEffect/swh/util/waveguide_nl.h
+++ b/plugins/LadspaEffect/swh/util/waveguide_nl.h
@@ -115,7 +115,8 @@ inline void waveguide_nl_process(waveguide_nl *wg, float in0, float in1, float *
 	b = (*out0 + 1.0) * 6.0f;
 	if (b > 1.0f) {
 		b = 1.0f;
-	} else if (b < 0.0f) {
+	}
+	if (b < 0.0f) {
 		b = 0.0f;
 	}
 	a1 = b * wg->a1a + (1.0f - b) * wg->a1b;
@@ -129,7 +130,8 @@ inline void waveguide_nl_process(waveguide_nl *wg, float in0, float in1, float *
 	b = (*out1 + 1.0) * 6.0f;
 	if (b > 1.0f) {
 		b = 1.0f;
-	} else if (b < 0.0f) {
+	}
+	if (b < 0.0f) {
 		b = 0.0f;
 	}
 	a1 = b * wg->a1a + (1.0f - b) * wg->a1b;
diff --git a/plugins/LadspaEffect/swh/valve_1209.c b/plugins/LadspaEffect/swh/valve_1209.c
index 8e4dd6f13..2ab03dd17 100644
--- a/plugins/LadspaEffect/swh/valve_1209.c
+++ b/plugins/LadspaEffect/swh/valve_1209.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -51,7 +51,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -243,7 +243,7 @@ static void runAddingValve(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->otm1 = otm1;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/valve_rect_1405.c b/plugins/LadspaEffect/swh/valve_rect_1405.c
index 3c971118f..9a87af2fa 100644
--- a/plugins/LadspaEffect/swh/valve_rect_1405.c
+++ b/plugins/LadspaEffect/swh/valve_rect_1405.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -56,7 +56,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -312,7 +312,7 @@ static void runAddingValveRect(LADSPA_Handle instance, unsigned long sample_coun
 	plugin_data->apos = apos;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/vocoder_1337.c b/plugins/LadspaEffect/swh/vocoder_1337.c
index e5b4d24bd..0fb51688a 100644
--- a/plugins/LadspaEffect/swh/vocoder_1337.c
+++ b/plugins/LadspaEffect/swh/vocoder_1337.c
@@ -43,7 +43,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -333,10 +333,9 @@ LADSPA_Descriptor * g_psDescriptor = NULL;
 
 /*****************************************************************************/
 
-/* _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) swh_init() is called automatically when the plugin library is first
    loaded. */
-void 
-_init() {
+void __attribute__((constructor)) swh_init() {
   char ** pcPortNames;
   LADSPA_PortDescriptor * piPortDescriptors;
   LADSPA_PortRangeHint * psPortRangeHints;
@@ -448,7 +447,7 @@ const LADSPA_Descriptor *
 ladspa_descriptor(unsigned long Index) {
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
diff --git a/plugins/LadspaEffect/swh/vynil_1905.c b/plugins/LadspaEffect/swh/vynil_1905.c
index d42f8f6a3..03112ac8e 100644
--- a/plugins/LadspaEffect/swh/vynil_1905.c
+++ b/plugins/LadspaEffect/swh/vynil_1905.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -93,7 +93,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -579,7 +579,7 @@ static void runAddingVynil(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->phi = phi;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/wave_terrain_1412.c b/plugins/LadspaEffect/swh/wave_terrain_1412.c
index 00c2efef5..46791bdc1 100644
--- a/plugins/LadspaEffect/swh/wave_terrain_1412.c
+++ b/plugins/LadspaEffect/swh/wave_terrain_1412.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -44,7 +44,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -155,7 +155,7 @@ static void runAddingWaveTerrain(LADSPA_Handle instance, unsigned long sample_co
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/xfade_1915.c b/plugins/LadspaEffect/swh/xfade_1915.c
index a8c8dd5bd..3d0d01d01 100644
--- a/plugins/LadspaEffect/swh/xfade_1915.c
+++ b/plugins/LadspaEffect/swh/xfade_1915.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -79,7 +79,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -385,7 +385,7 @@ static void runAddingXfade4(LADSPA_Handle instance, unsigned long sample_count)
 	}
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/swh/zm1_1428.c b/plugins/LadspaEffect/swh/zm1_1428.c
index 048631ebb..5c3c19b5d 100644
--- a/plugins/LadspaEffect/swh/zm1_1428.c
+++ b/plugins/LadspaEffect/swh/zm1_1428.c
@@ -20,7 +20,7 @@
 #ifdef WIN32
 #define _WINDOWS_DLL_EXPORT_ __declspec(dllexport)
 int bIsFirstTime = 1; 
-void _init(); // forward declaration
+void __attribute__((constructor)) swh_init(); // forward declaration
 #else
 #define _WINDOWS_DLL_EXPORT_ 
 #endif
@@ -43,7 +43,7 @@ const LADSPA_Descriptor *ladspa_descriptor(unsigned long index) {
 
 #ifdef WIN32
 	if (bIsFirstTime) {
-		_init();
+		swh_init();
 		bIsFirstTime = 0;
 	}
 #endif
@@ -163,7 +163,7 @@ static void runAddingZm1(LADSPA_Handle instance, unsigned long sample_count) {
 	plugin_data->xm1 = xm1;
 }
 
-void _init() {
+void __attribute__((constructor)) swh_init() {
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
 	LADSPA_PortRangeHint *port_range_hints;
diff --git a/plugins/LadspaEffect/tap/tap_autopan.c b/plugins/LadspaEffect/tap/tap_autopan.c
index 387ae2b92..3cffaabf7 100644
--- a/plugins/LadspaEffect/tap/tap_autopan.c
+++ b/plugins/LadspaEffect/tap/tap_autopan.c
@@ -233,10 +233,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
-_init() {
+__attribute__((constructor)) tap_init() {
 	
 	int i;
 	char ** port_names;
@@ -341,9 +341,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
-_fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_chorusflanger.c b/plugins/LadspaEffect/tap/tap_chorusflanger.c
index c85b39439..9605fbf81 100644
--- a/plugins/LadspaEffect/tap/tap_chorusflanger.c
+++ b/plugins/LadspaEffect/tap/tap_chorusflanger.c
@@ -436,10 +436,10 @@ LADSPA_Descriptor * stereo_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -575,9 +575,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(stereo_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_deesser.c b/plugins/LadspaEffect/tap/tap_deesser.c
index b18f33b45..919007ddb 100644
--- a/plugins/LadspaEffect/tap/tap_deesser.c
+++ b/plugins/LadspaEffect/tap/tap_deesser.c
@@ -349,10 +349,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	int i;
 	char ** port_names;
@@ -471,9 +471,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_doubler.c b/plugins/LadspaEffect/tap/tap_doubler.c
index b84c1d583..46b0f7971 100644
--- a/plugins/LadspaEffect/tap/tap_doubler.c
+++ b/plugins/LadspaEffect/tap/tap_doubler.c
@@ -574,10 +574,10 @@ LADSPA_Descriptor * stereo_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -717,9 +717,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(stereo_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_dynamics_m.c b/plugins/LadspaEffect/tap/tap_dynamics_m.c
index 6ea8d6263..559d80d3f 100644
--- a/plugins/LadspaEffect/tap/tap_dynamics_m.c
+++ b/plugins/LadspaEffect/tap/tap_dynamics_m.c
@@ -516,10 +516,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -646,9 +646,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_dynamics_st.c b/plugins/LadspaEffect/tap/tap_dynamics_st.c
index 7a42fe1e8..045754cda 100644
--- a/plugins/LadspaEffect/tap/tap_dynamics_st.c
+++ b/plugins/LadspaEffect/tap/tap_dynamics_st.c
@@ -696,10 +696,10 @@ LADSPA_Descriptor * stereo_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -857,9 +857,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(stereo_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_echo.c b/plugins/LadspaEffect/tap/tap_echo.c
index e84cc2b51..6a0bdbb54 100644
--- a/plugins/LadspaEffect/tap/tap_echo.c
+++ b/plugins/LadspaEffect/tap/tap_echo.c
@@ -436,10 +436,10 @@ LADSPA_Descriptor * stereo_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -607,9 +607,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(stereo_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_eq.c b/plugins/LadspaEffect/tap/tap_eq.c
index 2c07cd004..daf9463a1 100644
--- a/plugins/LadspaEffect/tap/tap_eq.c
+++ b/plugins/LadspaEffect/tap/tap_eq.c
@@ -494,7 +494,7 @@ run_adding_eq(LADSPA_Handle instance, unsigned long sample_count) {
 
 
 void
- _init() {
+__attribute__((constructor)) tap_init() {
 
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
@@ -765,7 +765,7 @@ void
 
 
 void 
- _fini() {
+__attribute__((destructor)) tap_fini() {
 
 	if (eqDescriptor) {
 		free((LADSPA_PortDescriptor *)eqDescriptor->PortDescriptors);
diff --git a/plugins/LadspaEffect/tap/tap_eqbw.c b/plugins/LadspaEffect/tap/tap_eqbw.c
index 3805d003a..fd9d15d46 100644
--- a/plugins/LadspaEffect/tap/tap_eqbw.c
+++ b/plugins/LadspaEffect/tap/tap_eqbw.c
@@ -596,7 +596,7 @@ run_adding_eq(LADSPA_Handle instance, unsigned long sample_count) {
 
 
 void
- _init() {
+__attribute__((constructor)) tap_init() {
 
 	char **port_names;
 	LADSPA_PortDescriptor *port_descriptors;
@@ -955,7 +955,7 @@ void
 
 
 void 
- _fini() {
+__attribute__((destructor)) tap_fini() {
 
 	if (eqDescriptor) {
 		free((LADSPA_PortDescriptor *)eqDescriptor->PortDescriptors);
diff --git a/plugins/LadspaEffect/tap/tap_limiter.c b/plugins/LadspaEffect/tap/tap_limiter.c
index 7cd829c7c..b8de945bc 100644
--- a/plugins/LadspaEffect/tap/tap_limiter.c
+++ b/plugins/LadspaEffect/tap/tap_limiter.c
@@ -324,10 +324,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -423,9 +423,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_pinknoise.c b/plugins/LadspaEffect/tap/tap_pinknoise.c
index 5984ecee4..a71031061 100644
--- a/plugins/LadspaEffect/tap/tap_pinknoise.c
+++ b/plugins/LadspaEffect/tap/tap_pinknoise.c
@@ -225,10 +225,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -325,9 +325,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_pitch.c b/plugins/LadspaEffect/tap/tap_pitch.c
index eec650682..4f85a49ee 100644
--- a/plugins/LadspaEffect/tap/tap_pitch.c
+++ b/plugins/LadspaEffect/tap/tap_pitch.c
@@ -418,10 +418,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	int i;
 	char ** port_names;
@@ -536,9 +536,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_reflector.c b/plugins/LadspaEffect/tap/tap_reflector.c
index 4e8e33aa6..12af24366 100644
--- a/plugins/LadspaEffect/tap/tap_reflector.c
+++ b/plugins/LadspaEffect/tap/tap_reflector.c
@@ -378,10 +378,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	int i;
 	char ** port_names;
@@ -480,9 +480,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_reverb.c b/plugins/LadspaEffect/tap/tap_reverb.c
index 87afa28da..e1a0fe765 100644
--- a/plugins/LadspaEffect/tap/tap_reverb.c
+++ b/plugins/LadspaEffect/tap/tap_reverb.c
@@ -665,10 +665,10 @@ LADSPA_Descriptor * stereo_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -815,9 +815,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(stereo_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_rotspeak.c b/plugins/LadspaEffect/tap/tap_rotspeak.c
index c16393c3f..0b4be0720 100644
--- a/plugins/LadspaEffect/tap/tap_rotspeak.c
+++ b/plugins/LadspaEffect/tap/tap_rotspeak.c
@@ -624,10 +624,10 @@ LADSPA_Descriptor * stereo_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	int i;
 	char ** port_names;
@@ -748,9 +748,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(stereo_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_sigmoid.c b/plugins/LadspaEffect/tap/tap_sigmoid.c
index b1d33e843..e2e2d4b20 100644
--- a/plugins/LadspaEffect/tap/tap_sigmoid.c
+++ b/plugins/LadspaEffect/tap/tap_sigmoid.c
@@ -228,10 +228,10 @@ cleanup_Sigmoid(LADSPA_Handle Instance) {
 LADSPA_Descriptor * mono_descriptor = NULL;
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -318,9 +318,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_tremolo.c b/plugins/LadspaEffect/tap/tap_tremolo.c
index a4a929574..6ff4a3c52 100644
--- a/plugins/LadspaEffect/tap/tap_tremolo.c
+++ b/plugins/LadspaEffect/tap/tap_tremolo.c
@@ -220,10 +220,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -323,9 +323,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_tubewarmth.c b/plugins/LadspaEffect/tap/tap_tubewarmth.c
index 42a0db495..2af30437c 100644
--- a/plugins/LadspaEffect/tap/tap_tubewarmth.c
+++ b/plugins/LadspaEffect/tap/tap_tubewarmth.c
@@ -381,10 +381,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
- _init() {
+__attribute__((constructor)) tap_init() {
 	
 	char ** port_names;
 	LADSPA_PortDescriptor * port_descriptors;
@@ -471,9 +471,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
- _fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/LadspaEffect/tap/tap_vibrato.c b/plugins/LadspaEffect/tap/tap_vibrato.c
index 40d14541e..c95035a93 100644
--- a/plugins/LadspaEffect/tap/tap_vibrato.c
+++ b/plugins/LadspaEffect/tap/tap_vibrato.c
@@ -308,10 +308,10 @@ LADSPA_Descriptor * mono_descriptor = NULL;
 
 
 
-/*  _init() is called automatically when the plugin library is first
+/* __attribute__((constructor)) tap_init() is called automatically when the plugin library is first
    loaded. */
 void 
-_init() {
+__attribute__((constructor)) tap_init() {
 	
 	int i;
 	char ** port_names;
@@ -425,9 +425,9 @@ delete_descriptor(LADSPA_Descriptor * descriptor) {
 }
 
 
-/*  _fini() is called automatically when the library is unloaded. */
+/* __attribute__((destructor)) tap_fini() is called automatically when the library is unloaded. */
 void
-_fini() {
+__attribute__((destructor)) tap_fini() {
 	delete_descriptor(mono_descriptor);
 }
 
diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp
index 1e125850a..db566564f 100644
--- a/plugins/flp_import/FlpImport.cpp
+++ b/plugins/flp_import/FlpImport.cpp
@@ -982,6 +982,7 @@ if( p.currentEffectChannel <= NumFLFxChannels )
 
 			case FLP_LayerChans:
 				p.channels[data].layerParent = cur_channel;
+				break;
 
 			// DWORD EVENTS
 			case FLP_Color:
diff --git a/plugins/opl2/fmopl.c b/plugins/opl2/fmopl.c
index 6ead130d7..9b411a2dd 100644
--- a/plugins/opl2/fmopl.c
+++ b/plugins/opl2/fmopl.c
@@ -114,10 +114,9 @@ static int opl_dbg_maxchip,opl_dbg_chip;
 #define ENV_MOD_AR  0x02
 
 /* -------------------- tables --------------------- */
-static const int slot_array[32]=
-{
-	 0, 2, 4, 1, 3, 5,-1,-1,
-	 6, 8,10, 7, 9,11,-1,-1,
+static const int slot_array[32]= {
+	0, 2, 4, 1, 3, 5,-1,-1,
+	6, 8,10, 7, 9,11,-1,-1,
 	12,14,16,13,15,17,-1,-1,
 	-1,-1,-1,-1,-1,-1,-1,-1
 };
@@ -125,57 +124,56 @@ static const int slot_array[32]=
 /* key scale level */
 /* table is 3dB/OCT , DV converts this in TL step at 6dB/OCT */
 #define DV (EG_STEP/2)
-static const UINT32 KSL_TABLE[8*16]=
-{
+static const UINT32 KSL_TABLE[8*16]= {
 	/* OCT 0 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
 	/* OCT 1 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV,
-	 1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV,
+	0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	0.000/DV, 0.750/DV, 1.125/DV, 1.500/DV,
+	1.875/DV, 2.250/DV, 2.625/DV, 3.000/DV,
 	/* OCT 2 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
-	 0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV,
-	 3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV,
-	 4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV,
+	0.000/DV, 0.000/DV, 0.000/DV, 0.000/DV,
+	0.000/DV, 1.125/DV, 1.875/DV, 2.625/DV,
+	3.000/DV, 3.750/DV, 4.125/DV, 4.500/DV,
+	4.875/DV, 5.250/DV, 5.625/DV, 6.000/DV,
 	/* OCT 3 */
-	 0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV,
-	 3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV,
-	 6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV,
-	 7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV,
+	0.000/DV, 0.000/DV, 0.000/DV, 1.875/DV,
+	3.000/DV, 4.125/DV, 4.875/DV, 5.625/DV,
+	6.000/DV, 6.750/DV, 7.125/DV, 7.500/DV,
+	7.875/DV, 8.250/DV, 8.625/DV, 9.000/DV,
 	/* OCT 4 */
-	 0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
-	 6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
-	 9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
+	0.000/DV, 0.000/DV, 3.000/DV, 4.875/DV,
+	6.000/DV, 7.125/DV, 7.875/DV, 8.625/DV,
+	9.000/DV, 9.750/DV,10.125/DV,10.500/DV,
 	10.875/DV,11.250/DV,11.625/DV,12.000/DV,
 	/* OCT 5 */
-	 0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
-	 9.000/DV,10.125/DV,10.875/DV,11.625/DV,
+	0.000/DV, 3.000/DV, 6.000/DV, 7.875/DV,
+	9.000/DV,10.125/DV,10.875/DV,11.625/DV,
 	12.000/DV,12.750/DV,13.125/DV,13.500/DV,
 	13.875/DV,14.250/DV,14.625/DV,15.000/DV,
 	/* OCT 6 */
-	 0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
+	0.000/DV, 6.000/DV, 9.000/DV,10.875/DV,
 	12.000/DV,13.125/DV,13.875/DV,14.625/DV,
 	15.000/DV,15.750/DV,16.125/DV,16.500/DV,
 	16.875/DV,17.250/DV,17.625/DV,18.000/DV,
 	/* OCT 7 */
-	 0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
+	0.000/DV, 9.000/DV,12.000/DV,13.875/DV,
 	15.000/DV,16.125/DV,16.875/DV,17.625/DV,
 	18.000/DV,18.750/DV,19.125/DV,19.500/DV,
 	19.875/DV,20.250/DV,20.625/DV,21.000/DV
 };
 #undef DV
 
-/* sustain lebel table (3db per step) */
+/* sustain level table (3db per step) */
 /* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
 #define SC(db) (db*((3/EG_STEP)*(1<<ENV_BITS)))+EG_DST
-static const INT32 SL_TABLE[16]={
- SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
- SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
+static const INT32 SL_TABLE[16] = {
+	SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
+	SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
 };
 #undef SC
 
@@ -206,8 +204,9 @@ static const UINT32 MUL_TABLE[16]= {
 #undef ML
 
 /* dummy attack / decay rate ( when rate == 0 ) */
-static INT32 RATE_0[16]=
-{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+static INT32 RATE_0[16]= {
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+};
 
 /* -------------------- static state --------------------- */
 
@@ -216,7 +215,7 @@ static int num_lock = 0;
 
 /* work table */
 static void *cur_chip = NULL;	/* current chip point */
-/* currenct chip state */
+/* current chip state */
 /* static OPLSAMPLE  *bufL,*bufR; */
 static OPL_CH *S_CH;
 static OPL_CH *E_CH;
@@ -243,51 +242,64 @@ INT32 feedback2;		/* connect for SLOT 2 */
 #define LOG(n,x)
 
 /* --------------------- subroutines  --------------------- */
-
+#ifdef __clang__
+int Limit( int val, int max, int min ) {
+#else
 INLINE int Limit( int val, int max, int min ) {
-	if ( val > max )
+#endif
+	if ( val > max ) {
 		val = max;
-	else if ( val < min )
+	} else if ( val < min ) {
 		val = min;
-
+	}
 	return val;
 }
 
 /* status set and IRQ handling */
-INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag)
-{
+#ifdef __clang__
+void OPL_STATUS_SET(FM_OPL *OPL,int flag) {
+#else
+INLINE void OPL_STATUS_SET(FM_OPL *OPL,int flag) {
+#endif
 	/* set status flag */
 	OPL->status |= flag;
-	if(!(OPL->status & 0x80))
-	{
-		if(OPL->status & OPL->statusmask)
-		{	/* IRQ on */
+	if ( !(OPL->status & 0x80) ) {
+		/* IRQ on */
+		if ( OPL->status & OPL->statusmask ) {
 			OPL->status |= 0x80;
 			/* callback user interrupt handler (IRQ is OFF to ON) */
-			if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,1);
+			if (OPL->IRQHandler) {
+				(OPL->IRQHandler)(OPL->IRQParam,1);
+			}
 		}
 	}
 }
 
 /* status reset and IRQ handling */
-INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
-{
+#ifdef __clang__
+void OPL_STATUS_RESET(FM_OPL *OPL,int flag) {
+#else
+INLINE void OPL_STATUS_RESET(FM_OPL *OPL,int flag) {
+#endif
 	/* reset status flag */
 	OPL->status &=~flag;
-	if((OPL->status & 0x80))
-	{
-		if (!(OPL->status & OPL->statusmask) )
-		{
+	if ( (OPL->status & 0x80) ) {
+		if ( !(OPL->status & OPL->statusmask) ) {
 			OPL->status &= 0x7f;
 			/* callback user interrupt handler (IRQ is ON to OFF) */
-			if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,0);
+			if ( OPL->IRQHandler ) {
+				(OPL->IRQHandler)(OPL->IRQParam,0);
+			}
 		}
 	}
 }
 
 /* IRQ mask set */
-INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
-{
+#ifdef __clang__
+void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) {
+#else
+INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag) {
+#endif
 	OPL->statusmask = flag;
 	/* IRQ handling check */
 	OPL_STATUS_SET(OPL,0);
@@ -295,8 +307,11 @@ INLINE void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
 }
 
 /* ----- key on  ----- */
-INLINE void OPL_KEYON(OPL_SLOT *SLOT)
-{
+#ifdef __clang__
+void OPL_KEYON(OPL_SLOT *SLOT) {
+#else
+INLINE void OPL_KEYON(OPL_SLOT *SLOT) {
+#endif
 	/* sin wave restart */
 	SLOT->Cnt = 0;
 	/* set attack */
@@ -306,15 +321,18 @@ INLINE void OPL_KEYON(OPL_SLOT *SLOT)
 	SLOT->eve = EG_AED;
 }
 /* ----- key off ----- */
-INLINE void OPL_KEYOFF(OPL_SLOT *SLOT)
-{
-	if( SLOT->evm > ENV_MOD_RR)
-	{
+#ifdef __clang__
+void OPL_KEYOFF(OPL_SLOT *SLOT) {
+#else
+INLINE void OPL_KEYOFF(OPL_SLOT *SLOT) {
+#endif
+	if( SLOT->evm > ENV_MOD_RR) {
 		/* set envelope counter from envleope output */
 		SLOT->evm = ENV_MOD_RR;
-		if( !(SLOT->evc&EG_DST) )
+		if( !(SLOT->evc&EG_DST) ) {
 			/* SLOT->evc = (ENV_CURVE[SLOT->evc>>ENV_BITS]<<ENV_BITS) + EG_DST; */
 			SLOT->evc = EG_DST;
+		}
 		SLOT->eve = EG_DED;
 		SLOT->evs = SLOT->evsr;
 	}
@@ -322,62 +340,65 @@ INLINE void OPL_KEYOFF(OPL_SLOT *SLOT)
 
 /* ---------- calcrate Envelope Generator & Phase Generator ---------- */
 /* return : envelope output */
-INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT )
-{
+#ifdef __clang__
+UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT ) {
+#else
+INLINE UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT ) {
+#endif
 	/* calcrate envelope generator */
-	if( (SLOT->evc+=SLOT->evs) >= SLOT->eve )
-	{
+	if( (SLOT->evc+=SLOT->evs) >= SLOT->eve ) {
 		switch( SLOT->evm ){
-		case ENV_MOD_AR: /* ATTACK -> DECAY1 */
-			/* next DR */
-			SLOT->evm = ENV_MOD_DR;
-			SLOT->evc = EG_DST;
-			SLOT->eve = SLOT->SL;
-			SLOT->evs = SLOT->evsd;
-			break;
-		case ENV_MOD_DR: /* DECAY -> SL or RR */
-			SLOT->evc = SLOT->SL;
-			SLOT->eve = EG_DED;
-			if(SLOT->eg_typ)
-			{
+			case ENV_MOD_AR: /* ATTACK -> DECAY1 */
+				/* next DR */
+				SLOT->evm = ENV_MOD_DR;
+				SLOT->evc = EG_DST;
+				SLOT->eve = SLOT->SL;
+				SLOT->evs = SLOT->evsd;
+				break;
+			case ENV_MOD_DR: /* DECAY -> SL or RR */
+				SLOT->evc = SLOT->SL;
+				SLOT->eve = EG_DED;
+				if(SLOT->eg_typ)
+				{
+					SLOT->evs = 0;
+				}
+				else
+				{
+					SLOT->evm = ENV_MOD_RR;
+					SLOT->evs = SLOT->evsr;
+				}
+				break;
+			case ENV_MOD_RR: /* RR -> OFF */
+				SLOT->evc = EG_OFF;
+				SLOT->eve = EG_OFF+1;
 				SLOT->evs = 0;
+				break;
 			}
-			else
-			{
-				SLOT->evm = ENV_MOD_RR;
-				SLOT->evs = SLOT->evsr;
-			}
-			break;
-		case ENV_MOD_RR: /* RR -> OFF */
-			SLOT->evc = EG_OFF;
-			SLOT->eve = EG_OFF+1;
-			SLOT->evs = 0;
-			break;
-		}
 	}
 	/* calcrate envelope */
 	return SLOT->TLL+ENV_CURVE[SLOT->evc>>ENV_BITS]+(SLOT->ams ? ams : 0);
 }
 
 /* set algorythm connection */
-static void set_algorythm( OPL_CH *CH)
-{
+static void set_algorythm( OPL_CH *CH) {
 	INT32 *carrier = &outd[0];
 	CH->connect1 = CH->CON ? carrier : &feedback2;
 	CH->connect2 = carrier;
 }
 
 /* ---------- frequency counter for operater update ---------- */
-INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
-{
+#ifdef __clang__
+void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) {
+#else
+INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT) {
+#endif
 	int ksr;
 
 	/* frequency step counter */
 	SLOT->Incr = CH->fc * SLOT->mul;
 	ksr = CH->kcode >> SLOT->KSR;
 
-	if( SLOT->ksr != ksr )
-	{
+	if ( SLOT->ksr != ksr ) {
 		SLOT->ksr = ksr;
 		/* attack , decay rate recalcration */
 		SLOT->evsa = SLOT->AR[ksr];
@@ -388,8 +409,12 @@ INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
 }
 
 /* set multi,am,vib,EG-TYP,KSR,mul */
-INLINE void set_mul(FM_OPL *OPL,int slot,int v)
-{
+#ifdef __clang__
+void set_mul(FM_OPL *OPL,int slot,int v) {
+#else
+INLINE void set_mul(FM_OPL *OPL,int slot,int v) {
+#endif
+
 	OPL_CH   *CH   = &OPL->P_CH[slot/2];
 	OPL_SLOT *SLOT = &CH->SLOT[slot&1];
 
@@ -402,8 +427,12 @@ INLINE void set_mul(FM_OPL *OPL,int slot,int v)
 }
 
 /* set ksl & tl */
-INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
-{
+#ifdef __clang__
+void set_ksl_tl(FM_OPL *OPL,int slot,int v) {
+#else
+INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v) {
+#endif
+
 	OPL_CH   *CH   = &OPL->P_CH[slot/2];
 	OPL_SLOT *SLOT = &CH->SLOT[slot&1];
 	int ksl = v>>6; /* 0 / 1.5 / 3 / 6 db/OCT */
@@ -411,15 +440,18 @@ INLINE void set_ksl_tl(FM_OPL *OPL,int slot,int v)
 	SLOT->ksl = ksl ? 3-ksl : 31;
 	SLOT->TL  = (v&0x3f)*(0.75/EG_STEP); /* 0.75db step */
 
-	if( !(OPL->mode&0x80) )
-	{	/* not CSM latch total level */
+	if ( !(OPL->mode&0x80) ) {	/* not CSM latch total level */
 		SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
 	}
 }
 
 /* set attack rate & decay rate  */
-INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v)
-{
+#ifdef __clang__
+void set_ar_dr(FM_OPL *OPL,int slot,int v) {
+#else
+INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v) {
+#endif
+
 	OPL_CH   *CH   = &OPL->P_CH[slot/2];
 	OPL_SLOT *SLOT = &CH->SLOT[slot&1];
 	int ar = v>>4;
@@ -427,33 +459,48 @@ INLINE void set_ar_dr(FM_OPL *OPL,int slot,int v)
 
 	SLOT->AR = ar ? &OPL->AR_TABLE[ar<<2] : RATE_0;
 	SLOT->evsa = SLOT->AR[SLOT->ksr];
-	if( SLOT->evm == ENV_MOD_AR ) SLOT->evs = SLOT->evsa;
+	if ( SLOT->evm == ENV_MOD_AR ) {
+		SLOT->evs = SLOT->evsa;
+	}
 
 	SLOT->DR = dr ? &OPL->DR_TABLE[dr<<2] : RATE_0;
 	SLOT->evsd = SLOT->DR[SLOT->ksr];
-	if( SLOT->evm == ENV_MOD_DR ) SLOT->evs = SLOT->evsd;
+	
+	if ( SLOT->evm == ENV_MOD_DR ) {
+		SLOT->evs = SLOT->evsd;
+	}
 }
 
 /* set sustain level & release rate */
-INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v)
-{
+#ifdef __clang__
+void set_sl_rr(FM_OPL *OPL,int slot,int v) {
+#else
+INLINE void set_sl_rr(FM_OPL *OPL,int slot,int v) {
+#endif
 	OPL_CH   *CH   = &OPL->P_CH[slot/2];
 	OPL_SLOT *SLOT = &CH->SLOT[slot&1];
 	int sl = v>>4;
 	int rr = v & 0x0f;
 
 	SLOT->SL = SL_TABLE[sl];
-	if( SLOT->evm == ENV_MOD_DR ) SLOT->eve = SLOT->SL;
+	if ( SLOT->evm == ENV_MOD_DR ) {
+		SLOT->eve = SLOT->SL;
+	}
 	SLOT->RR = &OPL->DR_TABLE[rr<<2];
 	SLOT->evsr = SLOT->RR[SLOT->ksr];
-	if( SLOT->evm == ENV_MOD_RR ) SLOT->evs = SLOT->evsr;
+	if ( SLOT->evm == ENV_MOD_RR ) {
+		SLOT->evs = SLOT->evsr;
+	}
 }
 
 /* operator output calcrator */
 #define OP_OUT(slot,env,con)   slot->wavetable[((slot->Cnt+con)/(0x1000000/SIN_ENT))&(SIN_ENT-1)][env]
 /* ---------- calcrate one of channel ---------- */
-INLINE void OPL_CALC_CH( OPL_CH *CH )
-{
+#ifdef __clang__
+void OPL_CALC_CH( OPL_CH *CH ) {
+#else
+INLINE void OPL_CALC_CH( OPL_CH *CH ) {
+#endif
 	UINT32 env_out;
 	OPL_SLOT *SLOT;
 
@@ -461,35 +508,35 @@ INLINE void OPL_CALC_CH( OPL_CH *CH )
 	/* SLOT 1 */
 	SLOT = &CH->SLOT[SLOT1];
 	env_out=OPL_CALC_SLOT(SLOT);
-	if( env_out < EG_ENT-1 )
-	{
+	if( env_out < EG_ENT-1 ) {
 		/* PG */
-		if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
-		else          SLOT->Cnt += SLOT->Incr;
+		if (SLOT->vib) {
+			SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
+		} else {
+			SLOT->Cnt += SLOT->Incr;
+		}
 		/* connectoion */
-		if(CH->FB)
-		{
+		if(CH->FB) {
 			int feedback1 = (CH->op1_out[0]+CH->op1_out[1])>>CH->FB;
 			CH->op1_out[1] = CH->op1_out[0];
 			*CH->connect1 += CH->op1_out[0] = OP_OUT(SLOT,env_out,feedback1);
-		}
-		else
-		{
+		} else {
 			*CH->connect1 += OP_OUT(SLOT,env_out,0);
 		}
-	}else
-	{
+	} else {
 		CH->op1_out[1] = CH->op1_out[0];
 		CH->op1_out[0] = 0;
 	}
 	/* SLOT 2 */
 	SLOT = &CH->SLOT[SLOT2];
 	env_out=OPL_CALC_SLOT(SLOT);
-	if( env_out < EG_ENT-1 )
-	{
+	if ( env_out < EG_ENT-1 ) {
 		/* PG */
-		if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
-		else          SLOT->Cnt += SLOT->Incr;
+		if (SLOT->vib) {
+			SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
+		} else {
+			SLOT->Cnt += SLOT->Incr;
+		}
 		/* connectoion */
 		outd[0] += OP_OUT(SLOT,env_out, feedback2);
 	}
@@ -497,8 +544,11 @@ INLINE void OPL_CALC_CH( OPL_CH *CH )
 
 /* ---------- calcrate rythm block ---------- */
 #define WHITE_NOISE_db 6.0
-INLINE void OPL_CALC_RH( OPL_CH *CH )
-{
+#ifdef __clang__
+void OPL_CALC_RH( OPL_CH *CH ) {
+#else
+INLINE void OPL_CALC_RH( OPL_CH *CH ) {
+#endif
 	UINT32 env_tam,env_sd,env_top,env_hh;
 	int whitenoise = (rand()&1)*(WHITE_NOISE_db/EG_STEP);
 	INT32 tone8;
@@ -511,24 +561,22 @@ INLINE void OPL_CALC_RH( OPL_CH *CH )
 	/* SLOT 1 */
 	SLOT = &CH[6].SLOT[SLOT1];
 	env_out=OPL_CALC_SLOT(SLOT);
-	if( env_out < EG_ENT-1 )
-	{
+	if ( env_out < EG_ENT-1 ) {
 		/* PG */
-		if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
-		else          SLOT->Cnt += SLOT->Incr;
+		if (SLOT->vib) {
+			SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
+		} else {
+			SLOT->Cnt += SLOT->Incr;
+		}
 		/* connectoion */
-		if(CH[6].FB)
-		{
+		if(CH[6].FB) {
 			int feedback1 = (CH[6].op1_out[0]+CH[6].op1_out[1])>>CH[6].FB;
 			CH[6].op1_out[1] = CH[6].op1_out[0];
 			feedback2 = CH[6].op1_out[0] = OP_OUT(SLOT,env_out,feedback1);
-		}
-		else
-		{
+		} else {
 			feedback2 = OP_OUT(SLOT,env_out,0);
 		}
-	}else
-	{
+	} else {
 		feedback2 = 0;
 		CH[6].op1_out[1] = CH[6].op1_out[0];
 		CH[6].op1_out[0] = 0;
@@ -536,11 +584,13 @@ INLINE void OPL_CALC_RH( OPL_CH *CH )
 	/* SLOT 2 */
 	SLOT = &CH[6].SLOT[SLOT2];
 	env_out=OPL_CALC_SLOT(SLOT);
-	if( env_out < EG_ENT-1 )
-	{
+	if( env_out < EG_ENT-1 ) {
 		/* PG */
-		if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
-		else          SLOT->Cnt += SLOT->Incr;
+		if (SLOT->vib) {
+			SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
+		} else {
+			SLOT->Cnt += SLOT->Incr;
+		}
 		/* connectoion */
 		outd[0] += OP_OUT(SLOT,env_out, feedback2)*2;
 	}
@@ -555,106 +605,121 @@ INLINE void OPL_CALC_RH( OPL_CH *CH )
 	env_hh =OPL_CALC_SLOT(SLOT7_1) + whitenoise;
 
 	/* PG */
-	if(SLOT7_1->vib) SLOT7_1->Cnt += (2*SLOT7_1->Incr*vib/VIB_RATE);
-	else             SLOT7_1->Cnt += 2*SLOT7_1->Incr;
-	if(SLOT7_2->vib) SLOT7_2->Cnt += ((CH[7].fc*8)*vib/VIB_RATE);
-	else             SLOT7_2->Cnt += (CH[7].fc*8);
-	if(SLOT8_1->vib) SLOT8_1->Cnt += (SLOT8_1->Incr*vib/VIB_RATE);
-	else             SLOT8_1->Cnt += SLOT8_1->Incr;
-	if(SLOT8_2->vib) SLOT8_2->Cnt += ((CH[8].fc*48)*vib/VIB_RATE);
-	else             SLOT8_2->Cnt += (CH[8].fc*48);
+	if(SLOT7_1->vib) {
+		SLOT7_1->Cnt += (2*SLOT7_1->Incr*vib/VIB_RATE);
+	} else {
+		SLOT7_1->Cnt += 2*SLOT7_1->Incr;
+	}
+	if (SLOT7_2->vib) {
+		SLOT7_2->Cnt += ((CH[7].fc*8)*vib/VIB_RATE);
+	} else {
+		SLOT7_2->Cnt += (CH[7].fc*8);
+	}
+	if (SLOT8_1->vib) {
+		SLOT8_1->Cnt += (SLOT8_1->Incr*vib/VIB_RATE);
+	} else {
+		SLOT8_1->Cnt += SLOT8_1->Incr;
+	}
+	if (SLOT8_2->vib) {
+		SLOT8_2->Cnt += ((CH[8].fc*48)*vib/VIB_RATE);
+	}
+	else {
+		SLOT8_2->Cnt += (CH[8].fc*48);
+	}
 
 	tone8 = OP_OUT(SLOT8_2,whitenoise,0 );
 
 	/* SD */
-	if( env_sd < EG_ENT-1 )
+	if( env_sd < EG_ENT-1 ) {
 		outd[0] += OP_OUT(SLOT7_1,env_sd, 0)*8;
+	}
 	/* TAM */
-	if( env_tam < EG_ENT-1 )
+	if( env_tam < EG_ENT-1 ) {
 		outd[0] += OP_OUT(SLOT8_1,env_tam, 0)*2;
+	}
 	/* TOP-CY */
-	if( env_top < EG_ENT-1 )
+	if( env_top < EG_ENT-1 ) {
 		outd[0] += OP_OUT(SLOT7_2,env_top,tone8)*2;
+	}
 	/* HH */
-	if( env_hh  < EG_ENT-1 )
+	if( env_hh  < EG_ENT-1 ) {
 		outd[0] += OP_OUT(SLOT7_2,env_hh,tone8)*2;
+	}
 }
 
 /* ----------- initialize time tabls ----------- */
-static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE )
-{
+static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) {
 	int i;
 	double rate;
 
 	/* make attack rate & decay rate tables */
-	for (i = 0;i < 4;i++) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0;
-	for (i = 4;i <= 60;i++){
-		rate  = OPL->freqbase;						/* frequency rate */
-		if( i < 60 ) rate *= 1.0+(i&3)*0.25;		/* b0-1 : x1 , x1.25 , x1.5 , x1.75 */
-		rate *= 1<<((i>>2)-1);						/* b2-5 : shift bit */
-		rate *= (double)(EG_ENT<<ENV_BITS);
-		OPL->AR_TABLE[i] = rate / ARRATE;
-		OPL->DR_TABLE[i] = rate / DRRATE;
-	}
-	for (i = 60;i < 75;i++)
-	{
-		OPL->AR_TABLE[i] = EG_AED-1;
-		OPL->DR_TABLE[i] = OPL->DR_TABLE[60];
-	}
+	for ( i = 0; i < 4; i++ ) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; {
+		for (i = 4; i <= 60; i++) {
+			rate  = OPL->freqbase;						/* frequency rate */
+			if( i < 60 ) { 
+				rate *= 1.0+(i&3)*0.25;		/* b0-1 : x1 , x1.25 , x1.5 , x1.75 */
+			}
+			rate *= 1<<((i>>2)-1);						/* b2-5 : shift bit */
+			rate *= (double)(EG_ENT<<ENV_BITS);
+			OPL->AR_TABLE[i] = rate / ARRATE;
+			OPL->DR_TABLE[i] = rate / DRRATE;
+		}
+		for ( i = 60; i < 75; i++ ) {
+			OPL->AR_TABLE[i] = EG_AED-1;
+			OPL->DR_TABLE[i] = OPL->DR_TABLE[60];
+		}
 #if 0
-	for (i = 0;i < 64 ;i++){	/* make for overflow area */
-		LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i,
-			((double)(EG_ENT<<ENV_BITS) / OPL->AR_TABLE[i]) * (1000.0 / OPL->rate),
-			((double)(EG_ENT<<ENV_BITS) / OPL->DR_TABLE[i]) * (1000.0 / OPL->rate) ));
-	}
+			for ( i = 0; i < 64 ; i++ ) {	/* make for overflow area */
+				LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i,
+					((double)(EG_ENT<<ENV_BITS) / OPL->AR_TABLE[i]) * (1000.0 / OPL->rate),
+					((double)(EG_ENT<<ENV_BITS) / OPL->DR_TABLE[i]) * (1000.0 / OPL->rate) ));
+			}
 #endif
+	}
 }
 
 /* ---------- generic table initialize ---------- */
-static int OPLOpenTable( void )
-{
+static int OPLOpenTable( void ) {
 	int s,t;
 	double rate;
 	int i,j;
 	double pom;
 
 	/* allocate dynamic tables */
-	if( (TL_TABLE = malloc(TL_MAX*2*sizeof(INT32))) == NULL)
+	if ( (TL_TABLE = malloc(TL_MAX*2*sizeof(INT32))) == NULL ) {
 		return 0;
-	if( (SIN_TABLE = malloc(SIN_ENT*4 *sizeof(INT32 *))) == NULL)
-	{
+	}
+	if ( (SIN_TABLE = malloc(SIN_ENT*4 *sizeof(INT32 *))) == NULL ) {
 		free(TL_TABLE);
 		return 0;
 	}
-	if( (AMS_TABLE = malloc(AMS_ENT*2 *sizeof(INT32))) == NULL)
-	{
+	if ( (AMS_TABLE = malloc(AMS_ENT*2 *sizeof(INT32))) == NULL ) {
 		free(TL_TABLE);
 		free(SIN_TABLE);
 		return 0;
 	}
-	if( (VIB_TABLE = malloc(VIB_ENT*2 *sizeof(INT32))) == NULL)
-	{
+	if ( (VIB_TABLE = malloc(VIB_ENT*2 *sizeof(INT32))) == NULL ) {
 		free(TL_TABLE);
 		free(SIN_TABLE);
 		free(AMS_TABLE);
 		return 0;
 	}
 	/* make total level table */
-	for (t = 0;t < EG_ENT-1 ;t++){
+	for ( t = 0; t < EG_ENT-1; t++ ) {
 		rate = ((1<<TL_BITS)-1)/pow(10,EG_STEP*t/20);	/* dB -> voltage */
 		TL_TABLE[       t] =  (int)rate;
 		TL_TABLE[TL_MAX+t] = -TL_TABLE[t];
 /*		LOG(LOG_INF,("TotalLevel(%3d) = %x\n",t,TL_TABLE[t]));*/
 	}
 	/* fill volume off area */
-	for ( t = EG_ENT-1; t < TL_MAX ;t++){
+	for ( t = EG_ENT-1; t < TL_MAX; t++) {
 		TL_TABLE[t] = TL_TABLE[TL_MAX+t] = 0;
 	}
 
 	/* make sinwave table (total level offet) */
-	/* degree 0 = degree 180                   = off */
-	SIN_TABLE[0] = SIN_TABLE[SIN_ENT/2]         = &TL_TABLE[EG_ENT-1];
-	for (s = 1;s <= SIN_ENT/4;s++){
+	/* degree 0 = degree 180 = off */
+	SIN_TABLE[0] = SIN_TABLE[SIN_ENT/2] = &TL_TABLE[EG_ENT-1];
+	for ( s = 1; s <= SIN_ENT/4; s++) {
 		pom = sin(2*PI*s/SIN_ENT); /* sin     */
 		pom = 20*log10(1/pom);	   /* decibel */
 		j = pom / EG_STEP;         /* TL_TABLE steps */
@@ -665,16 +730,14 @@ static int OPLOpenTable( void )
 		SIN_TABLE[SIN_ENT/2+s] = SIN_TABLE[SIN_ENT  -s] = &TL_TABLE[TL_MAX+j];
 /*		LOG(LOG_INF,("sin(%3d) = %f:%f db\n",s,pom,(double)j * EG_STEP));*/
 	}
-	for (s = 0;s < SIN_ENT;s++)
-	{
+	for ( s = 0; s < SIN_ENT; s++) {
 		SIN_TABLE[SIN_ENT*1+s] = s<(SIN_ENT/2) ? SIN_TABLE[s] : &TL_TABLE[EG_ENT];
 		SIN_TABLE[SIN_ENT*2+s] = SIN_TABLE[s % (SIN_ENT/2)];
 		SIN_TABLE[SIN_ENT*3+s] = (s/(SIN_ENT/4))&1 ? &TL_TABLE[EG_ENT] : SIN_TABLE[SIN_ENT*2+s];
 	}
 
 	/* envelope counter -> envelope output table */
-	for (i=0; i<EG_ENT; i++)
-	{
+	for ( i=0; i<EG_ENT; i++ ) {
 		/* ATTACK curve */
 		pom = pow( ((double)(EG_ENT-1-i)/EG_ENT) , 8 ) * EG_ENT;
 		/* if( pom >= EG_ENT ) pom = EG_ENT-1; */
@@ -685,15 +748,13 @@ static int OPLOpenTable( void )
 	/* off */
 	ENV_CURVE[EG_OFF>>ENV_BITS]= EG_ENT-1;
 	/* make LFO ams table */
-	for (i=0; i<AMS_ENT; i++)
-	{
+	for ( i=0; i<AMS_ENT; i++ ) {
 		pom = (1.0+sin(2*PI*i/AMS_ENT))/2; /* sin */
 		AMS_TABLE[i]         = (1.0/EG_STEP)*pom; /* 1dB   */
 		AMS_TABLE[AMS_ENT+i] = (4.8/EG_STEP)*pom; /* 4.8dB */
 	}
 	/* make LFO vibrate table */
-	for (i=0; i<VIB_ENT; i++)
-	{
+	for (i=0; i<VIB_ENT; i++) {
 		/* 100cent = 1seminote = 6% ?? */
 		pom = (double)VIB_RATE*0.06*sin(2*PI*i/VIB_ENT); /* +-100sect step */
 		VIB_TABLE[i]         = VIB_RATE + (pom*0.07); /* +- 7cent */
@@ -704,8 +765,7 @@ static int OPLOpenTable( void )
 }
 
 
-static void OPLCloseTable( void )
-{
+static void OPLCloseTable( void ) {
 	free(TL_TABLE);
 	free(SIN_TABLE);
 	free(AMS_TABLE);
@@ -713,8 +773,11 @@ static void OPLCloseTable( void )
 }
 
 /* CSM Key Controll */
-INLINE void CSMKeyControll(OPL_CH *CH)
-{
+#ifdef __clang__
+void CSMKeyControll(OPL_CH *CH) {
+#else
+INLINE void CSMKeyControll(OPL_CH *CH) {
+#endif
 	OPL_SLOT *slot1 = &CH->SLOT[SLOT1];
 	OPL_SLOT *slot2 = &CH->SLOT[SLOT2];
 	/* all key off */
@@ -730,8 +793,7 @@ INLINE void CSMKeyControll(OPL_CH *CH)
 }
 
 /* ---------- opl initialize ---------- */
-static void OPL_initalize(FM_OPL *OPL)
-{
+static void OPL_initalize(FM_OPL *OPL) {
 	int fn;
 
 	/* frequency base */
@@ -741,8 +803,7 @@ static void OPL_initalize(FM_OPL *OPL)
 	/* make time tables */
 	init_timetables( OPL , OPL_ARRATE , OPL_DRRATE );
 	/* make fnumber -> increment counter table */
-	for( fn=0 ; fn < 1024 ; fn++ )
-	{
+	for( fn=0 ; fn < 1024 ; fn++ ) {
 		OPL->FN_TABLE[fn] = OPL->freqbase * fn * FREQ_RATE * (1<<7) / 2;
 	}
 	/* LFO freq.table */
@@ -751,227 +812,235 @@ static void OPL_initalize(FM_OPL *OPL)
 }
 
 /* ---------- write a OPL registers ---------- */
-static void OPLWriteReg(FM_OPL *OPL, int r, int v)
-{
+static void OPLWriteReg(FM_OPL *OPL, int r, int v) {
 	OPL_CH *CH;
 	int slot;
 	int block_fnum;
 
-	switch(r&0xe0)
-	{
+	switch ( r&0xe0 ) {
 	case 0x00: /* 00-1f:controll */
-		switch(r&0x1f)
-		{
-		case 0x01:
-			/* wave selector enable */
-			if(OPL->type&OPL_TYPE_WAVESEL)
-			{
-				OPL->wavesel = v&0x20;
-				if(!OPL->wavesel)
+		switch ( r&0x1f ) {
+			case 0x01:
+				/* wave selector enable */
+				if(OPL->type&OPL_TYPE_WAVESEL)
 				{
-					/* preset compatible mode */
-					int c;
-					for(c=0;c<OPL->max_ch;c++)
+					OPL->wavesel = v&0x20;
+					if( !OPL->wavesel )
 					{
-						OPL->P_CH[c].SLOT[SLOT1].wavetable = &SIN_TABLE[0];
-						OPL->P_CH[c].SLOT[SLOT2].wavetable = &SIN_TABLE[0];
+						/* preset compatible mode */
+						int c;
+						for ( c=0; c<OPL->max_ch; c++ )
+						{
+							OPL->P_CH[c].SLOT[SLOT1].wavetable = &SIN_TABLE[0];
+							OPL->P_CH[c].SLOT[SLOT2].wavetable = &SIN_TABLE[0];
+						}
 					}
 				}
-			}
-			return;
-		case 0x02:	/* Timer 1 */
-			OPL->T[0] = (256-v)*4;
-			break;
-		case 0x03:	/* Timer 2 */
-			OPL->T[1] = (256-v)*16;
-			return;
-		case 0x04:	/* IRQ clear / mask and Timer enable */
-			if(v&0x80)
-			{	/* IRQ flag clear */
-				OPL_STATUS_RESET(OPL,0x7f);
-			}
-			else
-			{	/* set IRQ mask ,timer enable*/
-				UINT8 st1 = v&1;
-				UINT8 st2 = (v>>1)&1;
-				/* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */
-				OPL_STATUS_RESET(OPL,v&0x78);
-				OPL_STATUSMASK_SET(OPL,((~v)&0x78)|0x01);
-				/* timer 2 */
-				if(OPL->st[1] != st2)
-				{
-					double interval = st2 ? (double)OPL->T[1]*OPL->TimerBase : 0.0;
-					OPL->st[1] = st2;
-					if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+1,interval);
+				return;
+			case 0x02:	/* Timer 1 */
+				OPL->T[0] = (256-v)*4;
+				break;
+			case 0x03:	/* Timer 2 */
+				OPL->T[1] = (256-v)*16;
+				return;
+			case 0x04:	/* IRQ clear / mask and Timer enable */
+				if ( v&0x80 ) {	/* IRQ flag clear */
+					OPL_STATUS_RESET(OPL,0x7f);
 				}
-				/* timer 1 */
-				if(OPL->st[0] != st1)
-				{
-					double interval = st1 ? (double)OPL->T[0]*OPL->TimerBase : 0.0;
-					OPL->st[0] = st1;
-					if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+0,interval);
+				else {	/* set IRQ mask ,timer enable*/
+					UINT8 st1 = v&1;
+					UINT8 st2 = (v>>1)&1;
+					/* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */
+					OPL_STATUS_RESET(OPL,v&0x78);
+					OPL_STATUSMASK_SET(OPL,((~v)&0x78)|0x01);
+					/* timer 2 */
+					if ( OPL->st[1] != st2 ) {
+						double interval = st2 ? (double)OPL->T[1]*OPL->TimerBase : 0.0;
+						OPL->st[1] = st2;
+						if ( OPL->TimerHandler ) {
+							(OPL->TimerHandler)(OPL->TimerParam+1,interval);
+						}
+					}
+					/* timer 1 */
+					if ( OPL->st[0] != st1 ) {
+						double interval = st1 ? (double)OPL->T[0]*OPL->TimerBase : 0.0;
+						OPL->st[0] = st1;
+						if ( OPL->TimerHandler ) {
+							(OPL->TimerHandler)(OPL->TimerParam+0,interval);
+						}
+					}
 				}
-			}
-			return;
+				return;
 #if BUILD_Y8950
-		case 0x06:		/* Key Board OUT */
-			if(OPL->type&OPL_TYPE_KEYBOARD)
-			{
-				if(OPL->keyboardhandler_w)
-					OPL->keyboardhandler_w(OPL->keyboard_param,v);
-				else
-					LOG(LOG_WAR,("OPL:write unmapped KEYBOARD port\n"));
-			}
-			return;
-		case 0x07:	/* DELTA-T controll : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
-			if(OPL->type&OPL_TYPE_ADPCM)
-				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
-			return;
-		case 0x08:	/* MODE,DELTA-T : CSM,NOTESEL,x,x,smpl,da/ad,64k,rom */
-			OPL->mode = v;
-			v&=0x1f;	/* for DELTA-T unit */
-		case 0x09:		/* START ADD */
-		case 0x0a:
-		case 0x0b:		/* STOP ADD  */
-		case 0x0c:
-		case 0x0d:		/* PRESCALE   */
-		case 0x0e:
-		case 0x0f:		/* ADPCM data */
-		case 0x10: 		/* DELTA-N    */
-		case 0x11: 		/* DELTA-N    */
-		case 0x12: 		/* EG-CTRL    */
-			if(OPL->type&OPL_TYPE_ADPCM)
-				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
-			return;
+			case 0x06:		/* Key Board OUT */
+				if ( OPL->type&OPL_TYPE_KEYBOARD ) {
+					if ( OPL->keyboardhandler_w ) {
+						OPL->keyboardhandler_w(OPL->keyboard_param,v);
+					}
+					else {
+						LOG(LOG_WAR,("OPL:write unmapped KEYBOARD port\n"));
+					}
+				}
+				return;
+			case 0x07:	/* DELTA-T controll : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
+				if ( OPL->type&OPL_TYPE_ADPCM ) {
+					YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
+				}
+				return;
+			case 0x08:	/* MODE,DELTA-T : CSM,NOTESEL,x,x,smpl,da/ad,64k,rom */
+				OPL->mode = v;
+				v&=0x1f;	/* for DELTA-T unit */
+			case 0x09:		/* START ADD */
+			case 0x0a:
+			case 0x0b:		/* STOP ADD  */
+			case 0x0c:
+			case 0x0d:		/* PRESCALE   */
+			case 0x0e:
+			case 0x0f:		/* ADPCM data */
+			case 0x10: 		/* DELTA-N    */
+			case 0x11: 		/* DELTA-N    */
+			case 0x12: 		/* EG-CTRL    */
+				if ( OPL->type&OPL_TYPE_ADPCM ) {
+					YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
+				}
+				return;
 #if 0
-		case 0x15:		/* DAC data    */
-		case 0x16:
-		case 0x17:		/* SHIFT    */
-			return;
-		case 0x18:		/* I/O CTRL (Direction) */
-			if(OPL->type&OPL_TYPE_IO)
-				OPL->portDirection = v&0x0f;
-			return;
-		case 0x19:		/* I/O DATA */
-			if(OPL->type&OPL_TYPE_IO)
-			{
-				OPL->portLatch = v;
-				if(OPL->porthandler_w)
-					OPL->porthandler_w(OPL->port_param,v&OPL->portDirection);
-			}
-			return;
-		case 0x1a:		/* PCM data */
-			return;
+			case 0x15:		/* DAC data    */
+			case 0x16:
+			case 0x17:		/* SHIFT    */
+				return;
+			case 0x18:		/* I/O CTRL (Direction) */
+				if ( OPL->type&OPL_TYPE_IO ) {
+					OPL->portDirection = v&0x0f;
+				}
+				return;
+			case 0x19:		/* I/O DATA */
+				if ( OPL->type&OPL_TYPE_IO ) {
+					OPL->portLatch = v;
+					if ( OPL->porthandler_w ) {
+						OPL->porthandler_w(OPL->port_param,v&OPL->portDirection);
+					}
+				}
+				return;
+			case 0x1a:		/* PCM data */
+				return;
 #endif
 #endif
 		}
 		break;
 	case 0x20:	/* am,vib,ksr,eg type,mul */
 		slot = slot_array[r&0x1f];
-		if(slot == -1) return;
+		if ( slot == -1 ) {
+			return;
+		}
 		set_mul(OPL,slot,v);
 		return;
 	case 0x40:
 		slot = slot_array[r&0x1f];
-		if(slot == -1) return;
+		if ( slot == -1 ) {
+			return;
+		}
 		set_ksl_tl(OPL,slot,v);
 		return;
 	case 0x60:
 		slot = slot_array[r&0x1f];
-		if(slot == -1) return;
+		if ( slot == -1 ) {
+			return;
+		}
 		set_ar_dr(OPL,slot,v);
 		return;
 	case 0x80:
 		slot = slot_array[r&0x1f];
-		if(slot == -1) return;
+		if ( slot == -1 ) {
+			return;
+		}
 		set_sl_rr(OPL,slot,v);
 		return;
 	case 0xa0:
-		switch(r)
-		{
-		case 0xbd:
+		switch ( r ) {
 			/* amsep,vibdep,r,bd,sd,tom,tc,hh */
-			{
-			UINT8 rkey = OPL->rythm^v;
-			OPL->ams_table = &AMS_TABLE[v&0x80 ? AMS_ENT : 0];
-			OPL->vib_table = &VIB_TABLE[v&0x40 ? VIB_ENT : 0];
-			OPL->rythm  = v&0x3f;
-			if(OPL->rythm&0x20)
-			{
+			case 0xbd: {
+				UINT8 rkey = OPL->rythm^v;
+				OPL->ams_table = &AMS_TABLE[v&0x80 ? AMS_ENT : 0];
+				OPL->vib_table = &VIB_TABLE[v&0x40 ? VIB_ENT : 0];
+				OPL->rythm  = v&0x3f;
+				if(OPL->rythm&0x20) {
 #if 0
-				usrintf_showmessage("OPL Rythm mode select");
+					usrintf_showmessage("OPL Rythm mode select");
 #endif
-				/* BD key on/off */
-				if(rkey&0x10)
-				{
-					if(v&0x10)
-					{
-						OPL->P_CH[6].op1_out[0] = OPL->P_CH[6].op1_out[1] = 0;
-						OPL_KEYON(&OPL->P_CH[6].SLOT[SLOT1]);
-						OPL_KEYON(&OPL->P_CH[6].SLOT[SLOT2]);
+					/* BD key on/off */
+					if ( rkey&0x10 ) {
+						if ( v&0x10 ) {
+							OPL->P_CH[6].op1_out[0] = OPL->P_CH[6].op1_out[1] = 0;
+							OPL_KEYON(&OPL->P_CH[6].SLOT[SLOT1]);
+							OPL_KEYON(&OPL->P_CH[6].SLOT[SLOT2]);
+						} else {
+							OPL_KEYOFF(&OPL->P_CH[6].SLOT[SLOT1]);
+							OPL_KEYOFF(&OPL->P_CH[6].SLOT[SLOT2]);
+						}
 					}
-					else
-					{
-						OPL_KEYOFF(&OPL->P_CH[6].SLOT[SLOT1]);
-						OPL_KEYOFF(&OPL->P_CH[6].SLOT[SLOT2]);
+					/* SD key on/off */
+					if ( rkey&0x08 ) {
+						if ( v&0x08 ) {
+							OPL_KEYON(&OPL->P_CH[7].SLOT[SLOT2]);
+						} else {
+							OPL_KEYOFF(&OPL->P_CH[7].SLOT[SLOT2]);
+						}
+					}/* TAM key on/off */
+					if ( rkey&0x04 ) {
+						if ( v&0x04 ) {
+							OPL_KEYON(&OPL->P_CH[8].SLOT[SLOT1]);
+						} else {
+							OPL_KEYOFF(&OPL->P_CH[8].SLOT[SLOT1]);
+						}
+					}
+					/* TOP-CY key on/off */
+					if ( rkey&0x02 ) {
+						if ( v&0x02 ) {
+							OPL_KEYON(&OPL->P_CH[8].SLOT[SLOT2]);
+						} else {
+							OPL_KEYOFF(&OPL->P_CH[8].SLOT[SLOT2]);
+						}
+					}
+					/* HH key on/off */
+					if ( rkey&0x01 ) {
+						if ( v&0x01 ) {
+							OPL_KEYON(&OPL->P_CH[7].SLOT[SLOT1]);
+						}
+						else {
+							OPL_KEYOFF(&OPL->P_CH[7].SLOT[SLOT1]);
+						}
 					}
 				}
-				/* SD key on/off */
-				if(rkey&0x08)
-				{
-					if(v&0x08) OPL_KEYON(&OPL->P_CH[7].SLOT[SLOT2]);
-					else       OPL_KEYOFF(&OPL->P_CH[7].SLOT[SLOT2]);
-				}/* TAM key on/off */
-				if(rkey&0x04)
-				{
-					if(v&0x04) OPL_KEYON(&OPL->P_CH[8].SLOT[SLOT1]);
-					else       OPL_KEYOFF(&OPL->P_CH[8].SLOT[SLOT1]);
-				}
-				/* TOP-CY key on/off */
-				if(rkey&0x02)
-				{
-					if(v&0x02) OPL_KEYON(&OPL->P_CH[8].SLOT[SLOT2]);
-					else       OPL_KEYOFF(&OPL->P_CH[8].SLOT[SLOT2]);
-				}
-				/* HH key on/off */
-				if(rkey&0x01)
-				{
-					if(v&0x01) OPL_KEYON(&OPL->P_CH[7].SLOT[SLOT1]);
-					else       OPL_KEYOFF(&OPL->P_CH[7].SLOT[SLOT1]);
-				}
-			}
 			}
 			return;
 		}
 		/* keyon,block,fnum */
-		if( (r&0x0f) > 8) return;
+		if ( (r&0x0f) > 8 ) {
+			return;
+		}
 		CH = &OPL->P_CH[r&0x0f];
-		if(!(r&0x10))
-		{	/* a0-a8 */
+		/* a0-a8 */
+		if ( !(r&0x10) ) {
 			block_fnum  = (CH->block_fnum&0x1f00) | v;
 		}
-		else
-		{	/* b0-b8 */
+		/* b0-b8 */
+		else {
 			int keyon = (v>>5)&1;
 			block_fnum = ((v&0x1f)<<8) | (CH->block_fnum&0xff);
-			if(CH->keyon != keyon)
-			{
-				if( (CH->keyon=keyon) )
-				{
+			if ( CH->keyon != keyon ) {
+				if ( (CH->keyon=keyon) ) {
 					CH->op1_out[0] = CH->op1_out[1] = 0;
 					OPL_KEYON(&CH->SLOT[SLOT1]);
 					OPL_KEYON(&CH->SLOT[SLOT2]);
-				}
-				else
-				{
+				} else {
 					OPL_KEYOFF(&CH->SLOT[SLOT1]);
 					OPL_KEYOFF(&CH->SLOT[SLOT2]);
 				}
 			}
 		}
 		/* update */
-		if(CH->block_fnum != block_fnum)
-		{
+		if(CH->block_fnum != block_fnum) {
 			int blockRv = 7-(block_fnum>>10);
 			int fnum   = block_fnum&0x3ff;
 			CH->block_fnum = block_fnum;
@@ -979,28 +1048,33 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
 			CH->ksl_base = KSL_TABLE[block_fnum>>6];
 			CH->fc = OPL->FN_TABLE[fnum]>>blockRv;
 			CH->kcode = CH->block_fnum>>9;
-			if( (OPL->mode&0x40) && CH->block_fnum&0x100) CH->kcode |=1;
+			if ( (OPL->mode&0x40) && CH->block_fnum&0x100 ) {
+				CH->kcode |=1;
+			}
 			CALC_FCSLOT(CH,&CH->SLOT[SLOT1]);
 			CALC_FCSLOT(CH,&CH->SLOT[SLOT2]);
 		}
 		return;
 	case 0xc0:
 		/* FB,C */
-		if( (r&0x0f) > 8) return;
+		if ( (r&0x0f) > 8 ) {
+			return;
+		}
 		CH = &OPL->P_CH[r&0x0f];
-		{
+		//{
 		int feedback = (v>>1)&7;
 		CH->FB   = feedback ? (8+1) - feedback : 0;
 		CH->CON = v&1;
 		set_algorythm(CH);
-		}
+		//}
 		return;
 	case 0xe0: /* wave type */
 		slot = slot_array[r&0x1f];
-		if(slot == -1) return;
+		if ( slot == -1 ) {
+			return;
+		}
 		CH = &OPL->P_CH[slot/2];
-		if(OPL->wavesel)
-		{
+		if (OPL->wavesel) {
 			/* LOG(LOG_INF,("OPL SLOT %d wave select %d\n",slot,v&3)); */
 			CH->SLOT[slot&1].wavetable = &SIN_TABLE[(v&0x03)*SIN_ENT];
 		}
@@ -1009,25 +1083,28 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
 }
 
 /* lock/unlock for common table */
-static int OPL_LockTable(void)
-{
+static int OPL_LockTable(void) {
 	num_lock++;
-	if(num_lock>1) return 0;
+	if ( num_lock>1 ) {
+		return 0;
+	}
 	/* first time */
 	cur_chip = NULL;
 	/* allocate total level table (128kb space) */
-	if( !OPLOpenTable() )
-	{
+	if ( !OPLOpenTable() ) {
 		num_lock--;
 		return -1;
 	}
 	return 0;
 }
 
-static void OPL_UnLockTable(void)
-{
-	if(num_lock) num_lock--;
-	if(num_lock) return;
+static void OPL_UnLockTable(void) {
+	if(num_lock) {
+		num_lock--;
+	}
+	if(num_lock) {
+		return;
+	}
 	/* last time */
 	cur_chip = NULL;
 	OPLCloseTable();
@@ -1039,8 +1116,7 @@ static void OPL_UnLockTable(void)
 /*******************************************************************************/
 
 /* ---------- update one of chip ----------- */
-void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
-{
+void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) {
     int i;
 	int data;
 	OPLSAMPLE *buf = buffer;
@@ -1049,7 +1125,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
 	UINT8 rythm = OPL->rythm&0x20;
 	OPL_CH *CH,*R_CH;
 
-	if( (void *)OPL != cur_chip ){
+	if ( (void *)OPL != cur_chip ) {
 		cur_chip = (void *)OPL;
 		/* channel pointers */
 		S_CH = OPL->P_CH;
@@ -1066,8 +1142,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
 		vib_table = OPL->vib_table;
 	}
 	R_CH = rythm ? &S_CH[6] : E_CH;
-    for( i=0; i < length ; i++ )
-	{
+    for ( i=0; i < length ; i++ ) {
 		/*            channel A         channel B         channel C      */
 		/* LFO */
 		ams = ams_table[(amsCnt+=amsIncr)>>AMS_SHIFT];
@@ -1088,11 +1163,13 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
 	OPL->amsCnt = amsCnt;
 	OPL->vibCnt = vibCnt;
 #ifdef OPL_OUTPUT_LOG
-	if(opl_dbg_fp)
-	{
-		for(opl_dbg_chip=0;opl_dbg_chip<opl_dbg_maxchip;opl_dbg_chip++)
-			if( opl_dbg_opl[opl_dbg_chip] == OPL) break;
-		fprintf(opl_dbg_fp,"%c%c%c",0x20+opl_dbg_chip,length&0xff,length/256);
+	if(opl_dbg_fp) {
+		for ( opl_dbg_chip=0;opl_dbg_chip<opl_dbg_maxchip;opl_dbg_chip++ ) {
+			if ( opl_dbg_opl[opl_dbg_chip] == OPL ) {
+				break;
+			}
+		}
+		fprintf(opl_dbg_fp, "%c%c%c", 0x20+opl_dbg_chip, length&0xff, length/256);
 	}
 #endif
 }
@@ -1100,8 +1177,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
 
 #if BUILD_Y8950
 
-void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
-{
+void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) {
     int i;
 	int data;
 	OPLSAMPLE *buf = buffer;
@@ -1114,7 +1190,7 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
 	/* setup DELTA-T unit */
 	YM_DELTAT_DECODE_PRESET(DELTAT);
 
-	if( (void *)OPL != cur_chip ){
+	if ( (void *)OPL != cur_chip ) {
 		cur_chip = (void *)OPL;
 		/* channel pointers */
 		S_CH = OPL->P_CH;
@@ -1131,22 +1207,24 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
 		vib_table = OPL->vib_table;
 	}
 	R_CH = rythm ? &S_CH[6] : E_CH;
-    for( i=0; i < length ; i++ )
-	{
+    for ( i=0; i < length ; i++ ) {
 		/*            channel A         channel B         channel C      */
 		/* LFO */
 		ams = ams_table[(amsCnt+=amsIncr)>>AMS_SHIFT];
 		vib = vib_table[(vibCnt+=vibIncr)>>VIB_SHIFT];
 		outd[0] = 0;
 		/* deltaT ADPCM */
-		if( DELTAT->portstate )
+		if( DELTAT->portstate ) {
 			YM_DELTAT_ADPCM_CALC(DELTAT);
+		}
 		/* FM part */
-		for(CH=S_CH ; CH < R_CH ; CH++)
+		for ( CH=S_CH ; CH < R_CH ; CH++ ) {
 			OPL_CALC_CH(CH);
+		}
 		/* Rythn part */
-		if(rythm)
+		if ( rythm ) {
 			OPL_CALC_RH(S_CH);
+		}
 		/* limit check */
 		data = Limit( outd[0] , OPL_MAXOUT, OPL_MINOUT );
 		/* store to sound buffer */
@@ -1155,14 +1233,14 @@ void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
 	OPL->amsCnt = amsCnt;
 	OPL->vibCnt = vibCnt;
 	/* deltaT START flag */
-	if( !DELTAT->portstate )
+	if ( !DELTAT->portstate ) {
 		OPL->status &= 0xfe;
+	}
 }
 #endif
 
 /* ---------- reset one of chip ---------- */
-void OPLResetChip(FM_OPL *OPL)
-{
+void OPLResetChip(FM_OPL *OPL) {
 	int c,s;
 	int i;
 
@@ -1174,14 +1252,14 @@ void OPLResetChip(FM_OPL *OPL)
 	OPLWriteReg(OPL,0x02,0); /* Timer1 */
 	OPLWriteReg(OPL,0x03,0); /* Timer2 */
 	OPLWriteReg(OPL,0x04,0); /* IRQ mask clear */
-	for(i = 0xff ; i >= 0x20 ; i-- ) OPLWriteReg(OPL,i,0);
+	for ( i = 0xff ; i >= 0x20 ; i-- ) {
+		OPLWriteReg(OPL,i,0);
+	}
 	/* reset OPerator paramater */
-	for( c = 0 ; c < OPL->max_ch ; c++ )
-	{
+	for ( c = 0 ; c < OPL->max_ch ; c++ ) {
 		OPL_CH *CH = &OPL->P_CH[c];
 		/* OPL->P_CH[c].PAN = OPN_CENTER; */
-		for(s = 0 ; s < 2 ; s++ )
-		{
+		for ( s = 0 ; s < 2 ; s++ ) {
 			/* wave table */
 			CH->SLOT[s].wavetable = &SIN_TABLE[0];
 			/* CH->SLOT[s].evm = ENV_MOD_RR; */
@@ -1191,8 +1269,7 @@ void OPLResetChip(FM_OPL *OPL)
 		}
 	}
 #if BUILD_Y8950
-	if(OPL->type&OPL_TYPE_ADPCM)
-	{
+	if ( OPL->type&OPL_TYPE_ADPCM ) {
 		YM_DELTAT *DELTAT = OPL->deltat;
 
 		DELTAT->freqbase = OPL->freqbase;
@@ -1206,29 +1283,37 @@ void OPLResetChip(FM_OPL *OPL)
 
 /* ----------  Create one of vietual YM3812 ----------       */
 /* 'rate'  is sampling rate and 'bufsiz' is the size of the  */
-FM_OPL *OPLCreate(int type, int clock, int rate)
-{
+FM_OPL *OPLCreate(int type, int clock, int rate) {
 	char *ptr;
 	FM_OPL *OPL;
 	int state_size;
 	int max_ch = 9; /* normaly 9 channels */
 
-	if( OPL_LockTable() ==-1) return NULL;
+	if ( OPL_LockTable() ==-1 ) {
+		return NULL;
+	}
 	/* allocate OPL state space */
 	state_size  = sizeof(FM_OPL);
 	state_size += sizeof(OPL_CH)*max_ch;
 #if BUILD_Y8950
-	if(type&OPL_TYPE_ADPCM) state_size+= sizeof(YM_DELTAT);
+	if ( type&OPL_TYPE_ADPCM ) {
+		state_size+= sizeof(YM_DELTAT);
+	}
 #endif
 	/* allocate memory block */
 	ptr = malloc(state_size);
-	if(ptr==NULL) return NULL;
+	if (ptr==NULL) {
+		return NULL;
+	}
 	/* clear */
 	memset(ptr,0,state_size);
 	OPL        = (FM_OPL *)ptr; ptr+=sizeof(FM_OPL);
 	OPL->P_CH  = (OPL_CH *)ptr; ptr+=sizeof(OPL_CH)*max_ch;
 #if BUILD_Y8950
-	if(type&OPL_TYPE_ADPCM) OPL->deltat = (YM_DELTAT *)ptr; ptr+=sizeof(YM_DELTAT);
+	if ( type&OPL_TYPE_ADPCM ) {
+		OPL->deltat = (YM_DELTAT *)ptr;
+		ptr+=sizeof(YM_DELTAT);
+	}
 #endif
 	/* set channel state pointer */
 	OPL->type  = type;
@@ -1240,15 +1325,13 @@ FM_OPL *OPLCreate(int type, int clock, int rate)
 	/* reset chip */
 	OPLResetChip(OPL);
 #ifdef OPL_OUTPUT_LOG
-	if(!opl_dbg_fp)
-	{
+	if (!opl_dbg_fp) {
 		opl_dbg_fp = fopen("opllog.opl","wb");
 		opl_dbg_maxchip = 0;
 	}
-	if(opl_dbg_fp)
-	{
+	if (opl_dbg_fp) {
 		opl_dbg_opl[opl_dbg_maxchip] = OPL;
-		fprintf(opl_dbg_fp,"%c%c%c%c%c%c",0x00+opl_dbg_maxchip,
+		fprintf(opl_dbg_fp, "%c%c%c%c%c%c", 0x00+opl_dbg_maxchip,
 			type,
 			clock&0xff,
 			(clock/0x100)&0xff,
@@ -1261,11 +1344,9 @@ FM_OPL *OPLCreate(int type, int clock, int rate)
 }
 
 /* ----------  Destroy one of vietual YM3812 ----------       */
-void OPLDestroy(FM_OPL *OPL)
-{
+void OPLDestroy(FM_OPL *OPL) {
 #ifdef OPL_OUTPUT_LOG
-	if(opl_dbg_fp)
-	{
+	if(opl_dbg_fp) {
 		fclose(opl_dbg_fp);
 		opl_dbg_fp = NULL;
 	}
@@ -1276,115 +1357,112 @@ void OPLDestroy(FM_OPL *OPL)
 
 /* ----------  Option handlers ----------       */
 
-void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset)
-{
+void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset) {
 	OPL->TimerHandler   = TimerHandler;
 	OPL->TimerParam = channelOffset;
 }
-void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param)
-{
+void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param) {
 	OPL->IRQHandler     = IRQHandler;
 	OPL->IRQParam = param;
 }
-void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param)
-{
+void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param) {
 	OPL->UpdateHandler = UpdateHandler;
 	OPL->UpdateParam = param;
 }
 #if BUILD_Y8950
-void OPLSetPortHandler(FM_OPL *OPL,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,int param)
-{
+void OPLSetPortHandler(FM_OPL *OPL,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,int param) {
 	OPL->porthandler_w = PortHandler_w;
 	OPL->porthandler_r = PortHandler_r;
 	OPL->port_param = param;
 }
 
-void OPLSetKeyboardHandler(FM_OPL *OPL,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,int param)
-{
+void OPLSetKeyboardHandler(FM_OPL *OPL,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,int param) {
 	OPL->keyboardhandler_w = KeyboardHandler_w;
 	OPL->keyboardhandler_r = KeyboardHandler_r;
 	OPL->keyboard_param = param;
 }
 #endif
 /* ---------- YM3812 I/O interface ---------- */
-int OPLWrite(FM_OPL *OPL,int a,int v)
-{
-	if( !(a&1) )
-	{	/* address port */
+int OPLWrite(FM_OPL *OPL,int a,int v) {
+	if ( !(a&1) ) {	/* address port */
 		OPL->address = v & 0xff;
-	}
-	else
-	{	/* data port */
-		if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam,0);
+	} else {	/* data port */
+		if ( OPL->UpdateHandler ) {
+			OPL->UpdateHandler(OPL->UpdateParam,0);
+		}
 #ifdef OPL_OUTPUT_LOG
-	if(opl_dbg_fp)
-	{
-		for(opl_dbg_chip=0;opl_dbg_chip<opl_dbg_maxchip;opl_dbg_chip++)
-			if( opl_dbg_opl[opl_dbg_chip] == OPL) break;
-		fprintf(opl_dbg_fp,"%c%c%c",0x10+opl_dbg_chip,OPL->address,v);
-	}
+		if ( opl_dbg_fp ) {
+			for ( opl_dbg_chip=0; opl_dbg_chip<opl_dbg_maxchip; opl_dbg_chip++ ) {
+				if( opl_dbg_opl[opl_dbg_chip] == OPL) break;
+			}
+			fprintf(opl_dbg_fp, "%c%c%c", 0x10+opl_dbg_chip, OPL->address, v);
+		}
 #endif
 		OPLWriteReg(OPL,OPL->address,v);
 	}
 	return OPL->status>>7;
 }
 
-unsigned char OPLRead(FM_OPL *OPL,int a)
-{
-	if( !(a&1) )
-	{	/* status port */
+unsigned char OPLRead(FM_OPL *OPL,int a) {
+	/* status port */
+	if( !(a&1) ) {
 		return OPL->status & (OPL->statusmask|0x80);
 	}
+	
 	/* data port */
-	switch(OPL->address)
-	{
-	case 0x05: /* KeyBoard IN */
-		if(OPL->type&OPL_TYPE_KEYBOARD)
-		{
-			if(OPL->keyboardhandler_r)
-				return OPL->keyboardhandler_r(OPL->keyboard_param);
-			else
-				LOG(LOG_WAR,("OPL:read unmapped KEYBOARD port\n"));
-		}
-		return 0;
-#if 0
-	case 0x0f: /* ADPCM-DATA  */
-		return 0;
-#endif
-	case 0x19: /* I/O DATA    */
-		if(OPL->type&OPL_TYPE_IO)
-		{
-			if(OPL->porthandler_r)
-				return OPL->porthandler_r(OPL->port_param);
-			else
-				LOG(LOG_WAR,("OPL:read unmapped I/O port\n"));
-		}
-		return 0;
-	case 0x1a: /* PCM-DATA    */
-		return 0;
+	switch(OPL->address) {
+		case 0x05: /* KeyBoard IN */
+			if ( OPL->type&OPL_TYPE_KEYBOARD ) {
+				if ( OPL->keyboardhandler_r ) {
+					return OPL->keyboardhandler_r(OPL->keyboard_param);
+				} else {
+					LOG(LOG_WAR,("OPL:read unmapped KEYBOARD port\n"));
+				}
+			}
+			return 0;
+	#if 0
+		case 0x0f: /* ADPCM-DATA  */
+			return 0;
+	#endif
+		case 0x19: /* I/O DATA    */
+			if ( OPL->type&OPL_TYPE_IO ) {
+				if ( OPL->porthandler_r ) {
+					return OPL->porthandler_r(OPL->port_param);
+				}
+				else {
+					LOG(LOG_WAR,("OPL:read unmapped I/O port\n"));
+				}
+			}
+			return 0;
+		case 0x1a: /* PCM-DATA    */
+			return 0;
 	}
 	return 0;
 }
 
-int OPLTimerOver(FM_OPL *OPL,int c)
-{
-	if( c )
-	{	/* Timer B */
+int OPLTimerOver(FM_OPL *OPL,int c) {
+	/* Timer B */
+	if( c ) {
 		OPL_STATUS_SET(OPL,0x20);
 	}
-	else
-	{	/* Timer A */
+	/* Timer A */
+	else {
 		OPL_STATUS_SET(OPL,0x40);
-		/* CSM mode key,TL controll */
-		if( OPL->mode & 0x80 )
-		{	/* CSM mode total level latch and auto key on */
+		/* CSM mode key,TL control */
+		/* CSM mode total level latch and auto key on */
+		if( OPL->mode & 0x80 ) {	
 			int ch;
-			if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam,0);
-			for(ch=0;ch<9;ch++)
+			if (OPL->UpdateHandler) {
+				OPL->UpdateHandler(OPL->UpdateParam,0);
+			}
+			for ( ch=0; ch<9; ch++ ) {
 				CSMKeyControll( &OPL->P_CH[ch] );
+			}
 		}
 	}
 	/* reload timer */
-	if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+c,(double)OPL->T[c]*OPL->TimerBase);
+	if ( OPL->TimerHandler ) {
+		(OPL->TimerHandler)(OPL->TimerParam+c,(double)OPL->T[c]*OPL->TimerBase);
+	}
 	return OPL->status>>7;
 }
diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
index a313ccdba..750ca9022 100644
--- a/plugins/vst_base/CMakeLists.txt
+++ b/plugins/vst_base/CMakeLists.txt
@@ -26,7 +26,7 @@ IF(LMMS_HOST_X86_64)
 	SET(EXTRA_FLAGS -m32)
 
 	# workaround for broken wineg++ in WINE 1.4 (shipped e.g. with Ubuntu Precise)
-	EXEC_PROGRAM( wineg++ ARGS "-v -m32 /dev/zero" OUTPUT_VARIABLE WINEBUILD_OUTPUT)
+	EXEC_PROGRAM( ${WINE_CXX} ARGS "-v -m32 /dev/zero" OUTPUT_VARIABLE WINEBUILD_OUTPUT)
 	if("${WINEBUILD_OUTPUT}" MATCHES ".*x86_64-linux-gnu/wine/libwinecrt0.a.*")
 		SET(EXTRA_FLAGS ${EXTRA_FLAGS} -nodefaultlibs /usr/lib/i386-linux-gnu/wine/libwinecrt0.a -luser32 -lkernel32 -lgdi32)
 	ENDIF()
@@ -34,7 +34,7 @@ ENDIF(LMMS_HOST_X86_64)
 
 ADD_CUSTOM_COMMAND(
 		SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp"
-		COMMAND wineg++
+		COMMAND ${WINE_CXX}
 		ARGS "-I\"${CMAKE_BINARY_DIR}\"" "-I\"${CMAKE_SOURCE_DIR}/include\"" "-I\"${CMAKE_INSTALL_PREFIX}/include/wine/windows\"" "-I\"${CMAKE_INSTALL_PREFIX}/include\"" -I/usr/include/wine/windows "\"${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp\"" -mwindows -lpthread ${EXTRA_FLAGS} -o RemoteVstPlugin
 		COMMAND find -name RemoteVstPlugin.exe -exec mv "'{}'" RemoteVstPlugin "';'"
 		TARGET vstbase
diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp
index 653c14d5d..51e61ac1d 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -344,8 +344,10 @@ void configManager::loadConfigFile()
 	if( m_ladDir.isEmpty() || m_ladDir == QDir::separator() ||
 			( !m_ladDir.contains( ':' ) && !QDir( m_ladDir ).exists() ) )
 	{
-#ifdef LMMS_BUILD_WIN32
+#if defined(LMMS_BUILD_WIN32)
 		m_ladDir = m_pluginDir + "ladspa" + QDir::separator();
+#elif defined(LMMS_BUILD_APPLE)
+		m_ladDir = qApp->applicationDirPath() + "/../lib/lmms/ladspa/";
 #else
 		m_ladDir = qApp->applicationDirPath() + '/' + LIB_DIR + "/ladspa/";
 #endif
@@ -355,8 +357,10 @@ void configManager::loadConfigFile()
 	if( m_stkDir.isEmpty() || m_stkDir == QDir::separator() ||
 			!QDir( m_stkDir ).exists() )
 	{
-#ifdef LMMS_BUILD_WIN32
+#if defined(LMMS_BUILD_WIN32)
 		m_stkDir = m_dataDir + "stk/rawwaves/";
+#elif defined(LMMS_BUILD_APPLE)
+		m_stkDir = qApp->applicationDirPath() + "/../share/stk/rawwaves/";
 #else
 		m_stkDir = "/usr/share/stk/rawwaves/";
 #endif
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 670ba34e1..5f3719a8a 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -748,6 +748,11 @@ void song::clearProject()
 		engine::automationEditor()->setCurrentPattern( NULL );
 	}
 
+	if( engine::pianoRoll() )
+	{
+		engine::pianoRoll()->reset();
+	}
+
 	m_tempoModel.reset();
 	m_masterVolumeModel.reset();
 	m_masterPitchModel.reset();
diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp
index 59b438d1a..9c4536ca2 100644
--- a/src/gui/AutomationEditor.cpp
+++ b/src/gui/AutomationEditor.cpp
@@ -1600,8 +1600,6 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe )
 				++it;
 			}
 
-			Q_ASSERT( it == time_map.end()-1 );
-
 			for( int i = it.key(), x = xCoordOfTick( i ); x <= width();
 							i++, x = xCoordOfTick( i ) )
 			{
diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp
index b89799690..563738987 100644
--- a/src/gui/PianoRoll.cpp
+++ b/src/gui/PianoRoll.cpp
@@ -649,6 +649,15 @@ PianoRoll::PianoRoll() :
 }
 
 
+
+void PianoRoll::reset()
+{
+	m_lastNoteVolume = DefaultVolume;
+	m_lastNotePanning = DefaultPanning;
+}
+
+
+
 void PianoRoll::changeNoteEditMode( int i )
 {
 	m_noteEditMode = (noteEditMode) i;