libvlc: use vlc_common.h (libvlccore) instead of vlc/vlc.h

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index fa74977758d74ea1de41ef32ed9755739d1391de..f9e8139ec85bdc7cb6eb020cb9357b56cec76205 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include "aout_internal.h"
 

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 2c53d83632bf16a0fb5f9ae7705c895b3fa79e39..67a1d84748a93ca34b9972c942d40d3b50947f76 100644 (file)
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifdef HAVE_ALLOCA_H
 #   include <alloca.h>

diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index 6bbaae12462f450771976471125a617774d2d72b..de89d314462628c933fc07d80a2743ac912eae80 100644 (file)
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 
 #ifdef HAVE_ALLOCA_H

diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index 5cfec8c9402da95a00f331cbf58575eaafb60c12..184e8f77dc5134e8f8171f01fb40d7c97493715d 100644 (file)
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 8bc68be1b5b7c2edd5ef1a91c7fd358e95cdcf0b..983f75950ede440efc10668a9f30d5f656469d2e 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <stdlib.h>                            /* calloc(), malloc(), free() */

diff --git a/src/audio_output/mixer.c b/src/audio_output/mixer.c
index 7f1c2ad2eb1e1e411120fa863fe47ff76b94c24e..a1bc8bc5c69d73350b2638c9f10e3af5049836ad 100644 (file)
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -29,7 +29,7 @@
 #endif
 
 #include <stddef.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifdef HAVE_ALLOCA_H
 #   include <alloca.h>

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index dd9ff19bc62205e4e477f61ef014a115d19e3202..b799855b43db43ac012c2ce0837f088aac515b64 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_aout.h>
 #include "aout_internal.h"
 

diff --git a/src/config/chain.c b/src/config/chain.c
index f2187be0c302b9401f0e5d9f020ee145062a8a8f..2606fc825530d84bde38531ae9f6e8d8ca42889b 100644 (file)
--- a/src/config/chain.c
+++ b/src/config/chain.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "libvlc.h"
 
 #include "vlc_interface.h"

diff --git a/src/config/cmdline.c b/src/config/cmdline.c
index bf665df338dfd4a1ada7a2ee865c53f2e8a8cb37..4899129088da9d81ebc40fc33b1c3af1e1ae9c0e 100644 (file)
--- a/src/config/cmdline.c
+++ b/src/config/cmdline.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 #include "vlc_keys.h"
 

diff --git a/src/config/core.c b/src/config/core.c
index f36090b4a7caeefca321dce2a16e840d6f3d4fe1..3f6110e2baf1412d7b9eb11a7a0686c5f40c73df 100644 (file)
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 #include "vlc_keys.h"
 #include "vlc_charset.h"

diff --git a/src/config/dirs.c b/src/config/dirs.c
index 00d949ad18a5608022c48b9677941a2b9b99dd89..dbfeadac8bc4ee9bb4036a66284b781b30266f5e 100644 (file)
--- a/src/config/dirs.c
+++ b/src/config/dirs.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #if defined( WIN32 )
 # define _WIN32_IE IE5

diff --git a/src/config/file.c b/src/config/file.c
index 56cda23911249a0f87f15a70319d181d41aa2ecd..894ebbb14e081062cd69a7f446e5881b0612b9a4 100644 (file)
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 #include "vlc_charset.h"
 #include "vlc_keys.h"

diff --git a/src/config/intf.c b/src/config/intf.c
index 6ce970c9bd5b5e87b317847d8d58cc63365be1ec..a97ef24e3ae98ef1260e23fc4c77fdfeb1a09ac1 100644 (file)
--- a/src/config/intf.c
+++ b/src/config/intf.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <assert.h>
 

diff --git a/src/extras/libc.c b/src/extras/libc.c
index da839095c6f7acd848a43568134c48c8ef399501..8e210e0f24c244dcdfb8a10a09841447a94af519 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <ctype.h>
 

diff --git a/src/input/access.c b/src/input/access.c
index 3052f92fc66d06eff9754bf04a31a842a69481be..49c6fd93ddce5fcd71ab5e295f941065befa1665 100644 (file)
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "input_internal.h"
 

