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