diff --git a/po/POTFILES.in b/po/POTFILES.in
index c2ad47e3096fe38dbe9a3196bed574e3465a23e6..040e65cb10cad469d4a1df39ea9025468682a300 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,16 +1,11 @@
 # main sources
 include/vlc_access.h
 include/vlc_actions.h
-include/vlc_addons.h
 include/vlc_aout.h
-include/vlc_aout_volume.h
 include/vlc_arrays.h
-include/vlc_atomic.h
-include/vlc_avcodec.h
 include/vlc_bits.h
 include/vlc_block.h
 include/vlc_block_helper.h
-include/vlc_boxes.h
 include/vlc_charset.h
 include/vlc_codec.h
 include/vlc_codecs.h
@@ -18,78 +13,46 @@ include/vlc_common.h
 include/vlc_config.h
 include/vlc_config_cat.h
 include/vlc_configuration.h
-include/vlc_cpu.h
 include/vlc_demux.h
 include/vlc/deprecated.h
-include/vlc_dialog.h
 include/vlc_epg.h
 include/vlc_es.h
 include/vlc_es_out.h
 include/vlc_events.h
-include/vlc_extensions.h
 include/vlc_filter.h
-include/vlc_fingerprinter.h
 include/vlc_fixups.h
-include/vlc_fourcc.h
-include/vlc_fs.h
 include/vlc_gcrypt.h
-include/vlc_http.h
 include/vlc_httpd.h
 include/vlc_image.h
-include/vlc_inhibit.h
 include/vlc_input.h
 include/vlc_intf_strings.h
 include/vlc_iso_lang.h
-include/vlc_keystore.h
 include/vlc_main.h
 include/vlc_md5.h
-include/vlc_media_library.h
-include/vlc_memory.h
-include/vlc_memstream.h
 include/vlc_messages.h
 include/vlc_meta.h
-include/vlc_meta_fetcher.h
-include/vlc_mime.h
 include/vlc_modules.h
-include/vlc_mouse.h
 include/vlc_mtime.h
 include/vlc_network.h
 include/vlc_objects.h
-include/vlc_opengl.h
 include/vlc_pgpkey.h
-include/vlc_picture.h
-include/vlc_picture_fifo.h
-include/vlc_picture_pool.h
 include/vlc_playlist.h
 include/vlc_plugin.h
-include/vlc_probe.h
 include/vlc_rand.h
-include/vlc_renderer_discovery.h
 include/vlc_services_discovery.h
 include/vlc_sout.h
-include/vlc_spu.h
 include/vlc_stream.h
-include/vlc_stream_extractor.h
 include/vlc_strings.h
-include/vlc_subpicture.h
-include/vlc_text_style.h
 include/vlc_threads.h
-include/vlc_timestamp_helper.h
 include/vlc_tls.h
 include/vlc_update.h
 include/vlc_url.h
 include/vlc_variables.h
-include/vlc_video_splitter.h
-include/vlc_viewpoint.h
 include/vlc/vlc.h
 include/vlc_vlm.h
 include/vlc_vod.h
 include/vlc_vout.h
-include/vlc_vout_display.h
-include/vlc_vout_osd.h
 include/vlc_vout_window.h
-include/vlc_vout_wrapper.h
-include/vlc_xlib.h
 include/vlc_xml.h
 src/audio_output/aout_internal.h
 src/audio_output/common.c
@@ -190,24 +153,17 @@ src/win32/thread.c
 
 lib/audio.c
 lib/core.c
-lib/dialog.c
-lib/error.c
 lib/event.c
 lib/libvlc_internal.h
 lib/log.c
 lib/media.c
 lib/media_discoverer.c
-lib/media_internal.h
 lib/media_library.c
 lib/media_list.c
-lib/media_list_internal.h
 lib/media_list_path.h
 lib/media_list_player.c
 lib/media_player.c
-lib/media_player_internal.h
 lib/playlist.c
-lib/renderer_discoverer.c
-lib/renderer_discoverer_internal.h
 lib/video.c
 lib/vlm.c
 
@@ -215,7 +171,6 @@ lib/vlm.c
 modules/access/alsa.c
 modules/access/attachment.c
 modules/access/avcapture.m
-modules/access/avio.c
 modules/access/avio.h
 modules/access/bluray.c
 modules/access/cdda.c
@@ -223,21 +178,16 @@ modules/access/concat.c
 modules/access/dc1394.c
 modules/access/dcp/dcp.cpp
 modules/access/decklink.cpp
-modules/access/directory.c
-modules/access/dshow/crossbar.cpp
 modules/access/dshow/dshow.cpp
