[vlc-devel] [PATCH 4/4] seek config.h include via angled bracket search

Lyndon Brown jnqnfe at gmail.com
Fri Oct 2 07:27:41 CEST 2020


From: Lyndon Brown <jnqnfe at gmail.com>
Date: Fri, 2 Oct 2020 04:16:44 +0100
Subject: seek config.h include via angled bracket search

since it will never exists within the same directories as the files that
include it.

diff --git a/bin/breakpad.cpp b/bin/breakpad.cpp
index 15baae5d8e..1a75177854 100644
--- a/bin/breakpad.cpp
+++ b/bin/breakpad.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <windows.h>
diff --git a/bin/cachegen.c b/bin/cachegen.c
index 5f0a1ac04b..b8ab1b6c5b 100644
--- a/bin/cachegen.c
+++ b/bin/cachegen.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/vlc.h>
diff --git a/bin/darwinvlc.m b/bin/darwinvlc.m
index b405c9731f..dd526d15f7 100644
--- a/bin/darwinvlc.m
+++ b/bin/darwinvlc.m
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/vlc.h>
diff --git a/bin/override.c b/bin/override.c
index 079ad030f5..70d200575c 100644
--- a/bin/override.c
+++ b/bin/override.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdbool.h>
diff --git a/bin/vlc.c b/bin/vlc.c
index 268922a617..2236a9953f 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/vlc.h>
diff --git a/bin/winvlc.c b/bin/winvlc.c
index 81fed36205..d443918240 100644
--- a/bin/winvlc.c
+++ b/bin/winvlc.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifndef UNICODE
diff --git a/compat/freeaddrinfo.c b/compat/freeaddrinfo.c
index f2a773da9c..db2e77b08b 100644
--- a/compat/freeaddrinfo.c
+++ b/compat/freeaddrinfo.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/compat/gai_strerror.c b/compat/gai_strerror.c
index cb13915ed4..11b443e541 100644
--- a/compat/gai_strerror.c
+++ b/compat/gai_strerror.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* GAI error codes. See include/vlc_network.h. */
diff --git a/compat/tdestroy.c b/compat/tdestroy.c
index 6bb3480957..90c671971b 100644
--- a/compat/tdestroy.c
+++ b/compat/tdestroy.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/compat/test/clock_nanosleep.c b/compat/test/clock_nanosleep.c
index 9c94f4b7ae..33794effad 100644
--- a/compat/test/clock_nanosleep.c
+++ b/compat/test/clock_nanosleep.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "config.h"
+#include <config.h>
 
 #include <stdbool.h>
 #include <unistd.h>
diff --git a/compat/test/heap.c b/compat/test/heap.c
index a4933295ff..447176c367 100644
--- a/compat/test/heap.c
+++ b/compat/test/heap.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "config.h"
+#include <config.h>
 #undef NDEBUG
 #include <assert.h>
 #include <stdalign.h>
diff --git a/compat/test/strnstr.c b/compat/test/strnstr.c
index eb0337a3de..5fa6987b1a 100644
--- a/compat/test/strnstr.c
+++ b/compat/test/strnstr.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "config.h"
+#include <config.h>
 
 #include <stdbool.h>
 #undef NDEBUG
diff --git a/extras/analyser/zsh.cpp b/extras/analyser/zsh.cpp
index 7b7b8e00e9..d79c24dba8 100644
--- a/extras/analyser/zsh.cpp
+++ b/extras/analyser/zsh.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <algorithm>
diff --git a/lib/audio.c b/lib/audio.c
index aab84cd47a..a2cf0eebdb 100644
--- a/lib/audio.c
+++ b/lib/audio.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/core.c b/lib/core.c
index 3bd3292e24..308ddb4fb0 100644
--- a/lib/core.c
+++ b/lib/core.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "libvlc_internal.h"
diff --git a/lib/dialog.c b/lib/dialog.c
index 5669bf8b4e..c64db0ee93 100644
--- a/lib/dialog.c
+++ b/lib/dialog.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/event.c b/lib/event.c
index 96a17e1b19..a1c8e0d187 100644
--- a/lib/event.c
+++ b/lib/event.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/libvlc_internal.h b/lib/libvlc_internal.h
index 154780895f..c1bdb06e9d 100644
--- a/lib/libvlc_internal.h
+++ b/lib/libvlc_internal.h
@@ -25,7 +25,7 @@
 #define _LIBVLC_INTERNAL_H 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/libvlc.h>
diff --git a/lib/log.c b/lib/log.c
index 66e0d996d1..e176b0b50f 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/media.c b/lib/media.c
index e4c0909c16..00ecb4ef1d 100644
--- a/lib/media.c
+++ b/lib/media.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/media_discoverer.c b/lib/media_discoverer.c
index 6fcab48eca..64cb98f2f9 100644
--- a/lib/media_discoverer.c
+++ b/lib/media_discoverer.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/media_list.c b/lib/media_list.c
index c747778d47..4fecff9e55 100644
--- a/lib/media_list.c
+++ b/lib/media_list.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/media_list_internal.h b/lib/media_list_internal.h
index 82c1482148..03b50fc42f 100644
--- a/lib/media_list_internal.h
+++ b/lib/media_list_internal.h
@@ -25,7 +25,7 @@
 #define _LIBVLC_MEDIA_LIST_INTERNAL_H 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/vlc.h>
diff --git a/lib/media_list_player.c b/lib/media_list_player.c
index 2e7405c492..9a3c79e713 100644
--- a/lib/media_list_player.c
+++ b/lib/media_list_player.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/libvlc.h>
diff --git a/lib/media_player.c b/lib/media_player.c
index 4db7f96af0..17bdd77246 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/media_player_internal.h b/lib/media_player_internal.h
index 1b95fcb355..4610bc2ac9 100644
--- a/lib/media_player_internal.h
+++ b/lib/media_player_internal.h
@@ -25,7 +25,7 @@
 #define _LIBVLC_MEDIA_PLAYER_INTERNAL_H 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/vlc.h>
diff --git a/lib/media_track.c b/lib/media_track.c
index a11c2973c6..fd955a9e6c 100644
--- a/lib/media_track.c
+++ b/lib/media_track.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/picture.c b/lib/picture.c
index fc8b769b2a..566057f64d 100644
--- a/lib/picture.c
+++ b/lib/picture.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/libvlc.h>
diff --git a/lib/playlist.c b/lib/playlist.c
index 92fca47e02..3e21faa471 100644
--- a/lib/playlist.c
+++ b/lib/playlist.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "libvlc_internal.h"
diff --git a/lib/renderer_discoverer.c b/lib/renderer_discoverer.c
index 67b81f4bf1..e4e15f3ad5 100644
--- a/lib/renderer_discoverer.c
+++ b/lib/renderer_discoverer.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/lib/renderer_discoverer_internal.h b/lib/renderer_discoverer_internal.h
index e84009b765..f2866170f0 100644
--- a/lib/renderer_discoverer_internal.h
+++ b/lib/renderer_discoverer_internal.h
@@ -22,7 +22,7 @@
 #define _LIBVLC_RENDERER_DISCOVERER_INTERNAL_H 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_renderer_discovery.h>
diff --git a/lib/video.c b/lib/video.c
index e06adf143b..b41d2844a2 100644
--- a/lib/video.c
+++ b/lib/video.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/libvlc.h>
diff --git a/modules/access/amt.c b/modules/access/amt.c
index 52bf0271ef..6c64bc5664 100644
--- a/modules/access/amt.c
+++ b/modules/access/amt.c
@@ -35,7 +35,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  ****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/modules/access/avaudiocapture.m b/modules/access/avaudiocapture.m
index f4171028c4..894840b9ac 100644
--- a/modules/access/avaudiocapture.m
+++ b/modules/access/avaudiocapture.m
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/avcapture.m b/modules/access/avcapture.m
index df3e3b082a..ca4d36b07b 100644
--- a/modules/access/avcapture.m
+++ b/modules/access/avcapture.m
@@ -28,7 +28,7 @@
 #define OS_OBJECT_USE_OBJC 0
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/avio.c b/modules/access/avio.c
index 8302ca7de9..d520f5819d 100644
--- a/modules/access/avio.c
+++ b/modules/access/avio.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index bf636c4991..42b9ed4c60 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 9260b833ed..26e989f498 100644
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -32,7 +32,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/concat.c b/modules/access/concat.c
index f8b5c13b02..81982588b9 100644
--- a/modules/access/concat.c
+++ b/modules/access/concat.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c
index d994d37f2d..42946202fa 100644
--- a/modules/access/dc1394.c
+++ b/modules/access/dc1394.c
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/dcp/dcp.cpp b/modules/access/dcp/dcp.cpp
index 093be530fd..b5fe7a97c2 100644
--- a/modules/access/dcp/dcp.cpp
+++ b/modules/access/dcp/dcp.cpp
@@ -37,7 +37,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define KDM_HELP_TEXT          N_("KDM file")
diff --git a/modules/access/dcp/dcpdecrypt.cpp b/modules/access/dcp/dcpdecrypt.cpp
index 0531b3d6da..c84a41cf93 100644
--- a/modules/access/dcp/dcpdecrypt.cpp
+++ b/modules/access/dcp/dcpdecrypt.cpp
@@ -31,7 +31,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* VLC core API headers */
diff --git a/modules/access/dcp/dcpparser.cpp b/modules/access/dcp/dcpparser.cpp
index e40255dd49..48e4e6e131 100755
--- a/modules/access/dcp/dcpparser.cpp
+++ b/modules/access/dcp/dcpparser.cpp
@@ -31,7 +31,7 @@
  * @brief Parsing of DCP XML files
  */
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* VLC core API headers */
diff --git a/modules/access/dcp/dcpparser.h b/modules/access/dcp/dcpparser.h
index 4c63aa3edc..f5c7f54650 100644
--- a/modules/access/dcp/dcpparser.h
+++ b/modules/access/dcp/dcpparser.h
@@ -35,7 +35,7 @@
 #define VLC_DCP_DCPPARSER_H_
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 /* VLC core API headers */
diff --git a/modules/access/decklink.cpp b/modules/access/decklink.cpp
index e24fd128c7..14fcaf18c4 100644
--- a/modules/access/decklink.cpp
+++ b/modules/access/decklink.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/directory.c b/modules/access/directory.c
index 5579bc0fab..63a61c1d83 100644
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/access/dshow/crossbar.cpp b/modules/access/dshow/crossbar.cpp
index 30a78c527f..8a1b814d67 100644
--- a/modules/access/dshow/crossbar.cpp
+++ b/modules/access/dshow/crossbar.cpp
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 02871d9aef..92ff1dec3a 100644
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <inttypes.h>
diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp
index 562c7af9d4..d0a441578c 100644
--- a/modules/access/dshow/filter.cpp
+++ b/modules/access/dshow/filter.cpp
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/dsm/access.c b/modules/access/dsm/access.c
index d5ed9c8937..eb54efed82 100644
--- a/modules/access/dsm/access.c
+++ b/modules/access/dsm/access.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/dsm/sd.c b/modules/access/dsm/sd.c
index 2c006b8fda..9c2c3b26b8 100644
--- a/modules/access/dsm/sd.c
+++ b/modules/access/dsm/sd.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/access/dtv/en50221.c b/modules/access/dtv/en50221.c
index 97512d3f38..0559f56ec1 100644
--- a/modules/access/dtv/en50221.c
+++ b/modules/access/dtv/en50221.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/dv.c b/modules/access/dv.c
index 8a8baa104d..5a95daa65b 100644
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index d017686fb8..b91fc770a3 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -29,7 +29,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/dvb/linux_dvb.c b/modules/access/dvb/linux_dvb.c
index bd39374efa..a28d22e2d7 100644
--- a/modules/access/dvb/linux_dvb.c
+++ b/modules/access/dvb/linux_dvb.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/dvb/scan.c b/modules/access/dvb/scan.c
index aa4eea573e..dde00d4367 100644
--- a/modules/access/dvb/scan.c
+++ b/modules/access/dvb/scan.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/dvb/scan_list.c b/modules/access/dvb/scan_list.c
index e09ebb501c..d71cbf8978 100644
--- a/modules/access/dvb/scan_list.c
+++ b/modules/access/dvb/scan_list.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA    02111, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 29170ae832..4fbaf4ea7b 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -33,7 +33,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index bd5cb84b3a..e26df76fb0 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -34,7 +34,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/file.c b/modules/access/file.c
index d37ac28446..992db567f8 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/fs.c b/modules/access/fs.c
index dae8c87164..b983d47b7f 100644
--- a/modules/access/fs.c
+++ b/modules/access/fs.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 553e5b5ddb..b8b96d3e12 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/gopher.c b/modules/access/gopher.c
index c8ed71369c..674967a039 100644
--- a/modules/access/gopher.c
+++ b/modules/access/gopher.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/http.c b/modules/access/http.c
index 4384e2b0a3..929fdd72c8 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef MODULE_STRING
diff --git a/modules/access/http/access.c b/modules/access/http/access.c
index a3805d0d42..491060bfd0 100644
--- a/modules/access/http/access.c
+++ b/modules/access/http/access.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef MODULE_STRING
diff --git a/modules/access/http/connmgr.c b/modules/access/http/connmgr.c
index f0f7616e40..c28d45ed60 100644
--- a/modules/access/http/connmgr.c
+++ b/modules/access/http/connmgr.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/idummy.c b/modules/access/idummy.c
index a66c684d57..d751ee8b3c 100644
--- a/modules/access/idummy.c
+++ b/modules/access/idummy.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/imem-access.c b/modules/access/imem-access.c
index 3e902822ac..9905a8e2e4 100644
--- a/modules/access/imem-access.c
+++ b/modules/access/imem-access.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <stdint.h>
diff --git a/modules/access/imem.c b/modules/access/imem.c
index 7710d91125..30aa7dd2d2 100644
--- a/modules/access/imem.c
+++ b/modules/access/imem.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <limits.h>
 #include <math.h>
diff --git a/modules/access/jack.c b/modules/access/jack.c
index b01c44d2d8..ce9ae4b667 100644
--- a/modules/access/jack.c
+++ b/modules/access/jack.c
@@ -34,7 +34,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/linsys/linsys_hdsdi.c b/modules/access/linsys/linsys_hdsdi.c
index 4952427ade..f83ed13714 100644
--- a/modules/access/linsys/linsys_hdsdi.c
+++ b/modules/access/linsys/linsys_hdsdi.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /*****************************************************************************
diff --git a/modules/access/linsys/linsys_sdi.c b/modules/access/linsys/linsys_sdi.c
index 8ce44d46d0..75eec91e70 100644
--- a/modules/access/linsys/linsys_sdi.c
+++ b/modules/access/linsys/linsys_sdi.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /*****************************************************************************
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 9d6e01ae32..2e6d82afa7 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <inttypes.h>
diff --git a/modules/access/mms/asf.c b/modules/access/mms/asf.c
index 694a16c5c8..9b43ea97ff 100644
--- a/modules/access/mms/asf.c
+++ b/modules/access/mms/asf.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/mms/buffer.c b/modules/access/mms/buffer.c
index e5d3c4843b..1c6ad93062 100644
--- a/modules/access/mms/buffer.c
+++ b/modules/access/mms/buffer.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/mms/mms.c b/modules/access/mms/mms.c
index 8aea7d4cf3..5ec5142b64 100644
--- a/modules/access/mms/mms.c
+++ b/modules/access/mms/mms.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 1e458d6412..0339bee5c8 100644
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index c524b22816..39794e72ca 100644
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/mtp.c b/modules/access/mtp.c
index d77b54d731..838c1e2cf9 100644
--- a/modules/access/mtp.c
+++ b/modules/access/mtp.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/nfs.c b/modules/access/nfs.c
index e892219991..dbf21530c3 100644
--- a/modules/access/nfs.c
+++ b/modules/access/nfs.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/oss.c b/modules/access/oss.c
index 40327232e2..0c392c91ed 100644
--- a/modules/access/oss.c
+++ b/modules/access/oss.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/pulse.c b/modules/access/pulse.c
index bcf3ae6b48..8499a16634 100644
--- a/modules/access/pulse.c
+++ b/modules/access/pulse.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/rdp.c b/modules/access/rdp.c
index b1a0fe0bdf..bb40900d4e 100644
--- a/modules/access/rdp.c
+++ b/modules/access/rdp.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/rist.c b/modules/access/rist.c
index 009c17790d..88653087fd 100644
--- a/modules/access/rist.c
+++ b/modules/access/rist.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/rtp/datagram.c b/modules/access/rtp/datagram.c
index 0ea99e4b3e..9d7503749b 100644
--- a/modules/access/rtp/datagram.c
+++ b/modules/access/rtp/datagram.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/modules/access/rtp/sdp.c b/modules/access/rtp/sdp.c
index 3e311531c1..2f465b422f 100644
--- a/modules/access/rtp/sdp.c
+++ b/modules/access/rtp/sdp.c
@@ -21,7 +21,7 @@
  ****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/rtp/sdp_test.c b/modules/access/rtp/sdp_test.c
index 7852a1b5ed..51d03ebbe0 100644
--- a/modules/access/rtp/sdp_test.c
+++ b/modules/access/rtp/sdp_test.c
@@ -20,7 +20,7 @@
  ****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/modules/access/samba.c b/modules/access/samba.c
index 9f397c44b7..d3c5dbbaef 100644
--- a/modules/access/samba.c
+++ b/modules/access/samba.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/satip.c b/modules/access/satip.c
index 4bb4a563aa..b262c05407 100644
--- a/modules/access/satip.c
+++ b/modules/access/satip.c
@@ -23,7 +23,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "config.h"
+#include <config.h>
 
 #include <unistd.h>
 #include <ctype.h>
diff --git a/modules/access/screen/mac.c b/modules/access/screen/mac.c
index 7375f6306e..d594e15bfc 100644
--- a/modules/access/screen/mac.c
+++ b/modules/access/screen/mac.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #import <vlc_common.h>
diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index 0c472deaa8..f3af2e6d9b 100644
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/screen/win32.c b/modules/access/screen/win32.c
index f506e75c9b..0531e8b3a0 100644
--- a/modules/access/screen/win32.c
+++ b/modules/access/screen/win32.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/sdp.c b/modules/access/sdp.c
index 556c4fcb0f..42a0ee874b 100644
--- a/modules/access/sdp.c
+++ b/modules/access/sdp.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/access/sftp.c b/modules/access/sftp.c
index dc7f6cc27f..1f956ac0bb 100644
--- a/modules/access/sftp.c
+++ b/modules/access/sftp.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/smb2.c b/modules/access/smb2.c
index 531e93206d..02a340fcae 100644
--- a/modules/access/smb2.c
+++ b/modules/access/smb2.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/srt_common.h b/modules/access/srt_common.h
index c2322d5755..36eeb39c5b 100644
--- a/modules/access/srt_common.h
+++ b/modules/access/srt_common.h
@@ -24,7 +24,7 @@
 #define SRT_COMMON_H 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index 214a5853be..bb939790c0 100644
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/modules/access/udp.c b/modules/access/udp.c
index 66f33b696d..c76ed5c36d 100644
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -32,7 +32,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/unc.c b/modules/access/unc.c
index 92a390535e..53ffcd1d84 100644
--- a/modules/access/unc.c
+++ b/modules/access/unc.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/v4l2/access.c b/modules/access/v4l2/access.c
index d3c31385f0..296dbdf2d5 100644
--- a/modules/access/v4l2/access.c
+++ b/modules/access/v4l2/access.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/v4l2/controls.c b/modules/access/v4l2/controls.c
index 9f3c3e1467..aff5fa2081 100644
--- a/modules/access/v4l2/controls.c
+++ b/modules/access/v4l2/controls.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/modules/access/v4l2/demux.c b/modules/access/v4l2/demux.c
index 00f02ee76e..e14cac43ba 100644
--- a/modules/access/v4l2/demux.c
+++ b/modules/access/v4l2/demux.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/access/v4l2/lib.c b/modules/access/v4l2/lib.c
index dc46b1acfe..950b913547 100644
--- a/modules/access/v4l2/lib.c
+++ b/modules/access/v4l2/lib.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <dlfcn.h>
diff --git a/modules/access/v4l2/radio.c b/modules/access/v4l2/radio.c
index 59204aad82..d906ad31b6 100644
--- a/modules/access/v4l2/radio.c
+++ b/modules/access/v4l2/radio.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <fcntl.h>
diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
index f0b753b5df..c0a4d5e152 100644
--- a/modules/access/v4l2/v4l2.c
+++ b/modules/access/v4l2/v4l2.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/access/v4l2/vbi.c b/modules/access/v4l2/vbi.c
index d645cdfcbf..3b1704b7a0 100644
--- a/modules/access/v4l2/vbi.c
+++ b/modules/access/v4l2/vbi.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c
index 4a4802368b..8ac7e4b6db 100644
--- a/modules/access/v4l2/video.c
+++ b/modules/access/v4l2/video.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access/vcd/cdrom.c b/modules/access/vcd/cdrom.c
index 5bda0d17a1..59b18e6abf 100644
--- a/modules/access/vcd/cdrom.c
+++ b/modules/access/vcd/cdrom.c
@@ -34,7 +34,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef __OS2__
diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 40c2000448..51edb506e2 100644
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/vdr.c b/modules/access/vdr.c
index b86337e762..190a6e71b0 100644
--- a/modules/access/vdr.c
+++ b/modules/access/vdr.c
@@ -42,7 +42,7 @@ See http://www.vdr-wiki.de/ and http://www.tvdr.de/ for more information.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/modules/access/vnc.c b/modules/access/vnc.c
index cd003eb575..1a7e9754e6 100644
--- a/modules/access/vnc.c
+++ b/modules/access/vnc.c
@@ -31,7 +31,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access/wasapi.c b/modules/access/wasapi.c
index 6377a3c7ff..d721308575 100644
--- a/modules/access/wasapi.c
+++ b/modules/access/wasapi.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define INITGUID
diff --git a/modules/access_output/dummy.c b/modules/access_output/dummy.c
index e81126eb4d..c4e2c688cb 100644
--- a/modules/access_output/dummy.c
+++ b/modules/access_output/dummy.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access_output/file.c b/modules/access_output/file.c
index 9e7e5c2f6b..4169397ccf 100644
--- a/modules/access_output/file.c
+++ b/modules/access_output/file.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/access_output/http.c b/modules/access_output/http.c
index 3cc24f4cd9..d50f530c60 100644
--- a/modules/access_output/http.c
+++ b/modules/access_output/http.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdint.h>
diff --git a/modules/access_output/livehttp.c b/modules/access_output/livehttp.c
index bbb2c5fc45..6d62e499bd 100644
--- a/modules/access_output/livehttp.c
+++ b/modules/access_output/livehttp.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/modules/access_output/rist.c b/modules/access_output/rist.c
index 61066bdc2b..e3bcbd26f8 100644
--- a/modules/access_output/rist.c
+++ b/modules/access_output/rist.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c
index 4f55b8e9c2..71628b2a6e 100644
--- a/modules/access_output/shout.c
+++ b/modules/access_output/shout.c
@@ -41,7 +41,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index e4ffa20f77..de4e10e8bc 100644
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/arm_neon/chroma_yuv.c b/modules/arm_neon/chroma_yuv.c
index 53fe0f86f5..88c7feac08 100644
--- a/modules/arm_neon/chroma_yuv.c
+++ b/modules/arm_neon/chroma_yuv.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/arm_neon/volume.c b/modules/arm_neon/volume.c
index 0ed1d2ed23..fe68e07497 100644
--- a/modules/arm_neon/volume.c
+++ b/modules/arm_neon/volume.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/arm_neon/yuv_rgb.c b/modules/arm_neon/yuv_rgb.c
index 84b5328d76..833005f48a 100644
--- a/modules/arm_neon/yuv_rgb.c
+++ b/modules/arm_neon/yuv_rgb.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/audiobargraph_a.c b/modules/audio_filter/audiobargraph_a.c
index e744b52f24..10b9cfea6e 100644
--- a/modules/audio_filter/audiobargraph_a.c
+++ b/modules/audio_filter/audiobargraph_a.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/center.c b/modules/audio_filter/center.c
index fe9301cfdb..b0ed35eb34 100644
--- a/modules/audio_filter/center.c
+++ b/modules/audio_filter/center.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/channel_mixer/dolby.c b/modules/audio_filter/channel_mixer/dolby.c
index 8d5c63c256..193feca932 100644
--- a/modules/audio_filter/channel_mixer/dolby.c
+++ b/modules/audio_filter/channel_mixer/dolby.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/channel_mixer/headphone.c b/modules/audio_filter/channel_mixer/headphone.c
index 0c91a15892..cd6a3933c7 100644
--- a/modules/audio_filter/channel_mixer/headphone.c
+++ b/modules/audio_filter/channel_mixer/headphone.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>                                        /* sqrt */
diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index 0c383e761e..1bf85616f7 100644
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>                                        /* sqrt */
diff --git a/modules/audio_filter/channel_mixer/remap.c b/modules/audio_filter/channel_mixer/remap.c
index 8c49a5f1ae..64bdc2373c 100644
--- a/modules/audio_filter/channel_mixer/remap.c
+++ b/modules/audio_filter/channel_mixer/remap.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index 567269a6bf..7797d59538 100644
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/channel_mixer/simple_neon.h b/modules/audio_filter/channel_mixer/simple_neon.h
index 4a2fcd0ff7..b34b2c974c 100644
--- a/modules/audio_filter/channel_mixer/simple_neon.h
+++ b/modules/audio_filter/channel_mixer/simple_neon.h
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <vlc_cpu.h>
 
diff --git a/modules/audio_filter/channel_mixer/spatialaudio.cpp b/modules/audio_filter/channel_mixer/spatialaudio.cpp
index acb9ed0b75..0e4f593532 100644
--- a/modules/audio_filter/channel_mixer/spatialaudio.cpp
+++ b/modules/audio_filter/channel_mixer/spatialaudio.cpp
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/audio_filter/channel_mixer/trivial.c b/modules/audio_filter/channel_mixer/trivial.c
index 6bb58e34da..b6247ac88e 100644
--- a/modules/audio_filter/channel_mixer/trivial.c
+++ b/modules/audio_filter/channel_mixer/trivial.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/audio_filter/chorus_flanger.c b/modules/audio_filter/chorus_flanger.c
index 8643c502f8..db57e2e476 100644
--- a/modules/audio_filter/chorus_flanger.c
+++ b/modules/audio_filter/chorus_flanger.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/audio_filter/compressor.c b/modules/audio_filter/compressor.c
index 5aab1ceaac..bb8c2ba4ea 100644
--- a/modules/audio_filter/compressor.c
+++ b/modules/audio_filter/compressor.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/audio_filter/converter/format.c b/modules/audio_filter/converter/format.c
index b7801998d9..7be4deba54 100644
--- a/modules/audio_filter/converter/format.c
+++ b/modules/audio_filter/converter/format.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 #include <assert.h>
diff --git a/modules/audio_filter/converter/tospdif.c b/modules/audio_filter/converter/tospdif.c
index c9d7e08adc..236cd545b4 100644
--- a/modules/audio_filter/converter/tospdif.c
+++ b/modules/audio_filter/converter/tospdif.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c
index 92ccaf85b2..606071af0c 100644
--- a/modules/audio_filter/equalizer.c
+++ b/modules/audio_filter/equalizer.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/audio_filter/gain.c b/modules/audio_filter/gain.c
index 655d944304..fdcc626c75 100644
--- a/modules/audio_filter/gain.c
+++ b/modules/audio_filter/gain.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/karaoke.c b/modules/audio_filter/karaoke.c
index 62967e5cec..c6aaa7836e 100644
--- a/modules/audio_filter/karaoke.c
+++ b/modules/audio_filter/karaoke.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/libebur128.c b/modules/audio_filter/libebur128.c
index 2a1623741f..8673821cfb 100644
--- a/modules/audio_filter/libebur128.c
+++ b/modules/audio_filter/libebur128.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c
index a9aa2b9cfb..e8710f96b8 100644
--- a/modules/audio_filter/normvol.c
+++ b/modules/audio_filter/normvol.c
@@ -32,7 +32,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c
index f498ffe08f..9ec38c646c 100644
--- a/modules/audio_filter/param_eq.c
+++ b/modules/audio_filter/param_eq.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c
index 2d544315af..57b4100209 100644
--- a/modules/audio_filter/resampler/bandlimited.c
+++ b/modules/audio_filter/resampler/bandlimited.c
@@ -33,7 +33,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/resampler/soxr.c b/modules/audio_filter/resampler/soxr.c
index 1490d30c63..fa2df0815f 100644
--- a/modules/audio_filter/resampler/soxr.c
+++ b/modules/audio_filter/resampler/soxr.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/resampler/src.c b/modules/audio_filter/resampler/src.c
index 1254314b13..ad6b18b92d 100644
--- a/modules/audio_filter/resampler/src.c
+++ b/modules/audio_filter/resampler/src.c
@@ -27,7 +27,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c
index 63bba803c7..5cce9a340e 100644
--- a/modules/audio_filter/resampler/ugly.c
+++ b/modules/audio_filter/resampler/ugly.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/scaletempo.c b/modules/audio_filter/scaletempo.c
index c67e01a50f..3ff16f3360 100644
--- a/modules/audio_filter/scaletempo.c
+++ b/modules/audio_filter/scaletempo.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_filter/spatializer/spatializer.cpp b/modules/audio_filter/spatializer/spatializer.cpp
index 4f9c19b133..9707235f7e 100644
--- a/modules/audio_filter/spatializer/spatializer.cpp
+++ b/modules/audio_filter/spatializer/spatializer.cpp
@@ -28,7 +28,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>                                      /* malloc(), free() */
diff --git a/modules/audio_filter/stereo_widen.c b/modules/audio_filter/stereo_widen.c
index 1ec29bfffd..aa87bbe2d5 100644
--- a/modules/audio_filter/stereo_widen.c
+++ b/modules/audio_filter/stereo_widen.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_mixer/float.c b/modules/audio_mixer/float.c
index d0d3b70008..936bddc802 100644
--- a/modules/audio_mixer/float.c
+++ b/modules/audio_mixer/float.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stddef.h>
diff --git a/modules/audio_mixer/integer.c b/modules/audio_mixer/integer.c
index aec6deb026..8ebf6b9f1e 100644
--- a/modules/audio_mixer/integer.c
+++ b/modules/audio_mixer/integer.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/audio_output/adummy.c b/modules/audio_output/adummy.c
index 4a3fe6ca0d..e9797477be 100644
--- a/modules/audio_output/adummy.c
+++ b/modules/audio_output/adummy.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 63056de522..45df455af1 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/audio_output/amem.c b/modules/audio_output/amem.c
index 176d2237c6..1bf39f16da 100644
--- a/modules/audio_output/amem.c
+++ b/modules/audio_output/amem.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_output/audiotrack.c b/modules/audio_output/audiotrack.c
index 7e49388e35..d7754f4184 100644
--- a/modules/audio_output/audiotrack.c
+++ b/modules/audio_output/audiotrack.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/audio_output/coreaudio_common.h b/modules/audio_output/coreaudio_common.h
index 4bd6139493..bfc044b398 100644
--- a/modules/audio_output/coreaudio_common.h
+++ b/modules/audio_output/coreaudio_common.h
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# import "config.h"
+# import <config.h>
 #endif
 
 #import <vlc_common.h>
diff --git a/modules/audio_output/directsound.c b/modules/audio_output/directsound.c
index 582771d178..1794a6ba38 100644
--- a/modules/audio_output/directsound.c
+++ b/modules/audio_output/directsound.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/audio_output/file.c b/modules/audio_output/file.c
index f08c0f0e24..ff7c7dd738 100644
--- a/modules/audio_output/file.c
+++ b/modules/audio_output/file.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/modules/audio_output/jack.c b/modules/audio_output/jack.c
index d21150f2a4..39471af7b8 100644
--- a/modules/audio_output/jack.c
+++ b/modules/audio_output/jack.c
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_output/kai.c b/modules/audio_output/kai.c
index 9680293c63..d4f86af5f7 100644
--- a/modules/audio_output/kai.c
+++ b/modules/audio_output/kai.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_output/opensles_android.c b/modules/audio_output/opensles_android.c
index 9e90b393d5..6e0e972d5d 100644
--- a/modules/audio_output/opensles_android.c
+++ b/modules/audio_output/opensles_android.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 5bada6857d..d2837cd2fc 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index fba8fd6840..28ae11dfe5 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/audio_output/sndio.c b/modules/audio_output/sndio.c
index 642113a487..1a24e8ad2c 100644
--- a/modules/audio_output/sndio.c
+++ b/modules/audio_output/sndio.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/audio_output/vlcpulse.c b/modules/audio_output/vlcpulse.c
index 4cdbc2293e..0baa48604c 100644
--- a/modules/audio_output/vlcpulse.c
+++ b/modules/audio_output/vlcpulse.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 936085fa36..5b54b98dce 100644
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index fb6a1ea2a8..9bbc661aa8 100644
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -32,7 +32,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/adpcm.c b/modules/codec/adpcm.c
index ead71abcd2..0cc58d5379 100644
--- a/modules/codec/adpcm.c
+++ b/modules/codec/adpcm.c
@@ -27,7 +27,7 @@
  * Documentation: http://www.pcisys.net/~melanson/codecs/adpcm.txt
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/aes3.c b/modules/codec/aes3.c
index cc77214586..284f106be4 100644
--- a/modules/codec/aes3.c
+++ b/modules/codec/aes3.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/aom.c b/modules/codec/aom.c
index 20ec11c75c..7bef1f03a2 100644
--- a/modules/codec/aom.c
+++ b/modules/codec/aom.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/araw.c b/modules/codec/araw.c
index c8c921414e..0a80395745 100644
--- a/modules/codec/araw.c
+++ b/modules/codec/araw.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/codec/arib/aribsub.c b/modules/codec/arib/aribsub.c
index fa44a9ba78..32f7ca121d 100644
--- a/modules/codec/arib/aribsub.c
+++ b/modules/codec/arib/aribsub.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/atsc_a65.c b/modules/codec/atsc_a65.c
index 7fdd2959e6..fa5e7ea09a 100644
--- a/modules/codec/atsc_a65.c
+++ b/modules/codec/atsc_a65.c
@@ -18,7 +18,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/audiotoolbox_midi.c b/modules/codec/audiotoolbox_midi.c
index 774b800873..7b37389248 100644
--- a/modules/codec/audiotoolbox_midi.c
+++ b/modules/codec/audiotoolbox_midi.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 27d4e511f6..07ddbaaa10 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 75bb9337d7..5258286e10 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/avcodec/avcommon.h b/modules/codec/avcodec/avcommon.h
index 6d88f12d72..148fdf0069 100644
--- a/modules/codec/avcodec/avcommon.h
+++ b/modules/codec/avcodec/avcommon.h
@@ -24,7 +24,7 @@
 #define AVCOMMON_H 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_avcodec.h>
diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 61b5aed54b..06817f074c 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -29,7 +29,7 @@
   * See https://msdn.microsoft.com/en-us/library/windows/desktop/hh162912%28v=vs.85%29.aspx
   **/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 # undef WINAPI_FAMILY
diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c
index af7a478e24..a638c1dd5b 100644
--- a/modules/codec/avcodec/directx_va.c
+++ b/modules/codec/avcodec/directx_va.c
@@ -24,7 +24,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 39a67811d8..e799f95644 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/avcodec/dxva_blocklist.c b/modules/codec/avcodec/dxva_blocklist.c
index ef86d1479f..c4806444c4 100644
--- a/modules/codec/avcodec/dxva_blocklist.c
+++ b/modules/codec/avcodec/dxva_blocklist.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 2564e0a518..8ba9bff220 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -28,7 +28,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index a580d9874f..f2a471920c 100644
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/codec/avcodec/va_surface.c b/modules/codec/avcodec/va_surface.c
index bbf3f6b06c..4431bfd795 100644
--- a/modules/codec/avcodec/va_surface.c
+++ b/modules/codec/avcodec/va_surface.c
@@ -24,7 +24,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index 01d2b350f1..a920fb7ae9 100644
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 4c5943d22e..48b49d1723 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/codec/bpg.c b/modules/codec/bpg.c
index 316b397e9e..7074dcfdbf 100644
--- a/modules/codec/bpg.c
+++ b/modules/codec/bpg.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index 9a9269b42c..17fb92ac91 100644
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -29,7 +29,7 @@
  * and rewritten */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c
index 14ece81267..0c8ddd178c 100644
--- a/modules/codec/cdg.c
+++ b/modules/codec/cdg.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/cea708.c b/modules/codec/cea708.c
index 01860e1650..4d35f6a577 100644
--- a/modules/codec/cea708.c
+++ b/modules/codec/cea708.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/cvdsub.c b/modules/codec/cvdsub.c
index c2dbfaeb84..f20e6c9b18 100644
--- a/modules/codec/cvdsub.c
+++ b/modules/codec/cvdsub.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/daala.c b/modules/codec/daala.c
index be3826796e..0593ccfefa 100644
--- a/modules/codec/daala.c
+++ b/modules/codec/daala.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c
index 5d341a367f..bea1ffcfbe 100644
--- a/modules/codec/dav1d.c
+++ b/modules/codec/dav1d.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 
diff --git a/modules/codec/dca.c b/modules/codec/dca.c
index 91d286b0cd..9e20199817 100644
--- a/modules/codec/dca.c
+++ b/modules/codec/dca.c
@@ -31,7 +31,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/ddummy.c b/modules/codec/ddummy.c
index 7df04deb2f..28aebf4929 100644
--- a/modules/codec/ddummy.c
+++ b/modules/codec/ddummy.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/dmo/buffer.c b/modules/codec/dmo/buffer.c
index c64c8b6e3c..409d1b3b14 100644
--- a/modules/codec/dmo/buffer.c
+++ b/modules/codec/dmo/buffer.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c
index 3656b6cf61..1f14f3a11d 100644
--- a/modules/codec/dmo/dmo.c
+++ b/modules/codec/dmo/dmo.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index b464314af3..bafcc68d07 100644
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -67,7 +67,7 @@
  ********************************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/edummy.c b/modules/codec/edummy.c
index d554f441b7..8170ca9924 100644
--- a/modules/codec/edummy.c
+++ b/modules/codec/edummy.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 5df25ea17b..f1359b72f4 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -30,7 +30,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/fdkaac.c b/modules/codec/fdkaac.c
index 3ac7b756a3..850654e8e2 100644
--- a/modules/codec/fdkaac.c
+++ b/modules/codec/fdkaac.c
@@ -50,7 +50,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <fdk-aac/aacenc_lib.h>
diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 850ea002c9..11be6ed492 100644
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -29,7 +29,7 @@
 #define assert(x) do {} while(0)
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 2e704097dd..fee07fd6f1 100644
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/g711.c b/modules/codec/g711.c
index 1e55b1d54a..c41ad1ac87 100644
--- a/modules/codec/g711.c
+++ b/modules/codec/g711.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/gstreamer/gstdecode.c b/modules/codec/gstreamer/gstdecode.c
index 020bc9ded6..903dcf4014 100644
--- a/modules/codec/gstreamer/gstdecode.c
+++ b/modules/codec/gstreamer/gstdecode.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/hxxx_helper.c b/modules/codec/hxxx_helper.c
index 33df5f6bce..81420eee8e 100644
--- a/modules/codec/hxxx_helper.c
+++ b/modules/codec/hxxx_helper.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdint.h>
diff --git a/modules/codec/hxxx_helper.h b/modules/codec/hxxx_helper.h
index 12577e8948..3c30307491 100644
--- a/modules/codec/hxxx_helper.h
+++ b/modules/codec/hxxx_helper.h
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_block.h>
diff --git a/modules/codec/hxxx_helper_testdec.c b/modules/codec/hxxx_helper_testdec.c
index c0dd3119e9..e664473994 100644
--- a/modules/codec/hxxx_helper_testdec.c
+++ b/modules/codec/hxxx_helper_testdec.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/jpeg.c b/modules/codec/jpeg.c
index 486502b211..d0a5903a8a 100644
--- a/modules/codec/jpeg.c
+++ b/modules/codec/jpeg.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 531b812978..d501d01b02 100644
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index dbaa5f5c4c..8a937006ab 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #include <string.h>
diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c
index 9896f40ee6..43967f50fa 100644
--- a/modules/codec/libmpeg2.c
+++ b/modules/codec/libmpeg2.c
@@ -33,7 +33,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c
index f698c5195e..93314e5c87 100644
--- a/modules/codec/lpcm.c
+++ b/modules/codec/lpcm.c
@@ -29,7 +29,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/mad.c b/modules/codec/mad.c
index b8a3ac50a2..6a0933be93 100644
--- a/modules/codec/mad.c
+++ b/modules/codec/mad.c
@@ -37,7 +37,7 @@
 #include <mad.h>
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/codec/mft.c b/modules/codec/mft.c
index 46e03bdcab..eda9515fa2 100644
--- a/modules/codec/mft.c
+++ b/modules/codec/mft.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef WINVER
diff --git a/modules/codec/mpg123.c b/modules/codec/mpg123.c
index 054482832a..059ceb7608 100644
--- a/modules/codec/mpg123.c
+++ b/modules/codec/mpg123.c
@@ -25,7 +25,7 @@
 *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/oggspots.c b/modules/codec/oggspots.c
index 3dc133229d..afe020c325 100644
--- a/modules/codec/oggspots.c
+++ b/modules/codec/oggspots.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index 041faa9a46..9a7ab3299c 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/codec/omxil/mediacodec_jni.c b/modules/codec/omxil/mediacodec_jni.c
index 9a65f8b85f..3413bc9ff4 100644
--- a/modules/codec/omxil/mediacodec_jni.c
+++ b/modules/codec/omxil/mediacodec_jni.c
@@ -22,7 +22,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <jni.h>
diff --git a/modules/codec/omxil/mediacodec_ndk.c b/modules/codec/omxil/mediacodec_ndk.c
index fad9e1689d..ace5978195 100644
--- a/modules/codec/omxil/mediacodec_ndk.c
+++ b/modules/codec/omxil/mediacodec_ndk.c
@@ -22,7 +22,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <jni.h>
diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c
index 5f3a5370b3..4abd3dd32e 100644
--- a/modules/codec/omxil/omxil.c
+++ b/modules/codec/omxil/omxil.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/codec/omxil/omxil_core.c b/modules/codec/omxil/omxil_core.c
index 5fe0f9a9bf..ef2c2daf12 100644
--- a/modules/codec/omxil/omxil_core.c
+++ b/modules/codec/omxil/omxil_core.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <dlfcn.h>
diff --git a/modules/codec/omxil/qcom.c b/modules/codec/omxil/qcom.c
index 301e9150ae..793e7aea00 100644
--- a/modules/codec/omxil/qcom.c
+++ b/modules/codec/omxil/qcom.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_picture.h>
diff --git a/modules/codec/omxil/utils.c b/modules/codec/omxil/utils.c
index c87e10dbad..ce521b1228 100644
--- a/modules/codec/omxil/utils.c
+++ b/modules/codec/omxil/utils.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/opus.c b/modules/codec/opus.c
index c6aaf407cb..6daa28493f 100644
--- a/modules/codec/opus.c
+++ b/modules/codec/opus.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/opus_header.c b/modules/codec/opus_header.c
index a19d9c73f7..ac5581c631 100644
--- a/modules/codec/opus_header.c
+++ b/modules/codec/opus_header.c
@@ -26,7 +26,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "opus_header.h"
diff --git a/modules/codec/png.c b/modules/codec/png.c
index 40f021e425..3dd221e149 100644
--- a/modules/codec/png.c
+++ b/modules/codec/png.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/qsv.c b/modules/codec/qsv.c
index 8f5e2aa003..81bd4bd4fb 100644
--- a/modules/codec/qsv.c
+++ b/modules/codec/qsv.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/rav1e.c b/modules/codec/rav1e.c
index 42c6aecde7..eab9a839d3 100644
--- a/modules/codec/rav1e.c
+++ b/modules/codec/rav1e.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/rawvideo.c b/modules/codec/rawvideo.c
index 43f864ad29..28649c8027 100644
--- a/modules/codec/rawvideo.c
+++ b/modules/codec/rawvideo.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/rtpvideo.c b/modules/codec/rtpvideo.c
index c495f4e114..1fa860cbeb 100644
--- a/modules/codec/rtpvideo.c
+++ b/modules/codec/rtpvideo.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/schroedinger.c b/modules/codec/schroedinger.c
index 20c708948b..56e6043d0e 100644
--- a/modules/codec/schroedinger.c
+++ b/modules/codec/schroedinger.c
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/scte18.c b/modules/codec/scte18.c
index 73ee7cda21..2f3dc5a43c 100644
--- a/modules/codec/scte18.c
+++ b/modules/codec/scte18.c
@@ -18,7 +18,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/scte27.c b/modules/codec/scte27.c
index 372dc01d9e..c957a675f1 100644
--- a/modules/codec/scte27.c
+++ b/modules/codec/scte27.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c
index e58045a9e6..8e3bac23eb 100644
--- a/modules/codec/sdl_image.c
+++ b/modules/codec/sdl_image.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/shine.c b/modules/codec/shine.c
index c07430368a..fe894ecf71 100644
--- a/modules/codec/shine.c
+++ b/modules/codec/shine.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/spdif.c b/modules/codec/spdif.c
index 093d862c7b..1c61344b96 100644
--- a/modules/codec/spdif.c
+++ b/modules/codec/spdif.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/speex.c b/modules/codec/speex.c
index 38eb459dc6..56249db517 100644
--- a/modules/codec/speex.c
+++ b/modules/codec/speex.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/spudec/parse.c b/modules/codec/spudec/parse.c
index 35598d822b..f899b29164 100644
--- a/modules/codec/spudec/parse.c
+++ b/modules/codec/spudec/parse.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/spudec/spudec.c b/modules/codec/spudec/spudec.c
index da728f2094..78ce646713 100644
--- a/modules/codec/spudec/spudec.c
+++ b/modules/codec/spudec/spudec.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/stl.c b/modules/codec/stl.c
index a00e0290a1..6f5484d916 100644
--- a/modules/codec/stl.c
+++ b/modules/codec/stl.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/codec/subsdec.c b/modules/codec/subsdec.c
index 0016332906..1fcb9a8db9 100644
--- a/modules/codec/subsdec.c
+++ b/modules/codec/subsdec.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/codec/substx3g.c b/modules/codec/substx3g.c
index 8315f1e194..a5771cbce2 100644
--- a/modules/codec/substx3g.c
+++ b/modules/codec/substx3g.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/subsusf.c b/modules/codec/subsusf.c
index 44248ff664..f4aeb033ad 100644
--- a/modules/codec/subsusf.c
+++ b/modules/codec/subsusf.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index d742692d64..23eac74dc4 100644
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/svg.c b/modules/codec/svg.c
index a39200bbe6..3c169d93b1 100644
--- a/modules/codec/svg.c
+++ b/modules/codec/svg.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/synchro.c b/modules/codec/synchro.c
index 597b1a6cdb..eee57bca0c 100644
--- a/modules/codec/synchro.c
+++ b/modules/codec/synchro.c
@@ -94,7 +94,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/t140.c b/modules/codec/t140.c
index c6e997ef19..71fd84f2fb 100644
--- a/modules/codec/t140.c
+++ b/modules/codec/t140.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/codec/telx.c b/modules/codec/telx.c
index 8563aab4db..e316f24acb 100644
--- a/modules/codec/telx.c
+++ b/modules/codec/telx.c
@@ -25,7 +25,7 @@
  *
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <stdint.h>
diff --git a/modules/codec/textst.c b/modules/codec/textst.c
index 26852f9248..5dad88ee7a 100644
--- a/modules/codec/textst.c
+++ b/modules/codec/textst.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index b038502fd2..6e6b3b6e33 100644
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/ttml/substtml.c b/modules/codec/ttml/substtml.c
index 0a6b5d5653..1f0e319fab 100644
--- a/modules/codec/ttml/substtml.c
+++ b/modules/codec/ttml/substtml.c
@@ -21,7 +21,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/ttml/ttml.c b/modules/codec/ttml/ttml.c
index 8c776edaf1..be3887c527 100644
--- a/modules/codec/ttml/ttml.c
+++ b/modules/codec/ttml/ttml.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index 4208ab100e..31ae98f899 100644
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/uleaddvaudio.c b/modules/codec/uleaddvaudio.c
index 5b91c2e972..ce9444df5b 100644
--- a/modules/codec/uleaddvaudio.c
+++ b/modules/codec/uleaddvaudio.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/videotoolbox.c b/modules/codec/videotoolbox.c
index aae548504b..acaff24893 100644
--- a/modules/codec/videotoolbox.c
+++ b/modules/codec/videotoolbox.c
@@ -23,7 +23,7 @@
 #pragma mark preamble
 
 #ifdef HAVE_CONFIG_H
-# import "config.h"
+# import <config.h>
 #endif
 
 #import <vlc_common.h>
diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 39133e5ff2..e4287ab4f0 100644
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c
index cb29f4428d..d2ad973a69 100644
--- a/modules/codec/vpx.c
+++ b/modules/codec/vpx.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/vt_utils.c b/modules/codec/vt_utils.c
index 75191117fe..3cb3aaaf04 100644
--- a/modules/codec/vt_utils.c
+++ b/modules/codec/vt_utils.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_atomic.h>
diff --git a/modules/codec/webvtt/CSSGrammar.y b/modules/codec/webvtt/CSSGrammar.y
index e51b132525..80bae2112a 100644
--- a/modules/codec/webvtt/CSSGrammar.y
+++ b/modules/codec/webvtt/CSSGrammar.y
@@ -34,7 +34,7 @@
 
 %{
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <vlc_common.h>
 #include "css_parser.h"
diff --git a/modules/codec/webvtt/CSSLexer.l b/modules/codec/webvtt/CSSLexer.l
index 2ad9193670..b11b72c1b0 100644
--- a/modules/codec/webvtt/CSSLexer.l
+++ b/modules/codec/webvtt/CSSLexer.l
@@ -28,7 +28,7 @@
 
 %{
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <vlc_common.h>
 #include "css_parser.h"
diff --git a/modules/codec/webvtt/css_parser.c b/modules/codec/webvtt/css_parser.c
index 01a948b268..191c589c97 100644
--- a/modules/codec/webvtt/css_parser.c
+++ b/modules/codec/webvtt/css_parser.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/webvtt/css_style.c b/modules/codec/webvtt/css_style.c
index 11cf32917f..b2f93032c5 100644
--- a/modules/codec/webvtt/css_style.c
+++ b/modules/codec/webvtt/css_style.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/webvtt/encvtt.c b/modules/codec/webvtt/encvtt.c
index 056be393a7..1a29c369c8 100644
--- a/modules/codec/webvtt/encvtt.c
+++ b/modules/codec/webvtt/encvtt.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/webvtt/subsvtt.c b/modules/codec/webvtt/subsvtt.c
index f20f734f7b..98648086ae 100644
--- a/modules/codec/webvtt/subsvtt.c
+++ b/modules/codec/webvtt/subsvtt.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/webvtt/webvtt.c b/modules/codec/webvtt/webvtt.c
index 7793d1e61b..45a6032eaa 100644
--- a/modules/codec/webvtt/webvtt.c
+++ b/modules/codec/webvtt/webvtt.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 1e04a9ca01..1507c84ed8 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/codec/x265.c b/modules/codec/x265.c
index 0fb8c0be8b..a63cc068dc 100644
--- a/modules/codec/x265.c
+++ b/modules/codec/x265.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/codec/xwd.c b/modules/codec/xwd.c
index f75c1d513b..00d3a21cd9 100644
--- a/modules/codec/xwd.c
+++ b/modules/codec/xwd.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index fe530551c4..5673b40e33 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -38,7 +38,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <ctype.h>
diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index 0837f64077..c8ad1aa708 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -42,7 +42,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <dbus/dbus.h>
diff --git a/modules/control/dbus/dbus_player.c b/modules/control/dbus/dbus_player.c
index 195d82e717..b2b11f5bd8 100644
--- a/modules/control/dbus/dbus_player.c
+++ b/modules/control/dbus/dbus_player.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/control/dbus/dbus_root.c b/modules/control/dbus/dbus_root.c
index 07ad570dce..7808992f7e 100644
--- a/modules/control/dbus/dbus_root.c
+++ b/modules/control/dbus/dbus_root.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/control/dbus/dbus_tracklist.c b/modules/control/dbus/dbus_tracklist.c
index a2e4119c2b..d895bdf976 100644
--- a/modules/control/dbus/dbus_tracklist.c
+++ b/modules/control/dbus/dbus_tracklist.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/control/dummy.c b/modules/control/dummy.c
index 4e95c49fe0..d200aba7c9 100644
--- a/modules/control/dummy.c
+++ b/modules/control/dummy.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index 4497a44521..b0a6f59c1b 100644
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/control/globalhotkeys/win32.c b/modules/control/globalhotkeys/win32.c
index 18239f5b61..44508d5bc3 100644
--- a/modules/control/globalhotkeys/win32.c
+++ b/modules/control/globalhotkeys/win32.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <ctype.h>
diff --git a/modules/control/globalhotkeys/xcb.c b/modules/control/globalhotkeys/xcb.c
index 32b2d312c6..0aaffc3a93 100644
--- a/modules/control/globalhotkeys/xcb.c
+++ b/modules/control/globalhotkeys/xcb.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
 #include <vlc_common.h>
diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index f03c864e2e..a05e462f05 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/control/lirc.c b/modules/control/lirc.c
index 818c4c9a3f..b9942a9e61 100644
--- a/modules/control/lirc.c
+++ b/modules/control/lirc.c
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/control/motionlib.c b/modules/control/motionlib.c
index 9937cae1a8..b26a0a46a7 100644
--- a/modules/control/motionlib.c
+++ b/modules/control/motionlib.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 4a75bc5bbd..03ca9dd3a1 100644
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/control/ntservice.c b/modules/control/ntservice.c
index 386b853a14..8751684b0e 100644
--- a/modules/control/ntservice.c
+++ b/modules/control/ntservice.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/control/rc.c b/modules/control/rc.c
index a67390e1db..4fa3f4c981 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>                                                 /* ENOMEM */
diff --git a/modules/control/win_msg.c b/modules/control/win_msg.c
index 0e7ae1ba70..c55e0f77ad 100644
--- a/modules/control/win_msg.c
+++ b/modules/control/win_msg.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/demux/adaptive/ID.cpp b/modules/demux/adaptive/ID.cpp
index e7505c1373..728a7a8dce 100644
--- a/modules/demux/adaptive/ID.cpp
+++ b/modules/demux/adaptive/ID.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "ID.hpp"
diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp
index 0e7b62a141..34973ae20c 100644
--- a/modules/demux/adaptive/PlaylistManager.cpp
+++ b/modules/demux/adaptive/PlaylistManager.cpp
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "PlaylistManager.h"
diff --git a/modules/demux/adaptive/SegmentTracker.cpp b/modules/demux/adaptive/SegmentTracker.cpp
index c83a6f1fec..1d51888968 100644
--- a/modules/demux/adaptive/SegmentTracker.cpp
+++ b/modules/demux/adaptive/SegmentTracker.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SegmentTracker.hpp"
diff --git a/modules/demux/adaptive/SharedResources.cpp b/modules/demux/adaptive/SharedResources.cpp
index 05c7a9288f..5f460d408a 100644
--- a/modules/demux/adaptive/SharedResources.cpp
+++ b/modules/demux/adaptive/SharedResources.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SharedResources.hpp"
diff --git a/modules/demux/adaptive/StreamFormat.cpp b/modules/demux/adaptive/StreamFormat.cpp
index 927a8a71a9..15909bfd4f 100644
--- a/modules/demux/adaptive/StreamFormat.cpp
+++ b/modules/demux/adaptive/StreamFormat.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "StreamFormat.hpp"
diff --git a/modules/demux/adaptive/Streams.cpp b/modules/demux/adaptive/Streams.cpp
index d522946899..66d2b1fcc4 100644
--- a/modules/demux/adaptive/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Streams.hpp"
diff --git a/modules/demux/adaptive/adaptive.cpp b/modules/demux/adaptive/adaptive.cpp
index f4aae7dc14..c8ffd340fe 100644
--- a/modules/demux/adaptive/adaptive.cpp
+++ b/modules/demux/adaptive/adaptive.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdint.h>
diff --git a/modules/demux/adaptive/encryption/CommonEncryption.cpp b/modules/demux/adaptive/encryption/CommonEncryption.cpp
index df642df92b..492c81ce63 100644
--- a/modules/demux/adaptive/encryption/CommonEncryption.cpp
+++ b/modules/demux/adaptive/encryption/CommonEncryption.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "CommonEncryption.hpp"
diff --git a/modules/demux/adaptive/encryption/Keyring.cpp b/modules/demux/adaptive/encryption/Keyring.cpp
index 95613b1a12..bb3a052491 100644
--- a/modules/demux/adaptive/encryption/Keyring.cpp
+++ b/modules/demux/adaptive/encryption/Keyring.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Keyring.hpp"
diff --git a/modules/demux/adaptive/http/AuthStorage.cpp b/modules/demux/adaptive/http/AuthStorage.cpp
index 303bcc96b5..ac7f8c035e 100644
--- a/modules/demux/adaptive/http/AuthStorage.cpp
+++ b/modules/demux/adaptive/http/AuthStorage.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "AuthStorage.hpp"
diff --git a/modules/demux/adaptive/http/BytesRange.cpp b/modules/demux/adaptive/http/BytesRange.cpp
index 01281ea145..8396744e18 100644
--- a/modules/demux/adaptive/http/BytesRange.cpp
+++ b/modules/demux/adaptive/http/BytesRange.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "BytesRange.hpp"
diff --git a/modules/demux/adaptive/http/Chunk.cpp b/modules/demux/adaptive/http/Chunk.cpp
index 6839ae3a5c..74850f05e4 100644
--- a/modules/demux/adaptive/http/Chunk.cpp
+++ b/modules/demux/adaptive/http/Chunk.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Chunk.h"
diff --git a/modules/demux/adaptive/http/ConnectionParams.cpp b/modules/demux/adaptive/http/ConnectionParams.cpp
index 6e3f221b66..32fc3a4e8a 100644
--- a/modules/demux/adaptive/http/ConnectionParams.cpp
+++ b/modules/demux/adaptive/http/ConnectionParams.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "ConnectionParams.hpp"
diff --git a/modules/demux/adaptive/http/Downloader.cpp b/modules/demux/adaptive/http/Downloader.cpp
index 666c86abdb..2b78b8d0c2 100644
--- a/modules/demux/adaptive/http/Downloader.cpp
+++ b/modules/demux/adaptive/http/Downloader.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Downloader.hpp"
diff --git a/modules/demux/adaptive/http/HTTPConnection.cpp b/modules/demux/adaptive/http/HTTPConnection.cpp
index 36354c5b90..e7ae0c41f3 100644
--- a/modules/demux/adaptive/http/HTTPConnection.cpp
+++ b/modules/demux/adaptive/http/HTTPConnection.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "HTTPConnection.hpp"
diff --git a/modules/demux/adaptive/http/HTTPConnectionManager.cpp b/modules/demux/adaptive/http/HTTPConnectionManager.cpp
index d1c5e556ec..bb9ba5ec2f 100644
--- a/modules/demux/adaptive/http/HTTPConnectionManager.cpp
+++ b/modules/demux/adaptive/http/HTTPConnectionManager.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "HTTPConnectionManager.h"
diff --git a/modules/demux/adaptive/http/Transport.cpp b/modules/demux/adaptive/http/Transport.cpp
index bcb65a93d9..e7a70fe9c7 100644
--- a/modules/demux/adaptive/http/Transport.cpp
+++ b/modules/demux/adaptive/http/Transport.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Transport.hpp"
diff --git a/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp b/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
index 22efc19db1..1087b20817 100644
--- a/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AbstractAdaptationLogic.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "AbstractAdaptationLogic.h"
diff --git a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
index 938c27c2b8..c83604da5d 100644
--- a/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AlwaysBestAdaptationLogic.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "AlwaysBestAdaptationLogic.h"
diff --git a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
index 5af1532574..615c0b6360 100644
--- a/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/AlwaysLowestAdaptationLogic.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "AlwaysLowestAdaptationLogic.hpp"
diff --git a/modules/demux/adaptive/logic/BufferingLogic.cpp b/modules/demux/adaptive/logic/BufferingLogic.cpp
index 8787ce5122..c3c84a0a53 100644
--- a/modules/demux/adaptive/logic/BufferingLogic.cpp
+++ b/modules/demux/adaptive/logic/BufferingLogic.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "BufferingLogic.hpp"
diff --git a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
index 9afdead977..ab51ac6f9e 100644
--- a/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "NearOptimalAdaptationLogic.hpp"
diff --git a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp
index 81f171f372..e0f8f92bba 100644
--- a/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "PredictiveAdaptationLogic.hpp"
diff --git a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
index 2885110f83..e8f1dde2d9 100644
--- a/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
+++ b/modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "RateBasedAdaptationLogic.h"
diff --git a/modules/demux/adaptive/logic/Representationselectors.cpp b/modules/demux/adaptive/logic/Representationselectors.cpp
index 1d740f660a..b4c072695f 100644
--- a/modules/demux/adaptive/logic/Representationselectors.cpp
+++ b/modules/demux/adaptive/logic/Representationselectors.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Representationselectors.hpp"
diff --git a/modules/demux/adaptive/logic/RoundRobinLogic.cpp b/modules/demux/adaptive/logic/RoundRobinLogic.cpp
index 9b3daf50bb..5436a8314c 100644
--- a/modules/demux/adaptive/logic/RoundRobinLogic.cpp
+++ b/modules/demux/adaptive/logic/RoundRobinLogic.cpp
@@ -1,5 +1,5 @@
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "RoundRobinLogic.hpp"
diff --git a/modules/demux/adaptive/mp4/AtomsReader.cpp b/modules/demux/adaptive/mp4/AtomsReader.cpp
index 117af646cc..7cec8a6d3b 100644
--- a/modules/demux/adaptive/mp4/AtomsReader.cpp
+++ b/modules/demux/adaptive/mp4/AtomsReader.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "AtomsReader.hpp"
diff --git a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
index cf1f930140..9b56856593 100644
--- a/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
+++ b/modules/demux/adaptive/playlist/AbstractPlaylist.cpp
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "AbstractPlaylist.hpp"
diff --git a/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp b/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
index 01fb3c3592..4943aae953 100644
--- a/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
+++ b/modules/demux/adaptive/playlist/BaseAdaptationSet.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "BaseAdaptationSet.h"
diff --git a/modules/demux/adaptive/playlist/BasePeriod.cpp b/modules/demux/adaptive/playlist/BasePeriod.cpp
index 94295ff51d..f90ef80609 100644
--- a/modules/demux/adaptive/playlist/BasePeriod.cpp
+++ b/modules/demux/adaptive/playlist/BasePeriod.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "BasePeriod.h"
diff --git a/modules/demux/adaptive/playlist/BaseRepresentation.cpp b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
index f4bfb4a5bc..fa1a8c5c78 100644
--- a/modules/demux/adaptive/playlist/BaseRepresentation.cpp
+++ b/modules/demux/adaptive/playlist/BaseRepresentation.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <cstdlib>
diff --git a/modules/demux/adaptive/playlist/CommonAttributesElements.cpp b/modules/demux/adaptive/playlist/CommonAttributesElements.cpp
index 1448de8152..caefbabe0d 100644
--- a/modules/demux/adaptive/playlist/CommonAttributesElements.cpp
+++ b/modules/demux/adaptive/playlist/CommonAttributesElements.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "CommonAttributesElements.h"
diff --git a/modules/demux/adaptive/playlist/Inheritables.cpp b/modules/demux/adaptive/playlist/Inheritables.cpp
index 218160e84f..59d14cd243 100644
--- a/modules/demux/adaptive/playlist/Inheritables.cpp
+++ b/modules/demux/adaptive/playlist/Inheritables.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Inheritables.hpp"
diff --git a/modules/demux/adaptive/playlist/Role.cpp b/modules/demux/adaptive/playlist/Role.cpp
index 6e1fd6c556..376f5ed8d1 100644
--- a/modules/demux/adaptive/playlist/Role.cpp
+++ b/modules/demux/adaptive/playlist/Role.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Role.hpp"
diff --git a/modules/demux/adaptive/playlist/Segment.cpp b/modules/demux/adaptive/playlist/Segment.cpp
index fee0ffe4dc..396bd16029 100644
--- a/modules/demux/adaptive/playlist/Segment.cpp
+++ b/modules/demux/adaptive/playlist/Segment.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Segment.h"
diff --git a/modules/demux/adaptive/playlist/SegmentBase.cpp b/modules/demux/adaptive/playlist/SegmentBase.cpp
index 62f224daa4..480cb85aff 100644
--- a/modules/demux/adaptive/playlist/SegmentBase.cpp
+++ b/modules/demux/adaptive/playlist/SegmentBase.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SegmentBase.h"
diff --git a/modules/demux/adaptive/playlist/SegmentChunk.cpp b/modules/demux/adaptive/playlist/SegmentChunk.cpp
index 666a9bef75..8673e67671 100644
--- a/modules/demux/adaptive/playlist/SegmentChunk.cpp
+++ b/modules/demux/adaptive/playlist/SegmentChunk.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SegmentChunk.hpp"
diff --git a/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp b/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
index 5dfb3d6790..eb8aa3bd70 100644
--- a/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInfoCommon.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SegmentInfoCommon.h"
diff --git a/modules/demux/adaptive/playlist/SegmentInformation.cpp b/modules/demux/adaptive/playlist/SegmentInformation.cpp
index 27a433627e..fff027c027 100644
--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SegmentInformation.hpp"
diff --git a/modules/demux/adaptive/playlist/SegmentList.cpp b/modules/demux/adaptive/playlist/SegmentList.cpp
index 7985e3ee85..d0b7fa22bd 100644
--- a/modules/demux/adaptive/playlist/SegmentList.cpp
+++ b/modules/demux/adaptive/playlist/SegmentList.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SegmentList.h"
diff --git a/modules/demux/adaptive/playlist/SegmentTemplate.cpp b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
index 5fdf38cd5e..0340082358 100644
--- a/modules/demux/adaptive/playlist/SegmentTemplate.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTemplate.cpp
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SegmentTemplate.h"
diff --git a/modules/demux/adaptive/playlist/SegmentTimeline.cpp b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
index e1c530a767..7aaa92d973 100644
--- a/modules/demux/adaptive/playlist/SegmentTimeline.cpp
+++ b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SegmentTimeline.h"
diff --git a/modules/demux/adaptive/playlist/Url.cpp b/modules/demux/adaptive/playlist/Url.cpp
index 86385b1afe..935df61b70 100644
--- a/modules/demux/adaptive/playlist/Url.cpp
+++ b/modules/demux/adaptive/playlist/Url.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Url.hpp"
diff --git a/modules/demux/adaptive/plumbing/CommandsQueue.cpp b/modules/demux/adaptive/plumbing/CommandsQueue.cpp
index e0253b11a2..f2bede4e74 100644
--- a/modules/demux/adaptive/plumbing/CommandsQueue.cpp
+++ b/modules/demux/adaptive/plumbing/CommandsQueue.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "CommandsQueue.hpp"
diff --git a/modules/demux/adaptive/plumbing/Demuxer.cpp b/modules/demux/adaptive/plumbing/Demuxer.cpp
index 43d3dafdc0..3629d55e7b 100644
--- a/modules/demux/adaptive/plumbing/Demuxer.cpp
+++ b/modules/demux/adaptive/plumbing/Demuxer.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Demuxer.hpp"
diff --git a/modules/demux/adaptive/plumbing/FakeESOut.cpp b/modules/demux/adaptive/plumbing/FakeESOut.cpp
index 72aabafa4b..e962d97816 100644
--- a/modules/demux/adaptive/plumbing/FakeESOut.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "FakeESOut.hpp"
diff --git a/modules/demux/adaptive/plumbing/FakeESOutID.cpp b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
index 8720e97c90..5c51df39ab 100644
--- a/modules/demux/adaptive/plumbing/FakeESOutID.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOutID.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "FakeESOutID.hpp"
diff --git a/modules/demux/adaptive/plumbing/SourceStream.cpp b/modules/demux/adaptive/plumbing/SourceStream.cpp
index a9fe0de65e..58030c1939 100644
--- a/modules/demux/adaptive/plumbing/SourceStream.cpp
+++ b/modules/demux/adaptive/plumbing/SourceStream.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SourceStream.hpp"
diff --git a/modules/demux/adaptive/tools/Conversions.cpp b/modules/demux/adaptive/tools/Conversions.cpp
index fc7434e335..91c083771f 100644
--- a/modules/demux/adaptive/tools/Conversions.cpp
+++ b/modules/demux/adaptive/tools/Conversions.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Conversions.hpp"
diff --git a/modules/demux/adaptive/tools/FormatNamespace.cpp b/modules/demux/adaptive/tools/FormatNamespace.cpp
index bf1edb7260..f633ef758e 100644
--- a/modules/demux/adaptive/tools/FormatNamespace.cpp
+++ b/modules/demux/adaptive/tools/FormatNamespace.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "FormatNamespace.hpp"
diff --git a/modules/demux/adaptive/tools/Helper.cpp b/modules/demux/adaptive/tools/Helper.cpp
index e0e80dfcaa..c8bf41ccd1 100644
--- a/modules/demux/adaptive/tools/Helper.cpp
+++ b/modules/demux/adaptive/tools/Helper.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Helper.h"
diff --git a/modules/demux/adaptive/tools/Retrieve.cpp b/modules/demux/adaptive/tools/Retrieve.cpp
index ac66411b8c..7827f57a66 100644
--- a/modules/demux/adaptive/tools/Retrieve.cpp
+++ b/modules/demux/adaptive/tools/Retrieve.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Retrieve.hpp"
diff --git a/modules/demux/adaptive/xml/DOMHelper.cpp b/modules/demux/adaptive/xml/DOMHelper.cpp
index 7b92099308..de62f7b436 100644
--- a/modules/demux/adaptive/xml/DOMHelper.cpp
+++ b/modules/demux/adaptive/xml/DOMHelper.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "DOMHelper.h"
diff --git a/modules/demux/adaptive/xml/DOMParser.cpp b/modules/demux/adaptive/xml/DOMParser.cpp
index c093089f22..8b407432b3 100644
--- a/modules/demux/adaptive/xml/DOMParser.cpp
+++ b/modules/demux/adaptive/xml/DOMParser.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "DOMParser.h"
diff --git a/modules/demux/adaptive/xml/Node.cpp b/modules/demux/adaptive/xml/Node.cpp
index 1d9cf0e585..30162516b6 100644
--- a/modules/demux/adaptive/xml/Node.cpp
+++ b/modules/demux/adaptive/xml/Node.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Node.h"
diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c
index 87e9db16b0..c19b918d7d 100644
--- a/modules/demux/aiff.c
+++ b/modules/demux/aiff.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 4828a77804..16d21f3f59 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/asf/asfpacket.c b/modules/demux/asf/asfpacket.c
index 0b447352df..3160e7b8db 100644
--- a/modules/demux/asf/asfpacket.c
+++ b/modules/demux/asf/asfpacket.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "asfpacket.h"
diff --git a/modules/demux/asf/libasf.c b/modules/demux/asf/libasf.c
index d949c4848b..73fac71cbf 100644
--- a/modules/demux/asf/libasf.c
+++ b/modules/demux/asf/libasf.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/demux/au.c b/modules/demux/au.c
index a271dea127..3469999fad 100644
--- a/modules/demux/au.c
+++ b/modules/demux/au.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/demux/avformat/avformat.c b/modules/demux/avformat/avformat.c
index a33ffcfbe2..9fde26bc04 100644
--- a/modules/demux/avformat/avformat.c
+++ b/modules/demux/avformat/avformat.c
@@ -23,7 +23,7 @@
 
 #ifndef MERGE_FFMPEG
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 11c15dad24..dc50034aea 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index 258ad283f8..56141ba08c 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 7bae686ca1..b1257d0ba3 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <ctype.h>
diff --git a/modules/demux/avi/libavi.c b/modules/demux/avi/libavi.c
index e40c266ce0..53a2b33430 100644
--- a/modules/demux/avi/libavi.c
+++ b/modules/demux/avi/libavi.c
@@ -21,7 +21,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/caf.c b/modules/demux/caf.c
index 268c5ae270..202aec25b2 100644
--- a/modules/demux/caf.c
+++ b/modules/demux/caf.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 #include <limits.h>
diff --git a/modules/demux/cdg.c b/modules/demux/cdg.c
index ae5cc1c2a4..f0ee8a918e 100644
--- a/modules/demux/cdg.c
+++ b/modules/demux/cdg.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp
index 5c200f3e49..f6498f0ebd 100644
--- a/modules/demux/dash/DASHManager.cpp
+++ b/modules/demux/dash/DASHManager.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_fixups.h>
diff --git a/modules/demux/dash/DASHStream.cpp b/modules/demux/dash/DASHStream.cpp
index 6d83213c8a..467098529c 100644
--- a/modules/demux/dash/DASHStream.cpp
+++ b/modules/demux/dash/DASHStream.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "DASHStream.hpp"
diff --git a/modules/demux/dash/mp4/IndexReader.cpp b/modules/demux/dash/mp4/IndexReader.cpp
index 83ef5cab66..d4c74a6752 100644
--- a/modules/demux/dash/mp4/IndexReader.cpp
+++ b/modules/demux/dash/mp4/IndexReader.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "IndexReader.hpp"
diff --git a/modules/demux/dash/mpd/AdaptationSet.cpp b/modules/demux/dash/mpd/AdaptationSet.cpp
index ece9592cd8..fb303e7938 100644
--- a/modules/demux/dash/mpd/AdaptationSet.cpp
+++ b/modules/demux/dash/mpd/AdaptationSet.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "AdaptationSet.h"
diff --git a/modules/demux/dash/mpd/ContentDescription.cpp b/modules/demux/dash/mpd/ContentDescription.cpp
index d551658345..166819ef05 100644
--- a/modules/demux/dash/mpd/ContentDescription.cpp
+++ b/modules/demux/dash/mpd/ContentDescription.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "ContentDescription.h"
diff --git a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
index e7bad1e236..c1e317b579 100644
--- a/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
+++ b/modules/demux/dash/mpd/DASHCommonAttributesElements.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "DASHCommonAttributesElements.h"
diff --git a/modules/demux/dash/mpd/DASHSegment.cpp b/modules/demux/dash/mpd/DASHSegment.cpp
index 95a23575c7..fa13c1ca0e 100644
--- a/modules/demux/dash/mpd/DASHSegment.cpp
+++ b/modules/demux/dash/mpd/DASHSegment.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "DASHSegment.h"
diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp
index 3e8eee2049..64871753fb 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "IsoffMainParser.h"
diff --git a/modules/demux/dash/mpd/IsoffMainParser.h b/modules/demux/dash/mpd/IsoffMainParser.h
index 0bd0f59ae5..1f4b6b51e4 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.h
+++ b/modules/demux/dash/mpd/IsoffMainParser.h
@@ -26,7 +26,7 @@
 #define ISOFFMAINPARSER_H_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "../../adaptive/playlist/SegmentInfoCommon.h"
diff --git a/modules/demux/dash/mpd/MPD.cpp b/modules/demux/dash/mpd/MPD.cpp
index adc1147c5a..cd09ee9716 100644
--- a/modules/demux/dash/mpd/MPD.cpp
+++ b/modules/demux/dash/mpd/MPD.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_fixups.h>
diff --git a/modules/demux/dash/mpd/Period.cpp b/modules/demux/dash/mpd/Period.cpp
index 905b9eb6d2..48ae3f211d 100644
--- a/modules/demux/dash/mpd/Period.cpp
+++ b/modules/demux/dash/mpd/Period.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Period.h"
diff --git a/modules/demux/dash/mpd/Profile.cpp b/modules/demux/dash/mpd/Profile.cpp
index a7520c238a..6ec889b4f7 100644
--- a/modules/demux/dash/mpd/Profile.cpp
+++ b/modules/demux/dash/mpd/Profile.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Profile.hpp"
diff --git a/modules/demux/dash/mpd/ProgramInformation.cpp b/modules/demux/dash/mpd/ProgramInformation.cpp
index 5731bd9f45..ecba20c83f 100644
--- a/modules/demux/dash/mpd/ProgramInformation.cpp
+++ b/modules/demux/dash/mpd/ProgramInformation.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "ProgramInformation.h"
diff --git a/modules/demux/dash/mpd/Representation.cpp b/modules/demux/dash/mpd/Representation.cpp
index a1acf7986c..dd5a5156b9 100644
--- a/modules/demux/dash/mpd/Representation.cpp
+++ b/modules/demux/dash/mpd/Representation.cpp
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <cstdlib>
diff --git a/modules/demux/dash/mpd/TemplatedUri.cpp b/modules/demux/dash/mpd/TemplatedUri.cpp
index 8cdd525d5b..4192ab15b6 100644
--- a/modules/demux/dash/mpd/TemplatedUri.cpp
+++ b/modules/demux/dash/mpd/TemplatedUri.cpp
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "TemplatedUri.hpp"
diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index ab47bc69b5..b33dce3a08 100644
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/directory.c b/modules/demux/directory.c
index cc9ac61d46..bc4146adad 100644
--- a/modules/demux/directory.c
+++ b/modules/demux/directory.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/dmxmus.c b/modules/demux/dmxmus.c
index 84110bdf1c..60e1bcf137 100644
--- a/modules/demux/dmxmus.c
+++ b/modules/demux/dmxmus.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/demux/filter/noseek.c b/modules/demux/filter/noseek.c
index 906da61f78..430d8c5bc3 100644
--- a/modules/demux/filter/noseek.c
+++ b/modules/demux/filter/noseek.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index defb7d39bc..9ae81911ad 100644
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/hls/HLSManager.cpp b/modules/demux/hls/HLSManager.cpp
index b6be5ca059..d1e518354c 100644
--- a/modules/demux/hls/HLSManager.cpp
+++ b/modules/demux/hls/HLSManager.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "HLSManager.hpp"
diff --git a/modules/demux/hls/HLSStreams.cpp b/modules/demux/hls/HLSStreams.cpp
index 93102a340e..495a053831 100644
--- a/modules/demux/hls/HLSStreams.cpp
+++ b/modules/demux/hls/HLSStreams.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "HLSStreams.hpp"
diff --git a/modules/demux/hls/playlist/HLSSegment.cpp b/modules/demux/hls/playlist/HLSSegment.cpp
index 83092d2cdb..9b9647d6ed 100644
--- a/modules/demux/hls/playlist/HLSSegment.cpp
+++ b/modules/demux/hls/playlist/HLSSegment.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "HLSSegment.hpp"
diff --git a/modules/demux/hls/playlist/M3U8.cpp b/modules/demux/hls/playlist/M3U8.cpp
index 84d122b8de..5b977e7b3e 100644
--- a/modules/demux/hls/playlist/M3U8.cpp
+++ b/modules/demux/hls/playlist/M3U8.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "M3U8.hpp"
diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp
index 5a6de6049d..14304bc514 100644
--- a/modules/demux/hls/playlist/Parser.cpp
+++ b/modules/demux/hls/playlist/Parser.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Parser.hpp"
diff --git a/modules/demux/hls/playlist/Representation.cpp b/modules/demux/hls/playlist/Representation.cpp
index 8f6e7e9fa2..e8fa53b3fe 100644
--- a/modules/demux/hls/playlist/Representation.cpp
+++ b/modules/demux/hls/playlist/Representation.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_fixups.h>
diff --git a/modules/demux/hls/playlist/Tags.cpp b/modules/demux/hls/playlist/Tags.cpp
index 6dbf169ef2..34b9f2e141 100644
--- a/modules/demux/hls/playlist/Tags.cpp
+++ b/modules/demux/hls/playlist/Tags.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Tags.hpp"
diff --git a/modules/demux/image.c b/modules/demux/image.c
index 59b8807ede..dafb477821 100644
--- a/modules/demux/image.c
+++ b/modules/demux/image.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index 82ae175725..6ae4b41794 100644
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index 924d460b23..14816b51ac 100644
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <inttypes.h>
diff --git a/modules/demux/mkv/stream_io_callback.hpp b/modules/demux/mkv/stream_io_callback.hpp
index bc52223ccf..3342f1ca67 100644
--- a/modules/demux/mkv/stream_io_callback.hpp
+++ b/modules/demux/mkv/stream_io_callback.hpp
@@ -25,7 +25,7 @@
 #define VLC_MKV_STREAM_IO_CALLBACK_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_demux.h>
diff --git a/modules/demux/mock.c b/modules/demux/mock.c
index aeb46f0d90..4a6892d7a6 100644
--- a/modules/demux/mock.c
+++ b/modules/demux/mock.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <ctype.h>
diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index 589b2822f3..3af4447011 100644
--- a/modules/demux/mod.c
+++ b/modules/demux/mod.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mp4/attachments.c b/modules/demux/mp4/attachments.c
index 20fa4ea512..4c6dfd6f26 100644
--- a/modules/demux/mp4/attachments.c
+++ b/modules/demux/mp4/attachments.c
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index d89489ae06..c693507e6f 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "mp4.h"
diff --git a/modules/demux/mp4/fragments.c b/modules/demux/mp4/fragments.c
index 7331965b40..8334671a89 100644
--- a/modules/demux/mp4/fragments.c
+++ b/modules/demux/mp4/fragments.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "fragments.h"
diff --git a/modules/demux/mp4/heif.c b/modules/demux/mp4/heif.c
index bcd7aec6bd..66d9cbb474 100644
--- a/modules/demux/mp4/heif.c
+++ b/modules/demux/mp4/heif.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /*****************************************************************************
diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 7e2971d9fb..b1a7a4e65a 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mp4/meta.c b/modules/demux/mp4/meta.c
index 97799196f5..a630e0fb6b 100644
--- a/modules/demux/mp4/meta.c
+++ b/modules/demux/mp4/meta.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "mp4.h"
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 875d8c4d38..84c967d1a8 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /*****************************************************************************
diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
index bd8891d2fc..53a4f1887d 100644
--- a/modules/demux/mpc.c
+++ b/modules/demux/mpc.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c
index 73449bf2a2..d23aee1cb7 100644
--- a/modules/demux/mpeg/es.c
+++ b/modules/demux/mpeg/es.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/h26x.c b/modules/demux/mpeg/h26x.c
index a4ba6fecad..3080ba54ce 100644
--- a/modules/demux/mpeg/h26x.c
+++ b/modules/demux/mpeg/h26x.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/mpeg4_iod.c b/modules/demux/mpeg/mpeg4_iod.c
index adb8b0697b..2ccfa7e31c 100644
--- a/modules/demux/mpeg/mpeg4_iod.c
+++ b/modules/demux/mpeg/mpeg4_iod.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/mpgv.c b/modules/demux/mpeg/mpgv.c
index 48a029c5dc..f16c187fc8 100644
--- a/modules/demux/mpeg/mpgv.c
+++ b/modules/demux/mpeg/mpgv.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index 99aac651ee..666039b57b 100644
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/sections.c b/modules/demux/mpeg/sections.c
index 23602e1438..84403a6ca1 100644
--- a/modules/demux/mpeg/sections.c
+++ b/modules/demux/mpeg/sections.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 8a98e3c6a3..4bba66f5b5 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_arib.c b/modules/demux/mpeg/ts_arib.c
index afd0798f81..787b481a46 100644
--- a/modules/demux/mpeg/ts_arib.c
+++ b/modules/demux/mpeg/ts_arib.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_decoders.c b/modules/demux/mpeg/ts_decoders.c
index fec5509017..7a05d82166 100644
--- a/modules/demux/mpeg/ts_decoders.c
+++ b/modules/demux/mpeg/ts_decoders.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_hotfixes.c b/modules/demux/mpeg/ts_hotfixes.c
index 4a79b40d75..23adad636c 100644
--- a/modules/demux/mpeg/ts_hotfixes.c
+++ b/modules/demux/mpeg/ts_hotfixes.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_metadata.c b/modules/demux/mpeg/ts_metadata.c
index bcf398485c..fe8e6503c8 100644
--- a/modules/demux/mpeg/ts_metadata.c
+++ b/modules/demux/mpeg/ts_metadata.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_pes.c b/modules/demux/mpeg/ts_pes.c
index 55dbd147ad..12fc4ec9a7 100644
--- a/modules/demux/mpeg/ts_pes.c
+++ b/modules/demux/mpeg/ts_pes.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_pid.c b/modules/demux/mpeg/ts_pid.c
index 80d1a77ce0..7acb59ec83 100644
--- a/modules/demux/mpeg/ts_pid.c
+++ b/modules/demux/mpeg/ts_pid.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index 10cd2eb758..c354710773 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_psip.c b/modules/demux/mpeg/ts_psip.c
index 4cae29eb55..6fd705d8ed 100644
--- a/modules/demux/mpeg/ts_psip.c
+++ b/modules/demux/mpeg/ts_psip.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_psip_dvbpsi_fixes.c b/modules/demux/mpeg/ts_psip_dvbpsi_fixes.c
index bd411863af..f1ba8ff50a 100644
--- a/modules/demux/mpeg/ts_psip_dvbpsi_fixes.c
+++ b/modules/demux/mpeg/ts_psip_dvbpsi_fixes.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_scte.c b/modules/demux/mpeg/ts_scte.c
index 1dc4b71f11..c35dc13b4e 100644
--- a/modules/demux/mpeg/ts_scte.c
+++ b/modules/demux/mpeg/ts_scte.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_si.c b/modules/demux/mpeg/ts_si.c
index 3aef96ce96..04335da21e 100644
--- a/modules/demux/mpeg/ts_si.c
+++ b/modules/demux/mpeg/ts_si.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_sl.c b/modules/demux/mpeg/ts_sl.c
index 76497e43c8..76de076880 100644
--- a/modules/demux/mpeg/ts_sl.c
+++ b/modules/demux/mpeg/ts_sl.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/mpeg/ts_streams.c b/modules/demux/mpeg/ts_streams.c
index 84e2cbeccf..af052a110c 100644
--- a/modules/demux/mpeg/ts_streams.c
+++ b/modules/demux/mpeg/ts_streams.c
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>;.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/nsv.c b/modules/demux/nsv.c
index f540b103b2..014d426241 100644
--- a/modules/demux/nsv.c
+++ b/modules/demux/nsv.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/demux/nuv.c b/modules/demux/nuv.c
index 0b0600d508..10573aab94 100644
--- a/modules/demux/nuv.c
+++ b/modules/demux/nuv.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 90edf1cb7e..71ba83b1b4 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef HAVE_LIBVORBIS
diff --git a/modules/demux/ogg_granule.c b/modules/demux/ogg_granule.c
index 87b05d5f3e..62e93ca6e0 100644
--- a/modules/demux/ogg_granule.c
+++ b/modules/demux/ogg_granule.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef HAVE_LIBVORBIS
diff --git a/modules/demux/oggseek.c b/modules/demux/oggseek.c
index 6defaca231..f973d15f7f 100644
--- a/modules/demux/oggseek.c
+++ b/modules/demux/oggseek.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef HAVE_LIBVORBIS
diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index 1dc691736c..4f2e516915 100644
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -28,7 +28,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index 74f0f88e89..790cea4cb5 100644
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/bdmv.c b/modules/demux/playlist/bdmv.c
index 762ac6cfbc..d37f1b6478 100644
--- a/modules/demux/playlist/bdmv.c
+++ b/modules/demux/playlist/bdmv.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index ebbc46950f..71ab11b30e 100644
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/modules/demux/playlist/ifo.c b/modules/demux/playlist/ifo.c
index 9468e133b4..ec59f9a603 100644
--- a/modules/demux/playlist/ifo.c
+++ b/modules/demux/playlist/ifo.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/itml.c b/modules/demux/playlist/itml.c
index 66a4a2fd4e..0a6f20ec59 100644
--- a/modules/demux/playlist/itml.c
+++ b/modules/demux/playlist/itml.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index f62b134c69..7ef8bc4ae6 100644
--- a/modules/demux/playlist/m3u.c
+++ b/modules/demux/playlist/m3u.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index bcffb03b7a..013a19a39f 100644
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index 5e885f7d75..50fa541921 100644
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index 49a0066c81..da28027510 100644
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c
index e340ba71f1..d73bc9ed3c 100644
--- a/modules/demux/playlist/qtl.c
+++ b/modules/demux/playlist/qtl.c
@@ -48,7 +48,7 @@ volume - 0 (mute) - 100 (max)
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/ram.c b/modules/demux/playlist/ram.c
index 5889110bd3..408e110163 100644
--- a/modules/demux/playlist/ram.c
+++ b/modules/demux/playlist/ram.c
@@ -43,7 +43,7 @@ http://service.real.com/help/library/guides/realone/IntroGuide/HTML/htmfiles/ram
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <ctype.h>
diff --git a/modules/demux/playlist/sgimb.c b/modules/demux/playlist/sgimb.c
index 167cc413bc..e98f762a72 100644
--- a/modules/demux/playlist/sgimb.c
+++ b/modules/demux/playlist/sgimb.c
@@ -98,7 +98,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/wms.c b/modules/demux/playlist/wms.c
index 8a8bdd3be2..557e3a8273 100644
--- a/modules/demux/playlist/wms.c
+++ b/modules/demux/playlist/wms.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/wpl.c b/modules/demux/playlist/wpl.c
index 85b14864be..fca2ab3136 100644
--- a/modules/demux/playlist/wpl.c
+++ b/modules/demux/playlist/wpl.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 85b36c1fe7..deb29ec6a8 100644
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -26,7 +26,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/pva.c b/modules/demux/pva.c
index 252de09298..ab44228242 100644
--- a/modules/demux/pva.c
+++ b/modules/demux/pva.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/rawaud.c b/modules/demux/rawaud.c
index 0e39928f67..eaed20211a 100644
--- a/modules/demux/rawaud.c
+++ b/modules/demux/rawaud.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c
index 4c02cd1a0d..6b9e103b0e 100644
--- a/modules/demux/rawdv.c
+++ b/modules/demux/rawdv.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c
index 94a3b00f6a..c519c5e99d 100644
--- a/modules/demux/rawvid.c
+++ b/modules/demux/rawvid.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/smf.c b/modules/demux/smf.c
index f2dae11439..03705bb989 100644
--- a/modules/demux/smf.c
+++ b/modules/demux/smf.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/smooth/SmoothManager.cpp b/modules/demux/smooth/SmoothManager.cpp
index 5f40ef4e3d..3c8aa671e8 100644
--- a/modules/demux/smooth/SmoothManager.cpp
+++ b/modules/demux/smooth/SmoothManager.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_fixups.h>
diff --git a/modules/demux/smooth/SmoothStream.cpp b/modules/demux/smooth/SmoothStream.cpp
index 8026848403..1ce3f8e0c6 100644
--- a/modules/demux/smooth/SmoothStream.cpp
+++ b/modules/demux/smooth/SmoothStream.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SmoothStream.hpp"
diff --git a/modules/demux/smooth/mp4/IndexReader.cpp b/modules/demux/smooth/mp4/IndexReader.cpp
index 60ac7c0825..e5b3848df4 100644
--- a/modules/demux/smooth/mp4/IndexReader.cpp
+++ b/modules/demux/smooth/mp4/IndexReader.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "IndexReader.hpp"
diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.cpp b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
index c254312b8b..f308d4cf1f 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.cpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "ForgedInitSegment.hpp"
diff --git a/modules/demux/smooth/playlist/Manifest.cpp b/modules/demux/smooth/playlist/Manifest.cpp
index 5538bc644f..007278a195 100644
--- a/modules/demux/smooth/playlist/Manifest.cpp
+++ b/modules/demux/smooth/playlist/Manifest.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Manifest.hpp"
diff --git a/modules/demux/smooth/playlist/MemoryChunk.cpp b/modules/demux/smooth/playlist/MemoryChunk.cpp
index 08890f53e5..8ce88e0590 100644
--- a/modules/demux/smooth/playlist/MemoryChunk.cpp
+++ b/modules/demux/smooth/playlist/MemoryChunk.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "MemoryChunk.hpp"
diff --git a/modules/demux/smooth/playlist/Parser.cpp b/modules/demux/smooth/playlist/Parser.cpp
index 9d2286bcfb..1766652b03 100644
--- a/modules/demux/smooth/playlist/Parser.cpp
+++ b/modules/demux/smooth/playlist/Parser.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Parser.hpp"
diff --git a/modules/demux/smooth/playlist/Representation.cpp b/modules/demux/smooth/playlist/Representation.cpp
index d919ade29e..dbfa0d130a 100644
--- a/modules/demux/smooth/playlist/Representation.cpp
+++ b/modules/demux/smooth/playlist/Representation.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Representation.hpp"
diff --git a/modules/demux/smooth/playlist/SmoothSegment.cpp b/modules/demux/smooth/playlist/SmoothSegment.cpp
index fc4eb7ac56..ab3b4f70a3 100644
--- a/modules/demux/smooth/playlist/SmoothSegment.cpp
+++ b/modules/demux/smooth/playlist/SmoothSegment.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SmoothSegment.hpp"
diff --git a/modules/demux/stl.c b/modules/demux/stl.c
index a635766872..826d08e2c7 100644
--- a/modules/demux/stl.c
+++ b/modules/demux/stl.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 968a356a59..4be787bb55 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index 81c162cd25..758a348ba5 100644
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/ttml.c b/modules/demux/ttml.c
index bc688f8b18..bcddaa6784 100644
--- a/modules/demux/ttml.c
+++ b/modules/demux/ttml.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index 7ea97f6eb2..fb8b55074d 100644
--- a/modules/demux/ty.c
+++ b/modules/demux/ty.c
@@ -35,7 +35,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/demux/vc1.c b/modules/demux/vc1.c
index 6902faf9fb..19cc2e9325 100644
--- a/modules/demux/vc1.c
+++ b/modules/demux/vc1.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index 157264612b..894e5f6d47 100644
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/demux/voc.c b/modules/demux/voc.c
index 106303c3c2..834de75711 100644
--- a/modules/demux/voc.c
+++ b/modules/demux/voc.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 4b0623412f..15bfa1d0ae 100644
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/demux/webvtt.c b/modules/demux/webvtt.c
index dd835e2d12..792e6ed956 100644
--- a/modules/demux/webvtt.c
+++ b/modules/demux/webvtt.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/xa.c b/modules/demux/xa.c
index 21e050b718..167d917d0b 100644
--- a/modules/demux/xa.c
+++ b/modules/demux/xa.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/demux/xiph_metadata.c b/modules/demux/xiph_metadata.c
index 7c32675f2f..a8cb51ce8c 100644
--- a/modules/demux/xiph_metadata.c
+++ b/modules/demux/xiph_metadata.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/demux/xiph_test.c b/modules/demux/xiph_test.c
index 60826dfb35..e69ba6f4e6 100644
--- a/modules/demux/xiph_test.c
+++ b/modules/demux/xiph_test.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/demux/ytdl.c b/modules/demux/ytdl.c
index 54c722a783..75961644e6 100644
--- a/modules/demux/ytdl.c
+++ b/modules/demux/ytdl.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/modules/gui/eject.c b/modules/gui/eject.c
index 1f32cafc06..0df64151be 100644
--- a/modules/gui/eject.c
+++ b/modules/gui/eject.c
@@ -29,7 +29,7 @@
  */
 
 /*#ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif*/
 
 #include <vlc_common.h>
diff --git a/modules/gui/macosx/main/VLCMain.h b/modules/gui/macosx/main/VLCMain.h
index 7ade11f8d3..519ab17949 100644
--- a/modules/gui/macosx/main/VLCMain.h
+++ b/modules/gui/macosx/main/VLCMain.h
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #import <Cocoa/Cocoa.h>
diff --git a/modules/gui/macosx/main/VLCMain.m b/modules/gui/macosx/main/VLCMain.m
index d8141913e8..ec208e7e5f 100644
--- a/modules/gui/macosx/main/VLCMain.m
+++ b/modules/gui/macosx/main/VLCMain.m
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #import "main/VLCMain.h"
diff --git a/modules/gui/macosx/main/macosx.m b/modules/gui/macosx/main/macosx.m
index d14f46155e..1a3ccfb94e 100644
--- a/modules/gui/macosx/main/macosx.m
+++ b/modules/gui/macosx/main/macosx.m
@@ -27,7 +27,7 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/gui/macosx/panels/VLCAudioEffectsWindowController.m b/modules/gui/macosx/panels/VLCAudioEffectsWindowController.m
index 5bf34a814c..0e4b6473ff 100644
--- a/modules/gui/macosx/panels/VLCAudioEffectsWindowController.m
+++ b/modules/gui/macosx/panels/VLCAudioEffectsWindowController.m
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# import "config.h"
+# import <config.h>
 #endif
 
 #import "VLCAudioEffectsWindowController.h"
diff --git a/modules/gui/macosx/preferences/VLCSimplePrefsController.m b/modules/gui/macosx/preferences/VLCSimplePrefsController.m
index f05f749da9..b9bec7f9f1 100644
--- a/modules/gui/macosx/preferences/VLCSimplePrefsController.m
+++ b/modules/gui/macosx/preferences/VLCSimplePrefsController.m
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #import "VLCSimplePrefsController.h"
diff --git a/modules/gui/macosx/preferences/prefs.m b/modules/gui/macosx/preferences/prefs.m
index f74afc9752..8d03846fe5 100644
--- a/modules/gui/macosx/preferences/prefs.m
+++ b/modules/gui/macosx/preferences/prefs.m
@@ -43,7 +43,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# import "config.h"
+# import <config.h>
 #endif
 
 #import <stdlib.h>                                      /* malloc(), free() */
diff --git a/modules/gui/macosx/preferences/prefs_widgets.m b/modules/gui/macosx/preferences/prefs_widgets.m
index d256052579..2503ca227f 100644
--- a/modules/gui/macosx/preferences/prefs_widgets.m
+++ b/modules/gui/macosx/preferences/prefs_widgets.m
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/macosx/windows/extensions/VLCExtensionsManager.h b/modules/gui/macosx/windows/extensions/VLCExtensionsManager.h
index 32d1e9e5d5..cf1d5af3bc 100644
--- a/modules/gui/macosx/windows/extensions/VLCExtensionsManager.h
+++ b/modules/gui/macosx/windows/extensions/VLCExtensionsManager.h
@@ -23,7 +23,7 @@
 #import <Cocoa/Cocoa.h>
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #import "VLCExtensionsDialogProvider.h"
diff --git a/modules/gui/minimal_macosx/intf.h b/modules/gui/minimal_macosx/intf.h
index 2c4649a0e7..da5ef3801d 100644
--- a/modules/gui/minimal_macosx/intf.h
+++ b/modules/gui/minimal_macosx/intf.h
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   import "config.h"
+#   import <config.h>
 #endif
 
 #import <Cocoa/Cocoa.h>
diff --git a/modules/gui/minimal_macosx/intf.m b/modules/gui/minimal_macosx/intf.m
index 8c0ee9bd58..7438218aec 100644
--- a/modules/gui/minimal_macosx/intf.m
+++ b/modules/gui/minimal_macosx/intf.m
@@ -29,7 +29,7 @@
 #import <unistd.h>
 
 #ifdef HAVE_CONFIG_H
-# import "config.h"
+# import <config.h>
 #endif
 
 #import <vlc_common.h>
diff --git a/modules/gui/minimal_macosx/macosx.c b/modules/gui/minimal_macosx/macosx.c
index 0b31f7c66a..4ff038c32a 100644
--- a/modules/gui/minimal_macosx/macosx.c
+++ b/modules/gui/minimal_macosx/macosx.c
@@ -29,7 +29,7 @@
 #include <string.h>
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 83feac5e13..f46ef72d38 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -30,7 +30,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define _XOPEN_SOURCE_EXTENDED 1
diff --git a/modules/gui/qt/dialogs/bookmarks/bookmarks.cpp b/modules/gui/qt/dialogs/bookmarks/bookmarks.cpp
index cf91a00418..64d753d602 100644
--- a/modules/gui/qt/dialogs/bookmarks/bookmarks.cpp
+++ b/modules/gui/qt/dialogs/bookmarks/bookmarks.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "bookmarks.hpp"
diff --git a/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp b/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp
index 40cd932f84..83da9005e7 100644
--- a/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp
+++ b/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp
@@ -19,7 +19,7 @@
 #define DIALOGMODEL_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/dialogs/dialogs_provider.cpp b/modules/gui/qt/dialogs/dialogs_provider.cpp
index 37975707d1..5dd5973055 100644
--- a/modules/gui/qt/dialogs/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs/dialogs_provider.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_intf_strings.h>
diff --git a/modules/gui/qt/dialogs/dialogs_provider.hpp b/modules/gui/qt/dialogs/dialogs_provider.hpp
index a588fd939a..39e9fdf882 100644
--- a/modules/gui/qt/dialogs/dialogs_provider.hpp
+++ b/modules/gui/qt/dialogs/dialogs_provider.hpp
@@ -25,7 +25,7 @@
 #define QVLC_DIALOGS_PROVIDER_H_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/gui/qt/dialogs/epg/epg.cpp b/modules/gui/qt/dialogs/epg/epg.cpp
index a3cffa2f97..c5dc8ce715 100644
--- a/modules/gui/qt/dialogs/epg/epg.cpp
+++ b/modules/gui/qt/dialogs/epg/epg.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "epg.hpp"
diff --git a/modules/gui/qt/dialogs/errors/errors.cpp b/modules/gui/qt/dialogs/errors/errors.cpp
index 77eb07cac9..064ffad1e6 100644
--- a/modules/gui/qt/dialogs/errors/errors.cpp
+++ b/modules/gui/qt/dialogs/errors/errors.cpp
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "errors.hpp"
diff --git a/modules/gui/qt/dialogs/extended/extended.cpp b/modules/gui/qt/dialogs/extended/extended.cpp
index ff0b5b00a0..b828fc513d 100644
--- a/modules/gui/qt/dialogs/extended/extended.cpp
+++ b/modules/gui/qt/dialogs/extended/extended.cpp
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/gui/qt/dialogs/extended/extended_panels.cpp b/modules/gui/qt/dialogs/extended/extended_panels.cpp
index 099921cdee..e9d4b7d720 100644
--- a/modules/gui/qt/dialogs/extended/extended_panels.cpp
+++ b/modules/gui/qt/dialogs/extended/extended_panels.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/gui/qt/dialogs/extended/extended_panels.hpp b/modules/gui/qt/dialogs/extended/extended_panels.hpp
index f0c775d6fb..21f7d4a779 100644
--- a/modules/gui/qt/dialogs/extended/extended_panels.hpp
+++ b/modules/gui/qt/dialogs/extended/extended_panels.hpp
@@ -25,7 +25,7 @@
 #define VLC_QT_EXTENDED_PANELS_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/dialogs/extensions/extensions_manager.hpp b/modules/gui/qt/dialogs/extensions/extensions_manager.hpp
index ceb56c24df..fe785c8936 100644
--- a/modules/gui/qt/dialogs/extensions/extensions_manager.hpp
+++ b/modules/gui/qt/dialogs/extensions/extensions_manager.hpp
@@ -24,7 +24,7 @@
 #define EXTENSIONS_MANAGER_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_extensions.h>
diff --git a/modules/gui/qt/dialogs/fingerprint/chromaprint.cpp b/modules/gui/qt/dialogs/fingerprint/chromaprint.cpp
index 585fc5e167..b50e02c149 100644
--- a/modules/gui/qt/dialogs/fingerprint/chromaprint.cpp
+++ b/modules/gui/qt/dialogs/fingerprint/chromaprint.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "chromaprint.hpp"
diff --git a/modules/gui/qt/dialogs/fingerprint/chromaprint.hpp b/modules/gui/qt/dialogs/fingerprint/chromaprint.hpp
index aeb9250d8a..7fb7f7b41b 100644
--- a/modules/gui/qt/dialogs/fingerprint/chromaprint.hpp
+++ b/modules/gui/qt/dialogs/fingerprint/chromaprint.hpp
@@ -21,7 +21,7 @@
 #define CHROMAPRINT_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <QObject>
diff --git a/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.hpp b/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.hpp
index c58d59a731..d7f20fc3ed 100644
--- a/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.hpp
+++ b/modules/gui/qt/dialogs/fingerprint/fingerprintdialog.hpp
@@ -21,7 +21,7 @@
 #define FINGERPRINTDIALOG_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/dialogs/gototime/gototime.cpp b/modules/gui/qt/dialogs/gototime/gototime.cpp
index 4c5849a78b..df580ccd4c 100644
--- a/modules/gui/qt/dialogs/gototime/gototime.cpp
+++ b/modules/gui/qt/dialogs/gototime/gototime.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "gototime.hpp"
diff --git a/modules/gui/qt/dialogs/help/aboutmodel.cpp b/modules/gui/qt/dialogs/help/aboutmodel.cpp
index 2aa267798a..7f3023add4 100644
--- a/modules/gui/qt/dialogs/help/aboutmodel.cpp
+++ b/modules/gui/qt/dialogs/help/aboutmodel.cpp
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "aboutmodel.hpp"
diff --git a/modules/gui/qt/dialogs/help/help.cpp b/modules/gui/qt/dialogs/help/help.cpp
index cd4f8baedc..20391a1f7d 100644
--- a/modules/gui/qt/dialogs/help/help.cpp
+++ b/modules/gui/qt/dialogs/help/help.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/dialogs/help/help.hpp b/modules/gui/qt/dialogs/help/help.hpp
index 96c10981dd..000ff5fede 100644
--- a/modules/gui/qt/dialogs/help/help.hpp
+++ b/modules/gui/qt/dialogs/help/help.hpp
@@ -24,7 +24,7 @@
 #define QVLC_HELP_DIALOG_H_ 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/dialogs/mediainfo/info_panels.cpp b/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
index 02b7c6c0b2..4ddefa55c0 100644
--- a/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
+++ b/modules/gui/qt/dialogs/mediainfo/info_panels.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/dialogs/mediainfo/info_panels.hpp b/modules/gui/qt/dialogs/mediainfo/info_panels.hpp
index 630e808693..8418361b26 100644
--- a/modules/gui/qt/dialogs/mediainfo/info_panels.hpp
+++ b/modules/gui/qt/dialogs/mediainfo/info_panels.hpp
@@ -26,7 +26,7 @@
 #define VLC_QT_INFO_PANELS_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/dialogs/mediainfo/mediainfo.cpp b/modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
index 649d821ab7..743758439f 100644
--- a/modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
+++ b/modules/gui/qt/dialogs/mediainfo/mediainfo.cpp
@@ -22,7 +22,7 @@
  ******************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "mediainfo.hpp"
diff --git a/modules/gui/qt/dialogs/messages/messages.cpp b/modules/gui/qt/dialogs/messages/messages.cpp
index abd0d5f7f2..6d0270cc18 100644
--- a/modules/gui/qt/dialogs/messages/messages.cpp
+++ b/modules/gui/qt/dialogs/messages/messages.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <QPlainTextEdit>
diff --git a/modules/gui/qt/dialogs/open/open.cpp b/modules/gui/qt/dialogs/open/open.cpp
index 0080e892b6..82e64bef73 100644
--- a/modules/gui/qt/dialogs/open/open.cpp
+++ b/modules/gui/qt/dialogs/open/open.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "dialogs/open/open.hpp"
diff --git a/modules/gui/qt/dialogs/open/open.hpp b/modules/gui/qt/dialogs/open/open.hpp
index e14442cb03..d58196bac6 100644
--- a/modules/gui/qt/dialogs/open/open.hpp
+++ b/modules/gui/qt/dialogs/open/open.hpp
@@ -24,7 +24,7 @@
 #define QVLC_OPEN_DIALOG_H_ 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/dialogs/open/open_panels.cpp b/modules/gui/qt/dialogs/open/open_panels.cpp
index d2be788cf8..8a12933207 100644
--- a/modules/gui/qt/dialogs/open/open_panels.cpp
+++ b/modules/gui/qt/dialogs/open/open_panels.cpp
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/dialogs/open/open_panels.hpp b/modules/gui/qt/dialogs/open/open_panels.hpp
index b91e9343f5..41e41318ba 100644
--- a/modules/gui/qt/dialogs/open/open_panels.hpp
+++ b/modules/gui/qt/dialogs/open/open_panels.hpp
@@ -28,7 +28,7 @@
 #define VLC_QT_OPEN_PANELS_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "dialogs/preferences/preferences_widgets.hpp"
diff --git a/modules/gui/qt/dialogs/open/openurl.cpp b/modules/gui/qt/dialogs/open/openurl.cpp
index 146b4bde6a..7ab4369621 100644
--- a/modules/gui/qt/dialogs/open/openurl.cpp
+++ b/modules/gui/qt/dialogs/open/openurl.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "dialogs/open/openurl.hpp"
diff --git a/modules/gui/qt/dialogs/open/openurl.hpp b/modules/gui/qt/dialogs/open/openurl.hpp
index 76c3479cc3..f09c7e3ec0 100644
--- a/modules/gui/qt/dialogs/open/openurl.hpp
+++ b/modules/gui/qt/dialogs/open/openurl.hpp
@@ -24,7 +24,7 @@
 #define QVLC_OPEN_URL_H_ 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/dialogs/plugins/addons_manager.hpp b/modules/gui/qt/dialogs/plugins/addons_manager.hpp
index 69c3f47279..024673dff2 100644
--- a/modules/gui/qt/dialogs/plugins/addons_manager.hpp
+++ b/modules/gui/qt/dialogs/plugins/addons_manager.hpp
@@ -22,7 +22,7 @@
 #define ADDONS_MANAGER_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/dialogs/plugins/plugins.cpp b/modules/gui/qt/dialogs/plugins/plugins.cpp
index fd1f46b541..3993b8163a 100644
--- a/modules/gui/qt/dialogs/plugins/plugins.cpp
+++ b/modules/gui/qt/dialogs/plugins/plugins.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "plugins.hpp"
diff --git a/modules/gui/qt/dialogs/podcast/podcast_configuration.cpp b/modules/gui/qt/dialogs/podcast/podcast_configuration.cpp
index 4c9869337e..1fec3624e0 100644
--- a/modules/gui/qt/dialogs/podcast/podcast_configuration.cpp
+++ b/modules/gui/qt/dialogs/podcast/podcast_configuration.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "podcast_configuration.hpp"
diff --git a/modules/gui/qt/dialogs/preferences/complete_preferences.cpp b/modules/gui/qt/dialogs/preferences/complete_preferences.cpp
index dc02c1a6f1..fde7751476 100644
--- a/modules/gui/qt/dialogs/preferences/complete_preferences.cpp
+++ b/modules/gui/qt/dialogs/preferences/complete_preferences.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <QApplication>
diff --git a/modules/gui/qt/dialogs/preferences/complete_preferences.hpp b/modules/gui/qt/dialogs/preferences/complete_preferences.hpp
index 1c726c440c..faf5f41153 100644
--- a/modules/gui/qt/dialogs/preferences/complete_preferences.hpp
+++ b/modules/gui/qt/dialogs/preferences/complete_preferences.hpp
@@ -24,7 +24,7 @@
 #define VLC_QT_COMPLETE_PREFERENCES_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/dialogs/preferences/preferences.cpp b/modules/gui/qt/dialogs/preferences/preferences.cpp
index 9fb2eee207..ce670abbe7 100644
--- a/modules/gui/qt/dialogs/preferences/preferences.cpp
+++ b/modules/gui/qt/dialogs/preferences/preferences.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "dialogs/preferences/preferences.hpp"
diff --git a/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp b/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
index 462d141400..91b9d3abc9 100644
--- a/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
+++ b/modules/gui/qt/dialogs/preferences/preferences_widgets.cpp
@@ -27,7 +27,7 @@
  *  - Validator for modulelist
  */
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "dialogs/preferences/preferences_widgets.hpp"
diff --git a/modules/gui/qt/dialogs/preferences/preferences_widgets.hpp b/modules/gui/qt/dialogs/preferences/preferences_widgets.hpp
index 9fafbcbb4f..a5ae3c7161 100644
--- a/modules/gui/qt/dialogs/preferences/preferences_widgets.hpp
+++ b/modules/gui/qt/dialogs/preferences/preferences_widgets.hpp
@@ -26,7 +26,7 @@
 #define VLC_QT_PREFERENCES_WIDGETS_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/dialogs/preferences/simple_preferences.cpp b/modules/gui/qt/dialogs/preferences/simple_preferences.cpp
index c9b90778a6..668f05b10a 100644
--- a/modules/gui/qt/dialogs/preferences/simple_preferences.cpp
+++ b/modules/gui/qt/dialogs/preferences/simple_preferences.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "simple_preferences.hpp"
diff --git a/modules/gui/qt/dialogs/preferences/simple_preferences.hpp b/modules/gui/qt/dialogs/preferences/simple_preferences.hpp
index 32d7df9fc2..677bfea55f 100644
--- a/modules/gui/qt/dialogs/preferences/simple_preferences.hpp
+++ b/modules/gui/qt/dialogs/preferences/simple_preferences.hpp
@@ -24,7 +24,7 @@
 #define VLC_QT_SIMPLE_PREFERENCES_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/dialogs/sout/convert.cpp b/modules/gui/qt/dialogs/sout/convert.cpp
index ec1e579819..fcd8a07268 100644
--- a/modules/gui/qt/dialogs/sout/convert.cpp
+++ b/modules/gui/qt/dialogs/sout/convert.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "dialogs/sout/sout.hpp"
diff --git a/modules/gui/qt/dialogs/sout/sout.cpp b/modules/gui/qt/dialogs/sout/sout.cpp
index 1b00279efe..def973c791 100644
--- a/modules/gui/qt/dialogs/sout/sout.cpp
+++ b/modules/gui/qt/dialogs/sout/sout.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "dialogs/sout/sout.hpp"
diff --git a/modules/gui/qt/dialogs/sout/sout.hpp b/modules/gui/qt/dialogs/sout/sout.hpp
index d42fe6bf43..bdea5284b8 100644
--- a/modules/gui/qt/dialogs/sout/sout.hpp
+++ b/modules/gui/qt/dialogs/sout/sout.hpp
@@ -24,7 +24,7 @@
 #define QVLC_SOUT_DIALOG_H_ 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h> /* Gettext functions */
diff --git a/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp b/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
index c0927f8058..fe6cc6c446 100644
--- a/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
+++ b/modules/gui/qt/dialogs/toolbar/toolbareditor.cpp
@@ -17,7 +17,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "toolbareditor.hpp"
diff --git a/modules/gui/qt/dialogs/vlm/vlm.cpp b/modules/gui/qt/dialogs/vlm/vlm.cpp
index 2b21d52f91..c29a61a932 100644
--- a/modules/gui/qt/dialogs/vlm/vlm.cpp
+++ b/modules/gui/qt/dialogs/vlm/vlm.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef ENABLE_VLM
diff --git a/modules/gui/qt/dialogs/vlm/vlm.hpp b/modules/gui/qt/dialogs/vlm/vlm.hpp
index 7f60ae5c19..70b28b990c 100644
--- a/modules/gui/qt/dialogs/vlm/vlm.hpp
+++ b/modules/gui/qt/dialogs/vlm/vlm.hpp
@@ -25,7 +25,7 @@
 #define QVLC_VLM_DIALOG_H_ 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_vlm.h>
diff --git a/modules/gui/qt/maininterface/compositor.hpp b/modules/gui/qt/maininterface/compositor.hpp
index aef4e11a32..5b8c3f2fa0 100644
--- a/modules/gui/qt/maininterface/compositor.hpp
+++ b/modules/gui/qt/maininterface/compositor.hpp
@@ -19,7 +19,7 @@
 #define VLC_QT_COMPOSITOR
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/maininterface/compositor_dcomp.cpp b/modules/gui/qt/maininterface/compositor_dcomp.cpp
index f459480447..5e2a35fdb1 100644
--- a/modules/gui/qt/maininterface/compositor_dcomp.cpp
+++ b/modules/gui/qt/maininterface/compositor_dcomp.cpp
@@ -17,7 +17,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "compositor_dcomp.hpp"
diff --git a/modules/gui/qt/maininterface/compositor_dcomp_uisurface.hpp b/modules/gui/qt/maininterface/compositor_dcomp_uisurface.hpp
index b41f883e73..460a48073e 100644
--- a/modules/gui/qt/maininterface/compositor_dcomp_uisurface.hpp
+++ b/modules/gui/qt/maininterface/compositor_dcomp_uisurface.hpp
@@ -19,7 +19,7 @@
 #define COMPOSITOR_DCOMP_UISURFACE_H
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <memory>
diff --git a/modules/gui/qt/maininterface/compositor_dummy.hpp b/modules/gui/qt/maininterface/compositor_dummy.hpp
index 51647d1ac0..3c60faafb3 100644
--- a/modules/gui/qt/maininterface/compositor_dummy.hpp
+++ b/modules/gui/qt/maininterface/compositor_dummy.hpp
@@ -20,7 +20,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "compositor.hpp"
diff --git a/modules/gui/qt/maininterface/main_interface.cpp b/modules/gui/qt/maininterface/main_interface.cpp
index 1ef30f77ea..0cf58d0c49 100644
--- a/modules/gui/qt/maininterface/main_interface.cpp
+++ b/modules/gui/qt/maininterface/main_interface.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/maininterface/main_interface_win32.cpp b/modules/gui/qt/maininterface/main_interface_win32.cpp
index a4c47cb9cc..58449604a3 100644
--- a/modules/gui/qt/maininterface/main_interface_win32.cpp
+++ b/modules/gui/qt/maininterface/main_interface_win32.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #if HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "main_interface_win32.hpp"
diff --git a/modules/gui/qt/maininterface/mainui.hpp b/modules/gui/qt/maininterface/mainui.hpp
index 08807d6550..04d95004ab 100644
--- a/modules/gui/qt/maininterface/mainui.hpp
+++ b/modules/gui/qt/maininterface/mainui.hpp
@@ -2,7 +2,7 @@
 #define MAINUI_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/maininterface/video_window_handler.hpp b/modules/gui/qt/maininterface/video_window_handler.hpp
index 164e9166c5..f7cfdd8d16 100644
--- a/modules/gui/qt/maininterface/video_window_handler.hpp
+++ b/modules/gui/qt/maininterface/video_window_handler.hpp
@@ -19,7 +19,7 @@
 #define VIDEOWINDOWHANDLER_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/medialibrary/mlalbum.hpp b/modules/gui/qt/medialibrary/mlalbum.hpp
index 230cc3b99b..9984282ab9 100644
--- a/modules/gui/qt/medialibrary/mlalbum.hpp
+++ b/modules/gui/qt/medialibrary/mlalbum.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include <vlc_common.h>
 
diff --git a/modules/gui/qt/medialibrary/mlalbummodel.hpp b/modules/gui/qt/medialibrary/mlalbummodel.hpp
index 972fbc64a7..8e8d7d8caa 100644
--- a/modules/gui/qt/medialibrary/mlalbummodel.hpp
+++ b/modules/gui/qt/medialibrary/mlalbummodel.hpp
@@ -20,7 +20,7 @@
 #define MLABLUMMODEL_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <QObject>
diff --git a/modules/gui/qt/medialibrary/mlalbumtrack.hpp b/modules/gui/qt/medialibrary/mlalbumtrack.hpp
index beebcfa0c6..310131b8fe 100644
--- a/modules/gui/qt/medialibrary/mlalbumtrack.hpp
+++ b/modules/gui/qt/medialibrary/mlalbumtrack.hpp
@@ -19,7 +19,7 @@
 #pragma once
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include <vlc_common.h>
 
diff --git a/modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp b/modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp
index 30a00ec478..1e4ae08aee 100644
--- a/modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp
+++ b/modules/gui/qt/medialibrary/mlalbumtrackmodel.hpp
@@ -20,7 +20,7 @@
 #define MLTRACKMODEL_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <QObject>
diff --git a/modules/gui/qt/medialibrary/mlartist.hpp b/modules/gui/qt/medialibrary/mlartist.hpp
index 0d524e3197..025b39eed2 100644
--- a/modules/gui/qt/medialibrary/mlartist.hpp
+++ b/modules/gui/qt/medialibrary/mlartist.hpp
@@ -20,7 +20,7 @@
 #define MLARTIST_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include <vlc_common.h>
 
diff --git a/modules/gui/qt/medialibrary/mlartistmodel.hpp b/modules/gui/qt/medialibrary/mlartistmodel.hpp
index ef92fdf65d..9d15a5e1fe 100644
--- a/modules/gui/qt/medialibrary/mlartistmodel.hpp
+++ b/modules/gui/qt/medialibrary/mlartistmodel.hpp
@@ -20,7 +20,7 @@
 #define MLARTISTMODEL_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <QObject>
diff --git a/modules/gui/qt/medialibrary/mlbasemodel.hpp b/modules/gui/qt/medialibrary/mlbasemodel.hpp
index 661630931f..0ab37e46ec 100644
--- a/modules/gui/qt/medialibrary/mlbasemodel.hpp
+++ b/modules/gui/qt/medialibrary/mlbasemodel.hpp
@@ -20,7 +20,7 @@
 #define MLBASEMODEL_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include <vlc_common.h>
 
diff --git a/modules/gui/qt/medialibrary/mlbookmarkmodel.cpp b/modules/gui/qt/medialibrary/mlbookmarkmodel.cpp
index 9c4a6ccca7..b7760a2dc1 100644
--- a/modules/gui/qt/medialibrary/mlbookmarkmodel.cpp
+++ b/modules/gui/qt/medialibrary/mlbookmarkmodel.cpp
@@ -17,7 +17,7 @@
  *****************************************************************************/
 
 #if HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "mlbookmarkmodel.hpp"
diff --git a/modules/gui/qt/medialibrary/mlfoldersmodel.hpp b/modules/gui/qt/medialibrary/mlfoldersmodel.hpp
index c5e23f1070..090fdbaa14 100644
--- a/modules/gui/qt/medialibrary/mlfoldersmodel.hpp
+++ b/modules/gui/qt/medialibrary/mlfoldersmodel.hpp
@@ -21,7 +21,7 @@
 
 #ifdef HAVE_CONFIG_H
 
-# include "config.h"
+# include <config.h>
 
 #endif
 
diff --git a/modules/gui/qt/medialibrary/mlgenre.hpp b/modules/gui/qt/medialibrary/mlgenre.hpp
index 5309dd0dfe..fc058cabcc 100644
--- a/modules/gui/qt/medialibrary/mlgenre.hpp
+++ b/modules/gui/qt/medialibrary/mlgenre.hpp
@@ -20,7 +20,7 @@
 #define MLGENRE_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include <vlc_common.h>
 
diff --git a/modules/gui/qt/medialibrary/mlgenremodel.hpp b/modules/gui/qt/medialibrary/mlgenremodel.hpp
index bef6eb140a..e032d7d04b 100644
--- a/modules/gui/qt/medialibrary/mlgenremodel.hpp
+++ b/modules/gui/qt/medialibrary/mlgenremodel.hpp
@@ -20,7 +20,7 @@
 #define MLGENREMODEL_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <memory>
diff --git a/modules/gui/qt/medialibrary/mlhelper.hpp b/modules/gui/qt/medialibrary/mlhelper.hpp
index e7375cf292..2f034ede41 100644
--- a/modules/gui/qt/medialibrary/mlhelper.hpp
+++ b/modules/gui/qt/medialibrary/mlhelper.hpp
@@ -22,7 +22,7 @@
 #include <memory>
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_media_library.h>
diff --git a/modules/gui/qt/medialibrary/mlqmltypes.hpp b/modules/gui/qt/medialibrary/mlqmltypes.hpp
index 7e963521b8..9097357285 100644
--- a/modules/gui/qt/medialibrary/mlqmltypes.hpp
+++ b/modules/gui/qt/medialibrary/mlqmltypes.hpp
@@ -20,7 +20,7 @@
 #define MLQMLTYPES_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <QObject>
diff --git a/modules/gui/qt/medialibrary/mlrecentsvideomodel.hpp b/modules/gui/qt/medialibrary/mlrecentsvideomodel.hpp
index 055eecf174..70f41e341b 100644
--- a/modules/gui/qt/medialibrary/mlrecentsvideomodel.hpp
+++ b/modules/gui/qt/medialibrary/mlrecentsvideomodel.hpp
@@ -20,7 +20,7 @@
 #define MCRECENTSMODEL_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/medialibrary/mlurlmodel.hpp b/modules/gui/qt/medialibrary/mlurlmodel.hpp
index 8feb87a4f8..f9fc0f0112 100644
--- a/modules/gui/qt/medialibrary/mlurlmodel.hpp
+++ b/modules/gui/qt/medialibrary/mlurlmodel.hpp
@@ -20,7 +20,7 @@
 #define MLURLMODEL_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <QObject>
diff --git a/modules/gui/qt/medialibrary/mlvideo.hpp b/modules/gui/qt/medialibrary/mlvideo.hpp
index 8a20aab038..3e96720b3e 100644
--- a/modules/gui/qt/medialibrary/mlvideo.hpp
+++ b/modules/gui/qt/medialibrary/mlvideo.hpp
@@ -20,7 +20,7 @@
 #define MLVIDEO_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/medialibrary/mlvideomodel.hpp b/modules/gui/qt/medialibrary/mlvideomodel.hpp
index 4c85885106..bb923d5d95 100644
--- a/modules/gui/qt/medialibrary/mlvideomodel.hpp
+++ b/modules/gui/qt/medialibrary/mlvideomodel.hpp
@@ -20,7 +20,7 @@
 #define MCVIDEOMODEL_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/menus/custom_menus.cpp b/modules/gui/qt/menus/custom_menus.cpp
index 8f21defc71..91be07f282 100644
--- a/modules/gui/qt/menus/custom_menus.cpp
+++ b/modules/gui/qt/menus/custom_menus.cpp
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/menus/menus.cpp b/modules/gui/qt/menus/menus.cpp
index aceeb6dade..b59a12519a 100644
--- a/modules/gui/qt/menus/menus.cpp
+++ b/modules/gui/qt/menus/menus.cpp
@@ -27,7 +27,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/network/networkdevicemodel.hpp b/modules/gui/qt/network/networkdevicemodel.hpp
index 1096ec9349..4e7743ef44 100644
--- a/modules/gui/qt/network/networkdevicemodel.hpp
+++ b/modules/gui/qt/network/networkdevicemodel.hpp
@@ -20,7 +20,7 @@
 #define MLNETWORKDEVICEMODEL_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <QAbstractListModel>
diff --git a/modules/gui/qt/network/networkmediamodel.hpp b/modules/gui/qt/network/networkmediamodel.hpp
index 7438f219e6..6cbe9db678 100644
--- a/modules/gui/qt/network/networkmediamodel.hpp
+++ b/modules/gui/qt/network/networkmediamodel.hpp
@@ -20,7 +20,7 @@
 #define MLNETWORKMEDIAMODEL_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <QAbstractListModel>
diff --git a/modules/gui/qt/network/networksourcelistener.hpp b/modules/gui/qt/network/networksourcelistener.hpp
index a2fbfe6f60..0da09ee92d 100644
--- a/modules/gui/qt/network/networksourcelistener.hpp
+++ b/modules/gui/qt/network/networksourcelistener.hpp
@@ -20,7 +20,7 @@
 #define MLNETWORKSOURCELISTENER_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_media_library.h>
diff --git a/modules/gui/qt/network/networksourcesmodel.hpp b/modules/gui/qt/network/networksourcesmodel.hpp
index f7b5bf4396..d88fbb46aa 100644
--- a/modules/gui/qt/network/networksourcesmodel.hpp
+++ b/modules/gui/qt/network/networksourcesmodel.hpp
@@ -20,7 +20,7 @@
 #define MLNetworkSourcesModel_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <QAbstractListModel>
diff --git a/modules/gui/qt/network/servicesdiscoverymodel.hpp b/modules/gui/qt/network/servicesdiscoverymodel.hpp
index 0eb5221bdc..181252f442 100644
--- a/modules/gui/qt/network/servicesdiscoverymodel.hpp
+++ b/modules/gui/qt/network/servicesdiscoverymodel.hpp
@@ -20,7 +20,7 @@
 #define MLServicesDiscoveryModel_HPP
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <QAbstractListModel>
diff --git a/modules/gui/qt/player/input_models.hpp b/modules/gui/qt/player/input_models.hpp
index d8f9db5467..292a14ed36 100644
--- a/modules/gui/qt/player/input_models.hpp
+++ b/modules/gui/qt/player/input_models.hpp
@@ -21,7 +21,7 @@
 #define INPUT_MODELS_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/player/player_controller.cpp b/modules/gui/qt/player/player_controller.cpp
index 3f62071525..99f56b4b04 100644
--- a/modules/gui/qt/player/player_controller.cpp
+++ b/modules/gui/qt/player/player_controller.cpp
@@ -17,7 +17,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "player_controller.hpp"
diff --git a/modules/gui/qt/player/player_controller.hpp b/modules/gui/qt/player/player_controller.hpp
index 99c0f0f296..c75068b913 100644
--- a/modules/gui/qt/player/player_controller.hpp
+++ b/modules/gui/qt/player/player_controller.hpp
@@ -20,7 +20,7 @@
 #define QVLC_INPUT_MANAGER_H_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/playlist/playlist_common.hpp b/modules/gui/qt/playlist/playlist_common.hpp
index 336e59b1a5..796b8ef6fe 100644
--- a/modules/gui/qt/playlist/playlist_common.hpp
+++ b/modules/gui/qt/playlist/playlist_common.hpp
@@ -19,7 +19,7 @@
 #define PLAYLIST_COMMON_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <QObject>
diff --git a/modules/gui/qt/playlist/playlist_controller.cpp b/modules/gui/qt/playlist/playlist_controller.cpp
index 36aee44c9b..5495250a89 100644
--- a/modules/gui/qt/playlist/playlist_controller.cpp
+++ b/modules/gui/qt/playlist/playlist_controller.cpp
@@ -17,7 +17,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "playlist_controller.hpp"
diff --git a/modules/gui/qt/playlist/playlist_controller.hpp b/modules/gui/qt/playlist/playlist_controller.hpp
index e411fcd747..724e16a5ec 100644
--- a/modules/gui/qt/playlist/playlist_controller.hpp
+++ b/modules/gui/qt/playlist/playlist_controller.hpp
@@ -20,7 +20,7 @@
 #define VLC_QT_PLAYLIST_NEW_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <QObject>
diff --git a/modules/gui/qt/playlist/playlist_item.hpp b/modules/gui/qt/playlist/playlist_item.hpp
index faddd4f803..2b72614da8 100644
--- a/modules/gui/qt/playlist/playlist_item.hpp
+++ b/modules/gui/qt/playlist/playlist_item.hpp
@@ -19,7 +19,7 @@
 #define VLC_QT_PLAYLIST_NEW_ITEM_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_player.h>
diff --git a/modules/gui/qt/playlist/playlist_model.cpp b/modules/gui/qt/playlist/playlist_model.cpp
index 65b49554ee..d4b01e536e 100644
--- a/modules/gui/qt/playlist/playlist_model.cpp
+++ b/modules/gui/qt/playlist/playlist_model.cpp
@@ -17,7 +17,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "playlist_model.hpp"
diff --git a/modules/gui/qt/playlist/playlist_model.hpp b/modules/gui/qt/playlist/playlist_model.hpp
index fdf487316e..5d399f0d58 100644
--- a/modules/gui/qt/playlist/playlist_model.hpp
+++ b/modules/gui/qt/playlist/playlist_model.hpp
@@ -20,7 +20,7 @@
 #define VLC_QT_PLAYLIST_NEW_MODEL_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <QAbstractListModel>
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index c05df6e2fa..223664971b 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/gui/qt/qt.hpp b/modules/gui/qt/qt.hpp
index c8a2241782..2c8fd6c0c6 100644
--- a/modules/gui/qt/qt.hpp
+++ b/modules/gui/qt/qt.hpp
@@ -25,7 +25,7 @@
 #define QVLC_H_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/util/audio_device_model.hpp b/modules/gui/qt/util/audio_device_model.hpp
index b8e040562b..a453d26125 100644
--- a/modules/gui/qt/util/audio_device_model.hpp
+++ b/modules/gui/qt/util/audio_device_model.hpp
@@ -22,7 +22,7 @@
 #include <QAbstractListModel>
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/util/i18n.cpp b/modules/gui/qt/util/i18n.cpp
index ab3ff12fb4..d52d42e42e 100644
--- a/modules/gui/qt/util/i18n.cpp
+++ b/modules/gui/qt/util/i18n.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "i18n.hpp"
diff --git a/modules/gui/qt/util/imagehelper.cpp b/modules/gui/qt/util/imagehelper.cpp
index fe588e6388..f667cba509 100644
--- a/modules/gui/qt/util/imagehelper.cpp
+++ b/modules/gui/qt/util/imagehelper.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/util/recent_media_model.hpp b/modules/gui/qt/util/recent_media_model.hpp
index b45799e2aa..8274a6b499 100644
--- a/modules/gui/qt/util/recent_media_model.hpp
+++ b/modules/gui/qt/util/recent_media_model.hpp
@@ -21,7 +21,7 @@
 
 #ifdef HAVE_CONFIG_H
 
-# include "config.h"
+# include <config.h>
 
 #endif
 
diff --git a/modules/gui/qt/util/registry.cpp b/modules/gui/qt/util/registry.cpp
index 407c221a9c..f66688cdbb 100644
--- a/modules/gui/qt/util/registry.cpp
+++ b/modules/gui/qt/util/registry.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/modules/gui/qt/util/renderer_manager.hpp b/modules/gui/qt/util/renderer_manager.hpp
index c8126761b0..84f9ea01f1 100644
--- a/modules/gui/qt/util/renderer_manager.hpp
+++ b/modules/gui/qt/util/renderer_manager.hpp
@@ -2,7 +2,7 @@
 #define RENDERER_MANAGER_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/util/selectable_list_model.cpp b/modules/gui/qt/util/selectable_list_model.cpp
index 3371893e9a..3a85ebbf0b 100644
--- a/modules/gui/qt/util/selectable_list_model.cpp
+++ b/modules/gui/qt/util/selectable_list_model.cpp
@@ -17,7 +17,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "selectable_list_model.hpp"
diff --git a/modules/gui/qt/util/validators.cpp b/modules/gui/qt/util/validators.cpp
index 397f4b8dd5..6bc73af5c8 100644
--- a/modules/gui/qt/util/validators.cpp
+++ b/modules/gui/qt/util/validators.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "validators.hpp"
diff --git a/modules/gui/qt/util/varchoicemodel.hpp b/modules/gui/qt/util/varchoicemodel.hpp
index 9f5b20729a..2009530d62 100644
--- a/modules/gui/qt/util/varchoicemodel.hpp
+++ b/modules/gui/qt/util/varchoicemodel.hpp
@@ -20,7 +20,7 @@
 #define VLC_VAR_CHOICE_MODEL_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/util/variables.hpp b/modules/gui/qt/util/variables.hpp
index dff7e84bcb..c2d51c61df 100644
--- a/modules/gui/qt/util/variables.hpp
+++ b/modules/gui/qt/util/variables.hpp
@@ -22,7 +22,7 @@
 #define QVLC_VARIABLES_H_ 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/qt/util/vlctick.hpp b/modules/gui/qt/util/vlctick.hpp
index 20853984ed..81a0e380e6 100644
--- a/modules/gui/qt/util/vlctick.hpp
+++ b/modules/gui/qt/util/vlctick.hpp
@@ -19,7 +19,7 @@
 #define VLCTICK_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <QObject>
diff --git a/modules/gui/qt/vlc-qt-check.cpp b/modules/gui/qt/vlc-qt-check.cpp
index 52a7f4a78b..a6779339ff 100644
--- a/modules/gui/qt/vlc-qt-check.cpp
+++ b/modules/gui/qt/vlc-qt-check.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/gui/qt/widgets/native/customwidgets.cpp b/modules/gui/qt/widgets/native/customwidgets.cpp
index d20a1eb52a..6c4b07b66e 100644
--- a/modules/gui/qt/widgets/native/customwidgets.cpp
+++ b/modules/gui/qt/widgets/native/customwidgets.cpp
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "customwidgets.hpp"
diff --git a/modules/gui/qt/widgets/native/interface_widgets.cpp b/modules/gui/qt/widgets/native/interface_widgets.cpp
index 39d6381dd5..393c818d33 100644
--- a/modules/gui/qt/widgets/native/interface_widgets.cpp
+++ b/modules/gui/qt/widgets/native/interface_widgets.cpp
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "qt.hpp"
diff --git a/modules/gui/qt/widgets/native/interface_widgets.hpp b/modules/gui/qt/widgets/native/interface_widgets.hpp
index 22454617c6..c5bde60c54 100644
--- a/modules/gui/qt/widgets/native/interface_widgets.hpp
+++ b/modules/gui/qt/widgets/native/interface_widgets.hpp
@@ -26,7 +26,7 @@
 #define VLC_QT_INTERFACE_WIDGETS_HPP_
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "maininterface/main_interface.hpp" /* Interface integration */
diff --git a/modules/gui/qt/widgets/native/searchlineedit.cpp b/modules/gui/qt/widgets/native/searchlineedit.cpp
index 1ea099e4c1..80b5ff36e0 100644
--- a/modules/gui/qt/widgets/native/searchlineedit.cpp
+++ b/modules/gui/qt/widgets/native/searchlineedit.cpp
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "searchlineedit.hpp"
diff --git a/modules/gui/skins2/commands/cmd_add_item.cpp b/modules/gui/skins2/commands/cmd_add_item.cpp
index 0ed8f80504..b4a9d3f6a7 100644
--- a/modules/gui/skins2/commands/cmd_add_item.cpp
+++ b/modules/gui/skins2/commands/cmd_add_item.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/skins2/commands/cmd_quit.cpp b/modules/gui/skins2/commands/cmd_quit.cpp
index 1d3d59806f..38ddf99b1e 100644
--- a/modules/gui/skins2/commands/cmd_quit.cpp
+++ b/modules/gui/skins2/commands/cmd_quit.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #include <vlc_vout.h>
diff --git a/modules/gui/skins2/commands/cmd_vars.hpp b/modules/gui/skins2/commands/cmd_vars.hpp
index d0d1d224d2..58eff4ef9e 100644
--- a/modules/gui/skins2/commands/cmd_vars.hpp
+++ b/modules/gui/skins2/commands/cmd_vars.hpp
@@ -24,7 +24,7 @@
 #define CMD_VARS_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/skins2/os2/os2_dragdrop.hpp b/modules/gui/skins2/os2/os2_dragdrop.hpp
index 3e70d03895..5b357977b2 100644
--- a/modules/gui/skins2/os2/os2_dragdrop.hpp
+++ b/modules/gui/skins2/os2/os2_dragdrop.hpp
@@ -26,7 +26,7 @@
 #define OS2_DRAGDROP_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "../src/skin_common.hpp"
diff --git a/modules/gui/skins2/os2/os2_factory.cpp b/modules/gui/skins2/os2/os2_factory.cpp
index 479e6f60d5..2cab83a3b4 100644
--- a/modules/gui/skins2/os2/os2_factory.cpp
+++ b/modules/gui/skins2/os2/os2_factory.cpp
@@ -25,7 +25,7 @@
 #ifdef OS2_SKINS
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <io.h>
diff --git a/modules/gui/skins2/os2/os2_factory.hpp b/modules/gui/skins2/os2/os2_factory.hpp
index 3f1923bca8..4ca47e83c6 100644
--- a/modules/gui/skins2/os2/os2_factory.hpp
+++ b/modules/gui/skins2/os2/os2_factory.hpp
@@ -26,7 +26,7 @@
 #define OS2_FACTORY_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "../src/os_factory.hpp"
diff --git a/modules/gui/skins2/parser/builder.hpp b/modules/gui/skins2/parser/builder.hpp
index f0b25aa0eb..5e42f3737e 100644
--- a/modules/gui/skins2/parser/builder.hpp
+++ b/modules/gui/skins2/parser/builder.hpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifndef BUILDER_HPP
diff --git a/modules/gui/skins2/src/art_manager.cpp b/modules/gui/skins2/src/art_manager.cpp
index 6768bd7bf0..e82373fd45 100644
--- a/modules/gui/skins2/src/art_manager.cpp
+++ b/modules/gui/skins2/src/art_manager.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "art_manager.hpp"
diff --git a/modules/gui/skins2/src/file_bitmap.cpp b/modules/gui/skins2/src/file_bitmap.cpp
index 658bdc122f..f41c8cfa04 100644
--- a/modules/gui/skins2/src/file_bitmap.cpp
+++ b/modules/gui/skins2/src/file_bitmap.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/skins2/src/skin_common.hpp b/modules/gui/skins2/src/skin_common.hpp
index 20ce3bbe1e..8ed32e7291 100644
--- a/modules/gui/skins2/src/skin_common.hpp
+++ b/modules/gui/skins2/src/skin_common.hpp
@@ -25,7 +25,7 @@
 #define SKIN_COMMON_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index ebb349ddf5..7474d6d752 100644
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/gui/skins2/src/theme_loader.cpp b/modules/gui/skins2/src/theme_loader.cpp
index 80f680172e..cbc86cc44d 100644
--- a/modules/gui/skins2/src/theme_loader.cpp
+++ b/modules/gui/skins2/src/theme_loader.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <fcntl.h>
diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp
index ed8cbe846d..b54219216f 100644
--- a/modules/gui/skins2/src/vlcproc.cpp
+++ b/modules/gui/skins2/src/vlcproc.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/skins2/src/vout_manager.cpp b/modules/gui/skins2/src/vout_manager.cpp
index d2bfb87a84..3a5c457cf1 100644
--- a/modules/gui/skins2/src/vout_manager.cpp
+++ b/modules/gui/skins2/src/vout_manager.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "vout_manager.hpp"
diff --git a/modules/gui/skins2/utils/bezier.cpp b/modules/gui/skins2/utils/bezier.cpp
index 8593a4d731..3f26f258e3 100644
--- a/modules/gui/skins2/utils/bezier.cpp
+++ b/modules/gui/skins2/utils/bezier.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/skins2/vars/equalizer.cpp b/modules/gui/skins2/vars/equalizer.cpp
index 7752e346cd..77944f9e2f 100644
--- a/modules/gui/skins2/vars/equalizer.cpp
+++ b/modules/gui/skins2/vars/equalizer.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index 9309d89052..ad2749e889 100644
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/skins2/vars/volume.cpp b/modules/gui/skins2/vars/volume.cpp
index 773a555dee..0d2f26955c 100644
--- a/modules/gui/skins2/vars/volume.cpp
+++ b/modules/gui/skins2/vars/volume.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/gui/skins2/win32/win32_dragdrop.hpp b/modules/gui/skins2/win32/win32_dragdrop.hpp
index 40d4454383..fe1d66293d 100644
--- a/modules/gui/skins2/win32/win32_dragdrop.hpp
+++ b/modules/gui/skins2/win32/win32_dragdrop.hpp
@@ -25,7 +25,7 @@
 #define WIN32_DRAGDROP_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <windows.h>
diff --git a/modules/gui/skins2/win32/win32_factory.cpp b/modules/gui/skins2/win32/win32_factory.cpp
index 7cd90f2de5..cf07e320af 100644
--- a/modules/gui/skins2/win32/win32_factory.cpp
+++ b/modules/gui/skins2/win32/win32_factory.cpp
@@ -24,7 +24,7 @@
 #ifdef WIN32_SKINS
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <windows.h>
diff --git a/modules/gui/skins2/win32/win32_factory.hpp b/modules/gui/skins2/win32/win32_factory.hpp
index eaf80216a3..42764513a8 100644
--- a/modules/gui/skins2/win32/win32_factory.hpp
+++ b/modules/gui/skins2/win32/win32_factory.hpp
@@ -25,7 +25,7 @@
 #define WIN32_FACTORY_HPP
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <windows.h>
diff --git a/modules/hw/d3d11/d3d11_deinterlace.c b/modules/hw/d3d11/d3d11_deinterlace.c
index b2c8d99447..ac6989a2ee 100644
--- a/modules/hw/d3d11/d3d11_deinterlace.c
+++ b/modules/hw/d3d11/d3d11_deinterlace.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/hw/d3d11/d3d11_device.c b/modules/hw/d3d11/d3d11_device.c
index 216b4f0750..f38e8eb565 100644
--- a/modules/hw/d3d11/d3d11_device.c
+++ b/modules/hw/d3d11/d3d11_device.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/d3d11/d3d11_filters.c b/modules/hw/d3d11/d3d11_filters.c
index 868ce7ac31..afb5141bc5 100644
--- a/modules/hw/d3d11/d3d11_filters.c
+++ b/modules/hw/d3d11/d3d11_filters.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/hw/d3d11/d3d11_processor.c b/modules/hw/d3d11/d3d11_processor.c
index 44309e47a2..db82bce0fe 100644
--- a/modules/hw/d3d11/d3d11_processor.c
+++ b/modules/hw/d3d11/d3d11_processor.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_filter.h>
diff --git a/modules/hw/d3d11/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c
index d6bc9ba026..a427251c66 100644
--- a/modules/hw/d3d11/d3d11_surface.c
+++ b/modules/hw/d3d11/d3d11_surface.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/d3d9/d3d9_device.c b/modules/hw/d3d9/d3d9_device.c
index 90cf50f362..7c4b63e19b 100644
--- a/modules/hw/d3d9/d3d9_device.c
+++ b/modules/hw/d3d9/d3d9_device.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/d3d9/d3d9_filters.c b/modules/hw/d3d9/d3d9_filters.c
index 80106bce5b..dd3a8a8016 100644
--- a/modules/hw/d3d9/d3d9_filters.c
+++ b/modules/hw/d3d9/d3d9_filters.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c
index 563818dc70..5ebbf55710 100644
--- a/modules/hw/d3d9/dxa9.c
+++ b/modules/hw/d3d9/dxa9.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/d3d9/dxva2_deinterlace.c b/modules/hw/d3d9/dxva2_deinterlace.c
index 7c0c4ec692..d12744bd5f 100644
--- a/modules/hw/d3d9/dxva2_deinterlace.c
+++ b/modules/hw/d3d9/dxva2_deinterlace.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/hw/mmal/codec.c b/modules/hw/mmal/codec.c
index a10ac5637a..f0e1137256 100644
--- a/modules/hw/mmal/codec.c
+++ b/modules/hw/mmal/codec.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/hw/mmal/converter.c b/modules/hw/mmal/converter.c
index f62f21e087..5601282302 100644
--- a/modules/hw/mmal/converter.c
+++ b/modules/hw/mmal/converter.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/hw/mmal/decoder_device.c b/modules/hw/mmal/decoder_device.c
index d9bf7b03db..4dfdcd3805 100644
--- a/modules/hw/mmal/decoder_device.c
+++ b/modules/hw/mmal/decoder_device.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/mmal/deinterlace.c b/modules/hw/mmal/deinterlace.c
index 2709a1f173..27deee04c5 100644
--- a/modules/hw/mmal/deinterlace.c
+++ b/modules/hw/mmal/deinterlace.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/mmal/mmal_cma.c b/modules/hw/mmal/mmal_cma.c
index 1b48030c29..f05c6a90a4 100644
--- a/modules/hw/mmal/mmal_cma.c
+++ b/modules/hw/mmal/mmal_cma.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/hw/mmal/subpic.c b/modules/hw/mmal/subpic.c
index 00365b6912..8fe29566f6 100644
--- a/modules/hw/mmal/subpic.c
+++ b/modules/hw/mmal/subpic.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/mmal/vout.c b/modules/hw/mmal/vout.c
index eb622954e0..b677d4cd93 100644
--- a/modules/hw/mmal/vout.c
+++ b/modules/hw/mmal/vout.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/nvdec/chroma.c b/modules/hw/nvdec/chroma.c
index 88353f5cbe..710ca45373 100644
--- a/modules/hw/nvdec/chroma.c
+++ b/modules/hw/nvdec/chroma.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/nvdec/hw_pool.c b/modules/hw/nvdec/hw_pool.c
index 63c6f1911f..35793f6513 100644
--- a/modules/hw/nvdec/hw_pool.c
+++ b/modules/hw/nvdec/hw_pool.c
@@ -22,7 +22,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_picture_pool.h>
diff --git a/modules/hw/nvdec/nvdec.c b/modules/hw/nvdec/nvdec.c
index 2ad4e2089b..3c454cb5c9 100644
--- a/modules/hw/nvdec/nvdec.c
+++ b/modules/hw/nvdec/nvdec.c
@@ -21,7 +21,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/nvdec/nvdec_gl.c b/modules/hw/nvdec/nvdec_gl.c
index 4ea9bf4ac1..980674a059 100644
--- a/modules/hw/nvdec/nvdec_gl.c
+++ b/modules/hw/nvdec/nvdec_gl.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/hw/vaapi/chroma.c b/modules/hw/vaapi/chroma.c
index 38b904ed20..ae71719d80 100644
--- a/modules/hw/vaapi/chroma.c
+++ b/modules/hw/vaapi/chroma.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/hw/vaapi/decoder_device.c b/modules/hw/vaapi/decoder_device.c
index bde1e62115..20cb8c2390 100644
--- a/modules/hw/vaapi/decoder_device.c
+++ b/modules/hw/vaapi/decoder_device.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/hw/vaapi/vlc_vaapi.c b/modules/hw/vaapi/vlc_vaapi.c
index 31304fd6c3..45510cc8c3 100644
--- a/modules/hw/vaapi/vlc_vaapi.c
+++ b/modules/hw/vaapi/vlc_vaapi.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "vlc_vaapi.h"
diff --git a/modules/hw/vdpau/adjust.c b/modules/hw/vdpau/adjust.c
index 27c8b4bfa7..537535f78b 100644
--- a/modules/hw/vdpau/adjust.c
+++ b/modules/hw/vdpau/adjust.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/hw/vdpau/avcodec.c b/modules/hw/vdpau/avcodec.c
index c412003945..ab362665e3 100644
--- a/modules/hw/vdpau/avcodec.c
+++ b/modules/hw/vdpau/avcodec.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <string.h>
diff --git a/modules/hw/vdpau/chroma.c b/modules/hw/vdpau/chroma.c
index fa4b1e8b62..69941c53c8 100644
--- a/modules/hw/vdpau/chroma.c
+++ b/modules/hw/vdpau/chroma.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/hw/vdpau/deinterlace.c b/modules/hw/vdpau/deinterlace.c
index bd66a61d1b..89e69f9e6d 100644
--- a/modules/hw/vdpau/deinterlace.c
+++ b/modules/hw/vdpau/deinterlace.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/hw/vdpau/sharpen.c b/modules/hw/vdpau/sharpen.c
index 4aee7e3c40..c3534da540 100644
--- a/modules/hw/vdpau/sharpen.c
+++ b/modules/hw/vdpau/sharpen.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/keystore/file.c b/modules/keystore/file.c
index b607185583..10ff2deeed 100644
--- a/modules/keystore/file.c
+++ b/modules/keystore/file.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/modules/keystore/file_crypt_android.c b/modules/keystore/file_crypt_android.c
index 2cbe98154c..09cea6737b 100644
--- a/modules/keystore/file_crypt_android.c
+++ b/modules/keystore/file_crypt_android.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdarg.h>
diff --git a/modules/keystore/file_crypt_win32.c b/modules/keystore/file_crypt_win32.c
index ebbdcfc99f..6cce3dc3c3 100644
--- a/modules/keystore/file_crypt_win32.c
+++ b/modules/keystore/file_crypt_win32.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_keystore.h>
diff --git a/modules/keystore/keychain.m b/modules/keystore/keychain.m
index f5ccf36b63..0ab561f95e 100644
--- a/modules/keystore/keychain.m
+++ b/modules/keystore/keychain.m
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/keystore/kwallet.c b/modules/keystore/kwallet.c
index 98707ee247..53c0f8dad9 100644
--- a/modules/keystore/kwallet.c
+++ b/modules/keystore/kwallet.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/keystore/list_util.c b/modules/keystore/list_util.c
index 66de585a85..57f3617471 100644
--- a/modules/keystore/list_util.c
+++ b/modules/keystore/list_util.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/keystore/memory.c b/modules/keystore/memory.c
index 7981bc7ffc..bfd29e2d59 100644
--- a/modules/keystore/memory.c
+++ b/modules/keystore/memory.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/modules/keystore/secret.c b/modules/keystore/secret.c
index c590af7dc9..e71bd4c4df 100644
--- a/modules/keystore/secret.c
+++ b/modules/keystore/secret.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/logger/android.c b/modules/logger/android.c
index c5ddd5cdce..8f42380bd6 100644
--- a/modules/logger/android.c
+++ b/modules/logger/android.c
@@ -23,7 +23,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <android/log.h>
diff --git a/modules/logger/console.c b/modules/logger/console.c
index 8266906a4d..14bc5a524b 100644
--- a/modules/logger/console.c
+++ b/modules/logger/console.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdarg.h>
diff --git a/modules/logger/file.c b/modules/logger/file.c
index b31acde506..349b5a5c0e 100644
--- a/modules/logger/file.c
+++ b/modules/logger/file.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/logger/journal.c b/modules/logger/journal.c
index f28c57892d..ac5635f799 100644
--- a/modules/logger/journal.c
+++ b/modules/logger/journal.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdarg.h>
diff --git a/modules/logger/syslog.c b/modules/logger/syslog.c
index d9506a30aa..d7edec9b85 100644
--- a/modules/logger/syslog.c
+++ b/modules/logger/syslog.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/lua/extension.c b/modules/lua/extension.c
index 998ba5a0cd..c5a89b0ab0 100644
--- a/modules/lua/extension.c
+++ b/modules/lua/extension.c
@@ -25,7 +25,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "vlc.h"
diff --git a/modules/lua/extension_thread.c b/modules/lua/extension_thread.c
index 628d0c8375..2dde6ded45 100644
--- a/modules/lua/extension_thread.c
+++ b/modules/lua/extension_thread.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "vlc.h"
diff --git a/modules/lua/intf.c b/modules/lua/intf.c
index 409432e8ec..ba490fcde3 100644
--- a/modules/lua/intf.c
+++ b/modules/lua/intf.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <sys/types.h>
diff --git a/modules/lua/libs/configuration.c b/modules/lua/libs/configuration.c
index 27de94c30d..8ada223880 100644
--- a/modules/lua/libs/configuration.c
+++ b/modules/lua/libs/configuration.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/dialog.c b/modules/lua/libs/dialog.c
index 57d349311b..e7969453f6 100644
--- a/modules/lua/libs/dialog.c
+++ b/modules/lua/libs/dialog.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/equalizer.c b/modules/lua/libs/equalizer.c
index 50f6df0248..046d225bdf 100644
--- a/modules/lua/libs/equalizer.c
+++ b/modules/lua/libs/equalizer.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/errno.c b/modules/lua/libs/errno.c
index 09824be648..68e70035d3 100644
--- a/modules/lua/libs/errno.c
+++ b/modules/lua/libs/errno.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/modules/lua/libs/gettext.c b/modules/lua/libs/gettext.c
index 3b7db153cc..82888f90c2 100644
--- a/modules/lua/libs/gettext.c
+++ b/modules/lua/libs/gettext.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "../vlc.h"
diff --git a/modules/lua/libs/httpd.c b/modules/lua/libs/httpd.c
index 9733df9a2b..15247aa889 100644
--- a/modules/lua/libs/httpd.c
+++ b/modules/lua/libs/httpd.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/input.c b/modules/lua/libs/input.c
index 9cae145854..f0199002be 100644
--- a/modules/lua/libs/input.c
+++ b/modules/lua/libs/input.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/io.c b/modules/lua/libs/io.c
index 12267e1822..b79de2a545 100644
--- a/modules/lua/libs/io.c
+++ b/modules/lua/libs/io.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/modules/lua/libs/messages.c b/modules/lua/libs/messages.c
index 33d3f8c813..a61b0511c8 100644
--- a/modules/lua/libs/messages.c
+++ b/modules/lua/libs/messages.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/misc.c b/modules/lua/libs/misc.c
index 10869afe49..4efd01d7cc 100644
--- a/modules/lua/libs/misc.c
+++ b/modules/lua/libs/misc.c
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/modules/lua/libs/net.c b/modules/lua/libs/net.c
index 9df5ffa48e..0eb2b5e7a8 100644
--- a/modules/lua/libs/net.c
+++ b/modules/lua/libs/net.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/lua/libs/objects.c b/modules/lua/libs/objects.c
index 678ea826ce..65f01351cf 100644
--- a/modules/lua/libs/objects.c
+++ b/modules/lua/libs/objects.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/osd.c b/modules/lua/libs/osd.c
index 6aa3257e98..7f9dbf2331 100644
--- a/modules/lua/libs/osd.c
+++ b/modules/lua/libs/osd.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_vout.h>
diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c
index 956da0a677..2fdab6ba8e 100644
--- a/modules/lua/libs/playlist.c
+++ b/modules/lua/libs/playlist.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/rand.c b/modules/lua/libs/rand.c
index 4f7c764393..7278995da1 100644
--- a/modules/lua/libs/rand.c
+++ b/modules/lua/libs/rand.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/renderers.c b/modules/lua/libs/renderers.c
index 822b7ad237..b2c23de29e 100644
--- a/modules/lua/libs/renderers.c
+++ b/modules/lua/libs/renderers.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/sd.c b/modules/lua/libs/sd.c
index 7068ec8f90..62b31ed3a2 100644
--- a/modules/lua/libs/sd.c
+++ b/modules/lua/libs/sd.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/lua/libs/stream.c b/modules/lua/libs/stream.c
index 29ac68a177..204f5a34dc 100644
--- a/modules/lua/libs/stream.c
+++ b/modules/lua/libs/stream.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/strings.c b/modules/lua/libs/strings.c
index 7862bc91f9..13d4fedf41 100644
--- a/modules/lua/libs/strings.c
+++ b/modules/lua/libs/strings.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/variables.c b/modules/lua/libs/variables.c
index a6586a07b0..34b810f101 100644
--- a/modules/lua/libs/variables.c
+++ b/modules/lua/libs/variables.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/lua/libs/video.c b/modules/lua/libs/video.c
index 8f14651994..1d7ace442f 100644
--- a/modules/lua/libs/video.c
+++ b/modules/lua/libs/video.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_vout.h>
diff --git a/modules/lua/libs/vlm.c b/modules/lua/libs/vlm.c
index eeb19b164d..a8bb690b4b 100644
--- a/modules/lua/libs/vlm.c
+++ b/modules/lua/libs/vlm.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/volume.c b/modules/lua/libs/volume.c
index ca0a1a9f70..ae4591b845 100644
--- a/modules/lua/libs/volume.c
+++ b/modules/lua/libs/volume.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/lua/libs/win.c b/modules/lua/libs/win.c
index c51f71c7f9..e7ebc2facb 100644
--- a/modules/lua/libs/win.c
+++ b/modules/lua/libs/win.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/libs/xml.c b/modules/lua/libs/xml.c
index 17e40d10c0..8097e6c56b 100644
--- a/modules/lua/libs/xml.c
+++ b/modules/lua/libs/xml.c
@@ -28,7 +28,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/lua/meta.c b/modules/lua/meta.c
index 01b3dcc57d..d527ae9a27 100644
--- a/modules/lua/meta.c
+++ b/modules/lua/meta.c
@@ -29,7 +29,7 @@
 #endif
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "vlc.h"
diff --git a/modules/lua/services_discovery.c b/modules/lua/services_discovery.c
index 2dc3621c3b..91fefc7023 100644
--- a/modules/lua/services_discovery.c
+++ b/modules/lua/services_discovery.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/lua/stream_filter.c b/modules/lua/stream_filter.c
index ecd4326ec2..ef40ddc1b8 100644
--- a/modules/lua/stream_filter.c
+++ b/modules/lua/stream_filter.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index 8238efdf52..70b010de48 100644
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 9d7e72b3f1..d84a9b76f3 100644
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <sys/stat.h>
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 480968edfd..6b6e7630f0 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/misc/addons/fsstorage.c b/modules/misc/addons/fsstorage.c
index b76bff7186..9491b8fd90 100644
--- a/modules/misc/addons/fsstorage.c
+++ b/modules/misc/addons/fsstorage.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/misc/addons/vorepository.c b/modules/misc/addons/vorepository.c
index 06f02ce239..e183aaf6d3 100644
--- a/modules/misc/addons/vorepository.c
+++ b/modules/misc/addons/vorepository.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index c7da3f2775..80e23e812a 100644
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -31,7 +31,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/misc/fingerprinter.c b/modules/misc/fingerprinter.c
index 3b51e5b23b..6705a1e8d0 100644
--- a/modules/misc/fingerprinter.c
+++ b/modules/misc/fingerprinter.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 49079d43d0..20cb9b19e8 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/misc/inhibit/iokit-inhibit.c b/modules/misc/inhibit/iokit-inhibit.c
index a361fe8bcb..a82dff8f61 100644
--- a/modules/misc/inhibit/iokit-inhibit.c
+++ b/modules/misc/inhibit/iokit-inhibit.c
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/misc/inhibit/xdg.c b/modules/misc/inhibit/xdg.c
index 016d014394..a4fea91ddb 100644
--- a/modules/misc/inhibit/xdg.c
+++ b/modules/misc/inhibit/xdg.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/misc/medialibrary/MetadataExtractor.cpp b/modules/misc/medialibrary/MetadataExtractor.cpp
index 0d6d969cc9..23b84d649a 100644
--- a/modules/misc/medialibrary/MetadataExtractor.cpp
+++ b/modules/misc/medialibrary/MetadataExtractor.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "medialibrary.h"
diff --git a/modules/misc/medialibrary/Thumbnailer.cpp b/modules/misc/medialibrary/Thumbnailer.cpp
index 51889e814e..07ef999dfa 100644
--- a/modules/misc/medialibrary/Thumbnailer.cpp
+++ b/modules/misc/medialibrary/Thumbnailer.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "medialibrary.h"
diff --git a/modules/misc/medialibrary/entities.cpp b/modules/misc/medialibrary/entities.cpp
index 02c106e4e1..2aa142fbf9 100644
--- a/modules/misc/medialibrary/entities.cpp
+++ b/modules/misc/medialibrary/entities.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "medialibrary.h"
diff --git a/modules/misc/medialibrary/fs/device.cpp b/modules/misc/medialibrary/fs/device.cpp
index b1baa25389..d9c2799a6b 100644
--- a/modules/misc/medialibrary/fs/device.cpp
+++ b/modules/misc/medialibrary/fs/device.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "device.h"
diff --git a/modules/misc/medialibrary/fs/devicelister.cpp b/modules/misc/medialibrary/fs/devicelister.cpp
index a93ce9bf37..06e0d96031 100644
--- a/modules/misc/medialibrary/fs/devicelister.cpp
+++ b/modules/misc/medialibrary/fs/devicelister.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #if HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "devicelister.h"
diff --git a/modules/misc/medialibrary/fs/directory.cpp b/modules/misc/medialibrary/fs/directory.cpp
index 50ef287217..60e3216e5d 100644
--- a/modules/misc/medialibrary/fs/directory.cpp
+++ b/modules/misc/medialibrary/fs/directory.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "directory.h"
diff --git a/modules/misc/medialibrary/fs/file.cpp b/modules/misc/medialibrary/fs/file.cpp
index daa77f99f9..48a02359f7 100644
--- a/modules/misc/medialibrary/fs/file.cpp
+++ b/modules/misc/medialibrary/fs/file.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "file.h"
diff --git a/modules/misc/medialibrary/fs/fs.cpp b/modules/misc/medialibrary/fs/fs.cpp
index 85323cb231..5053bf3fc5 100644
--- a/modules/misc/medialibrary/fs/fs.cpp
+++ b/modules/misc/medialibrary/fs/fs.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <algorithm>
diff --git a/modules/misc/medialibrary/fs/util.cpp b/modules/misc/medialibrary/fs/util.cpp
index f25f96d161..47e4cd9e91 100644
--- a/modules/misc/medialibrary/fs/util.cpp
+++ b/modules/misc/medialibrary/fs/util.cpp
@@ -17,7 +17,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "util.h"
diff --git a/modules/misc/medialibrary/medialib.cpp b/modules/misc/medialibrary/medialib.cpp
index 056f6be4a0..d3f41e2955 100644
--- a/modules/misc/medialibrary/medialib.cpp
+++ b/modules/misc/medialibrary/medialib.cpp
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/misc/playlist/export.c b/modules/misc/playlist/export.c
index f812d60026..8640597b3a 100644
--- a/modules/misc/playlist/export.c
+++ b/modules/misc/playlist/export.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/misc/playlist/html.c b/modules/misc/playlist/html.c
index ad731a5af9..cc4dd61313 100644
--- a/modules/misc/playlist/html.c
+++ b/modules/misc/playlist/html.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/misc/playlist/m3u.c b/modules/misc/playlist/m3u.c
index 8d3bfc5446..28049e93dd 100644
--- a/modules/misc/playlist/m3u.c
+++ b/modules/misc/playlist/m3u.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/misc/playlist/xspf.c b/modules/misc/playlist/xspf.c
index d03b22fa07..7db2dbdcd0 100644
--- a/modules/misc/playlist/xspf.c
+++ b/modules/misc/playlist/xspf.c
@@ -26,7 +26,7 @@
  * \brief XSPF playlist export functions
  */
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/misc/securetransport.c b/modules/misc/securetransport.c
index 228b8129b7..ce39440888 100644
--- a/modules/misc/securetransport.c
+++ b/modules/misc/securetransport.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/misc/stats.c b/modules/misc/stats.c
index c5377e3fbd..9502e1bb61 100644
--- a/modules/misc/stats.c
+++ b/modules/misc/stats.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Example usage:
diff --git a/modules/misc/webservices/acoustid.c b/modules/misc/webservices/acoustid.c
index 8a8bb98eb4..2854773ad7 100644
--- a/modules/misc/webservices/acoustid.c
+++ b/modules/misc/webservices/acoustid.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "json_helper.h"
diff --git a/modules/misc/webservices/musicbrainz.c b/modules/misc/webservices/musicbrainz.c
index 2393a7320a..40717179c7 100644
--- a/modules/misc/webservices/musicbrainz.c
+++ b/modules/misc/webservices/musicbrainz.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <string.h>
diff --git a/modules/misc/xml/libxml.c b/modules/misc/xml/libxml.c
index 14dd887532..dc53ff5592 100644
--- a/modules/misc/xml/libxml.c
+++ b/modules/misc/xml/libxml.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index 1f287745ca..f3a374557e 100644
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/mux/avi.c b/modules/mux/avi.c
index 844d983b42..6220733fb5 100644
--- a/modules/mux/avi.c
+++ b/modules/mux/avi.c
@@ -27,7 +27,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/dummy.c b/modules/mux/dummy.c
index d9600f41e9..58c4eb47a8 100644
--- a/modules/mux/dummy.c
+++ b/modules/mux/dummy.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/extradata.c b/modules/mux/extradata.c
index e0c7365044..e191be4171 100644
--- a/modules/mux/extradata.c
+++ b/modules/mux/extradata.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/mp4/libmp4mux.c b/modules/mux/mp4/libmp4mux.c
index be6f3e98f5..4cc92ed282 100644
--- a/modules/mux/mp4/libmp4mux.c
+++ b/modules/mux/mp4/libmp4mux.c
@@ -21,7 +21,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "libmp4mux.h"
diff --git a/modules/mux/mp4/mp4.c b/modules/mux/mp4/mp4.c
index b58a999dbe..f211ebdeb5 100644
--- a/modules/mux/mp4/mp4.c
+++ b/modules/mux/mp4/mp4.c
@@ -21,7 +21,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /*****************************************************************************
diff --git a/modules/mux/mpeg/csa.c b/modules/mux/mpeg/csa.c
index 19c2d6ad93..41f7e9dfa0 100644
--- a/modules/mux/mpeg/csa.c
+++ b/modules/mux/mpeg/csa.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/mpeg/pes.c b/modules/mux/mpeg/pes.c
index 98c05add41..425994c180 100644
--- a/modules/mux/mpeg/pes.c
+++ b/modules/mux/mpeg/pes.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/mpeg/ps.c b/modules/mux/mpeg/ps.c
index 4e969eb422..e71eba3881 100644
--- a/modules/mux/mpeg/ps.c
+++ b/modules/mux/mpeg/ps.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/mpeg/tables.c b/modules/mux/mpeg/tables.c
index 0d0580ed68..6e93e19669 100644
--- a/modules/mux/mpeg/tables.c
+++ b/modules/mux/mpeg/tables.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index d52289a325..3259e0a0e3 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/mux/mpeg/tsutil.c b/modules/mux/mpeg/tsutil.c
index 21668a0676..ecbb84af85 100644
--- a/modules/mux/mpeg/tsutil.c
+++ b/modules/mux/mpeg/tsutil.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index 5850d8a237..5391c5730b 100644
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 8f8b169665..4e098613b3 100644
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/mux/wav.c b/modules/mux/wav.c
index a80e916e89..a6e32ad542 100644
--- a/modules/mux/wav.c
+++ b/modules/mux/wav.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/notify/notify.c b/modules/notify/notify.c
index 138ec8225e..620ba33d87 100644
--- a/modules/notify/notify.c
+++ b/modules/notify/notify.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/notify/osx_notifications.m b/modules/notify/osx_notifications.m
index ab666d1714..67c1b6ae4d 100644
--- a/modules/notify/osx_notifications.m
+++ b/modules/notify/osx_notifications.m
@@ -28,7 +28,7 @@
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #import <Cocoa/Cocoa.h>
diff --git a/modules/packetizer/a52.c b/modules/packetizer/a52.c
index 15890af14b..2ba4e2277a 100644
--- a/modules/packetizer/a52.c
+++ b/modules/packetizer/a52.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/packetizer/av1.c b/modules/packetizer/av1.c
index 9782aaa3d5..fd8146c7e5 100644
--- a/modules/packetizer/av1.c
+++ b/modules/packetizer/av1.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/av1_obu.c b/modules/packetizer/av1_obu.c
index e99172bc23..9d08419edc 100644
--- a/modules/packetizer/av1_obu.c
+++ b/modules/packetizer/av1_obu.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/avparser.c b/modules/packetizer/avparser.c
index d498ff6eaa..602ea3dd1d 100644
--- a/modules/packetizer/avparser.c
+++ b/modules/packetizer/avparser.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/avparser.h b/modules/packetizer/avparser.h
index 320615a691..9a4ce28c2d 100644
--- a/modules/packetizer/avparser.h
+++ b/modules/packetizer/avparser.h
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c
index 2207bc73f0..86933fed40 100644
--- a/modules/packetizer/copy.c
+++ b/modules/packetizer/copy.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/dts.c b/modules/packetizer/dts.c
index 0500009d57..f20a63e8c0 100644
--- a/modules/packetizer/dts.c
+++ b/modules/packetizer/dts.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/dts_header.c b/modules/packetizer/dts_header.c
index 0eb64dfcfa..d21e2c53d2 100644
--- a/modules/packetizer/dts_header.c
+++ b/modules/packetizer/dts_header.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/flac.c b/modules/packetizer/flac.c
index e7556d87b1..455fb06b3d 100644
--- a/modules/packetizer/flac.c
+++ b/modules/packetizer/flac.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index ea4d2f994b..a8f67cd28b 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/h264_nal.c b/modules/packetizer/h264_nal.c
index 8233a3e6f7..e84c73f45d 100644
--- a/modules/packetizer/h264_nal.c
+++ b/modules/packetizer/h264_nal.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/packetizer/h264_slice.c b/modules/packetizer/h264_slice.c
index 5319957006..b626acba75 100644
--- a/modules/packetizer/h264_slice.c
+++ b/modules/packetizer/h264_slice.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/hevc.c b/modules/packetizer/hevc.c
index 4b3ee0d2bf..1b92ce8d63 100644
--- a/modules/packetizer/hevc.c
+++ b/modules/packetizer/hevc.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/hevc_nal.c b/modules/packetizer/hevc_nal.c
index 0f8daf263c..53bed55fed 100644
--- a/modules/packetizer/hevc_nal.c
+++ b/modules/packetizer/hevc_nal.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "hevc_nal.h"
diff --git a/modules/packetizer/hxxx_common.c b/modules/packetizer/hxxx_common.c
index 3ba7cbcb03..0d603e32ca 100644
--- a/modules/packetizer/hxxx_common.c
+++ b/modules/packetizer/hxxx_common.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/hxxx_nal.c b/modules/packetizer/hxxx_nal.c
index 7ccad55884..efdde99110 100644
--- a/modules/packetizer/hxxx_nal.c
+++ b/modules/packetizer/hxxx_nal.c
@@ -16,7 +16,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "hxxx_nal.h"
diff --git a/modules/packetizer/hxxx_sei.c b/modules/packetizer/hxxx_sei.c
index b6661f80b5..be93d97aad 100644
--- a/modules/packetizer/hxxx_sei.c
+++ b/modules/packetizer/hxxx_sei.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/mjpeg.c b/modules/packetizer/mjpeg.c
index fa015f3828..539c628f3e 100644
--- a/modules/packetizer/mjpeg.c
+++ b/modules/packetizer/mjpeg.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/mlp.c b/modules/packetizer/mlp.c
index 308e7fca04..01a3c3ddb3 100644
--- a/modules/packetizer/mlp.c
+++ b/modules/packetizer/mlp.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index f4c8895f60..39742db8be 100644
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c
index f2709f1206..b837e59272 100644
--- a/modules/packetizer/mpeg4video.c
+++ b/modules/packetizer/mpeg4video.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/mpegaudio.c b/modules/packetizer/mpegaudio.c
index 1398da0813..8a40967c08 100644
--- a/modules/packetizer/mpegaudio.c
+++ b/modules/packetizer/mpegaudio.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c
index 2388cc5488..800801067d 100644
--- a/modules/packetizer/mpegvideo.c
+++ b/modules/packetizer/mpegvideo.c
@@ -42,7 +42,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/packetizer/vc1.c b/modules/packetizer/vc1.c
index d8f43f3060..75c52e9538 100644
--- a/modules/packetizer/vc1.c
+++ b/modules/packetizer/vc1.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/services_discovery/avahi.c b/modules/services_discovery/avahi.c
index 77bb9f3711..ba88bdaf6d 100644
--- a/modules/services_discovery/avahi.c
+++ b/modules/services_discovery/avahi.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/services_discovery/mtp.c b/modules/services_discovery/mtp.c
index 6692effd29..e077474e0a 100644
--- a/modules/services_discovery/mtp.c
+++ b/modules/services_discovery/mtp.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 2e54af22b9..56ad4db4a6 100644
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 0bc85d85bc..c0d6f2e944 100644
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -26,7 +26,7 @@
  * Includes
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/services_discovery/upnp-wrapper.cpp b/modules/services_discovery/upnp-wrapper.cpp
index b8455a5b4a..b6232ebdaa 100644
--- a/modules/services_discovery/upnp-wrapper.cpp
+++ b/modules/services_discovery/upnp-wrapper.cpp
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef _WIN32
diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 054a5d1910..eb498ef4bd 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "upnp.hpp"
diff --git a/modules/spu/audiobargraph_v.c b/modules/spu/audiobargraph_v.c
index de3f9627a6..bcc18d1422 100644
--- a/modules/spu/audiobargraph_v.c
+++ b/modules/spu/audiobargraph_v.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <string.h>
 #include <math.h>
diff --git a/modules/spu/dynamicoverlay/dynamicoverlay.c b/modules/spu/dynamicoverlay/dynamicoverlay.c
index b038a2d66a..cee9c11268 100644
--- a/modules/spu/dynamicoverlay/dynamicoverlay.c
+++ b/modules/spu/dynamicoverlay/dynamicoverlay.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_buffer.c b/modules/spu/dynamicoverlay/dynamicoverlay_buffer.c
index ca7a2ef73b..10de048316 100644
--- a/modules/spu/dynamicoverlay/dynamicoverlay_buffer.c
+++ b/modules/spu/dynamicoverlay/dynamicoverlay_buffer.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
index 31160d2ec8..f1a025f39d 100644
--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_list.c b/modules/spu/dynamicoverlay/dynamicoverlay_list.c
index e8af8821dc..f9e5c9896d 100644
--- a/modules/spu/dynamicoverlay/dynamicoverlay_list.c
+++ b/modules/spu/dynamicoverlay/dynamicoverlay_list.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_queue.c b/modules/spu/dynamicoverlay/dynamicoverlay_queue.c
index 60d121aa3b..818f263eab 100644
--- a/modules/spu/dynamicoverlay/dynamicoverlay_queue.c
+++ b/modules/spu/dynamicoverlay/dynamicoverlay_queue.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/spu/logo.c b/modules/spu/logo.c
index c8d1b02445..c2a90a6276 100644
--- a/modules/spu/logo.c
+++ b/modules/spu/logo.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/spu/marq.c b/modules/spu/marq.c
index c370c5322d..d2258e2ffb 100644
--- a/modules/spu/marq.c
+++ b/modules/spu/marq.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/modules/spu/mosaic.c b/modules/spu/mosaic.c
index deecc74e73..fddfe98677 100644
--- a/modules/spu/mosaic.c
+++ b/modules/spu/mosaic.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/spu/rss.c b/modules/spu/rss.c
index 95f55e34a4..87c423c446 100644
--- a/modules/spu/rss.c
+++ b/modules/spu/rss.c
@@ -31,7 +31,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <time.h>
diff --git a/modules/spu/subsdelay.c b/modules/spu/subsdelay.c
index 70b2e9a332..63fb510f8e 100644
--- a/modules/spu/subsdelay.c
+++ b/modules/spu/subsdelay.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_extractor/archive.c b/modules/stream_extractor/archive.c
index f9493bbbd6..1680431928 100644
--- a/modules/stream_extractor/archive.c
+++ b/modules/stream_extractor/archive.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#  include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_filter/accesstweaks.c b/modules/stream_filter/accesstweaks.c
index 6e2c313759..2360b24370 100644
--- a/modules/stream_filter/accesstweaks.c
+++ b/modules/stream_filter/accesstweaks.c
@@ -22,7 +22,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_filter/adf.c b/modules/stream_filter/adf.c
index 71ccf1c305..1698d1ae4c 100644
--- a/modules/stream_filter/adf.c
+++ b/modules/stream_filter/adf.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_filter/aribcam.c b/modules/stream_filter/aribcam.c
index f1a3c61dc2..51e837441d 100644
--- a/modules/stream_filter/aribcam.c
+++ b/modules/stream_filter/aribcam.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_filter/cache_block.c b/modules/stream_filter/cache_block.c
index 4d6cb363bb..d4820ea725 100644
--- a/modules/stream_filter/cache_block.c
+++ b/modules/stream_filter/cache_block.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/stream_filter/cache_read.c b/modules/stream_filter/cache_read.c
index 046c1d9279..9b9dc7435a 100644
--- a/modules/stream_filter/cache_read.c
+++ b/modules/stream_filter/cache_read.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c
index ebd3929545..8873d9eab6 100644
--- a/modules/stream_filter/decomp.c
+++ b/modules/stream_filter/decomp.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_filter/hds/hds.c b/modules/stream_filter/hds/hds.c
index acdc7f9791..3fb3c086ab 100644
--- a/modules/stream_filter/hds/hds.c
+++ b/modules/stream_filter/hds/hds.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_filter/inflate.c b/modules/stream_filter/inflate.c
index 862cbddc31..554b5396c9 100644
--- a/modules/stream_filter/inflate.c
+++ b/modules/stream_filter/inflate.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/stream_filter/prefetch.c b/modules/stream_filter/prefetch.c
index 1ce217f02a..b52f94fa40 100644
--- a/modules/stream_filter/prefetch.c
+++ b/modules/stream_filter/prefetch.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/stream_filter/record.c b/modules/stream_filter/record.c
index b6bc9151c4..11eb530a59 100644
--- a/modules/stream_filter/record.c
+++ b/modules/stream_filter/record.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_filter/skiptags.c b/modules/stream_filter/skiptags.c
index 1097fc2764..f83b35a0b4 100644
--- a/modules/stream_filter/skiptags.c
+++ b/modules/stream_filter/skiptags.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/stream_out/autodel.c b/modules/stream_out/autodel.c
index 6c4ce40c60..5cf4e8bb13 100644
--- a/modules/stream_out/autodel.c
+++ b/modules/stream_out/autodel.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c
index 27e748bba1..e15c4fbde9 100644
--- a/modules/stream_out/bridge.c
+++ b/modules/stream_out/bridge.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c
index 6b9e029cfa..53499a3b52 100644
--- a/modules/stream_out/chromaprint.c
+++ b/modules/stream_out/chromaprint.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp
index 944bde923f..5fc799df5c 100644
--- a/modules/stream_out/chromecast/cast.cpp
+++ b/modules/stream_out/chromecast/cast.cpp
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "../renderer_common.hpp"
diff --git a/modules/stream_out/chromecast/chromecast_communication.cpp b/modules/stream_out/chromecast/chromecast_communication.cpp
index 347a15dbc6..9031d98c00 100644
--- a/modules/stream_out/chromecast/chromecast_communication.cpp
+++ b/modules/stream_out/chromecast/chromecast_communication.cpp
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "chromecast.h"
diff --git a/modules/stream_out/chromecast/chromecast_ctrl.cpp b/modules/stream_out/chromecast/chromecast_ctrl.cpp
index 34cdb6ae33..2ab2708437 100644
--- a/modules/stream_out/chromecast/chromecast_ctrl.cpp
+++ b/modules/stream_out/chromecast/chromecast_ctrl.cpp
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "chromecast.h"
diff --git a/modules/stream_out/chromecast/chromecast_demux.cpp b/modules/stream_out/chromecast/chromecast_demux.cpp
index 6bfc4fa9b0..d3010e29a1 100644
--- a/modules/stream_out/chromecast/chromecast_demux.cpp
+++ b/modules/stream_out/chromecast/chromecast_demux.cpp
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/delay.c b/modules/stream_out/delay.c
index 524dc9a65e..25002c8937 100644
--- a/modules/stream_out/delay.c
+++ b/modules/stream_out/delay.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index 4f9abe980c..6207c81864 100644
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/dlna/dlna.cpp b/modules/stream_out/dlna/dlna.cpp
index 44fcef90ec..21c9e86b21 100644
--- a/modules/stream_out/dlna/dlna.cpp
+++ b/modules/stream_out/dlna/dlna.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "dlna.hpp"
diff --git a/modules/stream_out/dummy.c b/modules/stream_out/dummy.c
index 07686fd1c8..3c0f5778e2 100644
--- a/modules/stream_out/dummy.c
+++ b/modules/stream_out/dummy.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c
index 516a852d18..256af91101 100644
--- a/modules/stream_out/duplicate.c
+++ b/modules/stream_out/duplicate.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index 70092e7034..d94fb72f0b 100644
--- a/modules/stream_out/es.c
+++ b/modules/stream_out/es.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/gather.c b/modules/stream_out/gather.c
index 4751bfdadd..40a2c503cf 100644
--- a/modules/stream_out/gather.c
+++ b/modules/stream_out/gather.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index 5171474320..60c9bf00ba 100644
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/record.c b/modules/stream_out/record.c
index ce2ce958e7..0d3f3f25f0 100644
--- a/modules/stream_out/record.c
+++ b/modules/stream_out/record.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/stream_out/renderer_common.cpp b/modules/stream_out/renderer_common.cpp
index f779ca0129..8c0d56377d 100644
--- a/modules/stream_out/renderer_common.cpp
+++ b/modules/stream_out/renderer_common.cpp
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/stream_out/rtcp.c b/modules/stream_out/rtcp.c
index d989efac44..79c48cedaf 100644
--- a/modules/stream_out/rtcp.c
+++ b/modules/stream_out/rtcp.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index e01a09127c..0e742f267f 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
diff --git a/modules/stream_out/rtpfmt.c b/modules/stream_out/rtpfmt.c
index 356abd4eb6..f15af9afe5 100644
--- a/modules/stream_out/rtpfmt.c
+++ b/modules/stream_out/rtpfmt.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c
index 8d79803c8e..eff5e48fec 100644
--- a/modules/stream_out/rtsp.c
+++ b/modules/stream_out/rtsp.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/sdi/AES3Audio.cpp b/modules/stream_out/sdi/AES3Audio.cpp
index 8bf95a11fa..b18c831d14 100644
--- a/modules/stream_out/sdi/AES3Audio.cpp
+++ b/modules/stream_out/sdi/AES3Audio.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "sdiout.hpp"
diff --git a/modules/stream_out/sdi/Ancillary.cpp b/modules/stream_out/sdi/Ancillary.cpp
index e260044a4d..4b6b0a3305 100644
--- a/modules/stream_out/sdi/Ancillary.cpp
+++ b/modules/stream_out/sdi/Ancillary.cpp
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "Ancillary.hpp"
diff --git a/modules/stream_out/sdi/DBMHelper.cpp b/modules/stream_out/sdi/DBMHelper.cpp
index 0ba92863d6..7e7255d68e 100644
--- a/modules/stream_out/sdi/DBMHelper.cpp
+++ b/modules/stream_out/sdi/DBMHelper.cpp
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/sdi/DBMSDIOutput.cpp b/modules/stream_out/sdi/DBMSDIOutput.cpp
index abd2559c5c..18db3a373e 100644
--- a/modules/stream_out/sdi/DBMSDIOutput.cpp
+++ b/modules/stream_out/sdi/DBMSDIOutput.cpp
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/sdi/SDIAudioMultiplex.cpp b/modules/stream_out/sdi/SDIAudioMultiplex.cpp
index a4ce26944a..f9922ca3bf 100644
--- a/modules/stream_out/sdi/SDIAudioMultiplex.cpp
+++ b/modules/stream_out/sdi/SDIAudioMultiplex.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SDIAudioMultiplex.hpp"
diff --git a/modules/stream_out/sdi/SDIGenerator.cpp b/modules/stream_out/sdi/SDIGenerator.cpp
index 726587431b..3f8b01d85c 100644
--- a/modules/stream_out/sdi/SDIGenerator.cpp
+++ b/modules/stream_out/sdi/SDIGenerator.cpp
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/sdi/SDIOutput.cpp b/modules/stream_out/sdi/SDIOutput.cpp
index 84fbe8cc89..20e40fa142 100644
--- a/modules/stream_out/sdi/SDIOutput.cpp
+++ b/modules/stream_out/sdi/SDIOutput.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SDIOutput.hpp"
diff --git a/modules/stream_out/sdi/SDIStream.cpp b/modules/stream_out/sdi/SDIStream.cpp
index ce4588d28c..83f5c195bc 100644
--- a/modules/stream_out/sdi/SDIStream.cpp
+++ b/modules/stream_out/sdi/SDIStream.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "SDIStream.hpp"
diff --git a/modules/stream_out/sdi/V210.cpp b/modules/stream_out/sdi/V210.cpp
index 872c40a61f..7b53ccf1d5 100644
--- a/modules/stream_out/sdi/V210.cpp
+++ b/modules/stream_out/sdi/V210.cpp
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "V210.hpp"
diff --git a/modules/stream_out/sdi/sdiout.cpp b/modules/stream_out/sdi/sdiout.cpp
index 56797a1fdb..7467298322 100644
--- a/modules/stream_out/sdi/sdiout.cpp
+++ b/modules/stream_out/sdi/sdiout.cpp
@@ -19,7 +19,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /*****************************************************************************
diff --git a/modules/stream_out/sdp_helper.c b/modules/stream_out/sdp_helper.c
index caa646b30b..5c8d49b69f 100644
--- a/modules/stream_out/sdp_helper.c
+++ b/modules/stream_out/sdp_helper.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <string.h>
diff --git a/modules/stream_out/setid.c b/modules/stream_out/setid.c
index 72eea63dc5..70b0dfdedb 100644
--- a/modules/stream_out/setid.c
+++ b/modules/stream_out/setid.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c
index 01e3ad565a..d640df700f 100644
--- a/modules/stream_out/smem.c
+++ b/modules/stream_out/smem.c
@@ -43,7 +43,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index eb76e70b94..c25d53028a 100644
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/stats.c b/modules/stream_out/stats.c
index ea262f42e8..a7c086bb9d 100644
--- a/modules/stream_out/stats.c
+++ b/modules/stream_out/stats.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index 79a2a1af4e..46b0898a9f 100644
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/transcode/encoder/audio.c b/modules/stream_out/transcode/encoder/audio.c
index 2aa0c78859..72a03f4407 100644
--- a/modules/stream_out/transcode/encoder/audio.c
+++ b/modules/stream_out/transcode/encoder/audio.c
@@ -24,7 +24,7 @@
  * along with this program; if not, If not, see https://www.gnu.org/licenses/
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/transcode/encoder/encoder.c b/modules/stream_out/transcode/encoder/encoder.c
index 2c89332663..851fd7511d 100644
--- a/modules/stream_out/transcode/encoder/encoder.c
+++ b/modules/stream_out/transcode/encoder/encoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, If not, see https://www.gnu.org/licenses/
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/transcode/encoder/spu.c b/modules/stream_out/transcode/encoder/spu.c
index 45f4bdf57e..23ea492b5d 100644
--- a/modules/stream_out/transcode/encoder/spu.c
+++ b/modules/stream_out/transcode/encoder/spu.c
@@ -24,7 +24,7 @@
  * along with this program; if not, If not, see https://www.gnu.org/licenses/
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/transcode/encoder/video.c b/modules/stream_out/transcode/encoder/video.c
index 4de9f3965a..ceaf513bff 100644
--- a/modules/stream_out/transcode/encoder/video.c
+++ b/modules/stream_out/transcode/encoder/video.c
@@ -24,7 +24,7 @@
  * along with this program; if not, If not, see https://www.gnu.org/licenses/
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c
index 832600d2b9..8bc9c1e50e 100644
--- a/modules/stream_out/transcode/spu.c
+++ b/modules/stream_out/transcode/spu.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 019deadc47..8aba235761 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -28,7 +28,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index dc07278e11..168f8f5e82 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/freetype/fonts/android.c b/modules/text_renderer/freetype/fonts/android.c
index 6712640d48..359ddc27a8 100644
--- a/modules/text_renderer/freetype/fonts/android.c
+++ b/modules/text_renderer/freetype/fonts/android.c
@@ -30,7 +30,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/freetype/fonts/darwin.c b/modules/text_renderer/freetype/fonts/darwin.c
index 53c8e5e724..4cc4804756 100644
--- a/modules/text_renderer/freetype/fonts/darwin.c
+++ b/modules/text_renderer/freetype/fonts/darwin.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/freetype/fonts/dwrite.cpp b/modules/text_renderer/freetype/fonts/dwrite.cpp
index 0b8250b4be..027c843756 100644
--- a/modules/text_renderer/freetype/fonts/dwrite.cpp
+++ b/modules/text_renderer/freetype/fonts/dwrite.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/freetype/fonts/fontconfig.c b/modules/text_renderer/freetype/fonts/fontconfig.c
index acc048d31c..c1503c96eb 100644
--- a/modules/text_renderer/freetype/fonts/fontconfig.c
+++ b/modules/text_renderer/freetype/fonts/fontconfig.c
@@ -30,7 +30,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/text_renderer/freetype/fonts/win32.c b/modules/text_renderer/freetype/fonts/win32.c
index 17cc85371b..c938cf6f36 100644
--- a/modules/text_renderer/freetype/fonts/win32.c
+++ b/modules/text_renderer/freetype/fonts/win32.c
@@ -36,7 +36,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c
index 5b5fc2d08f..866aa0d5ec 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -30,7 +30,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 
diff --git a/modules/text_renderer/freetype/freetype.h b/modules/text_renderer/freetype/freetype.h
index ee69304ab9..4514eba28a 100644
--- a/modules/text_renderer/freetype/freetype.h
+++ b/modules/text_renderer/freetype/freetype.h
@@ -35,7 +35,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_text_style.h>                             /* text_style_t */
diff --git a/modules/text_renderer/freetype/ftcache.c b/modules/text_renderer/freetype/ftcache.c
index f475c3c58e..1e2fdda6c3 100644
--- a/modules/text_renderer/freetype/ftcache.c
+++ b/modules/text_renderer/freetype/ftcache.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/freetype/lru.c b/modules/text_renderer/freetype/lru.c
index 226fd0510c..6f6b306c4c 100644
--- a/modules/text_renderer/freetype/lru.c
+++ b/modules/text_renderer/freetype/lru.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/freetype/platform_fonts.c b/modules/text_renderer/freetype/platform_fonts.c
index 180de9dd5e..871b4be87c 100644
--- a/modules/text_renderer/freetype/platform_fonts.c
+++ b/modules/text_renderer/freetype/platform_fonts.c
@@ -36,7 +36,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/freetype/platform_fonts.h b/modules/text_renderer/freetype/platform_fonts.h
index 7b91250e2b..7bfad11f8e 100644
--- a/modules/text_renderer/freetype/platform_fonts.h
+++ b/modules/text_renderer/freetype/platform_fonts.h
@@ -41,7 +41,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* Debug Stuff */
diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c
index baee972832..2446a90b91 100644
--- a/modules/text_renderer/freetype/text_layout.c
+++ b/modules/text_renderer/freetype/text_layout.c
@@ -35,7 +35,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/nsspeechsynthesizer.m b/modules/text_renderer/nsspeechsynthesizer.m
index 1b71c779ec..7497af54ea 100644
--- a/modules/text_renderer/nsspeechsynthesizer.m
+++ b/modules/text_renderer/nsspeechsynthesizer.m
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/sapi.cpp b/modules/text_renderer/sapi.cpp
index 874f5c8314..091acd2ae3 100644
--- a/modules/text_renderer/sapi.cpp
+++ b/modules/text_renderer/sapi.cpp
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 /* VLC core API headers */
diff --git a/modules/text_renderer/svg.c b/modules/text_renderer/svg.c
index f97c5fa3bf..9d32df51f9 100644
--- a/modules/text_renderer/svg.c
+++ b/modules/text_renderer/svg.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/text_renderer/tdummy.c b/modules/text_renderer/tdummy.c
index 3451c1068c..cfc951c41c 100644
--- a/modules/text_renderer/tdummy.c
+++ b/modules/text_renderer/tdummy.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c
index 7ec2798cc3..674c1901e2 100644
--- a/modules/video_chroma/chain.c
+++ b/modules/video_chroma/chain.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/copy.c b/modules/video_chroma/copy.c
index 2ad9d2b7a7..9436ad4d44 100644
--- a/modules/video_chroma/copy.c
+++ b/modules/video_chroma/copy.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef COPY_TEST
diff --git a/modules/video_chroma/cvpx.c b/modules/video_chroma/cvpx.c
index f3ece81632..83809a4497 100644
--- a/modules/video_chroma/cvpx.c
+++ b/modules/video_chroma/cvpx.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <QuartzCore/QuartzCore.h>
diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c
index 322320973b..e6773fa269 100644
--- a/modules/video_chroma/d3d11_fmt.c
+++ b/modules/video_chroma/d3d11_fmt.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/d3d9_fmt.c b/modules/video_chroma/d3d9_fmt.c
index d8c21fc41f..75d7b7ff2c 100644
--- a/modules/video_chroma/d3d9_fmt.c
+++ b/modules/video_chroma/d3d9_fmt.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_chroma/dxgi_fmt.c b/modules/video_chroma/dxgi_fmt.c
index fd42585608..b49b6c42c4 100644
--- a/modules/video_chroma/dxgi_fmt.c
+++ b/modules/video_chroma/dxgi_fmt.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_es.h>
diff --git a/modules/video_chroma/grey_yuv.c b/modules/video_chroma/grey_yuv.c
index 9796118241..601d30d0bc 100644
--- a/modules/video_chroma/grey_yuv.c
+++ b/modules/video_chroma/grey_yuv.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/i420_nv12.c b/modules/video_chroma/i420_nv12.c
index 53e1364adf..9e40e324cd 100644
--- a/modules/video_chroma/i420_nv12.c
+++ b/modules/video_chroma/i420_nv12.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index 24cc324731..e6bc57a214 100644
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/i420_rgb16.c b/modules/video_chroma/i420_rgb16.c
index 2db6497864..843a309e18 100644
--- a/modules/video_chroma/i420_rgb16.c
+++ b/modules/video_chroma/i420_rgb16.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/i420_rgb16_x86.c b/modules/video_chroma/i420_rgb16_x86.c
index 35d3272baf..fac9d5aaac 100644
--- a/modules/video_chroma/i420_rgb16_x86.c
+++ b/modules/video_chroma/i420_rgb16_x86.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/i420_rgb8.c b/modules/video_chroma/i420_rgb8.c
index 708f347363..f1717c0615 100644
--- a/modules/video_chroma/i420_rgb8.c
+++ b/modules/video_chroma/i420_rgb8.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index 966204f517..3c3263c437 100644
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/i422_i420.c b/modules/video_chroma/i422_i420.c
index e61ffce8f0..42343de3e0 100644
--- a/modules/video_chroma/i422_i420.c
+++ b/modules/video_chroma/i422_i420.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index 880be2cff7..74534bd332 100644
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/omxdl.c b/modules/video_chroma/omxdl.c
index 292fe950ea..33dec54467 100644
--- a/modules/video_chroma/omxdl.c
+++ b/modules/video_chroma/omxdl.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/rv32.c b/modules/video_chroma/rv32.c
index 9546872722..bb7be0912e 100644
--- a/modules/video_chroma/rv32.c
+++ b/modules/video_chroma/rv32.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
index 3c7bdf78ea..aa48d5c2ae 100644
--- a/modules/video_chroma/swscale.c
+++ b/modules/video_chroma/swscale.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/video_chroma/yuvp.c b/modules/video_chroma/yuvp.c
index b2eba4fda7..241ef99d96 100644
--- a/modules/video_chroma/yuvp.c
+++ b/modules/video_chroma/yuvp.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/yuy2_i420.c b/modules/video_chroma/yuy2_i420.c
index 93f3caaac2..7d67d5d69e 100644
--- a/modules/video_chroma/yuy2_i420.c
+++ b/modules/video_chroma/yuy2_i420.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_chroma/yuy2_i422.c b/modules/video_chroma/yuy2_i422.c
index e1c54b3162..ab40dbf5de 100644
--- a/modules/video_chroma/yuy2_i422.c
+++ b/modules/video_chroma/yuy2_i422.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index 063af77f22..b13e3f67d8 100644
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/video_filter/adjust_sat_hue.c b/modules/video_filter/adjust_sat_hue.c
index 6968fcad1b..a092dbb68c 100644
--- a/modules/video_filter/adjust_sat_hue.c
+++ b/modules/video_filter/adjust_sat_hue.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index 001f37185c..77150e9d8a 100644
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/anaglyph.c b/modules/video_filter/anaglyph.c
index b17bf7a525..d5c1692b6a 100644
--- a/modules/video_filter/anaglyph.c
+++ b/modules/video_filter/anaglyph.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/antiflicker.c b/modules/video_filter/antiflicker.c
index 568a84ae61..ac986cdad9 100644
--- a/modules/video_filter/antiflicker.c
+++ b/modules/video_filter/antiflicker.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/video_filter/ball.c b/modules/video_filter/ball.c
index 563ff8bedc..b2dd33e1ab 100644
--- a/modules/video_filter/ball.c
+++ b/modules/video_filter/ball.c
@@ -31,7 +31,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h> /* sin(), cos(), asin() */
diff --git a/modules/video_filter/blend.cpp b/modules/video_filter/blend.cpp
index b33aa084f3..464d6a579b 100644
--- a/modules/video_filter/blend.cpp
+++ b/modules/video_filter/blend.cpp
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c
index f288638531..5630b51ae4 100644
--- a/modules/video_filter/blendbench.c
+++ b/modules/video_filter/blendbench.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c
index 3fe83a1a5d..f3a42c9b88 100644
--- a/modules/video_filter/bluescreen.c
+++ b/modules/video_filter/bluescreen.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/canvas.c b/modules/video_filter/canvas.c
index 80010eecc1..d1f3ac5793 100644
--- a/modules/video_filter/canvas.c
+++ b/modules/video_filter/canvas.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/video_filter/ci_filters.m b/modules/video_filter/ci_filters.m
index 154fc44012..024263a21d 100644
--- a/modules/video_filter/ci_filters.m
+++ b/modules/video_filter/ci_filters.m
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index 3011b94f99..82b8d84c47 100644
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c
index 1d2f27fbe4..66442060db 100644
--- a/modules/video_filter/croppadd.c
+++ b/modules/video_filter/croppadd.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h> /* INT_MAX */
diff --git a/modules/video_filter/deinterlace/algo_basic.c b/modules/video_filter/deinterlace/algo_basic.c
index 8d675e01c6..a81558f8eb 100644
--- a/modules/video_filter/deinterlace/algo_basic.c
+++ b/modules/video_filter/deinterlace/algo_basic.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #include <stdint.h>
diff --git a/modules/video_filter/deinterlace/algo_ivtc.c b/modules/video_filter/deinterlace/algo_ivtc.c
index 2e6d09b69d..d6e142a3c2 100644
--- a/modules/video_filter/deinterlace/algo_ivtc.c
+++ b/modules/video_filter/deinterlace/algo_ivtc.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #ifdef CAN_COMPILE_MMXEXT
diff --git a/modules/video_filter/deinterlace/algo_phosphor.c b/modules/video_filter/deinterlace/algo_phosphor.c
index 289eed783b..7a9698e074 100644
--- a/modules/video_filter/deinterlace/algo_phosphor.c
+++ b/modules/video_filter/deinterlace/algo_phosphor.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #ifdef CAN_COMPILE_MMXEXT
diff --git a/modules/video_filter/deinterlace/algo_x.c b/modules/video_filter/deinterlace/algo_x.c
index 411351d1cd..d3429fbc4d 100644
--- a/modules/video_filter/deinterlace/algo_x.c
+++ b/modules/video_filter/deinterlace/algo_x.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #ifdef CAN_COMPILE_MMXEXT
diff --git a/modules/video_filter/deinterlace/algo_yadif.c b/modules/video_filter/deinterlace/algo_yadif.c
index 6fdecf53a5..0e6cfaafb3 100644
--- a/modules/video_filter/deinterlace/algo_yadif.c
+++ b/modules/video_filter/deinterlace/algo_yadif.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #include <stdint.h>
diff --git a/modules/video_filter/deinterlace/common.c b/modules/video_filter/deinterlace/common.c
index 94a6280e37..6909fd732e 100644
--- a/modules/video_filter/deinterlace/common.c
+++ b/modules/video_filter/deinterlace/common.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_picture.h>
diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index 1676a07f8c..5a035c5c92 100644
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_filter/deinterlace/helpers.c b/modules/video_filter/deinterlace/helpers.c
index a882a408c1..80a991c773 100644
--- a/modules/video_filter/deinterlace/helpers.c
+++ b/modules/video_filter/deinterlace/helpers.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #ifdef CAN_COMPILE_MMXEXT
diff --git a/modules/video_filter/deinterlace/merge.c b/modules/video_filter/deinterlace/merge.c
index 8d36479ca1..553c1dae09 100644
--- a/modules/video_filter/deinterlace/merge.c
+++ b/modules/video_filter/deinterlace/merge.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h
index f520c20252..57e59a2670 100644
--- a/modules/video_filter/deinterlace/yadif.h
+++ b/modules/video_filter/deinterlace/yadif.h
@@ -19,7 +19,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #define FFABS abs
diff --git a/modules/video_filter/edgedetection.c b/modules/video_filter/edgedetection.c
index 935189122f..183817bc10 100644
--- a/modules/video_filter/edgedetection.c
+++ b/modules/video_filter/edgedetection.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c
index 7e6683b14e..974d513bbd 100644
--- a/modules/video_filter/erase.c
+++ b/modules/video_filter/erase.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c
index 0e849642a9..bc6308684f 100644
--- a/modules/video_filter/extract.c
+++ b/modules/video_filter/extract.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/video_filter/fps.c b/modules/video_filter/fps.c
index 4e6a59dfd6..aff7ac2206 100644
--- a/modules/video_filter/fps.c
+++ b/modules/video_filter/fps.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/freeze.c b/modules/video_filter/freeze.c
index be5fde8e9d..14665ae1cc 100644
--- a/modules/video_filter/freeze.c
+++ b/modules/video_filter/freeze.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c
index 3a97dbcd34..9e4135d9a9 100644
--- a/modules/video_filter/gaussianblur.c
+++ b/modules/video_filter/gaussianblur.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/gradfun.c b/modules/video_filter/gradfun.c
index 093d207523..b05b420101 100644
--- a/modules/video_filter/gradfun.c
+++ b/modules/video_filter/gradfun.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c
index 22675305f5..22a8eef5dc 100644
--- a/modules/video_filter/gradient.c
+++ b/modules/video_filter/gradient.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>                                            /* sin(), cos() */
diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c
index 174de0a822..1178069fe1 100644
--- a/modules/video_filter/grain.c
+++ b/modules/video_filter/grain.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <math.h>
diff --git a/modules/video_filter/hqdn3d.c b/modules/video_filter/hqdn3d.c
index beb57974d8..908713528c 100644
--- a/modules/video_filter/hqdn3d.c
+++ b/modules/video_filter/hqdn3d.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c
index 67f96977c7..84abc96b05 100644
--- a/modules/video_filter/invert.c
+++ b/modules/video_filter/invert.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c
index e5582bbc0f..561ce2f070 100644
--- a/modules/video_filter/magnify.c
+++ b/modules/video_filter/magnify.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 #include <assert.h>
diff --git a/modules/video_filter/mirror.c b/modules/video_filter/mirror.c
index ab8f9dcdd0..c6c944c5ab 100644
--- a/modules/video_filter/mirror.c
+++ b/modules/video_filter/mirror.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c
index 4bd504598c..0f5dada8ce 100644
--- a/modules/video_filter/motionblur.c
+++ b/modules/video_filter/motionblur.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index 9906132a61..1853940099 100644
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/oldmovie.c b/modules/video_filter/oldmovie.c
index f7c6a710fc..c99450fc46 100644
--- a/modules/video_filter/oldmovie.c
+++ b/modules/video_filter/oldmovie.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp
index 1334cd4c36..dba2ffde25 100644
--- a/modules/video_filter/opencv_example.cpp
+++ b/modules/video_filter/opencv_example.cpp
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index 2ce695913f..3cb1c75446 100644
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/posterize.c b/modules/video_filter/posterize.c
index 91762a8591..94862b7ba5 100644
--- a/modules/video_filter/posterize.c
+++ b/modules/video_filter/posterize.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index bf0192de2b..9f6fd65ad6 100644
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -31,7 +31,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index 94c5764122..a683bb6e11 100644
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>                                            /* sin(), cos() */
diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c
index bef39368bc..1da9455950 100644
--- a/modules/video_filter/puzzle.c
+++ b/modules/video_filter/puzzle.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 
diff --git a/modules/video_filter/puzzle_bezier.c b/modules/video_filter/puzzle_bezier.c
index e97a7a7dde..a4a24cb382 100644
--- a/modules/video_filter/puzzle_bezier.c
+++ b/modules/video_filter/puzzle_bezier.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 
diff --git a/modules/video_filter/puzzle_lib.c b/modules/video_filter/puzzle_lib.c
index 2b58a2cc45..65df0212db 100644
--- a/modules/video_filter/puzzle_lib.c
+++ b/modules/video_filter/puzzle_lib.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 
diff --git a/modules/video_filter/puzzle_lib.h b/modules/video_filter/puzzle_lib.h
index 68d4be5ece..9da926a21c 100644
--- a/modules/video_filter/puzzle_lib.h
+++ b/modules/video_filter/puzzle_lib.h
@@ -31,7 +31,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 
diff --git a/modules/video_filter/puzzle_mgt.c b/modules/video_filter/puzzle_mgt.c
index bf2e7b5b79..c6338217d4 100644
--- a/modules/video_filter/puzzle_mgt.c
+++ b/modules/video_filter/puzzle_mgt.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 
diff --git a/modules/video_filter/puzzle_mgt.h b/modules/video_filter/puzzle_mgt.h
index 2a0ac95a12..545101de34 100644
--- a/modules/video_filter/puzzle_mgt.h
+++ b/modules/video_filter/puzzle_mgt.h
@@ -28,7 +28,7 @@
 #define VLC_LIB_PUZZLE_MGT_H 1
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 
diff --git a/modules/video_filter/puzzle_pce.c b/modules/video_filter/puzzle_pce.c
index db3ac1806c..1f3369ddab 100644
--- a/modules/video_filter/puzzle_pce.c
+++ b/modules/video_filter/puzzle_pce.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 
diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index a190c35003..f8373cac93 100644
--- a/modules/video_filter/ripple.c
+++ b/modules/video_filter/ripple.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>                                            /* sin(), cos() */
diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c
index 005ba96ec9..b6121d6858 100644
--- a/modules/video_filter/rotate.c
+++ b/modules/video_filter/rotate.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>                                            /* sin(), cos() */
diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c
index ef5189e2e1..eb18870017 100644
--- a/modules/video_filter/scale.c
+++ b/modules/video_filter/scale.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/scene.c b/modules/video_filter/scene.c
index 48ca076dfd..b7d87ee1fe 100644
--- a/modules/video_filter/scene.c
+++ b/modules/video_filter/scene.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/modules/video_filter/sepia.c b/modules/video_filter/sepia.c
index 9ca567c614..895d47fef1 100644
--- a/modules/video_filter/sepia.c
+++ b/modules/video_filter/sepia.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c
index 76972de44a..e7edd25147 100644
--- a/modules/video_filter/sharpen.c
+++ b/modules/video_filter/sharpen.c
@@ -33,7 +33,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c
index a9e8dcb147..f4a8ae482d 100644
--- a/modules/video_filter/transform.c
+++ b/modules/video_filter/transform.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 #include <limits.h>
 
diff --git a/modules/video_filter/vhs.c b/modules/video_filter/vhs.c
index 6d5c13db8e..4f9d0bc162 100644
--- a/modules/video_filter/vhs.c
+++ b/modules/video_filter/vhs.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#   include "config.h"
+#   include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c
index eae6c961b7..a6435e4979 100644
--- a/modules/video_filter/wave.c
+++ b/modules/video_filter/wave.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>                                            /* sin(), cos() */
diff --git a/modules/video_output/android/display.c b/modules/video_output/android/display.c
index 10ac60bb0a..a946feb184 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/android/utils.h b/modules/video_output/android/utils.h
index 69c5eaaceb..bb2b7aa1d5 100644
--- a/modules/video_output/android/utils.h
+++ b/modules/video_output/android/utils.h
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <jni.h>
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index d4a66c5e37..d4215233fa 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdbool.h>
diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index 587817d153..bac9ede3fd 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp
index 4f25dc6d01..189e37064a 100644
--- a/modules/video_output/decklink.cpp
+++ b/modules/video_output/decklink.cpp
@@ -27,7 +27,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_fixups.h>
diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 4ea44c154c..d42b82d810 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <signal.h>                                      /* SIGUSR1, SIGUSR2 */
diff --git a/modules/video_output/flaschen.c b/modules/video_output/flaschen.c
index ec515c9b8b..99aa17bee4 100644
--- a/modules/video_output/flaschen.c
+++ b/modules/video_output/flaschen.c
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index 07c8355d45..466f21a866 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -37,7 +37,7 @@
 #import <dlfcn.h>
 
 #ifdef HAVE_CONFIG_H
-# import "config.h"
+# import <config.h>
 #endif
 
 #import <vlc_common.h>
diff --git a/modules/video_output/kms.c b/modules/video_output/kms.c
index 9965f3a8ef..f8153fc286 100644
--- a/modules/video_output/kms.c
+++ b/modules/video_output/kms.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <fcntl.h>
diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c
index badef7a452..5e0c24d02b 100644
--- a/modules/video_output/kva.c
+++ b/modules/video_output/kva.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 9ce48deaaf..2ee49445b1 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -34,7 +34,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #import <Cocoa/Cocoa.h>
diff --git a/modules/video_output/opengl/filter.c b/modules/video_output/opengl/filter.c
index 819f5078aa..d0b604365e 100644
--- a/modules/video_output/opengl/filter.c
+++ b/modules/video_output/opengl/filter.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "filter_priv.h"
diff --git a/modules/video_output/opengl/filter_draw.c b/modules/video_output/opengl/filter_draw.c
index 885ae957b3..2588f50770 100644
--- a/modules/video_output/opengl/filter_draw.c
+++ b/modules/video_output/opengl/filter_draw.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/opengl/filters.c b/modules/video_output/opengl/filters.c
index 13088f44e9..fecc606150 100644
--- a/modules/video_output/opengl/filters.c
+++ b/modules/video_output/opengl/filters.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "filters.h"
diff --git a/modules/video_output/opengl/gl_api.c b/modules/video_output/opengl/gl_api.c
index 1264dde2a1..f44965091e 100644
--- a/modules/video_output/opengl/gl_api.c
+++ b/modules/video_output/opengl/gl_api.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "gl_api.h"
diff --git a/modules/video_output/opengl/gl_api.h b/modules/video_output/opengl/gl_api.h
index 49b46ae110..84a8a84349 100644
--- a/modules/video_output/opengl/gl_api.h
+++ b/modules/video_output/opengl/gl_api.h
@@ -23,7 +23,7 @@
 #define VLC_GL_API_H
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdbool.h>
diff --git a/modules/video_output/opengl/gl_util.c b/modules/video_output/opengl/gl_util.c
index c47a272acf..019378d7f6 100644
--- a/modules/video_output/opengl/gl_util.c
+++ b/modules/video_output/opengl/gl_util.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "gl_util.h"
diff --git a/modules/video_output/opengl/gl_util.h b/modules/video_output/opengl/gl_util.h
index a01d87c335..f7656330ca 100644
--- a/modules/video_output/opengl/gl_util.h
+++ b/modules/video_output/opengl/gl_util.h
@@ -23,7 +23,7 @@
 #define VLC_GL_UTIL_H
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/opengl/interop.c b/modules/video_output/opengl/interop.c
index 96d548519e..c4c45f9c40 100644
--- a/modules/video_output/opengl/interop.c
+++ b/modules/video_output/opengl/interop.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/opengl/interop_android.c b/modules/video_output/opengl/interop_android.c
index c5f654b95b..10d6b03b20 100644
--- a/modules/video_output/opengl/interop_android.c
+++ b/modules/video_output/opengl/interop_android.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifndef __ANDROID__
diff --git a/modules/video_output/opengl/interop_cvpx.c b/modules/video_output/opengl/interop_cvpx.c
index b7c0b47672..ed1cab70cb 100644
--- a/modules/video_output/opengl/interop_cvpx.c
+++ b/modules/video_output/opengl/interop_cvpx.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/opengl/interop_dxva2.c b/modules/video_output/opengl/interop_dxva2.c
index 2b32e93272..040486aec0 100644
--- a/modules/video_output/opengl/interop_dxva2.c
+++ b/modules/video_output/opengl/interop_dxva2.c
@@ -36,7 +36,7 @@
  *
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/opengl/interop_sw.c b/modules/video_output/opengl/interop_sw.c
index 9c36e09fcc..5c5b7debe2 100644
--- a/modules/video_output/opengl/interop_sw.c
+++ b/modules/video_output/opengl/interop_sw.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_output/opengl/interop_vaapi.c b/modules/video_output/opengl/interop_vaapi.c
index c7646eaed3..1b3be2c483 100644
--- a/modules/video_output/opengl/interop_vaapi.c
+++ b/modules/video_output/opengl/interop_vaapi.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_output/opengl/interop_vdpau.c b/modules/video_output/opengl/interop_vdpau.c
index 9919630ed7..5a6a50173e 100644
--- a/modules/video_output/opengl/interop_vdpau.c
+++ b/modules/video_output/opengl/interop_vdpau.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_output/opengl/renderer.c b/modules/video_output/opengl/renderer.c
index be93214917..2ec0eec07a 100644
--- a/modules/video_output/opengl/renderer.c
+++ b/modules/video_output/opengl/renderer.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "renderer.h"
diff --git a/modules/video_output/opengl/sampler.c b/modules/video_output/opengl/sampler.c
index 8588cd883c..400fe2ddfd 100644
--- a/modules/video_output/opengl/sampler.c
+++ b/modules/video_output/opengl/sampler.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "sampler_priv.h"
diff --git a/modules/video_output/opengl/sampler.h b/modules/video_output/opengl/sampler.h
index c3ddfd7204..65f8963042 100644
--- a/modules/video_output/opengl/sampler.h
+++ b/modules/video_output/opengl/sampler.h
@@ -22,7 +22,7 @@
 #define VLC_GL_SAMPLER_H
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/opengl/sub_renderer.c b/modules/video_output/opengl/sub_renderer.c
index 970067ce82..a3359fd653 100644
--- a/modules/video_output/opengl/sub_renderer.c
+++ b/modules/video_output/opengl/sub_renderer.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "sub_renderer.h"
diff --git a/modules/video_output/opengl/sub_renderer.h b/modules/video_output/opengl/sub_renderer.h
index 11d2ff89fe..1b4139fb9b 100644
--- a/modules/video_output/opengl/sub_renderer.h
+++ b/modules/video_output/opengl/sub_renderer.h
@@ -22,7 +22,7 @@
 #define VLC_SUB_RENDERER_H
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index ad3eba280b..bdade283fc 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -26,7 +26,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_output/vdummy.c b/modules/video_output/vdummy.c
index 91309cca24..60c0570df8 100644
--- a/modules/video_output/vdummy.c
+++ b/modules/video_output/vdummy.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/vgl.c b/modules/video_output/vgl.c
index 5302e3186f..5f129ff795 100644
--- a/modules/video_output/vgl.c
+++ b/modules/video_output/vgl.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index ce077db7a3..f47ab4f518 100644
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_output/vulkan/instance.c b/modules/video_output/vulkan/instance.c
index 3cafa5a571..f5e1e0f19d 100644
--- a/modules/video_output/vulkan/instance.c
+++ b/modules/video_output/vulkan/instance.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/vulkan/platform_win32.c b/modules/video_output/vulkan/platform_win32.c
index 5f03c41c52..c75c3dd3d2 100644
--- a/modules/video_output/vulkan/platform_win32.c
+++ b/modules/video_output/vulkan/platform_win32.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "platform.h"
diff --git a/modules/video_output/vulkan/surface.c b/modules/video_output/vulkan/surface.c
index 64fd5d8bde..6943b3cbc8 100644
--- a/modules/video_output/vulkan/surface.c
+++ b/modules/video_output/vulkan/surface.c
@@ -24,7 +24,7 @@
 #include <assert.h>
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c
index ea2cbf9d82..2e4aad30ff 100644
--- a/modules/video_output/win32/common.c
+++ b/modules/video_output/win32/common.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/win32/d3d11_quad.c b/modules/video_output/win32/d3d11_quad.c
index 6fff189ed7..285ff56bf6 100644
--- a/modules/video_output/win32/d3d11_quad.c
+++ b/modules/video_output/win32/d3d11_quad.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0601 // _WIN32_WINNT_WIN7
diff --git a/modules/video_output/win32/d3d11_shaders.c b/modules/video_output/win32/d3d11_shaders.c
index 8f718b933c..3762ee788c 100644
--- a/modules/video_output/win32/d3d11_shaders.c
+++ b/modules/video_output/win32/d3d11_shaders.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0601 // _WIN32_WINNT_WIN7
diff --git a/modules/video_output/win32/d3d11_swapchain.c b/modules/video_output/win32/d3d11_swapchain.c
index efeb69b205..cf23aa31c9 100644
--- a/modules/video_output/win32/d3d11_swapchain.c
+++ b/modules/video_output/win32/d3d11_swapchain.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/libvlc.h>
diff --git a/modules/video_output/win32/dcomp_wrapper.cpp b/modules/video_output/win32/dcomp_wrapper.cpp
index a0f0ed7e25..8d0dd4d032 100644
--- a/modules/video_output/win32/dcomp_wrapper.cpp
+++ b/modules/video_output/win32/dcomp_wrapper.cpp
@@ -16,7 +16,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef WINAPI_FAMILY
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index c4a020fb06..658bc48a91 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0601 // _WIN32_WINNT_WIN7
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index 55235f63d6..68db572626 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -36,7 +36,7 @@
  *
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/win32/events.c b/modules/video_output/win32/events.c
index ad6effbcf3..989d65df4c 100644
--- a/modules/video_output/win32/events.c
+++ b/modules/video_output/win32/events.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "win32touch.h"
diff --git a/modules/video_output/win32/glwin32.c b/modules/video_output/win32/glwin32.c
index 627a33ccc4..65917171c7 100644
--- a/modules/video_output/win32/glwin32.c
+++ b/modules/video_output/win32/glwin32.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/video_output/win32/inhibit.c b/modules/video_output/win32/inhibit.c
index 3dac8113dd..35271606f6 100644
--- a/modules/video_output/win32/inhibit.c
+++ b/modules/video_output/win32/inhibit.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/win32/sensors.cpp b/modules/video_output/win32/sensors.cpp
index 34794ef6d2..ee30ef03b9 100644
--- a/modules/video_output/win32/sensors.cpp
+++ b/modules/video_output/win32/sensors.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "events.h"
diff --git a/modules/video_output/win32/wgl.c b/modules/video_output/win32/wgl.c
index ec02c2dc6e..60a919cd46 100644
--- a/modules/video_output/win32/wgl.c
+++ b/modules/video_output/win32/wgl.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/win32/win32touch.c b/modules/video_output/win32/win32touch.c
index 809c1d4011..3e58e64ce5 100644
--- a/modules/video_output/win32/win32touch.c
+++ b/modules/video_output/win32/win32touch.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "win32touch.h"
diff --git a/modules/video_output/win32/win32touch.h b/modules/video_output/win32/win32touch.h
index ea854282bf..97d6393a82 100644
--- a/modules/video_output/win32/win32touch.h
+++ b/modules/video_output/win32/win32touch.h
@@ -32,7 +32,7 @@
 # include <winuser.h>
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_output/win32/wingdi.c b/modules/video_output/win32/wingdi.c
index e25eed09e3..b8c004ac70 100644
--- a/modules/video_output/win32/wingdi.c
+++ b/modules/video_output/win32/wingdi.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c
index e7460a1d2f..53b7b074bd 100644
--- a/modules/video_output/yuv.c
+++ b/modules/video_output/yuv.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_splitter/clone.c b/modules/video_splitter/clone.c
index 6219a40320..89f46d257e 100644
--- a/modules/video_splitter/clone.c
+++ b/modules/video_splitter/clone.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/video_splitter/panoramix.c b/modules/video_splitter/panoramix.c
index 9790bb2c4a..c7f8aac7f1 100644
--- a/modules/video_splitter/panoramix.c
+++ b/modules/video_splitter/panoramix.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <math.h>
 #include <assert.h>
diff --git a/modules/video_splitter/wall.c b/modules/video_splitter/wall.c
index 7248e21f03..957472c792 100644
--- a/modules/video_splitter/wall.c
+++ b/modules/video_splitter/wall.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/modules/visualization/glspectrum.c b/modules/visualization/glspectrum.c
index 5ca0e75ded..917c345902 100644
--- a/modules/visualization/glspectrum.c
+++ b/modules/visualization/glspectrum.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index fa8f2cc197..eb58a170f1 100644
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
index f4b636fb23..677c48b68e 100644
--- a/modules/visualization/projectm.cpp
+++ b/modules/visualization/projectm.cpp
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/visualization/visual/effects.c b/modules/visualization/visual/effects.c
index 06b9d0136e..aa8038ce18 100644
--- a/modules/visualization/visual/effects.c
+++ b/modules/visualization/visual/effects.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c
index db693dfbcd..31770d1b1e 100644
--- a/modules/visualization/visual/visual.c
+++ b/modules/visualization/visual/visual.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/modules/visualization/visual/window.c b/modules/visualization/visual/window.c
index 081810bc37..d57004cf93 100644
--- a/modules/visualization/visual/window.c
+++ b/modules/visualization/visual/window.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/modules/visualization/vsxu.cpp b/modules/visualization/vsxu.cpp
index dbbb061ecf..fecb8eb304 100644
--- a/modules/visualization/vsxu.cpp
+++ b/modules/visualization/vsxu.cpp
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/android/error.c b/src/android/error.c
index f4e363738e..add2ec77c1 100644
--- a/src/android/error.c
+++ b/src/android/error.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <string.h>
diff --git a/src/android/specific.c b/src/android/specific.c
index 45e6249944..c946a5f4cf 100644
--- a/src/android/specific.c
+++ b/src/android/specific.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/android/thread.c b/src/android/thread.c
index 49d52b838a..e8821a125a 100644
--- a/src/android/thread.c
+++ b/src/android/thread.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 9ed3a82546..90be900f0c 100644
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 45c9b2cda8..b16151f80b 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c
index b089ec930c..c18e3c19d1 100644
--- a/src/audio_output/filters.c
+++ b/src/audio_output/filters.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <math.h>
diff --git a/src/audio_output/meter.c b/src/audio_output/meter.c
index 3cfc1158ab..c0af2ebd8a 100644
--- a/src/audio_output/meter.c
+++ b/src/audio_output/meter.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 1d4c01421d..c1fd2169fd 100644
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/audio_output/volume.c b/src/audio_output/volume.c
index 4403e19bf7..08aa709ee5 100644
--- a/src/audio_output/volume.c
+++ b/src/audio_output/volume.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/src/clock/clock.c b/src/clock/clock.c
index cfbb5eb6f6..1898876532 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/clock/clock_internal.c b/src/clock/clock_internal.c
index 3352f3f7ec..227145606b 100644
--- a/src/clock/clock_internal.c
+++ b/src/clock/clock_internal.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "clock_internal.h"
diff --git a/src/clock/input_clock.c b/src/clock/input_clock.c
index b5472b3385..56f972fb98 100644
--- a/src/clock/input_clock.c
+++ b/src/clock/input_clock.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/config/chain.c b/src/config/chain.c
index 8e2e5f91aa..73dbe21438 100644
--- a/src/config/chain.c
+++ b/src/config/chain.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/config/cmdline.c b/src/config/cmdline.c
index dbe5ed0b33..7f48cfab36 100644
--- a/src/config/cmdline.c
+++ b/src/config/cmdline.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/config/core.c b/src/config/core.c
index cda59eb75d..ac80348d18 100644
--- a/src/config/core.c
+++ b/src/config/core.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/config/file.c b/src/config/file.c
index e13ead63af..97011cbad5 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>                                                  /* errno */
diff --git a/src/config/help.c b/src/config/help.c
index c64f07059d..2756e65a74 100644
--- a/src/config/help.c
+++ b/src/config/help.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/config/intf.c b/src/config/intf.c
index 14bb1d894d..de649fdc4a 100644
--- a/src/config/intf.c
+++ b/src/config/intf.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/darwin/dirs.m b/src/darwin/dirs.m
index 3a300a5824..e8516e08d5 100644
--- a/src/darwin/dirs.m
+++ b/src/darwin/dirs.m
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/darwin/error.c b/src/darwin/error.c
index e51b912b95..c0e2135c26 100644
--- a/src/darwin/error.c
+++ b/src/darwin/error.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/darwin/netconf.m b/src/darwin/netconf.m
index cee0116fb2..a52b772ab2 100644
--- a/src/darwin/netconf.m
+++ b/src/darwin/netconf.m
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/darwin/specific.c b/src/darwin/specific.c
index 48d69ae8a7..e58c4a6d3a 100644
--- a/src/darwin/specific.c
+++ b/src/darwin/specific.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/extras/libc.c b/src/extras/libc.c
index 6503664050..7d4543d2e1 100644
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/freebsd/thread.c b/src/freebsd/thread.c
index 49425a462b..2b0130f148 100644
--- a/src/freebsd/thread.c
+++ b/src/freebsd/thread.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/input/access.c b/src/input/access.c
index fc3f12115a..d675418ed4 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 795a298b6c..d7df6bbd0e 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <stdatomic.h>
diff --git a/src/input/decoder_helpers.c b/src/input/decoder_helpers.c
index 8818d55f88..db6dd0c167 100644
--- a/src/input/decoder_helpers.c
+++ b/src/input/decoder_helpers.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/input/demux.c b/src/input/demux.c
index 8ea4e45073..b8cdf324d1 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/input/demux_chained.c b/src/input/demux_chained.c
index c8c436daec..d3f0187492 100644
--- a/src/input/demux_chained.c
+++ b/src/input/demux_chained.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/input/es_out.c b/src/input/es_out.c
index e4b840ed75..bcb03f5574 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/input/es_out_source.c b/src/input/es_out_source.c
index 41bb3a1561..2450223361 100644
--- a/src/input/es_out_source.c
+++ b/src/input/es_out_source.c
@@ -22,7 +22,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 8ffa1ea400..fb624062ed 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/input/input.c b/src/input/input.c
index f8b52d8b9c..ef79f2a3fb 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/input/item.c b/src/input/item.c
index 44db7acb0b..7f7e6d3d2f 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <time.h>
diff --git a/src/input/meta.c b/src/input/meta.c
index e5d829222f..3bbb87392b 100644
--- a/src/input/meta.c
+++ b/src/input/meta.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/input/resource.c b/src/input/resource.c
index be870f78a2..cbb9485aab 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/input/services_discovery.c b/src/input/services_discovery.c
index dbb6d5934d..60aa1d4e5e 100644
--- a/src/input/services_discovery.c
+++ b/src/input/services_discovery.c
@@ -20,7 +20,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/src/input/stats.c b/src/input/stats.c
index 79a4093815..86a034bb1c 100644
--- a/src/input/stats.c
+++ b/src/input/stats.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/input/stream.c b/src/input/stream.c
index 802d1a726b..f50b52a4bc 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/input/stream_extractor.c b/src/input/stream_extractor.c
index 4438afbcd2..a1e20ead56 100644
--- a/src/input/stream_extractor.c
+++ b/src/input/stream_extractor.c
@@ -22,7 +22,7 @@
 #define STREAM_EXTRACTOR_H
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#  include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/input/stream_fifo.c b/src/input/stream_fifo.c
index 47de2b3a24..e600d7744c 100644
--- a/src/input/stream_fifo.c
+++ b/src/input/stream_fifo.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/input/stream_filter.c b/src/input/stream_filter.c
index b502de8fe6..3fedb9c3bb 100644
--- a/src/input/stream_filter.c
+++ b/src/input/stream_filter.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c
index 381d4250df..daadaa4343 100644
--- a/src/input/stream_memory.c
+++ b/src/input/stream_memory.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_input.h>
diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 25ebb52087..40ab5d4125 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -27,7 +27,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <ctype.h> /* isalnum() */
diff --git a/src/input/thumbnailer.c b/src/input/thumbnailer.c
index ffd8e282ef..5eee093668 100644
--- a/src/input/thumbnailer.c
+++ b/src/input/thumbnailer.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_thumbnailer.h>
diff --git a/src/input/var.c b/src/input/var.c
index b5de58afb6..529cd75204 100644
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/input/vlm.c b/src/input/vlm.c
index 4d50d723ed..d13ed16b62 100644
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/input/vlm_event.c b/src/input/vlm_event.c
index 086f968004..9f7e382d75 100644
--- a/src/input/vlm_event.c
+++ b/src/input/vlm_event.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c
index 616f956830..fd44c1aec3 100644
--- a/src/input/vlmshell.c
+++ b/src/input/vlmshell.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/interface/dialog.c b/src/interface/dialog.c
index 94501bb428..73815cc855 100644
--- a/src/interface/dialog.c
+++ b/src/interface/dialog.c
@@ -21,7 +21,7 @@
 
 /** @ingroup vlc_dialog */
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdarg.h>
diff --git a/src/interface/interface.c b/src/interface/interface.c
index 50f62f8656..f79b845a44 100644
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -33,7 +33,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <unistd.h>
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index e1ac07df41..0f09b0c715 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -27,7 +27,7 @@
 #define MODULE_NAME core
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/libvlc.c b/src/libvlc.c
index 40b8a871a2..a4463f357a 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -32,7 +32,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>                                              /* sprintf() */
diff --git a/src/linux/cpu.c b/src/linux/cpu.c
index 6ba11512ef..fcdb6433f1 100644
--- a/src/linux/cpu.c
+++ b/src/linux/cpu.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/linux/dirs.c b/src/linux/dirs.c
index d1ca152ab8..d7c3cc01b9 100644
--- a/src/linux/dirs.c
+++ b/src/linux/dirs.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/linux/filesystem.c b/src/linux/filesystem.c
index e94a60ec45..5109cfa8ed 100644
--- a/src/linux/filesystem.c
+++ b/src/linux/filesystem.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/src/linux/getaddrinfo.c b/src/linux/getaddrinfo.c
index 7c082d4e97..73dfbe5f8d 100644
--- a/src/linux/getaddrinfo.c
+++ b/src/linux/getaddrinfo.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/linux/thread.c b/src/linux/thread.c
index bd2596bade..ed66dc45f9 100644
--- a/src/linux/thread.c
+++ b/src/linux/thread.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/media_source/media_source.c b/src/media_source/media_source.c
index 1cffb3a62a..28761ff01a 100644
--- a/src/media_source/media_source.c
+++ b/src/media_source/media_source.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "media_source.h"
diff --git a/src/media_source/media_tree.c b/src/media_source/media_tree.c
index deff6fdadf..dc9ffbc047 100644
--- a/src/media_source/media_tree.c
+++ b/src/media_source/media_tree.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "media_tree.h"
diff --git a/src/media_source/test.c b/src/media_source/test.c
index 24ee580b36..697d55a225 100644
--- a/src/media_source/test.c
+++ b/src/media_source/test.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/misc/addons.c b/src/misc/addons.c
index 7ce5dbefd8..6957bab906 100644
--- a/src/misc/addons.c
+++ b/src/misc/addons.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/background_worker.c b/src/misc/background_worker.c
index 20642ecbe6..500a5110e9 100644
--- a/src/misc/background_worker.c
+++ b/src/misc/background_worker.c
@@ -17,7 +17,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#  include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/misc/block.c b/src/misc/block.c
index 74da567145..1f68188987 100644
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <sys/stat.h>
diff --git a/src/misc/cpu.c b/src/misc/cpu.c
index 4c59eb37a6..652b7d99a9 100644
--- a/src/misc/cpu.c
+++ b/src/misc/cpu.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/src/misc/epg.c b/src/misc/epg.c
index 7b410317cc..7dee073022 100644
--- a/src/misc/epg.c
+++ b/src/misc/epg.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/es_format.c b/src/misc/es_format.c
index fa092d5755..a668f8633c 100644
--- a/src/misc/es_format.c
+++ b/src/misc/es_format.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/misc/events.c b/src/misc/events.c
index e5472773ed..a669b08fcc 100644
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/exit.c b/src/misc/exit.c
index 86e5a69722..8573caed29 100644
--- a/src/misc/exit.c
+++ b/src/misc/exit.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/fifo.c b/src/misc/fifo.c
index 695b3243c1..50be728206 100644
--- a/src/misc/fifo.c
+++ b/src/misc/fifo.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/misc/filter.c b/src/misc/filter.c
index 23c5baef68..bd6002f349 100644
--- a/src/misc/filter.c
+++ b/src/misc/filter.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index c977e25cf1..f7f17ac997 100644
--- a/src/misc/filter_chain.c
+++ b/src/misc/filter_chain.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_filter.h>
diff --git a/src/misc/fingerprinter.c b/src/misc/fingerprinter.c
index 18e79956e9..3f15b91f1c 100644
--- a/src/misc/fingerprinter.c
+++ b/src/misc/fingerprinter.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 40aecdc1a7..af8bedc695 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/fourcc_gen.c b/src/misc/fourcc_gen.c
index 2eadf17023..71b41a3c0b 100644
--- a/src/misc/fourcc_gen.c
+++ b/src/misc/fourcc_gen.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-/* DO NOT include "config.h" here */
+/* DO NOT include <config.h> here */
 
 #include <assert.h>
 #include <stdbool.h>
diff --git a/src/misc/httpcookies.c b/src/misc/httpcookies.c
index 2049b1b62c..c09af00c0a 100644
--- a/src/misc/httpcookies.c
+++ b/src/misc/httpcookies.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/misc/image.c b/src/misc/image.c
index 7eec0b8e93..d8427621f0 100644
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -30,7 +30,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/src/misc/md5.c b/src/misc/md5.c
index 68657a4f0a..7475d9bba9 100644
--- a/src/misc/md5.c
+++ b/src/misc/md5.c
@@ -35,7 +35,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/misc/medialibrary.c b/src/misc/medialibrary.c
index 9af9515844..5f5ee76157 100644
--- a/src/misc/medialibrary.c
+++ b/src/misc/medialibrary.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/messages.c b/src/misc/messages.c
index 898e4be56f..0a06af8a28 100644
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/misc/mime.c b/src/misc/mime.c
index 07c9a54e8c..4a235bfad8 100644
--- a/src/misc/mime.c
+++ b/src/misc/mime.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 02b6d2830c..f97f1f6963 100644
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -29,7 +29,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 68af0a2313..0e0ded42f1 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -34,7 +34,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/objres.c b/src/misc/objres.c
index c96fb4a26d..7556d84dd5 100644
--- a/src/misc/objres.c
+++ b/src/misc/objres.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/misc/picture.c b/src/misc/picture.c
index 76df1bb807..04a6599a3a 100644
--- a/src/misc/picture.c
+++ b/src/misc/picture.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <limits.h>
diff --git a/src/misc/picture_fifo.c b/src/misc/picture_fifo.c
index c2f2df8734..ce15b57508 100644
--- a/src/misc/picture_fifo.c
+++ b/src/misc/picture_fifo.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/src/misc/picture_pool.c b/src/misc/picture_pool.c
index d2df4bf2eb..4a82a95535 100644
--- a/src/misc/picture_pool.c
+++ b/src/misc/picture_pool.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <limits.h>
diff --git a/src/misc/probe.c b/src/misc/probe.c
index c3f30d2481..676b10cafb 100644
--- a/src/misc/probe.c
+++ b/src/misc/probe.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/queue.c b/src/misc/queue.c
index 2ea374a5c1..8015f94062 100644
--- a/src/misc/queue.c
+++ b/src/misc/queue.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/misc/rand.c b/src/misc/rand.c
index 56afa7e1e9..c99a9012f9 100644
--- a/src/misc/rand.c
+++ b/src/misc/rand.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/renderer_discovery.c b/src/misc/renderer_discovery.c
index 6b35155387..1ba39a076f 100644
--- a/src/misc/renderer_discovery.c
+++ b/src/misc/renderer_discovery.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/misc/subpicture.c b/src/misc/subpicture.c
index 6dcd661810..9c5ca7b7e2 100644
--- a/src/misc/subpicture.c
+++ b/src/misc/subpicture.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/src/misc/text_style.c b/src/misc/text_style.c
index d61de0eeb0..5f21cb3c0f 100644
--- a/src/misc/text_style.c
+++ b/src/misc/text_style.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/threads.c b/src/misc/threads.c
index 8509a8f765..6c0a9d3e84 100644
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/misc/update.c b/src/misc/update.c
index a4c9349153..462af9b405 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -32,7 +32,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/misc/update_crypto.c b/src/misc/update_crypto.c
index f91bfe6b43..71f52c1fa0 100644
--- a/src/misc/update_crypto.c
+++ b/src/misc/update_crypto.c
@@ -30,7 +30,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <gcrypt.h>
diff --git a/src/misc/variables.c b/src/misc/variables.c
index 08b78ad9c6..1caf8926c0 100644
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef HAVE_SEARCH_H
diff --git a/src/misc/viewpoint.c b/src/misc/viewpoint.c
index b4fb5484af..a3c93aa37c 100644
--- a/src/misc/viewpoint.c
+++ b/src/misc/viewpoint.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_viewpoint.h>
diff --git a/src/misc/xml.c b/src/misc/xml.c
index 6afbec139c..12ba55b00f 100644
--- a/src/misc/xml.c
+++ b/src/misc/xml.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/missing.c b/src/missing.c
index 45fddf177f..0342171ab8 100644
--- a/src/missing.c
+++ b/src/missing.c
@@ -31,7 +31,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdnoreturn.h>
diff --git a/src/modules/bank.c b/src/modules/bank.c
index bfb391baa4..e2539b2cda 100644
--- a/src/modules/bank.c
+++ b/src/modules/bank.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/modules/cache.c b/src/modules/cache.c
index ae00727676..9ba9f57faa 100644
--- a/src/modules/cache.c
+++ b/src/modules/cache.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdalign.h>
diff --git a/src/modules/entry.c b/src/modules/entry.c
index 7d3c01ec6f..4453dc0973 100644
--- a/src/modules/entry.c
+++ b/src/modules/entry.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/modules/modules.c b/src/modules/modules.c
index bd7b79d456..271c1e7d57 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/modules/textdomain.c b/src/modules/textdomain.c
index fa9553d253..ae504d4a75 100644
--- a/src/modules/textdomain.c
+++ b/src/modules/textdomain.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c
index 14496d5b09..a0dd56fbd3 100644
--- a/src/network/getaddrinfo.c
+++ b/src/network/getaddrinfo.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/network/http_auth.c b/src/network/http_auth.c
index c8b4f61405..a51309d32a 100644
--- a/src/network/http_auth.c
+++ b/src/network/http_auth.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/network/httpd.c b/src/network/httpd.c
index 52c8e5bdf3..67b92c18de 100644
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/src/network/io.c b/src/network/io.c
index 5285edc169..4302a677ff 100644
--- a/src/network/io.c
+++ b/src/network/io.c
@@ -28,7 +28,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/network/stream.c b/src/network/stream.c
index 9d241e4f54..e0d2f70daa 100644
--- a/src/network/stream.c
+++ b/src/network/stream.c
@@ -27,7 +27,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef HAVE_POLL_H
diff --git a/src/network/tcp.c b/src/network/tcp.c
index 3caadab380..b20b73aaf7 100644
--- a/src/network/tcp.c
+++ b/src/network/tcp.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/network/tls.c b/src/network/tls.c
index a46c2728a1..e312d36d8c 100644
--- a/src/network/tls.c
+++ b/src/network/tls.c
@@ -25,7 +25,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef HAVE_POLL_H
diff --git a/src/network/udp.c b/src/network/udp.c
index f2361e3cd4..dda60cbd8f 100644
--- a/src/network/udp.c
+++ b/src/network/udp.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/os2/dirs.c b/src/os2/dirs.c
index 9c830c001c..2feb6a8570 100644
--- a/src/os2/dirs.c
+++ b/src/os2/dirs.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/os2/filesystem.c b/src/os2/filesystem.c
index 87a1f90b70..0743fc5433 100644
--- a/src/os2/filesystem.c
+++ b/src/os2/filesystem.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/os2/getaddrinfo.c b/src/os2/getaddrinfo.c
index 16c8c9868b..61523fd5dc 100644
--- a/src/os2/getaddrinfo.c
+++ b/src/os2/getaddrinfo.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/os2/netconf.c b/src/os2/netconf.c
index aa97f3519f..619eaa1579 100644
--- a/src/os2/netconf.c
+++ b/src/os2/netconf.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/os2/plugin.c b/src/os2/plugin.c
index 51627bf809..b024e5200d 100644
--- a/src/os2/plugin.c
+++ b/src/os2/plugin.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <string.h>
diff --git a/src/os2/rand.c b/src/os2/rand.c
index c214ac1757..e15b5c6d0a 100644
--- a/src/os2/rand.c
+++ b/src/os2/rand.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/os2/specific.c b/src/os2/specific.c
index 173e6325ef..3c713480f5 100644
--- a/src/os2/specific.c
+++ b/src/os2/specific.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/os2/thread.c b/src/os2/thread.c
index f4a155d80c..7e540b588d 100644
--- a/src/os2/thread.c
+++ b/src/os2/thread.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/player/aout.c b/src/player/aout.c
index 452b9b7d09..bd03c610d6 100644
--- a/src/player/aout.c
+++ b/src/player/aout.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/player/input.c b/src/player/input.c
index cf83337dc8..ff856df239 100644
--- a/src/player/input.c
+++ b/src/player/input.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/player/medialib.c b/src/player/medialib.c
index 8240ba671c..896f26a017 100644
--- a/src/player/medialib.c
+++ b/src/player/medialib.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/player/metadata.c b/src/player/metadata.c
index aafdcbed7e..12176845aa 100644
--- a/src/player/metadata.c
+++ b/src/player/metadata.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/player/osd.c b/src/player/osd.c
index fba7969354..256a3f959f 100644
--- a/src/player/osd.c
+++ b/src/player/osd.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/player/player.c b/src/player/player.c
index 1ee53e1005..543b60b2bd 100644
--- a/src/player/player.c
+++ b/src/player/player.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/player/timer.c b/src/player/timer.c
index 1be28b22f0..d08a8a4fcf 100644
--- a/src/player/timer.c
+++ b/src/player/timer.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/player/title.c b/src/player/title.c
index 5f6942ca68..93fbc143f8 100644
--- a/src/player/title.c
+++ b/src/player/title.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/player/track.c b/src/player/track.c
index 7a519a14aa..e088c0896c 100644
--- a/src/player/track.c
+++ b/src/player/track.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/player/vout.c b/src/player/vout.c
index cdfd3d9c8f..65ccab46fb 100644
--- a/src/player/vout.c
+++ b/src/player/vout.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/src/playlist/content.c b/src/playlist/content.c
index 7fba8cf388..95ae9e1439 100644
--- a/src/playlist/content.c
+++ b/src/playlist/content.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "content.h"
diff --git a/src/playlist/control.c b/src/playlist/control.c
index c4c859efa5..0233c699d1 100644
--- a/src/playlist/control.c
+++ b/src/playlist/control.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "control.h"
diff --git a/src/playlist/export.c b/src/playlist/export.c
index 011796ba25..9ca4d87ba4 100644
--- a/src/playlist/export.c
+++ b/src/playlist/export.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_playlist_export.h>
diff --git a/src/playlist/item.c b/src/playlist/item.c
index e4a1060e93..9b839ca0af 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "item.h"
diff --git a/src/playlist/notify.c b/src/playlist/notify.c
index 3b69dd1921..16c2a9fd9f 100644
--- a/src/playlist/notify.c
+++ b/src/playlist/notify.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "notify.h"
diff --git a/src/playlist/player.c b/src/playlist/player.c
index 1eaf8fff95..c7fb796834 100644
--- a/src/playlist/player.c
+++ b/src/playlist/player.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "player.h"
diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 4a1c3b38e1..0ea8028a45 100644
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "playlist.h"
diff --git a/src/playlist/preparse.c b/src/playlist/preparse.c
index 4c2d330528..6429df2a84 100644
--- a/src/playlist/preparse.c
+++ b/src/playlist/preparse.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "preparse.h"
diff --git a/src/playlist/randomizer.c b/src/playlist/randomizer.c
index 5c22a55486..efbaa4f3db 100644
--- a/src/playlist/randomizer.c
+++ b/src/playlist/randomizer.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef TEST_RANDOMIZER
diff --git a/src/playlist/request.c b/src/playlist/request.c
index a446745ccf..aa80854367 100644
--- a/src/playlist/request.c
+++ b/src/playlist/request.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "item.h"
diff --git a/src/playlist/shuffle.c b/src/playlist/shuffle.c
index efc644ff58..03d1573074 100644
--- a/src/playlist/shuffle.c
+++ b/src/playlist/shuffle.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/playlist/sort.c b/src/playlist/sort.c
index a85926d7d9..0adb6cf3f7 100644
--- a/src/playlist/sort.c
+++ b/src/playlist/sort.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/playlist/test.c b/src/playlist/test.c
index bb9290925c..75f40813bf 100644
--- a/src/playlist/test.c
+++ b/src/playlist/test.c
@@ -21,7 +21,7 @@
 #ifndef DOC
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/posix/dirs.c b/src/posix/dirs.c
index e8bf3160ea..238c742c00 100644
--- a/src/posix/dirs.c
+++ b/src/posix/dirs.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/posix/error.c b/src/posix/error.c
index db51004601..37f9f722b1 100644
--- a/src/posix/error.c
+++ b/src/posix/error.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <string.h>
diff --git a/src/posix/filesystem.c b/src/posix/filesystem.c
index 60a997d9e0..482a2a530b 100644
--- a/src/posix/filesystem.c
+++ b/src/posix/filesystem.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/posix/getaddrinfo.c b/src/posix/getaddrinfo.c
index c7f9bf07b5..e194f7a756 100644
--- a/src/posix/getaddrinfo.c
+++ b/src/posix/getaddrinfo.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/posix/netconf.c b/src/posix/netconf.c
index 4ec82612d9..2e98afa1c0 100644
--- a/src/posix/netconf.c
+++ b/src/posix/netconf.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/posix/picture.c b/src/posix/picture.c
index 65ad26d215..e57ce19634 100644
--- a/src/posix/picture.c
+++ b/src/posix/picture.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/posix/plugin.c b/src/posix/plugin.c
index dab304d9f4..0bdfd60846 100644
--- a/src/posix/plugin.c
+++ b/src/posix/plugin.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/posix/rand.c b/src/posix/rand.c
index bd0cdc4475..bbf41d8aba 100644
--- a/src/posix/rand.c
+++ b/src/posix/rand.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/posix/spawn.c b/src/posix/spawn.c
index 233bb01047..2926ce4c8f 100644
--- a/src/posix/spawn.c
+++ b/src/posix/spawn.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/posix/specific.c b/src/posix/specific.c
index d8ea097247..0389e87e4d 100644
--- a/src/posix/specific.c
+++ b/src/posix/specific.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/posix/thread.c b/src/posix/thread.c
index 69d2514bf2..af92f44fdc 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/posix/timer.c b/src/posix/timer.c
index d88df7d501..c67f73a0eb 100644
--- a/src/posix/timer.c
+++ b/src/posix/timer.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdatomic.h>
diff --git a/src/posix/wait.c b/src/posix/wait.c
index 3fa6890193..93d3da29d2 100644
--- a/src/posix/wait.c
+++ b/src/posix/wait.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/preparser/art.c b/src/preparser/art.c
index b7f0d48411..3095f15293 100644
--- a/src/preparser/art.c
+++ b/src/preparser/art.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <sys/stat.h>
diff --git a/src/preparser/fetcher.c b/src/preparser/fetcher.c
index d3016ca2b9..23ce02267c 100644
--- a/src/preparser/fetcher.c
+++ b/src/preparser/fetcher.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/preparser/preparser.c b/src/preparser/preparser.c
index ce2e7664f6..b4e8bf1c02 100644
--- a/src/preparser/preparser.c
+++ b/src/preparser/preparser.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index ba3f3343f5..8203aac5cd 100644
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index 2f2a522a37..54d36a9f62 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -27,7 +27,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/test/arrays.c b/src/test/arrays.c
index c138e1bc3f..58ee87ea25 100644
--- a/src/test/arrays.c
+++ b/src/test/arrays.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/src/test/block_test.c b/src/test/block_test.c
index 5c1a6b00d3..f287938df2 100644
--- a/src/test/block_test.c
+++ b/src/test/block_test.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/test/dictionary.c b/src/test/dictionary.c
index f9ca63c50d..4b163f3902 100644
--- a/src/test/dictionary.c
+++ b/src/test/dictionary.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/src/test/extensions.c b/src/test/extensions.c
index ab71111cad..d43525f1a8 100644
--- a/src/test/extensions.c
+++ b/src/test/extensions.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/src/test/i18n_atof.c b/src/test/i18n_atof.c
index 07cb5058a0..2c75dad53b 100644
--- a/src/test/i18n_atof.c
+++ b/src/test/i18n_atof.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/test/interrupt.c b/src/test/interrupt.c
index 808335575b..5a8b73e8d8 100644
--- a/src/test/interrupt.c
+++ b/src/test/interrupt.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/src/test/list.c b/src/test/list.c
index 583adc1f0d..242a262f10 100644
--- a/src/test/list.c
+++ b/src/test/list.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/test/mrl_helpers.c b/src/test/mrl_helpers.c
index 3439116fec..a0fabd1074 100644
--- a/src/test/mrl_helpers.c
+++ b/src/test/mrl_helpers.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/test/picture_pool.c b/src/test/picture_pool.c
index 9b43c25fdd..428d6643b3 100644
--- a/src/test/picture_pool.c
+++ b/src/test/picture_pool.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdbool.h>
diff --git a/src/test/sort.c b/src/test/sort.c
index b3bd944768..aad5eeefc0 100644
--- a/src/test/sort.c
+++ b/src/test/sort.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/test/thread.c b/src/test/thread.c
index 703bcc2afa..4747ca0576 100644
--- a/src/test/thread.c
+++ b/src/test/thread.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/test/timer.c b/src/test/timer.c
index a071bd93ee..b37813403a 100644
--- a/src/test/timer.c
+++ b/src/test/timer.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/test/url.c b/src/test/url.c
index 5f31047c2d..254441bad4 100644
--- a/src/test/url.c
+++ b/src/test/url.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/src/test/utf8.c b/src/test/utf8.c
index 7eef6c0857..48ea607132 100644
--- a/src/test/utf8.c
+++ b/src/test/utf8.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/test/vector.c b/src/test/vector.c
index d65f129c31..48824c0e29 100644
--- a/src/test/vector.c
+++ b/src/test/vector.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/src/test/xmlent.c b/src/test/xmlent.c
index e3d7f6b843..741f7ac9a3 100644
--- a/src/test/xmlent.c
+++ b/src/test/xmlent.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/text/charset.c b/src/text/charset.c
index 8c5f43dc94..185cbb6be7 100644
--- a/src/text/charset.c
+++ b/src/text/charset.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/text/filesystem.c b/src/text/filesystem.c
index 2f3b6470c8..783927fc3a 100644
--- a/src/text/filesystem.c
+++ b/src/text/filesystem.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/text/iso_lang.c b/src/text/iso_lang.c
index f90ec7feda..e5a51c30c4 100644
--- a/src/text/iso_lang.c
+++ b/src/text/iso_lang.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/src/text/memstream.c b/src/text/memstream.c
index 5b7e3ac4d0..983018b47c 100644
--- a/src/text/memstream.c
+++ b/src/text/memstream.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/text/strings.c b/src/text/strings.c
index 0c41c38bdc..ec9bb0a7fc 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -27,7 +27,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/text/unicode.c b/src/text/unicode.c
index 22b8b39c3f..6e6c9ae18e 100644
--- a/src/text/unicode.c
+++ b/src/text/unicode.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/text/url.c b/src/text/url.c
index f3a5b39515..c3024fe455 100644
--- a/src/text/url.c
+++ b/src/text/url.c
@@ -20,7 +20,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <errno.h>
diff --git a/src/version.c b/src/version.c
index 5a36ef576a..d63a7e3d18 100644
--- a/src/version.c
+++ b/src/version.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/video_output/control.c b/src/video_output/control.c
index 3b7fabb07e..3c65398768 100644
--- a/src/video_output/control.c
+++ b/src/video_output/control.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 37102b1fd0..560d74c68a 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <stdatomic.h>
diff --git a/src/video_output/inhibit.c b/src/video_output/inhibit.c
index 46bc5095e7..1d73eae914 100644
--- a/src/video_output/inhibit.c
+++ b/src/video_output/inhibit.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/video_output/interlacing.c b/src/video_output/interlacing.c
index 0f9a16956f..9b0fe9ea1d 100644
--- a/src/video_output/interlacing.c
+++ b/src/video_output/interlacing.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/src/video_output/snapshot.c b/src/video_output/snapshot.c
index aaa658c851..6f3a75dfd2 100644
--- a/src/video_output/snapshot.c
+++ b/src/video_output/snapshot.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/video_output/video_epg.c b/src/video_output/video_epg.c
index 447f105bf0..4c703a747c 100644
--- a/src/video_output/video_epg.c
+++ b/src/video_output/video_epg.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <time.h>
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 0117a3512c..33b94bf753 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -30,7 +30,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c
index d11e407889..617d8909ed 100644
--- a/src/video_output/video_text.c
+++ b/src/video_output/video_text.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/src/video_output/video_widgets.c b/src/video_output/video_widgets.c
index 9c7f67503e..f13167e844 100644
--- a/src/video_output/video_widgets.c
+++ b/src/video_output/video_widgets.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 6446fd916c..9893615585 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 8766e7b582..5429c987e7 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -26,7 +26,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 9d819f8a2d..b7aad36719 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/video_output/window.c b/src/video_output/window.c
index ff5435a185..637764a28f 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -24,7 +24,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/win32/dirs-uap.c b/src/win32/dirs-uap.c
index e1c7506961..6f763069f7 100644
--- a/src/win32/dirs-uap.c
+++ b/src/win32/dirs-uap.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define COBJMACROS
diff --git a/src/win32/dirs.c b/src/win32/dirs.c
index 90e02563a9..2f74a0873c 100644
--- a/src/win32/dirs.c
+++ b/src/win32/dirs.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifndef UNICODE
diff --git a/src/win32/error.c b/src/win32/error.c
index dd14dfa8c4..fe36614444 100644
--- a/src/win32/error.c
+++ b/src/win32/error.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdlib.h>
diff --git a/src/win32/filesystem.c b/src/win32/filesystem.c
index fb26d4ed0b..63bbbb95b1 100644
--- a/src/win32/filesystem.c
+++ b/src/win32/filesystem.c
@@ -25,7 +25,7 @@
  * Preamble
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/win32/netconf.c b/src/win32/netconf.c
index 8651092fef..8bc09bab17 100644
--- a/src/win32/netconf.c
+++ b/src/win32/netconf.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <string.h>
diff --git a/src/win32/plugin.c b/src/win32/plugin.c
index 482b1585c2..3f25c6bcfa 100644
--- a/src/win32/plugin.c
+++ b/src/win32/plugin.c
@@ -24,7 +24,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/win32/rand.c b/src/win32/rand.c
index 5a48522764..7f13ee73be 100644
--- a/src/win32/rand.c
+++ b/src/win32/rand.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/src/win32/specific.c b/src/win32/specific.c
index d58267ce4e..d3ebc020d7 100644
--- a/src/win32/specific.c
+++ b/src/win32/specific.c
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifndef UNICODE
diff --git a/src/win32/thread.c b/src/win32/thread.c
index 113e0c4199..e92f04f57f 100644
--- a/src/win32/thread.c
+++ b/src/win32/thread.c
@@ -26,7 +26,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #define _DECL_DLLMAIN
diff --git a/src/win32/timer.c b/src/win32/timer.c
index 4fe3d2b067..b140c92277 100644
--- a/src/win32/timer.c
+++ b/src/win32/timer.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/src/win32/winsock.c b/src/win32/winsock.c
index cac83fd5a1..a7e735ed55 100644
--- a/src/win32/winsock.c
+++ b/src/win32/winsock.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/test/iosvlc.m b/test/iosvlc.m
index 2752e5dc7b..70d8cc7398 100644
--- a/test/iosvlc.m
+++ b/test/iosvlc.m
@@ -22,7 +22,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #import <UIKit/UIKit.h>
diff --git a/test/libvlc/test.h b/test/libvlc/test.h
index b40d66d351..4eb84a7c58 100644
--- a/test/libvlc/test.h
+++ b/test/libvlc/test.h
@@ -29,7 +29,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <vlc/vlc.h>
 
diff --git a/test/modules/demux/dashuri.cpp b/test/modules/demux/dashuri.cpp
index 925665002f..2a8ae9d35a 100644
--- a/test/modules/demux/dashuri.cpp
+++ b/test/modules/demux/dashuri.cpp
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "../modules/demux/dash/mpd/TemplatedUri.cpp"
diff --git a/test/modules/demux/timestamps_filter.c b/test/modules/demux/timestamps_filter.c
index 6c5038ba25..ee55d648b1 100644
--- a/test/modules/demux/timestamps_filter.c
+++ b/test/modules/demux/timestamps_filter.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/test/modules/keystore/test.c b/test/modules/keystore/test.c
index 38e9ad9aab..51d0348cfc 100644
--- a/test/modules/keystore/test.c
+++ b/test/modules/keystore/test.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <vlc/vlc.h>
 
diff --git a/test/modules/misc/tls.c b/test/modules/misc/tls.c
index 8005c5dc86..64fca39398 100644
--- a/test/modules/misc/tls.c
+++ b/test/modules/misc/tls.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/test/modules/packetizer/h264.c b/test/modules/packetizer/h264.c
index b52ab3b4fb..32f246e997 100644
--- a/test/modules/packetizer/h264.c
+++ b/test/modules/packetizer/h264.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/vlc.h>
diff --git a/test/modules/packetizer/helpers.c b/test/modules/packetizer/helpers.c
index 0ef5e5db48..245dcb68f0 100644
--- a/test/modules/packetizer/helpers.c
+++ b/test/modules/packetizer/helpers.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/test/modules/packetizer/hevc.c b/test/modules/packetizer/hevc.c
index d049513754..9431b57d46 100644
--- a/test/modules/packetizer/hevc.c
+++ b/test/modules/packetizer/hevc.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/vlc.h>
diff --git a/test/modules/packetizer/hxxx.c b/test/modules/packetizer/hxxx.c
index 8cae9bfd86..64d3e7cd42 100644
--- a/test/modules/packetizer/hxxx.c
+++ b/test/modules/packetizer/hxxx.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #ifdef NDEBUG
diff --git a/test/modules/packetizer/mpegvideo.c b/test/modules/packetizer/mpegvideo.c
index a98bf1077c..1f5ee3ba3f 100644
--- a/test/modules/packetizer/mpegvideo.c
+++ b/test/modules/packetizer/mpegvideo.c
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc/vlc.h>
diff --git a/test/src/crypto/update.c b/test/src/crypto/update.c
index ac7def91ea..1f03383ac5 100644
--- a/test/src/crypto/update.c
+++ b/test/src/crypto/update.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>
diff --git a/test/src/input/common.c b/test/src/input/common.c
index 75112bd36d..b04afe9d30 100644
--- a/test/src/input/common.c
+++ b/test/src/input/common.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "../lib/libvlc_internal.h"
diff --git a/test/src/input/decoder.c b/test/src/input/decoder.c
index f91350835e..79cf9412f2 100644
--- a/test/src/input/decoder.c
+++ b/test/src/input/decoder.c
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <vlc_common.h>
diff --git a/test/src/input/demux-run.c b/test/src/input/demux-run.c
index 428552c02d..e6d33a0d13 100644
--- a/test/src/input/demux-run.c
+++ b/test/src/input/demux-run.c
@@ -26,7 +26,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <limits.h>
diff --git a/test/src/input/stream_fifo.c b/test/src/input/stream_fifo.c
index b725467df7..5631936181 100644
--- a/test/src/input/stream_fifo.c
+++ b/test/src/input/stream_fifo.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #undef NDEBUG
diff --git a/test/src/interface/dialog.c b/test/src/interface/dialog.c
index 62b9881285..a28b9b9f44 100644
--- a/test/src/interface/dialog.c
+++ b/test/src/interface/dialog.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <vlc/vlc.h>
 
diff --git a/test/src/media_source/media_source.c b/test/src/media_source/media_source.c
index 2b1b357373..5509813688 100644
--- a/test/src/media_source/media_source.c
+++ b/test/src/media_source/media_source.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include "../../libvlc/test.h"
diff --git a/test/src/misc/keystore.c b/test/src/misc/keystore.c
index d510b5d1cf..4b17883f98 100644
--- a/test/src/misc/keystore.c
+++ b/test/src/misc/keystore.c
@@ -19,7 +19,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 #include <vlc/vlc.h>
 
diff --git a/test/vlc-demux-libfuzzer.c b/test/vlc-demux-libfuzzer.c
index 44995d147d..763baf692b 100644
--- a/test/vlc-demux-libfuzzer.c
+++ b/test/vlc-demux-libfuzzer.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdint.h>
diff --git a/test/vlc-demux-run.c b/test/vlc-demux-run.c
index 3b8627a118..0283a2b2ce 100644
--- a/test/vlc-demux-run.c
+++ b/test/vlc-demux-run.c
@@ -25,7 +25,7 @@
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+# include <config.h>
 #endif
 
 #include <stdio.h>



More information about the vlc-devel mailing list