diff --git a/data/windows/build-win32.sh b/data/windows/build-win32.sh
index 3a867708a..fa3475a42 100755
--- a/data/windows/build-win32.sh
+++ b/data/windows/build-win32.sh
@@ -34,7 +34,7 @@ export PYUIC="wine $PYTHON_EXE C:\\\\Python33\\\\Lib\\\\site-packages\\\\PyQt4\\
 export PYRCC="wine C:\\\\Python33\\\\Lib\\\\site-packages\\\\PyQt4\\\\pyrcc4.exe -py3"
 
 export CFLAGS="-DPTW32_STATIC_LIB -I$MINGW_PATH/include"
-export CXXFLAGS="-DPTW32_STATIC_LIB -DFLUIDSYNTH_NOT_A_DLL -D__WINDOWS_ASIO__ -D__WINDOWS_DS__ -D__WINDOWS_MM__ -I$MINGW_PATH/include"
+export CXXFLAGS="-DPTW32_STATIC_LIB -DFLUIDSYNTH_NOT_A_DLL -I$MINGW_PATH/include"
 export EXTRA_LIBS1="-lglib-2.0 -lgthread-2.0 -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg"
 export EXTRA_LIBS2="$MINGW_PATH/lib/qt4/plugins/imageformats/libqsvg.a $MINGW_PATH/lib/qt4/plugins/iconengines/libqsvgicon.a"
 
diff --git a/data/windows/build-win64.sh b/data/windows/build-win64.sh
index 68135d2d8..8111d4cf9 100755
--- a/data/windows/build-win64.sh
+++ b/data/windows/build-win64.sh
@@ -34,7 +34,7 @@ export PYUIC="wine $PYTHON_EXE C:\\\\Python33\\\\Lib\\\\site-packages\\\\PyQt4\\
 export PYRCC="wine C:\\\\Python33\\\\Lib\\\\site-packages\\\\PyQt4\\\\pyrcc4.exe -py3"
 
 export CFLAGS="-DPTW32_STATIC_LIB -I$MINGW_PATH/include"
-export CXXFLAGS="-DPTW32_STATIC_LIB -DFLUIDSYNTH_NOT_A_DLL -D__WINDOWS_ASIO__ -D__WINDOWS_DS__ -D__WINDOWS_MM__ -I$MINGW_PATH/include"
+export CXXFLAGS="-DPTW32_STATIC_LIB -DFLUIDSYNTH_NOT_A_DLL -I$MINGW_PATH/include"
 export EXTRA_LIBS1="-lglib-2.0 -lgthread-2.0 -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg"
 export EXTRA_LIBS2="$MINGW_PATH/lib/qt4/plugins/imageformats/libqsvg.a $MINGW_PATH/lib/qt4/plugins/iconengines/libqsvgicon.a"
 
diff --git a/source/backend/engine/Makefile b/source/backend/engine/Makefile
index cdcf3f39c..727368c2a 100644
--- a/source/backend/engine/Makefile
+++ b/source/backend/engine/Makefile
@@ -46,6 +46,10 @@ BUILD_CXX_FLAGS += $(shell pkg-config --cflags libpulse-simple) -D__LINUX_PULSE_
 LINK_FLAGS      += $(shell pkg-config --libs libpulse-simple)
 endif
 
+ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -D__WINDOWS_ASIO__ -D__WINDOWS_DS__ -D__WINDOWS_MM__
+endif
+
 PLUGIN_CXX_FLAGS  = $(BUILD_CXX_FLAGS)
 PLUGIN_CXX_FLAGS += -Idistrho -I../../libs/distrho
 PLUGIN_CXX_FLAGS += -DWANT_PLUGIN
diff --git a/source/backend/standalone/Makefile b/source/backend/standalone/Makefile
index 901629c34..87f766515 100644
--- a/source/backend/standalone/Makefile
+++ b/source/backend/standalone/Makefile
@@ -24,7 +24,7 @@ LINK_FLAGS += $(shell pkg-config --libs liblo)
 ifeq ($(HAVE_QT5),true)
 LINK_FLAGS += $(shell pkg-config --libs Qt5Core Qt5Xml Qt5Widgets)
 else
-LINK_FLAGS += $(shell pkg-config --libs QtCore QtXml QtWidgets)
+LINK_FLAGS += $(shell pkg-config --libs QtCore QtGui QtXml)
 endif
 
 # --------------------------------------------------------------
@@ -57,8 +57,7 @@ endif
 # Native
 
 ifeq ($(WIN32),true)
-DGL_LIBS  = -lgdi32
-W32_LIBS  = -lcomdlg32 -ldsound -limm32 -lole32 -luuid -lwinmm -lwinspool -lws2_32
+W32_LIBS  = -lcomdlg32 -ldsound -lgdi32 -limm32 -lole32 -luuid -lwinmm -lwinspool -lws2_32
 ifeq ($(HAVE_LINUXSAMPLER),true)
 W32_LIBS += -lrpcrt4
 endif
diff --git a/source/carla_shared.py b/source/carla_shared.py
index 9fc50625a..e658156ec 100644
--- a/source/carla_shared.py
+++ b/source/carla_shared.py
@@ -146,7 +146,7 @@ Carla.processMode   = PROCESS_MODE_CONTINUOUS_RACK
 Carla.maxParameters = MAX_RACK_PLUGINS
 
 # ------------------------------------------------------------------------------------------------------------
-# Carla GUI stuff
+# Carla GUI defines
 
 ICON_STATE_NULL = 0
 ICON_STATE_WAIT = 1
@@ -308,8 +308,7 @@ elif HAIKU:
     splitter = ":"
 
     DEFAULT_LADSPA_PATH = ":".join((os.path.join(HOME, ".ladspa"),
-                                    os.path.join("/", "usr", "lib", "ladspa"),
-                                    os.path.join("/", "usr", "local", "lib", "ladspa")))
+                                    os.path.join("/", "boot", "common", "add-ons", "ladspa")))
 
     DEFAULT_DSSI_PATH = ":".join((os.path.join(HOME, ".dssi"),
                                   os.path.join("/", "boot", "common", "add-ons", "dssi")))