From: Rémi Denis-Courmont <remi@remlab.net>
Date: Tue, 27 Jul 2010 19:11:58 +0000 (+0300)
Subject: Do not include vlc_modules.h in vlc_common.h
X-Git-Tag: 1.2.0-pre1~5657
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=59117b28623d003c2bf3374bf551f126da4322dc;p=vlc

Do not include vlc_modules.h in vlc_common.h
---

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 9a5617c8c8..20dfbc9e8f 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -902,7 +902,6 @@ VLC_EXPORT( const char *, VLC_Compiler, ( void ) LIBVLC_USED );
 #include "vlc_messages.h"
 #include "vlc_objects.h"
 #include "vlc_variables.h"
-#include "vlc_modules.h"
 #include "vlc_main.h"
 #include "vlc_configuration.h"
 
diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index 671f41a2b3..2d359c6fd3 100644
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -32,6 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
+#include <vlc_modules.h>
 #include "screen.h"
 
 /*****************************************************************************
diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index 8ba2d25fae..da59b1664b 100644
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -35,6 +35,7 @@
 #include <vlc_codec.h>
 #include <vlc_aout.h>
 #include <vlc_block_helper.h>
+#include <vlc_modules.h>
 
 #include "a52.h"
 
diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index a2325546e6..d12c89ae43 100644
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -37,6 +37,7 @@
 #include <vlc_aout.h>
 #include <vlc_block_helper.h>
 #include <vlc_bits.h>
+#include <vlc_modules.h>
 
 /*****************************************************************************
  * Module descriptor
diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c
index 4267f09169..2335c4e457 100644
--- a/modules/codec/mpeg_audio.c
+++ b/modules/codec/mpeg_audio.c
@@ -35,6 +35,7 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_aout.h>
+#include <vlc_modules.h>
 #include <assert.h>
 
 #include <vlc_block_helper.h>
diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subtitles/subsusf.c
index 0c5b773553..1af2ae7692 100644
--- a/modules/codec/subtitles/subsusf.c
+++ b/modules/codec/subtitles/subsusf.c
@@ -26,6 +26,7 @@
 
 #include "subsdec.h"
 #include <vlc_plugin.h>
+#include <vlc_modules.h>
 #include <assert.h>
 
 /*****************************************************************************
diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c
index e55941e32f..ccc747ee46 100644
--- a/modules/gui/fbosd.c
+++ b/modules/gui/fbosd.c
@@ -32,6 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_fs.h>
+#include <vlc_modules.h>
 
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                            /* strerror() */
diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m
index 1050e8a7cb..ecd955a2aa 100644
--- a/modules/gui/macosx/simple_prefs.m
+++ b/modules/gui/macosx/simple_prefs.m
@@ -26,6 +26,7 @@
 #import <vlc_keys.h>
 #import <vlc_interface.h>
 #import <vlc_dialog.h>
+#import <vlc_modules.h>
 #import "misc.h"
 #import "intf.h"
 #import "AppleRemote.h"
diff --git a/modules/gui/macosx_dialog_provider/dialogProvider.m b/modules/gui/macosx_dialog_provider/dialogProvider.m
index 77b7d3f570..48aff3614f 100644
--- a/modules/gui/macosx_dialog_provider/dialogProvider.m
+++ b/modules/gui/macosx_dialog_provider/dialogProvider.m
@@ -36,6 +36,7 @@
 #import <vlc_plugin.h>
 #import <vlc_dialog.h>
 #import <vlc_extensions.h>
+#import <vlc_modules.h>
 
 #import "dialogProvider.h"
 #import "VLCUIWidgets.h"
diff --git a/modules/gui/qt4/components/complete_preferences.cpp b/modules/gui/qt4/components/complete_preferences.cpp
index 2a5f611381..1892f8e0e1 100644
--- a/modules/gui/qt4/components/complete_preferences.cpp
+++ b/modules/gui/qt4/components/complete_preferences.cpp
@@ -42,6 +42,7 @@
 
 #include <vlc_config_cat.h>
 #include <vlc_intf_strings.h>
+#include <vlc_modules.h>
 #include <assert.h>
 
 #define ITEM_HEIGHT 25
diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 95c391a66c..e10dceb05b 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -46,6 +46,7 @@
 #include <vlc_intf_strings.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
+#include <vlc_modules.h>
 
 #include <vlc_charset.h> /* us_strtod */
 
diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 611d25b31c..59fe5c0bbe 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -36,6 +36,7 @@
 #include "dialogs_provider.hpp" /* Open Subtitle file */
 #include "util/qt_dirs.hpp"
 #include <vlc_intf_strings.h>
+#include <vlc_modules.h>
 
 #include <QFileDialog>
 #include <QDialogButtonBox>
diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 05451d06e2..5508ae664a 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -39,6 +39,7 @@
 #include "util/qt_dirs.hpp"
 #include <vlc_keys.h>
 #include <vlc_intf_strings.h>
+#include <vlc_modules.h>
 
 #include <QString>
 #include <QVariant>
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index e92b60390e..22e1af7421 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -49,6 +49,7 @@
 #ifdef WIN32
 # include <vlc_windows_interfaces.h>
 #endif
+#include <vlc_modules.h>
 
 /*********************************************************************
  * The List of categories
diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index 8fa16537f5..3db42237db 100644
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -32,6 +32,7 @@
 
 #include <QTabWidget>
 #include <QGridLayout>
+#include <vlc_modules.h>
 
 ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
 {
diff --git a/modules/gui/qt4/dialogs/plugins.cpp b/modules/gui/qt4/dialogs/plugins.cpp
index dfc59cd47d..c29bd2d7fe 100644
--- a/modules/gui/qt4/dialogs/plugins.cpp
+++ b/modules/gui/qt4/dialogs/plugins.cpp
@@ -33,7 +33,7 @@
 
 #include <assert.h>
 
-//#include <vlc_modules.h>
+#include <vlc_modules.h>
 
 #include <QTreeWidget>
 #include <QStringList>
diff --git a/modules/gui/qt4/extensions_manager.cpp b/modules/gui/qt4/extensions_manager.cpp
index 35589c84c7..98e3b8f9a7 100644
--- a/modules/gui/qt4/extensions_manager.cpp
+++ b/modules/gui/qt4/extensions_manager.cpp
@@ -25,6 +25,7 @@
 #include "input_manager.hpp"
 #include "dialogs/extensions.hpp"
 
+#include <vlc_modules.h>
 #include "assert.h"
 
 #include <QMenu>
diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp
index ca260d8fdf..f3aac6fe71 100644
--- a/modules/gui/skins2/src/dialogs.cpp
+++ b/modules/gui/skins2/src/dialogs.cpp
@@ -29,6 +29,7 @@
 #include "../commands/cmd_playlist.hpp"
 #include "../commands/cmd_playtree.hpp"
 #include <vlc_playlist.h>
+#include <vlc_modules.h>
 
 /// Callback called when a new skin is chosen
 void Dialogs::showChangeSkinCB( intf_dialog_args_t *pArg )
diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index e9ff68b27a..d071189f50 100644
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -39,6 +39,7 @@
 
 #include <vlc_image.h>
 #include <vlc_filter.h>
+#include <vlc_modules.h>
 
 #include "../video_filter/mosaic.h"
 
diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index 5f7530ef4c..0141dda2ec 100644
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -32,6 +32,7 @@
 
 #include <vlc_aout.h>
 #include <vlc_meta.h>
+#include <vlc_modules.h>
 
 static const int pi_channels_maps[6] =
 {
diff --git a/modules/stream_out/transcode/osd.c b/modules/stream_out/transcode/osd.c
index a8950841fc..52dc9722d4 100644
--- a/modules/stream_out/transcode/osd.c
+++ b/modules/stream_out/transcode/osd.c
@@ -31,6 +31,7 @@
 #include "transcode.h"
 
 #include <vlc_spu.h>
+#include <vlc_modules.h>
 
 /*
  * OSD menu
diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c
index 31211d9ce6..85f45d3238 100644
--- a/modules/stream_out/transcode/spu.c
+++ b/modules/stream_out/transcode/spu.c
@@ -32,6 +32,7 @@
 
 #include <vlc_meta.h>
 #include <vlc_spu.h>
+#include <vlc_modules.h>
 #include <assert.h>
 
 static subpicture_t *spu_new_buffer( decoder_t *p_dec,
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 6d4f855f61..a26c8d0f8b 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -32,6 +32,7 @@
 
 #include <vlc_meta.h>
 #include <vlc_spu.h>
+#include <vlc_modules.h>
 
 #define ENC_FRAMERATE (25 * 1000 + .5)
 #define ENC_FRAMERATE_BASE 1000
diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c
index 263b404567..4efff565bd 100644
--- a/modules/video_filter/blendbench.c
+++ b/modules/video_filter/blendbench.c
@@ -32,6 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_sout.h>
+#include <vlc_modules.h>
 
 #include <vlc_filter.h>
 #include <vlc_image.h>
diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index 58d5d482ae..5025c02c23 100644
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -31,6 +31,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_vout.h>
+#include <vlc_modules.h>
 
 #include <math.h>
 #include <time.h>
diff --git a/projects/macosx/framework/Sources/VLCExtensionsManager.m b/projects/macosx/framework/Sources/VLCExtensionsManager.m
index 088f762998..15ac64d8c8 100644
--- a/projects/macosx/framework/Sources/VLCExtensionsManager.m
+++ b/projects/macosx/framework/Sources/VLCExtensionsManager.m
@@ -12,6 +12,7 @@
 #import "VLCLibVLCBridging.h"
 #import <vlc_extensions.h>
 #import <vlc_input.h>
+#include <vlc_modules.h>
 
 // Here comes the nasty hack.
 #define MODULE_STRING "VLCKit"
diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index 5c144dcd1e..b5ceb86b96 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -32,6 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_dialog.h>
+#include <vlc_modules.h>
 
 #include <vlc_aout.h>
 #include <vlc_filter.h>
diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index d041d68f6c..d237466bec 100644
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -40,6 +40,7 @@
 
 #include <vlc_input.h>
 #include <vlc_vout.h>                  /* for vout_Request */
