diff --git a/Makefile b/Makefile
index 787c583..efcba97 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ endif
 
 dgl:
 ifneq ($(HEADLESS),true)
-	$(MAKE) -C dpf/dgl opengl USE_NANOVG_FBO=true
+	$(MAKE) -C dpf/dgl opengl NVG_DISABLE_SKIPPING_WHITESPACE=true USE_NANOVG_FBO=true
 endif
 
 plugins: deps
diff --git a/dpf b/dpf
index ef69eba..86b8a10 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit ef69eba593298b90eb433493470a1ba4c0f1c0bf
+Subproject commit 86b8a102bb0ec78fbd072a01ceebe904d29283e7
diff --git a/src/CardinalModuleWidget.cpp b/src/CardinalModuleWidget.cpp
index b5dccba..c5cb043 100644
--- a/src/CardinalModuleWidget.cpp
+++ b/src/CardinalModuleWidget.cpp
@@ -39,7 +39,6 @@
 #include <ui/MenuSeparator.hpp>
 #include <asset.hpp>
 #include <context.hpp>
-#include <helpers.hpp>
 #include <system.hpp>
 
 namespace rack {
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 055cab7..7765bf1 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -239,7 +239,7 @@ BUILD_CXX_FLAGS += -DCARDINAL_PLUGIN_PREFIX='"$(PREFIX)"'
 
 ifeq ($(NAME),CardinalFX)
 
-all: jack vst2 lv2 shared resources
+all: jack vst2 lv2 resources
 
 CORE_RESOURCES = $(filter-out icon.png,$(subst ../Rack/res/,,$(wildcard ../Rack/res/*))) template.vcv
 
@@ -256,7 +256,7 @@ else # CardinalFX
 ifeq ($(NAME),Cardinal)
 all: jack lv2 vst3 resources
 else
-all: jack lv2 vst2 vst3 shared resources
+all: jack lv2 vst2 vst3 resources
 endif
 
 PLUGIN_RESOURCES += $(TARGET_DIR)/$(NAME).lv2/resources