From 17ada6c55fea1289c60475872b9613c4abb173fe Mon Sep 17 00:00:00 2001
From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
Date: Tue, 4 Jul 2023 21:57:10 +0200
Subject: [PATCH] lib: avoid including config.h in headers

... and add it back where it was missing in a source file.

Also regroup the includes in libvlc_internal.h somewhat.
---
 lib/error.c                        | 4 ++++
 lib/libvlc_internal.h              | 6 +-----
 lib/media_list_internal.h          | 4 ----
 lib/media_player_internal.h        | 4 ----
 lib/renderer_discoverer_internal.h | 4 ----
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/lib/error.c b/lib/error.c
index cb2b6f1804..d107b1f2df 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -18,6 +18,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "libvlc_internal.h"
 
 #include <stdarg.h>
diff --git a/lib/libvlc_internal.h b/lib/libvlc_internal.h
index c626bdb4fb..b529ed74bb 100644
--- a/lib/libvlc_internal.h
+++ b/lib/libvlc_internal.h
@@ -24,17 +24,13 @@
 #ifndef _LIBVLC_INTERNAL_H
 #define _LIBVLC_INTERNAL_H 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc/libvlc.h>
 #include <vlc/libvlc_dialog.h>
 #include <vlc/libvlc_picture.h>
 #include <vlc/libvlc_media.h>
 #include <vlc/libvlc_events.h>
-#include <vlc_atomic.h>
 
+#include <vlc_atomic.h>
 #include <vlc_common.h>
 #include <vlc_arrays.h>
 #include <vlc_threads.h>
diff --git a/lib/media_list_internal.h b/lib/media_list_internal.h
index 900a8e1a1c..5b93337204 100644
--- a/lib/media_list_internal.h
+++ b/lib/media_list_internal.h
@@ -24,10 +24,6 @@
 #ifndef _LIBVLC_MEDIA_LIST_INTERNAL_H
 #define _LIBVLC_MEDIA_LIST_INTERNAL_H 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc/vlc.h>
 #include <vlc/libvlc_media.h>
 
diff --git a/lib/media_player_internal.h b/lib/media_player_internal.h
index 3453260a7e..7ce6c2c551 100644
--- a/lib/media_player_internal.h
+++ b/lib/media_player_internal.h
@@ -24,10 +24,6 @@
 #ifndef _LIBVLC_MEDIA_PLAYER_INTERNAL_H
 #define _LIBVLC_MEDIA_PLAYER_INTERNAL_H 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc/vlc.h>
 #include <vlc/libvlc_media.h>
 #include <vlc_input.h>
diff --git a/lib/renderer_discoverer_internal.h b/lib/renderer_discoverer_internal.h
index e84009b765..08caec606d 100644
--- a/lib/renderer_discoverer_internal.h
+++ b/lib/renderer_discoverer_internal.h
@@ -21,10 +21,6 @@
 #ifndef _LIBVLC_RENDERER_DISCOVERER_INTERNAL_H
 #define _LIBVLC_RENDERER_DISCOVERER_INTERNAL_H 1
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
 #include <vlc_renderer_discovery.h>
 
 vlc_renderer_item_t *