diff --git a/Makefile b/Makefile
index 4c8a970..b619221 100644
--- a/Makefile
+++ b/Makefile
@@ -97,8 +97,7 @@ endif
 # --------------------------------------------------------------
 # Check for X11+OpenGL dependencies (unless headless build)
 
-ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
-ifneq ($(WASM),true)
+ifneq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS),true)
 ifneq ($(HEADLESS),true)
 
 ifneq ($(HAVE_OPENGL),true)
@@ -125,7 +124,6 @@ CARLA_EXTRA_ARGS += HAVE_XCURSOR=false
 CARLA_EXTRA_ARGS += HAVE_XEXT=false
 CARLA_EXTRA_ARGS += HAVE_XRANDR=false
 
-endif
 endif
 endif
 
diff --git a/carla b/carla
index 770364f..ca15445 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 770364fd8e684d08aa08f74d88c6d8cb41f77c21
+Subproject commit ca15445429d7ff872fd40db23e24840cc6b90436
diff --git a/dpf b/dpf
index 194f04a..717c759 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 194f04aee8396c98f320052626603d77a1b1931e
+Subproject commit 717c7596c29530998fc8522d000c9e856618a56b
diff --git a/plugins/Makefile b/plugins/Makefile
index 76f002f..61b4b49 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1004,6 +1004,12 @@ ifeq ($(NOPLUGINS),true)
 BASE_FLAGS += -DNOPLUGINS
 endif
 
+ifeq ($(USE_GLES2),true)
+BASE_FLAGS += -DNANOVG_GLES2_FORCED
+else ifeq ($(USE_GLES3),true)
+BASE_FLAGS += -DNANOVG_GLES3_FORCED
+endif
+
 ifeq ($(shell $(PKG_CONFIG) --exists sndfile && echo true),true)
 BASE_FLAGS += -DHAVE_SNDFILE
 endif
diff --git a/src/Makefile b/src/Makefile
index e24110d..6f2d182 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -95,6 +95,12 @@ BASE_FLAGS += -I../include/mingw-compat
 BASE_FLAGS += -I../include/mingw-std-threads
 endif
 
+ifeq ($(USE_GLES2),true)
+BASE_FLAGS += -DNANOVG_GLES2_FORCED
+else ifeq ($(USE_GLES3),true)
+BASE_FLAGS += -DNANOVG_GLES3_FORCED
+endif
+
 BUILD_C_FLAGS += -std=gnu11
 BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing
 BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index ec997a4..83a7b90 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -178,6 +178,12 @@ BASE_FLAGS += -I../../include/mingw-compat
 BASE_FLAGS += -I../../include/mingw-std-threads
 endif
 
+ifeq ($(USE_GLES2),true)
+BASE_FLAGS += -DNANOVG_GLES2_FORCED
+else ifeq ($(USE_GLES3),true)
+BASE_FLAGS += -DNANOVG_GLES3_FORCED
+endif
+
 BUILD_C_FLAGS += -std=gnu11
 BUILD_C_FLAGS += -fno-finite-math-only -fno-strict-aliasing
 BUILD_CXX_FLAGS += -fno-finite-math-only -fno-strict-aliasing