diff --git a/source/backend/engine/CarlaEngineJack.cpp b/source/backend/engine/CarlaEngineJack.cpp
index fb9e3b2ce..17ba8c3c1 100644
--- a/source/backend/engine/CarlaEngineJack.cpp
+++ b/source/backend/engine/CarlaEngineJack.cpp
@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the GPL.txt file
  */
 
-#if 1//def WANT_JACK
+#ifdef WANT_JACK
 
 #include "CarlaEngineInternal.hpp"
 #include "CarlaBackendUtils.hpp"
diff --git a/source/backend/engine/Makefile b/source/backend/engine/Makefile
index 24a19b3f0..bc8545576 100644
--- a/source/backend/engine/Makefile
+++ b/source/backend/engine/Makefile
@@ -15,7 +15,7 @@ LINK_FLAGS      += $(shell pkg-config --libs liblo QtCore QtXml)
 
 ifeq ($(CARLA_RTAUDIO_SUPPORT),true)
 BUILD_CXX_FLAGS += -DHAVE_GETTIMEOFDAY
-BUILD_CXX_FLAGS += -Irtaudio-4.0.11 -Irtmidi-2.0.1
+BUILD_CXX_FLAGS += -Irtaudio-4.0.11 -Irtaudio-4.0.11/include -Irtmidi-2.0.1
 ifeq ($(DEBUG),true)
 BUILD_CXX_FLAGS += -D__RTAUDIO_DEBUG__ -D__RTMIDI_DEBUG__
 endif
@@ -52,6 +52,12 @@ ifeq ($(CARLA_RTAUDIO_SUPPORT),true)
 OBJS += \
 	rtaudio-4.0.11/RtAudio.cpp.o \
 	rtmidi-2.0.1/RtMidi.cpp.o
+
+# OBJS += \
+# 	rtaudio-4.0.11/include/asio.cpp.o \
+# 	rtaudio-4.0.11/include/asiodrivers.cpp.o \
+# 	rtaudio-4.0.11/include/asiolist.cpp.o \
+# 	rtaudio-4.0.11/include/iasiothiscallresolver.cpp.o
 endif
 
 SHARED = ../libcarla_engine.so
diff --git a/source/backend/native/Makefile b/source/backend/native/Makefile
index afb66fc67..7feaeb4da 100644
--- a/source/backend/native/Makefile
+++ b/source/backend/native/Makefile
@@ -45,9 +45,15 @@ OBJS  = \
 	midi-sequencer.cpp.o \
 	midi-split.c.o \
 	midi-through.c.o \
-	midi-transpose.c.o \
+	midi-transpose.c.o
+
+# FIXME
+OBJSN = \
 	nekofilter.c.o
 
+OBJS += \
+	$(OBJS_N)
+
 # AudioFile
 ifeq ($(HAVE_AF_DEPS),true)
 OBJS += \
diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp
index 0b8f59bd8..d2ef65063 100644
--- a/source/backend/plugin/NativePlugin.cpp
+++ b/source/backend/plugin/NativePlugin.cpp
@@ -31,7 +31,9 @@ void carla_register_all_plugins()
     carla_register_native_plugin_midiSplit();
     carla_register_native_plugin_midiThrough();
     carla_register_native_plugin_midiTranspose();
+#ifndef CARLA_OS_WIN
     carla_register_native_plugin_nekofilter();
+#endif
 
 #ifdef WANT_AUDIOFILE
     // AudioFile
diff --git a/source/backend/standalone/CarlaStandalone.cpp b/source/backend/standalone/CarlaStandalone.cpp
index a5e947fab..0c43c1929 100644
--- a/source/backend/standalone/CarlaStandalone.cpp
+++ b/source/backend/standalone/CarlaStandalone.cpp
@@ -23,6 +23,8 @@
 #include "CarlaMIDI.h"
 #include "CarlaNative.h"
 
+#include <QtGui/QApplication>
+
 #if 0
 extern "C" {
 #include "siginfo.c"
@@ -49,7 +51,17 @@ struct CarlaBackendStandalone {
     CarlaBackendStandalone()
         : callback(nullptr),
           callbackPtr(nullptr),
-          engine(nullptr) {}
+          engine(nullptr)
+    {
+        QApplication* app = qApp;
+
+        if (app == nullptr)
+        {
+            static int    argc = 0;
+            static char** argv = nullptr;
+            app = new QApplication(argc, argv, true);
+        }
+    }
 
 } standalone;
 
diff --git a/source/backend/standalone/Makefile b/source/backend/standalone/Makefile
index bf6ba3cf5..f35b3cf31 100644
--- a/source/backend/standalone/Makefile
+++ b/source/backend/standalone/Makefile
@@ -6,6 +6,10 @@
 
 include ../Makefile.mk
 
+# --------------------------------------------------------------
+
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtGui)
+
 # --------------------------------------------------------------
 # Common
 
@@ -40,12 +44,14 @@ endif
 # --------------------------------------------------------------
 # Native
 
+DGL_LIBS = -lX11
+
 ifeq ($(HAVE_AF_DEPS),true)
 LINK_FLAGS += $(shell pkg-config --libs libavcodec libavformat libavutil sndfile)
 endif
 
 ifeq ($(HAVE_OPENGL),true)
-LINK_FLAGS += $(shell pkg-config --libs gl) -lX11
+LINK_FLAGS += $(shell pkg-config --libs gl) $(DGL_LIBS)
 endif
 
 ifeq ($(HAVE_ZYN_DEPS),true)
@@ -98,6 +104,9 @@ $(SHARED): $(OBJS) $(LIBS)
 $(STATIC): $(OBJS) $(LIBS)
 	$(AR) rs $@ $^
 
+../libcarla_standalone.dll: $(OBJS) $(LIBS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -lcomdlg32 -limm32 -lole32 -lshell32 -luuid -lwinspool -lws2_32 -Wl,--output-def,$@.def -o $@ && $(STRIP) $@
+
 # --------------------------------------------------------------
 
 ../libcarla_%.a:
diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp
index 5a19164e1..9b20899b7 100644
--- a/source/discovery/carla-discovery.cpp
+++ b/source/discovery/carla-discovery.cpp
@@ -1341,7 +1341,7 @@ void do_fluidsynth_check(const char* const filename, const bool init)
         delete_fluid_settings(f_settings);
     }
 
-#if CARLA_OS_WIN
+#ifdef CARLA_OS_WIN
     int sep = '\\';
 #else
     int sep = '/';