diff --git a/src/input/clock.c b/src/input/clock.c
index ce3b6d0ce3708d73c6b13334fd3a19799a2fac6c..27ab13ae76cbac1caa7d830edc87b1567279380b 100644 (file)
--- a/src/input/clock.c
+++ b/src/input/clock.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "input_internal.h"
 

diff --git a/src/input/control.c b/src/input/control.c
index 5d120fffb56e9281dde73de8fb7357b6e9dd66cf..be1785615a0981faefc96fadc1f8a7535d609b9f 100644 (file)
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 6955f7f93b5a8000cf37800a5e354024d1fb34de..ddf6688ef6697519b97deede6e71b58de2c1016b 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -31,7 +31,7 @@
 #endif
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <vlc_block.h>
 #include <vlc_vout.h>

diff --git a/src/input/decoder_synchro.c b/src/input/decoder_synchro.c
index 4b12a268a11fd71e3931d91c1d7ff69b98e0674a..cfa67d8cf903e9bb18766c676b943d0a1c572ca9 100644 (file)
--- a/src/input/decoder_synchro.c
+++ b/src/input/decoder_synchro.c
@@ -98,7 +98,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_codec.h>
 #include <vlc_codec_synchro.h>

diff --git a/src/input/demux.c b/src/input/demux.c
index 8b17db8c6f189918f5482becdb10760e22e9a6d0..586bc0996ec93c4a8bdb3f4af348e2dd294c35c5 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "input_internal.h"
 

diff --git a/src/input/es_out.c b/src/input/es_out.c
index b5ac3dc5fda69570aa3737214f1a84ffa2398d92..f30d3094cb3c7ad5f2b305a811836de88756fbfb 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 

diff --git a/src/input/input.c b/src/input/input.c
index bc93a5bdab0e113867d52c3e35ecac03a13b8865..a4b459aebde5dd3d58e281c1d87dea05dfb2ce96 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <ctype.h>
 #include <limits.h>

diff --git a/src/input/item.c b/src/input/item.c
index 1432a56c81c2a1a51d683be137c1f7ba947f4c65..50455b5c97bd618a92e7afed4ae57a01ea87bdef 100644 (file)
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -26,7 +26,7 @@
 #endif
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "vlc_interface.h"
 

diff --git a/src/input/mem_stream.c b/src/input/mem_stream.c
index 1c2f3cb76267703f3043b043d9841c1b407b013d..94c6e517581c1e2cfdf9ccb86a209b033843e91e 100644 (file)
--- a/src/input/mem_stream.c
+++ b/src/input/mem_stream.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "input_internal.h"
 

diff --git a/src/input/meta.c b/src/input/meta.c
index 0447fadf6f97dc5b08634ec8c43b32ef1ecbce12..bdc16ebc9190c66f976cfcc1e2bb5a100476872e 100644 (file)
--- a/src/input/meta.c
+++ b/src/input/meta.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_stream.h>
 #include <vlc_meta.h>

diff --git a/src/input/stream.c b/src/input/stream.c
index 6bc645a221f7e777be52f8f1495446d72e68f085..31caeb82395dc30a55b0606507b345be713af6f8 100644 (file)
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "input_internal.h"
 

diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index cc5bc287daf81d79bd63389343cabde08b17e20d..4361f80c88b9baac249cbf395ae85e3856b2b20e 100644 (file)
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_charset.h>
 

diff --git a/src/input/var.c b/src/input/var.c
index 4eac41c5fc25bf5cc42b467f533df7002e42d59e..28b4d75815abd2278390c69b5b4340fc1e5319f9 100644 (file)
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/src/input/vlm.c b/src/input/vlm.c
index 6c00d7f9d37c7df83f8d0554899b0cf2b21517d1..60e96ce0225b9529142abbef628b8ab007ff05d1 100644 (file)
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <ctype.h>                                              /* tolower() */

diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c
index 6d50926e07f0f0c1162f58ed012ff8d44588d7a4..a3ce6542aa6b217d86c51f0dc831dbaa1e2fbb5d 100644 (file)
--- a/src/input/vlmshell.c
+++ b/src/input/vlmshell.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <ctype.h>                                              /* tolower() */

