diff --git a/source/Makefile.mk b/source/Makefile.mk
index 25037d21d..1a3c3d9ba 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -409,14 +409,19 @@ RTMIDI_FLAGS          += -D__WINDOWS_MM__
 WATER_LIBS             = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
 endif
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
+
+NATIVE_PLUGINS_LIBS += $(FFMPEG_LIBS)
+NATIVE_PLUGINS_LIBS += $(SNDFILE_LIBS)
+
+# ---------------------------------------------------------------------------------------------------------------------
 # Set app extension
 
 ifeq ($(WIN32),true)
 APP_EXT = .exe
 endif
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Set shared lib extension
 
 LIB_EXT = .so
diff --git a/source/backend/Makefile b/source/backend/Makefile
index b331475ec..92e092d33 100644
--- a/source/backend/Makefile
+++ b/source/backend/Makefile
@@ -57,25 +57,11 @@ STANDALONE_LINK_FLAGS += $(WATER_LIBS)
 STANDALONE_LINK_FLAGS += $(RTAUDIO_LIBS)
 STANDALONE_LINK_FLAGS += $(RTMIDI_LIBS)
 
-ifeq ($(HAVE_LIBLO),true)
 STANDALONE_LINK_FLAGS += $(LIBLO_LIBS)
-endif
-
-ifeq ($(HAVE_LIBMAGIC),true)
 STANDALONE_LINK_FLAGS += $(MAGIC_LIBS)
-endif
-
-ifeq ($(HAVE_FLUIDSYNTH),true)
 STANDALONE_LINK_FLAGS += $(FLUIDSYNTH_LIBS)
-endif
-
-ifeq ($(HAVE_LINUXSAMPLER),true)
 STANDALONE_LINK_FLAGS += $(LINUXSAMPLER_LIBS)
-endif
-
-ifeq ($(HAVE_X11),true)
 STANDALONE_LINK_FLAGS += $(X11_LIBS)
-endif
 
 UTILS_LINK_FLAGS += $(LILV_LIBS)
 UTILS_LINK_FLAGS += $(WATER_LIBS)
diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile
index 02eeba5b6..9580b5367 100644
--- a/source/bridges-plugin/Makefile
+++ b/source/bridges-plugin/Makefile
@@ -43,10 +43,6 @@ LIBS_win64    = $(MODULEDIR)/jackbridge.win64e.a
 endif
 LINK_FLAGS   += $(JACKBRIDGE_LIBS)
 
-LIBS_native  += $(MODULEDIR)/audio_decoder.a
-LINK_FLAGS   += $(FFMPEG_LIBS)
-LINK_FLAGS   += $(SNDFILE_LIBS)
-
 LIBS_native  += $(MODULEDIR)/lilv.a
 LIBS_posix32 += $(MODULEDIR)/lilv.posix32.a
 LIBS_posix64 += $(MODULEDIR)/lilv.posix64.a
@@ -99,6 +95,7 @@ NATIVE_BUILD_FLAGS += $(LINUXSAMPLER_FLAGS)
 NATIVE_LINK_FLAGS  += $(LINUXSAMPLER_LIBS)
 endif
 
+LIBS_native        += $(MODULEDIR)/audio_decoder.a
 LIBS_native        += $(MODULEDIR)/native-plugins.a
 NATIVE_LINK_FLAGS  += $(NATIVE_PLUGINS_LIBS)
 
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index 2a3eecee4..dbf1fd897 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -51,12 +51,13 @@ LIBS  = $(MODULEDIR)/carla_engine_plugin.a
 LIBS += $(MODULEDIR)/carla_plugin.a
 LIBS += $(MODULEDIR)/jackbridge.a
 
-LIBS += $(MODULEDIR)/audio_decoder.a
 LIBS += $(MODULEDIR)/lilv.a
-LIBS += $(MODULEDIR)/native-plugins.a
 LIBS += $(MODULEDIR)/rtmempool.a
 LIBS += $(MODULEDIR)/water.a
 
+LIBS += $(MODULEDIR)/audio_decoder.a
+LIBS += $(MODULEDIR)/native-plugins.a
+
 ifeq ($(HAVE_DGL),true)
 LIBS += $(MODULEDIR)/dgl.a
 endif
@@ -74,12 +75,10 @@ LINK_FLAGS += $(NATIVE_PLUGINS_LIBS)
 LINK_FLAGS += $(RTMEMPOOL_LIBS)
 LINK_FLAGS += $(WATER_LIBS)
 
-LINK_FLAGS += $(FFMPEG_LIBS)
 LINK_FLAGS += $(LIBLO_LIBS)
 LINK_FLAGS += $(MAGIC_LIBS)
 LINK_FLAGS += $(FLUIDSYNTH_LIBS)
 LINK_FLAGS += $(LINUXSAMPLER_LIBS)
-LINK_FLAGS += $(SNDFILE_LIBS)
 LINK_FLAGS += $(X11_LIBS)
 
 # ----------------------------------------------------------------------------------------------------------------------------