diff --git a/configure.in b/configure.in
index a707e0d31..980901d21 100644
--- a/configure.in
+++ b/configure.in
@@ -160,9 +160,18 @@ AM_CONDITIONAL(HAVE_LIBJACK, test ! -z "$HAVE_JACK_JACK_H")
 AC_ARG_WITH(vst,
 	AS_HELP_STRING([--with-vst],
 			[enable support for builtin VST-plugin-hosting]), [ with_vst=yes ], [ with_vst=no ])
-AH_TEMPLATE(HAVE_VST_AEFFECTX_H, [Define to 1 if you have the <vst/aeffectx.h> header file.])
+AH_TEMPLATE(HAVE_VST_AEFFECTX_H, [Define to 1 if you have the <aeffectx.h> header file.])
 if test "x$with_vst" = "xyes" ; then
-	AC_CHECK_HEADER(vst/aeffectx.h, HAVE_VST_AEFFECTX_H="true")
+	AC_CHECK_HEADER(aeffectx.h, HAVE_VST_AEFFECTX_H="true")
+	if test -z "$HAVE_VST_AEFFECTX_H" ; then
+		ORIG_CFLAGS=$CFLAGS
+		ORIG_CPPFLAGS=$CPPFLAGS
+		CFLAGS="$CLFAGS -I./include"
+		CPPFLAGS="$CPPFLAGS -I./include"
+		AC_CHECK_HEADER(aeffectx.h, HAVE_VST_AEFFECTX_H="true")
+		CFLAGS="$ORIG_CFLAGS"
+		CPPFLAGS="$ORIG_CPPFLAGS"
+	fi
 	AC_CHECK_PROG(WINEGCC, winegcc, /usr/bin/winegcc,,/usr/bin)
 	AC_CHECK_LIB([wine], [wine_init])
 	if test ! -z "$WINEGCC" ; then
@@ -634,14 +643,14 @@ else
 		echo " ="
 		echo " = You seem to have a proper WINE-installation, but the header-files"
 		echo " = (AEffect.h and aeffectx.h) from Steinberg-VST-SDK are missing or not present"
-		echo " = in /usr/include/vst. We cannot distribute them as they're licensed under"
+		echo " = in /usr/include/ or ./include. We cannot distribute them as they're licensed under"
 		echo " = a GPL-incompatible license, so you'll have to download them at"
 		echo " ="
 		echo " = http://www.steinberg.de/Steinberg/ygrabit/vstsdk/OnlineDoc/source/common/AEffect.h"
 		echo " = http://www.steinberg.de/Steinberg/ygrabit/vstsdk/OnlineDoc/source/common/aeffectx.h"
 		echo " ="
-		echo " = and put the mentioned files into /usr/include/vst. Make sure, they're"
-		echo " = patched with file aeffectx_h_fix.patch!"
+		echo " = and put the mentioned files into /usr/include/ or ./include. Make sure, they're"
+		echo " = patched with file vst_sdk23_headers.diff!"
 		echo " = Otherwise (now!) configure will disable LMMS's support for built-in VST-"
 		echo " = plugin-usage. If you do not intend to use VST-plugins with LMMS you can "
 		echo " = ignore this warning."
diff --git a/src/lib/buffer_allocator.cpp b/src/lib/buffer_allocator.cpp
index 91c33c685..30fb3ef73 100644
--- a/src/lib/buffer_allocator.cpp
+++ b/src/lib/buffer_allocator.cpp
@@ -177,7 +177,7 @@ void * bufferAllocator::allocBytes( Uint32 _bytes )
 	// processes like pattern-freezing because this way we do not have to
 	// search for a free buffer in an array, containing several
 	// 10.000 buffers
-	if( s_freeBufs > s_buffers.size() / 10 )
+	if( (csize) s_freeBufs > s_buffers.size() / 10 )
 	{
 		bufIt free_buf = s_buffers.end();