From d666030b2349e8a710fcba4d2cabb912cc700580 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rdenis@simphalempin.com>
Date: Sat, 31 May 2008 21:56:22 +0300
Subject: [PATCH] libvlc: use vlc_common.h (libvlccore) instead of vlc/vlc.h

---
 src/audio_output/common.c           | 2 +-
 src/audio_output/dec.c              | 2 +-
 src/audio_output/filters.c          | 2 +-
 src/audio_output/input.c            | 2 +-
 src/audio_output/intf.c             | 2 +-
 src/audio_output/mixer.c            | 2 +-
 src/audio_output/output.c           | 2 +-
 src/config/chain.c                  | 2 +-
 src/config/cmdline.c                | 2 +-
 src/config/core.c                   | 2 +-
 src/config/dirs.c                   | 2 +-
 src/config/file.c                   | 2 +-
 src/config/intf.c                   | 2 +-
 src/extras/libc.c                   | 2 +-
 src/input/access.c                  | 2 +-
 src/input/clock.c                   | 2 +-
 src/input/control.c                 | 2 +-
 src/input/decoder.c                 | 2 +-
 src/input/decoder_synchro.c         | 2 +-
 src/input/demux.c                   | 2 +-
 src/input/es_out.c                  | 2 +-
 src/input/input.c                   | 2 +-
 src/input/item.c                    | 2 +-
 src/input/mem_stream.c              | 2 +-
 src/input/meta.c                    | 2 +-
 src/input/stream.c                  | 2 +-
 src/input/subtitles.c               | 2 +-
 src/input/var.c                     | 2 +-
 src/input/vlm.c                     | 2 +-
 src/input/vlmshell.c                | 2 +-
 src/interface/interaction.c         | 2 +-
 src/interface/interface.c           | 2 +-
 src/interface/intf_eject.c          | 2 +-
 src/libvlc-common.c                 | 2 +-
 src/libvlc-module.c                 | 2 +-
 src/libvlc.c                        | 2 +-
 src/misc/action.c                   | 2 +-
 src/misc/beos_specific.cpp          | 2 +-
 src/misc/block.c                    | 2 +-
 src/misc/cpu.c                      | 2 +-
 src/misc/darwin_specific.c          | 2 +-
 src/misc/devices.c                  | 2 +-
 src/misc/error.c                    | 4 ++--
 src/misc/events.c                   | 2 +-
 src/misc/image.c                    | 2 +-
 src/misc/linux_specific.c           | 2 +-
 src/misc/md5.c                      | 2 +-
 src/misc/messages.c                 | 2 +-
 src/misc/mtime.c                    | 2 +-
 src/misc/not_specific.c             | 2 +-
 src/misc/objects.c                  | 2 +-
 src/misc/rand.c                     | 2 +-
 src/misc/stats.c                    | 2 +-
 src/misc/threads.c                  | 2 +-
 src/misc/update.c                   | 2 +-
 src/misc/variables.c                | 2 +-
 src/misc/win32_specific.c           | 2 +-
 src/misc/xml.c                      | 2 +-
 src/modules/cache.c                 | 2 +-
 src/modules/entry.c                 | 2 +-
 src/modules/modules.c               | 2 +-
 src/modules/os.c                    | 2 +-
 src/network/acl.c                   | 2 +-
 src/network/getaddrinfo.c           | 2 +-
 src/network/httpd.c                 | 2 +-
 src/network/io.c                    | 2 +-
 src/network/poll.c                  | 2 +-
 src/network/tcp.c                   | 2 +-
 src/network/tls.c                   | 2 +-
 src/network/udp.c                   | 2 +-
 src/network/winsock.c               | 2 +-
 src/osd/osd.c                       | 2 +-
 src/osd/osd_text.c                  | 2 +-
 src/osd/osd_widgets.c               | 2 +-
 src/playlist/control.c              | 2 +-
 src/playlist/engine.c               | 2 +-
 src/playlist/item.c                 | 2 +-
 src/playlist/loadsave.c             | 2 +-
 src/playlist/search.c               | 2 +-
 src/playlist/services_discovery.c   | 2 +-
 src/playlist/sort.c                 | 2 +-
 src/playlist/thread.c               | 2 +-
 src/playlist/tree.c                 | 2 +-
 src/stream_output/announce.c        | 2 +-
 src/stream_output/profiles.c        | 1 +
 src/stream_output/sap.c             | 2 +-
 src/stream_output/sdp.c             | 2 +-
 src/stream_output/stream_output.c   | 2 +-
 src/test/block.c                    | 2 +-
 src/test/dictionary.c               | 2 +-
 src/test/headers.c                  | 2 +-
 src/test/i18n_atof.c                | 2 +-
 src/test/url.c                      | 2 +-
 src/test/utf8.c                     | 2 +-
 src/text/charset.c                  | 2 +-
 src/text/iso_lang.c                 | 2 +-
 src/text/strings.c                  | 2 +-
 src/text/unicode.c                  | 2 +-
 src/text/wincp.c                    | 2 +-
 src/version.c                       | 2 +-
 src/video_output/video_output.c     | 2 +-
 src/video_output/video_text.c       | 2 +-
 src/video_output/video_widgets.c    | 2 +-
 src/video_output/vout_intf.c        | 2 +-
 src/video_output/vout_pictures.c    | 2 +-
 src/video_output/vout_subpictures.c | 2 +-
 106 files changed, 107 insertions(+), 106 deletions(-)

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index fa74977758..f9e8139ec8 100644
--- 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 2c53d83632..67a1d84748 100644
--- 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 6bbaae1246..de89d31446 100644
--- 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 5cfec8c940..184e8f77dc 100644
--- 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 8bc68be1b5..983f75950e 100644
--- 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 7f1c2ad2eb..a1bc8bc5c6 100644
--- 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 dd9ff19bc6..b799855b43 100644
--- 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 f2187be0c3..2606fc8255 100644
--- 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 bf665df338..4899129088 100644
--- 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 f36090b4a7..3f6110e2ba 100644
--- 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 00d949ad18..dbfeadac8b 100644
--- 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 56cda23911..894ebbb14e 100644
--- 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 6ce970c9bd..a97ef24e3a 100644
--- 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 da839095c6..8e210e0f24 100644
--- 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 3052f92fc6..49c6fd93dd 100644
--- 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 ce3b6d0ce3..27ab13ae76 100644
--- 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 5d120fffb5..be1785615a 100644
--- 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 6955f7f93b..ddf6688ef6 100644
--- 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 4b12a268a1..cfa67d8cf9 100644
--- 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 8b17db8c6f..586bc0996e 100644
--- 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 b5ac3dc5fd..f30d3094cb 100644
--- 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 bc93a5bdab..a4b459aebd 100644
--- 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 1432a56c81..50455b5c97 100644
--- 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 1c2f3cb762..94c6e51758 100644
--- 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 0447fadf6f..bdc16ebc91 100644
--- 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 6bc645a221..31caeb8239 100644
--- 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 cc5bc287da..4361f80c88 100644
--- 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 4eac41c5fc..28b4d75815 100644
--- 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 6c00d7f9d3..60e96ce022 100644
--- 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 6d50926e07..a3ce6542aa 100644
--- 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 8a302c8e36..2d63439be9 100644
--- 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 d6ded5047a..9ec0628d49 100644
--- 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 866a9fbedc..87b9f7c508 100644
--- 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 60bd89341b..908d70e69d 100644
--- 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 abc6fa9aae..852b1f400e 100644
--- 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 2289add0ce..5f47b68b87 100644
--- 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 a9f79f39d8..af731a39e6 100644
--- 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 91099ec156..321db791f4 100644
--- 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 a350db5ec2..a757e3cf2d 100644
--- 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 82b42c70ef..124876d7ad 100644
--- 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 f80c783345..6e68ee1241 100644
--- 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 e0f839d605..e779226af9 100644
--- 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 774ccd85dd..cfd087a1dd 100644
--- 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 2bc50ff725..60bc130c84 100644
--- 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 b286ef97aa..728ba10299 100644
--- 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 6e069c4253..0a4be0ad79 100644
--- 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 adbb7d5a99..cb57f7b652 100644
--- 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 2e7fa5be78..be832c65c8 100644
--- 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 b25f1a5f77..9966e473be 100644
--- 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 e8b7b81b04..5d667b67f1 100644
--- 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 b4f3a6dfc6..a2e432cba6 100644
--- 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 45f77c871a..81bc1850b3 100644
--- 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 1b05c11b24..db0d13d660 100644
--- 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 89e9058674..33270df4a6 100644
--- 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 020eb52000..dc6ec48333 100644
--- 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 6d5923a2f7..2bd20558de 100644
--- 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 d984aada17..4e286b56e9 100644
--- 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 9030fbba57..af32ceeb4b 100644
--- 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 cc887e9b34..50800081b0 100644
--- 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 f7405bf67b..cf3d0f3e71 100644
--- 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 85ae61900a..0e25c855c0 100644
--- 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 7575e88b28..5cf3a82767 100644
--- 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 58e684d121..fcc52629b4 100644
--- 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 236088e2dd..4294bce83f 100644
--- 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 7a7ef80751..7283060d62 100644
--- 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 6293e87a3f..5f3f6bdd64 100644
--- 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 3fb441319c..df92479e03 100644
--- 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 20a31d5c4f..87bcdb26ab 100644
--- 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 b82d9e5ae7..11e3dd2a24 100644
--- 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 6e79f8d23a..d0938b9a9c 100644
--- 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 a5a718a030..ac01bc9978 100644
--- 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 f1206c9fe9..adc1c510e2 100644
--- 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 95ce8bd051..2386d30e3c 100644
--- 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 319d8d8b8b..5d8fafd988 100644
--- 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 b81f839e10..ac44286e4c 100644
--- 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 45397c2d24..b8731e6d77 100644
--- 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 2452051de3..15454014ef 100644
--- 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 181717e95f..3ffbe5715a 100644
--- 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 010227c272..207205d4aa 100644
--- 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 b68bad63de..6f3cda60de 100644
--- 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 56a5253b31..e7c5f6e116 100644
--- 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 50d19bcb5d..be7cd9c8b3 100644
--- 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 4b4b95bbe6..c10451817d 100644
--- 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 a8b383b8ed..3a723e3605 100644
--- 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 b374c39a5e..70e0349e59 100644
--- 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 ba9fdeeb23..9592f3a678 100644
--- 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 6125323c0c..d2c0610655 100644
--- 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 ea5bee8e90..c018afc775 100644
--- 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 ad03dab1d6..f594d06d72 100644
--- 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 749d4e8d63..b0d9644b7b 100644
--- 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 7ca1be8681..74ef9de94a 100644
--- 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 c62619c001..1e75bf78a2 100644
--- 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 3ae9798140..a097aca027 100644
--- 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 1fad571cb9..f34a953c9c 100644
--- 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 d80dc1d6aa..c06124ada3 100644
--- 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 885c5819e8..5e7a6c6a15 100644
--- 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 aebefe0e02..ec8bebe2ca 100644
--- 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 16c5a5fcfb..7b9b1d7b2c 100644
--- 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 9e20513f79..97dfc6158a 100644
--- 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 bc0cbe9636..3bac4340ae 100644
--- 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 45a32ddb5b..a548530e98 100644
--- 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 bb77890cfa..d98532284e 100644
--- 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 562d8a69ce..f0a1ded2bc 100644
--- 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 c5270dfe84..6485e65988 100644
--- 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 3a89686934..88da6b6fa6 100644
--- 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 a22e2052da..956a54aee8 100644
--- 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>
-- 
2.39.2