diff --git a/.gitignore b/.gitignore
index 4f327d8..e078da1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 *.so
 *.zip
 
+.DS_Store
 .kdev_include_paths
 .kdev4/
 
diff --git a/plugins/Makefile b/plugins/Makefile
index 2fe8355..44d5b60 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -804,17 +804,6 @@ $(BUILD_DIR)/Bidoo/%.cpp.o: Bidoo/%.cpp
 		-Wno-sign-compare \
 		-Wno-unused-function
 
-$(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp
-	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
-	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
-		$(foreach m,$(BOGAUDIO_CUSTOM),$(call custom_module_names,$(m),Bogaudio)) \
-		$(foreach m,$(BOGAUDIO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),Bogaudio_$(shell basename $*))) \
-		-DpluginInstance=pluginInstance__BogaudioModules \
-		-DRACK_SIMD=1 \
-		-IBogaudioModules/lib \
-		-IBogaudioModules/src/dsp
-
 $(BUILD_DIR)/BogaudioModules/src/follower_base.cpp.o: BogaudioModules/src/follower_base.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
@@ -826,6 +815,17 @@ $(BUILD_DIR)/BogaudioModules/src/follower_base.cpp.o: BogaudioModules/src/follow
 		-IBogaudioModules/lib \
 		-IBogaudioModules/src/dsp
 
+$(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(BOGAUDIO_CUSTOM),$(call custom_module_names,$(m),Bogaudio)) \
+		$(foreach m,$(BOGAUDIO_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),Bogaudio_$(shell basename $*))) \
+		-DpluginInstance=pluginInstance__BogaudioModules \
+		-DRACK_SIMD=1 \
+		-IBogaudioModules/lib \
+		-IBogaudioModules/src/dsp
+
 $(BUILD_DIR)/cf/src/%.cpp.o: cf/src/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
@@ -866,17 +866,6 @@ $(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 $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
-		$(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
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
@@ -894,6 +883,17 @@ $(BUILD_DIR)/ImpromptuModular/src/comp/Components.cpp.o: ImpromptuModular/src/co
 		-DsaveDarkAsDefault=ImpromptuModularIgnore1 \
 		-DloadDarkAsDefault=ImpromptuModularIgonre2
 
+# FIXME -DsetNextCableColor=isComplete shouldn't be here
+$(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(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)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
@@ -906,13 +906,6 @@ $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
 		-Wno-unused-but-set-variable \
 		-Wno-unused-result
 
-$(BUILD_DIR)/MindMeldModular/%.cpp.o: MindMeldModular/%.cpp
-	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
-	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
-		$(foreach m,$(MINDMELD_CUSTOM),$(call custom_module_names,$(m),JW)) \
-		-DpluginInstance=pluginInstance__MindMeld
-
 $(BUILD_DIR)/MindMeldModular/MindMeldModular.cpp.o: MindMeldModular/src/MindMeldModular.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
@@ -921,6 +914,13 @@ $(BUILD_DIR)/MindMeldModular/MindMeldModular.cpp.o: MindMeldModular/src/MindMeld
 		-DpluginInstance=pluginInstance__MindMeld \
 		-Dinit=init__MindMeld
 
+$(BUILD_DIR)/MindMeldModular/%.cpp.o: MindMeldModular/%.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
+		$(foreach m,$(MINDMELD_CUSTOM),$(call custom_module_names,$(m),JW)) \
+		-DpluginInstance=pluginInstance__MindMeld
+
 $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp
 	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
 	@echo "Compiling $<"
diff --git a/src/Makefile b/src/Makefile
index 97104f6..29949d9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -173,16 +173,16 @@ $(BUILD_DIR)/%.c.o: %.c
 	@echo "Compiling $<"
 	$(SILENT)$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
-$(BUILD_DIR)/%.cpp.o: %.cpp
-	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
-	@echo "Compiling $<"
-	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
 $(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 $@
 
+$(BUILD_DIR)/%.cpp.o: %.cpp
+	-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
+	@echo "Compiling $<"
+	$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
+
 # --------------------------------------------------------------
 
 -include $(RACK_OBJS:%.o=%.d)