diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake
index ccb8638befd..5bbbef44e66 100644
--- a/cmake/modules/DetectMachine.cmake
+++ b/cmake/modules/DetectMachine.cmake
@@ -1,11 +1,11 @@
 IF(WIN32)
 	SET(LMMS_BUILD_WIN32 1)
-ELSE(WIN32)
-	IF(APPLE)
-		SET(LMMS_BUILD_APPLE 1)
-	ELSE(APPLE)
-		SET(LMMS_BUILD_LINUX 1)
-	ENDIF(APPLE)
+ELSEIF(APPLE)
+	SET(LMMS_BUILD_APPLE 1)
+ELSEIF(HAIKU)
+	SET(LMMS_BUILD_HAIKU 1)
+ELSE()
+	SET(LMMS_BUILD_LINUX 1)
 ENDIF(WIN32)
 
 MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h
index d57a5d29321..42caa36aa66 100644
--- a/include/RemotePlugin.h
+++ b/include/RemotePlugin.h
@@ -36,17 +36,12 @@
 #include <string>
 #include <cassert>
 
-#ifdef LMMS_BUILD_WIN32
-#define USE_QT_SEMAPHORES
-#define USE_QT_SHMEM
-#endif
 
-#ifdef LMMS_BUILD_APPLE
+#if defined(LMMS_HAVE_SYS_IPC_H) && defined(LMMS_HAVE_SEMAPHORE_H)
+#include <sys/ipc.h>
+#include <semaphore.h>
+#else
 #define USE_QT_SEMAPHORES
-#endif
-
-
-#ifdef USE_QT_SEMAPHORES
 
 #ifdef LMMS_HAVE_PROCESS_H
 #include <process.h>
@@ -54,39 +49,25 @@
 
 #include <QtCore/QtGlobal>
 #include <QtCore/QSystemSemaphore>
-
-#else /* USE_QT_SEMAPHORES */
-
-#ifdef LMMS_HAVE_SYS_IPC_H
-#include <sys/ipc.h>
-#endif
-
-#ifdef LMMS_HAVE_SEMAPHORE_H
-#include <semaphore.h>
-#endif
-
 #endif
 
 
-#ifdef USE_QT_SHMEM
-
-#include <QtCore/QtGlobal>
-#include <QtCore/QSharedMemory>
-
-typedef int32_t key_t;
-
-#else /* USE_QT_SHMEM */
-
 #ifdef LMMS_HAVE_SYS_SHM_H
 #include <sys/shm.h>
-#endif
 
 #ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#else
+#define USE_QT_SHMEM
 
-#endif
+#include <QtCore/QtGlobal>
+#include <QtCore/QSharedMemory>
 
+#if !defined(LMMS_HAVE_SYS_TYPES_H) || defined(LMMS_BUILD_WIN32)
+typedef int32_t key_t;
+#endif
+#endif
 
 
 #ifdef LMMS_HAVE_LOCALE_H
diff --git a/include/lmms_math.h b/include/lmms_math.h
index d89280be2e1..1e3b530ae92 100644
--- a/include/lmms_math.h
+++ b/include/lmms_math.h
@@ -34,7 +34,7 @@
 #include <cmath>
 using namespace std;
 
-#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) 
+#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU)
 #ifndef isnanf
 #define isnanf(x)	isnan(x)
 #endif
diff --git a/include/versioninfo.h b/include/versioninfo.h
index 9295a56c467..58f7a79e930 100644
--- a/include/versioninfo.h
+++ b/include/versioninfo.h
@@ -27,3 +27,7 @@
 #ifdef LMMS_BUILD_WIN32
 #define PLATFORM "win32"
 #endif
+
+#ifdef LMMS_BUILD_HAIKU
+#define PLATFORM "Haiku"
+#endif
diff --git a/lmmsconfig.h.in b/lmmsconfig.h.in
index d645c5025b4..496d0db67ac 100644
--- a/lmmsconfig.h.in
+++ b/lmmsconfig.h.in
@@ -2,6 +2,7 @@
 #cmakedefine LMMS_BUILD_WIN32
 #cmakedefine LMMS_BUILD_WIN64
 #cmakedefine LMMS_BUILD_APPLE
