From fffe723fc4e3229e387f12dd2fe973ee8c7780c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com>
Date: Wed, 1 May 2024 19:43:17 +0200
Subject: [PATCH] various: move strings.h inclusion to common.h

---
 common/common.h             | 1 +
 common/tags.c               | 2 +-
 demux/demux_lavf.c          | 2 +-
 demux/demux_mf.c            | 1 -
 demux/demux_mkv_timeline.c  | 1 -
 demux/demux_playlist.c      | 1 -
 input/keycodes.c            | 1 -
 misc/bstr.c                 | 1 -
 misc/charset_conv.c         | 2 +-
 misc/language.c             | 1 -
 options/m_config_core.c     | 1 -
 options/m_config_frontend.c | 1 -
 player/external_files.c     | 1 -
 player/javascript.c         | 1 -
 player/loadfile.c           | 1 -
 player/lua.c                | 1 -
 player/scripting.c          | 1 -
 stream/stream.c             | 1 -
 stream/stream_bluray.c      | 1 -
 stream/stream_dvdnav.c      | 1 -
 video/out/opengl/common.c   | 1 -
 21 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/common/common.h b/common/common.h
index 44e9a1ba15..cfd610bbf3 100644
--- a/common/common.h
+++ b/common/common.h
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #if HAVE_POSIX || defined(__MINGW32__)
+#include <strings.h>
 #include <unistd.h>
 #endif
 
diff --git a/common/tags.c b/common/tags.c
index 43f557dd6c..67e428766a 100644
--- a/common/tags.c
+++ b/common/tags.c
@@ -17,9 +17,9 @@
 
 #include <stddef.h>
 #include <limits.h>
-#include <strings.h>
 #include <assert.h>
 #include <libavutil/dict.h>
+#include "common.h"
 #include "tags.h"
 #include "misc/bstr.h"
 
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 182642494e..94b1c893c5 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -21,7 +21,6 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 #include <assert.h>
 
@@ -41,6 +40,7 @@
 
 #include "audio/chmap_avchannel.h"
 
+#include "common/common.h"
 #include "common/msg.h"
 #include "common/tags.h"
 #include "common/av_common.h"
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 7b0f16baf4..d1e80a27a8 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -19,7 +19,6 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c
index 588699ad1e..c450462f88 100644
--- a/demux/demux_mkv_timeline.c
+++ b/demux/demux_mkv_timeline.c
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <dirent.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <libavutil/common.h>
diff --git a/demux/demux_playlist.c b/demux/demux_playlist.c
index 66be4b1270..251c8041e0 100644
--- a/demux/demux_playlist.c
+++ b/demux/demux_playlist.c
@@ -17,7 +17,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #include <dirent.h>
 
 #include <libavutil/common.h>
diff --git a/input/keycodes.c b/input/keycodes.c
index c412191573..d178a412bd 100644
--- a/input/keycodes.c
+++ b/input/keycodes.c
@@ -17,7 +17,6 @@
 
 #include <stddef.h>
 #include <string.h>
-#include <strings.h>
 
 #include "misc/bstr.h"
 #include "common/common.h"
diff --git a/misc/bstr.c b/misc/bstr.c
index abe688bd14..379b2ed22d 100644
--- a/misc/bstr.c
+++ b/misc/bstr.c
@@ -16,7 +16,6 @@
  */
 
 #include <string.h>
-#include <strings.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <stdint.h>
diff --git a/misc/charset_conv.c b/misc/charset_conv.c
index b54f6362b6..aa08470990 100644
--- a/misc/charset_conv.c
+++ b/misc/charset_conv.c
@@ -21,11 +21,11 @@
 
 #include <stdlib.h>
 #include <errno.h>
-#include <strings.h>
 #include <assert.h>
 
 #include "config.h"
 
+#include "common/common.h"
 #include "common/msg.h"
 
 #if HAVE_UCHARDET
diff --git a/misc/language.c b/misc/language.c
index 92857f75b4..b94dd8eaf2 100644
--- a/misc/language.c
+++ b/misc/language.c
@@ -26,7 +26,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 static const struct lang {
     char match[4];
diff --git a/options/m_config_core.c b/options/m_config_core.c
index 328ec6479f..2c9979688a 100644
--- a/options/m_config_core.c
+++ b/options/m_config_core.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "common/common.h"
 #include "common/global.h"
diff --git a/options/m_config_frontend.c b/options/m_config_frontend.c
index d800cdb75d..6f0aa22d3b 100644
--- a/options/m_config_frontend.c
+++ b/options/m_config_frontend.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 
 #include "libmpv/client.h"
 
diff --git a/player/external_files.c b/player/external_files.c
index 2e0091261d..6642433150 100644
--- a/player/external_files.c
+++ b/player/external_files.c
@@ -17,7 +17,6 @@
 
 #include <dirent.h>
 #include <string.h>
-#include <strings.h>
 #include <stdlib.h>
 #include <assert.h>
 
diff --git a/player/javascript.c b/player/javascript.c
index 2111d7906b..b1506c0f5e 100644
--- a/player/javascript.c
+++ b/player/javascript.c
@@ -17,7 +17,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
diff --git a/player/loadfile.c b/player/loadfile.c
index a8dfda8c1c..077ac20017 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -17,7 +17,6 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <strings.h>
 #include <inttypes.h>
 #include <assert.h>
 
diff --git a/player/lua.c b/player/lua.c
index 70fc8d5dd3..d6ae164b4f 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -17,7 +17,6 @@
 
 #include <assert.h>
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
diff --git a/player/scripting.c b/player/scripting.c
index be074aad53..f2ac50976b 100644
--- a/player/scripting.c
+++ b/player/scripting.c
@@ -16,7 +16,6 @@
  */
 
 #include <string.h>
-#include <strings.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <math.h>
diff --git a/stream/stream.c b/stream/stream.c
index 43a7f51a60..56313502c3 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include <strings.h>
 #include <assert.h>
 
 #include "osdep/io.h"
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index 7771375aa2..377ecd3b2b 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -27,7 +27,6 @@
  */
 
 #include <string.h>
-#include <strings.h>
 #include <assert.h>
 
 #include <libbluray/bluray.h>
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 1abbb9ffe8..77df426149 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <errno.h>
 #include <assert.h>
 
diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
index e3fc1ba032..6d361217b9 100644
--- a/video/out/opengl/common.c
+++ b/video/out/opengl/common.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <strings.h>
 #include <stdbool.h>
 #include <math.h>
 #include <assert.h>