diff --git a/source/modules/juce_audio_devices/Makefile b/source/modules/juce_audio_devices/Makefile
index d4d41e751..4910fd058 100644
--- a/source/modules/juce_audio_devices/Makefile
+++ b/source/modules/juce_audio_devices/Makefile
@@ -13,6 +13,7 @@ include ../Makefile.mk
 BUILD_CXX_FLAGS += $(JUCE_AUDIO_DEVICES_FLAGS) -I..
 
 ifeq ($(WIN32),true)
+BUILD_CXX_FLAGS += -Wno-missing-field-initializers
 # BUILD_CXX_FLAGS += -I$(CWD)/includes/asio
 BUILD_CXX_FLAGS += -I$(CWD)/modules/rtaudio/include
 endif
diff --git a/source/native-plugins/Makefile b/source/native-plugins/Makefile
index 1b7b962fb..17d24d1d1 100644
--- a/source/native-plugins/Makefile
+++ b/source/native-plugins/Makefile
@@ -30,10 +30,13 @@ endif # EXPERIMENTAL_PLUGINS
 # Flags for ZynAddSubFX
 
 ifeq ($(HAVE_ZYN_DEPS),true)
-ZYN_CXX_FLAGS  = $(BUILD_CXX_FLAGS) -DHAVE_ASYNC -Izynaddsubfx -Izynaddsubfx/rtosc
+ZYN_CXX_FLAGS  = $(BUILD_CXX_FLAGS) -Izynaddsubfx -Izynaddsubfx/rtosc
 ZYN_CXX_FLAGS += $(shell pkg-config --cflags fftw3 mxml zlib)
 ZYN_LD_FLAGS   = $(shell pkg-config --libs liblo)
 ZYN_LD_FLAGS  += -ldl -lpthread
+ifneq ($(WIN32),true)
+ZYN_CXX_FLAGS += -DHAVE_ASYNC
+endif
 ifeq ($(HAVE_X11),true)
 ZYN_CXX_FLAGS += $(shell pkg-config --cflags x11)
 ZYN_LD_FLAGS  += $(shell pkg-config --libs x11)
diff --git a/source/native-plugins/zynaddsubfx-src.cpp b/source/native-plugins/zynaddsubfx-src.cpp
index b16225c23..eff15a8dd 100644
--- a/source/native-plugins/zynaddsubfx-src.cpp
+++ b/source/native-plugins/zynaddsubfx-src.cpp
@@ -21,6 +21,7 @@
 # include <cmath>
 # define errx(...) {}
 # define warnx(...) {}
+# define index strchr
 # define rindex strrchr
 #else
 # include <err.h>