diff --git a/Makefile b/Makefile
index d12c8d0..2df9472 100644
--- a/Makefile
+++ b/Makefile
@@ -261,7 +261,7 @@ clean:
 	$(MAKE) clean -C dpf/utils/lv2-ttl-generator
 	$(MAKE) clean -C plugins
 	$(MAKE) clean -C src
-	rm -rf bin build
+	rm -rf bin build build-headless
 
 # --------------------------------------------------------------
 # Install step
diff --git a/carla b/carla
index 515af8a..4c29367 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 515af8ac30ac64deed8ae2fb89038266f0845da9
+Subproject commit 4c29367b6e6f82e75746b9ee3a01f9d205c0beae
diff --git a/plugins/Makefile b/plugins/Makefile
index bc3c7f4..e772a92 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -1041,7 +1041,9 @@ SURGEXT_FLAGS  = $(filter-out -fsingle-precision-constant,$(filter-out -std=gnu+
 SURGEXT_FLAGS += $(NOFINITE_FLAGS)
 SURGEXT_FLAGS += -std=gnu++17
 SURGEXT_FLAGS += -DTIXML_USE_STL=1
-SURGEXT_FLAGS += -Isurgext/surge/src/common \
+SURGEXT_FLAGS += \
+	-Isurgext/libs/sst/sst-basic-blocks/include \
+	-Isurgext/surge/src/common \
 	-Isurgext/surge/src/common/dsp \
 	-Isurgext/surge/src/common/dsp/filters \
 	-Isurgext/surge/src/common/dsp/vembertech \