[vlc-devel] [PATCH 3/4] core: fix header quoting/path consistency
Alexandre Janniaux
ajanni at videolabs.io
Fri Oct 2 11:41:30 CEST 2020
Hi,
On Fri, Oct 02, 2020 at 10:26:51AM +0200, Thomas Guillem wrote:
> Hello,
>
> On Fri, Oct 2, 2020, at 07:26, Lyndon Brown wrote:
> > From: Lyndon Brown <jnqnfe at gmail.com>
> > Date: Thu, 1 Oct 2020 22:01:01 +0100
> > Subject: core: fix header quoting/path consistency
> >
> > primarily fixes:
> > - inconsistency of <libvlc.h> vs. "libvlc.h" vs. "../libvlc.h"
>
> OK, <libvlc.h> is wrong, but I prefer "libvlc.h" than "../libvlc.h. Otherwise, what's the use of "-I" ?
>
>
> > - inconsistency of referencing files in other src/ subdirs with/without
> > initial '../'.
> > - pointless use of name of own directory for local headers (thus not
> > simply directly locating them, but instead doing so via /src fallback).
> >
> > policy:
> > - excluding include of config.h (to be addressed separately)...
> > - headers in same directory to be referenced by filename only, in quotes.
> > - headers in other src/ subdirectories to be referenced in quotes as a
> > relative path, **not** relying upon being found via src/ being a
> > fallback search directory.
> > - same for libvlc.h (prefering "../libvlc.h" direct reference).
> > - same for the few references to lib/libvlc_internal.h
> > - thus non-direct references thus reserved for public headers, both of
> > vlc's and common, for which we use angled brackets to skip looking
> > for a copy in the local directory.
> >
> > diff --git a/src/android/specific.c b/src/android/specific.c
> > index 1b74f522a3..45e6249944 100644
> > --- a/src/android/specific.c
> > +++ b/src/android/specific.c
> > @@ -29,7 +29,7 @@
> > #include <vlc_network.h>
> > #include <vlc_fs.h>
> > #include "../libvlc.h"
> > -#include "config/configuration.h"
> > +#include "../config/configuration.h"
>
> Again, I prefer #include "config/configuration.h"
>
> >
> > #include <string.h>
> > #include <jni.h>
> > diff --git a/src/android/thread.c b/src/android/thread.c
> > index 79132be2e4..49d52b838a 100644
> > --- a/src/android/thread.c
> > +++ b/src/android/thread.c
> > @@ -30,7 +30,7 @@
> >
> > #include <vlc_common.h>
> >
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include <signal.h>
> > #include <errno.h>
> > #include <stdatomic.h>
> > diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
> > index f3a3369ac1..45c9b2cda8 100644
> > --- a/src/audio_output/dec.c
> > +++ b/src/audio_output/dec.c
> > @@ -35,8 +35,8 @@
> > #include <vlc_aout.h>
> >
> > #include "aout_internal.h"
> > -#include "clock/clock.h"
> > -#include "libvlc.h"
> > +#include "../clock/clock.h"
> > +#include "../libvlc.h"
> >
> > static void aout_Drain(audio_output_t *aout)
> > {
> > diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
> > index 11a77e95b1..b089ec930c 100644
> > --- a/src/audio_output/filters.c
> > +++ b/src/audio_output/filters.c
> > @@ -36,7 +36,7 @@
> > #include <vlc_modules.h>
> > #include <vlc_aout.h>
> > #include <vlc_filter.h>
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> > #include "aout_internal.h"
> > #include "../video_output/vout_internal.h" /* for vout_Request */
> >
> > diff --git a/src/audio_output/volume.c b/src/audio_output/volume.c
> > index 5f3c379662..4403e19bf7 100644
> > --- a/src/audio_output/volume.c
> > +++ b/src/audio_output/volume.c
> > @@ -28,10 +28,10 @@
> > #include <math.h>
> >
> > #include <vlc_common.h>
> > -#include <libvlc.h>
> > #include <vlc_modules.h>
> > #include <vlc_aout.h>
> > #include <vlc_aout_volume.h>
> > +#include "../libvlc.h"
> > #include "aout_internal.h"
> >
> > struct aout_volume
> > diff --git a/src/config/chain.c b/src/config/chain.c
> > index 4458d4cbce..8e2e5f91aa 100644
> > --- a/src/config/chain.c
> > +++ b/src/config/chain.c
> > @@ -31,7 +31,7 @@
> > #endif
> >
> > #include <vlc_common.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include <vlc_charset.h>
> > #include <vlc_plugin.h>
> >
> > diff --git a/src/config/cmdline.c b/src/config/cmdline.c
> > index 72df85347a..dbe5ed0b33 100644
> > --- a/src/config/cmdline.c
> > +++ b/src/config/cmdline.c
> > @@ -34,7 +34,7 @@
> > #include "vlc_getopt.h"
> >
> > #include "configuration.h"
> > -#include "modules/modules.h"
> > +#include "../modules/modules.h"
> >
> > #include <assert.h>
> >
> > diff --git a/src/config/core.c b/src/config/core.c
> > index 13495e751b..cda59eb75d 100644
> > --- a/src/config/core.c
> > +++ b/src/config/core.c
> > @@ -35,7 +35,7 @@
> > #include <assert.h>
> >
> > #include "configuration.h"
> > -#include "modules/modules.h"
> > +#include "../modules/modules.h"
> >
> > vlc_rwlock_t config_lock = VLC_STATIC_RWLOCK;
> > bool config_dirty = false;
> > diff --git a/src/config/file.c b/src/config/file.c
> > index ae6e8b9ce5..e13ead63af 100644
> > --- a/src/config/file.c
> > +++ b/src/config/file.c
> > @@ -45,7 +45,7 @@
> > #include <vlc_plugin.h>
> >
> > #include "configuration.h"
> > -#include "modules/modules.h"
> > +#include "../modules/modules.h"
> >
> > static inline char *strdupnull (const char *src)
> > {
> > diff --git a/src/config/help.c b/src/config/help.c
> > index 9e013da29b..c64f07059d 100644
> > --- a/src/config/help.c
> > +++ b/src/config/help.c
> > @@ -34,9 +34,9 @@
> > #include <vlc_modules.h>
> > #include <vlc_plugin.h>
> > #include <vlc_charset.h>
> > -#include "modules/modules.h"
> > -#include "config/configuration.h"
> > -#include "libvlc.h"
> > +#include "../modules/modules.h"
> > +#include "configuration.h"
> > +#include "../libvlc.h"
> >
> > #if defined( _WIN32 )
> > # include <vlc_charset.h>
> > diff --git a/src/input/access.c b/src/input/access.c
> > index eab763f020..fc3f12115a 100644
> > --- a/src/input/access.c
> > +++ b/src/input/access.c
> > @@ -33,7 +33,7 @@
> > #include <vlc_modules.h>
> > #include <vlc_interrupt.h>
> >
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> > #include "stream.h"
> > #include "input_internal.h"
> >
> > diff --git a/src/input/decoder.c b/src/input/decoder.c
> > index cc3f69d740..795a298b6c 100644
> > --- a/src/input/decoder.c
> > +++ b/src/input/decoder.c
> > @@ -44,13 +44,12 @@
> > #include <vlc_decoder.h>
> > #include <vlc_picture_pool.h>
> >
> > -#include "audio_output/aout_internal.h"
> > -#include "stream_output/stream_output.h"
> > +#include "../audio_output/aout_internal.h"
> > +#include "../stream_output/stream_output.h"
> > #include "../clock/clock.h"
> > #include "decoder.h"
> > #include "resource.h"
> > -#include "libvlc.h"
> > -
> > +#include "../libvlc.h"
> > #include "../video_output/vout_internal.h"
> >
> > /*
> > diff --git a/src/input/decoder_helpers.c b/src/input/decoder_helpers.c
> > index c98e62bf21..8818d55f88 100644
> > --- a/src/input/decoder_helpers.c
> > +++ b/src/input/decoder_helpers.c
> > @@ -32,7 +32,7 @@
> > #include <vlc_meta.h>
> > #include <vlc_modules.h>
> > #include <vlc_picture.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > void decoder_Init( decoder_t *p_dec, const es_format_t *restrict p_fmt )
> > {
> > diff --git a/src/input/demux.c b/src/input/demux.c
> > index 44a7c440e7..8ea4e45073 100644
> > --- a/src/input/demux.c
> > +++ b/src/input/demux.c
> > @@ -28,7 +28,7 @@
> > #include <limits.h>
> >
> > #include "demux.h"
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> > #include <vlc_codec.h>
> > #include <vlc_meta.h>
> > #include <vlc_url.h>
> > diff --git a/src/input/input_interface.h b/src/input/input_interface.h
> > index 2d93fe55df..7358b86dad 100644
> > --- a/src/input/input_interface.h
> > +++ b/src/input/input_interface.h
> > @@ -24,7 +24,7 @@
> > #define LIBVLC_INPUT_INTERFACE_H 1
> >
> > #include <vlc_input.h>
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> >
> > /**********************************************************************
> > * Item metadata
> > diff --git a/src/input/input_internal.h b/src/input/input_internal.h
> > index 0bc67098f3..9a00c4b9b0 100644
> > --- a/src/input/input_internal.h
> > +++ b/src/input/input_internal.h
> > @@ -31,9 +31,9 @@
> > #include <vlc_input.h>
> > #include <vlc_viewpoint.h>
> > #include <vlc_atomic.h>
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> > #include "input_interface.h"
> > -#include "misc/interrupt.h"
> > +#include "../misc/interrupt.h"
> >
> > struct input_stats;
> >
> > diff --git a/src/input/stats.c b/src/input/stats.c
> > index bd41a34d75..79a4093815 100644
> > --- a/src/input/stats.c
> > +++ b/src/input/stats.c
> > @@ -28,7 +28,7 @@
> > #include <string.h>
> >
> > #include <vlc_common.h>
> > -#include "input/input_internal.h"
> > +#include "input_internal.h"
> >
> > /**
> > * Create a statistics counter
> > diff --git a/src/input/stream.c b/src/input/stream.c
> > index b26283e267..802d1a726b 100644
> > --- a/src/input/stream.c
> > +++ b/src/input/stream.c
> > @@ -39,7 +39,7 @@
> > #include <vlc_interrupt.h>
> > #include <vlc_stream_extractor.h>
> >
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> > #include "stream.h"
> > #include "mrl_helpers.h"
> >
> > diff --git a/src/input/stream_extractor.c b/src/input/stream_extractor.c
> > index f340646768..4438afbcd2 100644
> > --- a/src/input/stream_extractor.c
> > +++ b/src/input/stream_extractor.c
> > @@ -31,7 +31,7 @@
> > #include <vlc_modules.h>
> > #include <vlc_url.h>
> > #include <vlc_memstream.h>
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> > #include <assert.h>
> >
> > #include "stream.h"
> > diff --git a/src/input/stream_filter.c b/src/input/stream_filter.c
> > index 40ccbeaf82..b502de8fe6 100644
> > --- a/src/input/stream_filter.c
> > +++ b/src/input/stream_filter.c
> > @@ -27,7 +27,7 @@
> > #include <vlc_common.h>
> > #include <vlc_stream.h>
> > #include <vlc_modules.h>
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> >
> > #include <assert.h>
> >
> > diff --git a/src/input/thumbnailer.c b/src/input/thumbnailer.c
> > index 783eb2886b..ffd8e282ef 100644
> > --- a/src/input/thumbnailer.c
> > +++ b/src/input/thumbnailer.c
> > @@ -26,7 +26,7 @@
> >
> > #include <vlc_thumbnailer.h>
> > #include "input_internal.h"
> > -#include "misc/background_worker.h"
> > +#include "../misc/background_worker.h"
> >
> > struct vlc_thumbnailer_t
> > {
> > diff --git a/src/input/vlm.c b/src/input/vlm.c
> > index 116fc5296e..4d50d723ed 100644
> > --- a/src/input/vlm.c
> > +++ b/src/input/vlm.c
> > @@ -42,13 +42,14 @@
> >
> > #include <vlc_player.h>
> > #include <vlc_stream.h>
> > -#include "vlm_internal.h"
> > -#include "vlm_event.h"
> > #include <vlc_sout.h>
> > #include <vlc_url.h>
> > +
> > +#include "input_internal.h"
> > +#include "vlm_internal.h"
> > +#include "vlm_event.h"
> > #include "../stream_output/stream_output.h"
> > #include "../libvlc.h"
> > -#include "input_internal.h"
> >
> > /*****************************************************************************
> > * Local prototypes.
> > diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c
> > index cdb27bb9a9..616f956830 100644
> > --- a/src/input/vlmshell.c
> > +++ b/src/input/vlmshell.c
> > @@ -44,13 +44,14 @@
> > #include <fcntl.h>
> > #include <sys/stat.h>
> >
> > -#include "input_internal.h"
> > #include <vlc_stream.h>
> > -#include "vlm_internal.h"
> > #include <vlc_charset.h>
> > #include <vlc_fs.h>
> > #include <vlc_sout.h>
> > #include <vlc_memstream.h>
> > +
> > +#include "input_internal.h"
> > +#include "vlm_internal.h"
> > #include "../stream_output/stream_output.h"
> > #include "../libvlc.h"
> >
> > diff --git a/src/interface/dialog.c b/src/interface/dialog.c
> > index 68a1c1cbc8..94501bb428 100644
> > --- a/src/interface/dialog.c
> > +++ b/src/interface/dialog.c
> > @@ -31,7 +31,7 @@
> > #include <vlc_interrupt.h>
> > #include <vlc_extensions.h>
> > #include <assert.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > struct vlc_dialog_provider
> > {
> > diff --git a/src/interface/interface.c b/src/interface/interface.c
> > index cc490a35f2..50f62f8656 100644
> > --- a/src/interface/interface.c
> > +++ b/src/interface/interface.c
> > @@ -42,9 +42,9 @@
> > #include <vlc_modules.h>
> > #include <vlc_interface.h>
> > #include <vlc_playlist.h>
> > -#include "libvlc.h"
> > -#include "../lib/libvlc_internal.h"
> > -#include "player/player.h"
> > +#include "../libvlc.h"
> > +#include "../../lib/libvlc_internal.h"
> > +#include "../player/player.h"
> >
> > static int AddIntfCallback( vlc_object_t *, char const *,
> > vlc_value_t , vlc_value_t , void * );
> > diff --git a/src/libvlc.c b/src/libvlc.c
> > index c1dcde276d..40b8a871a2 100644
> > --- a/src/libvlc.c
> > +++ b/src/libvlc.c
> > @@ -35,40 +35,35 @@
> > # include "config.h"
> > #endif
> >
> > -#include <vlc_common.h>
> > -#include "../lib/libvlc_internal.h"
> > -
> > -#include "modules/modules.h"
> > -#include "config/configuration.h"
> > -#include "preparser/preparser.h"
> > -#include "media_source/media_source.h"
> > -
> > #include <stdio.h> /* sprintf() */
> > #include <string.h>
> > #include <stdlib.h> /* free() */
> > #include <errno.h>
> > +#include <assert.h>
> >
> > -#include "config/vlc_getopt.h"
> > -
> > -#include <vlc_playlist.h>
> > -#include <vlc_interface.h>
> > -
> > +#include <vlc_common.h>
> > #include <vlc_actions.h>
> > #include <vlc_charset.h>
> > +#include <vlc_cpu.h>
> > #include <vlc_dialog.h>
> > -#include <vlc_keystore.h>
> > #include <vlc_fs.h>
> > -#include <vlc_cpu.h>
> > -#include <vlc_url.h>
> > -#include <vlc_modules.h>
> > +#include <vlc_interface.h>
> > +#include <vlc_keystore.h>
> > #include <vlc_media_library.h>
> > +#include <vlc_modules.h>
> > +#include <vlc_playlist.h>
> > +#include <vlc_url.h>
> > #include <vlc_thumbnailer.h>
> > -
> > -#include "libvlc.h"
> > -
> > #include <vlc_vlm.h>
> >
> > -#include <assert.h>
> > +#include "../lib/libvlc_internal.h"
> > +#include "config/configuration.h"
> > +#include "config/vlc_getopt.h"
> > +#include "media_source/media_source.h"
> > +#include "modules/modules.h"
> > +#include "preparser/preparser.h"
> > +
> > +#include "libvlc.h"
> >
> > /*****************************************************************************
> > * Local prototypes
> > diff --git a/src/linux/dirs.c b/src/linux/dirs.c
> > index f5dbdaaf2c..d1ca152ab8 100644
> > --- a/src/linux/dirs.c
> > +++ b/src/linux/dirs.c
> > @@ -28,8 +28,8 @@
> > #include <linux/limits.h>
> >
> > #include <vlc_common.h>
> > -#include "libvlc.h"
> > -#include "config/configuration.h"
> > +#include "../libvlc.h"
> > +#include "../config/configuration.h"
> >
> > static char *config_GetLibDirRaw(void)
> > {
> > diff --git a/src/media_source/media_source.c b/src/media_source/media_source.c
> > index 71b37d41ac..1cffb3a62a 100644
> > --- a/src/media_source/media_source.c
> > +++ b/src/media_source/media_source.c
> > @@ -29,7 +29,7 @@
> > #include <vlc_playlist.h>
> > #include <vlc_services_discovery.h>
> > #include <vlc_vector.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include "media_tree.h"
> >
> > #ifdef TEST_MEDIA_SOURCE
> > diff --git a/src/media_source/media_tree.c b/src/media_source/media_tree.c
> > index 5774b294ff..deff6fdadf 100644
> > --- a/src/media_source/media_tree.c
> > +++ b/src/media_source/media_tree.c
> > @@ -30,7 +30,7 @@
> > #include <vlc_atomic.h>
> > #include <vlc_input_item.h>
> > #include <vlc_threads.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > struct vlc_media_tree_listener_id
> > {
> > diff --git a/src/misc/actions.c b/src/misc/actions.c
> > index b10b07936e..ec930ff964 100644
> > --- a/src/misc/actions.c
> > +++ b/src/misc/actions.c
> > @@ -40,8 +40,8 @@
> > #include <vlc_common.h>
> > #include <vlc_actions.h>
> > #include <vlc_charset.h>
> > -#include "config/configuration.h"
> > -#include "libvlc.h"
> > +#include "../config/configuration.h"
> > +#include "../libvlc.h"
> >
> > static const struct key_descriptor
> > {
> > diff --git a/src/misc/addons.c b/src/misc/addons.c
> > index 49a0f32463..7ce5dbefd8 100644
> > --- a/src/misc/addons.c
> > +++ b/src/misc/addons.c
> > @@ -27,7 +27,7 @@
> > #include <vlc_modules.h>
> > #include <vlc_arrays.h>
> > #include <vlc_interrupt.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > #include <vlc_addons.h>
> >
> > diff --git a/src/misc/background_worker.c b/src/misc/background_worker.c
> > index 05e28d813c..20642ecbe6 100644
> > --- a/src/misc/background_worker.c
> > +++ b/src/misc/background_worker.c
> > @@ -25,7 +25,7 @@
> > #include <vlc_list.h>
> > #include <vlc_threads.h>
> >
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include "background_worker.h"
> >
> > struct task {
> > diff --git a/src/misc/cpu.c b/src/misc/cpu.c
> > index 3bf4f8c63f..4c59eb37a6 100644
> > --- a/src/misc/cpu.c
> > +++ b/src/misc/cpu.c
> > @@ -34,7 +34,7 @@
> > #include <vlc_common.h>
> > #include <vlc_cpu.h>
> > #include <vlc_memstream.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > #include <assert.h>
> >
> > diff --git a/src/misc/exit.c b/src/misc/exit.c
> > index d6cb0ad407..86e5a69722 100644
> > --- a/src/misc/exit.c
> > +++ b/src/misc/exit.c
> > @@ -24,8 +24,8 @@
> >
> > #include <vlc_common.h>
> > #include <vlc_interface.h>
> > -#include "libvlc.h"
> > -#include "../lib/libvlc_internal.h"
> > +#include "../libvlc.h"
> > +#include "../../lib/libvlc_internal.h"
> >
> > void vlc_ExitInit( vlc_exit_t *exit )
> > {
> > diff --git a/src/misc/fifo.c b/src/misc/fifo.c
> > index 8361d30c3d..695b3243c1 100644
> > --- a/src/misc/fifo.c
> > +++ b/src/misc/fifo.c
> > @@ -30,7 +30,7 @@
> >
> > #include <vlc_common.h>
> > #include <vlc_block.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > /**
> > * Internal state for block queues
> > diff --git a/src/misc/filter.c b/src/misc/filter.c
> > index e8c1cae82e..23c5baef68 100644
> > --- a/src/misc/filter.c
> > +++ b/src/misc/filter.c
> > @@ -27,10 +27,11 @@
> > #include <assert.h>
> >
> > #include <vlc_common.h>
> > -#include <libvlc.h>
> > #include <vlc_filter.h>
> > #include <vlc_modules.h>
> > -#include "../misc/variables.h"
> > +
> > +#include "../libvlc.h"
> > +#include "variables.h"
> >
> > /* */
> >
> > diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
> > index 645a27507f..c977e25cf1 100644
> > --- a/src/misc/filter_chain.c
> > +++ b/src/misc/filter_chain.c
> > @@ -29,7 +29,8 @@
> > #include <vlc_modules.h>
> > #include <vlc_mouse.h>
> > #include <vlc_spu.h>
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> > +
> > #include <assert.h>
> >
> > typedef struct chained_filter_t
> > diff --git a/src/misc/fingerprinter.c b/src/misc/fingerprinter.c
> > index b41fb41ce3..18e79956e9 100644
> > --- a/src/misc/fingerprinter.c
> > +++ b/src/misc/fingerprinter.c
> > @@ -25,7 +25,7 @@
> > #include <vlc_common.h>
> > #include <vlc_fingerprinter.h>
> > #include <vlc_modules.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > fingerprinter_thread_t *fingerprinter_Create( vlc_object_t *p_this )
> > {
> > diff --git a/src/misc/fourcc_gen.c b/src/misc/fourcc_gen.c
> > index 5f91783690..2eadf17023 100644
> > --- a/src/misc/fourcc_gen.c
> > +++ b/src/misc/fourcc_gen.c
> > @@ -46,7 +46,7 @@ typedef struct
> > const char *description;
> > } staticentry_t;
> >
> > -#include "misc/fourcc_list.h"
> > +#include "fourcc_list.h"
> >
> > struct entry
> > {
> > diff --git a/src/misc/image.c b/src/misc/image.c
> > index faa05d9b01..7eec0b8e93 100644
> > --- a/src/misc/image.c
> > +++ b/src/misc/image.c
> > @@ -45,9 +45,10 @@
> > #include <vlc_stream.h>
> > #include <vlc_fs.h>
> > #include <vlc_sout.h>
> > -#include <libvlc.h>
> > #include <vlc_modules.h>
> >
> > +#include "../libvlc.h"
> > +
> > struct decoder_owner
> > {
> > decoder_t dec;
> > diff --git a/src/misc/interrupt.c b/src/misc/interrupt.c
> > index 972c01ebf5..7b99c8ba43 100644
> > --- a/src/misc/interrupt.c
> > +++ b/src/misc/interrupt.c
> > @@ -41,7 +41,7 @@
> > #include <vlc_network.h> /* vlc_accept */
> >
> > #include "interrupt.h"
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > static thread_local vlc_interrupt_t *vlc_interrupt_var;
> >
> > diff --git a/src/misc/keystore.c b/src/misc/keystore.c
> > index d58e8dea98..5fc54df619 100644
> > --- a/src/misc/keystore.c
> > +++ b/src/misc/keystore.c
> > @@ -27,7 +27,7 @@
> > #include <vlc_keystore.h>
> > #include <vlc_modules.h>
> > #include <vlc_url.h>
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> >
> > #include <assert.h>
> > #include <limits.h>
> > diff --git a/src/misc/medialibrary.c b/src/misc/medialibrary.c
> > index 140f055b5f..9af9515844 100644
> > --- a/src/misc/medialibrary.c
> > +++ b/src/misc/medialibrary.c
> > @@ -27,7 +27,7 @@
> > #include <vlc_modules.h>
> > #include <vlc_list.h>
> > #include <vlc_threads.h>
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> >
> > #include <assert.h>
> >
> > diff --git a/src/misc/objects.c b/src/misc/objects.c
> > index d7285358a5..68af0a2313 100644
> > --- a/src/misc/objects.c
> > +++ b/src/misc/objects.c
> > @@ -38,14 +38,12 @@
> > #endif
> >
> > #include <vlc_common.h>
> > -
> > -#include "../libvlc.h"
> > #include <vlc_aout.h>
> > -#include "audio_output/aout_internal.h"
> > -
> > #include <vlc_interface.h>
> > #include <vlc_codec.h>
> >
> > +#include "../libvlc.h"
> > +#include "../audio_output/aout_internal.h"
> > #include "variables.h"
> >
> > #ifdef HAVE_SEARCH_H
> > diff --git a/src/misc/objres.c b/src/misc/objres.c
> > index cac8624e7e..c96fb4a26d 100644
> > --- a/src/misc/objres.c
> > +++ b/src/misc/objres.c
> > @@ -30,7 +30,7 @@
> >
> > #include <vlc_common.h>
> >
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include "variables.h"
> >
> > struct vlc_res
> > diff --git a/src/misc/picture.c b/src/misc/picture.c
> > index e00b130325..76df1bb807 100644
> > --- a/src/misc/picture.c
> > +++ b/src/misc/picture.c
> > @@ -34,10 +34,11 @@
> > #include <limits.h>
> >
> > #include <vlc_common.h>
> > -#include "picture.h"
> > #include <vlc_image.h>
> > #include <vlc_block.h>
> >
> > +#include "picture.h"
> > +
> > static void PictureDestroyContext( picture_t *p_picture )
> > {
> > picture_context_t *ctx = p_picture->context;
> > diff --git a/src/misc/probe.c b/src/misc/probe.c
> > index 08fe54194d..c3f30d2481 100644
> > --- a/src/misc/probe.c
> > +++ b/src/misc/probe.c
> > @@ -25,7 +25,7 @@
> > #include <vlc_common.h>
> > #include <vlc_probe.h>
> > #include <vlc_modules.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > #undef vlc_probe
> > void *vlc_probe (vlc_object_t *obj,
> > diff --git a/src/misc/renderer_discovery.c b/src/misc/renderer_discovery.c
> > index 0fe57c9d99..6b35155387 100644
> > --- a/src/misc/renderer_discovery.c
> > +++ b/src/misc/renderer_discovery.c
> > @@ -29,7 +29,7 @@
> > #include <vlc_renderer_discovery.h>
> > #include <vlc_probe.h>
> > #include <vlc_modules.h>
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> >
> > struct vlc_renderer_item_t
> > {
> > diff --git a/src/misc/threads.c b/src/misc/threads.c
> > index 196e0dc1d0..8509a8f765 100644
> > --- a/src/misc/threads.c
> > +++ b/src/misc/threads.c
> > @@ -28,7 +28,7 @@
> > #include <stdatomic.h>
> >
> > #include <vlc_common.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > /* <stdatomic.h> types cannot be used in the C++ view of <vlc_threads.h> */
> > struct vlc_suuint { union { unsigned int value; }; };
> > diff --git a/src/misc/variables.c b/src/misc/variables.c
> > index ed284cf4f4..08b78ad9c6 100644
> > --- a/src/misc/variables.c
> > +++ b/src/misc/variables.c
> > @@ -38,9 +38,9 @@
> > #include <vlc_common.h>
> > #include <vlc_arrays.h>
> > #include <vlc_charset.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include "variables.h"
> > -#include "config/configuration.h"
> > +#include "../config/configuration.h"
> >
> > typedef struct callback_entry_t
> > {
> > diff --git a/src/modules/bank.c b/src/modules/bank.c
> > index 12330d695d..bfb391baa4 100644
> > --- a/src/modules/bank.c
> > +++ b/src/modules/bank.c
> > @@ -45,9 +45,9 @@
> > #include <vlc_modules.h>
> > #include <vlc_fs.h>
> > #include <vlc_block.h>
> > -#include "libvlc.h"
> > -#include "config/configuration.h"
> > -#include "modules/modules.h"
> > +#include "../libvlc.h"
> > +#include "../config/configuration.h"
> > +#include "modules.h"
> >
> > typedef struct vlc_modcap
> > {
> > diff --git a/src/modules/cache.c b/src/modules/cache.c
> > index ad2e44b548..ae00727676 100644
> > --- a/src/modules/cache.c
> > +++ b/src/modules/cache.c
> > @@ -38,16 +38,16 @@
> >
> > #include <vlc_common.h>
> > #include <vlc_block.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > #include <vlc_plugin.h>
> > #include <errno.h>
> >
> > -#include "config/configuration.h"
> > +#include "../config/configuration.h"
> >
> > #include <vlc_fs.h>
> >
> > -#include "modules/modules.h"
> > +#include "modules.h"
> >
> >
> > /*****************************************************************************
> > diff --git a/src/modules/entry.c b/src/modules/entry.c
> > index fc7f3cdbb6..7d3c01ec6f 100644
> > --- a/src/modules/entry.c
> > +++ b/src/modules/entry.c
> > @@ -33,9 +33,9 @@
> > # include <search.h>
> > #endif
> >
> > -#include "modules/modules.h"
> > -#include "config/configuration.h"
> > -#include "libvlc.h"
> > +#include "modules.h"
> > +#include "../config/configuration.h"
> > +#include "../libvlc.h"
> >
> > module_t *vlc_module_create(vlc_plugin_t *plugin)
> > {
> > diff --git a/src/modules/modules.c b/src/modules/modules.c
> > index dc7b2fddf4..bd7b79d456 100644
> > --- a/src/modules/modules.c
> > +++ b/src/modules/modules.c
> > @@ -39,9 +39,9 @@
> > #include <vlc_modules.h>
> > #include <vlc_arrays.h>
> >
> > -#include "libvlc.h"
> > -#include "config/configuration.h"
> > -#include "modules/modules.h"
> > +#include "../libvlc.h"
> > +#include "../config/configuration.h"
> > +#include "modules.h"
> >
> > bool module_provides (const module_t *m, const char *cap)
> > {
> > diff --git a/src/modules/textdomain.c b/src/modules/textdomain.c
> > index d16cecbdb5..fa9553d253 100644
> > --- a/src/modules/textdomain.c
> > +++ b/src/modules/textdomain.c
> > @@ -23,7 +23,7 @@
> > #endif
> >
> > #include <vlc_common.h>
> > -#include "modules/modules.h"
> > +#include "modules.h"
> >
> > #ifdef ENABLE_NLS
> > # include <libintl.h>
> > diff --git a/src/network/http_auth.c b/src/network/http_auth.c
> > index 599fda6286..c8b4f61405 100644
> > --- a/src/network/http_auth.c
> > +++ b/src/network/http_auth.c
> > @@ -36,7 +36,7 @@
> > #include <vlc_rand.h>
> > #include <vlc_strings.h>
> >
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> >
> > /*****************************************************************************
> > diff --git a/src/network/tls.c b/src/network/tls.c
> > index 0bbcee8e00..a46c2728a1 100644
> > --- a/src/network/tls.c
> > +++ b/src/network/tls.c
> > @@ -38,7 +38,7 @@
> > #endif
> >
> > #include <vlc_common.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > #include <vlc_tls.h>
> > #include <vlc_modules.h>
> > diff --git a/src/os2/dirs.c b/src/os2/dirs.c
> > index 350067472c..9c830c001c 100644
> > --- a/src/os2/dirs.c
> > +++ b/src/os2/dirs.c
> > @@ -28,7 +28,7 @@
> >
> > #include "../libvlc.h"
> > #include <vlc_charset.h>
> > -#include "config/configuration.h"
> > +#include "../config/configuration.h"
> >
> > #include <assert.h>
> >
> > diff --git a/src/os2/filesystem.c b/src/os2/filesystem.c
> > index 8b1d3d5eec..87a1f90b70 100644
> > --- a/src/os2/filesystem.c
> > +++ b/src/os2/filesystem.c
> > @@ -47,7 +47,7 @@
> > #include <vlc_charset.h>
> > #include <vlc_fs.h>
> > #include <vlc_network.h>
> > -#include "libvlc.h" /* vlc_mkdir */
> > +#include "../libvlc.h" /* vlc_mkdir */
> >
> > int vlc_open (const char *filename, int flags, ...)
> > {
> > diff --git a/src/os2/plugin.c b/src/os2/plugin.c
> > index 21c621746e..51627bf809 100644
> > --- a/src/os2/plugin.c
> > +++ b/src/os2/plugin.c
> > @@ -35,7 +35,7 @@
> >
> > #include <vlc_common.h>
> > #include <vlc_charset.h>
> > -#include "modules/modules.h"
> > +#include "../modules/modules.h"
> >
> > void *vlc_dlopen(const char *psz_file, bool lazy )
> > {
> > diff --git a/src/os2/thread.c b/src/os2/thread.c
> > index a5fa6c8bda..f4a155d80c 100644
> > --- a/src/os2/thread.c
> > +++ b/src/os2/thread.c
> > @@ -32,7 +32,7 @@
> >
> > #include <vlc_common.h>
> >
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include <stdarg.h>
> > #include <assert.h>
> > #include <limits.h>
> > diff --git a/src/player/aout.c b/src/player/aout.c
> > index 8674cc6535..452b9b7d09 100644
> > --- a/src/player/aout.c
> > +++ b/src/player/aout.c
> > @@ -27,7 +27,7 @@
> > #include <vlc_common.h>
> > #include <vlc_decoder.h>
> > #include "player.h"
> > -#include "input/resource.h"
> > +#include "../input/resource.h"
> >
> > #define vlc_player_aout_SendEvent(player, event, ...) do { \
> > vlc_mutex_lock(&player->aout_listeners_lock); \
> > diff --git a/src/player/medialib.c b/src/player/medialib.c
> > index 64c7bad0de..8240ba671c 100644
> > --- a/src/player/medialib.c
> > +++ b/src/player/medialib.c
> > @@ -24,7 +24,7 @@
> >
> > #include <vlc_common.h>
> > #include "player.h"
> > -#include "misc/variables.h"
> > +#include "../misc/variables.h"
> >
> > void
> > vlc_player_input_RestoreMlStates(struct vlc_player_input* input, bool
> > force_pos)
> > diff --git a/src/player/osd.c b/src/player/osd.c
> > index ca163da215..fba7969354 100644
> > --- a/src/player/osd.c
> > +++ b/src/player/osd.c
> > @@ -26,7 +26,7 @@
> >
> > #include <vlc_common.h>
> > #include "player.h"
> > -#include "input/resource.h"
> > +#include "../input/resource.h"
> >
> > static vout_thread_t **
> > vlc_player_osd_HoldAll(vlc_player_t *player, size_t *count)
> > diff --git a/src/player/player.c b/src/player/player.c
> > index 669df87649..1ee53e1005 100644
> > --- a/src/player/player.c
> > +++ b/src/player/player.c
> > @@ -25,16 +25,17 @@
> > #include <limits.h>
> >
> > #include <vlc_common.h>
> > -#include "player.h"
> > #include <vlc_aout.h>
> > #include <vlc_renderer_discovery.h>
> > #include <vlc_tick.h>
> > #include <vlc_decoder.h>
> > #include <vlc_memstream.h>
> >
> > -#include "libvlc.h"
> > -#include "input/resource.h"
> > -#include "audio_output/aout_internal.h"
> > +#include "player.h"
> > +
> > +#include "../libvlc.h"
> > +#include "../input/resource.h"
> > +#include "../audio_output/aout_internal.h"
> >
> > static_assert(VLC_PLAYER_CAP_SEEK == VLC_INPUT_CAPABILITIES_SEEKABLE &&
> > VLC_PLAYER_CAP_PAUSE == VLC_INPUT_CAPABILITIES_PAUSEABLE &&
> > diff --git a/src/player/player.h b/src/player/player.h
> > index fde4b1dbf3..8915a9740f 100644
> > --- a/src/player/player.h
> > +++ b/src/player/player.h
> > @@ -27,7 +27,7 @@
> > #include <vlc_atomic.h>
> > #include <vlc_media_library.h>
> >
> > -#include "input/input_internal.h"
> > +#include "../input/input_internal.h"
> >
> > struct vlc_player_track_priv
> > {
> > diff --git a/src/player/vout.c b/src/player/vout.c
> > index 4bb6412c91..cdfd3d9c8f 100644
> > --- a/src/player/vout.c
> > +++ b/src/player/vout.c
> > @@ -26,7 +26,7 @@
> >
> > #include <vlc_common.h>
> > #include "player.h"
> > -#include "input/resource.h"
> > +#include "../input/resource.h"
> >
> > #define vlc_player_vout_SendEvent(player, event, ...) do { \
> > vlc_mutex_lock(&player->vout_listeners_lock); \
> > diff --git a/src/playlist/export.c b/src/playlist/export.c
> > index e9f3ab5e05..011796ba25 100644
> > --- a/src/playlist/export.c
> > +++ b/src/playlist/export.c
> > @@ -32,7 +32,7 @@
> > #include <vlc_modules.h>
> > #include <vlc_url.h>
> > #include "playlist.h"
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > struct vlc_playlist_view
> > {
> > diff --git a/src/playlist/preparse.c b/src/playlist/preparse.c
> > index 11f6faff41..4c2d330528 100644
> > --- a/src/playlist/preparse.c
> > +++ b/src/playlist/preparse.c
> > @@ -28,7 +28,7 @@
> > #include "item.h"
> > #include "playlist.h"
> > #include "notify.h"
> > -#include "libvlc.h" /* for vlc_MetadataRequest() */
> > +#include "../libvlc.h" /* for vlc_MetadataRequest() */
> >
> > typedef struct VLC_VECTOR(input_item_t *) media_vector_t;
> >
> > diff --git a/src/posix/dirs.c b/src/posix/dirs.c
> > index d6acdb47dc..e8bf3160ea 100644
> > --- a/src/posix/dirs.c
> > +++ b/src/posix/dirs.c
> > @@ -28,7 +28,7 @@
> > #include <vlc_common.h>
> >
> > #include "../libvlc.h"
> > -#include "config/configuration.h"
> > +#include "../config/configuration.h"
> >
> > #include <unistd.h>
> > #include <pwd.h>
> > diff --git a/src/posix/picture.c b/src/posix/picture.c
> > index c8395aaf6c..65ad26d215 100644
> > --- a/src/posix/picture.c
> > +++ b/src/posix/picture.c
> > @@ -28,7 +28,7 @@
> >
> > #include <vlc_common.h>
> > #include <vlc_fs.h>
> > -#include "misc/picture.h"
> > +#include "../misc/picture.h"
> >
> > void *picture_Allocate(int *restrict fdp, size_t size)
> > {
> > diff --git a/src/posix/plugin.c b/src/posix/plugin.c
> > index 2b80301816..dab304d9f4 100644
> > --- a/src/posix/plugin.c
> > +++ b/src/posix/plugin.c
> > @@ -29,7 +29,7 @@
> >
> > #include <assert.h>
> > #include <vlc_common.h>
> > -#include "modules/modules.h"
> > +#include "../modules/modules.h"
> >
> > #include <sys/types.h>
> > #include <dlfcn.h>
> > diff --git a/src/posix/specific.c b/src/posix/specific.c
> > index 067cfe07e1..d8ea097247 100644
> > --- a/src/posix/specific.c
> > +++ b/src/posix/specific.c
> > @@ -24,7 +24,7 @@
> >
> > #include <vlc_common.h>
> > #include "../libvlc.h"
> > -#include "../lib/libvlc_internal.h"
> > +#include "../../lib/libvlc_internal.h"
> >
> > #ifdef HAVE_DBUS
> > /* used for one-instance mode */
> > diff --git a/src/posix/thread.c b/src/posix/thread.c
> > index 33f6da47bc..69d2514bf2 100644
> > --- a/src/posix/thread.c
> > +++ b/src/posix/thread.c
> > @@ -30,7 +30,7 @@
> >
> > #include <vlc_common.h>
> >
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include <stdarg.h>
> > #include <stdatomic.h>
> > #include <stdnoreturn.h>
> > diff --git a/src/preparser/fetcher.c b/src/preparser/fetcher.c
> > index 5bb4aa1cef..d3016ca2b9 100644
> > --- a/src/preparser/fetcher.c
> > +++ b/src/preparser/fetcher.c
> > @@ -32,12 +32,12 @@
> > #include <vlc_memstream.h>
> > #include <vlc_meta_fetcher.h>
> >
> > +#include "../libvlc.h"
> > #include "art.h"
> > -#include "libvlc.h"
> > #include "fetcher.h"
> > -#include "input/input_interface.h"
> > -#include "misc/background_worker.h"
> > -#include "misc/interrupt.h"
> > +#include "../input/input_interface.h"
> > +#include "../misc/background_worker.h"
> > +#include "../misc/interrupt.h"
> >
> > struct input_fetcher_t {
> > struct background_worker* local;
> > diff --git a/src/preparser/preparser.c b/src/preparser/preparser.c
> > index 723feb96dc..ce2e7664f6 100644
> > --- a/src/preparser/preparser.c
> > +++ b/src/preparser/preparser.c
> > @@ -25,9 +25,9 @@
> > #include <vlc_common.h>
> > #include <vlc_atomic.h>
> >
> > -#include "misc/background_worker.h"
> > -#include "input/input_interface.h"
> > -#include "input/input_internal.h"
> > +#include "../misc/background_worker.h"
> > +#include "../input/input_interface.h"
> > +#include "../input/input_internal.h"
> > #include "preparser.h"
> > #include "fetcher.h"
> >
> > diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
> > index 0e699faeee..ba3f3343f5 100644
> > --- a/src/stream_output/sap.c
> > +++ b/src/stream_output/sap.c
> > @@ -37,7 +37,7 @@
> > #include <vlc_memstream.h>
> >
> > #include "stream_output.h"
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> >
> > /* SAP is always on that port */
> > #define IPPORT_SAP 9875
> > diff --git a/src/stream_output/stream_output.c
> > b/src/stream_output/stream_output.c
> > index 524b1a65ca..2f2a522a37 100644
> > --- a/src/stream_output/stream_output.c
> > +++ b/src/stream_output/stream_output.c
> > @@ -47,7 +47,7 @@
> > #include <vlc_codec.h>
> > #include <vlc_modules.h>
> >
> > -#include "input/input_interface.h"
> > +#include "../input/input_interface.h"
> >
> > #undef DEBUG_BUFFER
> > /*****************************************************************************
> > diff --git a/src/text/charset.c b/src/text/charset.c
> > index 0cb2322654..8c5f43dc94 100644
> > --- a/src/text/charset.c
> > +++ b/src/text/charset.c
> > @@ -40,7 +40,7 @@
> > # include <xlocale.h>
> > #endif
> >
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include <vlc_charset.h>
> >
> > /**
> > diff --git a/src/text/strings.c b/src/text/strings.c
> > index 9676687aae..0c41c38bdc 100644
> > --- a/src/text/strings.c
> > +++ b/src/text/strings.c
> > @@ -38,6 +38,7 @@
> > #include <limits.h>
> > #include <math.h>
> > #include <string.h>
> > +#include <errno.h>
> > #ifndef HAVE_STRCOLL
> > # define strcoll strcasecmp
> > #endif
> > @@ -51,8 +52,7 @@
> > #include <vlc_charset.h>
> > #include <vlc_arrays.h>
> > #include <vlc_player.h>
> > -#include <libvlc.h>
> > -#include <errno.h>
> > +#include "../libvlc.h"
> >
> > static const struct xml_entity_s
> > {
> > diff --git a/src/text/unicode.c b/src/text/unicode.c
> > index a862c5a2e1..22b8b39c3f 100644
> > --- a/src/text/unicode.c
> > +++ b/src/text/unicode.c
> > @@ -30,7 +30,7 @@
> >
> > #include <vlc_common.h>
> >
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include <vlc_charset.h>
> >
> > #include <assert.h>
> > diff --git a/src/text/url.c b/src/text/url.c
> > index 9e5eb6cff7..f3a5b39515 100644
> > --- a/src/text/url.c
> > +++ b/src/text/url.c
> > @@ -33,12 +33,12 @@
> > #ifdef _WIN32
> > # include <io.h>
> > #endif
> > +#include <ctype.h>
> >
> > #include <vlc_common.h>
> > #include <vlc_memstream.h>
> > #include <vlc_url.h>
> > #include <vlc_fs.h>
> > -#include <ctype.h>
> >
> > char *vlc_uri_decode_duplicate (const char *str)
> > {
> > diff --git a/src/video_output/display.c b/src/video_output/display.c
> > index 5e895fd5b1..37102b1fd0 100644
> > --- a/src/video_output/display.c
> > +++ b/src/video_output/display.c
> > @@ -38,8 +38,7 @@
> > #include <vlc_picture_pool.h>
> > #include <vlc_codec.h>
> >
> > -#include <libvlc.h>
> > -
> > +#include "../libvlc.h"
> > #include "display.h"
> > #include "window.h"
> >
> > diff --git a/src/video_output/inhibit.c b/src/video_output/inhibit.c
> > index 43ca020cb1..46bc5095e7 100644
> > --- a/src/video_output/inhibit.c
> > +++ b/src/video_output/inhibit.c
> > @@ -25,7 +25,7 @@
> > #include <vlc_common.h>
> > #include <vlc_modules.h>
> > #include "inhibit.h"
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> > #include <assert.h>
> >
> > typedef struct
> > diff --git a/src/video_output/opengl.c b/src/video_output/opengl.c
> > index e5aa450888..6d9a7c8baa 100644
> > --- a/src/video_output/opengl.c
> > +++ b/src/video_output/opengl.c
> > @@ -29,7 +29,7 @@
> > #include <vlc_atomic.h>
> > #include <vlc_opengl.h>
> > #include <vlc_vout_display.h>
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include <vlc_modules.h>
> >
> > struct vlc_gl_priv_t
> > diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
> > index de9329bfcb..0117a3512c 100644
> > --- a/src/video_output/video_output.c
> > +++ b/src/video_output/video_output.c
> > @@ -50,17 +50,17 @@
> > #include <vlc_codec.h>
> > #include <vlc_atomic.h>
> >
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> > +#include "chrono.h"
> > +#include "control.h"
> > #include "vout_private.h"
> > #include "vout_internal.h"
> > #include "display.h"
> > #include "snapshot.h"
> > +#include "statistic.h"
> > #include "window.h"
> > #include "../misc/variables.h"
> > #include "../clock/clock.h"
> > -#include "statistic.h"
> > -#include "chrono.h"
> > -#include "control.h"
> >
> > typedef struct vout_thread_sys_t
> > {
> > diff --git a/src/video_output/window.c b/src/video_output/window.c
> > index 9c2df5c1e6..ff5435a185 100644
> > --- a/src/video_output/window.c
> > +++ b/src/video_output/window.c
> > @@ -34,7 +34,7 @@
> > #include <vlc_vout_window.h>
> > #include <vlc_modules.h>
> > #include "inhibit.h"
> > -#include <libvlc.h>
> > +#include "../libvlc.h"
> >
> > typedef struct
> > {
> > diff --git a/src/win32/dirs.c b/src/win32/dirs.c
> > index 7c39e391c2..90e02563a9 100644
> > --- a/src/win32/dirs.c
> > +++ b/src/win32/dirs.c
> > @@ -39,7 +39,7 @@
> > #include "../libvlc.h"
> > #include <vlc_charset.h>
> > #include <vlc_configuration.h>
> > -#include "config/configuration.h"
> > +#include "../config/configuration.h"
> >
> > #include <assert.h>
> > #include <limits.h>
> > diff --git a/src/win32/filesystem.c b/src/win32/filesystem.c
> > index 0a0656dbba..fb26d4ed0b 100644
> > --- a/src/win32/filesystem.c
> > +++ b/src/win32/filesystem.c
> > @@ -42,7 +42,7 @@
> > #include <vlc_common.h>
> > #include <vlc_charset.h>
> > #include <vlc_fs.h>
> > -#include "libvlc.h" /* vlc_mkdir */
> > +#include "../libvlc.h" /* vlc_mkdir */
> >
> > #ifdef _MSC_VER
> > # define __STDC__ 1
> > diff --git a/src/win32/plugin.c b/src/win32/plugin.c
> > index a0d392e6e0..482b1585c2 100644
> > --- a/src/win32/plugin.c
> > +++ b/src/win32/plugin.c
> > @@ -29,7 +29,7 @@
> >
> > #include <vlc_common.h>
> > #include <vlc_charset.h>
> > -#include "modules/modules.h"
> > +#include "../modules/modules.h"
> > #include <windows.h>
> > #include <wchar.h>
> >
> > diff --git a/src/win32/specific.c b/src/win32/specific.c
> > index cf5836af0b..d58267ce4e 100644
> > --- a/src/win32/specific.c
> > +++ b/src/win32/specific.c
> > @@ -29,9 +29,9 @@
> > # define UNICODE
> > #endif
> > #include <vlc_common.h>
> > -#include "libvlc.h"
> > -#include "../lib/libvlc_internal.h"
> > -#include "config/vlc_getopt.h"
> > +#include "../libvlc.h"
> > +#include "../../lib/libvlc_internal.h"
> > +#include "../config/vlc_getopt.h"
> >
> > #include <mmsystem.h>
> > #include <winsock2.h>
> > diff --git a/src/win32/thread.c b/src/win32/thread.c
> > index 255946913c..113e0c4199 100644
> > --- a/src/win32/thread.c
> > +++ b/src/win32/thread.c
> > @@ -32,7 +32,7 @@
> > #define _DECL_DLLMAIN
> > #include <vlc_common.h>
> >
> > -#include "libvlc.h"
> > +#include "../libvlc.h"
> > #include <stdarg.h>
> > #include <stdatomic.h>
> > #include <assert.h>
>
> Not really fan of this patch, that change many files for no specific gain.
Agreed, this is mostly aesthetical.
Regards,
--
Alexandre Janniaux
Videolabs
More information about the vlc-devel
mailing list