diff --git a/include/common.hpp b/include/common.hpp
index eeeab00..3d2d9d3 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -17,6 +17,10 @@
 
 #pragma once
 
+#ifdef PRIVATE
+# define PRIVATE_WAS_DEFINED
+#endif
+
 #include_next "common.hpp"
 
 // Make binary resources work the same no matter the OS
@@ -29,3 +33,9 @@
 #define BINARY_START(sym) ((const void*) sym)
 #define BINARY_END(sym) ((const void*) sym + sym##_len)
 #define BINARY_SIZE(sym) (sym##_len)
+
+#if defined(PRIVATE) && !defined(PRIVATE_WAS_DEFINED)
+# undef PRIVATE
+#endif
+
+#undef PRIVATE_WAS_DEFINED
diff --git a/include/helpers.hpp b/include/helpers.hpp
index ead08fa..2a30f1a 100644
--- a/include/helpers.hpp
+++ b/include/helpers.hpp
@@ -68,6 +68,7 @@ struct CardinalPluginModel : CardinalPluginModelHelper
             tm = dynamic_cast<TModule*>(m);
         }
         app::ModuleWidget* const tmw = new TModuleWidget(tm);
+        DISTRHO_SAFE_ASSERT_RETURN(tmw->module == m, nullptr);
         tmw->setModel(this);
         return tmw;
     }
@@ -81,6 +82,7 @@ struct CardinalPluginModel : CardinalPluginModelHelper
         DISTRHO_SAFE_ASSERT_RETURN(tm != nullptr, nullptr);
 
         TModuleWidget* const tmw = new TModuleWidget(tm);
+        DISTRHO_SAFE_ASSERT_RETURN(tmw->module == m, nullptr);
         tmw->setModel(this);
 
         widgets[m] = tmw;
diff --git a/plugins/Makefile b/plugins/Makefile
index db04b76..3218267 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -4,6 +4,10 @@
 # Created by falkTX
 #
 
+# FIXME items for v2:
+# Bidoo includes <system.hpp>, PRIVATE workaround
+# ImpromptuModular setNextCableColor
+
 # --------------------------------------------------------------
 # Build config
 
@@ -794,6 +798,7 @@ $(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp
 		$(foreach m,$(BIDOO_CUSTOM),$(call custom_module_names,$(m),Bidoo)) \
 		$(foreach m,$(BIDOO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),Bidoo_$(shell basename $*))) \
 		-DpluginInstance=pluginInstance__Bidoo \
+		-DPRIVATE= \
 		-IBidoo/src/dep/gverb/include \
 		-Wno-sign-compare
 
@@ -866,6 +871,7 @@ $(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp
 		$(foreach m,$(IMPROMPTUMODULAR_CUSTOM),$(call custom_module_names,$(m),ImpromptuModular)) \
 		$(foreach m,$(IMPROMPTUMODULAR_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),ImpromptuModular_$(shell basename $*))) \
 		-DpluginInstance=pluginInstance__ImpromptuModular \
+		-DsetNextCableColor=isComplete \
 		-Dinit=init__ImpromptuModular
 
 $(BUILD_DIR)/ImpromptuModular/src/Foundr%.cpp.o: ImpromptuModular/src/Foundr%.cpp
diff --git a/src/Makefile b/src/Makefile
index 48d551d..229c398 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,6 +30,8 @@ else
 BASE_FLAGS += -DARCH_LIN
 endif
 
+BASE_FLAGS += -DPRIVATE=
+
 BASE_FLAGS += -I../dpf/dgl/src/nanovg
 BASE_FLAGS += -I../dpf/distrho
 BASE_FLAGS += -I../include
@@ -125,12 +127,15 @@ RACK_FILES += $(filter-out $(IGNORED_FILES), $(wildcard Rack/src/*/*.cpp))
 # --------------------------------------------------------------
 # lots of warnings from VCV side
 
-BASE_FLAGS += -Wno-unknown-warning-option
 BASE_FLAGS += -Wno-unused-but-set-variable
 BASE_FLAGS += -Wno-unused-parameter
 BASE_FLAGS += -Wno-unused-result
 BASE_FLAGS += -Wno-unused-variable
 
+ifeq ($(MACOS),true)
+BASE_FLAGS += -Wno-unknown-warning-option
+endif
+
 # --------------------------------------------------------------
 # Build targets
 
@@ -173,6 +178,11 @@ $(BUILD_DIR)/%.cpp.o: %.cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
+$(BUILD_DIR)/Core/%.cpp.o: Core/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -UPRIVATE -c -o $@
+
 # --------------------------------------------------------------
 
 -include $(RACK_OBJS:%.o=%.d)
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 624a49d..b843313 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -127,6 +127,8 @@ else
 BASE_FLAGS += -DARCH_LIN
 endif
 
+BASE_FLAGS += -DPRIVATE=
+
 BASE_FLAGS += -I..
 BASE_FLAGS += -I../../dpf/dgl/src/nanovg
 BASE_FLAGS += -I../../include