diff --git a/source/Makefile.deps b/source/Makefile.deps
new file mode 100644
index 000000000..0ba2281cf
--- /dev/null
+++ b/source/Makefile.deps
@@ -0,0 +1,157 @@
+#!/usr/bin/make -f
+# Makefile for file dependencies #
+# ------------------------------ #
+# Created by falkTX
+#
+
+ifeq ($(CWD),)
+$(error CWD not set)
+endif
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# includes
+
+CARLA_DEFINES_H = $(CWD)/includes/CarlaDefines.h
+CARLA_MIDI_H    = $(CWD)/includes/CarlaMIDI.h
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# backend
+
+CARLA_BACKEND_H  = $(CWD)/backend/CarlaBackend.h  $(CARLA_DEFINES_H)
+CARLA_HOST_H     = $(CWD)/backend/CarlaHost.h     $(CARLA_BACKEND_H)
+CARLA_ENGINE_HPP = $(CWD)/backend/CarlaEngine.hpp $(CARLA_BACKEND_H)
+CARLA_PLUGIN_HPP = $(CWD)/backend/CarlaPlugin.hpp $(CARLA_BACKEND_H)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# utils (base with no extra depends)
+
+CARLA_UTILS_HPP      = $(CWD)/utils/CarlaUtils.hpp     $(CARLA_DEFINES_H)
+CARLA_JUCE_UTILS_HPP = $(CWD)/utils/CarlaJuceUtils.hpp $(CARLA_UTILS_HPP)
+CARLA_MATH_UTILS_HPP = $(CWD)/utils/CarlaMathUtils.hpp $(CARLA_UTILS_HPP)
+CARLA_LIB_UTILS_HPP  = $(CWD)/utils/CarlaLibUtils.hpp  $(CARLA_UTILS_HPP)
+CARLA_OSC_UTILS_HPP  = $(CWD)/utils/CarlaOscUtils.hpp  $(CARLA_UTILS_HPP)
+CARLA_SHM_UTILS_HPP  = $(CWD)/utils/CarlaShmUtils.hpp  $(CARLA_UTILS_HPP)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# utils (base classes)
+
+CARLA_MUTEX_HPP       = $(CWD)/utils/CarlaMutex.hpp      $(CARLA_UTILS_HPP)
+CARLA_RING_BUFFER_HPP = $(CWD)/utils/CarlaRingBuffer.hpp $(CARLA_UTILS_HPP)
+CARLA_STRING_HPP      = $(CWD)/utils/CarlaString.hpp     $(CARLA_JUCE_UTILS_HPP)
+CARLA_THREAD_HPP      = $(CWD)/utils/CarlaThread.hpp     $(CARLA_MUTEX_HPP) $(CARLA_STRING_HPP)
+LINKED_LIST_HPP       = $(CWD)/utils/LinkedList.hpp      $(CARLA_UTILS_HPP)
+LV2_ATOM_QUEUE_HPP    = $(CWD)/utils/Lv2AtomQueue.hpp    $(CARLA_MATH_UTILS_HPP) $(CARLA_MUTEX_HPP) $(CARLA_RING_BUFFER_HPP)
+RT_LINKED_LIST_HPP    = $(CWD)/utils/RtLinkedList.hpp    $(LINKED_LIST_HPP)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# utils (plugin stuff)
+
+CARLA_LADSPA_UTILS_HPP = $(CWD)/utils/CarlaLadspaUtils.hpp $(CARLA_UTILS_HPP)
+CARLA_DSSI_UTILS_HPP   = $(CWD)/utils/CarlaDssiUtils.hpp   $(CARLA_LADSPA_UTILS_HPP)
+CARLA_DSSI_UTILS_CPP   = $(CWD)/utils/CarlaDssiUtils.cpp   $(CARLA_DSSI_UTILS_HPP)
+CARLA_LV2_UTILS_HPP    = $(CWD)/utils/CarlaLv2Utils.hpp    $(CARLA_UTILS_HPP)
+CARLA_VST_UTILS_HPP    = $(CWD)/utils/CarlaVstUtils.hpp    $(CARLA_UTILS_HPP)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# utils (misc stuff)
+
+CARLA_BACKEND_UTILS_HPP = $(CWD)/utils/CarlaBackendUtils.hpp $(CARLA_BACKEND_H) $(CARLA_HOST_H) $(CARLA_STRING_HPP)
+CARLA_BRIDGE_UTILS_HPP  = $(CWD)/utils/CarlaBridgeUtils.hpp  $(CARLA_RING_BUFFER_HPP)
+CARLA_ENGINE_UTILS_HPP  = $(CWD)/utils/CarlaEngineUtils.hpp  $(CARLA_ENGINE_HPP) $(CARLA_UTILS_HPP)
+CARLA_PIPE_UTILS_HPP    = $(CWD)/utils/CarlaPipeUtils.hpp    $(CARLA_STRING_HPP)
+CARLA_STATE_UTILS_HPP   = $(CWD)/utils/CarlaStateUtils.hpp   $(CARLA_BACKEND_H) $(LINKED_LIST_HPP)
+CARLA_STATE_UTILS_CPP   = $(CWD)/utils/CarlaStateUtils.cpp   $(CARLA_STATE_UTILS_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_MIDI_H)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# utils (advanced classes)
+
+CARLA_EXTERNAL_UI_HPP = $(CWD)/utils/CarlaExternalUI.hpp $(CARLA_PIPE_UTILS_HPP)
+CARLA_LIB_COUNTER_HPP = $(CWD)/utils/CarlaLibCounter.hpp $(CARLA_LIB_UTILS_HPP) $(CARLA_MUTEX_HPP) $(LINKED_LIST_HPP)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# modules
+
+CARLA_NATIVE_H          = $(CWD)/modules/CarlaNative.h
+CARLA_NATIVE_HPP        = $(CWD)/modules/CarlaNative.hpp           $(CARLA_NATIVE_H) $(CARLA_MIDI_H) $(CARLA_JUCE_UTILS_HPP)
+CARLA_NATIVE_EXT_UI_HPP = $(CWD)/modules/CarlaNativeExtUI.hpp      $(CARLA_NATIVE_HPP) $(CARLA_EXTERNAL_UI_HPP)
+JACK_BRIDGE_HPP         = $(CWD)/modules/jackbridge/JackBridge.hpp $(CARLA_DEFINES_H)
+RTAUDIO_HPP             = $(CWD)/modules/rtaudio/RtAudio.h
+RTMIDI_HPP              = $(CWD)/modules/rtmidi/RtMidi.h           $(CARLA_DEFINES_H)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# backend/engine
+
+CARLA_ENGINE_OSC_HPP           = $(CWD)/backend/engine/CarlaEngineOsc.hpp      $(CARLA_BACKEND_H) $(CARLA_OSC_UTILS_HPP) $(CARLA_STRING_HPP)
+CARLA_ENGINE_THREAD_HPP        = $(CWD)/backend/engine/CarlaEngineThread.hpp   $(CARLA_BACKEND_H) $(CARLA_THREAD_HPP)
+CARLA_ENGINE_INTERNAL_HPP      = $(CWD)/backend/engine/CarlaEngineInternal.hpp $(CARLA_ENGINE_HPP) $(CARLA_ENGINE_OSC_HPP) $(CARLA_ENGINE_THREAD_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_MUTEX_HPP) $(LINKED_LIST_HPP)
+
+CARLA_ENGINE_CPP_DEPS          = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_MIDI_H) $(JACK_BRIDGE_HPP)
+CARLA_ENGINE_BRIDGE_CPP_DEPS   = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_BRIDGE_UTILS_HPP) $(CARLA_MIDI_H) $(JACK_BRIDGE_HPP)
+CARLA_ENGINE_INTERNAL_CPP_DEPS = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_MIDI_H) $(CARLA_MATH_UTILS_HPP)
+CARLA_ENGINE_JACK_CPP_DEPS     = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_MIDI_H) $(JACK_BRIDGE_HPP)
+CARLA_ENGINE_JUCE_CPP_DEPS     = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_BACKEND_UTILS_HPP)
+CARLA_ENGINE_NATIVE_CPP_DEPS   = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_EXTERNAL_UI_HPP) $(CARLA_NATIVE_HPP) $(CARLA_DSSI_UTILS_CPP) $(CARLA_STATE_UTILS_CPP)
+CARLA_ENGINE_OSC_CPP_DEPS      = $(CARLA_ENGINE_HPP) $(CARLA_ENGINE_OSC_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BRIDGE_UTILS_HPP) $(CARLA_MIDI_H)
+CARLA_ENGINE_RTAUDIO_CPP_DEPS  = $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(RT_LINKED_LIST_HPP) $(RTAUDIO_HPP) $(RTMIDI_HPP)
+CARLA_ENGINE_THREAD_CPP_DEPS   = $(CARLA_ENGINE_HPP) $(CARLA_ENGINE_THREAD_HPP) $(CARLA_PLUGIN_HPP)
+
+CARLA_ENGINE_CPP               = $(CWD)/backend/engine/CarlaEngine.cpp         $(CARLA_ENGINE_CPP_DEPS)
+CARLA_ENGINE_BRIDGE_CPP        = $(CWD)/backend/engine/CarlaEngineBridge.cpp   $(CARLA_ENGINE_CPP_BRIDGE_DEPS)
+CARLA_ENGINE_INTERNAL_CPP      = $(CWD)/backend/engine/CarlaEngineInternal.cpp $(CARLA_ENGINE_CPP_INTERNAL_DEPS)
+CARLA_ENGINE_JACK_CPP          = $(CWD)/backend/engine/CarlaEngineJack.cpp     $(CARLA_ENGINE_CPP_JACK_DEPS)
+CARLA_ENGINE_JUCE_CPP          = $(CWD)/backend/engine/CarlaEngineJuce.cpp     $(CARLA_ENGINE_CPP_JUCE_DEPS)
+CARLA_ENGINE_NATIVE_CPP        = $(CWD)/backend/engine/CarlaEngineNative.cpp   $(CARLA_ENGINE_CPP_NATIVE_DEPS)
+CARLA_ENGINE_OSC_CPP           = $(CWD)/backend/engine/CarlaEngineOsc.cpp      $(CARLA_ENGINE_CPP_OSC_DEPS)
+CARLA_ENGINE_RTAUDIO_CPP       = $(CWD)/backend/engine/CarlaEngineRtAudio.cpp  $(CARLA_ENGINE_CPP_RTAUDIO_DEPS)
+CARLA_ENGINE_THREAD_CPP        = $(CWD)/backend/engine/CarlaEngineThread.cpp   $(CARLA_ENGINE_CPP_THREAD_DEPS)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# backend/plugin
+
+CARLA_PLUGIN_THREAD_HPP        = $(CWD)/backend/plugin/CarlaPluginThread.hpp   $(CARLA_BACKEND_H) $(CARLA_THREAD_HPP)
+CARLA_PLUGIN_UI_HPP            = $(CWD)/backend/plugin/CarlaPluginUi.hpp       $(CARLA_UTILS_HPP)
+CARLA_PLUGIN_INTERNAL_HPP      = $(CWD)/backend/plugin/CarlaPluginInternal.hpp $(CARLA_PLUGIN_HPP) $(CARLA_PLUGIN_THREAD_HPP) $(CARLA_OSC_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_MUTEX_HPP) $(RT_LINKED_LIST_HPP) $(CARLA_MIDI_H)
+
+AU_PLUGIN_CPP_DEPS             = $(CARLA_PLUGIN_HPP) $(CARLA_ENGINE_HPP) $(CARLA_UTILS_HPP)
+BRIDGE_PLUGIN_CPP_DEPS         = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_BRIDGE_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_SHM_UTILS_HPP) $(JACK_BRIDGE_HPP)
+CARLA_PLUGIN_CPP_DEPS          = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_PLUGIN_UI_HPP)
+CARLA_PLUGIN_INTERNAL_CPP_DEPS = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_LIB_COUNTER_HPP) $(CARLA_MATH_UTILS_HPP)
+CARLA_PLUGIN_THREAD_CPP_DEPS   = $(CARLA_PLUGIN_HPP) $(CARLA_PLUGIN_THREAD_HPP) $(CARLA_ENGINE_HPP)
+CARLA_PLUGIN_UI_CPP_DEPS       = $(CARLA_PLUGIN_UI_HPP)
+CSOUND_PLUGIN_CPP_DEPS         = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP)
+DSSI_PLUGIN_CPP_DEPS           = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_DSSI_UTILS_HPP) $(CARLA_MATH_UTILS_HPP)
+FLUIDSYNTH_PLUGIN_CPP_DEPS     = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_MATH_UTILS_HPP)
+JUCE_PLUGIN_CPP_DEPS           = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP)
+LADSPA_PLUGIN_CPP_DEPS         = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_LADSPA_UTILS_HPP) $(CARLA_MATH_UTILS_HPP)
+LINUXSAMPLER_PLUGIN_CPP_DEPS   = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP)
+LV2_PLUGIN_CPP_DEPS            = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_LV2_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_PLUGIN_UI_HPP) $(LV2_ATOM_QUEUE_HPP) $(CARLA_ENGINE_OSC_HPP)
+NATIVE_PLUGIN_CPP_DEPS         = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_NATIVE_H)
+REWIRE_PLUGIN_CPP_DEPS         = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_LIB_UTILS_HPP) $(CARLA_MATH_UTILS_HPP)
+VST_PLUGIN_CPP_DEPS            = $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_VST_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_PLUGIN_UI_HPP)
+VST3_PLUGIN_CPP_DEPS           = $(CARLA_PLUGIN_HPP) $(CARLA_ENGINE_HPP) $(CARLA_UTILS_HPP)
+
+AU_PLUGIN_CPP                  = $(CWD)/backend/plugin/AuPlugin.cpp            $(AU_PLUGIN_CPP_DEPS)
+BRIDGE_PLUGIN_CPP              = $(CWD)/backend/plugin/BridgePlugin.cpp        $(BRIDGE_PLUGIN_CPP_DEPS)
+CARLA_PLUGIN_CPP               = $(CWD)/backend/plugin/CarlaPlugin.cpp         $(CARLA_PLUGIN_CPP_DEPS)
+CARLA_PLUGIN_INTERNAL_CPP      = $(CWD)/backend/plugin/CarlaPluginInternal.cpp $(CARLA_PLUGIN_INTERNAL_CPP_DEPS)
+CARLA_PLUGIN_THREAD_CPP        = $(CWD)/backend/plugin/CarlaPluginThread.cpp   $(CARLA_PLUGIN_THREAD_CPP_DEPS)
+CARLA_PLUGIN_UI_CPP            = $(CWD)/backend/plugin/CarlaPluginUi.cpp       $(CARLA_PLUGIN_UI_CPP_DEPS)
+CSOUND_PLUGIN_CPP              = $(CWD)/backend/plugin/CsoundPlugin.cpp        $(CSOUND_PLUGIN_CPP_DEPS)
+DSSI_PLUGIN_CPP                = $(CWD)/backend/plugin/DssiPlugin.cpp          $(DSSI_PLUGIN_CPP_DEPS)
+FLUIDSYNTH_PLUGIN_CPP          = $(CWD)/backend/plugin/FluidSynthPlugin.cpp    $(FLUIDSYNTH_PLUGIN_CPP_DEPS)
+JUCE_PLUGIN_CPP                = $(CWD)/backend/plugin/JucePlugin.cpp          $(JUCE_PLUGIN_CPP_DEPS)
+LADSPA_PLUGIN_CPP              = $(CWD)/backend/plugin/LadspaPlugin.cpp        $(LADSPA_PLUGIN_CPP_DEPS)
+LINUXSAMPLER_PLUGIN_CPP        = $(CWD)/backend/plugin/LinuxSamplerPlugin.cpp  $(LINUXSAMPLER_PLUGIN_CPP_DEPS)
+LV2_PLUGIN_CPP                 = $(CWD)/backend/plugin/Lv2Plugin.cpp           $(LV2_PLUGIN_CPP_DEPS)
+NATIVE_PLUGIN_CPP              = $(CWD)/backend/plugin/NativePlugin.cpp        $(NATIVE_PLUGIN_CPP_DEPS)
+REWIRE_PLUGIN_CPP              = $(CWD)/backend/plugin/ReWirePlugin.cpp        $(REWIRE_PLUGIN_CPP_DEPS)
+VST_PLUGIN_CPP                 = $(CWD)/backend/plugin/VstPlugin.cpp           $(VST_PLUGIN_CPP_DEPS)
+VST3_PLUGIN_CPP                = $(CWD)/backend/plugin/Vst3Plugin.cpp          $(VST3_PLUGIN_CPP_DEPS)
+
+# ----------------------------------------------------------------------------------------------------------------------------
+# backend/standalone
+
+CARLA_STANDALONE_CPP_DEPS = $(CARLA_HOST_H) $(CARLA_MIDI_H) $(CARLA_NATIVE_H) $(CARLA_ENGINE_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_OSC_UTILS_HPP) $(CARLA_DSSI_UTILS_CPP) $(CARLA_STATE_UTILS_CPP)
+CARLA_STANDALONE_CPP      = $(CWD)/backend/standalone/CarlaStandalone.cpp $(CARLA_STANDALONE_CPP_DEPS)
+
+# ----------------------------------------------------------------------------------------------------------------------------
diff --git a/source/Makefile.mk b/source/Makefile.mk
index 6cb1c43ec..a8ff6f214 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -38,6 +38,17 @@ endif
 endif
 endif
 
