diff --git a/Makefile b/Makefile
index 8bcb1f25d..6e92e7170 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,10 @@ ALL_LIBS += $(MODULEDIR)/rtmempool.a
 3RD_LIBS += $(MODULEDIR)/zita-resampler.a
 
 ifeq ($(HAVE_DGL),true)
+ifneq ($(USING_CUSTOM_DPF),true)
 3RD_LIBS += $(MODULEDIR)/dgl.a
 endif
+endif
 
 ifeq ($(HAVE_HYLIA),true)
 3RD_LIBS += $(MODULEDIR)/hylia.a
diff --git a/source/Makefile.mk b/source/Makefile.mk
index cdec5e105..839beee05 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -179,11 +179,15 @@ endif
 ifeq ($(HAVE_DGL),true)
 BASE_FLAGS += -DHAVE_DGL
 BASE_FLAGS += -DHAVE_OPENGL
-BASE_FLAGS += -DDGL_NAMESPACE=CarlaDGL
 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
-BASE_FLAGS += -DDONT_SET_USING_DGL_NAMESPACE
+else
+BASE_FLAGS += -DDISTRHO_UI_FILE_BROWSER
+endif
 endif
 
 ifeq ($(HAVE_FLUIDSYNTH),true)
diff --git a/source/native-plugins/external b/source/native-plugins/external
index edebaabb1..45a2d5b0a 160000
--- a/source/native-plugins/external
+++ b/source/native-plugins/external
@@ -1 +1 @@
-Subproject commit edebaabb1228ffb775f9d9a8395a858ba365cdf8
+Subproject commit 45a2d5b0a268180b4304ce27f22abbd3f8d5073c