+#cmakedefine LMMS_BUILD_HAIKU
 
 #cmakedefine LMMS_HOST_X86
 #cmakedefine LMMS_HOST_X86_64
diff --git a/plugins/LadspaEffect/swh/CMakeLists.txt b/plugins/LadspaEffect/swh/CMakeLists.txt
index 080f446e063..64d67bd5fa4 100644
--- a/plugins/LadspaEffect/swh/CMakeLists.txt
+++ b/plugins/LadspaEffect/swh/CMakeLists.txt
@@ -24,9 +24,9 @@ FOREACH(_item ${PLUGIN_SOURCES})
 	ELSE(LMMS_BUILD_APPLE)
 		SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm")
 	ENDIF(LMMS_BUILD_APPLE)
-	IF(LMMS_BUILD_LINUX)
+	IF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU)
 		SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles")
-	ENDIF(LMMS_BUILD_LINUX)
+	ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU)
 ENDFOREACH(_item ${PLUGIN_SOURCES})
 
 
diff --git a/plugins/LadspaEffect/tap/CMakeLists.txt b/plugins/LadspaEffect/tap/CMakeLists.txt
index d88c6990b86..b747f853b82 100644
--- a/plugins/LadspaEffect/tap/CMakeLists.txt
+++ b/plugins/LadspaEffect/tap/CMakeLists.txt
@@ -14,8 +14,8 @@ FOREACH(_item ${PLUGIN_SOURCES})
 	ELSE(LMMS_BUILD_APPLE)
 		SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined -Wl,-Bsymbolic -lm")
 	ENDIF(LMMS_BUILD_APPLE)
-	IF(LMMS_BUILD_LINUX)
+	IF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU)
 		SET_TARGET_PROPERTIES("${_plugin}" PROPERTIES LINK_FLAGS "${LINK_FLAGS} -nostartfiles")
-	ENDIF(LMMS_BUILD_LINUX)
+	ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_HAIKU)
 ENDFOREACH(_item ${PLUGIN_SOURCES})
 
diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp
index 14ecb8fa16f..5864b94c8d9 100644
--- a/plugins/lb302/lb302.cpp
+++ b/plugins/lb302/lb302.cpp
@@ -458,10 +458,6 @@ void lb302Synth::recalcFilter()
 	vcf_envpos = ENVINC; // Trigger filter update in process()
 }
 
-inline int MIN(int a, int b) {
-	return (a<b)?a:b;
-}
-
 inline float GET_INC(float freq) {
 	return freq/Engine::mixer()->processingSampleRate();  // TODO: Use actual sampling rate.
 }
diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 9f751f38c4f..77569dd7852 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -32,7 +32,11 @@ IF(MINGW_PREFIX)
 	SET(FLTK_SKIP_FLUID TRUE)
 ENDIF()
 
-FIND_PACKAGE(FLTK REQUIRED)
+FIND_PACKAGE(FLTK)
+
+IF(NOT FLTK_FOUND)
+	RETURN()
+ENDIF()
 
 IF(MINGW_PREFIX)
 	SET(FLTK_FLUID_EXECUTABLE "${MINGW_PREFIX}/bin/fluid")
diff --git a/src/core/VstSyncController.cpp b/src/core/VstSyncController.cpp
index 1e1294c32f1..a28b9adb10d 100644
--- a/src/core/VstSyncController.cpp
+++ b/src/core/VstSyncController.cpp
@@ -30,12 +30,7 @@
 #include "lmmsconfig.h"
 #include "Mixer.h"
 #include "VstSyncController.h"
-
-#ifdef LMMS_BUILD_WIN32
-#ifndef USE_QT_SHMEM
-#define USE_QT_SHMEM
-#endif
-#endif
+#include "RemotePlugin.h"
 
 #ifndef USE_QT_SHMEM
 #include <stdio.h>