+# --------------------------------------------------------------
+# Set MACOS_OR_WIN32
+
+ifeq ($(MACOS),true)
+MACOS_OR_WIN32=true
+endif
+
+ifeq ($(WIN32),true)
+MACOS_OR_WIN32=true
+endif
+
 # --------------------------------------------------------------
 # Common build and link flags
 
@@ -217,14 +228,7 @@ HAVE_ZYN_UI_DEPS  = $(shell pkg-config --exists ntk_images ntk && echo true)
 # --------------------------------------------------------------
 # Force some features on MacOS and Windows
 
-ifeq ($(MACOS),true)
-FORCE_FEATURES = true
-endif
-ifeq ($(WIN32),true)
-FORCE_FEATURES = true
-endif
-
-ifeq ($(FORCE_FEATURES),true)
+ifeq ($(MACOS_OR_WIN32),true)
 CARLA_VESTIGE_HEADER = false
 HAVE_WAYLAND = false
 HAVE_X11     = false
@@ -383,21 +387,31 @@ endif
 # --------------------------------------------------------------
 # Set libs stuff (part 3)
 
-NATIVE_PLUGINS_LIBS  = $(AUDIO_DECODER_LIBS)
-NATIVE_PLUGINS_LIBS += $(DGL_LIBS)
+ifeq ($(HAVE_DGL),true)
+NATIVE_PLUGINS_LIBS  += $(DGL_LIBS)
+endif
+
+ifeq ($(HAVE_AF_DEPS),true)
+NATIVE_PLUGINS_FLAGS += -DWANT_AUDIOFILE
+NATIVE_PLUGINS_LIBS  += $(AUDIO_DECODER_LIBS)
+endif
 
 ifeq ($(HAVE_MF_DEPS),true)
-NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs smf)
+NATIVE_PLUGINS_FLAGS += -DWANT_MIDIFILE
+NATIVE_PLUGINS_LIBS  += $(shell pkg-config --libs smf)
 endif
 
 ifeq ($(HAVE_PM_DEPS),true)
-NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs libprojectM)
+NATIVE_PLUGINS_FLAGS += -DWANT_PROJECTM
+NATIVE_PLUGINS_LIBS  += $(shell pkg-config --libs libprojectM)
 endif
 
 ifeq ($(HAVE_ZYN_DEPS),true)
-NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs fftw3 mxml zlib)
+NATIVE_PLUGINS_FLAGS += -DWANT_ZYNADDSUBFX
+NATIVE_PLUGINS_LIBS  += $(shell pkg-config --libs fftw3 mxml zlib)
 ifeq ($(HAVE_ZYN_UI_DEPS),true)
-NATIVE_PLUGINS_LIBS += $(shell pkg-config --libs ntk_images ntk)
+NATIVE_PLUGINS_FLAGS += -DWANT_ZYNADDSUBFX_UI
+NATIVE_PLUGINS_LIBS  += $(shell pkg-config --libs ntk_images ntk)
 endif
 endif
 
diff --git a/source/backend/CarlaHost.h b/source/backend/CarlaHost.h
index b4fe9b842..9a84829f4 100644
--- a/source/backend/CarlaHost.h
+++ b/source/backend/CarlaHost.h
@@ -38,6 +38,7 @@ using CarlaBackend::MidiProgramData;
 using CarlaBackend::CustomData;
 using CarlaBackend::EngineDriverDeviceInfo;
 using CarlaBackend::CarlaEngine;
