Merge commit '7516bd349c81fc113d6474dee3271dfe8439e27c' into main

src/video/vivante/SDL_vivantevideo.h

@@ -18,11 +18,11 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_internal.h"
 
 #ifndef SDL_vivantevideo_h_
 #define SDL_vivantevideo_h_
 
-#include "SDL_internal.h"
 #include "../SDL_sysvideo.h"
 
 #include <SDL3/SDL_egl.h>

src/video/vivante/SDL_vivantevulkan.c

@@ -18,6 +18,7 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_internal.h"
 
 /*
  * @author Wladimir J. van der Laan. Based on Jacob Lifshay's
@@ -25,8 +26,6 @@
  * the FSL demo framework.
  */
 
-#include "SDL_internal.h"
-
 #if SDL_VIDEO_VULKAN && SDL_VIDEO_DRIVER_VIVANTE
 
 #include "SDL_vivantevideo.h"

src/video/vivante/SDL_vivantevulkan.h

@@ -18,14 +18,13 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "SDL_internal.h"
 
 /*
  * @author Wladimir J. van der Laan. Based on Jacob Lifshay's
  * SDL_x11vulkan.h and Mark Callow's SDL_vivantevulkan.h
  */
 
-#include "SDL_internal.h"
-
 #ifndef SDL_vivantevulkan_h_
 #define SDL_vivantevulkan_h_