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

---
 audio/decode/ad_lavc.c          | 1 -
 audio/out/ao_jack.c             | 1 -
 audio/out/ao_oss.c              | 1 -
 audio/out/buffer.c              | 1 -
 common/common.h                 | 6 ++++++
 common/msg.c                    | 1 -
 common/stats.c                  | 1 -
 demux/cache.c                   | 1 -
 demux/demux.c                   | 1 -
 demux/demux_mf.c                | 1 -
 demux/demux_mkv_timeline.c      | 1 -
 demux/demux_raw.c               | 1 -
 input/input.c                   | 1 -
 misc/io_utils.c                 | 2 +-
 misc/path_utils.c               | 2 +-
 misc/thread_tools.c             | 1 -
 options/m_option.c              | 1 -
 options/path.c                  | 1 -
 osdep/io.c                      | 2 +-
 osdep/timer.c                   | 1 -
 player/client.c                 | 1 -
 player/command.c                | 1 -
 player/configfiles.c            | 1 -
 player/javascript.c             | 1 -
 player/lua.c                    | 1 -
 player/scripting.c              | 1 -
 stream/cookies.c                | 1 -
 stream/dvb_tune.c               | 2 +-
 stream/stream_cb.c              | 1 -
 stream/stream_dvdnav.c          | 1 -
 stream/stream_file.c            | 1 -
 stream/stream_slice.c           | 1 -
 video/image_writer.c            | 1 -
 video/out/hwdec/hwdec_cuda_gl.c | 1 -
 video/out/hwdec/hwdec_cuda_vk.c | 1 -
 video/out/hwdec/hwdec_vaapi.c   | 1 -
 video/out/vo_gpu_next.c         | 1 -
 video/out/vo_sdl.c              | 1 -
 video/out/vo_sixel.c            | 4 ----
 video/out/vo_tct.c              | 1 -
 40 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 9b5f1fb467..39cd74cd2a 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <stdbool.h>
 #include <assert.h>
 
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c
index 412e91d626..053347d145 100644
--- a/audio/out/ao_jack.c
+++ b/audio/out/ao_jack.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "config.h"
 #include "common/msg.h"
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c
index afe5839dd5..12d2666038 100644
--- a/audio/out/ao_oss.c
+++ b/audio/out/ao_oss.c
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
diff --git a/audio/out/buffer.c b/audio/out/buffer.c
index 97f7ea147e..d64e74fa92 100644
--- a/audio/out/buffer.c
+++ b/audio/out/buffer.c
@@ -18,7 +18,6 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <math.h>
-#include <unistd.h>
 #include <errno.h>
 #include <assert.h>
 
diff --git a/common/common.h b/common/common.h
index cd9bea93c2..44e9a1ba15 100644
--- a/common/common.h
+++ b/common/common.h
@@ -24,6 +24,12 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "config.h"
+
+#if HAVE_POSIX || defined(__MINGW32__)
+#include <unistd.h>
+#endif
+
 #include "osdep/compiler.h"
 #include "mpv_talloc.h"
 
diff --git a/common/msg.c b/common/msg.c
index 840f2ab30d..3e6bad2418 100644
--- a/common/msg.c
+++ b/common/msg.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "mpv_talloc.h"
 
diff --git a/common/stats.c b/common/stats.c
index c5f1e50590..fac3c73598 100644
--- a/common/stats.c
+++ b/common/stats.c
@@ -1,6 +1,5 @@
 #include <stdatomic.h>
 #include <time.h>
-#include <unistd.h>
 
 #include "common.h"
 #include "global.h"
diff --git a/demux/cache.c b/demux/cache.c
index 6398f61823..036ed35d2d 100644
--- a/demux/cache.c
+++ b/demux/cache.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include "cache.h"
 #include "common/msg.h"
diff --git a/demux/demux.c b/demux/demux.c
index 37d8341852..6feb97e998 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include "cache.h"
 #include "config.h"
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index d971f04c96..7b0f16baf4 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c
index 0c23e27d25..588699ad1e 100644
--- a/demux/demux_mkv_timeline.c
+++ b/demux/demux_mkv_timeline.c
@@ -24,7 +24,6 @@
 #include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <libavutil/common.h>
 
 #include "osdep/io.h"
diff --git a/demux/demux_raw.c b/demux/demux_raw.c
index 86b0368300..acb0251847 100644
--- a/demux/demux_raw.c
+++ b/demux/demux_raw.c
@@ -17,7 +17,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
 
 #include <libavcodec/avcodec.h>