-modules/access/dshow/filter.cpp
-modules/access/dshow/filter.h
 modules/access/dsm/access.c
 modules/access/dsm/sd.c
 modules/access/dtv/access.c
 modules/access/dv.c
 modules/access/dvb/access.c
+modules/access/dvb/scan.c
 modules/access/dvdnav.c
 modules/access/dvdread.c
-modules/access/file.c
 modules/access/fs.c
-modules/access/fs.h
 modules/access/ftp.c
 modules/access/http.c
 modules/access/http/access.c
@@ -248,45 +198,19 @@ modules/access/jack.c
 modules/access/linsys/linsys_hdsdi.c
 modules/access/linsys/linsys_sdi.c
 modules/access/live555.cpp
-modules/access/mms/asf.c
-modules/access/mms/asf.h
-modules/access/mms/buffer.c
-modules/access/mms/buffer.h
 modules/access/mms/mms.c
-modules/access/mms/mms.h
-modules/access/mms/mmsh.c
-modules/access/mms/mmsh.h
-modules/access/mms/mmstu.c
-modules/access/mms/mmstu.h
 modules/access/mtp.c
 modules/access/nfs.c
 modules/access/oss.c
 modules/access/pulse.c
 modules/access/qtsound.m
 modules/access/rdp.c
-modules/access/rtp/input.c
 modules/access/rtp/rtp.c
-modules/access/rtp/rtp.h
-modules/access/rtp/session.c
 modules/access/rtsp/access.c
-modules/access/rtsp/real_asmrp.c
-modules/access/rtsp/real.c
-modules/access/rtsp/real.h
-modules/access/rtsp/real_rmff.c
-modules/access/rtsp/real_rmff.h
-modules/access/rtsp/real_sdpplin.c
-modules/access/rtsp/real_sdpplin.h
-modules/access/rtsp/rtsp.c
-modules/access/rtsp/rtsp.h
 modules/access/satip.c
-modules/access/screen/mac.c
 modules/access/screen/screen.c
-modules/access/screen/screen.h
 modules/access/screen/wayland.c
-modules/access/screen/win32.c
 modules/access/screen/xcb.c
-modules/access/sdi.c
-modules/access/sdi.h
 modules/access/sdp.c
 modules/access/sftp.c
 modules/access/shm.c
@@ -298,13 +222,17 @@ modules/access/timecode.c
 modules/access/udp.c
 modules/access/v4l2/controls.c
 modules/access/v4l2/v4l2.c
-modules/access/vcd/cdrom.c
-modules/access/vcd/cdrom.h
-modules/access/vcd/cdrom_internals.h
 modules/access/vcd/vcd.c
 modules/access/vdr.c
 modules/access/vnc.c
 modules/access/wasapi.c
+modules/access_output/dummy.c
+modules/access_output/file.c
+modules/access_output/http.c
+modules/access_output/livehttp.c
+modules/access_output/shout.c
+modules/access_output/srt.c
+modules/access_output/udp.c
 modules/arm_neon/chroma_yuv.c
 modules/arm_neon/volume.c
 modules/arm_neon/yuv_rgb.c
@@ -327,22 +255,12 @@ modules/audio_filter/karaoke.c
 modules/audio_filter/normvol.c
 modules/audio_filter/param_eq.c
 modules/audio_filter/resampler/bandlimited.c
-modules/audio_filter/resampler/bandlimited.h
 modules/audio_filter/resampler/soxr.c
 modules/audio_filter/resampler/speex.c
 modules/audio_filter/resampler/src.c
 modules/audio_filter/resampler/ugly.c
 modules/audio_filter/scaletempo.c
-modules/audio_filter/spatializer/allpass.cpp
-modules/audio_filter/spatializer/allpass.hpp
-modules/audio_filter/spatializer/comb.cpp
-modules/audio_filter/spatializer/comb.hpp
-modules/audio_filter/spatializer/denormals.c
-modules/audio_filter/spatializer/denormals.h
-modules/audio_filter/spatializer/revmodel.cpp
-modules/audio_filter/spatializer/revmodel.hpp
 modules/audio_filter/spatializer/spatializer.cpp
-modules/audio_filter/spatializer/tuning.h
 modules/audio_filter/stereo_widen.c
 modules/audio_mixer/float.c
 modules/audio_mixer/integer.c
@@ -352,6 +270,7 @@ modules/audio_output/amem.c
 modules/audio_output/audiotrack.c
 modules/audio_output/audiounit_ios.m
 modules/audio_output/auhal.c
+modules/audio_output/coreaudio_common.c
 modules/audio_output/directsound.c
 modules/audio_output/file.c
 modules/audio_output/jack.c