+using CarlaBackend::CarlaEngineClient;
 using CarlaBackend::CarlaPlugin;
 #endif
 
diff --git a/source/backend/Makefile b/source/backend/Makefile
index b5232bd31..c0d94cad9 100644
--- a/source/backend/Makefile
+++ b/source/backend/Makefile
@@ -4,8 +4,6 @@
 # Created by falkTX
 #
 
-include ../Makefile.mk
-
 # ----------------------------------------------------------------------------------------------------------------------------
 
 all:
diff --git a/source/backend/Makefile.mk b/source/backend/Makefile.mk
index c7aaea2f6..8631a4c15 100644
--- a/source/backend/Makefile.mk
+++ b/source/backend/Makefile.mk
@@ -4,6 +4,8 @@
 # Created by falkTX
 #
 
+CWD=../..
+include ../../Makefile.deps
 include ../../Makefile.mk
 
 # ----------------------------------------------------------------------------------------------------------------------------
@@ -16,10 +18,13 @@ BUILD_CXX_FLAGS += $(LIBLO_FLAGS)
 BUILD_CXX_FLAGS += -DWANT_NATIVE
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST -DWANT_VST3 -DWANT_REWIRE
+BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -DWANT_AU
 endif
+ifeq ($(MACOS_OR_WIN32),true)
+BUILD_CXX_FLAGS += -DWANT_VST3
+endif
 ifeq ($(CARLA_VESTIGE_HEADER),true)
 BUILD_CXX_FLAGS += -DVESTIGE_HEADER
 endif
@@ -27,9 +32,9 @@ endif
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-# ifeq ($(HAVE_CSOUND),true)
-# BUILD_CXX_FLAGS += -DWANT_CSOUND
-# endif
+ifeq ($(HAVE_CSOUND),true)
+BUILD_CXX_FLAGS += -DWANT_CSOUND
+endif
 
 ifeq ($(HAVE_FLUIDSYNTH),true)
 BUILD_CXX_FLAGS += -DWANT_FLUIDSYNTH