diff --git a/input/input.c b/input/input.c
index 9890a0252b..c34f0b4c96 100644
--- a/input/input.c
+++ b/input/input.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include <unistd.h>
 #include <math.h>
 #include <errno.h>
 #include <sys/types.h>
diff --git a/misc/io_utils.c b/misc/io_utils.c
index c973cee0e4..6a98336553 100644
--- a/misc/io_utils.c
+++ b/misc/io_utils.c
@@ -23,10 +23,10 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <limits.h>
-#include <unistd.h>
 
 #include "mpv_talloc.h"
 #include "config.h"
+#include "common/common.h"
 #include "misc/random.h"
 #include "misc/io_utils.h"
 #include "osdep/io.h"
diff --git a/misc/path_utils.c b/misc/path_utils.c
index a1484a9046..7252834e7e 100644
--- a/misc/path_utils.c
+++ b/misc/path_utils.c
@@ -24,12 +24,12 @@
 #include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "config.h"
 
 #include "mpv_talloc.h"
+#include "common/common.h"
 #include "osdep/io.h"
 #include "misc/ctype.h"
 #include "misc/path_utils.h"
diff --git a/misc/thread_tools.c b/misc/thread_tools.c
index 0f7fe8f77a..43426a7546 100644
--- a/misc/thread_tools.c
+++ b/misc/thread_tools.c
@@ -18,7 +18,6 @@
 #include <stdatomic.h>
 #include <string.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #ifdef __MINGW32__
 #include <windows.h>
diff --git a/options/m_option.c b/options/m_option.c
index 3d9ae26669..b4bf68fee4 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -28,7 +28,6 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <inttypes.h>
-#include <unistd.h>
 #include <assert.h>
 
 #include <libavutil/common.h>
diff --git a/options/path.c b/options/path.c
index 7c7d31c02f..ab6f30f51c 100644
--- a/options/path.c
+++ b/options/path.c
@@ -24,7 +24,6 @@
 #include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "config.h"
diff --git a/osdep/io.c b/osdep/io.c
index 21abe0e1d5..0ee0c3dcfe 100644
--- a/osdep/io.c
+++ b/osdep/io.c
@@ -27,11 +27,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <limits.h>
-#include <unistd.h>
 
 #include "mpv_talloc.h"
 
 #include "config.h"
+#include "common/common.h"
 #include "misc/random.h"
 #include "osdep/io.h"
 #include "osdep/terminal.h"
diff --git a/osdep/timer.c b/osdep/timer.c
index 907ba50a65..51190e401a 100644
--- a/osdep/timer.c
+++ b/osdep/timer.c
@@ -17,7 +17,6 @@
 
 #include <stdlib.h>
 #include <time.h>
-#include <unistd.h>
 #include <sys/time.h>
 #include <limits.h>
 #include <assert.h>
diff --git a/player/client.c b/player/client.c
index 5087f89885..8a7f36f039 100644
--- a/player/client.c
+++ b/player/client.c
@@ -21,7 +21,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 #include "common/common.h"
 #include "common/global.h"
diff --git a/player/command.c b/player/command.c
index 560bc3e643..4e28d064e5 100644
--- a/player/command.c
+++ b/player/command.c
@@ -18,7 +18,6 @@
 #include <float.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdbool.h>
 #include <assert.h>
diff --git a/player/configfiles.c b/player/configfiles.c
index 123867db7e..d70ddb21f6 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <utime.h>
 
 #include <libavutil/md5.h>
diff --git a/player/javascript.c b/player/javascript.c
index 5be7277bd7..2111d7906b 100644
--- a/player/javascript.c
+++ b/player/javascript.c
@@ -20,7 +20,6 @@
 #include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <math.h>
 #include <stdint.h>
diff --git a/player/lua.c b/player/lua.c
index 63547694e2..70fc8d5dd3 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -20,7 +20,6 @@
 #include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <dirent.h>
 #include <math.h>
 
diff --git a/player/scripting.c b/player/scripting.c
index 0b200815f1..be074aad53 100644
--- a/player/scripting.c
+++ b/player/scripting.c
@@ -21,7 +21,6 @@
 #include <dirent.h>
 #include <math.h>
 #include <assert.h>
-#include <unistd.h>
 
 #include "config.h"
 
diff --git a/stream/cookies.c b/stream/cookies.c
index fe61c0e512..140ee6a275 100644
--- a/stream/cookies.c
+++ b/stream/cookies.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/types.h>
 #include <dirent.h>
 #include <inttypes.h>
diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c
index d18f70f7a9..82763756c0 100644
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
@@ -28,12 +28,12 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <poll.h>
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
 
+#include "common/common.h"
 #include "osdep/io.h"
 #include "osdep/timer.h"
 #include "dvbin.h"
diff --git a/stream/stream_cb.c b/stream/stream_cb.c
index 29e556390c..104fff0b05 100644
--- a/stream/stream_cb.c
+++ b/stream/stream_cb.c
@@ -2,7 +2,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <errno.h>
 
 #include "osdep/io.h"
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 5dba92ada5..1abbb9ffe8 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
diff --git a/stream/stream_file.c b/stream/stream_file.c
index 89e7a2d9f1..ff78e7d370 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -23,7 +23,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <errno.h>
 
 #ifndef __MINGW32__
diff --git a/stream/stream_slice.c b/stream/stream_slice.c
index c0dbeeb2af..4b2f475c4c 100644
--- a/stream/stream_slice.c
+++ b/stream/stream_slice.c
@@ -19,7 +19,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include "common/common.h"
 #include "options/m_option.h"
diff --git a/video/image_writer.c b/video/image_writer.c
index cc795735ef..b04f15c908 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
-#include <unistd.h>
 
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
diff --git a/video/out/hwdec/hwdec_cuda_gl.c b/video/out/hwdec/hwdec_cuda_gl.c
index f20540ed4d..4c9aaafa14 100644
--- a/video/out/hwdec/hwdec_cuda_gl.c
+++ b/video/out/hwdec/hwdec_cuda_gl.c
@@ -25,7 +25,6 @@
 
 #include <libavutil/hwcontext.h>
 #include <libavutil/hwcontext_cuda.h>
-#include <unistd.h>
 
 #define CHECK_CU(x) check_cu((mapper)->owner, (x), #x)
 
diff --git a/video/out/hwdec/hwdec_cuda_vk.c b/video/out/hwdec/hwdec_cuda_vk.c
index b9f8caa815..ee0a17683d 100644
--- a/video/out/hwdec/hwdec_cuda_vk.c
+++ b/video/out/hwdec/hwdec_cuda_vk.c
@@ -24,7 +24,6 @@
 #include <libavutil/hwcontext.h>
 #include <libavutil/hwcontext_cuda.h>
 #include <libplacebo/vulkan.h>
-#include <unistd.h>
 
 #if HAVE_WIN32_DESKTOP
 #include <versionhelpers.h>
diff --git a/video/out/hwdec/hwdec_vaapi.c b/video/out/hwdec/hwdec_vaapi.c
index 34b6e52b3c..353d50f264 100644
--- a/video/out/hwdec/hwdec_vaapi.c
+++ b/video/out/hwdec/hwdec_vaapi.c
@@ -18,7 +18,6 @@
 #include <stddef.h>
 #include <string.h>
 #include <assert.h>
-#include <unistd.h>
 
 #include <libavutil/hwcontext.h>
 #include <libavutil/hwcontext_vaapi.h>
diff --git a/video/out/vo_gpu_next.c b/video/out/vo_gpu_next.c
index d68c836b52..0c662e4396 100644
--- a/video/out/vo_gpu_next.c
+++ b/video/out/vo_gpu_next.c
@@ -20,7 +20,6 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <time.h>
-#include <unistd.h>
 
 #include <libplacebo/colorspace.h>
 #include <libplacebo/options.h>
diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c
index 71791e2468..d1ab23973c 100644
--- a/video/out/vo_sdl.c
+++ b/video/out/vo_sdl.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <string.h>
 #include <time.h>
 #include <errno.h>
diff --git a/video/out/vo_sixel.c b/video/out/vo_sixel.c
index c7df67f17f..ba5341b54a 100644
--- a/video/out/vo_sixel.c
+++ b/video/out/vo_sixel.c
@@ -35,10 +35,6 @@
 #include "video/sws_utils.h"
 #include "video/mp_image.h"
 
-#if HAVE_POSIX
-#include <unistd.h>
-#endif
-
 #define IMGFMT IMGFMT_RGB24
 
 #define TERM_ESC_USE_GLOBAL_COLOR_REG   "\033[?1070l"
diff --git a/video/out/vo_tct.c b/video/out/vo_tct.c
index 293f884544..127ca880bd 100644
--- a/video/out/vo_tct.c
+++ b/video/out/vo_tct.c
@@ -16,7 +16,6 @@
  */
 
 #include <stdio.h>
-#include <unistd.h>
 #include <config.h>
 
 #if HAVE_POSIX