diff --git a/configure.ac b/configure.ac
index 177a833ff4e9edaff9bb138f9c9727f07ed30363..753e21d342febc10f0a0fbd1223d921cf5e1e8d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1167,67 +1167,14 @@ test "${enable_cprof}" != "yes" && enable_cprof="no"
dnl
dnl default modules
dnl
-VLC_ADD_PLUGIN([vmem])
-VLC_ADD_PLUGIN([yuv])
-
ALIASES="${ALIASES} cvlc"
-dnl
-dnl default modules that need g++
-dnl
-AC_LANG_PUSH(C++)
-VLC_ADD_PLUGIN([spatializer])
-AC_LANG_POP(C++)
-
if test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([gestures])
VLC_ADD_PLUGIN([oldrc])
- VLC_ADD_PLUGIN([hotkeys])
- VLC_ADD_PLUGIN([showintf])
- VLC_ADD_PLUGIN([marq])
- VLC_ADD_PLUGIN([podcast])
- VLC_ADD_PLUGIN([shout])
- VLC_ADD_PLUGIN([sap])
VLC_ADD_PLUGIN([mediadirs])
- VLC_ADD_PLUGIN([fake])
- VLC_ADD_PLUGIN([folder])
- VLC_ADD_PLUGIN([rss])
- VLC_ADD_PLUGIN([mosaic])
- VLC_ADD_PLUGIN([wall])
- VLC_ADD_PLUGIN([motiondetect])
- VLC_ADD_PLUGIN([clone])
- VLC_ADD_PLUGIN([crop])
- VLC_ADD_PLUGIN([erase])
- VLC_ADD_PLUGIN([bluescreen])
- VLC_ADD_PLUGIN([alphamask])
- VLC_ADD_PLUGIN([gaussianblur])
- VLC_ADD_PLUGIN([dolby_surround_decoder])
- VLC_ADD_PLUGIN([equalizer])
- VLC_ADD_PLUGIN([param_eq])
- VLC_ADD_PLUGIN([scaletempo])
- VLC_ADD_PLUGIN([a52tospdif])
- VLC_ADD_PLUGIN([dtstospdif])
ALIASES="${ALIASES} rvlc"
fi
-VLC_ADD_PLUGIN([chain])
-VLC_ADD_PLUGIN([aout_file])
-VLC_ADD_PLUGIN([linear_resampler])
-VLC_ADD_PLUGIN([bandlimited_resampler])
-VLC_ADD_PLUGIN([float32_mixer])
-VLC_ADD_PLUGIN([spdif_mixer])
-VLC_ADD_PLUGIN([simple_channel_mixer])
-VLC_ADD_PLUGIN([headphone_channel_mixer])
-VLC_ADD_PLUGIN([normvol])
-VLC_ADD_PLUGIN([audiobargraph_a])
-VLC_ADD_PLUGIN([a52tospdif])
-VLC_ADD_PLUGIN([dtstospdif])
-VLC_ADD_PLUGIN([i420_yuy2])
-VLC_ADD_PLUGIN([i422_yuy2])
-VLC_ADD_PLUGIN([i422_i420])
-VLC_ADD_PLUGIN([yuy2_i422])
-VLC_ADD_PLUGIN([yuy2_i420])
-
dnl
dnl Some plugins aren't useful on some platforms
dnl
diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am
index 69303b9fb7d712766a33c2f72a132c72fb4127c9..eae73fc91553b53abddcdb2e9b507b00d14dd90f 100644
--- a/modules/audio_filter/Modules.am
+++ b/modules/audio_filter/Modules.am
@@ -7,5 +7,10 @@ SOURCES_scaletempo = scaletempo.c
SOURCES_chorus_flanger = chorus_flanger.c
libvlc_LTLIBRARIES += \
+ libaudiobargraph_a_plugin.la \
libchorus_flanger_plugin.la \
+ libequalizer_plugin.la \
+ libnormvol_plugin.la \
+ libparam_eq_plugin.la \
+ libscaletempo_plugin.la \
$(NULL)
diff --git a/modules/audio_filter/channel_mixer/Modules.am b/modules/audio_filter/channel_mixer/Modules.am
index 83920db2e592c4cd3723f4d1d308eb8529aabf3a..7505ff3ff1455777db1d3e47095a8fdd0168d7bd 100644
--- a/modules/audio_filter/channel_mixer/Modules.am
+++ b/modules/audio_filter/channel_mixer/Modules.am
@@ -5,6 +5,9 @@ SOURCES_dolby_surround_decoder = dolby.c
SOURCES_mono = mono.c
libvlc_LTLIBRARIES += \
+ libdolby_surround_decoder_plugin.la \
+ libheadphone_channel_mixer_plugin.la \
libmono_plugin.la \
+ libsimple_channel_mixer_plugin.la \
libtrivial_channel_mixer_plugin.la \
$(NULL)
diff --git a/modules/audio_filter/converter/Modules.am b/modules/audio_filter/converter/Modules.am
index 5fc32634067053f31d9871677a6bbbf16cd11cab..96f878af9edeebda2d0ec1cb9b5a7241e2833f92 100644
--- a/modules/audio_filter/converter/Modules.am
+++ b/modules/audio_filter/converter/Modules.am
@@ -8,7 +8,9 @@ SOURCES_mpgatofixed32 = mpgatofixed32.c
SOURCES_audio_format = format.c
libvlc_LTLIBRARIES += \
+ liba52tospdif_plugin.la \
libaudio_format_plugin.la \
libconverter_fixed_plugin.la \
libconverter_float_plugin.la \
+ libdtstospdif_plugin.la \
$(NULL)
diff --git a/modules/audio_filter/resampler/Modules.am b/modules/audio_filter/resampler/Modules.am
index 24a1e03aaac91d3917dc379d2018629e489d029f..e759f993719a4de3b817ef8adfef2787eacb690a 100644
--- a/modules/audio_filter/resampler/Modules.am
+++ b/modules/audio_filter/resampler/Modules.am
@@ -2,5 +2,6 @@ SOURCES_ugly_resampler = ugly.c
SOURCES_bandlimited_resampler = bandlimited.c bandlimited.h
libvlc_LTLIBRARIES += \
+ libbandlimited_resampler_plugin.la \
libugly_resampler_plugin.la \
$(NULL)
diff --git a/modules/audio_filter/spatializer/Modules.am b/modules/audio_filter/spatializer/Modules.am
index fcc7b44960a05544824a172440318646b4e56e55..3590a6478b3f440d1b36f6fcea4d687dd1c7d0da 100644
--- a/modules/audio_filter/spatializer/Modules.am
+++ b/modules/audio_filter/spatializer/Modules.am
@@ -1,4 +1,4 @@
SOURCES_spatializer = spatializer.cpp \
allpass.cpp allpass.hpp comb.cpp comb.hpp \
denormals.h denormals.c tuning.h revmodel.cpp revmodel.hpp
-
+libvlc_LTLIBRARIES += libspatializer_plugin.la
diff --git a/modules/audio_mixer/Modules.am b/modules/audio_mixer/Modules.am
index 0ff953cad4f9a293e1df52a332e3ab5e34c527c2..c6e67e9c06c7d8ca371d1e1e6ed46349b44a09e0 100644
--- a/modules/audio_mixer/Modules.am
+++ b/modules/audio_mixer/Modules.am
@@ -2,4 +2,7 @@ SOURCES_trivial_mixer = trivial.c
SOURCES_float32_mixer = float32.c
SOURCES_spdif_mixer = spdif.c
-libvlc_LTLIBRARIES += libtrivial_mixer_plugin.la
+libvlc_LTLIBRARIES += \
+ libfloat32_mixer_plugin.la \
+ libspdif_mixer_plugin.la \
+ libtrivial_mixer_plugin.la
diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index 548a62401db726c8531f8eb2ef6aae12d2c196e1..5a2aac9ff8642d17b1215b39fe0adac3a2b602aa 100644
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -9,3 +9,5 @@ SOURCES_portaudio = portaudio.c
SOURCES_auhal = auhal.c
SOURCES_jack = jack.c
SOURCES_pulse = pulse.c
+
+libvlc_LTLIBRARIES += libaout_file_plugin.la
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 3404dba10e9c51599865c89e44a5694387603f17..5392ab8e643c49c2a12e0ceef7bf3ea7d7ec9fa5 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -46,6 +46,7 @@ libvlc_LTLIBRARIES += \
libcdg_plugin.la \
libcvdsub_plugin.la \
libdts_plugin.la \
+ libfake_plugin.la \
libflac_plugin.la \
libdvbsub_plugin.la \
liblpcm_plugin.la \
diff --git a/modules/control/Modules.am b/modules/control/Modules.am
index acaaa5c803df8b6902b000d94f58f1cc64f27306..0ed8ca28d343916d6140b2fb8556f23705a8e56e 100644
--- a/modules/control/Modules.am
+++ b/modules/control/Modules.am
@@ -17,3 +17,7 @@ SOURCES_motion = \
motion.c \
$(motion_extra) \
$(NULL)
+
+libvlc_LTLIBRARIES += \
+ libgestures_plugin.la \
+ libhotkeys_plugin.la
diff --git a/modules/meta_engine/Modules.am b/modules/meta_engine/Modules.am
index c3d21e540e9db0ebd0206af4260b3b8be1db2a40..8cc1c1208723bf95c378767e5868f372f78a49f2 100644
--- a/modules/meta_engine/Modules.am
+++ b/modules/meta_engine/Modules.am
@@ -1,3 +1,6 @@
SOURCES_folder = folder.c
SOURCES_id3tag = id3tag.c id3genres.h $(NULL)
SOURCES_taglib = taglib.cpp
+
+libvlc_LTLIBRARIES += \
+ libfolder_plugin.la
diff --git a/modules/services_discovery/Modules.am b/modules/services_discovery/Modules.am
index 45302d193b3e480b2992266ed1e29f6f4c730dd5..5db46b6b21801235b7a2059cbc3feae7ff3e9504 100644
--- a/modules/services_discovery/Modules.am
+++ b/modules/services_discovery/Modules.am
@@ -18,4 +18,7 @@ libxcb_apps_plugin_la_DEPENDENCIES =
EXTRA_LTLIBRARIES += \
libxcb_apps_plugin.la
libvlc_LTLIBRARIES += \
+ libpodcast_plugin.la \
+ libsap_plugin.la \
+ libshout_plugin.la \
$(LTLIBxcb_apps)
diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am
index b90632de484d6d1fcecd39b6c764bcfadb9d9b3d..32f965fc4b7c621bd836baae075ad542bba2adda 100644
--- a/modules/video_chroma/Modules.am
+++ b/modules/video_chroma/Modules.am
@@ -34,5 +34,10 @@ SOURCES_yuy2_i420 = \
libvlc_LTLIBRARIES += \
libi420_rgb_plugin.la \
+ libi420_yuy2_plugin.la \
+ libi422_i420_plugin.la \
+ libi422_yuy2_plugin.la \
libgrey_yuv_plugin.la \
+ libyuy2_i420_plugin.la \
+ libyuy2_i422_plugin.la \
$(NULL)
diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index cbb26031cd87217e7e6a9467b1490a36f6d5ffc2..d83a9057c0e37380df8eff97ffd2e7fcf552d7a9 100644
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -71,32 +71,44 @@ noinst_HEADERS = filter_common.h filter_picture.h
libvlc_LTLIBRARIES += \
libadjust_plugin.la \
+ libalphamask_plugin.la \
libaudiobargraph_v_plugin.la \
libball_plugin.la \
libblend_plugin.la \
libblendbench_plugin.la \
+ libbluescreen_plugin.la \
libcanvas_plugin.la \
+ libchain_plugin.la \
+ libclone_plugin.la \
libcolorthres_plugin.la \
+ libcrop_plugin.la \
libcroppadd_plugin.la \
libdeinterlace_plugin.la \
+ liberase_plugin.la \
libextract_plugin.la \
libgradient_plugin.la \
libgrain_plugin.la \
+ libgaussianblur_plugin.la \
libinvert_plugin.la \
liblogo_plugin.la \
libmagnify_plugin.la \
+ libmarq_plugin.la \
libmirror_plugin.la \
+ libmosaic_plugin.la \
libmotionblur_plugin.la \
+ libmotiondetect_plugin.la \
libnoise_plugin.la \
libpsychedelic_plugin.la \
libpuzzle_plugin.la \
libripple_plugin.la \
librotate_plugin.la \
+ librss_plugin.la \
librv32_plugin.la \
libscale_plugin.la \
libscene_plugin.la \
libsharpen_plugin.la \
libtransform_plugin.la \
+ libwall_plugin.la \
libwave_plugin.la \
libyuvp_plugin.la \
libvideo_filter_wrapper_plugin.la
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index c7aa9a3cbd9f0e4f18a2403b7e0618559b6bac82..3ac66d3b64ad73325d90399a7a3c8df52fe59ec1 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -83,4 +83,7 @@ if HAVE_WIN32
libvlc_LTLIBRARIES += libdrawable_plugin.la
endif
-libvlc_LTLIBRARIES += libvout_wrapper_plugin.la
+libvlc_LTLIBRARIES += \
+ libvmem_plugin.la \
+ libyuv_plugin.la \
+ libvout_wrapper_plugin.la