+#include <vlc_modules.h>
 
 #include <vlc_aout.h>
 #include <vlc_filter.h>
diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c
index 108e815a11..8b1fd3acdb 100644
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -32,6 +32,7 @@
 #include <stddef.h>
 #include <vlc_common.h>
 #include <libvlc.h>
+#include <vlc_modules.h>
 
 #include <vlc_aout.h>
 #include "aout_internal.h"
diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 8abdf7daf1..1bfb2d92a0 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -31,6 +31,7 @@
 #include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_cpu.h>
+#include <vlc_modules.h>
 
 #include "aout_internal.h"
 
diff --git a/src/config/cmdline.c b/src/config/cmdline.c
index 015ffcdb5a..4d7514d9d1 100644
--- a/src/config/cmdline.c
+++ b/src/config/cmdline.c
@@ -29,6 +29,7 @@
 #include "../libvlc.h"
 #include <vlc_keys.h>
 #include <vlc_charset.h>
+#include <vlc_modules.h>
 
 #include "vlc_getopt.h"
 
diff --git a/src/config/core.c b/src/config/core.c
index 75907dd20b..b84bf922a4 100644
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -26,7 +26,9 @@
 #endif
 
 #include <vlc_common.h>
-#include "vlc_keys.h"
+#include <vlc_keys.h>
+#include <vlc_modules.h>
+
 #include "vlc_configuration.h"
 
 #include <assert.h>
diff --git a/src/config/file.c b/src/config/file.c
index 0d3f6b6afb..305bbf8d73 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -40,7 +40,8 @@
 #include "../libvlc.h"
 #include <vlc_charset.h>
 #include <vlc_fs.h>
-#include "vlc_keys.h"
+#include <vlc_keys.h>
+#include <vlc_modules.h>
 
 #include "configuration.h"
 #include "modules/modules.h"
diff --git a/src/control/audio.c b/src/control/audio.c
index b7ebf34e31..6088750d9b 100644
--- a/src/control/audio.c
+++ b/src/control/audio.c
@@ -35,6 +35,7 @@
 #include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_aout.h>
+#include <vlc_modules.h>
 
 #include "libvlc_internal.h"
 #include "media_player_internal.h"
diff --git a/src/input/access.c b/src/input/access.c
index 1132b84d4a..b8a2f031e3 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -28,6 +28,7 @@
 #include "access.h"
 #include <libvlc.h>
 #include <vlc_url.h>
+#include <vlc_modules.h>
 
 /* Decode URL (which has had its scheme stripped earlier) to a file path. */
 static char *get_path(const char *location)
diff --git a/src/input/decoder.c b/src/input/decoder.c
index df6b781d0c..f7ec650a58 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -41,6 +41,7 @@
 #include <vlc_spu.h>
 #include <vlc_meta.h>
 #include <vlc_dialog.h>
+#include <vlc_modules.h>
 
 #include "audio_output/aout_internal.h"
 #include "stream_output/stream_output.h"
diff --git a/src/input/demux.c b/src/input/demux.c
index 675da9c1d5..458e162b99 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -30,6 +30,7 @@
 #include <vlc_codec.h>
 #include <vlc_meta.h>
 #include <vlc_url.h>