@@ -361,6 +280,7 @@ modules/audio_output/opensles_android.c
 modules/audio_output/oss.c
 modules/audio_output/pulse.c
 modules/audio_output/sndio.c
+modules/audio_output/vlcpulse.c
 modules/audio_output/tizen_audio.c
 modules/audio_output/volume.h
 modules/audio_output/wasapi.c
@@ -373,22 +293,14 @@ modules/codec/aes3.c
 modules/codec/aom.c
 modules/codec/araw.c
 modules/codec/arib/aribsub.c
-modules/codec/avcodec/audio.c
 modules/codec/avcodec/avcodec.c
 modules/codec/avcodec/avcodec.h
-modules/codec/avcodec/avcommon.h
-modules/codec/avcodec/avcommon_compat.h
-modules/codec/avcodec/chroma.c
-modules/codec/avcodec/chroma.h
 modules/codec/avcodec/d3d11va.c
 modules/codec/avcodec/dxva2.c
 modules/codec/avcodec/encoder.c
-modules/codec/avcodec/fourcc.c
 modules/codec/avcodec/vaapi.c
-modules/codec/avcodec/video.c
 modules/codec/bpg.c
 modules/codec/cc.c
-modules/codec/cc.h
 modules/codec/cdg.c
 modules/codec/cea708.c
 modules/codec/cea708.h
@@ -397,9 +309,7 @@ modules/codec/cvdsub.c
 modules/codec/daala.c
 modules/codec/dca.c
 modules/codec/ddummy.c
-modules/codec/dmo/buffer.c
 modules/codec/dmo/dmo.c
-modules/codec/dmo/dmo.h
 modules/codec/dvbsub.c
 modules/codec/edummy.c
 modules/codec/faad.c
@@ -418,13 +328,7 @@ modules/codec/mft.c
 modules/codec/mpg123.c
 modules/codec/oggspots.c
 modules/codec/omxil/mediacodec.c
-modules/codec/omxil/mediacodec_jni.c
-modules/codec/omxil/mediacodec_ndk.c
-modules/codec/omxil/mediacodec.h
 modules/codec/omxil/omxil.c
-modules/codec/omxil/omxil.h
-modules/codec/omxil/omxil_utils.h
-modules/codec/omxil/utils.c
 modules/codec/omxil/vout.c
 modules/codec/opus.c
 modules/codec/png.c
@@ -439,14 +343,13 @@ modules/codec/sdl_image.c
 modules/codec/shine.c
 modules/codec/spdif.c
 modules/codec/speex.c
-modules/codec/spudec/parse.c
 modules/codec/spudec/spudec.c
-modules/codec/spudec/spudec.h
 modules/codec/stl.c
 modules/codec/subsdec.c
 modules/codec/subsusf.c
 modules/codec/substx3g.c
 modules/codec/svcdsub.c
+modules/codec/svg.c
 modules/codec/t140.c
 modules/codec/telx.c
 modules/codec/textst.c
@@ -466,13 +369,7 @@ modules/codec/x265.c
 modules/codec/xwd.c
 modules/codec/zvbi.c
 modules/control/dbus/dbus.c
-modules/control/dbus/dbus_common.h
-modules/control/dbus/dbus_player.c
-modules/control/dbus/dbus_player.h
 modules/control/dbus/dbus_root.c
-modules/control/dbus/dbus_root.h
-modules/control/dbus/dbus_tracklist.c
-modules/control/dbus/dbus_tracklist.h
 modules/control/dummy.c
 modules/control/gestures.c
 modules/control/globalhotkeys/win32.c
@@ -484,18 +381,13 @@ modules/control/motion.c
 modules/control/netsync.c
 modules/control/ntservice.c
 modules/control/oldrc.c
-modules/control/unimotion.c
-modules/control/unimotion.h
+modules/control/win_msg.c
 modules/demux/adaptive/adaptive.cpp
 modules/demux/aiff.c
 modules/demux/asf/asf.c
-modules/demux/asf/libasf.c
-modules/demux/asf/libasf.h
 modules/demux/au.c
 modules/demux/avformat/avformat.c
 modules/demux/avformat/avformat.h
-modules/demux/avformat/demux.c
-modules/demux/avformat/mux.c
 modules/demux/avi/avi.c
 modules/demux/avi/libavi.c
 modules/demux/avi/libavi.h
@@ -503,42 +395,23 @@ modules/demux/caf.c
 modules/demux/cdg.c
 modules/demux/demuxdump.c
 modules/demux/dirac.c