@@ -41,66 +46,6 @@ endif
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-ifeq ($(HAVE_AF_DEPS),true)
-BUILD_CXX_FLAGS += -DWANT_AUDIOFILE
-endif
-
-ifeq ($(HAVE_MF_DEPS),true)
-BUILD_CXX_FLAGS += -DWANT_MIDIFILE
-endif
-
-ifeq ($(HAVE_ZYN_DEPS),true)
-BUILD_CXX_FLAGS += -DWANT_ZYNADDSUBFX
-ifeq ($(HAVE_ZYN_UI_DEPS),true)
-BUILD_CXX_FLAGS += -DWANT_ZYNADDSUBFX_UI
-endif
-endif
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
-CARLA_DEFINES_H = ../../includes/CarlaDefines.h
-CARLA_MIDI_H    = ../../includes/CarlaMIDI.h
-
-CARLA_BACKEND_H  = ../CarlaBackend.h $(CARLA_DEFINES_H)
-CARLA_HOST_H     = ../CarlaHost.h $(CARLA_BACKEND_H)
-CARLA_ENGINE_HPP = ../CarlaEngine.hpp $(CARLA_BACKEND_H)
-CARLA_PLUGIN_HPP = ../CarlaPlugin.hpp $(CARLA_BACKEND_H)
-
-CARLA_UTILS_HPP       = ../../utils/CarlaUtils.hpp $(CARLA_DEFINES_H)
-CARLA_JUCE_UTILS_HPP  = ../../utils/CarlaJuceUtils.hpp $(CARLA_UTILS_HPP)
-CARLA_LIB_UTILS_HPP   = ../../utils/CarlaLibUtils.hpp $(CARLA_UTILS_HPP)
-CARLA_OSC_UTILS_HPP   = ../../utils/CarlaOscUtils.hpp $(CARLA_UTILS_HPP)
-
-CARLA_MUTEX_HPP       = ../../utils/CarlaMutex.hpp $(CARLA_UTILS_HPP)
-CARLA_RING_BUFFER_HPP = ../../utils/CarlaRingBuffer.hpp $(CARLA_UTILS_HPP)
-CARLA_STRING_HPP      = ../../utils/CarlaString.hpp $(CARLA_JUCE_UTILS_HPP)
-CARLA_THREAD_HPP      = ../../utils/CarlaThread.hpp $(CARLA_MUTEX_HPP) $(CARLA_STRING_HPP)
-
-LV2_ATOM_QUEUE_HPP    = ../../utils/Lv2AtomQueue.hpp $(CARLA_MUTEX_HPP) $(CARLA_RING_BUFFER_HPP)
-LINKED_LIST_HPP       = ../../utils/LinkedList.hpp $(CARLA_UTILS_HPP)
-RT_LINKED_LIST_HPP    = ../../utils/RtLinkedList.hpp $(LINKED_LIST_HPP)
-
-CARLA_BACKEND_UTILS_HPP = ../../utils/CarlaBackendUtils.hpp $(CARLA_BACKEND_H) $(CARLA_HOST_H) $(CARLA_STRING_HPP)
-CARLA_EXTERNAL_UI_HPP   = ../../utils/CarlaExternalUI.hpp $(CARLA_PIPE_UTILS_HPP)
-CARLA_BRIDGE_UTILS_HPP  = ../../utils/CarlaBridgeUtils.hpp $(CARLA_BACKEND_H) $(CARLA_RING_BUFFER_HPP)
-CARLA_ENGINE_UTILS_HPP  = ../../utils/CarlaEngineUtils.hpp $(CARLA_ENGINE_HPP) $(CARLA_UTILS_HPP)
-CARLA_LIB_COUNTER_HPP   = ../../utils/CarlaLibCounter.hpp $(CARLA_LIB_UTILS_HPP) $(CARLA_MUTEX_HPP) $(LINKED_LIST_HPP)
-CARLA_MATH_UTILS_HPP    = ../../utils/CarlaMathUtils.hpp $(CARLA_UTILS_HPP)
-CARLA_PIPE_UTILS_HPP    = ../../utils/CarlaPipeUtils.hpp $(CARLA_STRING_HPP)
-CARLA_SHM_UTILS_HPP     = ../../utils/CarlaShmUtils.hpp $(CARLA_UTILS_HPP)
-CARLA_STATE_UTILS_HPP   = ../../utils/CarlaStateUtils.hpp $(LINKED_LIST_HPP)
-CARLA_STATE_UTILS_CPP   = ../../utils/CarlaStateUtils.cpp $(CARLA_STATE_UTILS_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_MIDI_H)
-
-CARLA_LADSPA_UTILS_HPP  = ../../utils/CarlaLadspaUtils.hpp $(CARLA_UTILS_HPP)
-CARLA_DSSI_UTILS_HPP    = ../../utils/CarlaDssiUtils.hpp $(CARLA_LADSPA_UTILS_HPP)
-CARLA_LV2_UTILS_HPP     = ../../utils/CarlaLv2Utils.hpp $(CARLA_UTILS_HPP)
-CARLA_VST_UTILS_HPP     = ../../utils/CarlaVstUtils.hpp $(CARLA_UTILS_HPP)
-
-CARLA_NATIVE_H          = ../../modules/CarlaNative.h
-CARLA_NATIVE_HPP        = ../../modules/CarlaNative.hpp $(CARLA_NATIVE_H) $(CARLA_MIDI_H) $(CARLA_JUCE_UTILS_HPP)
-CARLA_NATIVE_EXT_UI_HPP = ../../modules/CarlaNativeExtUI.hpp $(CARLA_NATIVE_HPP) $(CARLA_EXTERNAL_UI_HPP)
-JACK_BRIDGE_HPP         = ../../modules/jackbridge/JackBridge.hpp $(CARLA_DEFINES_H)
-RTAUDIO_HPP             = ../../modules/rtaudio/RtAudio.h
-RTMIDI_HPP              = ../../modules/rtmidi/RtMidi.h $(CARLA_DEFINES_H)
+BUILD_CXX_FLAGS += $(NATIVE_PLUGINS_FLAGS)
 
 # ----------------------------------------------------------------------------------------------------------------------------
diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp
index 38ef98869..bb1803992 100644
--- a/source/backend/engine/CarlaEngine.cpp
+++ b/source/backend/engine/CarlaEngine.cpp
@@ -30,8 +30,8 @@
 #include "CarlaBackendUtils.hpp"
 #include "CarlaEngineUtils.hpp"
 #include "CarlaMathUtils.hpp"
-#include "CarlaMIDI.h"
 #include "CarlaStateUtils.hpp"
+#include "CarlaMIDI.h"
 
 #include "jackbridge/JackBridge.hpp"
 
diff --git a/source/backend/engine/Makefile b/source/backend/engine/Makefile
index bba01424f..e09ffa5d3 100644
--- a/source/backend/engine/Makefile
+++ b/source/backend/engine/Makefile
@@ -8,12 +8,6 @@ include ../Makefile.mk
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-CARLA_ENGINE_OSC_HPP      = CarlaEngineOsc.hpp $(CARLA_BACKEND_H) $(CARLA_OSC_UTILS_HPP) $(CARLA_STRING_HPP)
-CARLA_ENGINE_THREAD_HPP   = CarlaEngineThread.hpp $(CARLA_BACKEND_H) $(CARLA_THREAD_HPP)
-CARLA_ENGINE_INTERNAL_HPP = CarlaEngineInternal.hpp $(CARLA_ENGINE_OSC_HPP) $(CARLA_ENGINE_THREAD_HPP) $(CARLA_ENGINE_HPP) $(CARLA_MUTEX_HPP) $(LINKED_LIST_HPP)
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
 OBJS = \
 	CarlaEngine.cpp.o \
 	CarlaEngineInternal.cpp.o \
@@ -66,31 +60,31 @@ $(TARGETp): $(OBJSp)
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-CarlaEngine.cpp.o: CarlaEngine.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_MIDI_H)
+CarlaEngine.cpp.o: CarlaEngine.cpp $(CARLA_ENGINE_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) $(QTXML_FLAGS) -c -o $@
 
