diff --git a/source/native-plugins/Makefile b/source/native-plugins/Makefile
index 67b5b7728..767697d37 100644
--- a/source/native-plugins/Makefile
+++ b/source/native-plugins/Makefile
@@ -25,9 +25,6 @@ TARGETS = \
 # ---------------------------------------------------------------------------------------------------------------------
 # Set objects
 
-# ---------------------------------------------------------------------------------------------------------------------
-# Simple plugins
-
 OBJS = \
 	$(OBJDIR)/bypass.c.o \
 	$(OBJDIR)/lfo.c.o \
@@ -100,6 +97,6 @@ $(OBJDIR)/%.cpp.o: %.cpp
 
 # ---------------------------------------------------------------------------------------------------------------------
 
--include $(OBJS:%.o=%.d)
+-include $(OBJS_all:%.o=%.d)
 
 # ---------------------------------------------------------------------------------------------------------------------
diff --git a/source/native-plugins/external/Makefile b/source/native-plugins/external/Makefile
index 6138a587a..73cb6a4db 100644
--- a/source/native-plugins/external/Makefile
+++ b/source/native-plugins/external/Makefile
@@ -95,66 +95,66 @@ zynaddsubfx/UI/%.h: zynaddsubfx/UI/%.fl
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-$(OBJDIR)/distrho-3bandeq.cpp.o: $(EXTERNAL_DIR)distrho-3bandeq.cpp
+$(OBJDIR)/distrho-3bandeq.cpp.o: external/distrho-3bandeq.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(DPF_FLAGS) -DDISTRHO_NAMESPACE=d3BandEQ -Idistrho-3bandeq -c -o $@
 
-$(OBJDIR)/distrho-3bandsplitter.cpp.o: distrho-3bandsplitter.cpp
+$(OBJDIR)/distrho-3bandsplitter.cpp.o: external/distrho-3bandsplitter.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(DPF_FLAGS) -DDISTRHO_NAMESPACE=d3BandSplitter -Idistrho-3bandsplitter -c -o $@
 
-$(OBJDIR)/distrho-kars.cpp.o: distrho-kars.cpp
+$(OBJDIR)/distrho-kars.cpp.o: external/distrho-kars.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(DPF_FLAGS) -DDISTRHO_NAMESPACE=dKars -Idistrho-kars -c -o $@
 
-$(OBJDIR)/distrho-nekobi.cpp.o: distrho-nekobi.cpp
+$(OBJDIR)/distrho-nekobi.cpp.o: external/distrho-nekobi.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(DPF_FLAGS) -DDISTRHO_NAMESPACE=dNekobi -Idistrho-nekobi -w -c -o $@
 
-$(OBJDIR)/distrho-pingpongpan.cpp.o: distrho-pingpongpan.cpp
+$(OBJDIR)/distrho-pingpongpan.cpp.o: external/distrho-pingpongpan.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(DPF_FLAGS) -DDISTRHO_NAMESPACE=dPingPongPan -Idistrho-pingpongpan -c -o $@
 
-$(OBJDIR)/distrho-prom.cpp.o: distrho-prom.cpp
+$(OBJDIR)/distrho-prom.cpp.o: external/distrho-prom.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(DPF_FLAGS) $(PROJECTM_FLAGS) -DDISTRHO_NAMESPACE=dProM -Idistrho-prom -c -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-$(OBJDIR)/distrho-vectorjuice.cpp.o: distrho-vectorjuice.cpp
+$(OBJDIR)/distrho-vectorjuice.cpp.o: external/distrho-vectorjuice.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(DPF_FLAGS) -DDISTRHO_NAMESPACE=dVectorJuice -Idistrho-vectorjuice -c -o $@
 
-$(OBJDIR)/distrho-wobblejuice.cpp.o: distrho-wobblejuice.cpp
+$(OBJDIR)/distrho-wobblejuice.cpp.o: external/distrho-wobblejuice.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(DPF_FLAGS) -DDISTRHO_NAMESPACE=dWobbleJuice -Idistrho-wobblejuice -c -o $@
 
 # ---------------------------------------------------------------------------------------------------------------------
 
-$(OBJDIR)/zynaddsubfx-fx.cpp.o: zynaddsubfx-fx.cpp
+$(OBJDIR)/zynaddsubfx-fx.cpp.o: external/zynaddsubfx-fx.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(ZYN_DSP_FLAGS) -c -o $@
 