diff --git a/src/interface/interaction.c b/src/interface/interaction.c
index 8a302c8e366781714fa74fe3db808bf9f0b420b7..2d63439be9b055458b87d5ddde6ee60d8d7d2963 100644 (file)
--- a/src/interface/interaction.c
+++ b/src/interface/interaction.c
@@ -35,7 +35,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <vlc_interface.h>
 #include "interface.h"

diff --git a/src/interface/interface.c b/src/interface/interface.c
index d6ded5047a7136efabf6b035c3c0cfba6fb62824..9ec0628d49694e42ce4cd684433b55a629307cab 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -37,7 +37,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <vlc_aout.h>
 #include <vlc_vout.h>

diff --git a/src/interface/intf_eject.c b/src/interface/intf_eject.c
index 866a9fbedc710feea06d548f51c38a83b479dc6b..87b9f7c5089fff2bb5625d947c7032e99216c6ff 100644 (file)
--- a/src/interface/intf_eject.c
+++ b/src/interface/intf_eject.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifdef HAVE_UNISTD_H
 #    include <unistd.h>

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 60bd89341b3ffc25a2e15d3d1c6310ba83c8923a..908d70e69da6f1339ec1bfab7600496778e4f462 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -36,7 +36,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "control/libvlc_internal.h"
 #include <vlc_input.h>
 

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index abc6fa9aaeeffa93f6b71e5bff407dabd34faeb3..852b1f400eea1603f9a35610d025d17e2a290047 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include "libvlc.h"
 

diff --git a/src/libvlc.c b/src/libvlc.c
index 2289add0ce83fb22bf0fd09a0f38f4b1814d58c9..5f47b68b878bf436646f1072113677273ce9b895 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -39,7 +39,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "control/libvlc_internal.h"
 #include "libvlc.h"

diff --git a/src/misc/action.c b/src/misc/action.c
index a9f79f39d80a5767f26efc514149a60c27b33cca..af731a39e621805f9b7b3fb6c0bbdfd1dccdf0f0 100644 (file)
--- a/src/misc/action.c
+++ b/src/misc/action.c
@@ -22,7 +22,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 
 int vlc_key_to_action (vlc_object_t *libvlc, const char *varname,

diff --git a/src/misc/beos_specific.cpp b/src/misc/beos_specific.cpp
index 91099ec15685f0fc076550c17d7dc30b39bd697d..321db791f4ce923b955b882094f03a70f21fef23 100644 (file)
--- a/src/misc/beos_specific.cpp
+++ b/src/misc/beos_specific.cpp
@@ -37,7 +37,7 @@ extern "C"
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 }
 

diff --git a/src/misc/block.c b/src/misc/block.c
index a350db5ec2c12244980fd9f1df04ab8c3e02073c..a757e3cf2d487753602ca57282b3e905d2940095 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <sys/stat.h>
 #include "vlc_block.h"
 

diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 82b42c70efbc4ae810bf3e165bbcda6d0fdafa56..124876d7adfc02cebbb68f343ce2a58baa5fd9cd 100644 (file)
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifdef HAVE_SIGNAL_H
 #   include <signal.h>                            /* SIGHUP, SIGINT, SIGKILL */

diff --git a/src/misc/darwin_specific.c b/src/misc/darwin_specific.c
index f80c783345e24ffad4c69598059dfdfa0f838610..6e68ee1241dea61c9f0cc69414c11b3f5d89529d 100644 (file)
--- a/src/misc/darwin_specific.c
+++ b/src/misc/darwin_specific.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 #include <dirent.h>                                                /* *dir() */
 

diff --git a/src/misc/devices.c b/src/misc/devices.c
index e0f839d6055e6cd0dfe90100c453f12735617523..e779226af9bb36c90236e9cdb7ca18b9c341e918 100644 (file)
--- a/src/misc/devices.c
+++ b/src/misc/devices.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc/intf.h>
 #include <vlc_devices.h>
 