-CarlaEngineInternal.cpp.o: CarlaEngineInternal.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_MIDI_H) $(CARLA_MATH_UTILS_HPP)
+CarlaEngineInternal.cpp.o: CarlaEngineInternal.cpp $(CARLA_ENGINE_INTERNAL_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-CarlaEngineOsc.cpp.o: CarlaEngineOsc.cpp $(CARLA_ENGINE_HPP) $(CARLA_ENGINE_OSC_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BRIDGE_UTILS_HPP) $(CARLA_MIDI_H)
+CarlaEngineOsc.cpp.o: CarlaEngineOsc.cpp $(CARLA_ENGINE_OSC_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-CarlaEngineThread.cpp.o: CarlaEngineThread.cpp $(CARLA_ENGINE_HPP) $(CARLA_ENGINE_THREAD_HPP) $(CARLA_PLUGIN_HPP)
+CarlaEngineThread.cpp.o: CarlaEngineThread.cpp $(CARLA_ENGINE_THREAD_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-CarlaEngineJack.cpp.o: CarlaEngineJack.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_ENGINE_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_MIDI_H) $(JACK_BRIDGE_HPP)
+CarlaEngineJack.cpp.o: CarlaEngineJack.cpp $(CARLA_ENGINE_JACK_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
-CarlaEngineRtAudio.cpp.o: CarlaEngineRtAudio.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(RT_LINKED_LIST_HPP) $(RTAUDIO_HPP) $(RTMIDI_HPP)
+CarlaEngineRtAudio.cpp.o: CarlaEngineRtAudio.cpp $(CARLA_ENGINE_RTAUDIO_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(RTAUDIO_FLAGS) $(RTMIDI_FLAGS) -c -o $@
 
-CarlaEngineJuce.cpp.o: CarlaEngineJuce.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_BACKEND_UTILS_HPP)
+CarlaEngineJuce.cpp.o: CarlaEngineJuce.cpp $(CARLA_ENGINE_JUCE_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-CarlaEngineNative.cpp.o: CarlaEngineNative.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_EXTERNAL_UI_HPP) $(CARLA_NATIVE_HPP)
+CarlaEngineNative.cpp.o: CarlaEngineNative.cpp $(CARLA_ENGINE_NATIVE_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) $(QTXML_FLAGS) -c -o $@
 
-CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp $(CARLA_ENGINE_INTERNAL_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_EXTERNAL_UI_HPP) $(CARLA_NATIVE_HPP)
+CarlaEngineNative.cpp.exp.o: CarlaEngineNative.cpp $(CARLA_ENGINE_NATIVE_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) $(QTXML_FLAGS) -DCARLA_PLUGIN_EXPORT -c -o $@
 
 # ----------------------------------------------------------------------------------------------------------------------------
diff --git a/source/backend/plugin/CarlaPluginInternal.hpp b/source/backend/plugin/CarlaPluginInternal.hpp
index d16ff238a..f1385c608 100644
--- a/source/backend/plugin/CarlaPluginInternal.hpp
+++ b/source/backend/plugin/CarlaPluginInternal.hpp
@@ -47,7 +47,6 @@ CARLA_BACKEND_START_NAMESPACE
 class CarlaEngineAudioPort;
 class CarlaEngineCVPort;
 class CarlaEngineEventPort;
-class CarlaEngineClient;
 
 // -----------------------------------------------------------------------
 // Maximum pre-allocated events for some plugin types
diff --git a/source/backend/plugin/Makefile b/source/backend/plugin/Makefile
index 3ebca597f..0d23f0ea4 100644
--- a/source/backend/plugin/Makefile
+++ b/source/backend/plugin/Makefile
@@ -8,13 +8,6 @@ include ../Makefile.mk
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-CARLA_ENGINE_OSC_HPP      = ../engine/CarlaEngineOsc.hpp $(CARLA_BACKEND_H) $(CARLA_OSC_UTILS_HPP) $(CARLA_STRING_HPP)
-CARLA_PLUGIN_UI_HPP       = CarlaPluginUi.hpp $(CARLA_UTILS_HPP)
-CARLA_PLUGIN_THREAD_HPP   = CarlaPluginThread.hpp $(CARLA_BACKEND_H) $(CARLA_THREAD_HPP)
-CARLA_PLUGIN_INTERNAL_HPP = CarlaPluginInternal.hpp $(CARLA_PLUGIN_HPP) $(CARLA_PLUGIN_THREAD_HPP) $(CARLA_OSC_UTILS_HPP) $(CARLA_STATE_UTILS_HPP) $(CARLA_MUTEX_HPP) $(RT_LINKED_LIST_HPP) $(CARLA_MIDI_H)
-
-# ----------------------------------------------------------------------------------------------------------------------------
-
 OBJS = \
 	CarlaPlugin.cpp.o \
 	CarlaPluginInternal.cpp.o \
@@ -56,55 +49,55 @@ $(TARGET): $(OBJS)
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-CarlaPlugin.cpp.o: CarlaPlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_PLUGIN_UI_HPP)
+CarlaPlugin.cpp.o: CarlaPlugin.cpp $(CARLA_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) $(QTXML_FLAGS) -c -o $@
 
-CarlaPluginInternal.cpp.o: CarlaPluginInternal.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_LIB_COUNTER_HPP) $(CARLA_MATH_UTILS_HPP)
+CarlaPluginInternal.cpp.o: CarlaPluginInternal.cpp $(CARLA_PLUGIN_INTERNAL_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
-CarlaPluginThread.cpp.o: CarlaPluginThread.cpp $(CARLA_PLUGIN_HPP) $(CARLA_PLUGIN_THREAD_HPP) $(CARLA_ENGINE_HPP)
+CarlaPluginThread.cpp.o: CarlaPluginThread.cpp $(CARLA_PLUGIN_THREAD_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
-CarlaPluginUi.cpp.o: CarlaPluginUi.cpp $(CARLA_PLUGIN_UI_HPP) $(CARLA_HOST_H)
+CarlaPluginUi.cpp.o: CarlaPluginUi.cpp $(CARLA_PLUGIN_UI_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-NativePlugin.cpp.o: NativePlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_NATIVE_H)
+NativePlugin.cpp.o: NativePlugin.cpp $(NATIVE_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
-BridgePlugin.cpp.o: BridgePlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_BRIDGE_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_SHM_UTILS_HPP) $(JACK_BRIDGE_HPP)
+BridgePlugin.cpp.o: BridgePlugin.cpp $(BRIDGE_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
-LadspaPlugin.cpp.o: LadspaPlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_LADSPA_UTILS_HPP) $(CARLA_MATH_UTILS_HPP)
+LadspaPlugin.cpp.o: LadspaPlugin.cpp $(LADSPA_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-DssiPlugin.cpp.o: DssiPlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_DSSI_UTILS_HPP) $(CARLA_MATH_UTILS_HPP)
+DssiPlugin.cpp.o: DssiPlugin.cpp $(DSSI_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
-Lv2Plugin.cpp.o: Lv2Plugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_LV2_UTILS_HPP) $(CARLA_PLUGIN_UI_HPP) $(LV2_ATOM_QUEUE_HPP) $(CARLA_ENGINE_OSC_HPP)
+Lv2Plugin.cpp.o: Lv2Plugin.cpp $(LV2_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
-VstPlugin.cpp.o: VstPlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_VST_UTILS_HPP) $(CARLA_MATH_UTILS_HPP) $(CARLA_PLUGIN_UI_HPP)
+VstPlugin.cpp.o: VstPlugin.cpp $(VST_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
-Vst3Plugin.cpp.o: Vst3Plugin.cpp $(CARLA_PLUGIN_HPP) $(CARLA_ENGINE_HPP) $(CARLA_UTILS_HPP)
+Vst3Plugin.cpp.o: Vst3Plugin.cpp $(VST3_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-AuPlugin.cpp.o: AuPlugin.cpp $(CARLA_PLUGIN_HPP) $(CARLA_ENGINE_HPP) $(CARLA_UTILS_HPP)
+AuPlugin.cpp.o: AuPlugin.cpp $(AU_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-ReWirePlugin.cpp.o: ReWirePlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_LIB_UTILS_HPP) $(CARLA_MATH_UTILS_HPP)
+ReWirePlugin.cpp.o: ReWirePlugin.cpp $(REWIRE_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-CsoundPlugin.cpp.o: CsoundPlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP)
+CsoundPlugin.cpp.o: CsoundPlugin.cpp $(CSOUND_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(CSOUND_FLAGS) -c -o $@
 
-JucePlugin.cpp.o: JucePlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP)
+JucePlugin.cpp.o: JucePlugin.cpp $(JUCE_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-FluidSynthPlugin.cpp.o: FluidSynthPlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_MATH_UTILS_HPP)
+FluidSynthPlugin.cpp.o: FluidSynthPlugin.cpp $(FLUIDSYNTH_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(FLUIDSYNTH_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
-LinuxSamplerPlugin.cpp.o: LinuxSamplerPlugin.cpp $(CARLA_PLUGIN_INTERNAL_HPP) $(CARLA_ENGINE_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_MATH_UTILS_HPP)
+LinuxSamplerPlugin.cpp.o: LinuxSamplerPlugin.cpp $(LINUXSAMPLER_PLUGIN_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(LINUXSAMPLER_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
 # ----------------------------------------------------------------------------------------------------------------------------
diff --git a/source/backend/standalone/Makefile b/source/backend/standalone/Makefile
index ef9d73428..338d85385 100644
--- a/source/backend/standalone/Makefile
+++ b/source/backend/standalone/Makefile
@@ -24,6 +24,11 @@ STATIC_LIBS += ../../modules/rtmempool.a
 LINK_FLAGS  += $(JACKBRIDGE_LIBS)
 LINK_FLAGS  += $(RTMEMPOOL_LIBS)
 
+ifeq ($(HAVE_DGL),true)
+STATIC_LIBS += ../../modules/dgl.a
+LINK_FLAGS  += $(DGL_LIBS)
+endif
+
 ifeq ($(HAVE_JUCE),true)
 STATIC_LIBS += ../../modules/juce_audio_basics.a
 STATIC_LIBS += ../../modules/juce_audio_devices.a
@@ -45,11 +50,6 @@ LINK_FLAGS  += $(JUCE_GUI_BASICS_LIBS)
 LINK_FLAGS  += $(JUCE_GUI_EXTRA_LIBS)
 endif
 
-ifeq ($(HAVE_DGL),true)
-STATIC_LIBS += ../../modules/dgl.a
-LINK_FLAGS  += $(DGL_LIBS)
-endif
-
 # ----------------------------------------------------------------------------------------------------------------------------
 # Engine
 
@@ -133,7 +133,7 @@ debug:
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-CarlaStandalone.cpp.o: CarlaStandalone.cpp $(CARLA_HOST_H) $(CARLA_MIDI_H) $(CARLA_NATIVE_H) $(CARLA_ENGINE_HPP) $(CARLA_PLUGIN_HPP) $(CARLA_BACKEND_UTILS_HPP) $(CARLA_THREAD_HPP) $(CARLA_STATE_UTILS_CPP)
+CarlaStandalone.cpp.o: CarlaStandalone.cpp $(CARLA_STANDALONE_CPP_DEPS)
 	$(CXX) $< $(BUILD_CXX_FLAGS) $(QTCORE_FLAGS) -c -o $@
 
 # ----------------------------------------------------------------------------------------------------------------------------
diff --git a/source/discovery/Makefile b/source/discovery/Makefile
index adec22cdb..4e665dd65 100644
--- a/source/discovery/Makefile
+++ b/source/discovery/Makefile
@@ -12,27 +12,25 @@ BUILD_CXX_FLAGS += -I../backend -I../includes -I../utils -isystem ../modules
 BUILD_CXX_FLAGS += -I../includes/ladspa -I../includes/vst -I../includes/vst3
 #-Wno-multichar
 
+BUILD_CXX_FLAGS += $(QTCORE_FLAGS)
+LINK_FLAGS      += $(QTCORE_LIBS)
+
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -ObjC++
-WANT_JUCE_PROCESSORS = true
-endif
-
-ifeq ($(WIN32),true)
-WANT_JUCE_PROCESSORS = true
 endif
 
-BUILD_CXX_FLAGS += $(QTCORE_FLAGS)
-LINK_FLAGS      += $(QTCORE_LIBS)
-
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -DWANT_NATIVE
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST -DWANT_VST3
+BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
 ifeq ($(MACOS),true)
 BUILD_CXX_FLAGS += -DWANT_AU
 endif
+ifeq ($(MACOS_OR_WIN32),true)
+BUILD_CXX_FLAGS += -DWANT_VST3
+endif
 ifeq ($(CARLA_VESTIGE_HEADER),true)
 BUILD_CXX_FLAGS += -DVESTIGE_HEADER
 endif
@@ -40,16 +38,16 @@ endif
 
 # --------------------------------------------------------------
 
-# ifeq ($(HAVE_CSOUND),true)
-# NATIVE_FLAGS += $(shell pkg-config --cflags --libs sndfile) -lcsound64 -DWANT_CSOUND
-# endif
+ifeq ($(HAVE_CSOUND),true)
+NATIVE_FLAGS += -DWANT_CSOUND $(CSOUND_FLAGS) $(CSOUND_LIBS)
+endif
 
 ifeq ($(HAVE_FLUIDSYNTH),true)
-NATIVE_FLAGS += $(FLUIDSYNTH_FLAGS) $(FLUIDSYNTH_LIBS) -DWANT_FLUIDSYNTH
+NATIVE_FLAGS += -DWANT_FLUIDSYNTH $(FLUIDSYNTH_FLAGS) $(FLUIDSYNTH_LIBS)
 endif
 
 ifeq ($(HAVE_LINUXSAMPLER),true)
-NATIVE_FLAGS += $(LINUXSAMPLER_FLAGS) $(LINUXSAMPLER_LIBS) -DWANT_LINUXSAMPLER
+NATIVE_FLAGS += -DWANT_LINUXSAMPLER $(LINUXSAMPLER_FLAGS) $(LINUXSAMPLER_LIBS)
 endif
 
 # --------------------------------------------------------------
@@ -77,7 +75,12 @@ LIBS_win64   += ../modules/juce_core.win64.a
 LINK_FLAGS   += $(JUCE_CORE_LIBS) $(JUCE_AUDIO_BASICS_LIBS)
 endif
 
-ifeq ($(WANT_JUCE_PROCESSORS),true)
+ifeq ($(MACOS),true)
+LIBS         += ../modules/juce_gui_extra.a
+LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
+endif
+
+ifeq ($(MACOS_OR_WIN32),true)
 LIBS         += ../modules/juce_audio_processors.a
 LIBS_posix32 += ../modules/juce_audio_processors.posix32.a
 LIBS_posix64 += ../modules/juce_audio_processors.posix64.a
@@ -108,10 +111,6 @@ LINK_FLAGS   += $(JUCE_DATA_STRUCTURES_LIBS)
 LINK_FLAGS   += $(JUCE_EVENTS_LIBS)
 LINK_FLAGS   += $(JUCE_GRAPHICS_LIBS)
 LINK_FLAGS   += $(JUCE_GUI_BASICS_LIBS)
-ifeq ($(MACOS),true)
-LIBS         += ../modules/juce_gui_extra.a
-LINK_FLAGS   += $(JUCE_GUI_EXTRA_LIBS)
-endif
 endif
 
 POSIX_BUILD_FLAGS = $(BUILD_CXX_FLAGS)
diff --git a/source/includes/CarlaDefines.h b/source/includes/CarlaDefines.h
index 1675d9c5b..e071ce0b9 100644
--- a/source/includes/CarlaDefines.h
+++ b/source/includes/CarlaDefines.h
@@ -217,21 +217,6 @@ private:                               \
 # endif
 #endif
 
-#if 0
-/* Define PRE/POST_PACKED_STRUCTURE */
-#if defined(__GNUC__) || defined(__clang__)
-# define PRE_PACKED_STRUCTURE
-# define POST_PACKED_STRUCTURE __attribute__((__packed__))
-#elif defined(_MSC_VER)
-# define PRE_PACKED_STRUCTURE1 __pragma(pack(push,1))
-# define PRE_PACKED_STRUCTURE    PRE_PACKED_STRUCTURE1
-# define POST_PACKED_STRUCTURE ;__pragma(pack(pop))
-#else
-# define PRE_PACKED_STRUCTURE
-# define POST_PACKED_STRUCTURE
-#endif
-#endif
-
 /* Define OS_SEP */
 #ifdef CARLA_OS_WIN
 # define OS_SEP     '\\'
diff --git a/source/utils/CarlaBridgeUtils.hpp b/source/utils/CarlaBridgeUtils.hpp
index 967e99baa..41d45654e 100644
--- a/source/utils/CarlaBridgeUtils.hpp
+++ b/source/utils/CarlaBridgeUtils.hpp
@@ -18,8 +18,6 @@
 #ifndef CARLA_BRIDGE_UTILS_HPP_INCLUDED
 #define CARLA_BRIDGE_UTILS_HPP_INCLUDED
 
-//#include "CarlaBackend.h"
-//#include "CarlaEngine.hpp"
 #include "CarlaRingBuffer.hpp"
 
 // -----------------------------------------------------------------------
diff --git a/source/utils/CarlaLogThread.hpp b/source/utils/CarlaLogThread.hpp
index 7561bc580..0223f6677 100644
--- a/source/utils/CarlaLogThread.hpp
+++ b/source/utils/CarlaLogThread.hpp
@@ -18,7 +18,7 @@
 #ifndef CARLA_LOG_THREAD_HPP_INCLUDED
 #define CARLA_LOG_THREAD_HPP_INCLUDED
 
-#include "CarlaBackend.hpp"
+#include "CarlaBackend.h"
 #include "CarlaString.hpp"
 #include "CarlaThread.hpp"
 
diff --git a/source/utils/CarlaRingBuffer.hpp b/source/utils/CarlaRingBuffer.hpp
index 30a58f195..d85de84b9 100644
--- a/source/utils/CarlaRingBuffer.hpp
+++ b/source/utils/CarlaRingBuffer.hpp
@@ -20,7 +20,7 @@
 
 #include "CarlaUtils.hpp"
 
-#ifndef CARLA_OS_WIN
+#if 0 //ndef CARLA_OS_WIN
 # include <sys/mman.h>
 # ifdef CARLA_OS_MAC
 #  include <libkern/OSAtomic.h>
@@ -123,6 +123,7 @@ public:
         return (fBuffer->head != fBuffer->tail);
     }
 
+#if 0
     void lockMemory() const noexcept
     {
         CARLA_SAFE_ASSERT_RETURN(fBuffer != nullptr,);
@@ -137,6 +138,7 @@ public:
         ::mlock(fBuffer->buf, fBuffer->size);
 #endif
     }
+#endif
 
     // -------------------------------------------------------------------
 
diff --git a/source/utils/CarlaVstUtils.hpp b/source/utils/CarlaVstUtils.hpp
index b3fc94220..513db7e15 100644
--- a/source/utils/CarlaVstUtils.hpp
+++ b/source/utils/CarlaVstUtils.hpp
@@ -143,13 +143,9 @@ typedef AEffect* (*VST_Function)(audioMasterCallback);
 static inline
 bool vstPluginCanDo(AEffect* const effect, const char* const feature) noexcept
 {
-    bool ret = false;
-
     try {
-        ret = (effect->dispatcher(effect, effCanDo, 0, 0, const_cast<char*>(feature), 0.0f) == 1);
-    } CARLA_SAFE_EXCEPTION("vstPluginCanDo");
-
-    return ret;
+        return (effect->dispatcher(effect, effCanDo, 0, 0, const_cast<char*>(feature), 0.0f) == 1);
+    } CARLA_SAFE_EXCEPTION_RETURN("vstPluginCanDo", false);
 }
 
 // -----------------------------------------------------------------------
diff --git a/source/utils/Lv2AtomQueue.hpp b/source/utils/Lv2AtomQueue.hpp
index 7a0586a3c..18f32234b 100644
--- a/source/utils/Lv2AtomQueue.hpp
+++ b/source/utils/Lv2AtomQueue.hpp
@@ -71,7 +71,7 @@ public:
 
         fLv2Buffer.size = p2size;
         setRingBuffer(&fLv2Buffer, true);
-        lockMemory();
+        //lockMemory();
     }
 
     // used for tmp buffers only