diff --git a/source/Makefile.mk b/source/Makefile.mk
index f532003ad..afd5a4fb4 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -242,7 +242,7 @@ RTMIDI_FLAGS  += -D__RTMIDI_DEBUG__
 endif
 
 ifeq ($(LINUX),true)
-ifeq ($(HAVE_OPENGL),true)
+ifeq ($(HAVE_DGL),true)
 DGL_FLAGS                = $(shell pkg-config --cflags gl x11)
 DGL_LIBS                 = $(shell pkg-config --libs gl x11)
 endif
diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp
index 08039b68a..a0b359679 100644
--- a/source/backend/plugin/NativePlugin.cpp
+++ b/source/backend/plugin/NativePlugin.cpp
@@ -2215,6 +2215,8 @@ public:
 
             CARLA_SAFE_ASSERT_BREAK(fDescriptor != nullptr);
 
+            carla_debug("Check vs \"%s\"", fDescriptor->label);
+
             if (fDescriptor->label != nullptr && std::strcmp(fDescriptor->label, label) == 0)
                 break;
 
diff --git a/source/backend/standalone/Makefile b/source/backend/standalone/Makefile
index 13d3449b5..27a8892f8 100644
--- a/source/backend/standalone/Makefile
+++ b/source/backend/standalone/Makefile
@@ -41,7 +41,7 @@ LINK_FLAGS  += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS  += $(JUCE_GUI_BASICS_LIBS)
 endif
 
-ifeq ($(HAVE_OPENGL),true)
+ifeq ($(HAVE_DGL),true)
 STATIC_LIBS += ../../modules/dgl.a
 LINK_FLAGS  += $(DGL_LIBS)
 endif
diff --git a/source/modules/daz-plugins/Makefile b/source/modules/daz-plugins/Makefile
index 71be0a478..02a81e28b 100644
--- a/source/modules/daz-plugins/Makefile
+++ b/source/modules/daz-plugins/Makefile
@@ -107,7 +107,7 @@ endif
 
 # --------------------------------------------------------------
 
-ifeq ($(HAVE_OPENGL),true)
+ifeq ($(HAVE_DGL),true)
 OBJS += \
 	distrho-3bandeq.cpp.o \
 	distrho-3bandsplitter.cpp.o \
@@ -234,28 +234,28 @@ audio-file.cpp.o: audio-file.cpp audio-base.hpp $(CXXDEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
 distrho-3bandeq.cpp.o: distrho-3bandeq.cpp 3bandeq/*.cpp 3bandeq/*.h 3bandeq/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -I3bandeq -DDISTRHO_NAMESPACE=DISTRHO_3BandEQ -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -I3bandeq -DDISTRHO_NAMESPACE=DISTRHO_3BandEQ -c -o $@
 
 distrho-3bandsplitter.cpp.o: distrho-3bandsplitter.cpp 3bandsplitter/*.cpp 3bandsplitter/*.h 3bandsplitter/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -I3bandsplitter -DDISTRHO_NAMESPACE=DISTRHO_3BandSplitter -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -I3bandsplitter -DDISTRHO_NAMESPACE=DISTRHO_3BandSplitter -c -o $@
 
 distrho-nekobi.cpp.o: distrho-nekobi.cpp nekobi/*.cpp nekobi/*.h nekobi/*.hpp nekobi/nekobee-src/*.c nekobi/nekobee-src/*.h distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -Inekobi -DDISTRHO_NAMESPACE=DISTRHO_Nekobi -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Inekobi -DDISTRHO_NAMESPACE=DISTRHO_Nekobi -c -o $@
 
 distrho-pingpongpan.cpp.o: distrho-pingpongpan.cpp pingpongpan/*.cpp pingpongpan/*.h pingpongpan/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -Ipingpongpan -DDISTRHO_NAMESPACE=DISTRHO_PingPongPan -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Ipingpongpan -DDISTRHO_NAMESPACE=DISTRHO_PingPongPan -c -o $@
 
 distrho-stereoenhancer.cpp.o: distrho-stereoenhancer.cpp stereoenhancer/*.cpp stereoenhancer/*.h stereoenhancer/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -Istereoenhancer -DDISTRHO_NAMESPACE=DISTRHO_StereoEnhancer -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Istereoenhancer -DDISTRHO_NAMESPACE=DISTRHO_StereoEnhancer -c -o $@
 
 distrho-bigmeter.cpp.o: distrho-bigmeter.cpp bigmeter/*.cpp bigmeter/*.h bigmeter/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -Ibigmeter -DDISTRHO_NAMESPACE=DISTRHO_BigMeter -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Ibigmeter -DDISTRHO_NAMESPACE=DISTRHO_BigMeter -c -o $@
 
 distrho-bigmeterM.cpp.o: distrho-bigmeterM.cpp bigmeterM/*.cpp bigmeterM/*.h bigmeterM/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -IbigmeterM -DDISTRHO_NAMESPACE=DISTRHO_BigMeterM -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -IbigmeterM -DDISTRHO_NAMESPACE=DISTRHO_BigMeterM -c -o $@
 
 distrho-notes.cpp.o: distrho-notes.cpp notes/*.cpp notes/*.h notes/*.hpp distrho/DistrhoPluginCarla.cpp $(CXXDEPS)
-	$(CXX) $< $(BUILD_CXX_FLAGS) -Inotes -DDISTRHO_NAMESPACE=DISTRHO_Notes -c -o $@
+	$(CXX) $< $(BUILD_CXX_FLAGS) -I../dgl -Inotes -DDISTRHO_NAMESPACE=DISTRHO_Notes -c -o $@
 
 midi-file.cpp.o: midi-file.cpp midi-base.hpp $(CXXDEPS)
 	$(CXX) $< $(MF_CXX_FLAGS) -c -o $@
diff --git a/source/modules/daz-plugins/_all.c b/source/modules/daz-plugins/_all.c
index 52048cb89..578c40d93 100644
--- a/source/modules/daz-plugins/_all.c
+++ b/source/modules/daz-plugins/_all.c
@@ -107,7 +107,7 @@ void carla_register_all_plugins()
     carla_register_native_plugin_midifile();
 #endif
 
-#ifdef HAVE_OPENGL
+#ifdef HAVE_DGL
     // DISTRHO plugins (OpenGL)
     carla_register_native_plugin_3BandEQ();
     carla_register_native_plugin_3BandSplitter();
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index f39cf809b..5dce1f3ea 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -62,7 +62,7 @@ LINK_FLAGS += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS += $(JUCE_GUI_BASICS_LIBS)
 endif
 
-ifeq ($(HAVE_OPENGL),true)
+ifeq ($(HAVE_DGL),true)
 LINK_FLAGS += $(DGL_LIBS)
 endif
 
@@ -111,7 +111,7 @@ LIBS += ../modules/juce_graphics.a
 LIBS += ../modules/juce_gui_basics.a
 endif
 
-ifeq ($(HAVE_OPENGL),true)
+ifeq ($(HAVE_DGL),true)
 LIBS += ../modules/dgl.a
 endif