Do not include vlc_modules.h in vlc_common.h

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"
 

modules/access/screen/screen.c

@@ -32,6 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
+#include <vlc_modules.h>
 #include "screen.h"
 
 /*****************************************************************************

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"
 

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

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>

modules/codec/subtitles/subsusf.c

@@ -26,6 +26,7 @@
 
 #include "subsdec.h"
 #include <vlc_plugin.h>
+#include <vlc_modules.h>
 #include <assert.h>
 
 /*****************************************************************************

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() */

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"

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"

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

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 */
 

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>

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>

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

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 )
 {

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>

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>

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 )

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"
 

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] =
 {

modules/stream_out/transcode/osd.c

@@ -31,6 +31,7 @@
 #include "transcode.h"
 
 #include <vlc_spu.h>
+#include <vlc_modules.h>
 
 /*
  * OSD menu

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,

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

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>

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>

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"

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>

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>

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"

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"
 

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"
 

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>

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"

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"

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)

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"

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 );

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>

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"

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>

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() */

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

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"
 

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 )

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>
 

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 * );

src/misc/media_library.c

@@ -33,6 +33,7 @@
 
 #include <assert.h>
 #include <vlc_media_library.h>
+#include <vlc_modules.h>
 #include "../libvlc.h"
 
 /**

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

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"
 

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

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() */

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.

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"
 

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"

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>

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"
 

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"
 

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>
 

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>

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>

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"
 
 /*****************************************************************************

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>