diff --git a/source/Makefile.mk b/source/Makefile.mk
index a100e3197..3f45dd365 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -176,14 +176,15 @@ BASE_FLAGS += -DHAVE_OPENGL
 BASE_FLAGS += -DDGL_OPENGL
 BASE_FLAGS += -DDONT_SET_USING_DGL_NAMESPACE
 ifneq ($(USING_CUSTOM_DPF),true)
-BASE_FLAGS += -DDGL_NAMESPACE=CarlaDGL
 BASE_FLAGS += -DDGL_FILE_BROWSER_DISABLED
 BASE_FLAGS += -DDGL_NO_SHARED_RESOURCES
 else
 BASE_FLAGS += -DDISTRHO_UI_FILE_BROWSER=0
+endif
 ifneq ($(DGL_NAMESPACE),)
 BASE_FLAGS += -DDGL_NAMESPACE=$(DGL_NAMESPACE)
-endif
+else
+BASE_FLAGS += -DDGL_NAMESPACE=CarlaDGL
 endif
 endif
 
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index 3b816ec78..977a6aba5 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -77,9 +77,7 @@ LIBS += $(MODULEDIR)/sfzero.a
 LIBS += $(MODULEDIR)/zita-resampler.a
 
 ifeq ($(HAVE_DGL),true)
-ifeq ($(STATIC_PLUGIN_TARGET)$(USING_CUSTOM_DPF),truetrue)
-# nothing
-else ifeq ($(USING_CUSTOM_DPF),true)
+ifeq ($(USING_CUSTOM_DPF),true)
 LIBS += $(CUSTOM_DPF_PATH)/build/libdgl-opengl.a
 else
 LIBS += $(MODULEDIR)/dgl.a