diff --git a/distrho/src/DistrhoPluginChecks.h b/distrho/src/DistrhoPluginChecks.h
index 7bc5dd67..d8a3b0f8 100644
--- a/distrho/src/DistrhoPluginChecks.h
+++ b/distrho/src/DistrhoPluginChecks.h
@@ -142,11 +142,12 @@
 // -----------------------------------------------------------------------
 // Enable full state if plugin exports presets
 
-#if DISTRHO_PLUGIN_WANT_PROGRAMS && DISTRHO_PLUGIN_WANT_STATE && ! DISTRHO_PLUGIN_WANT_FULL_STATE
-# warning Plugins with programs and state need to implement full state API
-# undef DISTRHO_PLUGIN_WANT_FULL_STATE
-# define DISTRHO_PLUGIN_WANT_FULL_STATE 1
-#endif
+// FIXME
+// #if DISTRHO_PLUGIN_WANT_PROGRAMS && DISTRHO_PLUGIN_WANT_STATE && ! DISTRHO_PLUGIN_WANT_FULL_STATE
+// # warning Plugins with programs and state need to implement full state API
+// # undef DISTRHO_PLUGIN_WANT_FULL_STATE
+// # define DISTRHO_PLUGIN_WANT_FULL_STATE 1
+// #endif
 
 // -----------------------------------------------------------------------
 // Disable UI if DGL or External UI is not available
diff --git a/examples/CairoUI/Makefile b/examples/CairoUI/Makefile
index 828029e3..13c684b6 100644
--- a/examples/CairoUI/Makefile
+++ b/examples/CairoUI/Makefile
@@ -29,28 +29,23 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_CAIRO),true)
+
+ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
-endif
+endif # HAVE_JACK
 
 ifneq ($(MACOS_OR_WINDOWS),true)
-ifeq ($(HAVE_CAIRO),true)
 ifeq ($(HAVE_LIBLO),true)
 TARGETS += dssi
-endif
-endif
-endif
+endif # HAVE_LIBLO
+endif # MACOS_OR_WINDOWS
 
-ifeq ($(HAVE_CAIRO),true)
 TARGETS += lv2_sep
-else
-TARGETS += lv2_dsp
-endif
-
 TARGETS += vst
 
+endif # HAVE_CAIRO
+
 all: $(TARGETS)
 
 # --------------------------------------------------------------
diff --git a/examples/ImguiSimpleGain/Makefile b/examples/ImguiSimpleGain/Makefile
index 0e07c251..f398a122 100644
--- a/examples/ImguiSimpleGain/Makefile
+++ b/examples/ImguiSimpleGain/Makefile
@@ -32,20 +32,23 @@ LINK_FLAGS += $(shell $(PKG_CONFIG) glew --libs)
 # --------------------------------------------------------------
 # Enable all selected plugin types
 
-ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_OPENGL),true)
+
+ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
-endif
+endif # HAVE_JACK
 
-ifeq ($(HAVE_OPENGL),true)
-TARGETS += lv2_sep
-else
-TARGETS += lv2_dsp
-endif
+ifneq ($(MACOS_OR_WINDOWS),true)
+ifeq ($(HAVE_LIBLO),true)
+TARGETS += dssi
+endif # HAVE_LIBLO
+endif # MACOS_OR_WINDOWS
 
+TARGETS += lv2_sep
 TARGETS += vst
 
+endif # HAVE_OPENGL
+
 all: $(TARGETS)
 
 # --------------------------------------------------------------
diff --git a/examples/Info/Makefile b/examples/Info/Makefile
index 4fe4fa54..2ffdae11 100644
--- a/examples/Info/Makefile
+++ b/examples/Info/Makefile
@@ -29,8 +29,8 @@ include ../../Makefile.plugins.mk
 ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += jack
-endif
-endif
+endif # HAVE_OPENGL
+endif # HAVE_JACK
 
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += lv2_sep
diff --git a/examples/Latency/Makefile b/examples/Latency/Makefile
index c0520530..4b0067b9 100644
--- a/examples/Latency/Makefile
+++ b/examples/Latency/Makefile
@@ -23,11 +23,7 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifneq ($(MACOS_OR_WINDOWS),true)
 TARGETS += ladspa
-TARGETS += dssi
-endif
-
 TARGETS += lv2_dsp
 TARGETS += vst
 
