diff --git a/deps/Makefile b/deps/Makefile
index 3c553ee..ef94d8e 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -32,11 +32,6 @@ BASE_FLAGS += -I../include/mingw-compat
 BASE_FLAGS += -I../include/mingw-std-threads
 endif
 
-ifeq ($(WITH_LTO),true)
-BASE_FLAGS += -fno-strict-aliasing -flto
-LINK_FLAGS += -fno-strict-aliasing -flto -Werror=odr -Werror=lto-type-mismatch
-endif
-
 BUILD_C_FLAGS += -fno-finite-math-only
 BUILD_CXX_FLAGS += -fno-finite-math-only
 
diff --git a/dpf b/dpf
index 56c33dd..2208680 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 56c33dd1cdd66b315b9783f1f9a4e0f83d580579
+Subproject commit 2208680d20cca0360d38043d65f050a51d2c5a02
diff --git a/plugins/Makefile b/plugins/Makefile
index 5636e19..ae6e575 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -678,10 +678,6 @@ ifeq ($(NOPLUGINS),true)
 BASE_FLAGS += -DNOPLUGINS
 endif
 
-ifeq ($(WITH_LTO),true)
-BASE_FLAGS += -fno-strict-aliasing -flto
-endif
-
 BUILD_C_FLAGS += -std=gnu11
 BUILD_C_FLAGS += -fno-finite-math-only
 BUILD_CXX_FLAGS += -fno-finite-math-only
@@ -811,6 +807,11 @@ $(BUILD_DIR)/Cardinal/%.cpp.o: Cardinal/%.cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
 		-DpluginInstance=pluginInstance__Cardinal \
+		-Dstbrp_context=stbrp_context_cardinal \
+		-Dstbrp_coord=stbrp_coord_cardinal \
+		-Dstbtt_fontinfo=stbtt_fontinfo_cardinal \
+		-Dstbrp_node=stbrp_node_cardinal \
+		-Dstbrp_rect=stbrp_rect_cardinal \
 		-DREAL_BUILD \
 		-DSTATIC_PLUGIN_TARGET \
 		-I../carla/source/backend \
diff --git a/src/Makefile b/src/Makefile
index 29949d9..8685636 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -76,10 +76,6 @@ BASE_FLAGS += -I../include/mingw-compat
 BASE_FLAGS += -I../include/mingw-std-threads
 endif
 
-ifeq ($(WITH_LTO),true)
-BASE_FLAGS += -fno-strict-aliasing -flto
-endif
-
 BUILD_C_FLAGS += -std=gnu11
 BUILD_C_FLAGS += -fno-finite-math-only
 BUILD_CXX_FLAGS += -fno-finite-math-only
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index aee4e04..f2b59b6 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -167,10 +167,6 @@ BASE_FLAGS += -I../../include/mingw-compat
 BASE_FLAGS += -I../../include/mingw-std-threads
 endif
 
-ifeq ($(WITH_LTO),true)
-BASE_FLAGS += -fno-strict-aliasing -flto
-endif
-
 BUILD_C_FLAGS += -std=gnu11
 BUILD_C_FLAGS += -fno-finite-math-only
 BUILD_CXX_FLAGS += -fno-finite-math-only
@@ -204,7 +200,6 @@ EXTRA_LIBS += $(shell pkg-config --libs jansson libarchive samplerate speexdsp)
 endif
 
 ifeq ($(WITH_LTO),true)
-LINK_FLAGS += -fno-strict-aliasing -flto -Werror=odr -Werror=lto-type-mismatch
 # false positive
 LINK_FLAGS += -Wno-alloc-size-larger-than
 ifneq ($(SYSDEPS),true)