diff --git a/src/misc/error.c b/src/misc/error.c
index 774ccd85dd83dd301c82a5d6abeb3077ef779bc3..cfd087a1ddc05b8ed8f7b319a362a015fb68a327 100644 (file)
--- a/src/misc/error.c
+++ b/src/misc/error.c
@@ -28,13 +28,13 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 /*****************************************************************************
  * vlc_error: strerror() equivalent
  *****************************************************************************
  * This function returns a string describing the error code passed in the
- * argument. A list of all errors can be found in include/vlc/vlc.h.
+ * argument. A list of all errors can be found in include/vlc_common.h.
  *****************************************************************************/
 char const * vlc_error ( int i_err )
 {

diff --git a/src/misc/events.c b/src/misc/events.c
index 2bc50ff7255031bd42a38fc57e78fb274f627df8..60bc130c84afd4b29bf8e78c96a2162507d5bdc3 100644 (file)
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <assert.h>
 

diff --git a/src/misc/image.c b/src/misc/image.c
index b286ef97aa0073dcc3a420636f665f9c7f3d7c4a..728ba102999f48c693681e6f6c2a7bd6edf17e4b 100644 (file)
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -35,7 +35,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_filter.h>
 #include <vlc_es.h>

diff --git a/src/misc/linux_specific.c b/src/misc/linux_specific.c
index 6e069c4253063bc3db3e3eb15ec8e7d11fd70c84..0a4be0ad7988c03822b9c20d456e4df35106b0a4 100644 (file)
--- a/src/misc/linux_specific.c
+++ b/src/misc/linux_specific.c
@@ -22,7 +22,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 
 #if 0

diff --git a/src/misc/md5.c b/src/misc/md5.c
index adbb7d5a9981843500d6d4b3b0a95c488af67704..cb57f7b6522df0960a924193cfca438c03a92521 100644 (file)
--- a/src/misc/md5.c
+++ b/src/misc/md5.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_md5.h>
 
 #ifdef WORDS_BIGENDIAN

diff --git a/src/misc/messages.c b/src/misc/messages.c
index 2e7fa5be78add8280b48ec1fb9264615a5ad3491..be832c65c87fba5ec3ea54be0cd2c8e3768f2059 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdarg.h>                                       /* va_list for BSD */
 

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index b25f1a5f77c9ff67ee9381201c5611e9a7e1557d..9966e473bec8f5a046fcf1b92ccbb132331bba48 100644 (file)
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <time.h>                      /* clock_gettime(), clock_nanosleep() */
 #include <assert.h>

diff --git a/src/misc/not_specific.c b/src/misc/not_specific.c
index e8b7b81b049f6e296469f7b683f58a21109d488d..5d667b67f1c3c7c3218118e4c611c67804ff569d 100644 (file)
--- a/src/misc/not_specific.c
+++ b/src/misc/not_specific.c
@@ -22,7 +22,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 
 void system_Init (libvlc_int_t *libvlc, int *argc, const char *argv[])

diff --git a/src/misc/objects.c b/src/misc/objects.c
index b4f3a6dfc60e4f7bacfe3cd3e93f8631ff865692..a2e432cba6d475147c9ba5e83e33a720b7a93e61 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "../libvlc.h"
 #include <vlc_vout.h>

diff --git a/src/misc/rand.c b/src/misc/rand.c
index 45f77c871a34fc1b6ad40076018027cc5c35a55c..81bc1850b3300b7466009659dc1301aa538b7bc1 100644 (file)
--- a/src/misc/rand.c
+++ b/src/misc/rand.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_rand.h>
 
 #ifndef WIN32

diff --git a/src/misc/stats.c b/src/misc/stats.c
index 1b05c11b24cbb4f8aa3c679097fbafa99fa13309..db0d13d6609bc6c530db9c4978e79f96a3c2aaa2 100644 (file)
--- a/src/misc/stats.c
+++ b/src/misc/stats.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <stdio.h>                                               /* required */
 
 #include "input/input_internal.h"

diff --git a/src/misc/threads.c b/src/misc/threads.c
index 89e905867472dc1e5da8a61594e9de4ad816fa4e..33270df4a65a75be81a6d9ba63b24a761bea1df3 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "libvlc.h"
 #include <assert.h>

diff --git a/src/misc/update.c b/src/misc/update.c
index 020eb520006f24ce0ce3d6a9ec86117d246548cd..dc6ec48333a80fae930b0d7e08ff30c991ae8f6d 100644 (file)
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -36,7 +36,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_update.h>
 
 #ifdef UPDATE_CHECK

diff --git a/src/misc/variables.c b/src/misc/variables.c
index 6d5923a2f78e2b7eeea40f4a6e218bd6dfa47bd6..2bd20558deace8af349713b4ef0e9eb2b4affc52 100644 (file)
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "variables.h"
 
 #include "libvlc.h"

diff --git a/src/misc/win32_specific.c b/src/misc/win32_specific.c
index d984aada1725945de00c293182bcd9e629c9b538..4e286b56e9d75b50955f364051c3a4b1878390bc 100644 (file)
--- a/src/misc/win32_specific.c
+++ b/src/misc/win32_specific.c
@@ -27,7 +27,7 @@
 #endif
 
 #define UNICODE
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 #include <vlc_playlist.h>
 #include <vlc_charset.h>

diff --git a/src/misc/xml.c b/src/misc/xml.c
index 9030fbba577fa00961f4eaad96b8f6c9c9e75313..af32ceeb4b774df72fe044e13ae18e4f3ae39eb1 100644 (file)
--- a/src/misc/xml.c
+++ b/src/misc/xml.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_xml.h"
 #include "../libvlc.h"
 

diff --git a/src/modules/cache.c b/src/modules/cache.c
index cc887e9b3499ea6a2d25177219994ae8b69819ba..50800081b042211fdf24e4e214385a37fdc5dbad 100644 (file)
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "libvlc.h"
 
 #include <stdlib.h>                                      /* free(), strtol() */

diff --git a/src/modules/entry.c b/src/modules/entry.c
index f7405bf67b5397cc8b2b99e0f4bf67e0d45363c8..cf3d0f3e71bf28103476b0080a24eac2b7fe26cd 100644 (file)
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <assert.h>
 #include <stdarg.h>

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 85ae61900a41560d2395add8c8a4cc80276ef1e9..0e25c855c021cb87ab2b8d38cd763d631485cf47 100644 (file)
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include "libvlc.h"
 

diff --git a/src/modules/os.c b/src/modules/os.c
index 7575e88b281e002994cb01254c6abbf1e32cc0c7..5cf3a827672f8dfef6748029303e9a480fb2d096 100644 (file)
--- a/src/modules/os.c
+++ b/src/modules/os.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h> /* MODULE_SUFFIX */
 #include "libvlc.h"
 #include "modules.h"

diff --git a/src/network/acl.c b/src/network/acl.c
index 58e684d121fe92713eb71ef42f08d5c0c82e0db4..fcc52629b4607a2c89614b7123a8e0c4bdf4b798 100644 (file)
--- a/src/network/acl.c
+++ b/src/network/acl.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <ctype.h>
 #include <vlc_acl.h>

diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index 236088e2dde1c8de8b8cd25ab975cccf90d91e65..4294bce83f8c45dcd3a0c13b3cf9ad028499295f 100644 (file)
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stddef.h> /* size_t */
 #include <string.h> /* strlen(), memcpy(), memset(), strchr() */

diff --git a/src/network/httpd.c b/src/network/httpd.c
index 7a7ef80751d62eaf1fc90c3d464bce09ce5eddc0..7283060d62469dc5b5e63f9b1b172c0d3d035e95 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_httpd.h>
 
 #ifdef ENABLE_HTTPD

diff --git a/src/network/io.c b/src/network/io.c
index 6293e87a3f20b4b06d38c33753c974dee9ccc270..5f3f6bdd645dc223143134e7c29c228366c8073e 100644 (file)
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -32,7 +32,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/src/network/poll.c b/src/network/poll.c
index 3fb441319c1ea1d2d1a9b2cafa64f82929a4aad3..df92479e0334a283c6539a669372001a8780df0e 100644 (file)
--- a/src/network/poll.c
+++ b/src/network/poll.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifndef HAVE_POLL
 #include <string.h>

diff --git a/src/network/tcp.c b/src/network/tcp.c
index 20a31d5c4fed6c914672dda3aeb45ea7aada4f67..87bcdb26ab0d83f6c2f7b14ec5c3dbc74848c4a0 100644 (file)
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <errno.h>
 #include <assert.h>

diff --git a/src/network/tls.c b/src/network/tls.c
index b82d9e5ae7772b52418a5fc518c48b9633d21369..11e3dd2a24861ce817b2de1bd85aed9ba9252aa8 100644 (file)
--- a/src/network/tls.c
+++ b/src/network/tls.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "libvlc.h"
 
 #include <vlc_tls.h>

diff --git a/src/network/udp.c b/src/network/udp.c
index 6e79f8d23acc1da6e9d86719af3b79eb4681e09c..d0938b9a9cc070118f26fdd3024299644177174d 100644 (file)
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <errno.h>
 

diff --git a/src/network/winsock.c b/src/network/winsock.c
index a5a718a030772957d8472f88ec2104099935f8f2..ac01bc9978759dde1117af74e9b38957e8bec50b 100644 (file)
--- a/src/network/winsock.c
+++ b/src/network/winsock.c
@@ -22,7 +22,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <errno.h>
 #include <vlc_network.h>
 

diff --git a/src/osd/osd.c b/src/osd/osd.c
index f1206c9fe9697d0381c38a3111849ec40c46b442..adc1c510e22e985a748fa4d4b590d339a8d4f73c 100644 (file)
--- a/src/osd/osd.c
+++ b/src/osd/osd.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_keys.h>
 #include <vlc_osd.h>
 #include <vlc_image.h>

diff --git a/src/osd/osd_text.c b/src/osd/osd_text.c
index 95ce8bd051cc072ca955564b7806c277823b61d8..2386d30e3c799f709fa5f7f8e85c783a1e8b866f 100644 (file)
--- a/src/osd/osd_text.c
+++ b/src/osd/osd_text.c
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>

diff --git a/src/osd/osd_widgets.c b/src/osd/osd_widgets.c
index 319d8d8b8bfb60e625c6baface9fbce02e803332..5d8fafd988c75c5ae827aca0cbaa7a5a3992e744 100644 (file)
--- a/src/osd/osd_widgets.c
+++ b/src/osd/osd_widgets.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_osd.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>

diff --git a/src/playlist/control.c b/src/playlist/control.c
index b81f839e10ef42d33bf1b9e76fa6d35f7e95d176..ac44286e4c8a68918d56628117c54286cfea0e7e 100644 (file)
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "playlist_internal.h"
 #include <assert.h>

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 45397c2d24028b47fe3066bd75abfa2500ece179..b8731e6d77085687a35809b4447d19c7ae5732ef 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_sout.h>
 #include <vlc_playlist.h>

diff --git a/src/playlist/item.c b/src/playlist/item.c
index 2452051de39fd7eb45b7a8e56ad176ec726ce14c..15454014ef652aeb124cb5d1fbc359140578e586 100644 (file)
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <assert.h>
 #include <vlc_playlist.h>
 #include "playlist_internal.h"

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 181717e95fa97394e6a85b8d56be7c6ea380eaa3..3ffbe5715a25931f2a4be635bcce20a53253a9f0 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_playlist.h>
 #include <vlc_events.h>
 #include "playlist_internal.h"

diff --git a/src/playlist/search.c b/src/playlist/search.c
index 010227c27267011d25b37478575807b8ba36f513..207205d4aa93ed7504ec1a65228c6db9227b70d3 100644 (file)
--- a/src/playlist/search.c
+++ b/src/playlist/search.c
@@ -25,7 +25,7 @@
 #endif
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "playlist_internal.h"
 

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index b68bad63deac8e1bceb886bf7b16f408ce9642b1..6f3cda60de2041337b0031dbc5a83bb1bbcc67ae 100644 (file)
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -25,7 +25,7 @@
 #endif
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "vlc_events.h"
 #include "playlist_internal.h"

diff --git a/src/playlist/sort.c b/src/playlist/sort.c
index 56a5253b3170f4f40a4d4afea17db669a3c95525..e7c5f6e116b056080cc8d00c0a6486ed24a70d04 100644 (file)
--- a/src/playlist/sort.c
+++ b/src/playlist/sort.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "playlist_internal.h"
 

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 50d19bcb5d3d06015558cad02bb465e89dd5cc07..be7cd9c8b3c194bd9c39940cc0f90a354c635918 100644 (file)
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_es.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>

diff --git a/src/playlist/tree.c b/src/playlist/tree.c
index 4b4b95bbe64b69159c494f00a31feafb55f2b442..c10451817d5f11f3d299ecb3943789ca05f0b146 100644 (file)
--- a/src/playlist/tree.c
+++ b/src/playlist/tree.c
@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <assert.h>
 #include "vlc_playlist.h"
 #include "playlist_internal.h"

diff --git a/src/stream_output/announce.c b/src/stream_output/announce.c
index a8b383b8ed74065af163a4b1c1011ddb36342939..3a723e360558c6c9e75d3b0bac52a85e50d9f147 100644 (file)
--- a/src/stream_output/announce.c
+++ b/src/stream_output/announce.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_sout.h>
 #include "stream_output.h"
 

diff --git a/src/stream_output/profiles.c b/src/stream_output/profiles.c
index b374c39a5eb4df1f45df95d5aea4c764b11aaa12..70e0349e592207868200447d1acf11f0c4992a27 100644 (file)
--- a/src/stream_output/profiles.c
+++ b/src/stream_output/profiles.c
@@ -25,6 +25,7 @@
 # include "config.h"
 #endif
 
+#include <vlc_common.h>
 #include <vlc_streaming.h>
 #include <assert.h>
 

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index ba9fdeeb23ae5b45ae5e3d18934e7b7c555d3f7a..9592f3a6781483630279f15d789fba78d884606b 100644 (file)
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdlib.h>                                                /* free() */
 #include <stdio.h>                                              /* sprintf() */

diff --git a/src/stream_output/sdp.c b/src/stream_output/sdp.c
index 6125323c0c4731bce58399a08f03eddc4d7e5df8..d2c0610655df1ac88588dc4120ba48bdf1fcebca 100644 (file)
--- a/src/stream_output/sdp.c
+++ b/src/stream_output/sdp.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stddef.h>
 #include <string.h>

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index ea5bee8e904570cad578a58640866bbdb6f0e570..c018afc7751f43f2ec68021fb029a11cf0ab81cf 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdlib.h>                                                /* free() */
 #include <stdio.h>                                              /* sprintf() */

diff --git a/src/test/block.c b/src/test/block.c
index ad03dab1d619b47a25958da68be2955fe07877ed..f594d06d72b8b5ef4a562e2ddc4721a795616e9c 100644 (file)
--- a/src/test/block.c
+++ b/src/test/block.c
@@ -27,7 +27,7 @@
 #undef NDEBUG
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_block.h>
 
 static const char text[] =

diff --git a/src/test/dictionary.c b/src/test/dictionary.c
index 749d4e8d638a56d78afecf5c36f1df3994c4e49d..b0d9644b7b0135f7bc17ed317dda30cf9616da95 100644 (file)
--- a/src/test/dictionary.c
+++ b/src/test/dictionary.c
@@ -26,7 +26,7 @@
 #undef NDEBUG
 #include <assert.h>
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_arrays.h"
 
 #include <stdio.h>

diff --git a/src/test/headers.c b/src/test/headers.c
index 7ca1be86813a3db711cfef2a0effad04b79436cf..74ef9de94a1939e33efce7c77c0d9254de8e9dc4 100644 (file)
--- a/src/test/headers.c
+++ b/src/test/headers.c
@@ -32,7 +32,7 @@
 # undef __LIBVLC__
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc/deprecated.h>
 #include <vlc/libvlc.h>
 #include <vlc/libvlc_structures.h>

diff --git a/src/test/i18n_atof.c b/src/test/i18n_atof.c
index c62619c001899affff2369cdcb0363ac66266744..1e75bf78a24ea544d4a812ca68a9058a91adf16a 100644 (file)
--- a/src/test/i18n_atof.c
+++ b/src/test/i18n_atof.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_charset.h"
 
 #undef NDEBUG

diff --git a/src/test/url.c b/src/test/url.c
index 3ae9798140a52fe64f99b280f6cb9f88f872a820..a097aca0277beb8f711330a7bfd582bf2ceb2bf2 100644 (file)
--- a/src/test/url.c
+++ b/src/test/url.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_url.h"
 #include "vlc_strings.h"
 

diff --git a/src/test/utf8.c b/src/test/utf8.c
index 1fad571cb9e08dca08300c6b956eb9c27751d364..f34a953c9ce95d2e95a38f1871b1d8ccfb111aff 100644 (file)
--- a/src/test/utf8.c
+++ b/src/test/utf8.c
@@ -23,7 +23,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_charset.h"
 
 #include <stdio.h>

diff --git a/src/text/charset.c b/src/text/charset.c
index d80dc1d6aa3e832016cf6420a6b15368bc16a076..c06124ada3ce940df69840fc87c863ce33bb60a9 100644 (file)
--- a/src/text/charset.c
+++ b/src/text/charset.c
@@ -39,7 +39,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #if !defined WIN32
 # ifdef HAVE_LANGINFO_CODESET

diff --git a/src/text/iso_lang.c b/src/text/iso_lang.c
index 885c5819e8d4009f4ff97958657e180a21d422be..5e7a6c6a1543180e4c2691d24f79d2be67193c5e 100644 (file)
--- a/src/text/iso_lang.c
+++ b/src/text/iso_lang.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include "vlc_iso_lang.h"
 

diff --git a/src/text/strings.c b/src/text/strings.c
index aebefe0e0226454483178a4ad191794c0576931b..ec8bebe2ca597817067bf62801c12139eb5f6ae8 100644 (file)
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <assert.h>
 
 /* Needed by str_format_time */

diff --git a/src/text/unicode.c b/src/text/unicode.c
index 16c5a5fcfb207be5812379713d05cfb089cc7bde..7b9b1d7b2c305c7d27f50f90563fa438f5342259 100644 (file)
--- a/src/text/unicode.c
+++ b/src/text/unicode.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_charset.h>
 #include "libvlc.h" /* utf8_mkdir */
 

diff --git a/src/text/wincp.c b/src/text/wincp.c
index 9e20513f79c82d314830cc1859af7fb26a4a7634..97dfc6158a99b570c75ab67da038214678b816e6 100644 (file)
--- a/src/text/wincp.c
+++ b/src/text/wincp.c
@@ -26,7 +26,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #ifndef WIN32
 # include <locale.h>

diff --git a/src/version.c b/src/version.c
index bc0cbe963687f5c43926a157d7e4fb13900d85f3..3bac4340ae34c307d12c61de1b5fecb100bf5c6a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 /*****************************************************************************
  * VLC_Version: return the libvlc version.

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 45a32ddb5b2de100f5aa9f6dd737087bba31422f..a548530e98a6a002ffd3112e461afd843560e56c 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -33,7 +33,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdlib.h>                                                /* free() */
 #include <string.h>

diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index bb77890cfa73e037929d642037de5b2c09a32373..d98532284ebcc843da9035136d1cffa3890e47c5 100644 (file)
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>

diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index 562d8a69ce29ce3bae97d510513d45ab2f3d1554..f0a1ded2bc0098f223d20a4196226232a0bd9a5f 100644 (file)
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
 

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index c5270dfe84d8048ff972257131ec264fc2319f5d..6485e6598812b10f7576712460673d4d1a013d3f 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <stdlib.h>                                                /* free() */

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 3a89686934581a1e75b46525700dbc8eaa9260b6..88da6b6fa689ffcc8f32267085cf1a261ecba638 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_osd.h>
 #include "vout_pictures.h"

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index a22e2052daff974a40ba73a866520b9085db86d1..956a54aee8c2608a2fa5d9d0d1d47d7fb9aca763 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_vout.h>
 #include <vlc_block.h>
 #include <vlc_filter.h>