+modules/demux/directory.c
 modules/demux/filter/noseek.c
 modules/demux/flac.c
 modules/demux/gme.c
 modules/demux/image.c
 modules/demux/mjpeg.c
-modules/demux/mkv/chapter_command.cpp
-modules/demux/mkv/chapter_command.hpp
-modules/demux/mkv/chapters.cpp
-modules/demux/mkv/chapters.hpp
-modules/demux/mkv/demux.cpp
-modules/demux/mkv/demux.hpp
-modules/demux/mkv/Ebml_parser.cpp
-modules/demux/mkv/Ebml_parser.hpp
-modules/demux/mkv/matroska_segment.cpp
-modules/demux/mkv/matroska_segment.hpp
-modules/demux/mkv/matroska_segment_parse.cpp
 modules/demux/mkv/mkv.cpp
-modules/demux/mkv/mkv.hpp
-modules/demux/mkv/stream_io_callback.cpp
-modules/demux/mkv/stream_io_callback.hpp
-modules/demux/mkv/util.cpp
-modules/demux/mkv/util.hpp
-modules/demux/mkv/virtual_segment.cpp
-modules/demux/mkv/virtual_segment.hpp
 modules/demux/mod.c
 modules/demux/mp4/libmp4.c
 modules/demux/mp4/libmp4.h
 modules/demux/mp4/meta.c
-modules/demux/mp4/minibox.h
 modules/demux/mp4/mp4.c
 modules/demux/mpc.c
 modules/demux/mpeg/es.c
 modules/demux/mpeg/h26x.c
 modules/demux/mpeg/mpgv.c
 modules/demux/mpeg/ps.c
-modules/demux/mpeg/ps.h
 modules/demux/mpeg/ts.c
 modules/demux/mpeg/ts_psi.c
 modules/demux/nsc.c
@@ -715,8 +588,6 @@ modules/gui/minimal_macosx/VLCMinimalVoutWindow.m
 modules/gui/minimal_macosx/intf.h
 modules/gui/minimal_macosx/intf.m
 modules/gui/minimal_macosx/macosx.c
-modules/gui/minimal_macosx/misc.h
-modules/gui/minimal_macosx/misc.m
 modules/gui/ncurses.c
 modules/gui/qt/actions_manager.cpp
 modules/gui/qt/actions_manager.hpp
@@ -868,7 +739,6 @@ modules/gui/qt/util/registry.cpp
 modules/gui/qt/util/registry.hpp
 modules/gui/qt/util/searchlineedit.cpp
 modules/gui/qt/util/searchlineedit.hpp
-modules/gui/qt/util/searchlineedit_mac.mm
 modules/gui/qt/util/singleton.hpp
 modules/gui/qt/util/timetooltip.cpp
 modules/gui/qt/util/timetooltip.hpp
@@ -1087,17 +957,10 @@ modules/gui/skins2/x11/x11_tooltip.cpp
 modules/gui/skins2/x11/x11_tooltip.hpp
 modules/gui/skins2/x11/x11_window.cpp
 modules/gui/skins2/x11/x11_window.hpp
-modules/hw/d3d11/d3d11_deinterlace.c
 modules/hw/d3d11/d3d11_filters.c
-modules/hw/d3d11/d3d11_filters.h
-modules/hw/d3d11/d3d11_instance.c
-modules/hw/d3d11/d3d11_surface.c
 modules/hw/d3d9/d3d9_filters.c
-modules/hw/d3d9/d3d9_filters.h
-modules/hw/d3d9/d3d9_instance.c
-modules/hw/d3d9/dxa9.c
-modules/hw/d3d9/dxva2_deinterlace.c
 modules/hw/mmal/codec.c
+modules/hw/mmal/deinterlace.c
 modules/hw/mmal/vout.c
 modules/hw/vaapi/filters.c
 modules/hw/vdpau/adjust.c
@@ -1118,31 +981,12 @@ modules/logger/journal.c
 modules/logger/syslog.c
 modules/lua/demux.c
 modules/lua/extension.c
+modules/lua/libs/gettext.c
 modules/lua/intf.c
 modules/lua/libs/configuration.c
 modules/lua/libs.h
 modules/lua/libs/httpd.c
-modules/lua/libs/input.c
-modules/lua/libs/input.h
-modules/lua/libs/messages.c
-modules/lua/libs/misc.c
-modules/lua/libs/misc.h
-modules/lua/libs/net.c
-modules/lua/libs/objects.c
-modules/lua/libs/objects.h
-modules/lua/libs/osd.c
-modules/lua/libs/playlist.c
-modules/lua/libs/sd.c
-modules/lua/libs/stream.c
-modules/lua/libs/strings.c
-modules/lua/libs/variables.c
-modules/lua/libs/variables.h
-modules/lua/libs/video.c
-modules/lua/libs/vlm.c
-modules/lua/libs/volume.c
-modules/lua/meta.c
 modules/lua/vlc.c