-$(OBJDIR)/zynaddsubfx-synth.cpp.o: zynaddsubfx-synth.cpp
+$(OBJDIR)/zynaddsubfx-synth.cpp.o: external/zynaddsubfx-synth.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(ZYN_DSP_FLAGS) -Wno-unused-parameter -c -o $@
 
-$(OBJDIR)/zynaddsubfx-src.cpp.o: zynaddsubfx-src.cpp
+$(OBJDIR)/zynaddsubfx-src.cpp.o: external/zynaddsubfx-src.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(ZYN_DSP_FLAGS) -Wno-unused-parameter -Wno-unused-variable -c -o $@
 
-$(OBJDIR)/zynaddsubfx-ui.cpp.o: zynaddsubfx-ui.cpp $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
+$(OBJDIR)/zynaddsubfx-ui.cpp.o: external/zynaddsubfx-ui.cpp $(ZYN_UI_FILES_H) $(ZYN_UI_FILES_CPP)
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(ZYN_UI_FLAGS) -Wno-unused-parameter -Wno-unused-variable -c -o $@
diff --git a/source/native-plugins/distrho-3bandeq.cpp b/source/native-plugins/external/distrho-3bandeq.cpp
similarity index 100%
rename from source/native-plugins/distrho-3bandeq.cpp
rename to source/native-plugins/external/distrho-3bandeq.cpp
diff --git a/source/native-plugins/distrho-3bandsplitter.cpp b/source/native-plugins/external/distrho-3bandsplitter.cpp
similarity index 100%
rename from source/native-plugins/distrho-3bandsplitter.cpp
rename to source/native-plugins/external/distrho-3bandsplitter.cpp
diff --git a/source/native-plugins/distrho-kars.cpp b/source/native-plugins/external/distrho-kars.cpp
similarity index 100%
rename from source/native-plugins/distrho-kars.cpp
rename to source/native-plugins/external/distrho-kars.cpp
diff --git a/source/native-plugins/distrho-nekobi.cpp b/source/native-plugins/external/distrho-nekobi.cpp
similarity index 100%
rename from source/native-plugins/distrho-nekobi.cpp
rename to source/native-plugins/external/distrho-nekobi.cpp
diff --git a/source/native-plugins/distrho-pingpongpan.cpp b/source/native-plugins/external/distrho-pingpongpan.cpp
similarity index 100%
rename from source/native-plugins/distrho-pingpongpan.cpp
rename to source/native-plugins/external/distrho-pingpongpan.cpp
diff --git a/source/native-plugins/distrho-prom.cpp b/source/native-plugins/external/distrho-prom.cpp
similarity index 100%
rename from source/native-plugins/distrho-prom.cpp
rename to source/native-plugins/external/distrho-prom.cpp
diff --git a/source/native-plugins/distrho-vectorjuice.cpp b/source/native-plugins/external/distrho-vectorjuice.cpp
similarity index 100%
rename from source/native-plugins/distrho-vectorjuice.cpp
rename to source/native-plugins/external/distrho-vectorjuice.cpp
diff --git a/source/native-plugins/distrho-wobblejuice.cpp b/source/native-plugins/external/distrho-wobblejuice.cpp
similarity index 100%
rename from source/native-plugins/distrho-wobblejuice.cpp
rename to source/native-plugins/external/distrho-wobblejuice.cpp
diff --git a/source/native-plugins/zynaddsubfx-fx.cpp b/source/native-plugins/external/zynaddsubfx-fx.cpp
similarity index 100%
rename from source/native-plugins/zynaddsubfx-fx.cpp
rename to source/native-plugins/external/zynaddsubfx-fx.cpp
diff --git a/source/native-plugins/zynaddsubfx-src.cpp b/source/native-plugins/external/zynaddsubfx-src.cpp
similarity index 100%
rename from source/native-plugins/zynaddsubfx-src.cpp
rename to source/native-plugins/external/zynaddsubfx-src.cpp
diff --git a/source/native-plugins/zynaddsubfx-synth.cpp b/source/native-plugins/external/zynaddsubfx-synth.cpp
similarity index 100%
rename from source/native-plugins/zynaddsubfx-synth.cpp
rename to source/native-plugins/external/zynaddsubfx-synth.cpp
diff --git a/source/native-plugins/zynaddsubfx-ui.cpp b/source/native-plugins/external/zynaddsubfx-ui.cpp
similarity index 100%
rename from source/native-plugins/zynaddsubfx-ui.cpp
rename to source/native-plugins/external/zynaddsubfx-ui.cpp