diff --git a/Makefile b/Makefile
index c1d9af530..058bc07dc 100644
--- a/Makefile
+++ b/Makefile
@@ -423,6 +423,7 @@ install:
 	install -d $(DESTDIR)$(LIBDIR)/python3/dist-packages
 	install -d $(DESTDIR)$(DATADIR)
 	install -d $(DESTDIR)$(DATADIR)/carla
+	install -d $(DESTDIR)$(DATADIR)/carla/resources
 	install -d $(DESTDIR)$(INCLUDEDIR)
 	install -d $(DESTDIR)$(INCLUDEDIR)/carla
 	install -d $(DESTDIR)$(INCLUDEDIR)/carla/includes
@@ -432,7 +433,6 @@ ifeq ($(HAVE_PYQT),true)
 	# Create directories (gui)
 	install -d $(DESTDIR)$(LIBDIR)/carla/styles
 	install -d $(DESTDIR)$(DATADIR)/applications
-	install -d $(DESTDIR)$(DATADIR)/carla/resources
 	install -d $(DESTDIR)$(DATADIR)/icons
 	install -d $(DESTDIR)$(DATADIR)/icons/hicolor
 	install -d $(DESTDIR)$(DATADIR)/icons/hicolor/16x16
@@ -730,9 +730,11 @@ endif
 	rm -rf $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/resources
 	$(LINK) $(DATADIR)/carla/resources $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/resources
 
+ifeq ($(HAVE_PYQT),true)
 	# Link styles for lv2 plugin
 	rm -rf $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/styles
 	$(LINK) $(LIBDIR)/carla/styles $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/styles
+endif
 
 	# --------------------------------------------------------------------------------------------------------------------
 
@@ -767,6 +769,7 @@ endif
 ifneq ($(HAVE_PYQT),true)
 	# Remove gui files for non-gui build
 	rm $(DESTDIR)$(LIBDIR)/carla/carla-bridge-lv2-modgui
+	rm $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/carla-bridge-lv2-modgui
 endif
 
 # ----------------------------------------------------------------------------------------------------------------------------
diff --git a/data/carla-single b/data/carla-single
index cc9c6a33c..4dba198b6 100755
--- a/data/carla-single
+++ b/data/carla-single
@@ -171,6 +171,10 @@ if not os.path.exists(CARLA_LIBDIR):
     print("Carla library folder does not exist, is Carla installed?")
     sys.exit(2)
 
+if not os.path.exists(CARLA_RESDIR):
+    print("Carla resource folder does not exist, is Carla installed?")
+    sys.exit(2)
+
 # --------------------------------------------------------------------------------------------------------
 # Check for existing arch binary
 
diff --git a/source/Makefile.mk b/source/Makefile.mk
index cc0fafc21..5db2b766e 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -287,6 +287,10 @@ endif
 # --------------------------------------------------------------
 # Set base defines
 
+ifeq ($(HAVE_PYQT),true)
+BASE_FLAGS += -DHAVE_PYQT
+endif
+
 ifeq ($(HAVE_DGL),true)
 BASE_FLAGS += -DHAVE_DGL
 endif
diff --git a/source/native-plugins/_all.c b/source/native-plugins/_all.c
index 8bb5c8ebf..ae9329cc2 100644
--- a/source/native-plugins/_all.c
+++ b/source/native-plugins/_all.c
@@ -20,6 +20,7 @@
 
 #ifdef CARLA_OS_WIN
 # define DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+# undef HAVE_PYQT
 #endif
 
 // -----------------------------------------------------------------------
@@ -88,12 +89,12 @@ void carla_register_all_native_plugins(void)
 
     // MIDI file and sequencer
     carla_register_native_plugin_midifile();
-#ifndef DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+#ifdef HAVE_PYQT
     carla_register_native_plugin_midipattern();
 #endif
 
     // Carla
-#ifndef DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+#ifdef HAVE_PYQT
     carla_register_native_plugin_carla();
 #endif
 
@@ -113,7 +114,7 @@ void carla_register_all_native_plugins(void)
     carla_register_native_plugin_distrho_vectorjuice();
     carla_register_native_plugin_distrho_wobblejuice();
 
-#ifndef DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+#ifdef HAVE_PYQT
     // External-UI plugins
     carla_register_native_plugin_bigmeter();
     carla_register_native_plugin_notes();
diff --git a/source/native-plugins/_data.cpp b/source/native-plugins/_data.cpp
index 64a65be50..df279df67 100644
--- a/source/native-plugins/_data.cpp
+++ b/source/native-plugins/_data.cpp
@@ -20,7 +20,8 @@
 #include "CarlaUtils.hpp"
 
 #ifdef CARLA_OS_WIN
-#define DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+# define DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+# undef HAVE_PYQT
 #endif
 
 #undef DESCFUNCS
@@ -209,7 +210,7 @@ static const NativePluginDescriptor sNativePluginDescriptors[] = {
     /* copyright */ "GNU GPL v2+",
     DESCFUNCS
 },
-#ifndef DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+#ifdef HAVE_PYQT
 {
     /* category  */ NATIVE_PLUGIN_CATEGORY_UTILITY,
     /* hints     */ static_cast<NativePluginHints>(NATIVE_PLUGIN_IS_RTSAFE
@@ -234,7 +235,7 @@ static const NativePluginDescriptor sNativePluginDescriptors[] = {
 // -----------------------------------------------------------------------
 // Carla
 
-#ifndef DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+#ifdef HAVE_PYQT
 {
     /* category  */ NATIVE_PLUGIN_CATEGORY_OTHER,
     /* hints     */ static_cast<NativePluginHints>(NATIVE_PLUGIN_IS_SYNTH
@@ -546,7 +547,7 @@ static const NativePluginDescriptor sNativePluginDescriptors[] = {
 // -----------------------------------------------------------------------
 // External-UI plugins
 
-#ifndef DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+#ifdef HAVE_PYQT
 {
     /* category  */ NATIVE_PLUGIN_CATEGORY_UTILITY,
     /* hints     */ static_cast<NativePluginHints>(NATIVE_PLUGIN_IS_RTSAFE