+#include <vlc_modules.h>
 
 static bool SkipID3Tag( demux_t * );
 static bool SkipAPETag( demux_t *p_demux );
diff --git a/src/input/input.c b/src/input/input.c
index 99725675e4..35da58bd31 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -53,6 +53,7 @@
 #include <vlc_charset.h>
 #include <vlc_fs.h>
 #include <vlc_strings.h>
+#include <vlc_modules.h>
 
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>
diff --git a/src/input/meta.c b/src/input/meta.c
index f6eaed6fa6..bff1b7d2eb 100644
--- a/src/input/meta.c
+++ b/src/input/meta.c
@@ -30,6 +30,7 @@
 #include <vlc_playlist.h>
 #include <vlc_url.h>
 #include <vlc_arrays.h>
+#include <vlc_modules.h>
 
 #include "input_internal.h"
 #include "../playlist/art.h"
diff --git a/src/input/stream_filter.c b/src/input/stream_filter.c
index 9126f76788..73255e5555 100644
--- a/src/input/stream_filter.c
+++ b/src/input/stream_filter.c
@@ -27,6 +27,7 @@
 
 #include <vlc_common.h>
 #include <vlc_stream.h>
+#include <vlc_modules.h>
 #include <libvlc.h>
 
 #include <assert.h>
diff --git a/src/input/vlm.c b/src/input/vlm.c
index 772ce7c76d..8e8a5d2f60 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -37,6 +37,7 @@
 #include <assert.h>
 
 #include <vlc_vlm.h>
+#include <vlc_modules.h>
 
 #ifndef WIN32
 #   include <sys/time.h>                                   /* gettimeofday() */
diff --git a/src/interface/interface.c b/src/interface/interface.c
index af2f097051..43b45f28d1 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -39,11 +39,9 @@
 
 #include <assert.h>
 #include <vlc_common.h>
+#include <vlc_modules.h>
+#include <vlc_interface.h>
 
-#include <vlc_aout.h>
-#include <vlc_vout.h>
-
-#include "vlc_interface.h"
 #if defined( __APPLE__ ) || defined( WIN32 )
 #include "../control/libvlc_internal.h"
 #endif
diff --git a/src/libvlc.c b/src/libvlc.c
index a567ec9b9e..4cffe55439 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -81,6 +81,7 @@
 #include <vlc_cpu.h>
 #include <vlc_url.h>
 #include <vlc_atomic.h>
+#include <vlc_modules.h>
 
 #include "libvlc.h"
 
diff --git a/src/misc/filter.c b/src/misc/filter.c
index d769b60265..adc7ad7a6d 100644
--- a/src/misc/filter.c
+++ b/src/misc/filter.c
@@ -28,6 +28,7 @@
 #include <vlc_common.h>
 #include <libvlc.h>
 #include <vlc_filter.h>
+#include <vlc_modules.h>
 
 filter_t *filter_NewBlend( vlc_object_t *p_this,
                            const video_format_t *p_dst_chroma )
diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index 11dc963ad8..5dd48137fd 100644
--- a/src/misc/filter_chain.c
+++ b/src/misc/filter_chain.c
@@ -27,6 +27,7 @@
 
 #include <vlc_filter.h>
 #include <vlc_osd.h>
+#include <vlc_modules.h>
 #include <libvlc.h>
 #include <assert.h>
 
diff --git a/src/misc/image.c b/src/misc/image.c
index 497ed2bed9..7a64572620 100644
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -46,6 +46,7 @@
 #include <vlc_fs.h>
 #include <vlc_sout.h>
 #include <libvlc.h>
+#include <vlc_modules.h>
 
 static picture_t *ImageRead( image_handler_t *, block_t *,
                              video_format_t *, video_format_t * );
diff --git a/src/misc/media_library.c b/src/misc/media_library.c
index 18f2299577..922b4935f2 100644
--- a/src/misc/media_library.c
+++ b/src/misc/media_library.c
@@ -33,6 +33,7 @@
 
 #include <assert.h>
 #include <vlc_media_library.h>
