diff --git a/plugins/Makefile b/plugins/Makefile
index 3218267..360f006 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -792,6 +792,17 @@ $(BUILD_DIR)/Befaco/%.cpp.o: Befaco/%.cpp
 		-DpluginInstance=pluginInstance__Befaco
 
 $(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(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 \
+		-IBidoo/src/dep/gverb/include \
+		-Wno-sign-compare
+
+# FIXME -DPRIVATE= shouldn't be here
+$(BUILD_DIR)/Bidoo/src/dep/%.cpp.o: Bidoo/src/dep/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
@@ -864,6 +875,7 @@ $(BUILD_DIR)/GrandeModular/%.cpp.o: GrandeModular/%.cpp
 		-Wno-missing-braces \
 		-Wno-self-assign
 
+# FIXME -DsetNextCableColor=isComplete shouldn't be here
 $(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
diff --git a/src/Makefile b/src/Makefile
index 229c398..97104f6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -178,7 +178,7 @@ $(BUILD_DIR)/%.cpp.o: %.cpp
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(BUILD_DIR)/Core/%.cpp.o: Core/%.cpp
+$(BUILD_DIR)/Rack/src/core/%.cpp.o: Rack/src/core/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
 	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -UPRIVATE -c -o $@