diff --git a/examples/Meters/Makefile b/examples/Meters/Makefile
index 9ac485a5..1fdbfa24 100644
--- a/examples/Meters/Makefile
+++ b/examples/Meters/Makefile
@@ -26,28 +26,23 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_OPENGL),true)
+
+ifeq ($(HAVE_JACK),true)
 TARGETS += jack
-endif
-endif
+endif # HAVE_JACK
 
 ifneq ($(MACOS_OR_WINDOWS),true)
 ifeq ($(HAVE_LIBLO),true)
-ifeq ($(HAVE_OPENGL),true)
 TARGETS += dssi
-endif
-endif
-endif
+endif # HAVE_LIBLO
+endif # MACOS_OR_WINDOWS
 
-ifeq ($(HAVE_OPENGL),true)
 TARGETS += lv2_sep
-else
-TARGETS += lv2_dsp
-endif
-
 TARGETS += vst
 
+endif # HAVE_OPENGL
+
 all: $(TARGETS)
 
 # --------------------------------------------------------------
diff --git a/examples/MidiThrough/Makefile b/examples/MidiThrough/Makefile
index 79c50beb..084fb2c7 100644
--- a/examples/MidiThrough/Makefile
+++ b/examples/MidiThrough/Makefile
@@ -23,10 +23,9 @@ include ../../Makefile.plugins.mk
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(LINUX),true)
+ifeq ($(HAVE_JACK),true)
 TARGETS += jack
 endif
-
 TARGETS += lv2_dsp
 TARGETS += vst
 
diff --git a/examples/Parameters/Makefile b/examples/Parameters/Makefile
index c8c7cafc..2d899211 100644
--- a/examples/Parameters/Makefile
+++ b/examples/Parameters/Makefile
@@ -29,17 +29,17 @@ include ../../Makefile.plugins.mk
 ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += jack
-endif
-endif
+endif # HAVE_OPENGL
+endif # HAVE_JACK
 
 ifneq ($(MACOS_OR_WINDOWS),true)
+TARGETS += ladspa
 ifeq ($(HAVE_LIBLO),true)
 ifeq ($(HAVE_OPENGL),true)
-TARGETS += ladspa
 TARGETS += dssi
-endif
-endif
-endif
+endif # HAVE_OPENGL
+endif # HAVE_LIBLO
+endif # MACOS_OR_WINDOWS
 
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += lv2_sep
diff --git a/examples/States/DistrhoPluginInfo.h b/examples/States/DistrhoPluginInfo.h
index 2b888245..52e13568 100644
--- a/examples/States/DistrhoPluginInfo.h
+++ b/examples/States/DistrhoPluginInfo.h
@@ -27,7 +27,6 @@
 #define DISTRHO_PLUGIN_NUM_OUTPUTS     2
 #define DISTRHO_PLUGIN_WANT_PROGRAMS   1
 #define DISTRHO_PLUGIN_WANT_STATE      1
-#define DISTRHO_PLUGIN_WANT_FULL_STATE 1
 #define DISTRHO_UI_USER_RESIZABLE      1
 
 #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED
diff --git a/examples/States/ExamplePluginStates.cpp b/examples/States/ExamplePluginStates.cpp
index 66cba49d..8d1c6c94 100644
--- a/examples/States/ExamplePluginStates.cpp
+++ b/examples/States/ExamplePluginStates.cpp
@@ -208,6 +208,7 @@ The plugin will be treated as an effect, but it will not change the host audio."
         }
     }
 
+#if DISTRHO_PLUGIN_WANT_FULL_STATE /* FIXME */
    /**
       Get the value of an internal state.
       The host may call this function from any non-realtime context.
@@ -239,6 +240,7 @@ The plugin will be treated as an effect, but it will not change the host audio."
 
         return sFalse;
     }
+#endif
 
    /**
       Change an internal state.
@@ -296,7 +298,6 @@ private:
     */
     bool fParamGrid[9];
 
-
    /**
       Set our plugin class as non-copyable and add a leak detector just in case.
     */
diff --git a/examples/States/Makefile b/examples/States/Makefile
index a9117e84..25489a34 100644
--- a/examples/States/Makefile
+++ b/examples/States/Makefile
@@ -29,8 +29,12 @@ include ../../Makefile.plugins.mk
 ifeq ($(HAVE_JACK),true)
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += jack
-endif
-endif
+endif # HAVE_OPENGL
+endif # HAVE_JACK
+
+ifneq ($(MACOS_OR_WINDOWS),true)
+TARGETS += dssi
+endif # MACOS_OR_WINDOWS
 
 ifeq ($(HAVE_OPENGL),true)
 TARGETS += lv2_sep