various: sort some standard headers

since i was going to fix the include order of stdatomic, might as well
sort the surrouding includes in accordance with the project's coding
style.

some headers can sometime require specific include order. standard
library headers usually don't. but mpv might "hack into" the standard
headers (e.g pthreads) so that complicates things a bit more.

hopefully nothing breaks. if it does, the style guide is to blame.

8 files changed, 25 insertions, 22 deletions

diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 6b6fe4ccb6..d670a7c1c3 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -17,6 +17,8 @@
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdatomic.h>
+
 #import <Cocoa/Cocoa.h>
 #import <IOKit/pwr_mgt/IOPMLib.h>
 #import <IOKit/IOKitLib.h>
@@ -30,7 +32,6 @@
 #import "video/out/cocoa/mpvadapter.h"
 
 #include "osdep/threads.h"
-#include <stdatomic.h>
 #include "osdep/macosx_compat.h"
 #include "osdep/macosx_events_objc.h"
 
diff --git a/video/out/dr_helper.c b/video/out/dr_helper.c
index a381923526..862705369d 100644
--- a/video/out/dr_helper.c
+++ b/video/out/dr_helper.c
@@ -1,12 +1,12 @@
-#include <stdlib.h>
 #include <assert.h>
 #include <pthread.h>
+#include <stdatomic.h>
+#include <stdlib.h>
 
 #include <libavutil/buffer.h>
 
 #include "mpv_talloc.h"
 #include "misc/dispatch.h"
-#include <stdatomic.h>
 #include "video/mp_image.h"
 
 #include "dr_helper.h"
diff --git a/video/out/opengl/context_rpi.c b/video/out/opengl/context_rpi.c
index 815c3aa11f..0b6babbd1f 100644
--- a/video/out/opengl/context_rpi.c
+++ b/video/out/opengl/context_rpi.c
@@ -15,8 +15,9 @@
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stddef.h>
 #include <assert.h>
+#include <stdatomic.h>
+#include <stddef.h>
 
 #include <bcm_host.h>
 
@@ -24,7 +25,6 @@
 #include <EGL/eglext.h>
 
 #include "common/common.h"
-#include <stdatomic.h>
 #include "video/out/win_state.h"
 #include "context.h"
 #include "egl_helpers.h"
diff --git a/video/out/vo.c b/video/out/vo.c
index fd2ccf9e17..445a6c3a0c 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -15,18 +15,18 @@
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <assert.h>
+#include <math.h>
+#include <pthread.h>
+#include <stdatomic.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-#include <stdbool.h>
-#include <pthread.h>
-#include <math.h>
 
 #include "mpv_talloc.h"
 
 #include "config.h"
-#include <stdatomic.h>
 #include "osdep/timer.h"
 #include "osdep/threads.h"
 #include "misc/dispatch.h"
diff --git a/video/out/vo_libmpv.c b/video/out/vo_libmpv.c
index 1af1fc72f0..c084ad6768 100644
--- a/video/out/vo_libmpv.c
+++ b/video/out/vo_libmpv.c
@@ -1,11 +1,12 @@
+#include <assert.h>
+#include <limits.h>
+#include <math.h>
+#include <pthread.h>
+#include <stdatomic.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <stdbool.h>
-#include <limits.h>
-#include <pthread.h>
-#include <assert.h>
 
 #include "mpv_talloc.h"
 #include "common/common.h"
@@ -19,7 +20,6 @@
 #include "vo.h"
 #include "video/mp_image.h"
 #include "sub/osd.h"
-#include <stdatomic.h>
 #include "osdep/timer.h"
 
 #include "common/global.h"
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index be9c5d250d..f58149e3c9 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -15,10 +15,12 @@
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
+#include <assert.h>
 #include <limits.h>
 #include <pthread.h>
-#include <assert.h>
+#include <stdatomic.h>
+#include <stdio.h>
+
 #include <windows.h>
 #include <windowsx.h>
 #include <dwmapi.h>
@@ -42,7 +44,6 @@
 #include "osdep/io.h"
 #include "osdep/threads.h"
 #include "osdep/w32_keyboard.h"
-#include <stdatomic.h>
 #include "misc/dispatch.h"
 #include "misc/rendezvous.h"
 #include "mpv_talloc.h"
diff --git a/video/out/win32/droptarget.c b/video/out/win32/droptarget.c
index 67864cdc61..8a33522df0 100644
--- a/video/out/win32/droptarget.c
+++ b/video/out/win32/droptarget.c
@@ -14,6 +14,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include <stdatomic.h>
 
 #include <windows.h>
 #include <ole2.h>
@@ -23,7 +24,6 @@
 #include "common/common.h"
 #include "input/input.h"
 #include "input/event.h"
-#include <stdatomic.h>
 #include "osdep/io.h"
 #include "osdep/windows_utils.h"
 #include "mpv_talloc.h"
diff --git a/video/out/x11_common.h b/video/out/x11_common.h
index cf92de58f8..62a96d7043 100644
--- a/video/out/x11_common.h
+++ b/video/out/x11_common.h
@@ -18,13 +18,14 @@
 #ifndef MPLAYER_X11_COMMON_H
 #define MPLAYER_X11_COMMON_H
 
-#include <stdint.h>
+#include <stdatomic.h>
 #include <stdbool.h>
+#include <stdint.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include "common/common.h"
-#include <stdatomic.h>
 
 #include "config.h"
 #if !HAVE_GPL