-modules/lua/vlc.h
 modules/meta_engine/folder.c
 modules/meta_engine/ID3Genres.h
 modules/meta_engine/taglib.cpp
@@ -1168,11 +1012,6 @@ modules/mux/dummy.c
 modules/mux/mp4/libmp4mux.c
 modules/mux/mp4/libmp4mux.h
 modules/mux/mp4/mp4.c
-modules/mux/mpeg/bits.h
-modules/mux/mpeg/csa.c
-modules/mux/mpeg/csa.h
-modules/mux/mpeg/pes.c
-modules/mux/mpeg/pes.h
 modules/mux/mpeg/ps.c
 modules/mux/mpeg/ts.c
 modules/mux/mpjpeg.c
@@ -1228,6 +1067,7 @@ modules/stream_filter/record.c
 modules/stream_filter/skiptags.c
 modules/stream_out/autodel.c
 modules/stream_out/bridge.c
+modules/stream_out/chromaprint.c
 modules/stream_out/chromecast/cast.cpp
 modules/stream_out/chromecast/chromecast_demux.cpp
 modules/stream_out/cycle.c
@@ -1250,6 +1090,7 @@ modules/stream_out/smem.c
 modules/stream_out/stats.c
 modules/stream_out/standard.c
 modules/stream_out/transcode/transcode.c
+modules/text_renderer/freetype/fonts/fontconfig.c
 modules/text_renderer/freetype/freetype.c
 modules/text_renderer/nsspeechsynthesizer.m
 modules/text_renderer/sapi.cpp
@@ -1258,6 +1099,8 @@ modules/text_renderer/tdummy.c
 modules/video_chroma/chain.c
 modules/video_chroma/cvpx.c
 modules/video_chroma/grey_yuv.c
+modules/video_chroma/i420_10_p010.c
+modules/video_chroma/i420_nv12.c
 modules/video_chroma/i420_rgb16.c
 modules/video_chroma/i420_rgb8.c
 modules/video_chroma/i420_rgb.c
@@ -1283,6 +1126,7 @@ modules/video_filter/blendbench.c
 modules/video_filter/blend.cpp
 modules/video_filter/bluescreen.c
 modules/video_filter/canvas.c
+modules/video_filter/ci_filters.m
 modules/video_filter/colorthres.c
 modules/video_filter/croppadd.c
 modules/video_filter/deinterlace/algo_phosphor.h
@@ -1291,8 +1135,6 @@ modules/video_filter/deinterlace/deinterlace.h
 modules/video_filter/edgedetection.c
 modules/video_filter/erase.c
 modules/video_filter/extract.c
-modules/video_filter/filter_event_info.h
-modules/video_filter/filter_picture.h
 modules/video_filter/fps.c
 modules/video_filter/freeze.c
 modules/video_filter/gaussianblur.c
@@ -1322,7 +1164,6 @@ modules/video_filter/transform.c
 modules/video_filter/vhs.c
 modules/video_filter/wave.c
 modules/video_output/aa.c
-modules/video_output/android/display.c
 modules/video_output/android/window.c
 modules/video_output/caca.c
 modules/video_output/caopengllayer.m
@@ -1334,12 +1175,9 @@ modules/video_output/glx.c
 modules/video_output/ios.m
 modules/video_output/kva.c
 modules/video_output/macosx.m
-modules/video_output/opengl/converter_android.c
-modules/video_output/opengl/converter_cvpx.c
-modules/video_output/opengl/converter_vaapi.c
-modules/video_output/opengl/converter_vdpau.c
 modules/video_output/opengl/display.c
 modules/video_output/opengl/egl.c
+modules/video_output/opengl/vout_helper.h
 modules/video_output/win32/direct3d9.c
 modules/video_output/win32/direct3d11.c
 modules/video_output/win32/directdraw.c
@@ -1362,11 +1200,8 @@ modules/video_splitter/wall.c
 modules/visualization/glspectrum.c
 modules/visualization/goom.c
 modules/visualization/projectm.cpp
-modules/visualization/visual/effects.c
-modules/visualization/visual/fft.c
-modules/visualization/visual/fft.h
 modules/visualization/visual/visual.c
-modules/visualization/visual/visual.h
+modules/visualization/visual/window_presets.h
 modules/visualization/vsxu.cpp
 share/vlc.appdata.xml.in.in
 share/lua/http/dialogs/batch_window.html