+#include <vlc_modules.h>
 #include "../libvlc.h"
 
 /**
diff --git a/src/misc/probe.c b/src/misc/probe.c
index d75d445155..fe44aa7c4c 100644
--- a/src/misc/probe.c
+++ b/src/misc/probe.c
@@ -24,6 +24,7 @@
 
 #include <vlc_common.h>
 #include <vlc_probe.h>
+#include <vlc_modules.h>
 #include "libvlc.h"
 
 #undef vlc_probe
diff --git a/src/misc/sql.c b/src/misc/sql.c
index b2177bda9d..1634ffa460 100644
--- a/src/misc/sql.c
+++ b/src/misc/sql.c
@@ -31,6 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_sql.h>
+#include <vlc_modules.h>
 #include <assert.h>
 #include "libvlc.h"
 
diff --git a/src/misc/xml.c b/src/misc/xml.c
index 0d2625f8b3..6efe0c25c2 100644
--- a/src/misc/xml.c
+++ b/src/misc/xml.c
@@ -26,7 +26,8 @@
 #endif
 
 #include <vlc_common.h>
-#include "vlc_xml.h"
+#include <vlc_xml.h>
+#include <vlc_modules.h>
 #include "../libvlc.h"
 
 #undef xml_Create
diff --git a/src/modules/modules.c b/src/modules/modules.c
index 6020b14683..2bc029f4f6 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -31,6 +31,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_memory.h>
+#include <vlc_modules.h>
 #include "libvlc.h"
 
 #include <stdlib.h>                                      /* free(), strtol() */
diff --git a/src/network/tls.c b/src/network/tls.c
index 1b11bde038..9c2590d943 100644
--- a/src/network/tls.c
+++ b/src/network/tls.c
@@ -34,6 +34,7 @@
 #include "libvlc.h"
 
 #include <vlc_tls.h>
+#include <vlc_modules.h>
 
 /**
  * Allocates a whole server's TLS credentials.
diff --git a/src/osd/osd.c b/src/osd/osd.c
index 4a40959fa1..086abf8c87 100644
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -33,6 +33,7 @@
 #include <vlc_keys.h>
 #include <vlc_osd.h>
 #include <vlc_image.h>
+#include <vlc_modules.h>
 
 #include "libvlc.h"
 
diff --git a/src/playlist/fetcher.c b/src/playlist/fetcher.c
index 2075c0dfdb..1551020960 100644
--- a/src/playlist/fetcher.c
+++ b/src/playlist/fetcher.c
@@ -34,6 +34,7 @@
 #include <vlc_art_finder.h>
 #include <vlc_memory.h>
 #include <vlc_demux.h>
+#include <vlc_modules.h>
 
 #include "art.h"
 #include "fetcher.h"
diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index eed2f8e972..44a8257a15 100644
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -31,6 +31,7 @@
 #include "config/configuration.h"
 #include <vlc_fs.h>
 #include <vlc_url.h>
+#include <vlc_modules.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 1155779385..2f384e679a 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -30,6 +30,7 @@
 #include "vlc_events.h"
 #include <vlc_services_discovery.h>
 #include <vlc_probe.h>
+#include <vlc_modules.h>
 #include "playlist_internal.h"
 #include "../libvlc.h"
 
diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 103d690899..38b2361186 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -46,6 +46,7 @@
 #include <vlc_meta.h>
 #include <vlc_block.h>
 #include <vlc_codec.h>
+#include <vlc_modules.h>
 
 #include "input/input_interface.h"
 
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 3e91c6f876..be379dc58f 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -34,6 +34,7 @@
 #include <vlc_vout_display.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
+#include <vlc_modules.h>
 
 #include <libvlc.h>
 
diff --git a/src/video_output/inhibit.c b/src/video_output/inhibit.c
index b9e5cc9b78..18830964b6 100644
--- a/src/video_output/inhibit.c
+++ b/src/video_output/inhibit.c
@@ -23,6 +23,7 @@
 #endif
 
 #include <vlc_common.h>
+#include <vlc_modules.h>
 #include "inhibit.h"
 #include <libvlc.h>
 #include <assert.h>
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 23a727e45b..412fefb245 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -40,6 +40,7 @@
 #include <vlc_interface.h>
 #include <vlc_block.h>
 #include <vlc_playlist.h>
+#include <vlc_modules.h>
 
 #include <vlc_vout.h>
 #include <vlc_image.h>
diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 16d19d8f80..45d05414e1 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -42,6 +42,7 @@
 #include "vout_internal.h"
 #include <vlc_image.h>
 #include <vlc_input.h>
+#include <vlc_modules.h>
 #include "../misc/subpicture.h"
 
 /*****************************************************************************
diff --git a/src/video_output/window.c b/src/video_output/window.c
index d79a4e21eb..e5f4c25bea 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -31,6 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_vout_window.h>
+#include <vlc_modules.h>
 #include "inhibit.h"
 #include <libvlc.h>