diff --git a/VisualC-GDK/tests/testgdk/src/testgdk.cpp b/VisualC-GDK/tests/testgdk/src/testgdk.cpp
index 19a4fe67c9..f533c9d5bc 100644
--- a/VisualC-GDK/tests/testgdk/src/testgdk.cpp
+++ b/VisualC-GDK/tests/testgdk/src/testgdk.cpp
@@ -500,5 +500,3 @@ main(int argc, char *argv[])
     SDL_free(soundname);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/build-scripts/gen_audio_channel_conversion.c b/build-scripts/gen_audio_channel_conversion.c
index 37b370e107..c239e24d7f 100644
--- a/build-scripts/gen_audio_channel_conversion.c
+++ b/build-scripts/gen_audio_channel_conversion.c
@@ -442,9 +442,6 @@ int main(void)
     }
 
     printf("};\n\n");
-    printf("/* vi: set ts=4 sw=4 expandtab: */\n\n");
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/build-scripts/gen_audio_resampler_filter.c b/build-scripts/gen_audio_resampler_filter.c
index 99d77957eb..bfd7b3cbfc 100644
--- a/build-scripts/gen_audio_resampler_filter.c
+++ b/build-scripts/gen_audio_resampler_filter.c
@@ -154,10 +154,6 @@ int main(void)
         printf("%s%.9ff", ((i % 5) == 4) ? ",\n    " : ", ", ResamplerFilterDifference[i+1]);
     }
     printf("\n};\n\n");
-    printf("/* vi: set ts=4 sw=4 expandtab: */\n\n");
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
-
diff --git a/docs/README-migration.md b/docs/README-migration.md
index 8cd89962f5..6f1ca3e505 100644
--- a/docs/README-migration.md
+++ b/docs/README-migration.md
@@ -38,6 +38,7 @@ There is no SDLmain library anymore, it's now header-only, see below in the SDL_
 
 begin_code.h and close_code.h in the public headers have been renamed to SDL_begin_code.h and SDL_close_code.h. These aren't meant to be included directly by applications, but if your application did, please update your `#include` lines.
 
+The vi format comments have been removed from source code. Vim users can use the [editorconfig plugin](https://github.com/editorconfig/editorconfig-vim) to automatically set tab spacing for the SDL coding style.
 
 ## SDL_cpuinfo.h
 
diff --git a/include/SDL3/SDL.h b/include/SDL3/SDL.h
index f1c0087600..bca7a8332d 100644
--- a/include/SDL3/SDL.h
+++ b/include/SDL3/SDL.h
@@ -79,5 +79,3 @@
 #include <SDL3/SDL_oldnames.h>
 
 #endif /* SDL_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_assert.h b/include/SDL3/SDL_assert.h
index 1681409476..f1b2687af2 100644
--- a/include/SDL3/SDL_assert.h
+++ b/include/SDL3/SDL_assert.h
@@ -316,5 +316,3 @@ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_assert_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_atomic.h b/include/SDL3/SDL_atomic.h
index 8989529ed9..a2722af2b4 100644
--- a/include/SDL3/SDL_atomic.h
+++ b/include/SDL3/SDL_atomic.h
@@ -406,5 +406,3 @@ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_atomic_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_audio.h b/include/SDL3/SDL_audio.h
index 2a89223bbb..51c83440d4 100644
--- a/include/SDL3/SDL_audio.h
+++ b/include/SDL3/SDL_audio.h
@@ -1496,5 +1496,3 @@ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_audio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_bits.h b/include/SDL3/SDL_bits.h
index d30c67b347..1dc0ff18f8 100644
--- a/include/SDL3/SDL_bits.h
+++ b/include/SDL3/SDL_bits.h
@@ -122,5 +122,3 @@ SDL_HasExactlyOneBitSet32(Uint32 x)
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_bits_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_blendmode.h b/include/SDL3/SDL_blendmode.h
index 8a9d67b569..9c7f45740a 100644
--- a/include/SDL3/SDL_blendmode.h
+++ b/include/SDL3/SDL_blendmode.h
@@ -194,5 +194,3 @@ extern DECLSPEC SDL_BlendMode SDLCALL SDL_ComposeCustomBlendMode(SDL_BlendFactor
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_blendmode_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_clipboard.h b/include/SDL3/SDL_clipboard.h
index cd9b33decc..f6a2f1081f 100644
--- a/include/SDL3/SDL_clipboard.h
+++ b/include/SDL3/SDL_clipboard.h
@@ -137,5 +137,3 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasPrimarySelectionText(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_clipboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_cpuinfo.h b/include/SDL3/SDL_cpuinfo.h
index b30a1de34d..936f1ceea6 100644
--- a/include/SDL3/SDL_cpuinfo.h
+++ b/include/SDL3/SDL_cpuinfo.h
@@ -464,5 +464,3 @@ extern DECLSPEC void SDLCALL SDL_SIMDFree(void *ptr);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_cpuinfo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_endian.h b/include/SDL3/SDL_endian.h
index 6a4d11a290..f95c6f783a 100644
--- a/include/SDL3/SDL_endian.h
+++ b/include/SDL3/SDL_endian.h
@@ -344,5 +344,3 @@ SDL_SwapFloat(float x)
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_endian_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_error.h b/include/SDL3/SDL_error.h
index ee1e549ef6..505d93d49c 100644
--- a/include/SDL3/SDL_error.h
+++ b/include/SDL3/SDL_error.h
@@ -159,5 +159,3 @@ extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_error_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_events.h b/include/SDL3/SDL_events.h
index 251f129a1c..96b3ce2b32 100644
--- a/include/SDL3/SDL_events.h
+++ b/include/SDL3/SDL_events.h
@@ -1148,5 +1148,3 @@ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_events_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_filesystem.h b/include/SDL3/SDL_filesystem.h
index 429398b4e8..e45e6d0510 100644
--- a/include/SDL3/SDL_filesystem.h
+++ b/include/SDL3/SDL_filesystem.h
@@ -145,5 +145,3 @@ extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_filesystem_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_gamecontroller.h b/include/SDL3/SDL_gamecontroller.h
index b340f41787..aa33361c3d 100644
--- a/include/SDL3/SDL_gamecontroller.h
+++ b/include/SDL3/SDL_gamecontroller.h
@@ -1051,5 +1051,3 @@ extern DECLSPEC const char* SDLCALL SDL_GameControllerGetAppleSFSymbolsNameForAx
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_gamecontroller_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_guid.h b/include/SDL3/SDL_guid.h
index dea68fd5c3..a241a4891f 100644
--- a/include/SDL3/SDL_guid.h
+++ b/include/SDL3/SDL_guid.h
@@ -96,5 +96,3 @@ extern DECLSPEC SDL_GUID SDLCALL SDL_GUIDFromString(const char *pchGUID);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_guid_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_haptic.h b/include/SDL3/SDL_haptic.h
index 846e169777..5397c4c6db 100644
--- a/include/SDL3/SDL_haptic.h
+++ b/include/SDL3/SDL_haptic.h
@@ -1337,5 +1337,3 @@ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_haptic_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_hidapi.h b/include/SDL3/SDL_hidapi.h
index b4d13010b8..91f01344ab 100644
--- a/include/SDL3/SDL_hidapi.h
+++ b/include/SDL3/SDL_hidapi.h
@@ -447,5 +447,3 @@ extern DECLSPEC void SDLCALL SDL_hid_ble_scan(SDL_bool active);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_hidapi_h_ */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_hints.h b/include/SDL3/SDL_hints.h
index 5532b5d9ff..46d081b9fc 100644
--- a/include/SDL3/SDL_hints.h
+++ b/include/SDL3/SDL_hints.h
@@ -2574,5 +2574,3 @@ extern DECLSPEC void SDLCALL SDL_ClearHints(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_hints_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_init.h b/include/SDL3/SDL_init.h
index 4b9962908e..e05bc58b3c 100644
--- a/include/SDL3/SDL_init.h
+++ b/include/SDL3/SDL_init.h
@@ -195,5 +195,3 @@ extern DECLSPEC void SDLCALL SDL_Quit(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_init_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_joystick.h b/include/SDL3/SDL_joystick.h
index 6d59db2b4d..0dd0f55f58 100644
--- a/include/SDL3/SDL_joystick.h
+++ b/include/SDL3/SDL_joystick.h
@@ -1026,5 +1026,3 @@ extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_joystick_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_keyboard.h b/include/SDL3/SDL_keyboard.h
index 98a456e5b9..e35b97df44 100644
--- a/include/SDL3/SDL_keyboard.h
+++ b/include/SDL3/SDL_keyboard.h
@@ -349,5 +349,3 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_keyboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_keycode.h b/include/SDL3/SDL_keycode.h
index b5b9cc0162..448dcbac4d 100644
--- a/include/SDL3/SDL_keycode.h
+++ b/include/SDL3/SDL_keycode.h
@@ -354,5 +354,3 @@ typedef enum
 } SDL_Keymod;
 
 #endif /* SDL_keycode_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_loadso.h b/include/SDL3/SDL_loadso.h
index bf3c319207..32976e13b5 100644
--- a/include/SDL3/SDL_loadso.h
+++ b/include/SDL3/SDL_loadso.h
@@ -111,5 +111,3 @@ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_loadso_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_locale.h b/include/SDL3/SDL_locale.h
index 410fc52b96..416d64b028 100644
--- a/include/SDL3/SDL_locale.h
+++ b/include/SDL3/SDL_locale.h
@@ -99,5 +99,3 @@ extern DECLSPEC SDL_Locale * SDLCALL SDL_GetPreferredLocales(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* _SDL_locale_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_log.h b/include/SDL3/SDL_log.h
index f5204c2ce2..9486ae8c46 100644
--- a/include/SDL3/SDL_log.h
+++ b/include/SDL3/SDL_log.h
@@ -400,5 +400,3 @@ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction call
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_log_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_main.h b/include/SDL3/SDL_main.h
index 4bf3c69025..01e5500bd8 100644
--- a/include/SDL3/SDL_main.h
+++ b/include/SDL3/SDL_main.h
@@ -305,5 +305,3 @@ extern DECLSPEC void SDLCALL SDL_GDKSuspendComplete(void);
 #endif /* SDL_MAIN_HANDLED */
 
 #endif /* SDL_main_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_main_impl.h b/include/SDL3/SDL_main_impl.h
index 3e1e63aab3..3848151892 100644
--- a/include/SDL3/SDL_main_impl.h
+++ b/include/SDL3/SDL_main_impl.h
@@ -198,5 +198,3 @@ int main(int argc, char *argv[])
 #endif /* SDL_MAIN_HANDLED */
 
 #endif /* SDL_main_windows_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_messagebox.h b/include/SDL3/SDL_messagebox.h
index 7a0f5a9cd8..c39430affa 100644
--- a/include/SDL3/SDL_messagebox.h
+++ b/include/SDL3/SDL_messagebox.h
@@ -189,5 +189,3 @@ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *t
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_messagebox_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_misc.h b/include/SDL3/SDL_misc.h
index 80d972f245..e62964d726 100644
--- a/include/SDL3/SDL_misc.h
+++ b/include/SDL3/SDL_misc.h
@@ -75,5 +75,3 @@ extern DECLSPEC int SDLCALL SDL_OpenURL(const char *url);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_misc_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_mouse.h b/include/SDL3/SDL_mouse.h
index 9b28bec71b..f74e2b8b32 100644
--- a/include/SDL3/SDL_mouse.h
+++ b/include/SDL3/SDL_mouse.h
@@ -466,5 +466,3 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_mouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_mutex.h b/include/SDL3/SDL_mutex.h
index e9c3696c69..6aa4f83a44 100644
--- a/include/SDL3/SDL_mutex.h
+++ b/include/SDL3/SDL_mutex.h
@@ -541,5 +541,3 @@ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond *cond,
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_mutex_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_name.h b/include/SDL3/SDL_name.h
index 6ff35b46ef..3c10b8db71 100644
--- a/include/SDL3/SDL_name.h
+++ b/include/SDL3/SDL_name.h
@@ -29,5 +29,3 @@
 #define SDL_NAME(X) SDL_##X
 
 #endif /* SDLname_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_oldnames.h b/include/SDL3/SDL_oldnames.h
index af36a5af5b..24f36f6952 100644
--- a/include/SDL3/SDL_oldnames.h
+++ b/include/SDL3/SDL_oldnames.h
@@ -110,5 +110,3 @@
 #endif /* SDL_ENABLE_OLD_NAMES */
 
 #endif /* SDL_oldnames_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_opengl.h b/include/SDL3/SDL_opengl.h
index 47987e2dc7..61c349bbd6 100644
--- a/include/SDL3/SDL_opengl.h
+++ b/include/SDL3/SDL_opengl.h
@@ -2121,5 +2121,3 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh
 #endif /* !__IOS__ */
 
 #endif /* SDL_opengl_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_pixels.h b/include/SDL3/SDL_pixels.h
index a7146755d8..cebd2cbd41 100644
--- a/include/SDL3/SDL_pixels.h
+++ b/include/SDL3/SDL_pixels.h
@@ -617,5 +617,3 @@ extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_pixels_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_platform.h b/include/SDL3/SDL_platform.h
index 052a05ddbf..27db71d22d 100644
--- a/include/SDL3/SDL_platform.h
+++ b/include/SDL3/SDL_platform.h
@@ -238,5 +238,3 @@ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_platform_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_power.h b/include/SDL3/SDL_power.h
index 8b23f45e4e..311d104be4 100644
--- a/include/SDL3/SDL_power.h
+++ b/include/SDL3/SDL_power.h
@@ -83,5 +83,3 @@ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *seconds, int *perce
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_power_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_rect.h b/include/SDL3/SDL_rect.h
index 060252e5f1..2a95d1b83b 100644
--- a/include/SDL3/SDL_rect.h
+++ b/include/SDL3/SDL_rect.h
@@ -372,5 +372,3 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectFRectAndLine(const SDL_FRect *
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_rect_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_render.h b/include/SDL3/SDL_render.h
index 84a55c2b99..daa31bf70c 100644
--- a/include/SDL3/SDL_render.h
+++ b/include/SDL3/SDL_render.h
@@ -1932,5 +1932,3 @@ extern DECLSPEC int SDLCALL SDL_RenderSetVSync(SDL_Renderer* renderer, int vsync
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_render_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_rwops.h b/include/SDL3/SDL_rwops.h
index aea18bdfbd..11df261e6b 100644
--- a/include/SDL3/SDL_rwops.h
+++ b/include/SDL3/SDL_rwops.h
@@ -808,5 +808,3 @@ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_rwops_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_scancode.h b/include/SDL3/SDL_scancode.h
index d321266541..f0167daa75 100644
--- a/include/SDL3/SDL_scancode.h
+++ b/include/SDL3/SDL_scancode.h
@@ -434,5 +434,3 @@ typedef enum
 } SDL_Scancode;
 
 #endif /* SDL_scancode_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_sensor.h b/include/SDL3/SDL_sensor.h
index f81f892222..063012e9f5 100644
--- a/include/SDL3/SDL_sensor.h
+++ b/include/SDL3/SDL_sensor.h
@@ -301,5 +301,3 @@ extern DECLSPEC void SDLCALL SDL_SensorUpdate(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_sensor_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_stdinc.h b/include/SDL3/SDL_stdinc.h
index a76c40cfa6..5582b023ed 100644
--- a/include/SDL3/SDL_stdinc.h
+++ b/include/SDL3/SDL_stdinc.h
@@ -743,5 +743,3 @@ SDL_FORCE_INLINE int _SDL_size_add_overflow_builtin (size_t a,
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_stdinc_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_surface.h b/include/SDL3/SDL_surface.h
index 4bf58cac5f..450eb40a92 100644
--- a/include/SDL3/SDL_surface.h
+++ b/include/SDL3/SDL_surface.h
@@ -885,5 +885,3 @@ extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionModeForResol
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_surface_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_system.h b/include/SDL3/SDL_system.h
index cbbdfb66c4..1c8de768b2 100644
--- a/include/SDL3/SDL_system.h
+++ b/include/SDL3/SDL_system.h
@@ -619,5 +619,3 @@ extern DECLSPEC int SDLCALL SDL_GDKGetTaskQueue(XTaskQueueHandle * outTaskQueue)
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_system_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_syswm.h b/include/SDL3/SDL_syswm.h
index 89d280b309..d1b53e646a 100644
--- a/include/SDL3/SDL_syswm.h
+++ b/include/SDL3/SDL_syswm.h
@@ -264,5 +264,3 @@ extern DECLSPEC int SDLCALL SDL_GetWindowWMInfo(SDL_Window *window, SDL_SysWMinf
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_syswm_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test.h b/include/SDL3/SDL_test.h
index 72c48e93e8..273c2cfe55 100644
--- a/include/SDL3/SDL_test.h
+++ b/include/SDL3/SDL_test.h
@@ -65,5 +65,3 @@ extern "C" {
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_assert.h b/include/SDL3/SDL_test_assert.h
index 87ba897b8c..a52f711b3b 100644
--- a/include/SDL3/SDL_test_assert.h
+++ b/include/SDL3/SDL_test_assert.h
@@ -101,5 +101,3 @@ int SDLTest_AssertSummaryToTestResult(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_assert_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_common.h b/include/SDL3/SDL_test_common.h
index f6883c7ae7..1375d85d1c 100644
--- a/include/SDL3/SDL_test_common.h
+++ b/include/SDL3/SDL_test_common.h
@@ -232,5 +232,3 @@ void SDLTest_CommonDrawWindowInfo(SDL_Renderer * renderer, SDL_Window * window,
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_common_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_compare.h b/include/SDL3/SDL_test_compare.h
index 5da0be26f2..a20496cab5 100644
--- a/include/SDL3/SDL_test_compare.h
+++ b/include/SDL3/SDL_test_compare.h
@@ -65,5 +65,3 @@ int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface,
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_compare_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_crc32.h b/include/SDL3/SDL_test_crc32.h
index 94852a8c99..3aebb3b7ae 100644
--- a/include/SDL3/SDL_test_crc32.h
+++ b/include/SDL3/SDL_test_crc32.h
@@ -120,5 +120,3 @@ int SDLTest_Crc32Done(SDLTest_Crc32Context * crcContext);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_crc32_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_font.h b/include/SDL3/SDL_test_font.h
index c7d4f60e01..97c95cb35b 100644
--- a/include/SDL3/SDL_test_font.h
+++ b/include/SDL3/SDL_test_font.h
@@ -164,5 +164,3 @@ void SDLTest_CleanupTextDrawing(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_font_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_fuzzer.h b/include/SDL3/SDL_test_fuzzer.h
index f7680d060c..b3da7bc231 100644
--- a/include/SDL3/SDL_test_fuzzer.h
+++ b/include/SDL3/SDL_test_fuzzer.h
@@ -382,5 +382,3 @@ int SDLTest_GetFuzzerInvocationCount(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_fuzzer_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_harness.h b/include/SDL3/SDL_test_harness.h
index c6f89ef173..d59aeb2e72 100644
--- a/include/SDL3/SDL_test_harness.h
+++ b/include/SDL3/SDL_test_harness.h
@@ -130,5 +130,3 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_h_arness_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_images.h b/include/SDL3/SDL_test_images.h
index 0e978873f7..9e87c0fb6c 100644
--- a/include/SDL3/SDL_test_images.h
+++ b/include/SDL3/SDL_test_images.h
@@ -74,5 +74,3 @@ SDL_Surface *SDLTest_ImagePrimitivesBlend(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_images_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_log.h b/include/SDL3/SDL_test_log.h
index b9cf26b591..5e5bef6f9f 100644
--- a/include/SDL3/SDL_test_log.h
+++ b/include/SDL3/SDL_test_log.h
@@ -63,5 +63,3 @@ void SDLTest_LogError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_log_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_md5.h b/include/SDL3/SDL_test_md5.h
index 0f0de97c38..de68172d43 100644
--- a/include/SDL3/SDL_test_md5.h
+++ b/include/SDL3/SDL_test_md5.h
@@ -125,5 +125,3 @@ extern "C" {
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_md5_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_memory.h b/include/SDL3/SDL_test_memory.h
index 6080625813..40a9b0b15b 100644
--- a/include/SDL3/SDL_test_memory.h
+++ b/include/SDL3/SDL_test_memory.h
@@ -59,5 +59,3 @@ void SDLTest_LogAllocations(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_memory_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_test_random.h b/include/SDL3/SDL_test_random.h
index 7f60ad5f48..258dc630f8 100644
--- a/include/SDL3/SDL_test_random.h
+++ b/include/SDL3/SDL_test_random.h
@@ -111,5 +111,3 @@ extern "C" {
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_test_random_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_thread.h b/include/SDL3/SDL_thread.h
index 8c090b21ac..5d37816554 100644
--- a/include/SDL3/SDL_thread.h
+++ b/include/SDL3/SDL_thread.h
@@ -417,5 +417,3 @@ extern DECLSPEC void SDLCALL SDL_TLSCleanup(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_thread_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_timer.h b/include/SDL3/SDL_timer.h
index b1d226c82c..138394ed3b 100644
--- a/include/SDL3/SDL_timer.h
+++ b/include/SDL3/SDL_timer.h
@@ -196,5 +196,3 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_timer_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_touch.h b/include/SDL3/SDL_touch.h
index f721605095..d026e23b9d 100644
--- a/include/SDL3/SDL_touch.h
+++ b/include/SDL3/SDL_touch.h
@@ -144,5 +144,3 @@ extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_touch_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_version.h b/include/SDL3/SDL_version.h
index 22599bf5e3..499021d14f 100644
--- a/include/SDL3/SDL_version.h
+++ b/include/SDL3/SDL_version.h
@@ -159,5 +159,3 @@ extern DECLSPEC const char *SDLCALL SDL_GetRevision(void);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_version_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL3/SDL_video.h b/include/SDL3/SDL_video.h
index 2f4845c2a6..7a55d5b460 100644
--- a/include/SDL3/SDL_video.h
+++ b/include/SDL3/SDL_video.h
@@ -2083,5 +2083,3 @@ extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
 #include <SDL3/SDL_close_code.h>
 
 #endif /* SDL_video_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/build_config/SDL_build_config_windows.h b/include/build_config/SDL_build_config_windows.h
index c40bdd2cfc..ecac14a058 100644
--- a/include/build_config/SDL_build_config_windows.h
+++ b/include/build_config/SDL_build_config_windows.h
@@ -304,5 +304,3 @@ typedef unsigned int uintptr_t;
 #define SDL_FILESYSTEM_WINDOWS  1
 
 #endif /* SDL_build_config_windows_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/build_config/SDL_build_config_wingdk.h b/include/build_config/SDL_build_config_wingdk.h
index 0e1d1afcfb..03c43961f2 100644
--- a/include/build_config/SDL_build_config_wingdk.h
+++ b/include/build_config/SDL_build_config_wingdk.h
@@ -244,5 +244,3 @@
 #define SDL_FILESYSTEM_WINDOWS  1
 
 #endif /* SDL_build_config_wingdk_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/build_config/SDL_build_config_xbox.h b/include/build_config/SDL_build_config_xbox.h
index 3db6b365cd..5e4d0a3b9c 100644
--- a/include/build_config/SDL_build_config_xbox.h
+++ b/include/build_config/SDL_build_config_xbox.h
@@ -231,5 +231,3 @@
 #define SDL_DISABLE_WINDOWS_IME 1
 
 #endif /* SDL_build_config_wingdk_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL.c b/src/SDL.c
index ba3271abcd..9bc358d6e3 100644
--- a/src/SDL.c
+++ b/src/SDL.c
@@ -623,5 +623,3 @@ _DllMainCRTStartup(HANDLE hModule,
 #endif /* Building DLL */
 
 #endif /* defined(__WIN32__) || defined(__GDK__) */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/SDL_assert.c b/src/SDL_assert.c
index 9eb532d634..d9f5935507 100644
--- a/src/SDL_assert.c
+++ b/src/SDL_assert.c
@@ -445,5 +445,3 @@ SDL_AssertionHandler SDL_GetAssertionHandler(void **userdata)
     }
     return assertion_handler;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_assert_c.h b/src/SDL_assert_c.h
index 504172fa27..3f23011e1f 100644
--- a/src/SDL_assert_c.h
+++ b/src/SDL_assert_c.h
@@ -26,5 +26,3 @@
 extern void SDL_AssertionsQuit(void);
 
 #endif /* SDL_assert_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_dataqueue.c b/src/SDL_dataqueue.c
index ebddaccfae..eb36cd243e 100644
--- a/src/SDL_dataqueue.c
+++ b/src/SDL_dataqueue.c
@@ -325,5 +325,3 @@ SDL_ReserveSpaceInDataQueue(SDL_DataQueue *queue, const size_t len)
     queue->queued_bytes += len;
     return packet->data;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_dataqueue.h b/src/SDL_dataqueue.h
index e5c8c966de..9e8a536981 100644
--- a/src/SDL_dataqueue.h
+++ b/src/SDL_dataqueue.h
@@ -50,5 +50,3 @@ size_t SDL_CountDataQueue(SDL_DataQueue *queue);
 void *SDL_ReserveSpaceInDataQueue(SDL_DataQueue *queue, const size_t len);
 
 #endif /* SDL_dataqueue_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_error.c b/src/SDL_error.c
index 704ce29f2f..fcda98bfc2 100644
--- a/src/SDL_error.c
+++ b/src/SDL_error.c
@@ -120,5 +120,3 @@ SDL_GetErrorMsg(char *errstr, int maxlen)
 
     return errstr;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_error_c.h b/src/SDL_error_c.h
index 4410fcd7a1..9507673100 100644
--- a/src/SDL_error_c.h
+++ b/src/SDL_error_c.h
@@ -40,5 +40,3 @@ typedef struct SDL_error
 extern SDL_error *SDL_GetErrBuf(void);
 
 #endif /* SDL_error_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_hints.c b/src/SDL_hints.c
index 4dbc09ae27..7cfd5574c6 100644
--- a/src/SDL_hints.c
+++ b/src/SDL_hints.c
@@ -300,5 +300,3 @@ void SDL_ClearHints(void)
         SDL_free(hint);
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_hints_c.h b/src/SDL_hints_c.h
index 515832f156..980e7f6a65 100644
--- a/src/SDL_hints_c.h
+++ b/src/SDL_hints_c.h
@@ -28,5 +28,3 @@
 extern SDL_bool SDL_GetStringBoolean(const char *value, SDL_bool default_value);
 
 #endif /* SDL_hints_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_internal.h b/src/SDL_internal.h
index 4ee473f5a5..b7490529fb 100644
--- a/src/SDL_internal.h
+++ b/src/SDL_internal.h
@@ -202,5 +202,3 @@ extern DECLSPEC int SDLCALL SDL_WaitEventTimeoutNS(SDL_Event *event, Sint64 time
 #endif
 
 #endif /* SDL_internal_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_intrin.h b/src/SDL_intrin.h
index 9c547c6ced..1828a147df 100644
--- a/src/SDL_intrin.h
+++ b/src/SDL_intrin.h
@@ -113,5 +113,3 @@ _m_prefetch(void *__P)
 #endif /* HAVE_IMMINTRIN_H */
 
 #endif /* SDL_intrin_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_list.c b/src/SDL_list.c
index 9d28d3aadd..3e99270a61 100644
--- a/src/SDL_list.c
+++ b/src/SDL_list.c
@@ -84,5 +84,3 @@ void SDL_ListClear(SDL_ListNode **head)
         SDL_free(tmp);
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_list.h b/src/SDL_list.h
index 458234ae79..9c6047e73a 100644
--- a/src/SDL_list.h
+++ b/src/SDL_list.h
@@ -34,5 +34,3 @@ void SDL_ListRemove(SDL_ListNode **head, void *ent);
 void SDL_ListClear(SDL_ListNode **head);
 
 #endif /* SDL_list_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_log.c b/src/SDL_log.c
index bdba9a9406..31a129833b 100644
--- a/src/SDL_log.c
+++ b/src/SDL_log.c
@@ -501,5 +501,3 @@ void SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata)
     SDL_log_function = callback;
     SDL_log_userdata = userdata;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_log_c.h b/src/SDL_log_c.h
index ae604b363b..65f5df1928 100644
--- a/src/SDL_log_c.h
+++ b/src/SDL_log_c.h
@@ -29,5 +29,3 @@ extern void SDL_LogInit(void);
 extern void SDL_LogQuit(void);
 
 #endif /* SDL_log_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_utils.c b/src/SDL_utils.c
index 99ed1ac861..c0a58186fa 100644
--- a/src/SDL_utils.c
+++ b/src/SDL_utils.c
@@ -48,5 +48,3 @@ int SDL_powerof2(int x)
 
     return value;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/SDL_utils_c.h b/src/SDL_utils_c.h
index 63b101e701..cc4731606c 100644
--- a/src/SDL_utils_c.h
+++ b/src/SDL_utils_c.h
@@ -29,5 +29,3 @@
 int SDL_powerof2(int x);
 
 #endif /* SDL_utils_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/atomic/SDL_atomic.c b/src/atomic/SDL_atomic.c
index c8353f31a0..ca0d2b531c 100644
--- a/src/atomic/SDL_atomic.c
+++ b/src/atomic/SDL_atomic.c
@@ -303,5 +303,3 @@ void SDL_MemoryBarrierAcquireFunction(void)
 {
     SDL_MemoryBarrierAcquire();
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/atomic/SDL_spinlock.c b/src/atomic/SDL_spinlock.c
index 5a08c86ed1..20f81402fa 100644
--- a/src/atomic/SDL_spinlock.c
+++ b/src/atomic/SDL_spinlock.c
@@ -206,5 +206,3 @@ void SDL_AtomicUnlock(SDL_SpinLock *lock)
     *lock = 0;
 #endif
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 83a92b5b28..38a45dade9 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -1722,5 +1722,3 @@ void SDL_MixAudio(Uint8 *dst, const Uint8 *src, Uint32 len, int volume)
         SDL_MixAudioFormat(dst, src, device->callbackspec.format, len, volume);
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_audio_c.h b/src/audio/SDL_audio_c.h
index e194bba63c..371b375646 100644
--- a/src/audio/SDL_audio_c.h
+++ b/src/audio/SDL_audio_c.h
@@ -72,5 +72,3 @@ extern SDL_AudioFilter SDL_Convert_F32_to_U16;
 extern SDL_AudioFilter SDL_Convert_F32_to_S32;
 
 #endif /* SDL_audio_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_audio_channel_converters.h b/src/audio/SDL_audio_channel_converters.h
index 8b35f36965..27d0ed99a6 100644
--- a/src/audio/SDL_audio_channel_converters.h
+++ b/src/audio/SDL_audio_channel_converters.h
@@ -1398,5 +1398,3 @@ static const SDL_AudioFilter channel_converters[8][8] = { /* [from][to] */
                                                           { SDL_Convert61ToMono, SDL_Convert61ToStereo, SDL_Convert61To21, SDL_Convert61ToQuad, SDL_Convert61To41, SDL_Convert61To51, NULL, SDL_Convert61To71 },
                                                           { SDL_Convert71ToMono, SDL_Convert71ToStereo, SDL_Convert71To21, SDL_Convert71ToQuad, SDL_Convert71To41, SDL_Convert71To51, SDL_Convert71To61, NULL }
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_audio_resampler_filter.h b/src/audio/SDL_audio_resampler_filter.h
index 44df796138..abb7c93c8a 100644
--- a/src/audio/SDL_audio_resampler_filter.h
+++ b/src/audio/SDL_audio_resampler_filter.h
@@ -1057,5 +1057,3 @@ static const float ResamplerFilterDifference[RESAMPLER_FILTER_SIZE] = {
     -0.000001176f, -0.000001149f, -0.000001123f, -0.000001096f, -0.000001070f,
     0.000000000f
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_audiocvt.c b/src/audio/SDL_audiocvt.c
index 2bef1cec2f..b9026edda5 100644
--- a/src/audio/SDL_audiocvt.c
+++ b/src/audio/SDL_audiocvt.c
@@ -1405,5 +1405,3 @@ void SDL_FreeAudioStream(SDL_AudioStream *stream)
         SDL_free(stream);
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_audiodev.c b/src/audio/SDL_audiodev.c
index ded9842a92..cb842093ff 100644
--- a/src/audio/SDL_audiodev.c
+++ b/src/audio/SDL_audiodev.c
@@ -123,5 +123,3 @@ void SDL_EnumUnixAudioDevices(const int classic, int (*test)(int))
 }
 
 #endif /* Audio driver selection */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_audiodev_c.h b/src/audio/SDL_audiodev_c.h
index c54d6a6eed..d80c4ecddb 100644
--- a/src/audio/SDL_audiodev_c.h
+++ b/src/audio/SDL_audiodev_c.h
@@ -39,5 +39,3 @@
 extern void SDL_EnumUnixAudioDevices(const int classic, int (*test)(int));
 
 #endif /* SDL_audiodev_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_audiotypecvt.c b/src/audio/SDL_audiotypecvt.c
index e677d0dba8..1958a1a1ca 100644
--- a/src/audio/SDL_audiotypecvt.c
+++ b/src/audio/SDL_audiotypecvt.c
@@ -1484,5 +1484,3 @@ void SDL_ChooseAudioConverters(void)
 
     SDL_assert(converters_chosen == SDL_TRUE);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_mixer.c b/src/audio/SDL_mixer.c
index 9952ab5a9c..4d039a2f83 100644
--- a/src/audio/SDL_mixer.c
+++ b/src/audio/SDL_mixer.c
@@ -338,5 +338,3 @@ void SDL_MixAudioFormat(Uint8 *dst, const Uint8 *src, SDL_AudioFormat format,
         return;
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h
index 6cabed57c9..a1975a7613 100644
--- a/src/audio/SDL_sysaudio.h
+++ b/src/audio/SDL_sysaudio.h
@@ -200,5 +200,3 @@ extern AudioBootStrap N3DSAUDIO_bootstrap;
 extern AudioBootStrap EMSCRIPTENAUDIO_bootstrap;
 
 #endif /* SDL_sysaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
index 52dbe74636..c28a31a45d 100644
--- a/src/audio/SDL_wave.c
+++ b/src/audio/SDL_wave.c
@@ -2132,5 +2132,3 @@ void SDL_FreeWAV(Uint8 *audio_buf)
 {
     SDL_free(audio_buf);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/SDL_wave.h b/src/audio/SDL_wave.h
index 064f90d459..c11b361dd0 100644
--- a/src/audio/SDL_wave.h
+++ b/src/audio/SDL_wave.h
@@ -149,5 +149,3 @@ typedef struct WaveFile
     WaveTruncationHint trunchint;
     WaveFactChunkHint facthint;
 } WaveFile;
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/aaudio/SDL_aaudio.c b/src/audio/aaudio/SDL_aaudio.c
index 8b7f505194..92d0c81ea6 100644
--- a/src/audio/aaudio/SDL_aaudio.c
+++ b/src/audio/aaudio/SDL_aaudio.c
@@ -459,5 +459,3 @@ SDL_bool aaudio_DetectBrokenPlayState(void)
 }
 
 #endif /* SDL_AUDIO_DRIVER_AAUDIO */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/aaudio/SDL_aaudio.h b/src/audio/aaudio/SDL_aaudio.h
index 214b340745..50f07cf37b 100644
--- a/src/audio/aaudio/SDL_aaudio.h
+++ b/src/audio/aaudio/SDL_aaudio.h
@@ -48,5 +48,3 @@ void aaudio_PauseDevices(void);
 SDL_bool aaudio_DetectBrokenPlayState(void);
 
 #endif /* _SDL_aaudio_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c
index 327aa6d5b6..1c8cd3031f 100644
--- a/src/audio/alsa/SDL_alsa_audio.c
+++ b/src/audio/alsa/SDL_alsa_audio.c
@@ -985,5 +985,3 @@ AudioBootStrap ALSA_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_ALSA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/alsa/SDL_alsa_audio.h b/src/audio/alsa/SDL_alsa_audio.h
index 1298bc6a10..69c3249867 100644
--- a/src/audio/alsa/SDL_alsa_audio.h
+++ b/src/audio/alsa/SDL_alsa_audio.h
@@ -44,5 +44,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_ALSA_audio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/android/SDL_androidaudio.c b/src/audio/android/SDL_androidaudio.c
index e4108e54f7..826c7c200b 100644
--- a/src/audio/android/SDL_androidaudio.c
+++ b/src/audio/android/SDL_androidaudio.c
@@ -203,5 +203,3 @@ void ANDROIDAUDIO_ResumeDevices(void) {}
 void ANDROIDAUDIO_PauseDevices(void) {}
 
 #endif /* SDL_AUDIO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/android/SDL_androidaudio.h b/src/audio/android/SDL_androidaudio.h
index 5fbd2f4f87..9562e7143c 100644
--- a/src/audio/android/SDL_androidaudio.h
+++ b/src/audio/android/SDL_androidaudio.h
@@ -38,5 +38,3 @@ void ANDROIDAUDIO_ResumeDevices(void);
 void ANDROIDAUDIO_PauseDevices(void);
 
 #endif /* SDL_androidaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/coreaudio/SDL_coreaudio.h b/src/audio/coreaudio/SDL_coreaudio.h
index 165a12f01d..27a65eba04 100644
--- a/src/audio/coreaudio/SDL_coreaudio.h
+++ b/src/audio/coreaudio/SDL_coreaudio.h
@@ -72,5 +72,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_coreaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/coreaudio/SDL_coreaudio.m b/src/audio/coreaudio/SDL_coreaudio.m
index d4928716fb..d354f9ed25 100644
--- a/src/audio/coreaudio/SDL_coreaudio.m
+++ b/src/audio/coreaudio/SDL_coreaudio.m
@@ -1304,5 +1304,3 @@ AudioBootStrap COREAUDIO_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_COREAUDIO */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/directsound/SDL_directsound.c b/src/audio/directsound/SDL_directsound.c
index a9b4cd45c6..830d85e8ac 100644
--- a/src/audio/directsound/SDL_directsound.c
+++ b/src/audio/directsound/SDL_directsound.c
@@ -653,5 +653,3 @@ AudioBootStrap DSOUND_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_DSOUND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/directsound/SDL_directsound.h b/src/audio/directsound/SDL_directsound.h
index 0044920668..09c60dee2f 100644
--- a/src/audio/directsound/SDL_directsound.h
+++ b/src/audio/directsound/SDL_directsound.h
@@ -43,5 +43,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_directsound_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c
index 84b096ecaa..53338975f7 100644
--- a/src/audio/disk/SDL_diskaudio.c
+++ b/src/audio/disk/SDL_diskaudio.c
@@ -190,5 +190,3 @@ AudioBootStrap DISKAUDIO_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_DISK */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/disk/SDL_diskaudio.h b/src/audio/disk/SDL_diskaudio.h
index be3a49e278..0186779168 100644
--- a/src/audio/disk/SDL_diskaudio.h
+++ b/src/audio/disk/SDL_diskaudio.h
@@ -37,4 +37,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_diskaudio_h_ */
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/dsp/SDL_dspaudio.c b/src/audio/dsp/SDL_dspaudio.c
index 11be0bccb8..3599f45f42 100644
--- a/src/audio/dsp/SDL_dspaudio.c
+++ b/src/audio/dsp/SDL_dspaudio.c
@@ -313,5 +313,3 @@ AudioBootStrap DSP_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_OSS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/dsp/SDL_dspaudio.h b/src/audio/dsp/SDL_dspaudio.h
index b8990f8adf..117c0524c5 100644
--- a/src/audio/dsp/SDL_dspaudio.h
+++ b/src/audio/dsp/SDL_dspaudio.h
@@ -40,4 +40,3 @@ struct SDL_PrivateAudioData
 #define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */
 
 #endif /* SDL_dspaudio_h_ */
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/dummy/SDL_dummyaudio.c b/src/audio/dummy/SDL_dummyaudio.c
index b456ca0366..8d29c04dcd 100644
--- a/src/audio/dummy/SDL_dummyaudio.c
+++ b/src/audio/dummy/SDL_dummyaudio.c
@@ -58,5 +58,3 @@ static SDL_bool DUMMYAUDIO_Init(SDL_AudioDriverImpl *impl)
 AudioBootStrap DUMMYAUDIO_bootstrap = {
     "dummy", "SDL dummy audio driver", DUMMYAUDIO_Init, SDL_TRUE
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/dummy/SDL_dummyaudio.h b/src/audio/dummy/SDL_dummyaudio.h
index 93745fe9bc..7ca32d1e2c 100644
--- a/src/audio/dummy/SDL_dummyaudio.h
+++ b/src/audio/dummy/SDL_dummyaudio.h
@@ -38,4 +38,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_dummyaudio_h_ */
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/emscripten/SDL_emscriptenaudio.c b/src/audio/emscripten/SDL_emscriptenaudio.c
index 28886887a0..aef703b864 100644
--- a/src/audio/emscripten/SDL_emscriptenaudio.c
+++ b/src/audio/emscripten/SDL_emscriptenaudio.c
@@ -403,5 +403,3 @@ AudioBootStrap EMSCRIPTENAUDIO_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_EMSCRIPTEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/emscripten/SDL_emscriptenaudio.h b/src/audio/emscripten/SDL_emscriptenaudio.h
index b1ceb4ee10..00c5d47e23 100644
--- a/src/audio/emscripten/SDL_emscriptenaudio.h
+++ b/src/audio/emscripten/SDL_emscriptenaudio.h
@@ -34,5 +34,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_emscriptenaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/haiku/SDL_haikuaudio.cc b/src/audio/haiku/SDL_haikuaudio.cc
index 5440e6c3ab..34b9df8083 100644
--- a/src/audio/haiku/SDL_haikuaudio.cc
+++ b/src/audio/haiku/SDL_haikuaudio.cc
@@ -233,5 +233,3 @@ AudioBootStrap HAIKUAUDIO_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/haiku/SDL_haikuaudio.h b/src/audio/haiku/SDL_haikuaudio.h
index 628338a709..53f2c225c1 100644
--- a/src/audio/haiku/SDL_haikuaudio.h
+++ b/src/audio/haiku/SDL_haikuaudio.h
@@ -34,5 +34,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_haikuaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/jack/SDL_jackaudio.c b/src/audio/jack/SDL_jackaudio.c
index b0d0c6b447..6e7fe6d144 100644
--- a/src/audio/jack/SDL_jackaudio.c
+++ b/src/audio/jack/SDL_jackaudio.c
@@ -423,5 +423,3 @@ AudioBootStrap JACK_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_JACK */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/jack/SDL_jackaudio.h b/src/audio/jack/SDL_jackaudio.h
index a552e81998..8c2b54749a 100644
--- a/src/audio/jack/SDL_jackaudio.h
+++ b/src/audio/jack/SDL_jackaudio.h
@@ -37,5 +37,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_jackaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/n3ds/SDL_n3dsaudio.c b/src/audio/n3ds/SDL_n3dsaudio.c
index e596ee9341..1cebcb4c71 100644
--- a/src/audio/n3ds/SDL_n3dsaudio.c
+++ b/src/audio/n3ds/SDL_n3dsaudio.c
@@ -340,5 +340,3 @@ static int FindAudioFormat(_THIS)
 }
 
 #endif /* SDL_AUDIO_DRIVER_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/audio/n3ds/SDL_n3dsaudio.h b/src/audio/n3ds/SDL_n3dsaudio.h
index d01f17f539..0b33f00559 100644
--- a/src/audio/n3ds/SDL_n3dsaudio.h
+++ b/src/audio/n3ds/SDL_n3dsaudio.h
@@ -47,4 +47,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* _SDL_n3dsaudio_h_ */
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/audio/netbsd/SDL_netbsdaudio.c b/src/audio/netbsd/SDL_netbsdaudio.c
index e40e38ac41..90c97c3267 100644
--- a/src/audio/netbsd/SDL_netbsdaudio.c
+++ b/src/audio/netbsd/SDL_netbsdaudio.c
@@ -329,5 +329,3 @@ AudioBootStrap NETBSDAUDIO_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_NETBSD */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/netbsd/SDL_netbsdaudio.h b/src/audio/netbsd/SDL_netbsdaudio.h
index 1d24dd160e..97d7375382 100644
--- a/src/audio/netbsd/SDL_netbsdaudio.h
+++ b/src/audio/netbsd/SDL_netbsdaudio.h
@@ -44,5 +44,3 @@ struct SDL_PrivateAudioData
 #define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */
 
 #endif /* SDL_netbsdaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/openslES/SDL_openslES.c b/src/audio/openslES/SDL_openslES.c
index e3ec9be226..a7d36a7dd3 100644
--- a/src/audio/openslES/SDL_openslES.c
+++ b/src/audio/openslES/SDL_openslES.c
@@ -770,5 +770,3 @@ void openslES_PauseDevices(void)
 }
 
 #endif /* SDL_AUDIO_DRIVER_OPENSLES */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/openslES/SDL_openslES.h b/src/audio/openslES/SDL_openslES.h
index 8fd65d6127..56f8376ba2 100644
--- a/src/audio/openslES/SDL_openslES.h
+++ b/src/audio/openslES/SDL_openslES.h
@@ -42,5 +42,3 @@ void openslES_ResumeDevices(void);
 void openslES_PauseDevices(void);
 
 #endif /* _SDL_openslesaudio_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/pipewire/SDL_pipewire.c b/src/audio/pipewire/SDL_pipewire.c
index 3d1abcb16b..0cfb7979f2 100644
--- a/src/audio/pipewire/SDL_pipewire.c
+++ b/src/audio/pipewire/SDL_pipewire.c
@@ -1380,5 +1380,3 @@ static SDL_bool PIPEWIRE_Init(SDL_AudioDriverImpl *impl)
 AudioBootStrap PIPEWIRE_bootstrap = { "pipewire", "Pipewire", PIPEWIRE_Init, SDL_FALSE };
 
 #endif /* SDL_AUDIO_DRIVER_PIPEWIRE */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/pipewire/SDL_pipewire.h b/src/audio/pipewire/SDL_pipewire.h
index 9f8cb634b5..8a6b95a497 100644
--- a/src/audio/pipewire/SDL_pipewire.h
+++ b/src/audio/pipewire/SDL_pipewire.h
@@ -43,5 +43,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_pipewire_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/ps2/SDL_ps2audio.c b/src/audio/ps2/SDL_ps2audio.c
index 3f681c9f87..8543790bbb 100644
--- a/src/audio/ps2/SDL_ps2audio.c
+++ b/src/audio/ps2/SDL_ps2audio.c
@@ -171,5 +171,3 @@ static SDL_bool PS2AUDIO_Init(SDL_AudioDriverImpl *impl)
 AudioBootStrap PS2AUDIO_bootstrap = {
     "ps2", "PS2 audio driver", PS2AUDIO_Init, SDL_FALSE
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/ps2/SDL_ps2audio.h b/src/audio/ps2/SDL_ps2audio.h
index b71b13fcf3..c620e8a080 100644
--- a/src/audio/ps2/SDL_ps2audio.h
+++ b/src/audio/ps2/SDL_ps2audio.h
@@ -43,4 +43,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_ps2audio_h_ */
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/psp/SDL_pspaudio.c b/src/audio/psp/SDL_pspaudio.c
index e13372179f..b18a76c456 100644
--- a/src/audio/psp/SDL_pspaudio.c
+++ b/src/audio/psp/SDL_pspaudio.c
@@ -178,5 +178,3 @@ AudioBootStrap PSPAUDIO_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_PSP */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/psp/SDL_pspaudio.h b/src/audio/psp/SDL_pspaudio.h
index 70a40abdb5..4089841b2f 100644
--- a/src/audio/psp/SDL_pspaudio.h
+++ b/src/audio/psp/SDL_pspaudio.h
@@ -42,5 +42,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_pspaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/pulseaudio/SDL_pulseaudio.c b/src/audio/pulseaudio/SDL_pulseaudio.c
index 6fa9abe6a0..9b2481dd0f 100644
--- a/src/audio/pulseaudio/SDL_pulseaudio.c
+++ b/src/audio/pulseaudio/SDL_pulseaudio.c
@@ -911,5 +911,3 @@ AudioBootStrap PULSEAUDIO_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_PULSEAUDIO */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/pulseaudio/SDL_pulseaudio.h b/src/audio/pulseaudio/SDL_pulseaudio.h
index 5c80acb172..c621504df7 100644
--- a/src/audio/pulseaudio/SDL_pulseaudio.h
+++ b/src/audio/pulseaudio/SDL_pulseaudio.h
@@ -50,5 +50,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_pulseaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/sndio/SDL_sndioaudio.c b/src/audio/sndio/SDL_sndioaudio.c
index 241fe5491e..2080faaac5 100644
--- a/src/audio/sndio/SDL_sndioaudio.c
+++ b/src/audio/sndio/SDL_sndioaudio.c
@@ -365,5 +365,3 @@ AudioBootStrap SNDIO_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_SNDIO */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/sndio/SDL_sndioaudio.h b/src/audio/sndio/SDL_sndioaudio.h
index 9953c5e572..301b49e1ca 100644
--- a/src/audio/sndio/SDL_sndioaudio.h
+++ b/src/audio/sndio/SDL_sndioaudio.h
@@ -45,5 +45,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* SDL_sndioaudio_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/vita/SDL_vitaaudio.c b/src/audio/vita/SDL_vitaaudio.c
index 24c31b1852..d7787c3dff 100644
--- a/src/audio/vita/SDL_vitaaudio.c
+++ b/src/audio/vita/SDL_vitaaudio.c
@@ -214,5 +214,3 @@ AudioBootStrap VITAAUD_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/vita/SDL_vitaaudio.h b/src/audio/vita/SDL_vitaaudio.h
index 5bc32cdf43..190ff80fbc 100644
--- a/src/audio/vita/SDL_vitaaudio.h
+++ b/src/audio/vita/SDL_vitaaudio.h
@@ -42,5 +42,3 @@ struct SDL_PrivateAudioData
 };
 
 #endif /* _SDL_vitaaudio_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/wasapi/SDL_wasapi.c b/src/audio/wasapi/SDL_wasapi.c
index 5056b4c927..c0cc9f15e3 100644
--- a/src/audio/wasapi/SDL_wasapi.c
+++ b/src/audio/wasapi/SDL_wasapi.c
@@ -606,5 +606,3 @@ AudioBootStrap WASAPI_bootstrap = {
 };
 
 #endif /* SDL_AUDIO_DRIVER_WASAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/wasapi/SDL_wasapi.h b/src/audio/wasapi/SDL_wasapi.h
index 4a2668b135..da60b9e732 100644
--- a/src/audio/wasapi/SDL_wasapi.h
+++ b/src/audio/wasapi/SDL_wasapi.h
@@ -75,5 +75,3 @@ void WASAPI_PlatformDeleteActivationHandler(void *handler);
 #endif
 
 #endif /* SDL_wasapi_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/wasapi/SDL_wasapi_win32.c b/src/audio/wasapi/SDL_wasapi_win32.c
index 1e9db77364..73a65db4da 100644
--- a/src/audio/wasapi/SDL_wasapi_win32.c
+++ b/src/audio/wasapi/SDL_wasapi_win32.c
@@ -147,5 +147,3 @@ void WASAPI_PlatformDeleteActivationHandler(void *handler)
 }
 
 #endif /* SDL_AUDIO_DRIVER_WASAPI && !defined(__WINRT__) */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/wasapi/SDL_wasapi_winrt.cpp b/src/audio/wasapi/SDL_wasapi_winrt.cpp
index 19b0e12bae..f108257070 100644
--- a/src/audio/wasapi/SDL_wasapi_winrt.cpp
+++ b/src/audio/wasapi/SDL_wasapi_winrt.cpp
@@ -425,5 +425,3 @@ static void WASAPI_AddDevice(const SDL_bool iscapture, const char *devname, WAVE
 }
 
 #endif // SDL_AUDIO_DRIVER_WASAPI && defined(__WINRT__)
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index 02406a7e95..66943a61c7 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -2687,5 +2687,3 @@ int Android_JNI_OpenURL(const char *url)
 }
 
 #endif /* __ANDROID__ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/android/SDL_android.h b/src/core/android/SDL_android.h
index ab2953ce8f..2fcf8f0c3e 100644
--- a/src/core/android/SDL_android.h
+++ b/src/core/android/SDL_android.h
@@ -144,5 +144,3 @@ void Android_ActivityMutex_Lock_Running(void);
 }
 /* *INDENT-ON* */
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/freebsd/SDL_evdev_kbd_freebsd.c b/src/core/freebsd/SDL_evdev_kbd_freebsd.c
index 4dc6e224be..1aacbdbde4 100644
--- a/src/core/freebsd/SDL_evdev_kbd_freebsd.c
+++ b/src/core/freebsd/SDL_evdev_kbd_freebsd.c
@@ -597,5 +597,3 @@ void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *kbd, unsigned int keycode,
 }
 
 #endif /* SDL_INPUT_FBSDKBIO */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/haiku/SDL_BeApp.cc b/src/core/haiku/SDL_BeApp.cc
index e641edbf1d..6fa7c286b9 100644
--- a/src/core/haiku/SDL_BeApp.cc
+++ b/src/core/haiku/SDL_BeApp.cc
@@ -152,5 +152,3 @@ void SDL_BApp::ClearID(SDL_BWin *bwin) {
 }
 
 #endif /* __HAIKU__ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/haiku/SDL_BeApp.h b/src/core/haiku/SDL_BeApp.h
index 9cf7f5888b..2ab58cc3c3 100644
--- a/src/core/haiku/SDL_BeApp.h
+++ b/src/core/haiku/SDL_BeApp.h
@@ -34,7 +34,6 @@ extern void SDL_QuitBeApp(void);
 /* Be Application Signature*/
 extern const char *signature;
 
-/* vi: set ts=4 sw=4 expandtab: */
 
 #ifdef __cplusplus
 }
diff --git a/src/core/linux/SDL_dbus.c b/src/core/linux/SDL_dbus.c
index 16604b64ed..e1d018a918 100644
--- a/src/core/linux/SDL_dbus.c
+++ b/src/core/linux/SDL_dbus.c
@@ -499,5 +499,3 @@ SDL_DBus_ScreensaverInhibit(SDL_bool inhibit)
     return SDL_TRUE;
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_dbus.h b/src/core/linux/SDL_dbus.h
index 20890be925..2e6d302e0c 100644
--- a/src/core/linux/SDL_dbus.h
+++ b/src/core/linux/SDL_dbus.h
@@ -97,5 +97,3 @@ extern SDL_bool SDL_DBus_ScreensaverInhibit(SDL_bool inhibit);
 #endif /* HAVE_DBUS_DBUS_H */
 
 #endif /* SDL_dbus_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_evdev.c b/src/core/linux/SDL_evdev.c
index 92907075e6..05303604fd 100644
--- a/src/core/linux/SDL_evdev.c
+++ b/src/core/linux/SDL_evdev.c
@@ -898,5 +898,3 @@ Uint64 SDL_EVDEV_GetEventTimestamp(struct input_event *event)
 }
 
 #endif /* SDL_INPUT_LINUXEV */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_evdev.h b/src/core/linux/SDL_evdev.h
index 6c0abe17f8..efeb5b33b2 100644
--- a/src/core/linux/SDL_evdev.h
+++ b/src/core/linux/SDL_evdev.h
@@ -36,5 +36,3 @@ extern Uint64 SDL_EVDEV_GetEventTimestamp(struct input_event *event);
 #endif /* SDL_INPUT_LINUXEV */
 
 #endif /* SDL_evdev_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_evdev_capabilities.c b/src/core/linux/SDL_evdev_capabilities.c
index 0999529fe6..3bb9c5bcb8 100644
--- a/src/core/linux/SDL_evdev_capabilities.c
+++ b/src/core/linux/SDL_evdev_capabilities.c
@@ -146,5 +146,3 @@ SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_ev[NBITS(EV_MAX)],
 }
 
 #endif /* HAVE_LINUX_INPUT_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_evdev_capabilities.h b/src/core/linux/SDL_evdev_capabilities.h
index 5104d8d562..770479cb67 100644
--- a/src/core/linux/SDL_evdev_capabilities.h
+++ b/src/core/linux/SDL_evdev_capabilities.h
@@ -55,5 +55,3 @@ extern int SDL_EVDEV_GuessDeviceClass(const unsigned long bitmask_ev[NBITS(EV_MA
 #endif /* HAVE_LINUX_INPUT_H */
 
 #endif /* SDL_evdev_capabilities_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_evdev_kbd.c b/src/core/linux/SDL_evdev_kbd.c
index c1b1490ac5..c9f877c690 100644
--- a/src/core/linux/SDL_evdev_kbd.c
+++ b/src/core/linux/SDL_evdev_kbd.c
@@ -851,5 +851,3 @@ void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *state)
 }
 
 #endif /* SDL_INPUT_LINUXKD */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_evdev_kbd.h b/src/core/linux/SDL_evdev_kbd.h
index 9511838cc7..49804e9efe 100644
--- a/src/core/linux/SDL_evdev_kbd.h
+++ b/src/core/linux/SDL_evdev_kbd.h
@@ -30,5 +30,3 @@ extern void SDL_EVDEV_kbd_keycode(SDL_EVDEV_keyboard_state *state, unsigned int
 extern void SDL_EVDEV_kbd_quit(SDL_EVDEV_keyboard_state *state);
 
 #endif /* SDL_evdev_kbd_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_evdev_kbd_default_accents.h b/src/core/linux/SDL_evdev_kbd_default_accents.h
index 6ac0895062..50b668bf29 100644
--- a/src/core/linux/SDL_evdev_kbd_default_accents.h
+++ b/src/core/linux/SDL_evdev_kbd_default_accents.h
@@ -280,5 +280,3 @@ static struct kbdiacrs default_accents = {
         { 0x00, 0x00, 0x00 },
     }
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_evdev_kbd_default_keymap.h b/src/core/linux/SDL_evdev_kbd_default_keymap.h
index 48305e2acb..134526c282 100644
--- a/src/core/linux/SDL_evdev_kbd_default_keymap.h
+++ b/src/core/linux/SDL_evdev_kbd_default_keymap.h
@@ -4763,5 +4763,3 @@ static unsigned short *default_key_maps[MAX_NR_KEYMAPS] = {
     NULL,
     NULL,
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_fcitx.c b/src/core/linux/SDL_fcitx.c
index 032b063c9f..cf51ac438d 100644
--- a/src/core/linux/SDL_fcitx.c
+++ b/src/core/linux/SDL_fcitx.c
@@ -485,5 +485,3 @@ void SDL_Fcitx_PumpEvents(void)
         usleep(10);
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_fcitx.h b/src/core/linux/SDL_fcitx.h
index c7b620c4c4..aa5c907588 100644
--- a/src/core/linux/SDL_fcitx.h
+++ b/src/core/linux/SDL_fcitx.h
@@ -33,5 +33,3 @@ extern void SDL_Fcitx_UpdateTextRect(const SDL_Rect *rect);
 extern void SDL_Fcitx_PumpEvents(void);
 
 #endif /* SDL_fcitx_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_ibus.c b/src/core/linux/SDL_ibus.c
index 903c12739d..839353bd89 100644
--- a/src/core/linux/SDL_ibus.c
+++ b/src/core/linux/SDL_ibus.c
@@ -750,5 +750,3 @@ void SDL_IBus_PumpEvents(void)
 }
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_ibus.h b/src/core/linux/SDL_ibus.h
index bc8955ffb6..9ea5e1fab2 100644
--- a/src/core/linux/SDL_ibus.h
+++ b/src/core/linux/SDL_ibus.h
@@ -53,5 +53,3 @@ extern void SDL_IBus_PumpEvents(void);
 #endif /* HAVE_IBUS_IBUS_H */
 
 #endif /* SDL_ibus_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_ime.c b/src/core/linux/SDL_ime.c
index e927056c1b..4740dd0e6e 100644
--- a/src/core/linux/SDL_ime.c
+++ b/src/core/linux/SDL_ime.c
@@ -150,5 +150,3 @@ void SDL_IME_PumpEvents()
         SDL_IME_PumpEvents_Real();
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_ime.h b/src/core/linux/SDL_ime.h
index 2f8020ec08..c095e059fb 100644
--- a/src/core/linux/SDL_ime.h
+++ b/src/core/linux/SDL_ime.h
@@ -33,5 +33,3 @@ extern void SDL_IME_UpdateTextRect(const SDL_Rect *rect);
 extern void SDL_IME_PumpEvents(void);
 
 #endif /* SDL_ime_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_sandbox.c b/src/core/linux/SDL_sandbox.c
index fcfa91609a..9f3ad2666a 100644
--- a/src/core/linux/SDL_sandbox.c
+++ b/src/core/linux/SDL_sandbox.c
@@ -43,5 +43,3 @@ SDL_Sandbox SDL_DetectSandbox(void)
 
     return SDL_SANDBOX_NONE;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_sandbox.h b/src/core/linux/SDL_sandbox.h
index 22be690257..d0e136443c 100644
--- a/src/core/linux/SDL_sandbox.h
+++ b/src/core/linux/SDL_sandbox.h
@@ -35,5 +35,3 @@ typedef enum
 SDL_Sandbox SDL_DetectSandbox(void);
 
 #endif /* SDL_SANDBOX_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_threadprio.c b/src/core/linux/SDL_threadprio.c
index 38ff1f180f..4113e750d2 100644
--- a/src/core/linux/SDL_threadprio.c
+++ b/src/core/linux/SDL_threadprio.c
@@ -343,5 +343,3 @@ int SDL_LinuxSetThreadPriorityAndPolicy(Sint64 threadID, int sdlPriority, int sc
 }
 
 #endif /* __LINUX__ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_udev.c b/src/core/linux/SDL_udev.c
index ca2c1993d1..9c031a77fb 100644
--- a/src/core/linux/SDL_udev.c
+++ b/src/core/linux/SDL_udev.c
@@ -563,5 +563,3 @@ void SDL_UDEV_ReleaseUdevSyms(void)
 }
 
 #endif /* SDL_USE_LIBUDEV */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/linux/SDL_udev.h b/src/core/linux/SDL_udev.h
index 44c298fd7a..7fae9ae8f8 100644
--- a/src/core/linux/SDL_udev.h
+++ b/src/core/linux/SDL_udev.h
@@ -110,5 +110,3 @@ extern void SDL_UDEV_ReleaseUdevSyms(void);
 #endif /* HAVE_LIBUDEV_H && HAVE_LINUX_INPUT_H */
 
 #endif /* SDL_udev_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/ngage/SDL_ngage_runapp.cpp b/src/core/ngage/SDL_ngage_runapp.cpp
index aaadd965fa..6c3e4b04d7 100644
--- a/src/core/ngage/SDL_ngage_runapp.cpp
+++ b/src/core/ngage/SDL_ngage_runapp.cpp
@@ -76,5 +76,3 @@ cleanup:
 }
 
 #endif // __NGAGE__
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/unix/SDL_poll.c b/src/core/unix/SDL_poll.c
index bf3a4f5ea0..90f7ddaa72 100644
--- a/src/core/unix/SDL_poll.c
+++ b/src/core/unix/SDL_poll.c
@@ -93,5 +93,3 @@ int SDL_IOReady(int fd, int flags, Sint64 timeoutNS)
 
     return result;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/unix/SDL_poll.h b/src/core/unix/SDL_poll.h
index f511557b3c..868dad4b5e 100644
--- a/src/core/unix/SDL_poll.h
+++ b/src/core/unix/SDL_poll.h
@@ -31,5 +31,3 @@
 extern int SDL_IOReady(int fd, int flags, Sint64 timeoutNS);
 
 #endif /* SDL_poll_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/windows/SDL_directx.h b/src/core/windows/SDL_directx.h
index 9330aaf4a2..0746e121d5 100644
--- a/src/core/windows/SDL_directx.h
+++ b/src/core/windows/SDL_directx.h
@@ -110,5 +110,3 @@ typedef struct
 #endif
 
 #endif /* SDL_directx_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/windows/SDL_hid.c b/src/core/windows/SDL_hid.c
index e14bf42ed5..3ede665ab5 100644
--- a/src/core/windows/SDL_hid.c
+++ b/src/core/windows/SDL_hid.c
@@ -82,5 +82,3 @@ void WIN_UnloadHIDDLL(void)
 }
 
 #endif /* !__WINRT__ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/windows/SDL_hid.h b/src/core/windows/SDL_hid.h
index c38bd94ff5..2d8a0fb4e5 100644
--- a/src/core/windows/SDL_hid.h
+++ b/src/core/windows/SDL_hid.h
@@ -211,5 +211,3 @@ extern HidP_GetData_t SDL_HidP_GetData;
 #endif /* !__WINRT__ */
 
 #endif /* SDL_hid_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/windows/SDL_windows.c b/src/core/windows/SDL_windows.c
index 9ba9fe1ff4..6871ce919c 100644
--- a/src/core/windows/SDL_windows.c
+++ b/src/core/windows/SDL_windows.c
@@ -453,5 +453,3 @@ SDL_DXGIGetOutputInfo(int displayIndex, int *adapterIndex, int *outputIndex)
 #endif /* __WIN32__ || __WINGDK__ */
 
 #endif /* !SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/windows/SDL_windows.h b/src/core/windows/SDL_windows.h
index 160d1bb52c..b9473d6820 100644
--- a/src/core/windows/SDL_windows.h
+++ b/src/core/windows/SDL_windows.h
@@ -157,5 +157,3 @@ extern void WIN_RectToRECT(const SDL_Rect *sdlrect, RECT *winrect);
 #endif
 
 #endif /* _INCLUDED_WINDOWS_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/windows/SDL_xinput.c b/src/core/windows/SDL_xinput.c
index 7de3012597..6bcf7ef852 100644
--- a/src/core/windows/SDL_xinput.c
+++ b/src/core/windows/SDL_xinput.c
@@ -139,5 +139,3 @@ void WIN_UnloadXInputDLL(void)
 #ifdef __cplusplus
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/windows/SDL_xinput.h b/src/core/windows/SDL_xinput.h
index 0688b49691..46057d251e 100644
--- a/src/core/windows/SDL_xinput.h
+++ b/src/core/windows/SDL_xinput.h
@@ -263,5 +263,3 @@ extern DWORD SDL_XInputVersion; /* ((major << 16) & 0xFF00) | (minor & 0xFF) */
 #define XINPUTGETBATTERYINFORMATION SDL_XInputGetBatteryInformation
 
 #endif /* SDL_xinput_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/winrt/SDL_winrtapp_direct3d.cpp b/src/core/winrt/SDL_winrtapp_direct3d.cpp
index 017547817f..e70e132ab6 100644
--- a/src/core/winrt/SDL_winrtapp_direct3d.cpp
+++ b/src/core/winrt/SDL_winrtapp_direct3d.cpp
@@ -770,5 +770,3 @@ void SDL_WinRTApp::OnGamepadAdded(Platform::Object ^ sender, Windows::Gaming::In
     */
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c
index 34fd509f56..80133ee52c 100644
--- a/src/cpuinfo/SDL_cpuinfo.c
+++ b/src/cpuinfo/SDL_cpuinfo.c
@@ -1209,5 +1209,3 @@ int main()
 }
 
 #endif /* TEST_MAIN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/dynapi/SDL_dynapi.c b/src/dynapi/SDL_dynapi.c
index 2a21457acf..8095e99f63 100644
--- a/src/dynapi/SDL_dynapi.c
+++ b/src/dynapi/SDL_dynapi.c
@@ -487,5 +487,3 @@ static void SDL_InitDynamicAPI(void)
 }
 
 #endif /* SDL_DYNAMIC_API */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/dynapi/SDL_dynapi.h b/src/dynapi/SDL_dynapi.h
index 5c1bce5065..ca9fb7affa 100644
--- a/src/dynapi/SDL_dynapi.h
+++ b/src/dynapi/SDL_dynapi.h
@@ -75,5 +75,3 @@
 #endif
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/dynapi/SDL_dynapi_overrides.h b/src/dynapi/SDL_dynapi_overrides.h
index 07b6de1e16..dec3fab441 100644
--- a/src/dynapi/SDL_dynapi_overrides.h
+++ b/src/dynapi/SDL_dynapi_overrides.h
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* vi: set ts=4 sw=4 expandtab: */
 
 /* DO NOT EDIT THIS FILE BY HAND. It is autogenerated by gendynapi.pl. */
 
diff --git a/src/dynapi/SDL_dynapi_procs.h b/src/dynapi/SDL_dynapi_procs.h
index a7cf5dbc8e..7a80f80de6 100644
--- a/src/dynapi/SDL_dynapi_procs.h
+++ b/src/dynapi/SDL_dynapi_procs.h
@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-/* vi: set ts=4 sw=4 expandtab: */
 
 /*
    DO NOT EDIT THIS FILE BY HAND. It is autogenerated by gendynapi.pl.
diff --git a/src/events/SDL_clipboardevents.c b/src/events/SDL_clipboardevents.c
index 95443738dd..e39a527094 100644
--- a/src/events/SDL_clipboardevents.c
+++ b/src/events/SDL_clipboardevents.c
@@ -39,5 +39,3 @@ int SDL_SendClipboardUpdate(void)
     }
     return posted;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_clipboardevents_c.h b/src/events/SDL_clipboardevents_c.h
index 69d50b889f..c8723ece64 100644
--- a/src/events/SDL_clipboardevents_c.h
+++ b/src/events/SDL_clipboardevents_c.h
@@ -26,5 +26,3 @@
 extern int SDL_SendClipboardUpdate(void);
 
 #endif /* SDL_clipboardevents_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_displayevents.c b/src/events/SDL_displayevents.c
index f687906e2a..8c6c9147f9 100644
--- a/src/events/SDL_displayevents.c
+++ b/src/events/SDL_displayevents.c
@@ -55,5 +55,3 @@ int SDL_SendDisplayEvent(SDL_VideoDisplay *display, SDL_EventType displayevent,
 
     return posted;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_displayevents_c.h b/src/events/SDL_displayevents_c.h
index 34ceb2858f..222d9d8f25 100644
--- a/src/events/SDL_displayevents_c.h
+++ b/src/events/SDL_displayevents_c.h
@@ -26,5 +26,3 @@
 extern int SDL_SendDisplayEvent(SDL_VideoDisplay *display, SDL_EventType displayevent, int data1);
 
 #endif /* SDL_displayevents_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_dropevents.c b/src/events/SDL_dropevents.c
index 30fe4110ac..13fa80f500 100644
--- a/src/events/SDL_dropevents.c
+++ b/src/events/SDL_dropevents.c
@@ -85,5 +85,3 @@ int SDL_SendDropComplete(SDL_Window *window)
 {
     return SDL_SendDrop(window, SDL_DROPCOMPLETE, NULL);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_dropevents_c.h b/src/events/SDL_dropevents_c.h
index b3f1e1c967..0d4e9dc000 100644
--- a/src/events/SDL_dropevents_c.h
+++ b/src/events/SDL_dropevents_c.h
@@ -28,5 +28,3 @@ extern int SDL_SendDropText(SDL_Window *window, const char *text);
 extern int SDL_SendDropComplete(SDL_Window *window);
 
 #endif /* SDL_dropevents_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c
index 0a47ab0b27..00d907599c 100644
--- a/src/events/SDL_events.c
+++ b/src/events/SDL_events.c
@@ -1407,5 +1407,3 @@ void SDL_EventsQuit(void)
     SDL_DelHintCallback(SDL_HINT_AUTO_UPDATE_SENSORS, SDL_AutoUpdateSensorsChanged, NULL);
 #endif
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_events_c.h b/src/events/SDL_events_c.h
index 8b0032970b..5173d4edc2 100644
--- a/src/events/SDL_events_c.h
+++ b/src/events/SDL_events_c.h
@@ -56,5 +56,3 @@ extern int SDL_QuitInit(void);
 extern void SDL_QuitQuit(void);
 
 #endif /* SDL_events_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
index 214668c557..4f8921dcf4 100644
--- a/src/events/SDL_keyboard.c
+++ b/src/events/SDL_keyboard.c
@@ -1273,5 +1273,3 @@ SDL_GetKeyFromName(const char *name)
         return SDL_default_keymap[SDL_GetScancodeFromName(name)];
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_keyboard_c.h b/src/events/SDL_keyboard_c.h
index f587812c32..d4e00afec1 100644
--- a/src/events/SDL_keyboard_c.h
+++ b/src/events/SDL_keyboard_c.h
@@ -79,5 +79,3 @@ extern char *SDL_UCS4ToUTF8(Uint32 ch, char *dst);
 extern void SDL_ToggleModState(const SDL_Keymod modstate, const SDL_bool toggle);
 
 #endif /* SDL_keyboard_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_keysym_to_scancode.c b/src/events/SDL_keysym_to_scancode.c
index dbf027f5fb..c86399d0fe 100644
--- a/src/events/SDL_keysym_to_scancode.c
+++ b/src/events/SDL_keysym_to_scancode.c
@@ -436,5 +436,3 @@ SDL_GetScancodeFromKeySym(Uint32 keysym, Uint32 keycode)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_keysym_to_scancode_c.h b/src/events/SDL_keysym_to_scancode_c.h
index bf92174896..7e40ae3474 100644
--- a/src/events/SDL_keysym_to_scancode_c.h
+++ b/src/events/SDL_keysym_to_scancode_c.h
@@ -26,5 +26,3 @@
 extern SDL_Scancode SDL_GetScancodeFromKeySym(Uint32 keysym, Uint32 keycode);
 
 #endif /* SDL_keysym_to_scancode_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
index 93337de768..1c07f7eb42 100644
--- a/src/events/SDL_mouse.c
+++ b/src/events/SDL_mouse.c
@@ -1435,5 +1435,3 @@ int SDL_ShowCursor(int toggle)
     }
     return shown;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_mouse_c.h b/src/events/SDL_mouse_c.h
index 045ef0b302..0025a16edd 100644
--- a/src/events/SDL_mouse_c.h
+++ b/src/events/SDL_mouse_c.h
@@ -168,5 +168,3 @@ extern void SDL_ResetMouse(void);
 extern void SDL_MouseQuit(void);
 
 #endif /* SDL_mouse_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_quit.c b/src/events/SDL_quit.c
index adde59e125..e9ccaf2b35 100644
--- a/src/events/SDL_quit.c
+++ b/src/events/SDL_quit.c
@@ -193,5 +193,3 @@ int SDL_SendQuit(void)
 #endif
     return SDL_SendAppEvent(SDL_QUIT);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_scancode_tables.c b/src/events/SDL_scancode_tables.c
index 637eddd343..5afd3ba6ab 100644
--- a/src/events/SDL_scancode_tables.c
+++ b/src/events/SDL_scancode_tables.c
@@ -69,5 +69,3 @@ SDL_Scancode SDL_GetScancodeFromTable(SDL_ScancodeTable table, int keycode)
 }
 
 #endif /* SDL_INPUT_LINUXEV || SDL_VIDEO_DRIVER_WAYLAND || SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_scancode_tables_c.h b/src/events/SDL_scancode_tables_c.h
index 60dc935eb7..c94ae7b399 100644
--- a/src/events/SDL_scancode_tables_c.h
+++ b/src/events/SDL_scancode_tables_c.h
@@ -31,5 +31,3 @@ typedef enum
 
 extern const SDL_Scancode *SDL_GetScancodeTable(SDL_ScancodeTable table, int *num_entries);
 extern SDL_Scancode SDL_GetScancodeFromTable(SDL_ScancodeTable table, int keycode);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_touch.c b/src/events/SDL_touch.c
index 69a11c7390..46f03fc2e5 100644
--- a/src/events/SDL_touch.c
+++ b/src/events/SDL_touch.c
@@ -493,5 +493,3 @@ void SDL_TouchQuit(void)
     SDL_free(SDL_touchDevices);
     SDL_touchDevices = NULL;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_touch_c.h b/src/events/SDL_touch_c.h
index 5db66510d7..a91da1e712 100644
--- a/src/events/SDL_touch_c.h
+++ b/src/events/SDL_touch_c.h
@@ -55,5 +55,3 @@ extern void SDL_DelTouch(SDL_TouchID id);
 extern void SDL_TouchQuit(void);
 
 #endif /* SDL_touch_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_windowevents.c b/src/events/SDL_windowevents.c
index cf60d3444d..524caa97f4 100644
--- a/src/events/SDL_windowevents.c
+++ b/src/events/SDL_windowevents.c
@@ -225,5 +225,3 @@ int SDL_SendWindowEvent(SDL_Window *window, SDL_EventType windowevent,
 
     return posted;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/SDL_windowevents_c.h b/src/events/SDL_windowevents_c.h
index 6f7febf12d..0c930b7b10 100644
--- a/src/events/SDL_windowevents_c.h
+++ b/src/events/SDL_windowevents_c.h
@@ -27,5 +27,3 @@ extern int SDL_SendWindowEvent(SDL_Window *window, SDL_EventType windowevent,
                                int data1, int data2);
 
 #endif /* SDL_windowevents_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/blank_cursor.h b/src/events/blank_cursor.h
index 9bc0e23b40..ba5e3d773e 100644
--- a/src/events/blank_cursor.h
+++ b/src/events/blank_cursor.h
@@ -29,5 +29,3 @@
 
 static const unsigned char blank_cdata[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 static const unsigned char blank_cmask[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/default_cursor.h b/src/events/default_cursor.h
index 359904de2a..0684e4d881 100644
--- a/src/events/default_cursor.h
+++ b/src/events/default_cursor.h
@@ -111,5 +111,3 @@ static const unsigned char default_cmask[] = {
 };
 
 #endif /* USE_MACOS_CURSOR */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/scancodes_ascii.h b/src/events/scancodes_ascii.h
index a91632bf49..2273458e85 100644
--- a/src/events/scancodes_ascii.h
+++ b/src/events/scancodes_ascii.h
@@ -163,5 +163,3 @@ static ASCIIKeyInfo SDL_ASCIIKeyInfoTable[] = {
     /* 126 */ { SDL_SCANCODE_GRAVE, SDL_KMOD_SHIFT },        /* plus shift modifier '~' */
     /* 127 */ { SDL_SCANCODE_BACKSPACE, SDL_KMOD_SHIFT }
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/scancodes_darwin.h b/src/events/scancodes_darwin.h
index 1d0b5c1658..75564112ad 100644
--- a/src/events/scancodes_darwin.h
+++ b/src/events/scancodes_darwin.h
@@ -157,5 +157,3 @@ static const SDL_Scancode darwin_scancode_table[] = {
     /* 127 */   SDL_SCANCODE_POWER
 };
 /* *INDENT-ON* */ /* clang-format on */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/scancodes_linux.h b/src/events/scancodes_linux.h
index d20f13e111..86003553b5 100644
--- a/src/events/scancodes_linux.h
+++ b/src/events/scancodes_linux.h
@@ -846,5 +846,3 @@ done
 
 
 /* *INDENT-ON* */ /* clang-format on */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/scancodes_windows.h b/src/events/scancodes_windows.h
index ab2de32ca9..eb418bd241 100644
--- a/src/events/scancodes_windows.h
+++ b/src/events/scancodes_windows.h
@@ -53,5 +53,3 @@ static const SDL_Scancode windows_scancode_table[] =
 	SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_INTERNATIONAL4,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_INTERNATIONAL5,		SDL_SCANCODE_UNKNOWN,	SDL_SCANCODE_INTERNATIONAL3,		SDL_SCANCODE_UNKNOWN,		SDL_SCANCODE_UNKNOWN	/* 7 */
 };
 /* *INDENT-ON* */ /* clang-format on */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/events/scancodes_xfree86.h b/src/events/scancodes_xfree86.h
index d32ae36af9..eab385b820 100644
--- a/src/events/scancodes_xfree86.h
+++ b/src/events/scancodes_xfree86.h
@@ -518,5 +518,3 @@ static const SDL_Scancode xvnc_scancode_table[] = {
 #endif /* scancodes_xfree86_h_ */
 
 /* *INDENT-ON* */ /* clang-format on */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c
index 77b1257988..cb0ddc07d0 100644
--- a/src/file/SDL_rwops.c
+++ b/src/file/SDL_rwops.c
@@ -873,5 +873,3 @@ SDL_WriteBE64(SDL_RWops *dst, Uint64 value)
     const Uint64 swapped = SDL_SwapBE64(value);
     return (SDL_RWwrite(dst, &swapped, sizeof(swapped)) == sizeof(swapped)) ? 1 : 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/file/cocoa/SDL_rwopsbundlesupport.m b/src/file/cocoa/SDL_rwopsbundlesupport.m
index aa855e6b57..0ab7240417 100644
--- a/src/file/cocoa/SDL_rwopsbundlesupport.m
+++ b/src/file/cocoa/SDL_rwopsbundlesupport.m
@@ -63,5 +63,3 @@ FILE *SDL_OpenFPFromBundleOrFallback(const char *file, const char *mode)
 }
 
 #endif /* __APPLE__ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/file/n3ds/SDL_rwopsromfs.c b/src/file/n3ds/SDL_rwopsromfs.c
index c635ed9f91..807959fa3d 100644
--- a/src/file/n3ds/SDL_rwopsromfs.c
+++ b/src/file/n3ds/SDL_rwopsromfs.c
@@ -92,5 +92,3 @@ TryOpenInRomfs(const char *file, const char *mode)
     SDL_free(prefixed_filepath);
     return fp;
 }
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/file/n3ds/SDL_rwopsromfs.h b/src/file/n3ds/SDL_rwopsromfs.h
index 776fe1008b..25ae233efd 100644
--- a/src/file/n3ds/SDL_rwopsromfs.h
+++ b/src/file/n3ds/SDL_rwopsromfs.h
@@ -26,5 +26,3 @@
 FILE *N3DS_FileOpen(const char *file, const char *mode);
 
 #endif /* SDL_rwopsromfs_h_ */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/android/SDL_sysfilesystem.c b/src/filesystem/android/SDL_sysfilesystem.c
index a21d08b748..33127a6ec4 100644
--- a/src/filesystem/android/SDL_sysfilesystem.c
+++ b/src/filesystem/android/SDL_sysfilesystem.c
@@ -53,5 +53,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/cocoa/SDL_sysfilesystem.m b/src/filesystem/cocoa/SDL_sysfilesystem.m
index 079a5f30a5..edae319a19 100644
--- a/src/filesystem/cocoa/SDL_sysfilesystem.m
+++ b/src/filesystem/cocoa/SDL_sysfilesystem.m
@@ -133,5 +133,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/dummy/SDL_sysfilesystem.c b/src/filesystem/dummy/SDL_sysfilesystem.c
index f395c909be..e228c633c9 100644
--- a/src/filesystem/dummy/SDL_sysfilesystem.c
+++ b/src/filesystem/dummy/SDL_sysfilesystem.c
@@ -40,5 +40,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_DUMMY || SDL_FILESYSTEM_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/emscripten/SDL_sysfilesystem.c b/src/filesystem/emscripten/SDL_sysfilesystem.c
index 1e3e16801d..f757b1846e 100644
--- a/src/filesystem/emscripten/SDL_sysfilesystem.c
+++ b/src/filesystem/emscripten/SDL_sysfilesystem.c
@@ -86,5 +86,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_EMSCRIPTEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/haiku/SDL_sysfilesystem.cc b/src/filesystem/haiku/SDL_sysfilesystem.cc
index 95712c50b7..0259b57ce3 100644
--- a/src/filesystem/haiku/SDL_sysfilesystem.cc
+++ b/src/filesystem/haiku/SDL_sysfilesystem.cc
@@ -102,5 +102,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/n3ds/SDL_sysfilesystem.c b/src/filesystem/n3ds/SDL_sysfilesystem.c
index b5d6ab01b8..a0c9a06157 100644
--- a/src/filesystem/n3ds/SDL_sysfilesystem.c
+++ b/src/filesystem/n3ds/SDL_sysfilesystem.c
@@ -84,5 +84,3 @@ CreatePrefPathDir(const char *pref)
 }
 
 #endif /* SDL_FILESYSTEM_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/ps2/SDL_sysfilesystem.c b/src/filesystem/ps2/SDL_sysfilesystem.c
index fec6e49c9d..e30ce2a5a2 100644
--- a/src/filesystem/ps2/SDL_sysfilesystem.c
+++ b/src/filesystem/ps2/SDL_sysfilesystem.c
@@ -105,5 +105,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_PS2 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/psp/SDL_sysfilesystem.c b/src/filesystem/psp/SDL_sysfilesystem.c
index 1b40f834ad..a4fb04f3c0 100644
--- a/src/filesystem/psp/SDL_sysfilesystem.c
+++ b/src/filesystem/psp/SDL_sysfilesystem.c
@@ -72,5 +72,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_PSP */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/riscos/SDL_sysfilesystem.c b/src/filesystem/riscos/SDL_sysfilesystem.c
index b267d531cf..1ad4e06ffc 100644
--- a/src/filesystem/riscos/SDL_sysfilesystem.c
+++ b/src/filesystem/riscos/SDL_sysfilesystem.c
@@ -202,5 +202,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_RISCOS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/unix/SDL_sysfilesystem.c b/src/filesystem/unix/SDL_sysfilesystem.c
index e80c5bad43..b4cd0048d7 100644
--- a/src/filesystem/unix/SDL_sysfilesystem.c
+++ b/src/filesystem/unix/SDL_sysfilesystem.c
@@ -333,5 +333,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_UNIX */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/vita/SDL_sysfilesystem.c b/src/filesystem/vita/SDL_sysfilesystem.c
index b23bc61932..e088034fd4 100644
--- a/src/filesystem/vita/SDL_sysfilesystem.c
+++ b/src/filesystem/vita/SDL_sysfilesystem.c
@@ -86,5 +86,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* SDL_FILESYSTEM_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/windows/SDL_sysfilesystem.c b/src/filesystem/windows/SDL_sysfilesystem.c
index a073344147..9735aaa516 100644
--- a/src/filesystem/windows/SDL_sysfilesystem.c
+++ b/src/filesystem/windows/SDL_sysfilesystem.c
@@ -183,5 +183,3 @@ SDL_GetPrefPath(const char *org, const char *app)
     return NULL;
 }
 #endif /* SDL_FILESYSTEM_XBOX */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/filesystem/winrt/SDL_sysfilesystem.cpp b/src/filesystem/winrt/SDL_sysfilesystem.cpp
index e409aa9e7e..bac359b3fd 100644
--- a/src/filesystem/winrt/SDL_sysfilesystem.cpp
+++ b/src/filesystem/winrt/SDL_sysfilesystem.cpp
@@ -233,5 +233,3 @@ SDL_GetPrefPath(const char *org, const char *app)
 }
 
 #endif /* __WINRT__ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/SDL_haptic.c b/src/haptic/SDL_haptic.c
index 69b8c14f5c..0e2e55777f 100644
--- a/src/haptic/SDL_haptic.c
+++ b/src/haptic/SDL_haptic.c
@@ -816,5 +816,3 @@ int SDL_HapticRumbleStop(SDL_Haptic *haptic)
 
     return SDL_HapticStopEffect(haptic, haptic->rumble_id);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/SDL_haptic_c.h b/src/haptic/SDL_haptic_c.h
index d834965991..79be378d32 100644
--- a/src/haptic/SDL_haptic_c.h
+++ b/src/haptic/SDL_haptic_c.h
@@ -26,5 +26,3 @@ extern int SDL_HapticInit(void);
 extern void SDL_HapticQuit(void);
 
 #endif /* SDL_haptic_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/SDL_syshaptic.h b/src/haptic/SDL_syshaptic.h
index bede613ab0..9ef5b1b818 100644
--- a/src/haptic/SDL_syshaptic.h
+++ b/src/haptic/SDL_syshaptic.h
@@ -211,5 +211,3 @@ extern int SDL_SYS_HapticStopAll(SDL_Haptic *haptic);
 #endif
 
 #endif /* SDL_syshaptic_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/android/SDL_syshaptic.c b/src/haptic/android/SDL_syshaptic.c
index 78ef23cf98..7239e351c5 100644
--- a/src/haptic/android/SDL_syshaptic.c
+++ b/src/haptic/android/SDL_syshaptic.c
@@ -303,5 +303,3 @@ int Android_RemoveHaptic(int device_id)
 }
 
 #endif /* SDL_HAPTIC_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/android/SDL_syshaptic_c.h b/src/haptic/android/SDL_syshaptic_c.h
index a7df784932..e6e2e10227 100644
--- a/src/haptic/android/SDL_syshaptic_c.h
+++ b/src/haptic/android/SDL_syshaptic_c.h
@@ -26,5 +26,3 @@ extern int Android_AddHaptic(int device_id, const char *name);
 extern int Android_RemoveHaptic(int device_id);
 
 #endif /* SDL_HAPTIC_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c
index ba1e0dbd6d..f56f70c7e6 100644
--- a/src/haptic/darwin/SDL_syshaptic.c
+++ b/src/haptic/darwin/SDL_syshaptic.c
@@ -1363,5 +1363,3 @@ int SDL_SYS_HapticStopAll(SDL_Haptic *haptic)
 }
 
 #endif /* SDL_HAPTIC_IOKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/darwin/SDL_syshaptic_c.h b/src/haptic/darwin/SDL_syshaptic_c.h
index 4a98c5a827..0b6ba78512 100644
--- a/src/haptic/darwin/SDL_syshaptic_c.h
+++ b/src/haptic/darwin/SDL_syshaptic_c.h
@@ -27,5 +27,3 @@
 
 extern int MacHaptic_MaybeAddDevice(io_object_t device);
 extern int MacHaptic_MaybeRemoveDevice(io_object_t device);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/dummy/SDL_syshaptic.c b/src/haptic/dummy/SDL_syshaptic.c
index 0ca3b7cbd1..746862535f 100644
--- a/src/haptic/dummy/SDL_syshaptic.c
+++ b/src/haptic/dummy/SDL_syshaptic.c
@@ -143,5 +143,3 @@ int SDL_SYS_HapticStopAll(SDL_Haptic *haptic)
 }
 
 #endif /* SDL_HAPTIC_DUMMY || SDL_HAPTIC_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/linux/SDL_syshaptic.c b/src/haptic/linux/SDL_syshaptic.c
index 774f5a12f5..c9f10b1cf3 100644
--- a/src/haptic/linux/SDL_syshaptic.c
+++ b/src/haptic/linux/SDL_syshaptic.c
@@ -1120,5 +1120,3 @@ int SDL_SYS_HapticStopAll(SDL_Haptic *haptic)
 }
 
 #endif /* SDL_HAPTIC_LINUX */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/windows/SDL_dinputhaptic.c b/src/haptic/windows/SDL_dinputhaptic.c
index 11f14472ce..1f7a2432c2 100644
--- a/src/haptic/windows/SDL_dinputhaptic.c
+++ b/src/haptic/windows/SDL_dinputhaptic.c
@@ -1252,5 +1252,3 @@ int SDL_DINPUT_HapticStopAll(SDL_Haptic *haptic)
 }
 
 #endif /* SDL_HAPTIC_DINPUT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/windows/SDL_dinputhaptic_c.h b/src/haptic/windows/SDL_dinputhaptic_c.h
index 8e5ccb58d4..b4a5b7a7d3 100644
--- a/src/haptic/windows/SDL_dinputhaptic_c.h
+++ b/src/haptic/windows/SDL_dinputhaptic_c.h
@@ -51,5 +51,3 @@ extern int SDL_DINPUT_HapticStopAll(SDL_Haptic *haptic);
 #ifdef __cplusplus
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/windows/SDL_windowshaptic.c b/src/haptic/windows/SDL_windowshaptic.c
index 0bbafb70a5..836ce6a5ac 100644
--- a/src/haptic/windows/SDL_windowshaptic.c
+++ b/src/haptic/windows/SDL_windowshaptic.c
@@ -444,5 +444,3 @@ int SDL_SYS_HapticStopAll(SDL_Haptic *haptic)
 #endif
 
 #endif /* SDL_HAPTIC_DINPUT || SDL_HAPTIC_XINPUT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/windows/SDL_windowshaptic_c.h b/src/haptic/windows/SDL_windowshaptic_c.h
index 5dbac135b4..fcd478e208 100644
--- a/src/haptic/windows/SDL_windowshaptic_c.h
+++ b/src/haptic/windows/SDL_windowshaptic_c.h
@@ -93,5 +93,3 @@ extern int SDL_SYS_RemoveHapticDevice(SDL_hapticlist_item *prev, SDL_hapticlist_
 #endif
 
 #endif /* SDL_windowshaptic_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/windows/SDL_xinputhaptic.c b/src/haptic/windows/SDL_xinputhaptic.c
index 42a11e7785..56c46d1dea 100644
--- a/src/haptic/windows/SDL_xinputhaptic.c
+++ b/src/haptic/windows/SDL_xinputhaptic.c
@@ -444,5 +444,3 @@ int SDL_XINPUT_HapticStopAll(SDL_Haptic *haptic)
 }
 
 #endif /* SDL_HAPTIC_XINPUT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/haptic/windows/SDL_xinputhaptic_c.h b/src/haptic/windows/SDL_xinputhaptic_c.h
index c36c6a169c..6d43383ce9 100644
--- a/src/haptic/windows/SDL_xinputhaptic_c.h
+++ b/src/haptic/windows/SDL_xinputhaptic_c.h
@@ -51,5 +51,3 @@ extern int SDL_XINPUT_HapticStopAll(SDL_Haptic *haptic);
 #ifdef __cplusplus
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/hidapi/SDL_hidapi.c b/src/hidapi/SDL_hidapi.c
index ad3fbc4827..f2af2200a2 100644
--- a/src/hidapi/SDL_hidapi.c
+++ b/src/hidapi/SDL_hidapi.c
@@ -1645,5 +1645,3 @@ void SDL_EnableGameCubeAdaptors(void)
 #endif /* HAVE_LIBUSB */
 }
 #endif /* HAVE_ENABLE_GAMECUBE_ADAPTORS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/hidapi/SDL_hidapi_c.h b/src/hidapi/SDL_hidapi_c.h
index 9a38ca54eb..c07c3620be 100644
--- a/src/hidapi/SDL_hidapi_c.h
+++ b/src/hidapi/SDL_hidapi_c.h
@@ -31,5 +31,3 @@ extern void SDL_EnableGameCubeAdaptors(void);
 #endif
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/hidapi/android/hid.h b/src/hidapi/android/hid.h
index bf5d058cfe..af70356ec3 100644
--- a/src/hidapi/android/hid.h
+++ b/src/hidapi/android/hid.h
@@ -37,5 +37,3 @@ extern JNINativeMethod HIDDeviceManager_tab[8];
 #endif
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
index b71b487b3a..fa7a16485c 100644
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -3201,5 +3201,3 @@ const char *SDL_GameControllerGetAppleSFSymbolsNameForAxis(SDL_GameController *g
     return NULL;
 #endif
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/SDL_gamecontrollerdb.h b/src/joystick/SDL_gamecontrollerdb.h
index aeac8a6c50..4600ff830f 100644
--- a/src/joystick/SDL_gamecontrollerdb.h
+++ b/src/joystick/SDL_gamecontrollerdb.h
@@ -997,5 +997,3 @@ static const char *s_ControllerMappings[] = {
     "hidapi,*,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index 841569acc0..c7a0886258 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -3047,5 +3047,3 @@ int SDL_PrivateJoystickSensor(Uint64 timestamp, SDL_Joystick *joystick, SDL_Sens
     }
     return posted;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/SDL_joystick_c.h b/src/joystick/SDL_joystick_c.h
index 1127de84d4..d291af56ac 100644
--- a/src/joystick/SDL_joystick_c.h
+++ b/src/joystick/SDL_joystick_c.h
@@ -222,5 +222,3 @@ extern SDL_bool SDL_PrivateJoystickGetAutoGamepadMapping(int device_index,
 #endif
 
 #endif /* SDL_joystick_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/SDL_sysjoystick.h b/src/joystick/SDL_sysjoystick.h
index db2209ffe2..78b6e705db 100644
--- a/src/joystick/SDL_sysjoystick.h
+++ b/src/joystick/SDL_sysjoystick.h
@@ -246,5 +246,3 @@ extern SDL_JoystickDriver SDL_N3DS_JoystickDriver;
 #endif
 
 #endif /* SDL_sysjoystick_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/android/SDL_sysjoystick.c b/src/joystick/android/SDL_sysjoystick.c
index b28e3385b2..fd2ac2a3e3 100644
--- a/src/joystick/android/SDL_sysjoystick.c
+++ b/src/joystick/android/SDL_sysjoystick.c
@@ -710,5 +710,3 @@ SDL_JoystickDriver SDL_ANDROID_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/android/SDL_sysjoystick_c.h b/src/joystick/android/SDL_sysjoystick_c.h
index 6e0c897a42..172a726ddc 100644
--- a/src/joystick/android/SDL_sysjoystick_c.h
+++ b/src/joystick/android/SDL_sysjoystick_c.h
@@ -55,5 +55,3 @@ typedef SDL_joylist_item joystick_hwdata;
 #endif /* SDL_sysjoystick_c_h_ */
 
 #endif /* SDL_JOYSTICK_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/apple/SDL_mfijoystick.m b/src/joystick/apple/SDL_mfijoystick.m
index a4bd3ba9b5..9e30b9f122 100644
--- a/src/joystick/apple/SDL_mfijoystick.m
+++ b/src/joystick/apple/SDL_mfijoystick.m
@@ -1879,5 +1879,3 @@ SDL_JoystickDriver SDL_IOS_JoystickDriver = {
     IOS_JoystickQuit,
     IOS_JoystickGetGamepadMapping
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/apple/SDL_mfijoystick_c.h b/src/joystick/apple/SDL_mfijoystick_c.h
index ef05549adb..e7f93272ae 100644
--- a/src/joystick/apple/SDL_mfijoystick_c.h
+++ b/src/joystick/apple/SDL_mfijoystick_c.h
@@ -57,5 +57,3 @@ typedef struct joystick_hwdata
 typedef joystick_hwdata SDL_JoystickDeviceItem;
 
 #endif /* SDL_JOYSTICK_IOS_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/bsd/SDL_bsdjoystick.c b/src/joystick/bsd/SDL_bsdjoystick.c
index f4f13afe17..467149c1ac 100644
--- a/src/joystick/bsd/SDL_bsdjoystick.c
+++ b/src/joystick/bsd/SDL_bsdjoystick.c
@@ -888,5 +888,3 @@ SDL_JoystickDriver SDL_BSD_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_USBHID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/controller_type.c b/src/joystick/controller_type.c
index 417621407e..1845e54aab 100644
--- a/src/joystick/controller_type.c
+++ b/src/joystick/controller_type.c
@@ -703,5 +703,3 @@ const char *GuessControllerName( int nVID, int nPID )
 }
 
 #undef MAKE_CONTROLLER_ID
-
-/* vi: set ts=4 sw=4 noexpandtab: */
diff --git a/src/joystick/controller_type.h b/src/joystick/controller_type.h
index 9ec6c57ee1..cf89239562 100644
--- a/src/joystick/controller_type.h
+++ b/src/joystick/controller_type.h
@@ -75,5 +75,3 @@ extern EControllerType GuessControllerType( int nVID, int nPID );
 extern const char *GuessControllerName( int nVID, int nPID );
 
 #endif // CONTROLLER_TYPE_H
-
-/* vi: set ts=4 sw=4 noexpandtab: */
diff --git a/src/joystick/darwin/SDL_iokitjoystick.c b/src/joystick/darwin/SDL_iokitjoystick.c
index 8656c368c1..2e9388cdeb 100644
--- a/src/joystick/darwin/SDL_iokitjoystick.c
+++ b/src/joystick/darwin/SDL_iokitjoystick.c
@@ -1075,5 +1075,3 @@ SDL_JoystickDriver SDL_DARWIN_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_IOKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/darwin/SDL_iokitjoystick_c.h b/src/joystick/darwin/SDL_iokitjoystick_c.h
index d7fbf7098b..cbe4cb0115 100644
--- a/src/joystick/darwin/SDL_iokitjoystick_c.h
+++ b/src/joystick/darwin/SDL_iokitjoystick_c.h
@@ -77,5 +77,3 @@ struct joystick_hwdata
 typedef struct joystick_hwdata recDevice;
 
 #endif /* SDL_JOYSTICK_IOKIT_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/dummy/SDL_sysjoystick.c b/src/joystick/dummy/SDL_sysjoystick.c
index e09f639d76..57294e3148 100644
--- a/src/joystick/dummy/SDL_sysjoystick.c
+++ b/src/joystick/dummy/SDL_sysjoystick.c
@@ -148,5 +148,3 @@ SDL_JoystickDriver SDL_DUMMY_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_DUMMY || SDL_JOYSTICK_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/emscripten/SDL_sysjoystick.c b/src/joystick/emscripten/SDL_sysjoystick.c
index 67288257fc..310d6060f2 100644
--- a/src/joystick/emscripten/SDL_sysjoystick.c
+++ b/src/joystick/emscripten/SDL_sysjoystick.c
@@ -437,5 +437,3 @@ SDL_JoystickDriver SDL_EMSCRIPTEN_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_EMSCRIPTEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/emscripten/SDL_sysjoystick_c.h b/src/joystick/emscripten/SDL_sysjoystick_c.h
index 0915c3355b..089330f63e 100644
--- a/src/joystick/emscripten/SDL_sysjoystick_c.h
+++ b/src/joystick/emscripten/SDL_sysjoystick_c.h
@@ -47,5 +47,3 @@ typedef struct SDL_joylist_item
 typedef SDL_joylist_item joystick_hwdata;
 
 #endif /* SDL_JOYSTICK_EMSCRIPTEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/haiku/SDL_haikujoystick.cc b/src/joystick/haiku/SDL_haikujoystick.cc
index 36523b7729..50120caee5 100644
--- a/src/joystick/haiku/SDL_haikujoystick.cc
+++ b/src/joystick/haiku/SDL_haikujoystick.cc
@@ -319,5 +319,3 @@ extern "C"
 }                              // extern "C"
 
 #endif /* SDL_JOYSTICK_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_combined.c b/src/joystick/hidapi/SDL_hidapi_combined.c
index 9e70622a07..3091235228 100644
--- a/src/joystick/hidapi/SDL_hidapi_combined.c
+++ b/src/joystick/hidapi/SDL_hidapi_combined.c
@@ -232,5 +232,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverCombined = {
 };
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_gamecube.c b/src/joystick/hidapi/SDL_hidapi_gamecube.c
index eec0cf1a8b..4a87fe3f5e 100644
--- a/src/joystick/hidapi/SDL_hidapi_gamecube.c
+++ b/src/joystick/hidapi/SDL_hidapi_gamecube.c
@@ -554,5 +554,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverGameCube = {
 #endif /* SDL_JOYSTICK_HIDAPI_GAMECUBE */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_luna.c b/src/joystick/hidapi/SDL_hidapi_luna.c
index f33cc03022..fb90a53e4c 100644
--- a/src/joystick/hidapi/SDL_hidapi_luna.c
+++ b/src/joystick/hidapi/SDL_hidapi_luna.c
@@ -448,5 +448,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverLuna = {
 #endif /* SDL_JOYSTICK_HIDAPI_LUNA */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_nintendo.h b/src/joystick/hidapi/SDL_hidapi_nintendo.h
index 6ca33ad3db..8957c2fc39 100644
--- a/src/joystick/hidapi/SDL_hidapi_nintendo.h
+++ b/src/joystick/hidapi/SDL_hidapi_nintendo.h
@@ -44,5 +44,3 @@ typedef enum
     k_eWiiExtensionControllerType_Gamepad = 130,
     k_eWiiExtensionControllerType_WiiUPro = 131,
 } EWiiExtensionControllerType;
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_ps3.c b/src/joystick/hidapi/SDL_hidapi_ps3.c
index 7a2d16ef41..89fe8094bc 100644
--- a/src/joystick/hidapi/SDL_hidapi_ps3.c
+++ b/src/joystick/hidapi/SDL_hidapi_ps3.c
@@ -861,5 +861,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverPS3ThirdParty = {
 #endif /* SDL_JOYSTICK_HIDAPI_PS3 */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_ps4.c b/src/joystick/hidapi/SDL_hidapi_ps4.c
index d580b25f41..b2d08a39bf 100644
--- a/src/joystick/hidapi/SDL_hidapi_ps4.c
+++ b/src/joystick/hidapi/SDL_hidapi_ps4.c
@@ -1171,5 +1171,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverPS4 = {
 #endif /* SDL_JOYSTICK_HIDAPI_PS4 */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_ps5.c b/src/joystick/hidapi/SDL_hidapi_ps5.c
index a87b8a16dc..62597fc7f1 100644
--- a/src/joystick/hidapi/SDL_hidapi_ps5.c
+++ b/src/joystick/hidapi/SDL_hidapi_ps5.c
@@ -1450,5 +1450,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverPS5 = {
 #endif /* SDL_JOYSTICK_HIDAPI_PS5 */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_rumble.c b/src/joystick/hidapi/SDL_hidapi_rumble.c
index 8a9fb524bc..6cd38feda7 100644
--- a/src/joystick/hidapi/SDL_hidapi_rumble.c
+++ b/src/joystick/hidapi/SDL_hidapi_rumble.c
@@ -281,5 +281,3 @@ void SDL_HIDAPI_QuitRumble(void)
 }
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_rumble.h b/src/joystick/hidapi/SDL_hidapi_rumble.h
index a2ffd5220b..9554d8772e 100644
--- a/src/joystick/hidapi/SDL_hidapi_rumble.h
+++ b/src/joystick/hidapi/SDL_hidapi_rumble.h
@@ -40,5 +40,3 @@ int SDL_HIDAPI_SendRumble(SDL_HIDAPI_Device *device, const Uint8 *data, int size
 void SDL_HIDAPI_QuitRumble(void);
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_shield.c b/src/joystick/hidapi/SDL_hidapi_shield.c
index e440639f42..6df984d04b 100644
--- a/src/joystick/hidapi/SDL_hidapi_shield.c
+++ b/src/joystick/hidapi/SDL_hidapi_shield.c
@@ -600,5 +600,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverShield = {
 #endif /* SDL_JOYSTICK_HIDAPI_SHIELD */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_stadia.c b/src/joystick/hidapi/SDL_hidapi_stadia.c
index 1330370c35..de8aab381d 100644
--- a/src/joystick/hidapi/SDL_hidapi_stadia.c
+++ b/src/joystick/hidapi/SDL_hidapi_stadia.c
@@ -310,5 +310,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverStadia = {
 #endif /* SDL_JOYSTICK_HIDAPI_STADIA */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_steam.c b/src/joystick/hidapi/SDL_hidapi_steam.c
index 7bb0889645..cb4f33d7ee 100644
--- a/src/joystick/hidapi/SDL_hidapi_steam.c
+++ b/src/joystick/hidapi/SDL_hidapi_steam.c
@@ -1244,5 +1244,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverSteam = {
 #endif /* SDL_JOYSTICK_HIDAPI_STEAM */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_switch.c b/src/joystick/hidapi/SDL_hidapi_switch.c
index 9749d57cb2..6acc54fe99 100644
--- a/src/joystick/hidapi/SDL_hidapi_switch.c
+++ b/src/joystick/hidapi/SDL_hidapi_switch.c
@@ -2253,5 +2253,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverSwitch = {
 #endif /* SDL_JOYSTICK_HIDAPI_SWITCH */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_wii.c b/src/joystick/hidapi/SDL_hidapi_wii.c
index 903dab6609..50a1f2a76b 100644
--- a/src/joystick/hidapi/SDL_hidapi_wii.c
+++ b/src/joystick/hidapi/SDL_hidapi_wii.c
@@ -1675,5 +1675,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverWii = {
 #endif /* SDL_JOYSTICK_HIDAPI_WII */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_xbox360.c b/src/joystick/hidapi/SDL_hidapi_xbox360.c
index f85739674b..073ab005d6 100644
--- a/src/joystick/hidapi/SDL_hidapi_xbox360.c
+++ b/src/joystick/hidapi/SDL_hidapi_xbox360.c
@@ -382,5 +382,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXbox360 = {
 #endif /* SDL_JOYSTICK_HIDAPI_XBOX360 */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_xbox360w.c b/src/joystick/hidapi/SDL_hidapi_xbox360w.c
index 80400409fc..4875ff82fa 100644
--- a/src/joystick/hidapi/SDL_hidapi_xbox360w.c
+++ b/src/joystick/hidapi/SDL_hidapi_xbox360w.c
@@ -377,5 +377,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXbox360W = {
 #endif /* SDL_JOYSTICK_HIDAPI_XBOX360 */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapi_xboxone.c b/src/joystick/hidapi/SDL_hidapi_xboxone.c
index a1af5a5ed1..dfa2912e4b 100644
--- a/src/joystick/hidapi/SDL_hidapi_xboxone.c
+++ b/src/joystick/hidapi/SDL_hidapi_xboxone.c
@@ -1338,5 +1338,3 @@ SDL_HIDAPI_DeviceDriver SDL_HIDAPI_DriverXboxOne = {
 #endif /* SDL_JOYSTICK_HIDAPI_XBOXONE */
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapijoystick.c b/src/joystick/hidapi/SDL_hidapijoystick.c
index f46def18a4..c9ba0240c1 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick.c
+++ b/src/joystick/hidapi/SDL_hidapijoystick.c
@@ -1519,5 +1519,3 @@ SDL_JoystickDriver SDL_HIDAPI_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_HIDAPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/hidapi/SDL_hidapijoystick_c.h b/src/joystick/hidapi/SDL_hidapijoystick_c.h
index 03741de173..622b3790e4 100644
--- a/src/joystick/hidapi/SDL_hidapijoystick_c.h
+++ b/src/joystick/hidapi/SDL_hidapijoystick_c.h
@@ -157,5 +157,3 @@ extern void HIDAPI_DumpPacket(const char *prefix, const Uint8 *data, int size);
 extern float HIDAPI_RemapVal(float val, float val_min, float val_max, float output_min, float output_max);
 
 #endif /* SDL_JOYSTICK_HIDAPI_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index caf5fc1b8c..b2622af995 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -2008,5 +2008,3 @@ SDL_JoystickDriver SDL_LINUX_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_LINUX */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/linux/SDL_sysjoystick_c.h b/src/joystick/linux/SDL_sysjoystick_c.h
index 017beaa1cd..244554a18f 100644
--- a/src/joystick/linux/SDL_sysjoystick_c.h
+++ b/src/joystick/linux/SDL_sysjoystick_c.h
@@ -90,5 +90,3 @@ struct joystick_hwdata
 };
 
 #endif /* SDL_sysjoystick_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/n3ds/SDL_sysjoystick.c b/src/joystick/n3ds/SDL_sysjoystick.c
index dd85a5963c..c7221c270c 100644
--- a/src/joystick/n3ds/SDL_sysjoystick.c
+++ b/src/joystick/n3ds/SDL_sysjoystick.c
@@ -279,5 +279,3 @@ SDL_JoystickDriver SDL_N3DS_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/joystick/ps2/SDL_sysjoystick.c b/src/joystick/ps2/SDL_sysjoystick.c
index 416977b2bb..0b5e5704d5 100644
--- a/src/joystick/ps2/SDL_sysjoystick.c
+++ b/src/joystick/ps2/SDL_sysjoystick.c
@@ -359,5 +359,3 @@ SDL_JoystickDriver SDL_PS2_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_PS2 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/steam/SDL_steamcontroller.c b/src/joystick/steam/SDL_steamcontroller.c
index 1fa5f17e48..85aa2b38f7 100644
--- a/src/joystick/steam/SDL_steamcontroller.c
+++ b/src/joystick/steam/SDL_steamcontroller.c
@@ -47,5 +47,3 @@ void SDL_UpdateSteamController(SDL_Joystick *joystick)
 void SDL_QuitSteamControllers(void)
 {
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/steam/SDL_steamcontroller.h b/src/joystick/steam/SDL_steamcontroller.h
index 9fd3b6c704..1ce6df34e8 100644
--- a/src/joystick/steam/SDL_steamcontroller.h
+++ b/src/joystick/steam/SDL_steamcontroller.h
@@ -35,5 +35,3 @@ void SDL_UpdateSteamController(SDL_Joystick *joystick);
 void SDL_QuitSteamControllers(void);
 
 #endif /* SDL_steamcontroller_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/usb_ids.h b/src/joystick/usb_ids.h
index 5a6a8e4d22..c74d0f2e7b 100644
--- a/src/joystick/usb_ids.h
+++ b/src/joystick/usb_ids.h
@@ -163,5 +163,3 @@
 #define BLUETOOTH_PRODUCT_LUNA_CONTROLLER 0x0419
 
 #endif /* usb_ids_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/virtual/SDL_virtualjoystick.c b/src/joystick/virtual/SDL_virtualjoystick.c
index fba56048dc..73d2243785 100644
--- a/src/joystick/virtual/SDL_virtualjoystick.c
+++ b/src/joystick/virtual/SDL_virtualjoystick.c
@@ -740,5 +740,3 @@ SDL_JoystickDriver SDL_VIRTUAL_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_VIRTUAL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/virtual/SDL_virtualjoystick_c.h b/src/joystick/virtual/SDL_virtualjoystick_c.h
index 1594c3dd75..7b93d2e3a1 100644
--- a/src/joystick/virtual/SDL_virtualjoystick_c.h
+++ b/src/joystick/virtual/SDL_virtualjoystick_c.h
@@ -54,5 +54,3 @@ int SDL_JoystickSetVirtualHatInner(SDL_Joystick *joystick, int hat, Uint8 value)
 #endif /* SDL_JOYSTICK_VIRTUAL */
 
 #endif /* SDL_VIRTUALJOYSTICK_C_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/vita/SDL_sysjoystick.c b/src/joystick/vita/SDL_sysjoystick.c
index efcdc79889..5ce0681a8e 100644
--- a/src/joystick/vita/SDL_sysjoystick.c
+++ b/src/joystick/vita/SDL_sysjoystick.c
@@ -394,5 +394,3 @@ SDL_JoystickDriver SDL_VITA_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_dinputjoystick.c b/src/joystick/windows/SDL_dinputjoystick.c
index af762b578d..2b16a7ce5a 100644
--- a/src/joystick/windows/SDL_dinputjoystick.c
+++ b/src/joystick/windows/SDL_dinputjoystick.c
@@ -1204,5 +1204,3 @@ void SDL_DINPUT_JoystickQuit(void)
 }
 
 #endif /* SDL_JOYSTICK_DINPUT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_dinputjoystick_c.h b/src/joystick/windows/SDL_dinputjoystick_c.h
index 89ea36b94d..27f239999e 100644
--- a/src/joystick/windows/SDL_dinputjoystick_c.h
+++ b/src/joystick/windows/SDL_dinputjoystick_c.h
@@ -39,5 +39,3 @@ extern void SDL_DINPUT_JoystickQuit(void);
 #ifdef __cplusplus
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_rawinputjoystick.c b/src/joystick/windows/SDL_rawinputjoystick.c
index a79e07ca0e..7764a3af0e 100644
--- a/src/joystick/windows/SDL_rawinputjoystick.c
+++ b/src/joystick/windows/SDL_rawinputjoystick.c
@@ -2031,5 +2031,3 @@ SDL_JoystickDriver SDL_RAWINPUT_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_RAWINPUT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_rawinputjoystick_c.h b/src/joystick/windows/SDL_rawinputjoystick_c.h
index b6b849a7e8..145c6eeb68 100644
--- a/src/joystick/windows/SDL_rawinputjoystick_c.h
+++ b/src/joystick/windows/SDL_rawinputjoystick_c.h
@@ -33,5 +33,3 @@ extern void RAWINPUT_UnregisterNotifications();
 
 /* Returns 0 if message was handled */
 extern LRESULT CALLBACK RAWINPUT_WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_windows_gaming_input.c b/src/joystick/windows/SDL_windows_gaming_input.c
index 1b6e95c062..029a5f98dd 100644
--- a/src/joystick/windows/SDL_windows_gaming_input.c
+++ b/src/joystick/windows/SDL_windows_gaming_input.c
@@ -961,5 +961,3 @@ SDL_JoystickDriver SDL_WGI_JoystickDriver = {
 };
 
 #endif /* SDL_JOYSTICK_WGI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_windowsjoystick.c b/src/joystick/windows/SDL_windowsjoystick.c
index 1f77e77907..5ad1035e11 100644
--- a/src/joystick/windows/SDL_windowsjoystick.c
+++ b/src/joystick/windows/SDL_windowsjoystick.c
@@ -819,5 +819,3 @@ SDL_JoystickDriver SDL_WINDOWS_JoystickDriver = {
 #endif
 
 #endif /* SDL_JOYSTICK_DINPUT || SDL_JOYSTICK_XINPUT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_windowsjoystick_c.h b/src/joystick/windows/SDL_windowsjoystick_c.h
index ce669042aa..605e9fa3da 100644
--- a/src/joystick/windows/SDL_windowsjoystick_c.h
+++ b/src/joystick/windows/SDL_windowsjoystick_c.h
@@ -99,5 +99,3 @@ extern void WINDOWS_AddJoystickDevice(JoyStick_DeviceData *device);
 #ifdef __cplusplus
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_xinputjoystick.c b/src/joystick/windows/SDL_xinputjoystick.c
index 03d06e0ccc..3afb536d63 100644
--- a/src/joystick/windows/SDL_xinputjoystick.c
+++ b/src/joystick/windows/SDL_xinputjoystick.c
@@ -602,5 +602,3 @@ void SDL_XINPUT_JoystickQuit(void)
 }
 
 #endif /* SDL_JOYSTICK_XINPUT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/joystick/windows/SDL_xinputjoystick_c.h b/src/joystick/windows/SDL_xinputjoystick_c.h
index 80e9b9dc27..d7a49d7b09 100644
--- a/src/joystick/windows/SDL_xinputjoystick_c.h
+++ b/src/joystick/windows/SDL_xinputjoystick_c.h
@@ -41,5 +41,3 @@ extern void SDL_XINPUT_JoystickQuit(void);
 #ifdef __cplusplus
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/libm/math_libm.h b/src/libm/math_libm.h
index f605ba8490..f88c73bf30 100644
--- a/src/libm/math_libm.h
+++ b/src/libm/math_libm.h
@@ -43,5 +43,3 @@ double SDL_uclibc_sqrt(double x);
 double SDL_uclibc_tan(double x);
 
 #endif /* math_libm_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/loadso/dlopen/SDL_sysloadso.c b/src/loadso/dlopen/SDL_sysloadso.c
index 07a8813d20..64016311ac 100644
--- a/src/loadso/dlopen/SDL_sysloadso.c
+++ b/src/loadso/dlopen/SDL_sysloadso.c
@@ -82,5 +82,3 @@ void SDL_UnloadObject(void *handle)
 }
 
 #endif /* SDL_LOADSO_DLOPEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/loadso/dummy/SDL_sysloadso.c b/src/loadso/dummy/SDL_sysloadso.c
index 87ad9e06e9..5894010869 100644
--- a/src/loadso/dummy/SDL_sysloadso.c
+++ b/src/loadso/dummy/SDL_sysloadso.c
@@ -47,5 +47,3 @@ void SDL_UnloadObject(void *handle)
 }
 
 #endif /* SDL_LOADSO_DUMMY || SDL_LOADSO_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/loadso/windows/SDL_sysloadso.c b/src/loadso/windows/SDL_sysloadso.c
index 584508eb81..437985856d 100644
--- a/src/loadso/windows/SDL_sysloadso.c
+++ b/src/loadso/windows/SDL_sysloadso.c
@@ -80,5 +80,3 @@ void SDL_UnloadObject(void *handle)
 }
 
 #endif /* SDL_LOADSO_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/SDL_locale.c b/src/locale/SDL_locale.c
index db46652f35..83e03347ca 100644
--- a/src/locale/SDL_locale.c
+++ b/src/locale/SDL_locale.c
@@ -99,5 +99,3 @@ SDL_GetPreferredLocales(void)
     }
     return build_locales_from_csv_string(locbuf);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/SDL_syslocale.h b/src/locale/SDL_syslocale.h
index 2018d75730..8905c10cdd 100644
--- a/src/locale/SDL_syslocale.h
+++ b/src/locale/SDL_syslocale.h
@@ -31,5 +31,3 @@ extern void SDL_SYS_GetPreferredLocales(char *buf, size_t buflen);
 #ifdef __cplusplus
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/android/SDL_syslocale.c b/src/locale/android/SDL_syslocale.c
index 1b3a186863..35f0ba7b29 100644
--- a/src/locale/android/SDL_syslocale.c
+++ b/src/locale/android/SDL_syslocale.c
@@ -27,5 +27,3 @@ void SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
 {
     Android_JNI_GetLocale(buf, buflen);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/dummy/SDL_syslocale.c b/src/locale/dummy/SDL_syslocale.c
index 9bc5cce855..b116048809 100644
--- a/src/locale/dummy/SDL_syslocale.c
+++ b/src/locale/dummy/SDL_syslocale.c
@@ -27,5 +27,3 @@ void SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
     /* dummy implementation. Caller already zero'd out buffer. */
     SDL_Unsupported();
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/emscripten/SDL_syslocale.c b/src/locale/emscripten/SDL_syslocale.c
index 4ed1229c5b..944350e023 100644
--- a/src/locale/emscripten/SDL_syslocale.c
+++ b/src/locale/emscripten/SDL_syslocale.c
@@ -68,5 +68,3 @@ void SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
     }, buf, buflen);
     /* *INDENT-ON* */ /* clang-format on */
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/haiku/SDL_syslocale.cc b/src/locale/haiku/SDL_syslocale.cc
index b5d85014d2..b12eba4cb5 100644
--- a/src/locale/haiku/SDL_syslocale.cc
+++ b/src/locale/haiku/SDL_syslocale.cc
@@ -72,6 +72,3 @@ SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
         }
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
-
diff --git a/src/locale/macos/SDL_syslocale.m b/src/locale/macos/SDL_syslocale.m
index 2f7c84d1e5..97ae236932 100644
--- a/src/locale/macos/SDL_syslocale.m
+++ b/src/locale/macos/SDL_syslocale.m
@@ -73,5 +73,3 @@ void SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
         }
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/n3ds/SDL_syslocale.c b/src/locale/n3ds/SDL_syslocale.c
index 8bd335d391..b886cea1d2 100644
--- a/src/locale/n3ds/SDL_syslocale.c
+++ b/src/locale/n3ds/SDL_syslocale.c
@@ -54,5 +54,3 @@ GetLocaleIndex(void)
     cfguExit();
     return current_locale;
 }
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/locale/unix/SDL_syslocale.c b/src/locale/unix/SDL_syslocale.c
index 01cb430618..cb994850cf 100644
--- a/src/locale/unix/SDL_syslocale.c
+++ b/src/locale/unix/SDL_syslocale.c
@@ -101,5 +101,3 @@ void SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
 
     SDL_small_free(tmp, isstack);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/vita/SDL_syslocale.c b/src/locale/vita/SDL_syslocale.c
index ccf75ebbb2..db97367b5d 100644
--- a/src/locale/vita/SDL_syslocale.c
+++ b/src/locale/vita/SDL_syslocale.c
@@ -66,5 +66,3 @@ void SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
 
     sceAppUtilShutdown();
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/windows/SDL_syslocale.c b/src/locale/windows/SDL_syslocale.c
index 023d53edd4..a90b1afe8b 100644
--- a/src/locale/windows/SDL_syslocale.c
+++ b/src/locale/windows/SDL_syslocale.c
@@ -108,5 +108,3 @@ void SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
         SDL_SYS_GetPreferredLocales_vista(buf, buflen); /* available on Vista and later. */
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/locale/winrt/SDL_syslocale.c b/src/locale/winrt/SDL_syslocale.c
index 7d5115d0ad..37906b54b6 100644
--- a/src/locale/winrt/SDL_syslocale.c
+++ b/src/locale/winrt/SDL_syslocale.c
@@ -51,5 +51,3 @@ void SDL_SYS_GetPreferredLocales(char *buf, size_t buflen)
         }
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/SDL_sysurl.h b/src/misc/SDL_sysurl.h
index 3f5731a715..d93c101a07 100644
--- a/src/misc/SDL_sysurl.h
+++ b/src/misc/SDL_sysurl.h
@@ -29,5 +29,3 @@ extern int SDL_SYS_OpenURL(const char *url);
 #ifdef __cplusplus
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/SDL_url.c b/src/misc/SDL_url.c
index 2667447148..c1aefd47c4 100644
--- a/src/misc/SDL_url.c
+++ b/src/misc/SDL_url.c
@@ -29,5 +29,3 @@ int SDL_OpenURL(const char *url)
     }
     return SDL_SYS_OpenURL(url);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/android/SDL_sysurl.c b/src/misc/android/SDL_sysurl.c
index f9786803eb..2bf07de297 100644
--- a/src/misc/android/SDL_sysurl.c
+++ b/src/misc/android/SDL_sysurl.c
@@ -27,5 +27,3 @@ int SDL_SYS_OpenURL(const char *url)
 {
     return Android_JNI_OpenURL(url);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/dummy/SDL_sysurl.c b/src/misc/dummy/SDL_sysurl.c
index fd4e5a54d3..609fccca40 100644
--- a/src/misc/dummy/SDL_sysurl.c
+++ b/src/misc/dummy/SDL_sysurl.c
@@ -26,5 +26,3 @@ int SDL_SYS_OpenURL(const char *url)
 {
     return SDL_Unsupported();
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/emscripten/SDL_sysurl.c b/src/misc/emscripten/SDL_sysurl.c
index b7526c7a5e..16df4259a0 100644
--- a/src/misc/emscripten/SDL_sysurl.c
+++ b/src/misc/emscripten/SDL_sysurl.c
@@ -33,5 +33,3 @@ int SDL_SYS_OpenURL(const char *url)
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/haiku/SDL_sysurl.cc b/src/misc/haiku/SDL_sysurl.cc
index ee272e990b..8c25c0fe4c 100644
--- a/src/misc/haiku/SDL_sysurl.cc
+++ b/src/misc/haiku/SDL_sysurl.cc
@@ -30,6 +30,3 @@ SDL_SYS_OpenURL(const char *url)
     const status_t rc = burl.OpenWithPreferredApplication(false);
     return (rc == B_NO_ERROR) ? 0 : SDL_SetError("URL open failed (err=%d)", (int) rc);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
-
diff --git a/src/misc/ios/SDL_sysurl.m b/src/misc/ios/SDL_sysurl.m
index 6c35a885ab..248605882b 100644
--- a/src/misc/ios/SDL_sysurl.m
+++ b/src/misc/ios/SDL_sysurl.m
@@ -33,5 +33,3 @@ int SDL_SYS_OpenURL(const char *url)
         return [[UIApplication sharedApplication] openURL:nsurl] ? 0 : -1;
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/macos/SDL_sysurl.m b/src/misc/macos/SDL_sysurl.m
index ee93ce9e3e..eb97fe604f 100644
--- a/src/misc/macos/SDL_sysurl.m
+++ b/src/misc/macos/SDL_sysurl.m
@@ -33,5 +33,3 @@ int SDL_SYS_OpenURL(const char *url)
         return status == noErr ? 0 : -1;
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/riscos/SDL_sysurl.c b/src/misc/riscos/SDL_sysurl.c
index be2b1e8530..f02b52334b 100644
--- a/src/misc/riscos/SDL_sysurl.c
+++ b/src/misc/riscos/SDL_sysurl.c
@@ -44,5 +44,3 @@ int SDL_SYS_OpenURL(const char *url)
 
     return (regs.r[0] & 1) ? SDL_SetError("Couldn't open given URL.") : 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/unix/SDL_sysurl.c b/src/misc/unix/SDL_sysurl.c
index caa5e622a5..c7e08209d0 100644
--- a/src/misc/unix/SDL_sysurl.c
+++ b/src/misc/unix/SDL_sysurl.c
@@ -66,5 +66,3 @@ int SDL_SYS_OpenURL(const char *url)
         }
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/vita/SDL_sysurl.c b/src/misc/vita/SDL_sysurl.c
index b460b94892..43f1dfaa49 100644
--- a/src/misc/vita/SDL_sysurl.c
+++ b/src/misc/vita/SDL_sysurl.c
@@ -39,5 +39,3 @@ int SDL_SYS_OpenURL(const char *url)
     sceAppUtilLaunchWebBrowser(&browser_param);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/windows/SDL_sysurl.c b/src/misc/windows/SDL_sysurl.c
index 13adeb10e5..dca505cd6a 100644
--- a/src/misc/windows/SDL_sysurl.c
+++ b/src/misc/windows/SDL_sysurl.c
@@ -57,5 +57,3 @@ int SDL_SYS_OpenURL(const char *url)
     return (rc > ((HINSTANCE)32)) ? 0 : WIN_SetError("Couldn't open given URL.");
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/misc/winrt/SDL_sysurl.cpp b/src/misc/winrt/SDL_sysurl.cpp
index dcaf839c69..28a52567d2 100644
--- a/src/misc/winrt/SDL_sysurl.cpp
+++ b/src/misc/winrt/SDL_sysurl.cpp
@@ -36,5 +36,3 @@ int SDL_SYS_OpenURL(const char *url)
     Windows::System::Launcher::LaunchUriAsync(uri);
     return 0; // oh well, we're not waiting on an async task here.
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/SDL_power.c b/src/power/SDL_power.c
index 8ee87b78cd..81a3b4054c 100644
--- a/src/power/SDL_power.c
+++ b/src/power/SDL_power.c
@@ -115,5 +115,3 @@ SDL_GetPowerInfo(int *seconds, int *percent)
     *percent = -1;
     return SDL_POWERSTATE_UNKNOWN;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/SDL_syspower.h b/src/power/SDL_syspower.h
index b97897be90..9f3b042ee0 100644
--- a/src/power/SDL_syspower.h
+++ b/src/power/SDL_syspower.h
@@ -45,5 +45,3 @@ SDL_bool SDL_GetPowerInfo_Emscripten(SDL_PowerState *, int *, int *);
 /* SDL_bool SDL_GetPowerInfo_Hardwired(SDL_PowerState *, int *, int *);*/
 
 #endif /* SDL_syspower_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/android/SDL_syspower.c b/src/power/android/SDL_syspower.c
index 339f957233..2872000417 100644
--- a/src/power/android/SDL_syspower.c
+++ b/src/power/android/SDL_syspower.c
@@ -59,5 +59,3 @@ SDL_GetPowerInfo_Android(SDL_PowerState *state, int *seconds, int *percent)
 
 #endif /* SDL_POWER_ANDROID */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/emscripten/SDL_syspower.c b/src/power/emscripten/SDL_syspower.c
index 48957aa9be..a0459cd7fa 100644
--- a/src/power/emscripten/SDL_syspower.c
+++ b/src/power/emscripten/SDL_syspower.c
@@ -57,5 +57,3 @@ SDL_GetPowerInfo_Emscripten(SDL_PowerState *state, int *seconds, int *percent)
 
 #endif /* SDL_POWER_EMSCRIPTEN */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/haiku/SDL_syspower.c b/src/power/haiku/SDL_syspower.c
index 34ab6261ca..459870f8ad 100644
--- a/src/power/haiku/SDL_syspower.c
+++ b/src/power/haiku/SDL_syspower.c
@@ -122,5 +122,3 @@ SDL_GetPowerInfo_Haiku(SDL_PowerState *state, int *seconds, int *percent)
 
 #endif /* SDL_POWER_HAIKU */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/linux/SDL_syspower.c b/src/power/linux/SDL_syspower.c
index ec518483e9..290aaa02a0 100644
--- a/src/power/linux/SDL_syspower.c
+++ b/src/power/linux/SDL_syspower.c
@@ -644,5 +644,3 @@ SDL_GetPowerInfo_Linux_org_freedesktop_upower(SDL_PowerState *state, int *second
 
 #endif /* SDL_POWER_LINUX */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/macos/SDL_syspower.c b/src/power/macos/SDL_syspower.c
index 469a3763a4..9572b2271b 100644
--- a/src/power/macos/SDL_syspower.c
+++ b/src/power/macos/SDL_syspower.c
@@ -184,5 +184,3 @@ SDL_GetPowerInfo_MacOSX(SDL_PowerState *state, int *seconds, int *percent)
 
 #endif /* SDL_POWER_MACOSX */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/n3ds/SDL_syspower.c b/src/power/n3ds/SDL_syspower.c
index 8ce358f752..4b13ae52d7 100644
--- a/src/power/n3ds/SDL_syspower.c
+++ b/src/power/n3ds/SDL_syspower.c
@@ -104,5 +104,3 @@ GetBatteryPercentage(void)
 }
 
 #endif /* !SDL_POWER_DISABLED && SDL_POWER_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/power/psp/SDL_syspower.c b/src/power/psp/SDL_syspower.c
index 77760e3211..307385225b 100644
--- a/src/power/psp/SDL_syspower.c
+++ b/src/power/psp/SDL_syspower.c
@@ -61,5 +61,3 @@ SDL_GetPowerInfo_PSP(SDL_PowerState *state, int *seconds,
 
 #endif /* SDL_POWER_PSP */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/uikit/SDL_syspower.h b/src/power/uikit/SDL_syspower.h
index 9c0d85054b..a6a4de8edc 100644
--- a/src/power/uikit/SDL_syspower.h
+++ b/src/power/uikit/SDL_syspower.h
@@ -26,5 +26,3 @@ void SDL_UIKit_UpdateBatteryMonitoring(void);
 SDL_bool SDL_GetPowerInfo_UIKit(SDL_PowerState *state, int *seconds, int *percent);
 
 #endif /* SDL_POWER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/uikit/SDL_syspower.m b/src/power/uikit/SDL_syspower.m
index 30026c8c2e..b06bdb6d82 100644
--- a/src/power/uikit/SDL_syspower.m
+++ b/src/power/uikit/SDL_syspower.m
@@ -104,5 +104,3 @@ SDL_GetPowerInfo_UIKit(SDL_PowerState *state, int *seconds, int *percent)
 
 #endif /* SDL_POWER_UIKIT */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/vita/SDL_syspower.c b/src/power/vita/SDL_syspower.c
index 16b632e283..a2532785b9 100644
--- a/src/power/vita/SDL_syspower.c
+++ b/src/power/vita/SDL_syspower.c
@@ -61,5 +61,3 @@ SDL_GetPowerInfo_VITA(SDL_PowerState *state, int *seconds,
 
 #endif /* SDL_POWER_VITA */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/windows/SDL_syspower.c b/src/power/windows/SDL_syspower.c
index 7613aa3ad3..abe38253f5 100644
--- a/src/power/windows/SDL_syspower.c
+++ b/src/power/windows/SDL_syspower.c
@@ -69,5 +69,3 @@ SDL_GetPowerInfo_Windows(SDL_PowerState *state, int *seconds, int *percent)
 
 #endif /* SDL_POWER_WINDOWS */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/power/winrt/SDL_syspower.cpp b/src/power/winrt/SDL_syspower.cpp
index 1cb4b3f957..461ce3e941 100644
--- a/src/power/winrt/SDL_syspower.cpp
+++ b/src/power/winrt/SDL_syspower.cpp
@@ -37,5 +37,3 @@ SDL_GetPowerInfo_WinRT(SDL_PowerState *state, int *seconds, int *percent)
 
 #endif /* SDL_POWER_WINRT */
 #endif /* SDL_POWER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/SDL_d3dmath.c b/src/render/SDL_d3dmath.c
index da915d733d..cd1b056476 100644
--- a/src/render/SDL_d3dmath.c
+++ b/src/render/SDL_d3dmath.c
@@ -130,5 +130,3 @@ Float4X4 MatrixRotationZ(float r)
 }
 
 #endif /* (SDL_VIDEO_RENDER_D3D || SDL_VIDEO_RENDER_D3D11 || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/SDL_d3dmath.h b/src/render/SDL_d3dmath.h
index 417dacd3da..92cd7376d5 100644
--- a/src/render/SDL_d3dmath.h
+++ b/src/render/SDL_d3dmath.h
@@ -79,5 +79,3 @@ Float4X4 MatrixRotationZ(float r);
 #endif
 
 #endif /* (SDL_VIDEO_RENDER_D3D || SDL_VIDEO_RENDER_D3D11 || SDL_VIDEO_RENDER_D3D12) && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index a580b2b523..56aa52978e 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -4484,5 +4484,3 @@ int SDL_RenderSetVSync(SDL_Renderer *renderer, int vsync)
     }
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/SDL_sysrender.h b/src/render/SDL_sysrender.h
index 78cc009e62..93cc438a16 100644
--- a/src/render/SDL_sysrender.h
+++ b/src/render/SDL_sysrender.h
@@ -325,5 +325,3 @@ extern int SDL_PrivateUpperBlitScaled(SDL_Surface *src, const SDL_Rect *srcrect,
 #endif
 
 #endif /* SDL_sysrender_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/SDL_yuv_sw.c b/src/render/SDL_yuv_sw.c
index 55d02ce00b..e613cae512 100644
--- a/src/render/SDL_yuv_sw.c
+++ b/src/render/SDL_yuv_sw.c
@@ -401,5 +401,3 @@ void SDL_SW_DestroyYUVTexture(SDL_SW_YUVTexture *swdata)
 }
 
 #endif /* SDL_HAVE_YUV */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/SDL_yuv_sw_c.h b/src/render/SDL_yuv_sw_c.h
index 086611532d..bb69e4f998 100644
--- a/src/render/SDL_yuv_sw_c.h
+++ b/src/render/SDL_yuv_sw_c.h
@@ -65,5 +65,3 @@ int SDL_SW_CopyYUVToRGB(SDL_SW_YUVTexture *swdata, const SDL_Rect *srcrect,
 void SDL_SW_DestroyYUVTexture(SDL_SW_YUVTexture *swdata);
 
 #endif /* SDL_yuv_sw_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c
index 0efa5c6f7f..78f64f8ddb 100644
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@@ -1760,5 +1760,3 @@ SDL_RenderGetD3D9Device(SDL_Renderer *renderer)
     return device;
 }
 #endif /* defined(__WIN32__) || defined(__WINGDK__) */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d/SDL_shaders_d3d.c b/src/render/direct3d/SDL_shaders_d3d.c
index 8749214b23..e7a9ae8008 100644
--- a/src/render/direct3d/SDL_shaders_d3d.c
+++ b/src/render/direct3d/SDL_shaders_d3d.c
@@ -266,5 +266,3 @@ HRESULT D3D9_CreatePixelShader(IDirect3DDevice9 *d3dDevice, D3D9_Shader shader,
 }
 
 #endif /* SDL_VIDEO_RENDER_D3D && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d/SDL_shaders_d3d.h b/src/render/direct3d/SDL_shaders_d3d.h
index 12b03f42eb..4e5ad2b701 100644
--- a/src/render/direct3d/SDL_shaders_d3d.h
+++ b/src/render/direct3d/SDL_shaders_d3d.h
@@ -31,5 +31,3 @@ typedef enum
 } D3D9_Shader;
 
 extern HRESULT D3D9_CreatePixelShader(IDirect3DDevice9 *d3dDevice, D3D9_Shader shader, IDirect3DPixelShader9 **pixelShader);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c
index 288efcee78..6526806c67 100644
--- a/src/render/direct3d11/SDL_render_d3d11.c
+++ b/src/render/direct3d11/SDL_render_d3d11.c
@@ -2439,5 +2439,3 @@ SDL_RenderGetD3D11Device(SDL_Renderer *renderer)
     return device;
 }
 #endif /* defined(__WIN32__) || defined(__WINGDK__) */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d11/SDL_render_winrt.cpp b/src/render/direct3d11/SDL_render_winrt.cpp
index 1aa35331e1..eb4c658c4b 100644
--- a/src/render/direct3d11/SDL_render_winrt.cpp
+++ b/src/render/direct3d11/SDL_render_winrt.cpp
@@ -113,5 +113,3 @@ D3D11_GetCurrentRotation()
 }
 
 #endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d11/SDL_render_winrt.h b/src/render/direct3d11/SDL_render_winrt.h
index ba0ee6d9a8..63e4b2cf59 100644
--- a/src/render/direct3d11/SDL_render_winrt.h
+++ b/src/render/direct3d11/SDL_render_winrt.h
@@ -34,5 +34,3 @@ DXGI_MODE_ROTATION D3D11_GetCurrentRotation();
 #endif
 
 #endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d11/SDL_shaders_d3d11.c b/src/render/direct3d11/SDL_shaders_d3d11.c
index 43750567e5..3d5963156a 100644
--- a/src/render/direct3d11/SDL_shaders_d3d11.c
+++ b/src/render/direct3d11/SDL_shaders_d3d11.c
@@ -1948,5 +1948,3 @@ int D3D11_CreatePixelShader(ID3D11Device1 *d3dDevice, D3D11_Shader shader, ID3D1
 }
 
 #endif /* SDL_VIDEO_RENDER_D3D11 && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d11/SDL_shaders_d3d11.h b/src/render/direct3d11/SDL_shaders_d3d11.h
index 3bb62678d0..e5a95b1d95 100644
--- a/src/render/direct3d11/SDL_shaders_d3d11.h
+++ b/src/render/direct3d11/SDL_shaders_d3d11.h
@@ -42,5 +42,3 @@ typedef enum
 
 extern int D3D11_CreateVertexShader(ID3D11Device1 *d3dDevice, ID3D11VertexShader **vertexShader, ID3D11InputLayout **inputLayout);
 extern int D3D11_CreatePixelShader(ID3D11Device1 *d3dDevice, D3D11_Shader shader, ID3D11PixelShader **pixelShader);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d12/SDL_render_d3d12.c b/src/render/direct3d12/SDL_render_d3d12.c
index ffd1c56207..e727cbca51 100644
--- a/src/render/direct3d12/SDL_render_d3d12.c
+++ b/src/render/direct3d12/SDL_render_d3d12.c
@@ -3078,5 +3078,3 @@ extern "C"
     return device;
 }
 #endif /* defined(__WIN32__) || defined(__GDK__) */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d12/SDL_shaders_d3d12.c b/src/render/direct3d12/SDL_shaders_d3d12.c
index fec9250ab9..0480fee534 100644
--- a/src/render/direct3d12/SDL_shaders_d3d12.c
+++ b/src/render/direct3d12/SDL_shaders_d3d12.c
@@ -6933,5 +6933,3 @@ void D3D12_GetRootSignatureData(D3D12_RootSignature rootSig, D3D12_SHADER_BYTECO
 }
 
 #endif /* SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED  && !defined(__XBOXONE__) && !defined(__XBOXSERIES__) */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d12/SDL_shaders_d3d12.h b/src/render/direct3d12/SDL_shaders_d3d12.h
index 9f1089dfba..57be9494de 100644
--- a/src/render/direct3d12/SDL_shaders_d3d12.h
+++ b/src/render/direct3d12/SDL_shaders_d3d12.h
@@ -65,5 +65,3 @@ extern void D3D12_GetRootSignatureData(D3D12_RootSignature rootSig, D3D12_SHADER
 #ifdef __cplusplus
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp b/src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp
index 293910bbcd..e6f4e1fd73 100644
--- a/src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp
+++ b/src/render/direct3d12/SDL_shaders_d3d12_xboxone.cpp
@@ -25,5 +25,3 @@
 #error "This is a placeholder Xbox file, as the real one is under NDA. See README-gdk.md for more info."
 
 #endif /* SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED && defined(__XBOXONE__) */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp b/src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp
index 7820191b08..0048551aa5 100644
--- a/src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp
+++ b/src/render/direct3d12/SDL_shaders_d3d12_xboxseries.cpp
@@ -25,5 +25,3 @@
 #error "This is a placeholder Xbox file, as the real one is under NDA. See README-gdk.md for more info."
 
 #endif /* SDL_VIDEO_RENDER_D3D12 && !SDL_RENDER_DISABLED && defined(__XBOXSERIES__) */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m
index ce73198cc5..5da255a30f 100644
--- a/src/render/metal/SDL_render_metal.m
+++ b/src/render/metal/SDL_render_metal.m
@@ -1988,5 +1988,3 @@ SDL_RenderDriver METAL_RenderDriver = {
 };
 
 #endif /* SDL_VIDEO_RENDER_METAL && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengl/SDL_glfuncs.h b/src/render/opengl/SDL_glfuncs.h
index f85f9029fd..a3aaaa1252 100644
--- a/src/render/opengl/SDL_glfuncs.h
+++ b/src/render/opengl/SDL_glfuncs.h
@@ -474,5 +474,3 @@ SDL_PROC(void, glVertexPointer,
          (GLint size, GLenum type, GLsizei stride,
           const GLvoid *pointer))
 SDL_PROC(void, glViewport, (GLint x, GLint y, GLsizei width, GLsizei height))
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index 5060f1dcba..d2116dea99 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -1964,5 +1964,3 @@ SDL_RenderDriver GL_RenderDriver = {
 };
 
 #endif /* SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengl/SDL_shaders_gl.c b/src/render/opengl/SDL_shaders_gl.c
index 2e7f80f888..6981e8fcd1 100644
--- a/src/render/opengl/SDL_shaders_gl.c
+++ b/src/render/opengl/SDL_shaders_gl.c
@@ -577,5 +577,3 @@ void GL_DestroyShaderContext(GL_ShaderContext *ctx)
 }
 
 #endif /* SDL_VIDEO_RENDER_OGL && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengl/SDL_shaders_gl.h b/src/render/opengl/SDL_shaders_gl.h
index d7498a5732..20b4cb7d60 100644
--- a/src/render/opengl/SDL_shaders_gl.h
+++ b/src/render/opengl/SDL_shaders_gl.h
@@ -56,5 +56,3 @@ extern void GL_SelectShader(GL_ShaderContext *ctx, GL_Shader shader);
 extern void GL_DestroyShaderContext(GL_ShaderContext *ctx);
 
 #endif /* SDL_shaders_gl_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c
index ef5bfebe2a..03cd314681 100644
--- a/src/render/opengles2/SDL_render_gles2.c
+++ b/src/render/opengles2/SDL_render_gles2.c
@@ -2248,5 +2248,3 @@ SDL_RenderDriver GLES2_RenderDriver = {
 };
 
 #endif /* SDL_VIDEO_RENDER_OGL_ES2 && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengles2/SDL_shaders_gles2.c b/src/render/opengles2/SDL_shaders_gles2.c
index 51658c773a..1f74b8b294 100644
--- a/src/render/opengles2/SDL_shaders_gles2.c
+++ b/src/render/opengles2/SDL_shaders_gles2.c
@@ -442,5 +442,3 @@ const char *GLES2_GetShader(GLES2_ShaderType type)
 }
 
 #endif /* SDL_VIDEO_RENDER_OGL_ES2 && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/opengles2/SDL_shaders_gles2.h b/src/render/opengles2/SDL_shaders_gles2.h
index e9bc53630a..89e37d6650 100644
--- a/src/render/opengles2/SDL_shaders_gles2.h
+++ b/src/render/opengles2/SDL_shaders_gles2.h
@@ -69,5 +69,3 @@ extern GLES2_ShaderIncludeType GLES2_GetTexCoordPrecisionEnumFromHint(void);
 #endif /* SDL_VIDEO_RENDER_OGL_ES2 */
 
 #endif /* SDL_shaders_gles2_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/ps2/SDL_render_ps2.c b/src/render/ps2/SDL_render_ps2.c
index bbbfc3a1fe..80e143ad41 100644
--- a/src/render/ps2/SDL_render_ps2.c
+++ b/src/render/ps2/SDL_render_ps2.c
@@ -676,5 +676,3 @@ SDL_RenderDriver PS2_RenderDriver = {
 };
 
 #endif /* SDL_VIDEO_RENDER_PS2 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/psp/SDL_render_psp.c b/src/render/psp/SDL_render_psp.c
index 97e2767324..48bad26f62 100644
--- a/src/render/psp/SDL_render_psp.c
+++ b/src/render/psp/SDL_render_psp.c
@@ -1421,5 +1421,3 @@ SDL_RenderDriver PSP_RenderDriver = {
 };
 
 #endif /* SDL_VIDEO_RENDER_PSP */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_blendfillrect.c b/src/render/software/SDL_blendfillrect.c
index f22d090b72..60a370ec5d 100644
--- a/src/render/software/SDL_blendfillrect.c
+++ b/src/render/software/SDL_blendfillrect.c
@@ -344,5 +344,3 @@ int SDL_BlendFillRects(SDL_Surface *dst, const SDL_Rect *rects, int count,
 }
 
 #endif /* SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_blendfillrect.h b/src/render/software/SDL_blendfillrect.h
index 5c088ee845..4154f04a29 100644
--- a/src/render/software/SDL_blendfillrect.h
+++ b/src/render/software/SDL_blendfillrect.h
@@ -28,5 +28,3 @@ extern int SDL_BlendFillRect(SDL_Surface *dst, const SDL_Rect *rect, SDL_BlendMo
 extern int SDL_BlendFillRects(SDL_Surface *dst, const SDL_Rect *rects, int count, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
 
 #endif /* SDL_blendfillrect_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_blendline.c b/src/render/software/SDL_blendline.c
index 89220966c6..0114f33b44 100644
--- a/src/render/software/SDL_blendline.c
+++ b/src/render/software/SDL_blendline.c
@@ -860,5 +860,3 @@ int SDL_BlendLines(SDL_Surface *dst, const SDL_Point *points, int count,
 }
 
 #endif /* SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_blendline.h b/src/render/software/SDL_blendline.h
index c70a927ba1..4b9a08739e 100644
--- a/src/render/software/SDL_blendline.h
+++ b/src/render/software/SDL_blendline.h
@@ -28,5 +28,3 @@ extern int SDL_BlendLine(SDL_Surface *dst, int x1, int y1, int x2, int y2, SDL_B
 extern int SDL_BlendLines(SDL_Surface *dst, const SDL_Point *points, int count, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
 
 #endif /* SDL_blendline_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_blendpoint.c b/src/render/software/SDL_blendpoint.c
index 18a80421c3..e7d0c44c68 100644
--- a/src/render/software/SDL_blendpoint.c
+++ b/src/render/software/SDL_blendpoint.c
@@ -349,5 +349,3 @@ int SDL_BlendPoints(SDL_Surface *dst, const SDL_Point *points, int count,
 }
 
 #endif /* SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_blendpoint.h b/src/render/software/SDL_blendpoint.h
index 2a02ffef52..4016d37697 100644
--- a/src/render/software/SDL_blendpoint.h
+++ b/src/render/software/SDL_blendpoint.h
@@ -28,5 +28,3 @@ extern int SDL_BlendPoint(SDL_Surface *dst, int x, int y, SDL_BlendMode blendMod
 extern int SDL_BlendPoints(SDL_Surface *dst, const SDL_Point *points, int count, SDL_BlendMode blendMode, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
 
 #endif /* SDL_blendpoint_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_draw.h b/src/render/software/SDL_draw.h
index f3b8bbfc76..9b063fd729 100644
--- a/src/render/software/SDL_draw.h
+++ b/src/render/software/SDL_draw.h
@@ -660,5 +660,3 @@
             pixel += skip;                                             \
         }                                                              \
     } while (0)
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_drawline.c b/src/render/software/SDL_drawline.c
index 8fe9c8983a..b543db1d71 100644
--- a/src/render/software/SDL_drawline.c
+++ b/src/render/software/SDL_drawline.c
@@ -198,5 +198,3 @@ int SDL_DrawLines(SDL_Surface *dst, const SDL_Point *points, int count,
 }
 
 #endif /* SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_drawline.h b/src/render/software/SDL_drawline.h
index 390e4dff6b..38e6b42ba9 100644
--- a/src/render/software/SDL_drawline.h
+++ b/src/render/software/SDL_drawline.h
@@ -28,5 +28,3 @@ extern int SDL_DrawLine(SDL_Surface *dst, int x1, int y1, int x2, int y2, Uint32
 extern int SDL_DrawLines(SDL_Surface *dst, const SDL_Point *points, int count, Uint32 color);
 
 #endif /* SDL_drawline_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_drawpoint.c b/src/render/software/SDL_drawpoint.c
index 692ea0f873..dbbd5dc4cf 100644
--- a/src/render/software/SDL_drawpoint.c
+++ b/src/render/software/SDL_drawpoint.c
@@ -107,5 +107,3 @@ int SDL_DrawPoints(SDL_Surface *dst, const SDL_Point *points, int count,
 }
 
 #endif /* SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_drawpoint.h b/src/render/software/SDL_drawpoint.h
index 5987aca21e..e58bb29ce3 100644
--- a/src/render/software/SDL_drawpoint.h
+++ b/src/render/software/SDL_drawpoint.h
@@ -28,5 +28,3 @@ extern int SDL_DrawPoint(SDL_Surface *dst, int x, int y, Uint32 color);
 extern int SDL_DrawPoints(SDL_Surface *dst, const SDL_Point *points, int count, Uint32 color);
 
 #endif /* SDL_drawpoint_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_render_sw.c b/src/render/software/SDL_render_sw.c
index 641131047a..dbeaa0cc8c 100644
--- a/src/render/software/SDL_render_sw.c
+++ b/src/render/software/SDL_render_sw.c
@@ -1184,5 +1184,3 @@ SDL_RenderDriver SW_RenderDriver = {
 };
 
 #endif /* SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_render_sw_c.h b/src/render/software/SDL_render_sw_c.h
index f20849bcda..d208697d4a 100644
--- a/src/render/software/SDL_render_sw_c.h
+++ b/src/render/software/SDL_render_sw_c.h
@@ -25,5 +25,3 @@
 extern SDL_Renderer *SW_CreateRendererForSurface(SDL_Surface *surface);
 
 #endif /* SDL_render_sw_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_triangle.c b/src/render/software/SDL_triangle.c
index 86ec234260..c291b8e5f1 100644
--- a/src/render/software/SDL_triangle.c
+++ b/src/render/software/SDL_triangle.c
@@ -889,5 +889,3 @@ static void SDL_BlitTriangle_Slow(SDL_BlitInfo *info,
 }
 
 #endif /* SDL_VIDEO_RENDER_SW && !SDL_RENDER_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/software/SDL_triangle.h b/src/render/software/SDL_triangle.h
index 68a3662074..128faf3d5c 100644
--- a/src/render/software/SDL_triangle.h
+++ b/src/render/software/SDL_triangle.h
@@ -38,5 +38,3 @@ extern int SDL_SW_BlitTriangle(
 extern void trianglepoint_2_fixedpoint(SDL_Point *a);
 
 #endif /* SDL_triangle_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/vitagxm/SDL_render_vita_gxm.c b/src/render/vitagxm/SDL_render_vita_gxm.c
index 802945b0a8..7e5660c05f 100644
--- a/src/render/vitagxm/SDL_render_vita_gxm.c
+++ b/src/render/vitagxm/SDL_render_vita_gxm.c
@@ -1224,5 +1224,3 @@ static void VITA_GXM_DestroyRenderer(SDL_Renderer *renderer)
 }
 
 #endif /* SDL_VIDEO_RENDER_VITA_GXM */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/vitagxm/SDL_render_vita_gxm_memory.c b/src/render/vitagxm/SDL_render_vita_gxm_memory.c
index 95aac51228..0696bba255 100644
--- a/src/render/vitagxm/SDL_render_vita_gxm_memory.c
+++ b/src/render/vitagxm/SDL_render_vita_gxm_memory.c
@@ -179,5 +179,3 @@ void vita_mem_fragment_usse_free(SceUID uid)
 }
 
 #endif /* SDL_VIDEO_RENDER_VITA_GXM */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/vitagxm/SDL_render_vita_gxm_memory.h b/src/render/vitagxm/SDL_render_vita_gxm_memory.h
index 861ec5b730..2fa4e93d83 100644
--- a/src/render/vitagxm/SDL_render_vita_gxm_memory.h
+++ b/src/render/vitagxm/SDL_render_vita_gxm_memory.h
@@ -40,5 +40,3 @@ void *vita_mem_fragment_usse_alloc(unsigned int size, SceUID *uid, unsigned int
 void vita_mem_fragment_usse_free(SceUID uid);
 
 #endif /* SDL_RENDER_VITA_GXM_MEMORY_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/vitagxm/SDL_render_vita_gxm_shaders.h b/src/render/vitagxm/SDL_render_vita_gxm_shaders.h
index eb00184c87..16bd586286 100644
--- a/src/render/vitagxm/SDL_render_vita_gxm_shaders.h
+++ b/src/render/vitagxm/SDL_render_vita_gxm_shaders.h
@@ -280,5 +280,3 @@ static const SceGxmProgram *const textureVertexProgramGxp = (const SceGxmProgram
 static const SceGxmProgram *const textureFragmentProgramGxp = (const SceGxmProgram *)gxm_shader_texture_f;
 
 #endif // SDL_RENDER_VITA_GXM_SHADERS_H
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/vitagxm/SDL_render_vita_gxm_tools.c b/src/render/vitagxm/SDL_render_vita_gxm_tools.c
index 50cbbd2ffe..338b2a7a2a 100644
--- a/src/render/vitagxm/SDL_render_vita_gxm_tools.c
+++ b/src/render/vitagxm/SDL_render_vita_gxm_tools.c
@@ -1215,5 +1215,3 @@ void gxm_term_for_common_dialog(void)
 }
 
 #endif /* SDL_VIDEO_RENDER_VITA_GXM */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/vitagxm/SDL_render_vita_gxm_tools.h b/src/render/vitagxm/SDL_render_vita_gxm_tools.h
index 278de5319f..3fd09cd1c6 100644
--- a/src/render/vitagxm/SDL_render_vita_gxm_tools.h
+++ b/src/render/vitagxm/SDL_render_vita_gxm_tools.h
@@ -61,5 +61,3 @@ void gxm_swap_for_common_dialog(void);
 void gxm_term_for_common_dialog(void);
 
 #endif /* SDL_RENDER_VITA_GXM_TOOLS_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/render/vitagxm/SDL_render_vita_gxm_types.h b/src/render/vitagxm/SDL_render_vita_gxm_types.h
index 36268baeda..b735e5c384 100644
--- a/src/render/vitagxm/SDL_render_vita_gxm_types.h
+++ b/src/render/vitagxm/SDL_render_vita_gxm_types.h
@@ -209,5 +209,3 @@ typedef struct
 } VITA_GXM_TextureData;
 
 #endif /* SDL_RENDER_VITA_GXM_TYPES_H */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/SDL_sensor.c b/src/sensor/SDL_sensor.c
index d17dd914c8..eac08299dd 100644
--- a/src/sensor/SDL_sensor.c
+++ b/src/sensor/SDL_sensor.c
@@ -522,5 +522,3 @@ void SDL_SensorUpdate(void)
 
     SDL_UnlockSensors();
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/SDL_sensor_c.h b/src/sensor/SDL_sensor_c.h
index 0d2136324a..7ddb06eca8 100644
--- a/src/sensor/SDL_sensor_c.h
+++ b/src/sensor/SDL_sensor_c.h
@@ -38,5 +38,3 @@ extern void SDL_SensorQuit(void);
 extern int SDL_PrivateSensorUpdate(Uint64 timestamp, SDL_Sensor *sensor, Uint64 sensor_timestamp, float *data, int num_values);
 
 #endif /* SDL_sensor_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/SDL_syssensor.h b/src/sensor/SDL_syssensor.h
index c333077718..5389dd3a98 100644
--- a/src/sensor/SDL_syssensor.h
+++ b/src/sensor/SDL_syssensor.h
@@ -102,5 +102,3 @@ extern SDL_SensorDriver SDL_VITA_SensorDriver;
 extern SDL_SensorDriver SDL_N3DS_SensorDriver;
 
 #endif /* SDL_syssensor_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/android/SDL_androidsensor.c b/src/sensor/android/SDL_androidsensor.c
index 57d0d97406..8d9a0523df 100644
--- a/src/sensor/android/SDL_androidsensor.c
+++ b/src/sensor/android/SDL_androidsensor.c
@@ -200,5 +200,3 @@ SDL_SensorDriver SDL_ANDROID_SensorDriver = {
 };
 
 #endif /* SDL_SENSOR_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/android/SDL_androidsensor.h b/src/sensor/android/SDL_androidsensor.h
index 156d79ce98..543a8d81ea 100644
--- a/src/sensor/android/SDL_androidsensor.h
+++ b/src/sensor/android/SDL_androidsensor.h
@@ -26,5 +26,3 @@ struct sensor_hwdata
     ASensorRef asensor;
     ASensorEventQueue *eventqueue;
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/coremotion/SDL_coremotionsensor.h b/src/sensor/coremotion/SDL_coremotionsensor.h
index 776a93c67f..3e731263d3 100644
--- a/src/sensor/coremotion/SDL_coremotionsensor.h
+++ b/src/sensor/coremotion/SDL_coremotionsensor.h
@@ -25,5 +25,3 @@ struct sensor_hwdata
 {
     float data[3];
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/coremotion/SDL_coremotionsensor.m b/src/sensor/coremotion/SDL_coremotionsensor.m
index f4c2351fe0..25e8e21d6e 100644
--- a/src/sensor/coremotion/SDL_coremotionsensor.m
+++ b/src/sensor/coremotion/SDL_coremotionsensor.m
@@ -212,5 +212,3 @@ SDL_SensorDriver SDL_COREMOTION_SensorDriver = {
 };
 
 #endif /* SDL_SENSOR_COREMOTION */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/dummy/SDL_dummysensor.c b/src/sensor/dummy/SDL_dummysensor.c
index 145fa9c08a..62942e1e9f 100644
--- a/src/sensor/dummy/SDL_dummysensor.c
+++ b/src/sensor/dummy/SDL_dummysensor.c
@@ -91,5 +91,3 @@ SDL_SensorDriver SDL_DUMMY_SensorDriver = {
 };
 
 #endif /* SDL_SENSOR_DUMMY || SDL_SENSOR_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/dummy/SDL_dummysensor.h b/src/sensor/dummy/SDL_dummysensor.h
index cb0c28adbf..6a50a83b27 100644
--- a/src/sensor/dummy/SDL_dummysensor.h
+++ b/src/sensor/dummy/SDL_dummysensor.h
@@ -19,5 +19,3 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "SDL_internal.h"
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/n3ds/SDL_n3dssensor.c b/src/sensor/n3ds/SDL_n3dssensor.c
index 5ad464c103..8be48ff8f7 100644
--- a/src/sensor/n3ds/SDL_n3dssensor.c
+++ b/src/sensor/n3ds/SDL_n3dssensor.c
@@ -205,5 +205,3 @@ SDL_SensorDriver SDL_N3DS_SensorDriver = {
 };
 
 #endif /* SDL_SENSOR_N3DS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/vita/SDL_vitasensor.c b/src/sensor/vita/SDL_vitasensor.c
index e9fc985313..45c1b59f67 100644
--- a/src/sensor/vita/SDL_vitasensor.c
+++ b/src/sensor/vita/SDL_vitasensor.c
@@ -202,5 +202,3 @@ SDL_SensorDriver SDL_VITA_SensorDriver = {
 };
 
 #endif /* SDL_SENSOR_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/vita/SDL_vitasensor.h b/src/sensor/vita/SDL_vitasensor.h
index 3610d8e822..3b8675f2d9 100644
--- a/src/sensor/vita/SDL_vitasensor.h
+++ b/src/sensor/vita/SDL_vitasensor.h
@@ -27,5 +27,3 @@ struct sensor_hwdata
     unsigned int last_tick;
     Uint64 sensor_timestamp;
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/windows/SDL_windowssensor.c b/src/sensor/windows/SDL_windowssensor.c
index 54f86ed3d2..ffa5bb611c 100644
--- a/src/sensor/windows/SDL_windowssensor.c
+++ b/src/sensor/windows/SDL_windowssensor.c
@@ -483,5 +483,3 @@ SDL_SensorDriver SDL_WINDOWS_SensorDriver = {
 };
 
 #endif /* SDL_SENSOR_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/sensor/windows/SDL_windowssensor.h b/src/sensor/windows/SDL_windowssensor.h
index cb0c28adbf..6a50a83b27 100644
--- a/src/sensor/windows/SDL_windowssensor.h
+++ b/src/sensor/windows/SDL_windowssensor.h
@@ -19,5 +19,3 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "SDL_internal.h"
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/stdlib/SDL_crc16.c b/src/stdlib/SDL_crc16.c
index 9a26aaaab5..6f8d51a506 100644
--- a/src/stdlib/SDL_crc16.c
+++ b/src/stdlib/SDL_crc16.c
@@ -50,5 +50,3 @@ Uint16 SDL_crc16(Uint16 crc, const void *data, size_t len)
     }
     return crc;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/stdlib/SDL_crc32.c b/src/stdlib/SDL_crc32.c
index 9903a74a2f..37dee6a830 100644
--- a/src/stdlib/SDL_crc32.c
+++ b/src/stdlib/SDL_crc32.c
@@ -48,5 +48,3 @@ Uint32 SDL_crc32(Uint32 crc, const void *data, size_t len)
     }
     return crc;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/stdlib/SDL_getenv.c b/src/stdlib/SDL_getenv.c
index a02225baaf..dc6e86b0fb 100644
--- a/src/stdlib/SDL_getenv.c
+++ b/src/stdlib/SDL_getenv.c
@@ -298,5 +298,3 @@ int main(int argc, char *argv[])
     return 0;
 }
 #endif /* TEST_MAIN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c
index 7e395bf14e..997c0bd70b 100644
--- a/src/stdlib/SDL_iconv.c
+++ b/src/stdlib/SDL_iconv.c
@@ -855,5 +855,3 @@ SDL_iconv_string(const char *tocode, const char *fromcode, const char *inbuf,
 
     return string;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/stdlib/SDL_malloc.c b/src/stdlib/SDL_malloc.c
index d60f27c07d..cbd71e164c 100644
--- a/src/stdlib/SDL_malloc.c
+++ b/src/stdlib/SDL_malloc.c
@@ -5328,5 +5328,3 @@ void SDL_free(void *ptr)
     s_mem.free_func(ptr);
     (void)SDL_AtomicDecRef(&s_mem.num_allocations);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/stdlib/SDL_mslibc.c b/src/stdlib/SDL_mslibc.c
index b00a373323..12669b9e0c 100644
--- a/src/stdlib/SDL_mslibc.c
+++ b/src/stdlib/SDL_mslibc.c
@@ -697,5 +697,3 @@ RETZERO:
 #endif /* MSC_VER */
 
 #endif /* !HAVE_LIBC && !SDL_STATIC_LIB */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/stdlib/SDL_qsort.c b/src/stdlib/SDL_qsort.c
index e50565f1cb..8121392268 100644
--- a/src/stdlib/SDL_qsort.c
+++ b/src/stdlib/SDL_qsort.c
@@ -560,6 +560,3 @@ SDL_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*
     return NULL;
 #endif /* HAVE_BSEARCH */
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
-
diff --git a/src/stdlib/SDL_stdlib.c b/src/stdlib/SDL_stdlib.c
index be0285e1c0..7663423fa4 100644
--- a/src/stdlib/SDL_stdlib.c
+++ b/src/stdlib/SDL_stdlib.c
@@ -664,5 +664,3 @@ int SDL_isblank(int x)
     return ((x) == ' ') || ((x) == '\t');
 }
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/stdlib/SDL_string.c b/src/stdlib/SDL_string.c
index 59bce31665..689e5d1874 100644
--- a/src/stdlib/SDL_string.c
+++ b/src/stdlib/SDL_string.c
@@ -1956,5 +1956,3 @@ int SDL_vasprintf(char **strp, const char *fmt, va_list ap)
         }
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/stdlib/SDL_vacopy.h b/src/stdlib/SDL_vacopy.h
index 6bb05a5e7b..a16fba7ee7 100644
--- a/src/stdlib/SDL_vacopy.h
+++ b/src/stdlib/SDL_vacopy.h
@@ -32,5 +32,3 @@
 #elif defined(__GNUC__) && (__GNUC__ < 3)
 #define va_copy(dst, src) __va_copy(dst, src)
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_assert.c b/src/test/SDL_test_assert.c
index 28019c99a3..bf8509c053 100644
--- a/src/test/SDL_test_assert.c
+++ b/src/test/SDL_test_assert.c
@@ -139,5 +139,3 @@ int SDLTest_AssertSummaryToTestResult()
         }
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_common.c b/src/test/SDL_test_common.c
index 5d2723db59..8b1b3ce60d 100644
--- a/src/test/SDL_test_common.c
+++ b/src/test/SDL_test_common.c
@@ -2336,5 +2336,3 @@ void SDLTest_CommonDrawWindowInfo(SDL_Renderer *renderer, SDL_Window *window, in
         *usedHeight = textY;
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_compare.c b/src/test/SDL_test_compare.c
index 7fdb5565cc..bf0b7e14f4 100644
--- a/src/test/SDL_test_compare.c
+++ b/src/test/SDL_test_compare.c
@@ -111,5 +111,3 @@ int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface,
 
     return ret;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_crc32.c b/src/test/SDL_test_crc32.c
index ae5145bb38..4762e5d9ef 100644
--- a/src/test/SDL_test_crc32.c
+++ b/src/test/SDL_test_crc32.c
@@ -158,5 +158,3 @@ int SDLTest_Crc32Done(SDLTest_Crc32Context *crcContext)
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_font.c b/src/test/SDL_test_font.c
index 72ad71fb4a..7df51bd6da 100644
--- a/src/test/SDL_test_font.c
+++ b/src/test/SDL_test_font.c
@@ -3487,5 +3487,3 @@ void SDLTest_CleanupTextDrawing(void)
 
     SDLTest_CharTextureCacheList = NULL;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_fuzzer.c b/src/test/SDL_test_fuzzer.c
index 3c6f86e5cf..1ea694c150 100644
--- a/src/test/SDL_test_fuzzer.c
+++ b/src/test/SDL_test_fuzzer.c
@@ -500,5 +500,3 @@ SDLTest_RandomAsciiStringOfSize(int size)
 
     return string;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_harness.c b/src/test/SDL_test_harness.c
index ea5c912e55..4ba9402a14 100644
--- a/src/test/SDL_test_harness.c
+++ b/src/test/SDL_test_harness.c
@@ -677,5 +677,3 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
     SDLTest_Log("Exit code: %d", runResult);
     return runResult;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_imageBlit.c b/src/test/SDL_test_imageBlit.c
index e5a9ce8614..f349587b4e 100644
--- a/src/test/SDL_test_imageBlit.c
+++ b/src/test/SDL_test_imageBlit.c
@@ -1654,5 +1654,3 @@ SDL_Surface *SDLTest_ImageBlitAlpha()
         SDLTest_imageBlitAlpha.width * SDLTest_imageBlitAlpha.bytes_per_pixel, SDL_PIXELFORMAT_RGB24);
     return surface;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_imageBlitBlend.c b/src/test/SDL_test_imageBlitBlend.c
index 3dbf418c07..987499969d 100644
--- a/src/test/SDL_test_imageBlitBlend.c
+++ b/src/test/SDL_test_imageBlitBlend.c
@@ -2931,5 +2931,3 @@ SDL_Surface *SDLTest_ImageBlitBlendAll()
         SDLTest_imageBlitBlendAll.width * SDLTest_imageBlitBlendAll.bytes_per_pixel, SDL_PIXELFORMAT_RGB24);
     return surface;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_imageFace.c b/src/test/SDL_test_imageFace.c
index 92ab6a01b4..1eb9fc3adc 100644
--- a/src/test/SDL_test_imageFace.c
+++ b/src/test/SDL_test_imageFace.c
@@ -231,5 +231,3 @@ SDL_Surface *SDLTest_ImageFace()
         SDL_PIXELFORMAT_RGBA32);
     return surface;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_imagePrimitives.c b/src/test/SDL_test_imagePrimitives.c
index e60706453e..6b93873bfa 100644
--- a/src/test/SDL_test_imagePrimitives.c
+++ b/src/test/SDL_test_imagePrimitives.c
@@ -511,5 +511,3 @@ SDL_Surface *SDLTest_ImagePrimitives()
         SDLTest_imagePrimitives.width * SDLTest_imagePrimitives.bytes_per_pixel, SDL_PIXELFORMAT_RGB24);
     return surface;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_imagePrimitivesBlend.c b/src/test/SDL_test_imagePrimitivesBlend.c
index 6dedd2baae..ee5f69a5ab 100644
--- a/src/test/SDL_test_imagePrimitivesBlend.c
+++ b/src/test/SDL_test_imagePrimitivesBlend.c
@@ -684,5 +684,3 @@ SDL_Surface *SDLTest_ImagePrimitivesBlend()
         SDLTest_imagePrimitivesBlend.width * SDLTest_imagePrimitivesBlend.bytes_per_pixel, SDL_PIXELFORMAT_RGB24);
     return surface;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_log.c b/src/test/SDL_test_log.c
index 3cb060afc7..e0a16f6960 100644
--- a/src/test/SDL_test_log.c
+++ b/src/test/SDL_test_log.c
@@ -111,5 +111,3 @@ void SDLTest_LogError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...)
     /* Log with timestamp and newline */
     SDL_LogMessage(SDL_LOG_CATEGORY_TEST, SDL_LOG_PRIORITY_ERROR, "%s: %s", SDLTest_TimestampToString(time(0)), logMessage);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_md5.c b/src/test/SDL_test_md5.c
index c7996a1b38..9ac63f16e9 100644
--- a/src/test/SDL_test_md5.c
+++ b/src/test/SDL_test_md5.c
@@ -340,5 +340,3 @@ static void SDLTest_Md5Transform(MD5UINT4 *buf, const MD5UINT4 *in)
     buf[2] += c;
     buf[3] += d;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_memory.c b/src/test/SDL_test_memory.c
index ed9794413a..936f8f9246 100644
--- a/src/test/SDL_test_memory.c
+++ b/src/test/SDL_test_memory.c
@@ -272,5 +272,3 @@ void SDLTest_LogAllocations()
 
     SDL_Log("%s", message);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/test/SDL_test_random.c b/src/test/SDL_test_random.c
index dc23c2e56b..cc577f45ae 100644
--- a/src/test/SDL_test_random.c
+++ b/src/test/SDL_test_random.c
@@ -96,5 +96,3 @@ unsigned int SDLTest_Random(SDLTest_RandomContext *rndContext)
     }
     return rndContext->x;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/SDL_systhread.h b/src/thread/SDL_systhread.h
index a2ad9cf95b..6ac738603c 100644
--- a/src/thread/SDL_systhread.h
+++ b/src/thread/SDL_systhread.h
@@ -75,5 +75,3 @@ SDL_CreateThreadInternal(int(SDLCALL *fn)(void *), const char *name,
 #endif
 
 #endif /* SDL_systhread_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/SDL_thread.c b/src/thread/SDL_thread.c
index b6a73b9569..03841a4d25 100644
--- a/src/thread/SDL_thread.c
+++ b/src/thread/SDL_thread.c
@@ -519,5 +519,3 @@ int SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Sint32 timeoutMS)
     }
     return SDL_CondWaitTimeoutNS(cond, mutex, timeoutNS);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/SDL_thread_c.h b/src/thread/SDL_thread_c.h
index 11ea1e3a04..3c73b58666 100644
--- a/src/thread/SDL_thread_c.h
+++ b/src/thread/SDL_thread_c.h
@@ -102,5 +102,3 @@ extern SDL_TLSData *SDL_Generic_GetTLSData(void);
 extern int SDL_Generic_SetTLSData(SDL_TLSData *data);
 
 #endif /* SDL_thread_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/generic/SDL_syscond.c b/src/thread/generic/SDL_syscond.c
index d9f0a0f834..f80854dff6 100644
--- a/src/thread/generic/SDL_syscond.c
+++ b/src/thread/generic/SDL_syscond.c
@@ -217,5 +217,3 @@ int SDL_CondWaitTimeoutNS_generic(SDL_cond *_cond, SDL_mutex *mutex, Sint64 time
 
     return retval;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/generic/SDL_syscond_c.h b/src/thread/generic/SDL_syscond_c.h
index 8c4238239e..6e06847722 100644
--- a/src/thread/generic/SDL_syscond_c.h
+++ b/src/thread/generic/SDL_syscond_c.h
@@ -34,5 +34,3 @@ int SDL_CondWaitTimeoutNS_generic(SDL_cond *cond, SDL_mutex *mutex, Sint64 timeo
 #endif /* SDL_THREAD_GENERIC_COND_SUFFIX */
 
 #endif /* SDL_syscond_generic_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/generic/SDL_sysmutex.c b/src/thread/generic/SDL_sysmutex.c
index db55cb00f1..f181fa3e7d 100644
--- a/src/thread/generic/SDL_sysmutex.c
+++ b/src/thread/generic/SDL_sysmutex.c
@@ -159,5 +159,3 @@ int SDL_UnlockMutex(SDL_mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS /* clang doe
     return 0;
 #endif /* SDL_THREADS_DISABLED */
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/generic/SDL_sysmutex_c.h b/src/thread/generic/SDL_sysmutex_c.h
index ba59c7f27c..6a50a83b27 100644
--- a/src/thread/generic/SDL_sysmutex_c.h
+++ b/src/thread/generic/SDL_sysmutex_c.h
@@ -19,4 +19,3 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "SDL_internal.h"
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/generic/SDL_syssem.c b/src/thread/generic/SDL_syssem.c
index 05d4641f32..179ea6480e 100644
--- a/src/thread/generic/SDL_syssem.c
+++ b/src/thread/generic/SDL_syssem.c
@@ -175,5 +175,3 @@ int SDL_SemPost(SDL_sem *sem)
 }
 
 #endif /* SDL_THREADS_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/generic/SDL_systhread.c b/src/thread/generic/SDL_systhread.c
index b58b6151ae..67a8a78cce 100644
--- a/src/thread/generic/SDL_systhread.c
+++ b/src/thread/generic/SDL_systhread.c
@@ -60,5 +60,3 @@ void SDL_SYS_DetachThread(SDL_Thread *thread)
 {
     return;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/generic/SDL_systhread_c.h b/src/thread/generic/SDL_systhread_c.h
index 1d2cc69228..7498259624 100644
--- a/src/thread/generic/SDL_systhread_c.h
+++ b/src/thread/generic/SDL_systhread_c.h
@@ -22,5 +22,3 @@
 
 /* Stub until we implement threads on this platform */
 typedef int SYS_ThreadHandle;
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/generic/SDL_systls.c b/src/thread/generic/SDL_systls.c
index fe3f5b3dbd..bbd4b750cb 100644
--- a/src/thread/generic/SDL_systls.c
+++ b/src/thread/generic/SDL_systls.c
@@ -32,5 +32,3 @@ int SDL_SYS_SetTLSData(SDL_TLSData *data)
 {
     return SDL_Generic_SetTLSData(data);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/n3ds/SDL_syscond.c b/src/thread/n3ds/SDL_syscond.c
index d339972761..dbfd05ab76 100644
--- a/src/thread/n3ds/SDL_syscond.c
+++ b/src/thread/n3ds/SDL_syscond.c
@@ -117,5 +117,3 @@ int SDL_CondWaitTimeoutNS(SDL_cond *cond, SDL_mutex *mutex, Sint64 timeoutNS)
 }
 
 #endif /* SDL_THREAD_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/thread/n3ds/SDL_sysmutex.c b/src/thread/n3ds/SDL_sysmutex.c
index 3d2150407a..9a841f39ad 100644
--- a/src/thread/n3ds/SDL_sysmutex.c
+++ b/src/thread/n3ds/SDL_sysmutex.c
@@ -85,5 +85,3 @@ int SDL_UnlockMutex(SDL_mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS /* clang doe
 }
 
 #endif /* SDL_THREAD_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/thread/n3ds/SDL_sysmutex_c.h b/src/thread/n3ds/SDL_sysmutex_c.h
index 23979ab343..828f3e58e1 100644
--- a/src/thread/n3ds/SDL_sysmutex_c.h
+++ b/src/thread/n3ds/SDL_sysmutex_c.h
@@ -31,5 +31,3 @@ struct SDL_mutex
 };
 
 #endif /* SDL_sysmutex_c_h */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/thread/n3ds/SDL_syssem.c b/src/thread/n3ds/SDL_syssem.c
index 98883b0ee8..d8c5dc3283 100644
--- a/src/thread/n3ds/SDL_syssem.c
+++ b/src/thread/n3ds/SDL_syssem.c
@@ -116,5 +116,3 @@ int SDL_SemPost(SDL_sem *sem)
 }
 
 #endif /* SDL_THREAD_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/thread/n3ds/SDL_systhread.c b/src/thread/n3ds/SDL_systhread.c
index 0773806010..1ff3255376 100644
--- a/src/thread/n3ds/SDL_systhread.c
+++ b/src/thread/n3ds/SDL_systhread.c
@@ -139,5 +139,3 @@ void SDL_SYS_DetachThread(SDL_Thread *thread)
 }
 
 #endif /* SDL_THREAD_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/thread/n3ds/SDL_systhread_c.h b/src/thread/n3ds/SDL_systhread_c.h
index 3ac325e38f..9c4f94a32d 100644
--- a/src/thread/n3ds/SDL_systhread_c.h
+++ b/src/thread/n3ds/SDL_systhread_c.h
@@ -28,5 +28,3 @@
 typedef Thread SYS_ThreadHandle;
 
 #endif /* SDL_systhread_c_h_ */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/thread/ngage/SDL_sysmutex.cpp b/src/thread/ngage/SDL_sysmutex.cpp
index 27891d3fdd..d82d1528d3 100644
--- a/src/thread/ngage/SDL_sysmutex.cpp
+++ b/src/thread/ngage/SDL_sysmutex.cpp
@@ -109,5 +109,3 @@ int SDL_UnlockMutex(SDL_mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS /* clang doe
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/ngage/SDL_syssem.cpp b/src/thread/ngage/SDL_syssem.cpp
index 6e37372274..8dfb9ee1b6 100644
--- a/src/thread/ngage/SDL_syssem.cpp
+++ b/src/thread/ngage/SDL_syssem.cpp
@@ -159,5 +159,3 @@ int SDL_SemPost(SDL_sem *sem)
     sema.Signal();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/ngage/SDL_systhread_c.h b/src/thread/ngage/SDL_systhread_c.h
index 187a3066b8..96cdaca2ac 100644
--- a/src/thread/ngage/SDL_systhread_c.h
+++ b/src/thread/ngage/SDL_systhread_c.h
@@ -21,5 +21,3 @@
 #include "SDL_internal.h"
 
 typedef int SYS_ThreadHandle;
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/psp/SDL_syscond.c b/src/thread/psp/SDL_syscond.c
index 89933bc8ba..f42236e017 100644
--- a/src/thread/psp/SDL_syscond.c
+++ b/src/thread/psp/SDL_syscond.c
@@ -203,5 +203,3 @@ int SDL_CondWaitTimeoutNS(SDL_cond *cond, SDL_mutex *mutex, Sint64 timeoutNS)
 }
 
 #endif /* SDL_THREAD_PSP */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/psp/SDL_sysmutex.c b/src/thread/psp/SDL_sysmutex.c
index bee7ceea91..f873a46042 100644
--- a/src/thread/psp/SDL_sysmutex.c
+++ b/src/thread/psp/SDL_sysmutex.c
@@ -144,5 +144,3 @@ int SDL_UnlockMutex(SDL_mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS /* clang doe
 }
 
 #endif /* SDL_THREAD_PSP */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/psp/SDL_sysmutex_c.h b/src/thread/psp/SDL_sysmutex_c.h
index ba59c7f27c..6a50a83b27 100644
--- a/src/thread/psp/SDL_sysmutex_c.h
+++ b/src/thread/psp/SDL_sysmutex_c.h
@@ -19,4 +19,3 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "SDL_internal.h"
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/pthread/SDL_syscond.c b/src/thread/pthread/SDL_syscond.c
index 9b0534caf9..0c5bb70411 100644
--- a/src/thread/pthread/SDL_syscond.c
+++ b/src/thread/pthread/SDL_syscond.c
@@ -142,5 +142,3 @@ tryagain:
     }
     return retval;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/pthread/SDL_sysmutex.c b/src/thread/pthread/SDL_sysmutex.c
index 1714d61114..774f1e4685 100644
--- a/src/thread/pthread/SDL_sysmutex.c
+++ b/src/thread/pthread/SDL_sysmutex.c
@@ -185,5 +185,3 @@ int SDL_UnlockMutex(SDL_mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS /* clang doe
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/pthread/SDL_sysmutex_c.h b/src/thread/pthread/SDL_sysmutex_c.h
index 8edd2cc6a0..ce98a0454f 100644
--- a/src/thread/pthread/SDL_sysmutex_c.h
+++ b/src/thread/pthread/SDL_sysmutex_c.h
@@ -29,4 +29,3 @@ struct SDL_mutex
 };
 
 #endif /* SDL_mutex_c_h_ */
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/pthread/SDL_syssem.c b/src/thread/pthread/SDL_syssem.c
index 0a244db4e5..c801366a2c 100644
--- a/src/thread/pthread/SDL_syssem.c
+++ b/src/thread/pthread/SDL_syssem.c
@@ -182,4 +182,3 @@ int SDL_SemPost(SDL_sem *sem)
 }
 
 #endif /* __MACOS__ */
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/pthread/SDL_systhread.c b/src/thread/pthread/SDL_systhread.c
index 2154fb2398..84d6154d51 100644
--- a/src/thread/pthread/SDL_systhread.c
+++ b/src/thread/pthread/SDL_systhread.c
@@ -282,5 +282,3 @@ void SDL_SYS_DetachThread(SDL_Thread *thread)
 {
     pthread_detach(thread->handle);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/pthread/SDL_systhread_c.h b/src/thread/pthread/SDL_systhread_c.h
index d6c73a4688..a377c5ce9b 100644
--- a/src/thread/pthread/SDL_systhread_c.h
+++ b/src/thread/pthread/SDL_systhread_c.h
@@ -23,5 +23,3 @@
 #include <pthread.h>
 
 typedef pthread_t SYS_ThreadHandle;
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/pthread/SDL_systls.c b/src/thread/pthread/SDL_systls.c
index 7d351b8993..639fb99a57 100644
--- a/src/thread/pthread/SDL_systls.c
+++ b/src/thread/pthread/SDL_systls.c
@@ -63,5 +63,3 @@ int SDL_SYS_SetTLSData(SDL_TLSData *data)
     }
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/stdcpp/SDL_syscond.cpp b/src/thread/stdcpp/SDL_syscond.cpp
index 0239edacf7..f66bcff0ce 100644
--- a/src/thread/stdcpp/SDL_syscond.cpp
+++ b/src/thread/stdcpp/SDL_syscond.cpp
@@ -139,5 +139,3 @@ SDL_CondWaitTimeoutNS(SDL_cond *cond, SDL_mutex *mutex, Sint64 timeoutNS)
         return SDL_SetError("Unable to wait on a C++ condition variable: code=%d; %s", ex.code(), ex.what());
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/stdcpp/SDL_sysmutex.cpp b/src/thread/stdcpp/SDL_sysmutex.cpp
index d590fc9471..c69edcde75 100644
--- a/src/thread/stdcpp/SDL_sysmutex.cpp
+++ b/src/thread/stdcpp/SDL_sysmutex.cpp
@@ -97,5 +97,3 @@ SDL_UnlockMutex(SDL_mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS /* clang doesn't
     mutex->cpp_mutex.unlock();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/stdcpp/SDL_sysmutex_c.h b/src/thread/stdcpp/SDL_sysmutex_c.h
index 28c380e187..abf8f47c9b 100644
--- a/src/thread/stdcpp/SDL_sysmutex_c.h
+++ b/src/thread/stdcpp/SDL_sysmutex_c.h
@@ -26,5 +26,3 @@ struct SDL_mutex
 {
     std::recursive_mutex cpp_mutex;
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/stdcpp/SDL_systhread.cpp b/src/thread/stdcpp/SDL_systhread.cpp
index 81d8f99ddf..76df54e17a 100644
--- a/src/thread/stdcpp/SDL_systhread.cpp
+++ b/src/thread/stdcpp/SDL_systhread.cpp
@@ -159,5 +159,3 @@ SDL_SYS_SetTLSData(SDL_TLSData *data)
 {
     return SDL_Generic_SetTLSData(data);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/stdcpp/SDL_systhread_c.h b/src/thread/stdcpp/SDL_systhread_c.h
index e8282f17bd..e0b5c88c00 100644
--- a/src/thread/stdcpp/SDL_systhread_c.h
+++ b/src/thread/stdcpp/SDL_systhread_c.h
@@ -22,5 +22,3 @@
 
 /* For a thread handle, use a void pointer to a std::thread */
 typedef void *SYS_ThreadHandle;
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/vita/SDL_syscond.c b/src/thread/vita/SDL_syscond.c
index ca5153cb8a..0492594f2b 100644
--- a/src/thread/vita/SDL_syscond.c
+++ b/src/thread/vita/SDL_syscond.c
@@ -203,5 +203,3 @@ int SDL_CondWaitTimeoutNS(SDL_cond *cond, SDL_mutex *mutex, Sint64 timeoutNS)
 }
 
 #endif /* SDL_THREAD_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/vita/SDL_sysmutex.c b/src/thread/vita/SDL_sysmutex.c
index 20e9d46394..83a4c53859 100644
--- a/src/thread/vita/SDL_sysmutex.c
+++ b/src/thread/vita/SDL_sysmutex.c
@@ -140,5 +140,3 @@ int SDL_UnlockMutex(SDL_mutex *mutex) SDL_NO_THREAD_SAFETY_ANALYSIS /* clang doe
 }
 
 #endif /* SDL_THREAD_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/vita/SDL_sysmutex_c.h b/src/thread/vita/SDL_sysmutex_c.h
index cb0c28adbf..6a50a83b27 100644
--- a/src/thread/vita/SDL_sysmutex_c.h
+++ b/src/thread/vita/SDL_sysmutex_c.h
@@ -19,5 +19,3 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "SDL_internal.h"
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/vita/SDL_syssem.c b/src/thread/vita/SDL_syssem.c
index b5f856bd31..69885b7e7a 100644
--- a/src/thread/vita/SDL_syssem.c
+++ b/src/thread/vita/SDL_syssem.c
@@ -145,5 +145,3 @@ int SDL_SemPost(SDL_sem *sem)
 }
 
 #endif /* SDL_THREAD_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/vita/SDL_systhread.c b/src/thread/vita/SDL_systhread.c
index 8fb9880773..03f53b7986 100644
--- a/src/thread/vita/SDL_systhread.c
+++ b/src/thread/vita/SDL_systhread.c
@@ -131,5 +131,3 @@ int SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
 }
 
 #endif /* SDL_THREAD_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/vita/SDL_systhread_c.h b/src/thread/vita/SDL_systhread_c.h
index f5f7074647..074132da35 100644
--- a/src/thread/vita/SDL_systhread_c.h
+++ b/src/thread/vita/SDL_systhread_c.h
@@ -22,5 +22,3 @@
 #include <psp2/types.h>
 
 typedef SceUID SYS_ThreadHandle;
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/windows/SDL_syscond_cv.c b/src/thread/windows/SDL_syscond_cv.c
index c2c8a750b9..ce5fec2040 100644
--- a/src/thread/windows/SDL_syscond_cv.c
+++ b/src/thread/windows/SDL_syscond_cv.c
@@ -267,5 +267,3 @@ int SDL_CondWaitTimeoutNS(SDL_cond *cond, SDL_mutex *mutex, Sint64 timeoutNS)
 {
     return SDL_cond_impl_active.WaitTimeoutNS(cond, mutex, timeoutNS);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/windows/SDL_sysmutex.c b/src/thread/windows/SDL_sysmutex.c
index 7755634f45..c93d69b1a8 100644
--- a/src/thread/windows/SDL_sysmutex.c
+++ b/src/thread/windows/SDL_sysmutex.c
@@ -284,5 +284,3 @@ int SDL_UnlockMutex(SDL_mutex *mutex)
 }
 
 #endif /* SDL_THREAD_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/windows/SDL_sysmutex_c.h b/src/thread/windows/SDL_sysmutex_c.h
index d89e4f3f5f..3bfe0feb5d 100644
--- a/src/thread/windows/SDL_sysmutex_c.h
+++ b/src/thread/windows/SDL_sysmutex_c.h
@@ -71,5 +71,3 @@ typedef struct SDL_mutex_cs
 {
     CRITICAL_SECTION cs;
 } SDL_mutex_cs;
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/windows/SDL_syssem.c b/src/thread/windows/SDL_syssem.c
index 9961f937e0..55f0d066e5 100644
--- a/src/thread/windows/SDL_syssem.c
+++ b/src/thread/windows/SDL_syssem.c
@@ -395,5 +395,3 @@ int SDL_SemPost(SDL_sem *sem)
 }
 
 #endif /* SDL_THREAD_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/windows/SDL_systhread.c b/src/thread/windows/SDL_systhread.c
index a4d017141d..5ed66a1906 100644
--- a/src/thread/windows/SDL_systhread.c
+++ b/src/thread/windows/SDL_systhread.c
@@ -211,5 +211,3 @@ void SDL_SYS_DetachThread(SDL_Thread *thread)
 }
 
 #endif /* SDL_THREAD_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/windows/SDL_systhread_c.h b/src/thread/windows/SDL_systhread_c.h
index ee7e16be7a..8eac77d1f3 100644
--- a/src/thread/windows/SDL_systhread_c.h
+++ b/src/thread/windows/SDL_systhread_c.h
@@ -28,5 +28,3 @@
 typedef HANDLE SYS_ThreadHandle;
 
 #endif /* SDL_systhread_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/thread/windows/SDL_systls.c b/src/thread/windows/SDL_systls.c
index 6ccefd8f71..055d9ebe49 100644
--- a/src/thread/windows/SDL_systls.c
+++ b/src/thread/windows/SDL_systls.c
@@ -78,5 +78,3 @@ int SDL_SYS_SetTLSData(SDL_TLSData *data)
 }
 
 #endif /* SDL_THREAD_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/timer/SDL_timer.c b/src/timer/SDL_timer.c
index 7a49276d91..c0d9692533 100644
--- a/src/timer/SDL_timer.c
+++ b/src/timer/SDL_timer.c
@@ -600,5 +600,3 @@ void SDL_Delay(Uint32 ms)
 {
     SDL_DelayNS(SDL_MS_TO_NS(ms));
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/timer/SDL_timer_c.h b/src/timer/SDL_timer_c.h
index 05e530db87..589cc0c287 100644
--- a/src/timer/SDL_timer_c.h
+++ b/src/timer/SDL_timer_c.h
@@ -35,5 +35,3 @@ extern int SDL_TimerInit(void);
 extern void SDL_TimerQuit(void);
 
 #endif /* SDL_timer_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/timer/dummy/SDL_systimer.c b/src/timer/dummy/SDL_systimer.c
index 3dd417b0ba..c2e0af0c2d 100644
--- a/src/timer/dummy/SDL_systimer.c
+++ b/src/timer/dummy/SDL_systimer.c
@@ -41,5 +41,3 @@ void SDL_DelayNS(Uint64 ns)
 }
 
 #endif /* SDL_TIMER_DUMMY || SDL_TIMERS_DISABLED */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/timer/haiku/SDL_systimer.c b/src/timer/haiku/SDL_systimer.c
index d832a632eb..2a28080664 100644
--- a/src/timer/haiku/SDL_systimer.c
+++ b/src/timer/haiku/SDL_systimer.c
@@ -43,5 +43,3 @@ void SDL_DelayNS(Uint64 ns)
 }
 
 #endif /* SDL_TIMER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/timer/n3ds/SDL_systimer.c b/src/timer/n3ds/SDL_systimer.c
index e109c4d5c9..388111af6d 100644
--- a/src/timer/n3ds/SDL_systimer.c
+++ b/src/timer/n3ds/SDL_systimer.c
@@ -43,5 +43,3 @@ void SDL_DelayNS(Uint64 ns)
 }
 
 #endif /* SDL_TIMER_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/timer/ngage/SDL_systimer.cpp b/src/timer/ngage/SDL_systimer.cpp
index 36b861487c..926fbe0424 100644
--- a/src/timer/ngage/SDL_systimer.cpp
+++ b/src/timer/ngage/SDL_systimer.cpp
@@ -59,5 +59,3 @@ void SDL_DelayNS(Uint64 ns)
 #endif
 
 #endif /* SDL_TIMER_NGAGE */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/timer/unix/SDL_systimer.c b/src/timer/unix/SDL_systimer.c
index e5242b8fb8..4ae259a567 100644
--- a/src/timer/unix/SDL_systimer.c
+++ b/src/timer/unix/SDL_systimer.c
@@ -188,5 +188,3 @@ void SDL_DelayNS(Uint64 ns)
 }
 
 #endif /* SDL_TIMER_UNIX */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/timer/vita/SDL_systimer.c b/src/timer/vita/SDL_systimer.c
index af8d5d16b1..7ac1fb8c3a 100644
--- a/src/timer/vita/SDL_systimer.c
+++ b/src/timer/vita/SDL_systimer.c
@@ -51,5 +51,3 @@ void SDL_DelayNS(Uint64 ns)
 }
 
 #endif /* SDL_TIMER_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/timer/windows/SDL_systimer.c b/src/timer/windows/SDL_systimer.c
index e481ae742f..bb46284e3b 100644
--- a/src/timer/windows/SDL_systimer.c
+++ b/src/timer/windows/SDL_systimer.c
@@ -91,5 +91,3 @@ void SDL_DelayNS(Uint64 ns)
 }
 
 #endif /* SDL_TIMER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_RLEaccel.c b/src/video/SDL_RLEaccel.c
index e1795939af..7e193df4ea 100644
--- a/src/video/SDL_RLEaccel.c
+++ b/src/video/SDL_RLEaccel.c
@@ -1589,5 +1589,3 @@ void SDL_UnRLESurface(SDL_Surface *surface, int recode)
 }
 
 #endif /* SDL_HAVE_RLE */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_RLEaccel_c.h b/src/video/SDL_RLEaccel_c.h
index 673631ffb6..bfa75c840e 100644
--- a/src/video/SDL_RLEaccel_c.h
+++ b/src/video/SDL_RLEaccel_c.h
@@ -30,5 +30,3 @@ extern int SDL_RLESurface(SDL_Surface *surface);
 extern void SDL_UnRLESurface(SDL_Surface *surface, int recode);
 
 #endif /* SDL_RLEaccel_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit.c b/src/video/SDL_blit.c
index 1607fc2c71..6d269708a1 100644
--- a/src/video/SDL_blit.c
+++ b/src/video/SDL_blit.c
@@ -281,5 +281,3 @@ int SDL_CalculateBlit(SDL_Surface *surface)
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit.h b/src/video/SDL_blit.h
index 73727ee42b..dbab6a69df 100644
--- a/src/video/SDL_blit.h
+++ b/src/video/SDL_blit.h
@@ -580,5 +580,3 @@ extern SDL_BlitFunc SDL_CalculateBlitA(SDL_Surface *surface);
 #endif
 
 #endif /* SDL_blit_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_0.c b/src/video/SDL_blit_0.c
index 2a88912e02..b4b3347ba0 100644
--- a/src/video/SDL_blit_0.c
+++ b/src/video/SDL_blit_0.c
@@ -551,5 +551,3 @@ SDL_CalculateBlit0(SDL_Surface *surface)
 }
 
 #endif /* SDL_HAVE_BLIT_0 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_1.c b/src/video/SDL_blit_1.c
index ccdd6697a5..0d92b676c5 100644
--- a/src/video/SDL_blit_1.c
+++ b/src/video/SDL_blit_1.c
@@ -540,5 +540,3 @@ SDL_CalculateBlit1(SDL_Surface *surface)
 }
 
 #endif /* SDL_HAVE_BLIT_1 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_A.c b/src/video/SDL_blit_A.c
index f11940d7de..d06732170b 100644
--- a/src/video/SDL_blit_A.c
+++ b/src/video/SDL_blit_A.c
@@ -1441,5 +1441,3 @@ SDL_CalculateBlitA(SDL_Surface *surface)
 }
 
 #endif /* SDL_HAVE_BLIT_A */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_N.c b/src/video/SDL_blit_N.c
index c18b4154da..e535fdd9e8 100644
--- a/src/video/SDL_blit_N.c
+++ b/src/video/SDL_blit_N.c
@@ -3437,5 +3437,3 @@ SDL_CalculateBlitN(SDL_Surface *surface)
 }
 
 #endif /* SDL_HAVE_BLIT_N */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_auto.c b/src/video/SDL_blit_auto.c
index c001b1ede6..9f34533b2a 100644
--- a/src/video/SDL_blit_auto.c
+++ b/src/video/SDL_blit_auto.c
@@ -7848,5 +7848,3 @@ SDL_BlitFuncEntry SDL_GeneratedBlitFuncTable[] = {
 /* *INDENT-ON* */ /* clang-format on */
 
 #endif /* SDL_HAVE_BLIT_AUTO */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_auto.h b/src/video/SDL_blit_auto.h
index 7fac55cea0..d11238f4bb 100644
--- a/src/video/SDL_blit_auto.h
+++ b/src/video/SDL_blit_auto.h
@@ -30,5 +30,3 @@ extern SDL_BlitFuncEntry SDL_GeneratedBlitFuncTable[];
 /* *INDENT-ON* */
 
 #endif /* SDL_HAVE_BLIT_AUTO */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_copy.c b/src/video/SDL_blit_copy.c
index acfde5a369..94fbe5651f 100644
--- a/src/video/SDL_blit_copy.c
+++ b/src/video/SDL_blit_copy.c
@@ -154,5 +154,3 @@ void SDL_BlitCopy(SDL_BlitInfo *info)
         dst += dstskip;
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_copy.h b/src/video/SDL_blit_copy.h
index 446f2ac824..2e49e9f7ef 100644
--- a/src/video/SDL_blit_copy.h
+++ b/src/video/SDL_blit_copy.h
@@ -25,5 +25,3 @@
 void SDL_BlitCopy(SDL_BlitInfo *info);
 
 #endif /* SDL_blit_copy_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_slow.c b/src/video/SDL_blit_slow.c
index 55123c6b7c..7bea64b5ae 100644
--- a/src/video/SDL_blit_slow.c
+++ b/src/video/SDL_blit_slow.c
@@ -200,5 +200,3 @@ void SDL_Blit_Slow(SDL_BlitInfo *info)
         info->dst += info->dst_pitch;
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_blit_slow.h b/src/video/SDL_blit_slow.h
index 62cfe7ba9d..66f8bded58 100644
--- a/src/video/SDL_blit_slow.h
+++ b/src/video/SDL_blit_slow.h
@@ -27,5 +27,3 @@
 extern void SDL_Blit_Slow(SDL_BlitInfo *info);
 
 #endif /* SDL_blit_slow_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
index 659f8e7b12..27d1a71a5f 100644
--- a/src/video/SDL_bmp.c
+++ b/src/video/SDL_bmp.c
@@ -870,5 +870,3 @@ int SDL_SaveBMP_RW(SDL_Surface *surface, SDL_RWops *dst, int freedst)
     }
     return (SDL_strcmp(SDL_GetError(), "") == 0) ? 0 : -1;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_clipboard.c b/src/video/SDL_clipboard.c
index 0f64c3f6d4..64e76b2e7a 100644
--- a/src/video/SDL_clipboard.c
+++ b/src/video/SDL_clipboard.c
@@ -145,5 +145,3 @@ SDL_HasPrimarySelectionText(void)
 
     return SDL_FALSE;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_egl.c b/src/video/SDL_egl.c
index 94f47be0dd..295af297d0 100644
--- a/src/video/SDL_egl.c
+++ b/src/video/SDL_egl.c
@@ -1335,5 +1335,3 @@ void SDL_EGL_DestroySurface(_THIS, EGLSurface egl_surface)
 }
 
 #endif /* SDL_VIDEO_OPENGL_EGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_egl_c.h b/src/video/SDL_egl_c.h
index c195c4be3a..d9d2f001f9 100644
--- a/src/video/SDL_egl_c.h
+++ b/src/video/SDL_egl_c.h
@@ -182,5 +182,3 @@ extern int SDL_EGL_SetErrorEx(const char *message, const char *eglFunctionName,
 #endif /* SDL_VIDEO_OPENGL_EGL */
 
 #endif /* SDL_egl_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_fillrect.c b/src/video/SDL_fillrect.c
index 5d36cc3708..dbe39ad833 100644
--- a/src/video/SDL_fillrect.c
+++ b/src/video/SDL_fillrect.c
@@ -441,5 +441,3 @@ int SDL_FillRects(SDL_Surface *dst, const SDL_Rect *rects, int count,
     /* We're done! */
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c
index e6c62124df..ace454bf9d 100644
--- a/src/video/SDL_pixels.c
+++ b/src/video/SDL_pixels.c
@@ -1142,5 +1142,3 @@ void SDL_FreeBlitMap(SDL_BlitMap *map)
         SDL_free(map);
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_pixels_c.h b/src/video/SDL_pixels_c.h
index 59996ef7ca..7f7dccf4d3 100644
--- a/src/video/SDL_pixels_c.h
+++ b/src/video/SDL_pixels_c.h
@@ -45,5 +45,3 @@ extern Uint8 SDL_FindColor(SDL_Palette *pal, Uint8 r, Uint8 g, Uint8 b, Uint8 a)
 extern void SDL_DetectPalette(SDL_Palette *pal, SDL_bool *is_opaque, SDL_bool *has_alpha_channel);
 
 #endif /* SDL_pixels_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_rect.c b/src/video/SDL_rect.c
index 333f740960..9d0b74de4c 100644
--- a/src/video/SDL_rect.c
+++ b/src/video/SDL_rect.c
@@ -109,5 +109,3 @@ SDL_GetSpanEnclosingRect(int width, int height,
 #define SDL_ENCLOSEPOINTS        SDL_EncloseFPoints
 #define SDL_INTERSECTRECTANDLINE SDL_IntersectFRectAndLine
 #include "SDL_rect_impl.h"
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_rect_c.h b/src/video/SDL_rect_c.h
index e9cb0a8655..794925b150 100644
--- a/src/video/SDL_rect_c.h
+++ b/src/video/SDL_rect_c.h
@@ -27,5 +27,3 @@
 extern SDL_bool SDL_GetSpanEnclosingRect(int width, int height, int numrects, const SDL_Rect *rects, SDL_Rect *span);
 
 #endif /* SDL_rect_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_rect_impl.h b/src/video/SDL_rect_impl.h
index 5727ec679f..c5a37bf790 100644
--- a/src/video/SDL_rect_impl.h
+++ b/src/video/SDL_rect_impl.h
@@ -440,5 +440,3 @@ SDL_INTERSECTRECTANDLINE(const RECTTYPE *rect, SCALARTYPE *X1, SCALARTYPE *Y1, S
 #undef SDL_UNIONRECT
 #undef SDL_ENCLOSEPOINTS
 #undef SDL_INTERSECTRECTANDLINE
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_shape_internals.h b/src/video/SDL_shape_internals.h
index 554279b0a4..f8bb89c9e9 100644
--- a/src/video/SDL_shape_internals.h
+++ b/src/video/SDL_shape_internals.h
@@ -57,5 +57,3 @@ extern void SDL_TraverseShapeTree(SDL_ShapeTree *tree, SDL_TraversalFunction fun
 extern void SDL_FreeShapeTree(SDL_ShapeTree **shape_tree);
 
 #endif /* SDL_shape_internals_h_ */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_stretch.c b/src/video/SDL_stretch.c
index 83f9efdc76..0917b019f7 100644
--- a/src/video/SDL_stretch.c
+++ b/src/video/SDL_stretch.c
@@ -951,5 +951,3 @@ int SDL_LowerSoftStretchNearest(SDL_Surface *s, const SDL_Rect *srcrect,
         return scale_mat_nearest_1(src, src_w, src_h, src_pitch, dst, dst_w, dst_h, dst_pitch);
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c
index 3255b73e7a..e8269906b3 100644
--- a/src/video/SDL_surface.c
+++ b/src/video/SDL_surface.c
@@ -1563,5 +1563,3 @@ void SDL_FreeSurface(SDL_Surface *surface)
     }
     SDL_free(surface);
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
index 3669696e71..0841119694 100644
--- a/src/video/SDL_sysvideo.h
+++ b/src/video/SDL_sysvideo.h
@@ -518,5 +518,3 @@ extern int SDL_GetPointDisplayIndex(const SDL_Point *point);
 extern int SDL_GL_SwapWindowWithResult(SDL_Window *window);
 
 #endif /* SDL_sysvideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 9aaf6ba98f..87cce71dd8 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -4777,5 +4777,3 @@ void SDL_Metal_GetDrawableSize(SDL_Window *window, int *w, int *h)
         SDL_GetWindowSizeInPixels(window, w, h);
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_vulkan_internal.h b/src/video/SDL_vulkan_internal.h
index e02d8f7861..f6a00c3383 100644
--- a/src/video/SDL_vulkan_internal.h
+++ b/src/video/SDL_vulkan_internal.h
@@ -88,5 +88,3 @@ typedef int (*PFN_vkEnumerateInstanceExtensionProperties)(void);
 #endif /* SDL_VIDEO_VULKAN */
 
 #endif /* SDL_vulkan_internal_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_vulkan_utils.c b/src/video/SDL_vulkan_utils.c
index 43941dfcfe..26ff6b9deb 100644
--- a/src/video/SDL_vulkan_utils.c
+++ b/src/video/SDL_vulkan_utils.c
@@ -494,5 +494,3 @@ error:
 }
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_yuv.c b/src/video/SDL_yuv.c
index 0f9837097b..c1d25dfc20 100644
--- a/src/video/SDL_yuv.c
+++ b/src/video/SDL_yuv.c
@@ -1984,5 +1984,3 @@ int SDL_ConvertPixels_YUV_to_YUV(int width, int height,
     return SDL_SetError("SDL not built with YUV support");
 #endif
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/SDL_yuv_c.h b/src/video/SDL_yuv_c.h
index d37c4b9e1f..ce60df16d3 100644
--- a/src/video/SDL_yuv_c.h
+++ b/src/video/SDL_yuv_c.h
@@ -34,5 +34,3 @@ extern int SDL_ConvertPixels_YUV_to_YUV(int width, int height, Uint32 src_format
 extern int SDL_CalculateYUVSize(Uint32 format, int w, int h, size_t *size, int *pitch);
 
 #endif /* SDL_yuv_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidclipboard.c b/src/video/android/SDL_androidclipboard.c
index 2c3c72a50f..1ef27c9884 100644
--- a/src/video/android/SDL_androidclipboard.c
+++ b/src/video/android/SDL_androidclipboard.c
@@ -43,5 +43,3 @@ SDL_bool Android_HasClipboardText(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidclipboard.h b/src/video/android/SDL_androidclipboard.h
index 08161fc068..8202e6d0cf 100644
--- a/src/video/android/SDL_androidclipboard.h
+++ b/src/video/android/SDL_androidclipboard.h
@@ -28,5 +28,3 @@ extern char *Android_GetClipboardText(_THIS);
 extern SDL_bool Android_HasClipboardText(_THIS);
 
 #endif /* SDL_androidclipboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidevents.c b/src/video/android/SDL_androidevents.c
index 2e55f4b3e0..46b5c15f27 100644
--- a/src/video/android/SDL_androidevents.c
+++ b/src/video/android/SDL_androidevents.c
@@ -266,5 +266,3 @@ void Android_PumpEvents_NonBlocking(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidevents.h b/src/video/android/SDL_androidevents.h
index a345c4c9c2..a0e53fd847 100644
--- a/src/video/android/SDL_androidevents.h
+++ b/src/video/android/SDL_androidevents.h
@@ -24,5 +24,3 @@
 
 extern void Android_PumpEvents_Blocking(_THIS);
 extern void Android_PumpEvents_NonBlocking(_THIS);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidgl.c b/src/video/android/SDL_androidgl.c
index ede41366ad..a7b58adaea 100644
--- a/src/video/android/SDL_androidgl.c
+++ b/src/video/android/SDL_androidgl.c
@@ -84,5 +84,3 @@ int Android_GLES_LoadLibrary(_THIS, const char *path)
 }
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidgl.h b/src/video/android/SDL_androidgl.h
index a28ec09577..cca307c7aa 100644
--- a/src/video/android/SDL_androidgl.h
+++ b/src/video/android/SDL_androidgl.h
@@ -29,5 +29,3 @@ int Android_GLES_SwapWindow(_THIS, SDL_Window *window);
 int Android_GLES_LoadLibrary(_THIS, const char *path);
 
 #endif /* SDL_androidgl_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidkeyboard.c b/src/video/android/SDL_androidkeyboard.c
index bf48abd124..98f7dd0bb7 100644
--- a/src/video/android/SDL_androidkeyboard.c
+++ b/src/video/android/SDL_androidkeyboard.c
@@ -372,5 +372,3 @@ void Android_SetTextInputRect(_THIS, const SDL_Rect *rect)
 }
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidkeyboard.h b/src/video/android/SDL_androidkeyboard.h
index d73f7de758..766701697c 100644
--- a/src/video/android/SDL_androidkeyboard.h
+++ b/src/video/android/SDL_androidkeyboard.h
@@ -31,5 +31,3 @@ extern SDL_bool Android_IsScreenKeyboardShown(_THIS, SDL_Window *window);
 extern void Android_StartTextInput(_THIS);
 extern void Android_StopTextInput(_THIS);
 extern void Android_SetTextInputRect(_THIS, const SDL_Rect *rect);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidmessagebox.c b/src/video/android/SDL_androidmessagebox.c
index 2d36a0240c..b741f866a5 100644
--- a/src/video/android/SDL_androidmessagebox.c
+++ b/src/video/android/SDL_androidmessagebox.c
@@ -31,5 +31,3 @@ int Android_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *button
 }
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidmessagebox.h b/src/video/android/SDL_androidmessagebox.h
index d6a825605a..822e876879 100644
--- a/src/video/android/SDL_androidmessagebox.h
+++ b/src/video/android/SDL_androidmessagebox.h
@@ -25,5 +25,3 @@
 extern int Android_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidmouse.c b/src/video/android/SDL_androidmouse.c
index c03661e448..e665359821 100644
--- a/src/video/android/SDL_androidmouse.c
+++ b/src/video/android/SDL_androidmouse.c
@@ -251,5 +251,3 @@ void Android_OnMouse(SDL_Window *window, int state, int action, float x, float y
 }
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidmouse.h b/src/video/android/SDL_androidmouse.h
index b810859999..2cc5c4596e 100644
--- a/src/video/android/SDL_androidmouse.h
+++ b/src/video/android/SDL_androidmouse.h
@@ -29,5 +29,3 @@ extern void Android_OnMouse(SDL_Window *window, int button, int action, float x,
 extern void Android_QuitMouse(void);
 
 #endif /* SDL_androidmouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidtouch.c b/src/video/android/SDL_androidtouch.c
index 3e2349ead7..b0ce073225 100644
--- a/src/video/android/SDL_androidtouch.c
+++ b/src/video/android/SDL_androidtouch.c
@@ -83,5 +83,3 @@ void Android_OnTouch(SDL_Window *window, int touch_device_id_in, int pointer_fin
 }
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidtouch.h b/src/video/android/SDL_androidtouch.h
index 6338d441fc..6b697e4dce 100644
--- a/src/video/android/SDL_androidtouch.h
+++ b/src/video/android/SDL_androidtouch.h
@@ -25,5 +25,3 @@
 extern void Android_InitTouch(void);
 extern void Android_QuitTouch(void);
 extern void Android_OnTouch(SDL_Window *window, int touch_device_id_in, int pointer_finger_id_in, int action, float x, float y, float p);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidvideo.c b/src/video/android/SDL_androidvideo.c
index c9c001ad63..e95f00678e 100644
--- a/src/video/android/SDL_androidvideo.c
+++ b/src/video/android/SDL_androidvideo.c
@@ -293,5 +293,3 @@ void Android_SendResize(SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidvideo.h b/src/video/android/SDL_androidvideo.h
index 2daf29582c..7eb4942812 100644
--- a/src/video/android/SDL_androidvideo.h
+++ b/src/video/android/SDL_androidvideo.h
@@ -46,5 +46,3 @@ extern SDL_sem *Android_PauseSem, *Android_ResumeSem;
 extern SDL_mutex *Android_ActivityMutex;
 
 #endif /* SDL_androidvideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidvulkan.c b/src/video/android/SDL_androidvulkan.c
index 5c0a496deb..00d5a2f67e 100644
--- a/src/video/android/SDL_androidvulkan.c
+++ b/src/video/android/SDL_androidvulkan.c
@@ -168,5 +168,3 @@ SDL_bool Android_Vulkan_CreateSurface(_THIS,
 }
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidvulkan.h b/src/video/android/SDL_androidvulkan.h
index c4b2183498..28fcedd022 100644
--- a/src/video/android/SDL_androidvulkan.h
+++ b/src/video/android/SDL_androidvulkan.h
@@ -48,5 +48,3 @@ SDL_bool Android_Vulkan_CreateSurface(_THIS,
 #endif
 
 #endif /* SDL_androidvulkan_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidwindow.c b/src/video/android/SDL_androidwindow.c
index 6b5ce179a6..1697a378c7 100644
--- a/src/video/android/SDL_androidwindow.c
+++ b/src/video/android/SDL_androidwindow.c
@@ -213,5 +213,3 @@ int Android_GetWindowWMInfo(_THIS, SDL_Window *window, SDL_SysWMinfo *info)
 }
 
 #endif /* SDL_VIDEO_DRIVER_ANDROID */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidwindow.h b/src/video/android/SDL_androidwindow.h
index f48898abd3..5e3d5e843e 100644
--- a/src/video/android/SDL_androidwindow.h
+++ b/src/video/android/SDL_androidwindow.h
@@ -48,5 +48,3 @@ typedef struct
 } SDL_WindowData;
 
 #endif /* SDL_androidwindow_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaclipboard.h b/src/video/cocoa/SDL_cocoaclipboard.h
index a28577f8bb..1212cf67c5 100644
--- a/src/video/cocoa/SDL_cocoaclipboard.h
+++ b/src/video/cocoa/SDL_cocoaclipboard.h
@@ -32,5 +32,3 @@ extern SDL_bool Cocoa_HasClipboardText(_THIS);
 extern void Cocoa_CheckClipboardUpdate(SDL_VideoData *data);
 
 #endif /* SDL_cocoaclipboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaclipboard.m b/src/video/cocoa/SDL_cocoaclipboard.m
index 4e5a91753c..25eff2df6a 100644
--- a/src/video/cocoa/SDL_cocoaclipboard.m
+++ b/src/video/cocoa/SDL_cocoaclipboard.m
@@ -104,5 +104,3 @@ void Cocoa_CheckClipboardUpdate(SDL_VideoData *data)
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaevents.h b/src/video/cocoa/SDL_cocoaevents.h
index aa70344f0d..3231a60721 100644
--- a/src/video/cocoa/SDL_cocoaevents.h
+++ b/src/video/cocoa/SDL_cocoaevents.h
@@ -31,5 +31,3 @@ extern void Cocoa_SendWakeupEvent(_THIS, SDL_Window *window);
 extern void Cocoa_SuspendScreenSaver(_THIS);
 
 #endif /* SDL_cocoaevents_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaevents.m b/src/video/cocoa/SDL_cocoaevents.m
index 8df1254c7c..4b736edad1 100644
--- a/src/video/cocoa/SDL_cocoaevents.m
+++ b/src/video/cocoa/SDL_cocoaevents.m
@@ -609,5 +609,3 @@ void Cocoa_SuspendScreenSaver(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoakeyboard.h b/src/video/cocoa/SDL_cocoakeyboard.h
index c86379fda0..37be7b3376 100644
--- a/src/video/cocoa/SDL_cocoakeyboard.h
+++ b/src/video/cocoa/SDL_cocoakeyboard.h
@@ -34,5 +34,3 @@ extern void Cocoa_SetTextInputRect(_THIS, const SDL_Rect *rect);
 extern void Cocoa_SetWindowKeyboardGrab(_THIS, SDL_Window *window, SDL_bool grabbed);
 
 #endif /* SDL_cocoakeyboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoakeyboard.m b/src/video/cocoa/SDL_cocoakeyboard.m
index 7e81db4ce7..e08dfecaa6 100644
--- a/src/video/cocoa/SDL_cocoakeyboard.m
+++ b/src/video/cocoa/SDL_cocoakeyboard.m
@@ -450,5 +450,3 @@ void Cocoa_SetWindowKeyboardGrab(_THIS, SDL_Window *window, SDL_bool grabbed)
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoamessagebox.h b/src/video/cocoa/SDL_cocoamessagebox.h
index d74672b1cf..7e49814d2e 100644
--- a/src/video/cocoa/SDL_cocoamessagebox.h
+++ b/src/video/cocoa/SDL_cocoamessagebox.h
@@ -25,5 +25,3 @@
 extern int Cocoa_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
 
 #endif /* SDL_VIDEO_DRIVER_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoamessagebox.m b/src/video/cocoa/SDL_cocoamessagebox.m
index aac2037622..2a8815564d 100644
--- a/src/video/cocoa/SDL_cocoamessagebox.m
+++ b/src/video/cocoa/SDL_cocoamessagebox.m
@@ -167,5 +167,3 @@ int Cocoa_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoametalview.h b/src/video/cocoa/SDL_cocoametalview.h
index 500e1f4932..a85b119f2c 100644
--- a/src/video/cocoa/SDL_cocoametalview.h
+++ b/src/video/cocoa/SDL_cocoametalview.h
@@ -64,5 +64,3 @@ void Cocoa_Metal_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h);
 #endif /* SDL_VIDEO_DRIVER_COCOA && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL) */
 
 #endif /* SDL_cocoametalview_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoametalview.m b/src/video/cocoa/SDL_cocoametalview.m
index a8e89d7f40..6e2568fb70 100644
--- a/src/video/cocoa/SDL_cocoametalview.m
+++ b/src/video/cocoa/SDL_cocoametalview.m
@@ -197,5 +197,3 @@ void Cocoa_Metal_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h)
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL) */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoamodes.h b/src/video/cocoa/SDL_cocoamodes.h
index df2a122151..ebba30dd0c 100644
--- a/src/video/cocoa/SDL_cocoamodes.h
+++ b/src/video/cocoa/SDL_cocoamodes.h
@@ -42,5 +42,3 @@ extern int Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMod
 extern void Cocoa_QuitModes(_THIS);
 
 #endif /* SDL_cocoamodes_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoamodes.m b/src/video/cocoa/SDL_cocoamodes.m
index 4133cb8ed3..f382320ef5 100644
--- a/src/video/cocoa/SDL_cocoamodes.m
+++ b/src/video/cocoa/SDL_cocoamodes.m
@@ -677,5 +677,3 @@ void Cocoa_QuitModes(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoamouse.h b/src/video/cocoa/SDL_cocoamouse.h
index a4e4cffbb0..c56b2ca6d1 100644
--- a/src/video/cocoa/SDL_cocoamouse.h
+++ b/src/video/cocoa/SDL_cocoamouse.h
@@ -48,5 +48,3 @@ typedef struct
 @end
 
 #endif /* SDL_cocoamouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoamouse.m b/src/video/cocoa/SDL_cocoamouse.m
index 4c19b42157..bc15d7169b 100644
--- a/src/video/cocoa/SDL_cocoamouse.m
+++ b/src/video/cocoa/SDL_cocoamouse.m
@@ -560,5 +560,3 @@ void Cocoa_QuitMouse(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaopengl.h b/src/video/cocoa/SDL_cocoaopengl.h
index 4b631b5a88..185b2a6c6e 100644
--- a/src/video/cocoa/SDL_cocoaopengl.h
+++ b/src/video/cocoa/SDL_cocoaopengl.h
@@ -87,5 +87,3 @@ extern void Cocoa_GL_DeleteContext(_THIS, SDL_GLContext context);
 #endif /* SDL_VIDEO_OPENGL_CGL */
 
 #endif /* SDL_cocoaopengl_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaopengl.m b/src/video/cocoa/SDL_cocoaopengl.m
index 16aab89d5c..26d0b6043e 100644
--- a/src/video/cocoa/SDL_cocoaopengl.m
+++ b/src/video/cocoa/SDL_cocoaopengl.m
@@ -526,5 +526,3 @@ void Cocoa_GL_DeleteContext(_THIS, SDL_GLContext context)
 #endif
 
 #endif /* SDL_VIDEO_OPENGL_CGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaopengles.h b/src/video/cocoa/SDL_cocoaopengles.h
index 7d6901e4b7..a860797122 100644
--- a/src/video/cocoa/SDL_cocoaopengles.h
+++ b/src/video/cocoa/SDL_cocoaopengles.h
@@ -48,5 +48,3 @@ extern SDL_EGLSurface Cocoa_GLES_GetEGLSurface(_THIS, SDL_Window *window);
 #endif /* SDL_VIDEO_OPENGL_EGL */
 
 #endif /* SDL_cocoaopengles_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaopengles.m b/src/video/cocoa/SDL_cocoaopengles.m
index 2671af63a4..521c870fb8 100644
--- a/src/video/cocoa/SDL_cocoaopengles.m
+++ b/src/video/cocoa/SDL_cocoaopengles.m
@@ -176,5 +176,3 @@ Cocoa_GLES_GetEGLSurface(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA && SDL_VIDEO_OPENGL_EGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoashape.h b/src/video/cocoa/SDL_cocoashape.h
index 064928a5e2..a00d978fbd 100644
--- a/src/video/cocoa/SDL_cocoashape.h
+++ b/src/video/cocoa/SDL_cocoashape.h
@@ -37,5 +37,3 @@ extern int Cocoa_SetWindowShape(SDL_WindowShaper *shaper, SDL_Surface *shape, SD
 extern int Cocoa_ResizeWindowShape(SDL_Window *window);
 
 #endif /* SDL_cocoashape_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoashape.m b/src/video/cocoa/SDL_cocoashape.m
index 09c972383d..d85298aa21 100644
--- a/src/video/cocoa/SDL_cocoashape.m
+++ b/src/video/cocoa/SDL_cocoashape.m
@@ -127,5 +127,3 @@ int Cocoa_ResizeWindowShape(SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoavideo.h b/src/video/cocoa/SDL_cocoavideo.h
index 460fa7c470..8c31421fc5 100644
--- a/src/video/cocoa/SDL_cocoavideo.h
+++ b/src/video/cocoa/SDL_cocoavideo.h
@@ -116,5 +116,3 @@ extern NSImage *Cocoa_CreateImage(SDL_Surface *surface);
 #endif
 
 #endif /* SDL_cocoavideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoavulkan.h b/src/video/cocoa/SDL_cocoavulkan.h
index 092e4d0c4e..3ed96cad2a 100644
--- a/src/video/cocoa/SDL_cocoavulkan.h
+++ b/src/video/cocoa/SDL_cocoavulkan.h
@@ -50,5 +50,3 @@ void Cocoa_Vulkan_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h);
 #endif
 
 #endif /* SDL_cocoavulkan_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoawindow.h b/src/video/cocoa/SDL_cocoawindow.h
index 1eb736f7ab..d4ed3c6c5e 100644
--- a/src/video/cocoa/SDL_cocoawindow.h
+++ b/src/video/cocoa/SDL_cocoawindow.h
@@ -170,5 +170,3 @@ extern void Cocoa_AcceptDragAndDrop(SDL_Window *window, SDL_bool accept);
 extern int Cocoa_FlashWindow(_THIS, SDL_Window *window, SDL_FlashOperation operation);
 
 #endif /* SDL_cocoawindow_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoawindow.m b/src/video/cocoa/SDL_cocoawindow.m
index 12f6c6676b..46b8a2e269 100644
--- a/src/video/cocoa/SDL_cocoawindow.m
+++ b/src/video/cocoa/SDL_cocoawindow.m
@@ -2466,5 +2466,3 @@ int Cocoa_SetWindowOpacity(_THIS, SDL_Window *window, float opacity)
 }
 
 #endif /* SDL_VIDEO_DRIVER_COCOA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/dummy/SDL_nullevents.c b/src/video/dummy/SDL_nullevents.c
index 13f0f217f0..67bc755411 100644
--- a/src/video/dummy/SDL_nullevents.c
+++ b/src/video/dummy/SDL_nullevents.c
@@ -36,5 +36,3 @@ void DUMMY_PumpEvents(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_DUMMY */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/dummy/SDL_nullevents_c.h b/src/video/dummy/SDL_nullevents_c.h
index 6cc7851240..7a1f65a208 100644
--- a/src/video/dummy/SDL_nullevents_c.h
+++ b/src/video/dummy/SDL_nullevents_c.h
@@ -29,5 +29,3 @@
 extern void DUMMY_PumpEvents(_THIS);
 
 #endif /* SDL_nullevents_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/dummy/SDL_nullframebuffer.c b/src/video/dummy/SDL_nullframebuffer.c
index f1e7f73669..6186a00457 100644
--- a/src/video/dummy/SDL_nullframebuffer.c
+++ b/src/video/dummy/SDL_nullframebuffer.c
@@ -80,5 +80,3 @@ void SDL_DUMMY_DestroyWindowFramebuffer(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_DUMMY */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/dummy/SDL_nullframebuffer_c.h b/src/video/dummy/SDL_nullframebuffer_c.h
index 4de54d0edf..118ca41660 100644
--- a/src/video/dummy/SDL_nullframebuffer_c.h
+++ b/src/video/dummy/SDL_nullframebuffer_c.h
@@ -29,5 +29,3 @@ extern int SDL_DUMMY_UpdateWindowFramebuffer(_THIS, SDL_Window *window, const SD
 extern void SDL_DUMMY_DestroyWindowFramebuffer(_THIS, SDL_Window *window);
 
 #endif /* SDL_nullframebuffer_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/dummy/SDL_nullvideo.c b/src/video/dummy/SDL_nullvideo.c
index 04be2d3504..0ba5e89239 100644
--- a/src/video/dummy/SDL_nullvideo.c
+++ b/src/video/dummy/SDL_nullvideo.c
@@ -175,5 +175,3 @@ void DUMMY_VideoQuit(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_DUMMY */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/dummy/SDL_nullvideo.h b/src/video/dummy/SDL_nullvideo.h
index 0cb7157883..54b258c996 100644
--- a/src/video/dummy/SDL_nullvideo.h
+++ b/src/video/dummy/SDL_nullvideo.h
@@ -26,5 +26,3 @@
 #include "../SDL_sysvideo.h"
 
 #endif /* SDL_nullvideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenevents.c b/src/video/emscripten/SDL_emscriptenevents.c
index 96cb3f3894..42f262a53d 100644
--- a/src/video/emscripten/SDL_emscriptenevents.c
+++ b/src/video/emscripten/SDL_emscriptenevents.c
@@ -1023,5 +1023,3 @@ void Emscripten_UnregisterEventHandlers(SDL_WindowData *data)
 }
 
 #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenevents.h b/src/video/emscripten/SDL_emscriptenevents.h
index 261a4f0b93..125516d4f5 100644
--- a/src/video/emscripten/SDL_emscriptenevents.h
+++ b/src/video/emscripten/SDL_emscriptenevents.h
@@ -34,5 +34,3 @@ extern EM_BOOL
 Emscripten_HandleCanvasResize(int eventType, const void *reserved, void *userData);
 
 #endif /* SDL_emscriptenevents_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenframebuffer.c b/src/video/emscripten/SDL_emscriptenframebuffer.c
index 3500ad44cf..01acb3e234 100644
--- a/src/video/emscripten/SDL_emscriptenframebuffer.c
+++ b/src/video/emscripten/SDL_emscriptenframebuffer.c
@@ -159,5 +159,3 @@ void Emscripten_DestroyWindowFramebuffer(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenframebuffer.h b/src/video/emscripten/SDL_emscriptenframebuffer.h
index 9dbacaeadb..88aa31a308 100644
--- a/src/video/emscripten/SDL_emscriptenframebuffer.h
+++ b/src/video/emscripten/SDL_emscriptenframebuffer.h
@@ -28,5 +28,3 @@ extern int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window *window, const S
 extern void Emscripten_DestroyWindowFramebuffer(_THIS, SDL_Window *window);
 
 #endif /* SDL_emscriptenframebuffer_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenmouse.c b/src/video/emscripten/SDL_emscriptenmouse.c
index d105e9445a..fc97d44c70 100644
--- a/src/video/emscripten/SDL_emscriptenmouse.c
+++ b/src/video/emscripten/SDL_emscriptenmouse.c
@@ -253,5 +253,3 @@ void Emscripten_FiniMouse()
 }
 
 #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenmouse.h b/src/video/emscripten/SDL_emscriptenmouse.h
index 3ef13c265b..1db29c435c 100644
--- a/src/video/emscripten/SDL_emscriptenmouse.h
+++ b/src/video/emscripten/SDL_emscriptenmouse.h
@@ -35,5 +35,3 @@ extern void
 Emscripten_FiniMouse();
 
 #endif /* SDL_emscriptenmouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenopengles.c b/src/video/emscripten/SDL_emscriptenopengles.c
index c4039efcb9..9293765bd6 100644
--- a/src/video/emscripten/SDL_emscriptenopengles.c
+++ b/src/video/emscripten/SDL_emscriptenopengles.c
@@ -156,5 +156,3 @@ int Emscripten_GLES_MakeCurrent(_THIS, SDL_Window *window, SDL_GLContext context
 }
 
 #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenopengles.h b/src/video/emscripten/SDL_emscriptenopengles.h
index 3488811083..4d3bb4d3a2 100644
--- a/src/video/emscripten/SDL_emscriptenopengles.h
+++ b/src/video/emscripten/SDL_emscriptenopengles.h
@@ -41,5 +41,3 @@ extern int Emscripten_GLES_MakeCurrent(_THIS, SDL_Window *window, SDL_GLContext
 #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN */
 
 #endif /* SDL_emscriptenopengles_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenvideo.c b/src/video/emscripten/SDL_emscriptenvideo.c
index ac9e4e27b1..9ad38dbf7d 100644
--- a/src/video/emscripten/SDL_emscriptenvideo.c
+++ b/src/video/emscripten/SDL_emscriptenvideo.c
@@ -354,5 +354,3 @@ static void Emscripten_SetWindowTitle(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenvideo.h b/src/video/emscripten/SDL_emscriptenvideo.h
index 496616dde4..216e9c0082 100644
--- a/src/video/emscripten/SDL_emscriptenvideo.h
+++ b/src/video/emscripten/SDL_emscriptenvideo.h
@@ -48,5 +48,3 @@ typedef struct SDL_WindowData
 } SDL_WindowData;
 
 #endif /* SDL_emscriptenvideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h
index 011936f381..01b436c0f2 100644
--- a/src/video/haiku/SDL_BWin.h
+++ b/src/video/haiku/SDL_BWin.h
@@ -749,5 +749,3 @@ class SDL_BWin : public BWindow
  *                         buffer provided by DirectConnected() is invalidated.
  */
 #endif /* SDL_BWin_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bclipboard.cc b/src/video/haiku/SDL_bclipboard.cc
index a16877327b..d7022b6da9 100644
--- a/src/video/haiku/SDL_bclipboard.cc
+++ b/src/video/haiku/SDL_bclipboard.cc
@@ -90,5 +90,3 @@ SDL_bool HAIKU_HasClipboardText(_THIS) {
 #endif
 
 #endif /* SDL_VIDEO_DRIVER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bclipboard.h b/src/video/haiku/SDL_bclipboard.h
index c0a40aea0e..d125773045 100644
--- a/src/video/haiku/SDL_bclipboard.h
+++ b/src/video/haiku/SDL_bclipboard.h
@@ -29,5 +29,3 @@ extern char *HAIKU_GetClipboardText(_THIS);
 extern SDL_bool HAIKU_HasClipboardText(_THIS);
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bevents.cc b/src/video/haiku/SDL_bevents.cc
index 1ccd41540c..2d85a09f4a 100644
--- a/src/video/haiku/SDL_bevents.cc
+++ b/src/video/haiku/SDL_bevents.cc
@@ -37,5 +37,3 @@ void HAIKU_PumpEvents(_THIS) {
 #endif
 
 #endif /* SDL_VIDEO_DRIVER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bevents.h b/src/video/haiku/SDL_bevents.h
index 22e491adbd..5001bdaf7f 100644
--- a/src/video/haiku/SDL_bevents.h
+++ b/src/video/haiku/SDL_bevents.h
@@ -35,5 +35,3 @@ extern void HAIKU_PumpEvents(_THIS);
 #endif
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bframebuffer.cc b/src/video/haiku/SDL_bframebuffer.cc
index 5e04f5eec2..830feebcd1 100644
--- a/src/video/haiku/SDL_bframebuffer.cc
+++ b/src/video/haiku/SDL_bframebuffer.cc
@@ -125,5 +125,3 @@ void HAIKU_DestroyWindowFramebuffer(_THIS, SDL_Window * window) {
 #endif
 
 #endif /* SDL_VIDEO_DRIVER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bframebuffer.h b/src/video/haiku/SDL_bframebuffer.h
index c0afd520c0..f8743bb143 100644
--- a/src/video/haiku/SDL_bframebuffer.h
+++ b/src/video/haiku/SDL_bframebuffer.h
@@ -43,5 +43,3 @@ extern int32 HAIKU_DrawThread(void *data);
 #endif
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bkeyboard.cc b/src/video/haiku/SDL_bkeyboard.cc
index 6e31b97eed..e4f968771e 100644
--- a/src/video/haiku/SDL_bkeyboard.cc
+++ b/src/video/haiku/SDL_bkeyboard.cc
@@ -184,5 +184,3 @@ void HAIKU_SetKeyState(int32 bkey, int8 state) {
 #endif
 
 #endif /* SDL_VIDEO_DRIVER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bkeyboard.h b/src/video/haiku/SDL_bkeyboard.h
index 4c76b4134e..d2b47c4414 100644
--- a/src/video/haiku/SDL_bkeyboard.h
+++ b/src/video/haiku/SDL_bkeyboard.h
@@ -38,5 +38,3 @@ extern void HAIKU_SetKeyState(int32 bkey, int8 state);
 #endif
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bmessagebox.cc b/src/video/haiku/SDL_bmessagebox.cc
index 2d675fea26..99dc3fbe64 100644
--- a/src/video/haiku/SDL_bmessagebox.cc
+++ b/src/video/haiku/SDL_bmessagebox.cc
@@ -396,5 +396,3 @@ HAIKU_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
 #endif
 
 #endif /* SDL_VIDEO_DRIVER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bmessagebox.h b/src/video/haiku/SDL_bmessagebox.h
index 9eaa927044..888b52f1b6 100644
--- a/src/video/haiku/SDL_bmessagebox.h
+++ b/src/video/haiku/SDL_bmessagebox.h
@@ -41,5 +41,3 @@ HAIKU_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
 #endif /* SDL_VIDEO_DRIVER_HAIKU */
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bmodes.cc b/src/video/haiku/SDL_bmodes.cc
index 27c057f977..3f395e2909 100644
--- a/src/video/haiku/SDL_bmodes.cc
+++ b/src/video/haiku/SDL_bmodes.cc
@@ -302,5 +302,3 @@ int HAIKU_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mode
 #endif
 
 #endif /* SDL_VIDEO_DRIVER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bmodes.h b/src/video/haiku/SDL_bmodes.h
index ead3817720..ff4c503a6e 100644
--- a/src/video/haiku/SDL_bmodes.h
+++ b/src/video/haiku/SDL_bmodes.h
@@ -43,5 +43,3 @@ extern int HAIKU_SetDisplayMode(_THIS, SDL_VideoDisplay *display,
 #endif
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bopengl.cc b/src/video/haiku/SDL_bopengl.cc
index ebf1b696d8..940c1ddf67 100644
--- a/src/video/haiku/SDL_bopengl.cc
+++ b/src/video/haiku/SDL_bopengl.cc
@@ -193,5 +193,3 @@ void HAIKU_GL_RebootContexts(_THIS) {
 #endif
 
 #endif /* SDL_VIDEO_DRIVER_HAIKU && SDL_VIDEO_OPENGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bopengl.h b/src/video/haiku/SDL_bopengl.h
index 298d27b09f..00278a2dd2 100644
--- a/src/video/haiku/SDL_bopengl.h
+++ b/src/video/haiku/SDL_bopengl.h
@@ -50,5 +50,3 @@ extern void HAIKU_GL_RebootContexts(_THIS);
 #endif /* SDL_VIDEO_DRIVER_HAIKU && SDL_VIDEO_OPENGL */
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bvideo.cc b/src/video/haiku/SDL_bvideo.cc
index 3d29e7455f..b7cfc3d1ef 100644
--- a/src/video/haiku/SDL_bvideo.cc
+++ b/src/video/haiku/SDL_bvideo.cc
@@ -311,5 +311,3 @@ int HAIKU_OpenURL(const char *url)
 #endif
 
 #endif /* SDL_VIDEO_DRIVER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bvideo.h b/src/video/haiku/SDL_bvideo.h
index a81b3bb648..af2edbb6ab 100644
--- a/src/video/haiku/SDL_bvideo.h
+++ b/src/video/haiku/SDL_bvideo.h
@@ -38,5 +38,3 @@ extern void HAIKU_DeleteDevice(_THIS);
 #endif
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bwindow.cc b/src/video/haiku/SDL_bwindow.cc
index 1a94db1a0d..2462644e15 100644
--- a/src/video/haiku/SDL_bwindow.cc
+++ b/src/video/haiku/SDL_bwindow.cc
@@ -227,5 +227,3 @@ int HAIKU_GetWindowWMInfo(_THIS, SDL_Window *window, struct SDL_SysWMinfo *info)
 #endif
 
 #endif /* SDL_VIDEO_DRIVER_HAIKU */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bwindow.h b/src/video/haiku/SDL_bwindow.h
index 88ef7c429f..bc36251a50 100644
--- a/src/video/haiku/SDL_bwindow.h
+++ b/src/video/haiku/SDL_bwindow.h
@@ -45,5 +45,3 @@ extern void HAIKU_DestroyWindow(_THIS, SDL_Window *window);
 extern int HAIKU_GetWindowWMInfo(_THIS, SDL_Window *window, struct SDL_SysWMinfo *info);
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmdyn.c b/src/video/kmsdrm/SDL_kmsdrmdyn.c
index 07ff2e9de1..119c40a268 100644
--- a/src/video/kmsdrm/SDL_kmsdrmdyn.c
+++ b/src/video/kmsdrm/SDL_kmsdrmdyn.c
@@ -157,5 +157,3 @@ int SDL_KMSDRM_LoadSymbols(void)
 }
 
 #endif /* SDL_VIDEO_DRIVER_KMSDRM */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmdyn.h b/src/video/kmsdrm/SDL_kmsdrmdyn.h
index 1690063363..e9b4f6d2fb 100644
--- a/src/video/kmsdrm/SDL_kmsdrmdyn.h
+++ b/src/video/kmsdrm/SDL_kmsdrmdyn.h
@@ -49,5 +49,3 @@ void SDL_KMSDRM_UnloadSymbols(void);
 #endif
 
 #endif /* SDL_kmsdrmdyn_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmmouse.c b/src/video/kmsdrm/SDL_kmsdrmmouse.c
index 6defe5756e..01957fbc2f 100644
--- a/src/video/kmsdrm/SDL_kmsdrmmouse.c
+++ b/src/video/kmsdrm/SDL_kmsdrmmouse.c
@@ -447,5 +447,3 @@ static void KMSDRM_MoveCursor(SDL_Cursor *cursor)
 }
 
 #endif /* SDL_VIDEO_DRIVER_KMSDRM */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmmouse.h b/src/video/kmsdrm/SDL_kmsdrmmouse.h
index d4e338327a..3e7a9b8d29 100644
--- a/src/video/kmsdrm/SDL_kmsdrmmouse.h
+++ b/src/video/kmsdrm/SDL_kmsdrmmouse.h
@@ -51,5 +51,3 @@ extern void KMSDRM_DestroyCursorBO(_THIS, SDL_VideoDisplay *display);
 extern void KMSDRM_InitCursor(void);
 
 #endif /* SDL_KMSDRM_mouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.c b/src/video/kmsdrm/SDL_kmsdrmopengles.c
index 8d3bb37853..2f75889ad2 100644
--- a/src/video/kmsdrm/SDL_kmsdrmopengles.c
+++ b/src/video/kmsdrm/SDL_kmsdrmopengles.c
@@ -201,5 +201,3 @@ int KMSDRM_GLES_SwapWindow(_THIS, SDL_Window *window)
 SDL_EGL_MakeCurrent_impl(KMSDRM)
 
 #endif /* SDL_VIDEO_DRIVER_KMSDRM */
-
-    /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.h b/src/video/kmsdrm/SDL_kmsdrmopengles.h
index 8e571daaad..e4a97f8088 100644
--- a/src/video/kmsdrm/SDL_kmsdrmopengles.h
+++ b/src/video/kmsdrm/SDL_kmsdrmopengles.h
@@ -44,5 +44,3 @@ extern int KMSDRM_GLES_MakeCurrent(_THIS, SDL_Window *window, SDL_GLContext cont
 #endif /* SDL_VIDEO_DRIVER_KMSDRM */
 
 #endif /* SDL_kmsdrmopengles_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmsym.h b/src/video/kmsdrm/SDL_kmsdrmsym.h
index 6b4ee6936a..f14e58cf0f 100644
--- a/src/video/kmsdrm/SDL_kmsdrmsym.h
+++ b/src/video/kmsdrm/SDL_kmsdrmsym.h
@@ -125,5 +125,3 @@ SDL_KMSDRM_SYM(void,gbm_surface_release_buffer,(struct gbm_surface *surf, struct
 #undef SDL_KMSDRM_SYM_CONST
 
 /* *INDENT-ON* */ /* clang-format on */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.c b/src/video/kmsdrm/SDL_kmsdrmvideo.c
index 30d0187ab7..527e1b8e61 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.c
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.c
@@ -1594,5 +1594,3 @@ int KMSDRM_GetWindowWMInfo(_THIS, SDL_Window *window, struct SDL_SysWMinfo *info
 }
 
 #endif /* SDL_VIDEO_DRIVER_KMSDRM */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmvideo.h b/src/video/kmsdrm/SDL_kmsdrmvideo.h
index 49dba346dd..4646901459 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvideo.h
+++ b/src/video/kmsdrm/SDL_kmsdrmvideo.h
@@ -151,5 +151,3 @@ int KMSDRM_GLES_SwapWindow(_THIS, SDL_Window *window);
 void KMSDRM_GLES_DeleteContext(_THIS, SDL_GLContext context);
 
 #endif /* __SDL_KMSDRMVIDEO_H__ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmvulkan.h b/src/video/kmsdrm/SDL_kmsdrmvulkan.h
index 59c404214c..dc08b7d244 100644
--- a/src/video/kmsdrm/SDL_kmsdrmvulkan.h
+++ b/src/video/kmsdrm/SDL_kmsdrmvulkan.h
@@ -49,5 +49,3 @@ SDL_bool KMSDRM_Vulkan_CreateSurface(_THIS,
 #endif
 
 #endif /* SDL_kmsdrm_vulkan_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dsevents.c b/src/video/n3ds/SDL_n3dsevents.c
index 9252ef8300..315b162ce2 100644
--- a/src/video/n3ds/SDL_n3dsevents.c
+++ b/src/video/n3ds/SDL_n3dsevents.c
@@ -43,5 +43,3 @@ void N3DS_PumpEvents(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dsevents_c.h b/src/video/n3ds/SDL_n3dsevents_c.h
index dd38251729..141259d4a2 100644
--- a/src/video/n3ds/SDL_n3dsevents_c.h
+++ b/src/video/n3ds/SDL_n3dsevents_c.h
@@ -27,5 +27,3 @@
 extern void N3DS_PumpEvents(_THIS);
 
 #endif /* SDL_n3dsevents_c_h_ */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dsframebuffer.c b/src/video/n3ds/SDL_n3dsframebuffer.c
index 7e49f52612..b18f181551 100644
--- a/src/video/n3ds/SDL_n3dsframebuffer.c
+++ b/src/video/n3ds/SDL_n3dsframebuffer.c
@@ -139,5 +139,3 @@ void SDL_N3DS_DestroyWindowFramebuffer(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dsframebuffer_c.h b/src/video/n3ds/SDL_n3dsframebuffer_c.h
index 32cb83f622..a8d44f6fe1 100644
--- a/src/video/n3ds/SDL_n3dsframebuffer_c.h
+++ b/src/video/n3ds/SDL_n3dsframebuffer_c.h
@@ -29,5 +29,3 @@ int SDL_N3DS_UpdateWindowFramebuffer(_THIS, SDL_Window *window, const SDL_Rect *
 void SDL_N3DS_DestroyWindowFramebuffer(_THIS, SDL_Window *window);
 
 #endif /* SDL_n3dsframebuffer_c_h_ */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dsswkb.c b/src/video/n3ds/SDL_n3dsswkb.c
index 77886bf432..8ade6f537e 100644
--- a/src/video/n3ds/SDL_n3dsswkb.c
+++ b/src/video/n3ds/SDL_n3dsswkb.c
@@ -67,5 +67,3 @@ void N3DS_StopTextInput(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dsswkb.h b/src/video/n3ds/SDL_n3dsswkb.h
index 6a48ae8ded..d4eade02e5 100644
--- a/src/video/n3ds/SDL_n3dsswkb.h
+++ b/src/video/n3ds/SDL_n3dsswkb.h
@@ -34,5 +34,3 @@ void N3DS_StartTextInput(_THIS);
 void N3DS_StopTextInput(_THIS);
 
 #endif /* SDL_n3dskeyboard_h_ */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dstouch.c b/src/video/n3ds/SDL_n3dstouch.c
index f7fb66d858..639bf1dbfa 100644
--- a/src/video/n3ds/SDL_n3dstouch.c
+++ b/src/video/n3ds/SDL_n3dstouch.c
@@ -77,5 +77,3 @@ void N3DS_PollTouch(void)
 }
 
 #endif /* SDL_VIDEO_DRIVER_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dstouch.h b/src/video/n3ds/SDL_n3dstouch.h
index 4cc7a05333..9202f9ffcb 100644
--- a/src/video/n3ds/SDL_n3dstouch.h
+++ b/src/video/n3ds/SDL_n3dstouch.h
@@ -27,5 +27,3 @@ void N3DS_QuitTouch(void);
 void N3DS_PollTouch(void);
 
 #endif /* SDL_n3dstouch_h_ */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dsvideo.c b/src/video/n3ds/SDL_n3dsvideo.c
index 30686e84d2..627c0ddb95 100644
--- a/src/video/n3ds/SDL_n3dsvideo.c
+++ b/src/video/n3ds/SDL_n3dsvideo.c
@@ -184,5 +184,3 @@ static void N3DS_DestroyWindow(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_N3DS */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/n3ds/SDL_n3dsvideo.h b/src/video/n3ds/SDL_n3dsvideo.h
index 407b3c2481..5c21f379c0 100644
--- a/src/video/n3ds/SDL_n3dsvideo.h
+++ b/src/video/n3ds/SDL_n3dsvideo.h
@@ -34,5 +34,3 @@ typedef struct SDL_WindowData
 #define FRAMEBUFFER_FORMAT SDL_PIXELFORMAT_RGBA8888
 
 #endif /* SDL_n3dsvideo_h_ */
-
-/* vi: set sts=4 ts=4 sw=4 expandtab: */
diff --git a/src/video/ngage/SDL_ngageevents.cpp b/src/video/ngage/SDL_ngageevents.cpp
index 4a7bd1af9b..7288ad00cc 100644
--- a/src/video/ngage/SDL_ngageevents.cpp
+++ b/src/video/ngage/SDL_ngageevents.cpp
@@ -192,5 +192,3 @@ int HandleWsEvent(_THIS, const TWsEvent &aWsEvent)
 }
 
 #endif /* SDL_VIDEO_DRIVER_NGAGE */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/ngage/SDL_ngageevents_c.h b/src/video/ngage/SDL_ngageevents_c.h
index 4f2f62a455..d4249a06f5 100644
--- a/src/video/ngage/SDL_ngageevents_c.h
+++ b/src/video/ngage/SDL_ngageevents_c.h
@@ -24,5 +24,3 @@
 #include "SDL_ngagevideo.h"
 
 extern void NGAGE_PumpEvents(_THIS);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/ngage/SDL_ngageframebuffer.cpp b/src/video/ngage/SDL_ngageframebuffer.cpp
index ed403a851e..6e0740df10 100644
--- a/src/video/ngage/SDL_ngageframebuffer.cpp
+++ b/src/video/ngage/SDL_ngageframebuffer.cpp
@@ -395,5 +395,3 @@ void RedrawWindowL(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_NGAGE */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/ngage/SDL_ngageframebuffer_c.h b/src/video/ngage/SDL_ngageframebuffer_c.h
index 19000a3135..cad5ef6343 100644
--- a/src/video/ngage/SDL_ngageframebuffer_c.h
+++ b/src/video/ngage/SDL_ngageframebuffer_c.h
@@ -34,5 +34,3 @@ class NGAGE_Runtime
   public:
     IMPORT_C static void GetScreenInfo(TScreenInfoV01 &screenInfo2);
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/ngage/SDL_ngagevideo.cpp b/src/video/ngage/SDL_ngagevideo.cpp
index 8e57261694..0eff10fcc0 100644
--- a/src/video/ngage/SDL_ngagevideo.cpp
+++ b/src/video/ngage/SDL_ngagevideo.cpp
@@ -174,5 +174,3 @@ void NGAGE_VideoQuit(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_NGAGE */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/ngage/SDL_ngagevideo.h b/src/video/ngage/SDL_ngagevideo.h
index 420ead171c..ff91012bc2 100644
--- a/src/video/ngage/SDL_ngagevideo.h
+++ b/src/video/ngage/SDL_ngagevideo.h
@@ -64,5 +64,3 @@ typedef struct SDL_VideoData
 } SDL_VideoData;
 
 #endif /* _SDL_ngagevideo_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/ngage/SDL_ngagewindow.cpp b/src/video/ngage/SDL_ngagewindow.cpp
index c74f1be110..35c266bb0d 100644
--- a/src/video/ngage/SDL_ngagewindow.cpp
+++ b/src/video/ngage/SDL_ngagewindow.cpp
@@ -123,5 +123,3 @@ void ConstructWindowL(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_NGAGE */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/ngage/SDL_ngagewindow.h b/src/video/ngage/SDL_ngagewindow.h
index 53eae3648a..cb69faaebf 100644
--- a/src/video/ngage/SDL_ngagewindow.h
+++ b/src/video/ngage/SDL_ngagewindow.h
@@ -41,5 +41,3 @@ extern void
 NGAGE_DestroyWindow(_THIS, SDL_Window *window);
 
 #endif /* _SDL_ngagewindow */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenevents.c b/src/video/offscreen/SDL_offscreenevents.c
index 4b6776d4d1..922e8cc59f 100644
--- a/src/video/offscreen/SDL_offscreenevents.c
+++ b/src/video/offscreen/SDL_offscreenevents.c
@@ -36,5 +36,3 @@ void OFFSCREEN_PumpEvents(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_OFFSCREEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenevents_c.h b/src/video/offscreen/SDL_offscreenevents_c.h
index 93595742f3..2493711aa5 100644
--- a/src/video/offscreen/SDL_offscreenevents_c.h
+++ b/src/video/offscreen/SDL_offscreenevents_c.h
@@ -21,5 +21,3 @@
 #include "SDL_internal.h"
 
 extern void OFFSCREEN_PumpEvents(_THIS);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenframebuffer.c b/src/video/offscreen/SDL_offscreenframebuffer.c
index 5c9ace2d58..cbaa76c45c 100644
--- a/src/video/offscreen/SDL_offscreenframebuffer.c
+++ b/src/video/offscreen/SDL_offscreenframebuffer.c
@@ -80,5 +80,3 @@ void SDL_OFFSCREEN_DestroyWindowFramebuffer(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_OFFSCREEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenframebuffer_c.h b/src/video/offscreen/SDL_offscreenframebuffer_c.h
index 0222442676..719b69fa42 100644
--- a/src/video/offscreen/SDL_offscreenframebuffer_c.h
+++ b/src/video/offscreen/SDL_offscreenframebuffer_c.h
@@ -23,5 +23,3 @@
 extern int SDL_OFFSCREEN_CreateWindowFramebuffer(_THIS, SDL_Window *window, Uint32 *format, void **pixels, int *pitch);
 extern int SDL_OFFSCREEN_UpdateWindowFramebuffer(_THIS, SDL_Window *window, const SDL_Rect *rects, int numrects);
 extern void SDL_OFFSCREEN_DestroyWindowFramebuffer(_THIS, SDL_Window *window);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenopengles.c b/src/video/offscreen/SDL_offscreenopengles.c
index 52f3b1d149..2f856655ea 100644
--- a/src/video/offscreen/SDL_offscreenopengles.c
+++ b/src/video/offscreen/SDL_offscreenopengles.c
@@ -83,5 +83,3 @@ int OFFSCREEN_GLES_SwapWindow(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_OFFSCREEN && SDL_VIDEO_OPENGL_EGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenopengles.h b/src/video/offscreen/SDL_offscreenopengles.h
index ac93f9caa4..26c52b45ff 100644
--- a/src/video/offscreen/SDL_offscreenopengles.h
+++ b/src/video/offscreen/SDL_offscreenopengles.h
@@ -42,5 +42,3 @@ extern int OFFSCREEN_GLES_SwapWindow(_THIS, SDL_Window *window);
 #endif /* SDL_VIDEO_DRIVER_OFFSCREEN && SDL_VIDEO_OPENGL_EGL */
 
 #endif /* _SDL_offscreenopengles_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenvideo.c b/src/video/offscreen/SDL_offscreenvideo.c
index 681b33d771..158b314cb7 100644
--- a/src/video/offscreen/SDL_offscreenvideo.c
+++ b/src/video/offscreen/SDL_offscreenvideo.c
@@ -127,5 +127,3 @@ void OFFSCREEN_VideoQuit(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_OFFSCREEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenvideo.h b/src/video/offscreen/SDL_offscreenvideo.h
index 050f05fcf3..436152e5f1 100644
--- a/src/video/offscreen/SDL_offscreenvideo.h
+++ b/src/video/offscreen/SDL_offscreenvideo.h
@@ -26,5 +26,3 @@
 #include "../SDL_sysvideo.h"
 
 #endif /* _SDL_offscreenvideo_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenwindow.c b/src/video/offscreen/SDL_offscreenwindow.c
index dc8bbf9b33..bfee3f2ced 100644
--- a/src/video/offscreen/SDL_offscreenwindow.c
+++ b/src/video/offscreen/SDL_offscreenwindow.c
@@ -83,5 +83,3 @@ void OFFSCREEN_DestroyWindow(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_OFFSCREEN */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/offscreen/SDL_offscreenwindow.h b/src/video/offscreen/SDL_offscreenwindow.h
index e715642361..8d5588ec6c 100644
--- a/src/video/offscreen/SDL_offscreenwindow.h
+++ b/src/video/offscreen/SDL_offscreenwindow.h
@@ -38,5 +38,3 @@ extern int OFFSCREEN_CreateWindow(_THIS, SDL_Window *window);
 extern void OFFSCREEN_DestroyWindow(_THIS, SDL_Window *window);
 
 #endif /* _SDL_offscreenwindow */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/ps2/SDL_ps2video.c b/src/video/ps2/SDL_ps2video.c
index 51cad4ab50..61d905a367 100644
--- a/src/video/ps2/SDL_ps2video.c
+++ b/src/video/ps2/SDL_ps2video.c
@@ -127,5 +127,3 @@ VideoBootStrap PS2_bootstrap = {
 };
 
 #endif /* SDL_VIDEO_DRIVER_PS2 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/ps2/SDL_ps2video.h b/src/video/ps2/SDL_ps2video.h
index 85cb3c205c..88876200bb 100644
--- a/src/video/ps2/SDL_ps2video.h
+++ b/src/video/ps2/SDL_ps2video.h
@@ -38,5 +38,3 @@
 #pragma GCC diagnostic pop
 
 #endif /* SDL_ps2video_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/psp/SDL_pspevents.c b/src/video/psp/SDL_pspevents.c
index cf470f8d7f..9c63c8356e 100644
--- a/src/video/psp/SDL_pspevents.c
+++ b/src/video/psp/SDL_pspevents.c
@@ -275,5 +275,3 @@ void PSP_EventQuit(_THIS)
 /* end of SDL_pspevents.c ... */
 
 #endif /* SDL_VIDEO_DRIVER_PSP */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/psp/SDL_pspgl.c b/src/video/psp/SDL_pspgl.c
index 539423c1bd..86d047aa20 100644
--- a/src/video/psp/SDL_pspgl.c
+++ b/src/video/psp/SDL_pspgl.c
@@ -192,5 +192,3 @@ void PSP_GL_DeleteContext(_THIS, SDL_GLContext context)
 }
 
 #endif /* SDL_VIDEO_DRIVER_PSP */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/psp/SDL_pspgl_c.h b/src/video/psp/SDL_pspgl_c.h
index 3d0429ef3b..6aa01425bc 100644
--- a/src/video/psp/SDL_pspgl_c.h
+++ b/src/video/psp/SDL_pspgl_c.h
@@ -48,5 +48,3 @@ extern int PSP_GL_SetSwapInterval(_THIS, int interval);
 extern int PSP_GL_GetSwapInterval(_THIS);
 
 #endif /* SDL_pspgl_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/psp/SDL_pspmouse.c b/src/video/psp/SDL_pspmouse.c
index 696af4f249..64eddf999c 100644
--- a/src/video/psp/SDL_pspmouse.c
+++ b/src/video/psp/SDL_pspmouse.c
@@ -35,5 +35,3 @@ struct WMcursor
 };
 
 #endif /* SDL_VIDEO_DRIVER_PSP */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/psp/SDL_pspvideo.c b/src/video/psp/SDL_pspvideo.c
index 4080ba3bc8..410e01f123 100644
--- a/src/video/psp/SDL_pspvideo.c
+++ b/src/video/psp/SDL_pspvideo.c
@@ -265,5 +265,3 @@ SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_PSP */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/psp/SDL_pspvideo.h b/src/video/psp/SDL_pspvideo.h
index 9eb719b182..17a462c1f4 100644
--- a/src/video/psp/SDL_pspvideo.h
+++ b/src/video/psp/SDL_pspvideo.h
@@ -86,5 +86,3 @@ void PSP_HideScreenKeyboard(_THIS, SDL_Window *window);
 SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window);
 
 #endif /* SDL_pspvideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpimouse.c b/src/video/raspberry/SDL_rpimouse.c
index 1913b0d272..456e86b9f6 100644
--- a/src/video/raspberry/SDL_rpimouse.c
+++ b/src/video/raspberry/SDL_rpimouse.c
@@ -373,5 +373,3 @@ static void RPI_MoveCursor(SDL_Cursor *cursor)
 }
 
 #endif /* SDL_VIDEO_DRIVER_RPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpimouse.h b/src/video/raspberry/SDL_rpimouse.h
index eb6fa8a241..b0090236c2 100644
--- a/src/video/raspberry/SDL_rpimouse.h
+++ b/src/video/raspberry/SDL_rpimouse.h
@@ -39,5 +39,3 @@ extern void RPI_InitMouse(_THIS);
 extern void RPI_QuitMouse(_THIS);
 
 #endif /* SDL_RPI_mouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpiopengles.c b/src/video/raspberry/SDL_rpiopengles.c
index 7891eae2e2..b2ddda8e3e 100644
--- a/src/video/raspberry/SDL_rpiopengles.c
+++ b/src/video/raspberry/SDL_rpiopengles.c
@@ -63,5 +63,3 @@ SDL_EGL_CreateContext_impl(RPI)
     SDL_EGL_MakeCurrent_impl(RPI)
 
 #endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */
-
-    /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpiopengles.h b/src/video/raspberry/SDL_rpiopengles.h
index a8bed54416..405c92591c 100644
--- a/src/video/raspberry/SDL_rpiopengles.h
+++ b/src/video/raspberry/SDL_rpiopengles.h
@@ -45,5 +45,3 @@ extern void RPI_GLES_DefaultProfileConfig(_THIS, int *mask, int *major, int *min
 #endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */
 
 #endif /* SDL_rpiopengles_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpivideo.c b/src/video/raspberry/SDL_rpivideo.c
index e90de68761..ad47ebcced 100644
--- a/src/video/raspberry/SDL_rpivideo.c
+++ b/src/video/raspberry/SDL_rpivideo.c
@@ -391,5 +391,3 @@ void RPI_RestoreWindow(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_RPI */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpivideo.h b/src/video/raspberry/SDL_rpivideo.h
index cac94654b1..40c9552a43 100644
--- a/src/video/raspberry/SDL_rpivideo.h
+++ b/src/video/raspberry/SDL_rpivideo.h
@@ -92,5 +92,3 @@ int RPI_GLES_SwapWindow(_THIS, SDL_Window *window);
 void RPI_GLES_DeleteContext(_THIS, SDL_GLContext context);
 
 #endif /* __SDL_RPIVIDEO_H__ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosdefs.h b/src/video/riscos/SDL_riscosdefs.h
index dfd73dc1bd..7f52f0deb1 100644
--- a/src/video/riscos/SDL_riscosdefs.h
+++ b/src/video/riscos/SDL_riscosdefs.h
@@ -49,5 +49,3 @@ typedef struct sprite_header
 SDL_COMPILE_TIME_ASSERT(sprite_header, sizeof(sprite_header) == 44);
 
 #endif /* SDL_riscosdefs_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosevents.c b/src/video/riscos/SDL_riscosevents.c
index f27bb00856..ca4aff4eb5 100644
--- a/src/video/riscos/SDL_riscosevents.c
+++ b/src/video/riscos/SDL_riscosevents.c
@@ -174,5 +174,3 @@ void RISCOS_QuitEvents(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_RISCOS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosevents_c.h b/src/video/riscos/SDL_riscosevents_c.h
index cf1212cf8c..0d082741d8 100644
--- a/src/video/riscos/SDL_riscosevents_c.h
+++ b/src/video/riscos/SDL_riscosevents_c.h
@@ -31,5 +31,3 @@ extern void RISCOS_PumpEvents(_THIS);
 extern void RISCOS_QuitEvents(_THIS);
 
 #endif /* SDL_riscosevents_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosframebuffer.c b/src/video/riscos/SDL_riscosframebuffer.c
index 71448781ac..3a757ca7f2 100644
--- a/src/video/riscos/SDL_riscosframebuffer.c
+++ b/src/video/riscos/SDL_riscosframebuffer.c
@@ -122,5 +122,3 @@ void RISCOS_DestroyWindowFramebuffer(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_RISCOS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosframebuffer_c.h b/src/video/riscos/SDL_riscosframebuffer_c.h
index 03b7240f02..a066ab6807 100644
--- a/src/video/riscos/SDL_riscosframebuffer_c.h
+++ b/src/video/riscos/SDL_riscosframebuffer_c.h
@@ -29,5 +29,3 @@ extern int RISCOS_UpdateWindowFramebuffer(_THIS, SDL_Window *window, const SDL_R
 extern void RISCOS_DestroyWindowFramebuffer(_THIS, SDL_Window *window);
 
 #endif /* SDL_riscosframebuffer_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosmessagebox.c b/src/video/riscos/SDL_riscosmessagebox.c
index 923d07eb10..904694f58d 100644
--- a/src/video/riscos/SDL_riscosmessagebox.c
+++ b/src/video/riscos/SDL_riscosmessagebox.c
@@ -65,5 +65,3 @@ int RISCOS_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttoni
 }
 
 #endif /* SDL_VIDEO_DRIVER_RISCOS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosmessagebox.h b/src/video/riscos/SDL_riscosmessagebox.h
index 0999e53704..be542e3c73 100644
--- a/src/video/riscos/SDL_riscosmessagebox.h
+++ b/src/video/riscos/SDL_riscosmessagebox.h
@@ -25,5 +25,3 @@
 extern int RISCOS_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
 
 #endif /* SDL_VIDEO_DRIVER_RISCOS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosmodes.c b/src/video/riscos/SDL_riscosmodes.c
index f6c9deac1e..4feed22747 100644
--- a/src/video/riscos/SDL_riscosmodes.c
+++ b/src/video/riscos/SDL_riscosmodes.c
@@ -307,5 +307,3 @@ int RISCOS_SetDisplayMode(_THIS, SDL_VideoDisplay *display, SDL_DisplayMode *mod
 }
 
 #endif /* SDL_VIDEO_DRIVER_RISCOS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosmodes.h b/src/video/riscos/SDL_riscosmodes.h
index d5b9ac0cad..e582bfda77 100644
--- a/src/video/riscos/SDL_riscosmodes.h
+++ b/src/video/riscos/SDL_riscosmodes.h
@@ -29,5 +29,3 @@ extern int RISCOS_SetDisplayMode(_THIS, SDL_VideoDisplay *display,
                                  SDL_DisplayMode *mode);
 
 #endif /* SDL_riscosmodes_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosmouse.c b/src/video/riscos/SDL_riscosmouse.c
index e3f6fc2c38..97880ea140 100644
--- a/src/video/riscos/SDL_riscosmouse.c
+++ b/src/video/riscos/SDL_riscosmouse.c
@@ -79,5 +79,3 @@ int RISCOS_InitMouse(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_RISCOS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosmouse.h b/src/video/riscos/SDL_riscosmouse.h
index f407cf0e02..18c0ee3bb7 100644
--- a/src/video/riscos/SDL_riscosmouse.h
+++ b/src/video/riscos/SDL_riscosmouse.h
@@ -26,5 +26,3 @@
 extern int RISCOS_InitMouse(_THIS);
 
 #endif /* SDL_riscosmouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosvideo.c b/src/video/riscos/SDL_riscosvideo.c
index c319d7351c..e0f2438d37 100644
--- a/src/video/riscos/SDL_riscosvideo.c
+++ b/src/video/riscos/SDL_riscosvideo.c
@@ -119,5 +119,3 @@ static void RISCOS_VideoQuit(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_RISCOS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscosvideo.h b/src/video/riscos/SDL_riscosvideo.h
index cce051e26a..05fd323794 100644
--- a/src/video/riscos/SDL_riscosvideo.h
+++ b/src/video/riscos/SDL_riscosvideo.h
@@ -34,5 +34,3 @@ typedef struct SDL_VideoData
 } SDL_VideoData;
 
 #endif /* SDL_riscosvideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscoswindow.c b/src/video/riscos/SDL_riscoswindow.c
index d728be31e8..dbc2452854 100644
--- a/src/video/riscos/SDL_riscoswindow.c
+++ b/src/video/riscos/SDL_riscoswindow.c
@@ -68,5 +68,3 @@ int RISCOS_GetWindowWMInfo(_THIS, SDL_Window *window, struct SDL_SysWMinfo *info
 }
 
 #endif /* SDL_VIDEO_DRIVER_RISCOS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/riscos/SDL_riscoswindow.h b/src/video/riscos/SDL_riscoswindow.h
index d31c1240d5..0b84a23e00 100644
--- a/src/video/riscos/SDL_riscoswindow.h
+++ b/src/video/riscos/SDL_riscoswindow.h
@@ -37,5 +37,3 @@ extern void RISCOS_DestroyWindow(_THIS, SDL_Window *window);
 extern int RISCOS_GetWindowWMInfo(_THIS, SDL_Window *window, struct SDL_SysWMinfo *info);
 
 #endif /* SDL_riscoswindow_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/sdlgenblit.pl b/src/video/sdlgenblit.pl
index f8d3e2376d..0fa4b6ea02 100755
--- a/src/video/sdlgenblit.pl
+++ b/src/video/sdlgenblit.pl
@@ -126,7 +126,6 @@ sub close_file {
 
 #endif /* SDL_HAVE_BLIT_AUTO */
 
-/* vi: set ts=4 sw=4 expandtab: */
 __EOF__
     close FILE;
     if ( ! -f $name || system("cmp -s $name $name.new") != 0 ) {
diff --git a/src/video/uikit/SDL_uikitappdelegate.h b/src/video/uikit/SDL_uikitappdelegate.h
index f734ce247f..431bc1f847 100644
--- a/src/video/uikit/SDL_uikitappdelegate.h
+++ b/src/video/uikit/SDL_uikitappdelegate.h
@@ -43,5 +43,3 @@
 @property(nonatomic) UIWindow *window;
 
 @end
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitappdelegate.m b/src/video/uikit/SDL_uikitappdelegate.m
index ee8ef82452..99e07bf3c9 100644
--- a/src/video/uikit/SDL_uikitappdelegate.m
+++ b/src/video/uikit/SDL_uikitappdelegate.m
@@ -515,5 +515,3 @@ static UIImage *SDL_LoadLaunchImageNamed(NSString *name, int screenh)
 @end
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitclipboard.h b/src/video/uikit/SDL_uikitclipboard.h
index 5e6b814972..6057875005 100644
--- a/src/video/uikit/SDL_uikitclipboard.h
+++ b/src/video/uikit/SDL_uikitclipboard.h
@@ -31,5 +31,3 @@ extern void UIKit_InitClipboard(_THIS);
 extern void UIKit_QuitClipboard(_THIS);
 
 #endif /* SDL_uikitclipboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitclipboard.m b/src/video/uikit/SDL_uikitclipboard.m
index b45fd8bcc1..b644c60988 100644
--- a/src/video/uikit/SDL_uikitclipboard.m
+++ b/src/video/uikit/SDL_uikitclipboard.m
@@ -104,5 +104,3 @@ void UIKit_QuitClipboard(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitevents.h b/src/video/uikit/SDL_uikitevents.h
index c69ad68b57..88bc71b516 100644
--- a/src/video/uikit/SDL_uikitevents.h
+++ b/src/video/uikit/SDL_uikitevents.h
@@ -38,5 +38,3 @@ extern SDL_bool SDL_GCMouseRelativeMode(void);
 extern void SDL_QuitGCMouse(void);
 
 #endif /* SDL_uikitevents_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitevents.m b/src/video/uikit/SDL_uikitevents.m
index 906393a3c8..7ca8c47e19 100644
--- a/src/video/uikit/SDL_uikitevents.m
+++ b/src/video/uikit/SDL_uikitevents.m
@@ -452,5 +452,3 @@ void SDL_QuitGCMouse(void)
 #endif /* ENABLE_GCMOUSE */
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitmessagebox.h b/src/video/uikit/SDL_uikitmessagebox.h
index 16b7dd8a73..07ccef6ff6 100644
--- a/src/video/uikit/SDL_uikitmessagebox.h
+++ b/src/video/uikit/SDL_uikitmessagebox.h
@@ -27,5 +27,3 @@ extern SDL_bool UIKit_ShowingMessageBox(void);
 extern int UIKit_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitmessagebox.m b/src/video/uikit/SDL_uikitmessagebox.m
index 6708f5e2f2..8fb554f5a0 100644
--- a/src/video/uikit/SDL_uikitmessagebox.m
+++ b/src/video/uikit/SDL_uikitmessagebox.m
@@ -149,5 +149,3 @@ int UIKit_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid
 }
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitmetalview.h b/src/video/uikit/SDL_uikitmetalview.h
index fc0cc70b51..b5230e6a3a 100644
--- a/src/video/uikit/SDL_uikitmetalview.h
+++ b/src/video/uikit/SDL_uikitmetalview.h
@@ -53,5 +53,3 @@ void UIKit_Metal_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h);
 #endif /* SDL_VIDEO_DRIVER_UIKIT && (SDL_VIDEO_VULKAN || SDL_VIDEO_METAL) */
 
 #endif /* SDL_uikitmetalview_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitmodes.h b/src/video/uikit/SDL_uikitmodes.h
index 10c362f52e..f582a9f703 100644
--- a/src/video/uikit/SDL_uikitmodes.h
+++ b/src/video/uikit/SDL_uikitmodes.h
@@ -52,5 +52,3 @@ extern void UIKit_QuitModes(_THIS);
 extern int UIKit_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay *display, SDL_Rect *rect);
 
 #endif /* SDL_uikitmodes_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitmodes.m b/src/video/uikit/SDL_uikitmodes.m
index 69b6d1ee19..39e7808d8a 100644
--- a/src/video/uikit/SDL_uikitmodes.m
+++ b/src/video/uikit/SDL_uikitmodes.m
@@ -578,5 +578,3 @@ void SDL_OnApplicationDidChangeStatusBarOrientation()
 #endif /* !TARGET_OS_TV */
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitopengles.h b/src/video/uikit/SDL_uikitopengles.h
index 4cd683282d..8d6ebc41cf 100644
--- a/src/video/uikit/SDL_uikitopengles.h
+++ b/src/video/uikit/SDL_uikitopengles.h
@@ -40,5 +40,3 @@ extern void UIKit_GL_RestoreCurrentContext(void);
 #endif // SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
 
 #endif /* SDL_uikitopengles_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitopengles.m b/src/video/uikit/SDL_uikitopengles.m
index 0b69bd47fa..4f30400d46 100644
--- a/src/video/uikit/SDL_uikitopengles.m
+++ b/src/video/uikit/SDL_uikitopengles.m
@@ -234,5 +234,3 @@ void UIKit_GL_RestoreCurrentContext(void)
 }
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitopenglview.h b/src/video/uikit/SDL_uikitopenglview.h
index 519fd328f9..ee1fb8d815 100644
--- a/src/video/uikit/SDL_uikitopenglview.h
+++ b/src/video/uikit/SDL_uikitopenglview.h
@@ -60,5 +60,3 @@
 @end
 
 #endif // SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitopenglview.m b/src/video/uikit/SDL_uikitopenglview.m
index bd3c3b691c..57bb37d51f 100644
--- a/src/video/uikit/SDL_uikitopenglview.m
+++ b/src/video/uikit/SDL_uikitopenglview.m
@@ -375,5 +375,3 @@
 @end
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitvideo.h b/src/video/uikit/SDL_uikitvideo.h
index a41ff3f18c..699ae1cf98 100644
--- a/src/video/uikit/SDL_uikitvideo.h
+++ b/src/video/uikit/SDL_uikitvideo.h
@@ -44,5 +44,3 @@ void UIKit_ForceUpdateHomeIndicator(void);
 SDL_bool UIKit_IsSystemVersionAtLeast(double version);
 
 #endif /* SDL_uikitvideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitvideo.m b/src/video/uikit/SDL_uikitvideo.m
index 4570ea33ec..d5e982f22f 100644
--- a/src/video/uikit/SDL_uikitvideo.m
+++ b/src/video/uikit/SDL_uikitvideo.m
@@ -280,5 +280,3 @@ SDL_bool SDL_IsIPad(void)
 }
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitview.h b/src/video/uikit/SDL_uikitview.h
index 31d8f83172..747b3e0320 100644
--- a/src/video/uikit/SDL_uikitview.h
+++ b/src/video/uikit/SDL_uikitview.h
@@ -44,5 +44,3 @@
 - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event;
 
 @end
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitview.m b/src/video/uikit/SDL_uikitview.m
index afd19596d0..b2eb2754fe 100644
--- a/src/video/uikit/SDL_uikitview.m
+++ b/src/video/uikit/SDL_uikitview.m
@@ -482,5 +482,3 @@ extern int SDL_AppleTVRemoteOpenedAsJoystick;
 @end
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitviewcontroller.m b/src/video/uikit/SDL_uikitviewcontroller.m
index f9155a73e9..5ace2d715f 100644
--- a/src/video/uikit/SDL_uikitviewcontroller.m
+++ b/src/video/uikit/SDL_uikitviewcontroller.m
@@ -563,5 +563,3 @@ void UIKit_SetTextInputRect(_THIS, const SDL_Rect *rect)
 #endif /* SDL_IPHONE_KEYBOARD */
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitvulkan.h b/src/video/uikit/SDL_uikitvulkan.h
index 7b6265f805..fc9a74c261 100644
--- a/src/video/uikit/SDL_uikitvulkan.h
+++ b/src/video/uikit/SDL_uikitvulkan.h
@@ -50,5 +50,3 @@ void UIKit_Vulkan_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h);
 #endif
 
 #endif /* SDL_uikitvulkan_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitvulkan.m b/src/video/uikit/SDL_uikitvulkan.m
index f25e3fabe9..5cb0ae1f45 100644
--- a/src/video/uikit/SDL_uikitvulkan.m
+++ b/src/video/uikit/SDL_uikitvulkan.m
@@ -268,5 +268,3 @@ void UIKit_Vulkan_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h)
 }
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitwindow.h b/src/video/uikit/SDL_uikitwindow.h
index b42c74d573..31541f6991 100644
--- a/src/video/uikit/SDL_uikitwindow.h
+++ b/src/video/uikit/SDL_uikitwindow.h
@@ -54,5 +54,3 @@ extern NSUInteger UIKit_GetSupportedOrientations(SDL_Window *window);
 @end
 
 #endif /* SDL_uikitwindow_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitwindow.m b/src/video/uikit/SDL_uikitwindow.m
index ae5f57ce8a..125bea1615 100644
--- a/src/video/uikit/SDL_uikitwindow.m
+++ b/src/video/uikit/SDL_uikitwindow.m
@@ -479,5 +479,3 @@ int SDL_iPhoneSetAnimationCallback(SDL_Window *window, int interval, void (*call
 }
 
 #endif /* SDL_VIDEO_DRIVER_UIKIT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitaframebuffer.c b/src/video/vita/SDL_vitaframebuffer.c
index 8349759090..18bc17e3ac 100644
--- a/src/video/vita/SDL_vitaframebuffer.c
+++ b/src/video/vita/SDL_vitaframebuffer.c
@@ -114,5 +114,3 @@ void VITA_DestroyWindowFramebuffer(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitaframebuffer.h b/src/video/vita/SDL_vitaframebuffer.h
index 4ce43c8d67..33b3a9e6c0 100644
--- a/src/video/vita/SDL_vitaframebuffer.h
+++ b/src/video/vita/SDL_vitaframebuffer.h
@@ -23,5 +23,3 @@
 extern int VITA_CreateWindowFramebuffer(_THIS, SDL_Window *window, Uint32 *format, void **pixels, int *pitch);
 extern int VITA_UpdateWindowFramebuffer(_THIS, SDL_Window *window, const SDL_Rect *rects, int numrects);
 extern void VITA_DestroyWindowFramebuffer(_THIS, SDL_Window *window);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitagl_pvr.c b/src/video/vita/SDL_vitagl_pvr.c
index beedb176de..85d1e6fbf4 100644
--- a/src/video/vita/SDL_vitagl_pvr.c
+++ b/src/video/vita/SDL_vitagl_pvr.c
@@ -122,5 +122,3 @@ VITA_GL_GetProcAddress(_THIS, const char *proc)
 }
 
 #endif /* SDL_VIDEO_DRIVER_VITA && SDL_VIDEO_VITA_PVR */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitagl_pvr_c.h b/src/video/vita/SDL_vitagl_pvr_c.h
index 9bbc090cec..d74d00999e 100644
--- a/src/video/vita/SDL_vitagl_pvr_c.h
+++ b/src/video/vita/SDL_vitagl_pvr_c.h
@@ -29,5 +29,3 @@ extern int VITA_GL_LoadLibrary(_THIS, const char *path);
 extern void *VITA_GL_GetProcAddress(_THIS, const char *proc);
 
 #endif /* SDL_vitagl_pvr_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitagles.c b/src/video/vita/SDL_vitagles.c
index cbb204f4e2..cad9e101da 100644
--- a/src/video/vita/SDL_vitagles.c
+++ b/src/video/vita/SDL_vitagles.c
@@ -218,5 +218,3 @@ void VITA_GLES_DeleteContext(_THIS, SDL_GLContext context)
 }
 
 #endif /* SDL_VIDEO_DRIVER_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitagles_c.h b/src/video/vita/SDL_vitagles_c.h
index 7f6022d04c..de180649b2 100644
--- a/src/video/vita/SDL_vitagles_c.h
+++ b/src/video/vita/SDL_vitagles_c.h
@@ -51,5 +51,3 @@ extern int VITA_GLES_SetSwapInterval(_THIS, int interval);
 extern int VITA_GLES_GetSwapInterval(_THIS);
 
 #endif /* SDL_vitagles_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitagles_pvr.c b/src/video/vita/SDL_vitagles_pvr.c
index 12ddca2d5f..bb6469f3b5 100644
--- a/src/video/vita/SDL_vitagles_pvr.c
+++ b/src/video/vita/SDL_vitagles_pvr.c
@@ -91,5 +91,3 @@ int VITA_GLES_SwapWindow(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_VITA && SDL_VIDEO_VITA_PVR */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitagles_pvr_c.h b/src/video/vita/SDL_vitagles_pvr_c.h
index 69371982c3..511a73aeb2 100644
--- a/src/video/vita/SDL_vitagles_pvr_c.h
+++ b/src/video/vita/SDL_vitagles_pvr_c.h
@@ -30,5 +30,3 @@ extern SDL_GLContext VITA_GLES_CreateContext(_THIS, SDL_Window *window);
 extern int VITA_GLES_LoadLibrary(_THIS, const char *path);
 
 #endif /* SDL_vitagles_pvr_c_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitakeyboard.c b/src/video/vita/SDL_vitakeyboard.c
index 488207161b..a89992e549 100644
--- a/src/video/vita/SDL_vitakeyboard.c
+++ b/src/video/vita/SDL_vitakeyboard.c
@@ -183,5 +183,3 @@ void VITA_PollKeyboard(void)
 }
 
 #endif /* SDL_VIDEO_DRIVER_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitakeyboard.h b/src/video/vita/SDL_vitakeyboard.h
index e5b58119bd..bb96426e53 100644
--- a/src/video/vita/SDL_vitakeyboard.h
+++ b/src/video/vita/SDL_vitakeyboard.h
@@ -29,5 +29,3 @@ extern void VITA_InitKeyboard(void);
 extern void VITA_PollKeyboard(void);
 
 #endif /* _SDL_vitakeyboard_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitamessagebox.c b/src/video/vita/SDL_vitamessagebox.c
index 9b2c43459e..2e2bd9d47e 100644
--- a/src/video/vita/SDL_vitamessagebox.c
+++ b/src/video/vita/SDL_vitamessagebox.c
@@ -123,5 +123,3 @@ int VITA_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
 }
 
 #endif /* SDL_VIDEO_DRIVER_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitamessagebox.h b/src/video/vita/SDL_vitamessagebox.h
index 445636010f..9638b6a1cf 100644
--- a/src/video/vita/SDL_vitamessagebox.h
+++ b/src/video/vita/SDL_vitamessagebox.h
@@ -29,5 +29,3 @@ extern int VITA_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *bu
 #endif /* SDL_VIDEO_DRIVER_VITA */
 
 #endif /* SDL_vitamessagebox_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitamouse.c b/src/video/vita/SDL_vitamouse.c
index 6044dcb7c8..d4dc09c0d5 100644
--- a/src/video/vita/SDL_vitamouse.c
+++ b/src/video/vita/SDL_vitamouse.c
@@ -82,5 +82,3 @@ void VITA_PollMouse(void)
 }
 
 #endif /* SDL_VIDEO_DRIVER_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitamouse_c.h b/src/video/vita/SDL_vitamouse_c.h
index c178fd43ad..ff71a8caea 100644
--- a/src/video/vita/SDL_vitamouse_c.h
+++ b/src/video/vita/SDL_vitamouse_c.h
@@ -29,5 +29,3 @@ extern void VITA_InitMouse(void);
 extern void VITA_PollMouse(void);
 
 #endif /* _SDL_vitamouse_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitatouch.c b/src/video/vita/SDL_vitatouch.c
index 4c3200498c..8f74dd79b9 100644
--- a/src/video/vita/SDL_vitatouch.c
+++ b/src/video/vita/SDL_vitatouch.c
@@ -187,5 +187,3 @@ void VITA_ConvertTouchXYToSDLXY(float *sdl_x, float *sdl_y, int vita_x, int vita
 }
 
 #endif /* SDL_VIDEO_DRIVER_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitatouch.h b/src/video/vita/SDL_vitatouch.h
index d109a24d87..eb47b3cf9e 100644
--- a/src/video/vita/SDL_vitatouch.h
+++ b/src/video/vita/SDL_vitatouch.h
@@ -31,5 +31,3 @@ extern void VITA_PollTouch(void);
 void VITA_ConvertTouchXYToSDLXY(float *sdl_x, float *sdl_y, int vita_x, int vita_y, int port);
 
 #endif /* _SDL_vitatouch_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitavideo.c b/src/video/vita/SDL_vitavideo.c
index 2a140310ac..40aabae71e 100644
--- a/src/video/vita/SDL_vitavideo.c
+++ b/src/video/vita/SDL_vitavideo.c
@@ -584,5 +584,3 @@ void VITA_PumpEvents(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_VITA */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vita/SDL_vitavideo.h b/src/video/vita/SDL_vitavideo.h
index f50588e0b4..575dc8f040 100644
--- a/src/video/vita/SDL_vitavideo.h
+++ b/src/video/vita/SDL_vitavideo.h
@@ -111,5 +111,3 @@ SDL_bool VITA_IsScreenKeyboardShown(_THIS, SDL_Window *window);
 void VITA_PumpEvents(_THIS);
 
 #endif /* _SDL_pspvideo_h */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivanteopengles.c b/src/video/vivante/SDL_vivanteopengles.c
index 7ceef34aca..125f631ce0 100644
--- a/src/video/vivante/SDL_vivanteopengles.c
+++ b/src/video/vivante/SDL_vivanteopengles.c
@@ -41,5 +41,3 @@ SDL_EGL_CreateContext_impl(VIVANTE)
         SDL_EGL_MakeCurrent_impl(VIVANTE)
 
 #endif /* SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL */
-
-    /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivanteopengles.h b/src/video/vivante/SDL_vivanteopengles.h
index f58278ce32..8c80d5aeba 100644
--- a/src/video/vivante/SDL_vivanteopengles.h
+++ b/src/video/vivante/SDL_vivanteopengles.h
@@ -44,5 +44,3 @@ extern int VIVANTE_GLES_MakeCurrent(_THIS, SDL_Window *window, SDL_GLContext con
 #endif /* SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL */
 
 #endif /* SDL_vivanteopengles_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivanteplatform.c b/src/video/vivante/SDL_vivanteplatform.c
index cdd6679609..8cd266fd21 100644
--- a/src/video/vivante/SDL_vivanteplatform.c
+++ b/src/video/vivante/SDL_vivanteplatform.c
@@ -47,5 +47,3 @@ void VIVANTE_CleanupPlatform(_THIS)
 #endif /* VIVANTE_PLATFORM_GENERIC */
 
 #endif /* SDL_VIDEO_DRIVER_VIVANTE */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivanteplatform.h b/src/video/vivante/SDL_vivanteplatform.h
index 28203ffd59..a5af91e2b6 100644
--- a/src/video/vivante/SDL_vivanteplatform.h
+++ b/src/video/vivante/SDL_vivanteplatform.h
@@ -43,5 +43,3 @@ extern void VIVANTE_CleanupPlatform(_THIS);
 #endif /* SDL_VIDEO_DRIVER_VIVANTE */
 
 #endif /* SDL_vivanteplatform_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivantevideo.c b/src/video/vivante/SDL_vivantevideo.c
index 51c819982c..e3bceba427 100644
--- a/src/video/vivante/SDL_vivantevideo.c
+++ b/src/video/vivante/SDL_vivantevideo.c
@@ -388,5 +388,3 @@ void VIVANTE_PumpEvents(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_VIVANTE */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivantevideo.h b/src/video/vivante/SDL_vivantevideo.h
index 0b309b7b48..3b0d0a309d 100644
--- a/src/video/vivante/SDL_vivantevideo.h
+++ b/src/video/vivante/SDL_vivantevideo.h
@@ -86,5 +86,3 @@ int VIVANTE_GetWindowWMInfo(_THIS, SDL_Window *window, struct SDL_SysWMinfo *inf
 void VIVANTE_PumpEvents(_THIS);
 
 #endif /* SDL_vivantevideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivantevulkan.c b/src/video/vivante/SDL_vivantevulkan.c
index 95236a3961..94c408ba07 100644
--- a/src/video/vivante/SDL_vivantevulkan.c
+++ b/src/video/vivante/SDL_vivantevulkan.c
@@ -147,5 +147,3 @@ SDL_bool VIVANTE_Vulkan_CreateSurface(_THIS,
 }
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivantevulkan.h b/src/video/vivante/SDL_vivantevulkan.h
index 6bedddf3ba..6e505903f5 100644
--- a/src/video/vivante/SDL_vivantevulkan.h
+++ b/src/video/vivante/SDL_vivantevulkan.h
@@ -48,5 +48,3 @@ SDL_bool VIVANTE_Vulkan_CreateSurface(_THIS,
 #endif
 
 #endif /* SDL_vivantevulkan_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandclipboard.c b/src/video/wayland/SDL_waylandclipboard.c
index 1d039d5ac2..bca5c3cedc 100644
--- a/src/video/wayland/SDL_waylandclipboard.c
+++ b/src/video/wayland/SDL_waylandclipboard.c
@@ -200,5 +200,3 @@ SDL_bool Wayland_HasPrimarySelectionText(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandclipboard.h b/src/video/wayland/SDL_waylandclipboard.h
index 1e18f22e97..055ec03079 100644
--- a/src/video/wayland/SDL_waylandclipboard.h
+++ b/src/video/wayland/SDL_waylandclipboard.h
@@ -31,5 +31,3 @@ extern char *Wayland_GetPrimarySelectionText(_THIS);
 extern SDL_bool Wayland_HasPrimarySelectionText(_THIS);
 
 #endif /* SDL_waylandclipboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylanddatamanager.c b/src/video/wayland/SDL_waylanddatamanager.c
index 8c2f6adc55..1b92836679 100644
--- a/src/video/wayland/SDL_waylanddatamanager.c
+++ b/src/video/wayland/SDL_waylanddatamanager.c
@@ -708,5 +708,3 @@ int Wayland_primary_selection_device_set_serial(SDL_WaylandPrimarySelectionDevic
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylanddatamanager.h b/src/video/wayland/SDL_waylanddatamanager.h
index de4250c602..ee5fa07074 100644
--- a/src/video/wayland/SDL_waylanddatamanager.h
+++ b/src/video/wayland/SDL_waylanddatamanager.h
@@ -155,5 +155,3 @@ extern int Wayland_data_device_set_serial(SDL_WaylandDataDevice *device,
 extern int Wayland_primary_selection_device_set_serial(SDL_WaylandPrimarySelectionDevice *device,
                                                        uint32_t serial);
 #endif /* SDL_waylanddatamanager_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylanddyn.c b/src/video/wayland/SDL_waylanddyn.c
index 99dce18750..88a498f518 100644
--- a/src/video/wayland/SDL_waylanddyn.c
+++ b/src/video/wayland/SDL_waylanddyn.c
@@ -172,5 +172,3 @@ int SDL_WAYLAND_LoadSymbols(void)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
index 269dc72c00..14a53591dd 100644
--- a/src/video/wayland/SDL_waylanddyn.h
+++ b/src/video/wayland/SDL_waylanddyn.h
@@ -179,5 +179,3 @@ void SDL_WAYLAND_UnloadSymbols(void);
 #endif /* SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */
 
 #endif /* SDL_waylanddyn_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c
index 17c801d33a..0b175b817c 100644
--- a/src/video/wayland/SDL_waylandevents.c
+++ b/src/video/wayland/SDL_waylandevents.c
@@ -2838,5 +2838,3 @@ int Wayland_input_ungrab_keyboard(SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandevents_c.h b/src/video/wayland/SDL_waylandevents_c.h
index fee4c854bf..a4e11dcd0a 100644
--- a/src/video/wayland/SDL_waylandevents_c.h
+++ b/src/video/wayland/SDL_waylandevents_c.h
@@ -190,5 +190,3 @@ extern void Wayland_input_destroy_tablet(struct SDL_WaylandInput *input);
 extern void Wayland_RegisterTimestampListeners(struct SDL_WaylandInput *input);
 
 #endif /* SDL_waylandevents_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandkeyboard.c b/src/video/wayland/SDL_waylandkeyboard.c
index 5314ae8f84..71c3305589 100644
--- a/src/video/wayland/SDL_waylandkeyboard.c
+++ b/src/video/wayland/SDL_waylandkeyboard.c
@@ -154,5 +154,3 @@ SDL_bool Wayland_HasScreenKeyboardSupport(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandkeyboard.h b/src/video/wayland/SDL_waylandkeyboard.h
index 9d7562eb7d..8939cdd948 100644
--- a/src/video/wayland/SDL_waylandkeyboard.h
+++ b/src/video/wayland/SDL_waylandkeyboard.h
@@ -39,5 +39,3 @@ extern void Wayland_SetTextInputRect(_THIS, const SDL_Rect *rect);
 extern SDL_bool Wayland_HasScreenKeyboardSupport(_THIS);
 
 #endif /* SDL_waylandkeyboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandmessagebox.c b/src/video/wayland/SDL_waylandmessagebox.c
index be4198982d..fa86079e94 100644
--- a/src/video/wayland/SDL_waylandmessagebox.c
+++ b/src/video/wayland/SDL_waylandmessagebox.c
@@ -189,5 +189,3 @@ int Wayland_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *button
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandmessagebox.h b/src/video/wayland/SDL_waylandmessagebox.h
index 7404520a79..dbe04718ed 100644
--- a/src/video/wayland/SDL_waylandmessagebox.h
+++ b/src/video/wayland/SDL_waylandmessagebox.h
@@ -29,5 +29,3 @@ extern int Wayland_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
 
 #endif /* SDL_waylandmessagebox_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandmouse.c b/src/video/wayland/SDL_waylandmouse.c
index 5123384734..ab4938c870 100644
--- a/src/video/wayland/SDL_waylandmouse.c
+++ b/src/video/wayland/SDL_waylandmouse.c
@@ -674,5 +674,3 @@ void Wayland_FiniMouse(SDL_VideoData *data)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandopengles.c b/src/video/wayland/SDL_waylandopengles.c
index d7f0b3f80e..980a2947db 100644
--- a/src/video/wayland/SDL_waylandopengles.c
+++ b/src/video/wayland/SDL_waylandopengles.c
@@ -202,5 +202,3 @@ EGLSurface Wayland_GLES_GetEGLSurface(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND && SDL_VIDEO_OPENGL_EGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandopengles.h b/src/video/wayland/SDL_waylandopengles.h
index d781cfde00..3ace938ee8 100644
--- a/src/video/wayland/SDL_waylandopengles.h
+++ b/src/video/wayland/SDL_waylandopengles.h
@@ -46,5 +46,3 @@ extern void Wayland_GLES_DeleteContext(_THIS, SDL_GLContext context);
 extern SDL_EGLSurface Wayland_GLES_GetEGLSurface(_THIS, SDL_Window *window);
 
 #endif /* SDL_waylandopengles_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
index 4ff726e99b..cc9731cce2 100644
--- a/src/video/wayland/SDL_waylandsym.h
+++ b/src/video/wayland/SDL_waylandsym.h
@@ -219,5 +219,3 @@ SDL_WAYLAND_SYM(int, libdecor_dispatch, (struct libdecor *, int))
 #undef SDL_WAYLAND_INTERFACE
 
 /* *INDENT-ON* */ /* clang-format on */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c
index 870a7f17f5..de4e402eef 100644
--- a/src/video/wayland/SDL_waylandvideo.c
+++ b/src/video/wayland/SDL_waylandvideo.c
@@ -1185,5 +1185,3 @@ void Wayland_VideoQuit(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandvideo.h b/src/video/wayland/SDL_waylandvideo.h
index cae968b8a7..f36429f0fa 100644
--- a/src/video/wayland/SDL_waylandvideo.h
+++ b/src/video/wayland/SDL_waylandvideo.h
@@ -134,5 +134,3 @@ extern SDL_bool Wayland_LoadLibdecor(SDL_VideoData *data, SDL_bool ignore_xdg);
 extern SDL_bool Wayland_VideoReconnect(_THIS);
 
 #endif /* SDL_waylandvideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandvulkan.h b/src/video/wayland/SDL_waylandvulkan.h
index 4dbeb24f4c..07a60b7249 100644
--- a/src/video/wayland/SDL_waylandvulkan.h
+++ b/src/video/wayland/SDL_waylandvulkan.h
@@ -48,5 +48,3 @@ SDL_bool Wayland_Vulkan_CreateSurface(_THIS,
 #endif
 
 #endif /* SDL_waylandvulkan_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
index dbaec22189..16855d79bb 100644
--- a/src/video/wayland/SDL_waylandwindow.c
+++ b/src/video/wayland/SDL_waylandwindow.c
@@ -2242,5 +2242,3 @@ void Wayland_QuitWin(SDL_VideoData *data)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandwindow.h b/src/video/wayland/SDL_waylandwindow.h
index df10a48d79..b6e394d609 100644
--- a/src/video/wayland/SDL_waylandwindow.h
+++ b/src/video/wayland/SDL_waylandwindow.h
@@ -150,5 +150,3 @@ extern void Wayland_InitWin(SDL_VideoData *data);
 extern void Wayland_QuitWin(SDL_VideoData *data);
 
 #endif /* SDL_waylandwindow_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_vkeys.h b/src/video/windows/SDL_vkeys.h
index c80beac6df..9557a2c67d 100644
--- a/src/video/windows/SDL_vkeys.h
+++ b/src/video/windows/SDL_vkeys.h
@@ -72,5 +72,3 @@
 #define VK_APOSTROPHE 0xDE
 #define VK_BACKTICK   0xDF
 #define VK_OEM_102    0xE2
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsclipboard.c b/src/video/windows/SDL_windowsclipboard.c
index fcc6308713..9ffa1e6f76 100644
--- a/src/video/windows/SDL_windowsclipboard.c
+++ b/src/video/windows/SDL_windowsclipboard.c
@@ -151,5 +151,3 @@ void WIN_CheckClipboardUpdate(struct SDL_VideoData *data)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsclipboard.h b/src/video/windows/SDL_windowsclipboard.h
index 3fac2d4fbf..b62c0e6195 100644
--- a/src/video/windows/SDL_windowsclipboard.h
+++ b/src/video/windows/SDL_windowsclipboard.h
@@ -32,5 +32,3 @@ extern SDL_bool WIN_HasClipboardText(_THIS);
 extern void WIN_CheckClipboardUpdate(struct SDL_VideoData *data);
 
 #endif /* SDL_windowsclipboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
index dcef0aa310..d9a5c80722 100644
--- a/src/video/windows/SDL_windowsevents.c
+++ b/src/video/windows/SDL_windowsevents.c
@@ -2050,5 +2050,3 @@ void SDL_UnregisterApp()
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsevents.h b/src/video/windows/SDL_windowsevents.h
index b68fc33da7..ffe924c1aa 100644
--- a/src/video/windows/SDL_windowsevents.h
+++ b/src/video/windows/SDL_windowsevents.h
@@ -35,5 +35,3 @@ extern void WIN_SendWakeupEvent(_THIS, SDL_Window *window);
 extern int WIN_WaitEventTimeout(_THIS, Sint64 timeoutNS);
 
 #endif /* SDL_windowsevents_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsframebuffer.c b/src/video/windows/SDL_windowsframebuffer.c
index 201dbf5dbe..1d1eff374f 100644
--- a/src/video/windows/SDL_windowsframebuffer.c
+++ b/src/video/windows/SDL_windowsframebuffer.c
@@ -127,5 +127,3 @@ void WIN_DestroyWindowFramebuffer(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsframebuffer.h b/src/video/windows/SDL_windowsframebuffer.h
index 58bfabe699..b9872fd656 100644
--- a/src/video/windows/SDL_windowsframebuffer.h
+++ b/src/video/windows/SDL_windowsframebuffer.h
@@ -23,5 +23,3 @@
 extern int WIN_CreateWindowFramebuffer(_THIS, SDL_Window *window, Uint32 *format, void **pixels, int *pitch);
 extern int WIN_UpdateWindowFramebuffer(_THIS, SDL_Window *window, const SDL_Rect *rects, int numrects);
 extern void WIN_DestroyWindowFramebuffer(_THIS, SDL_Window *window);
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowskeyboard.c b/src/video/windows/SDL_windowskeyboard.c
index 0264e8bb20..43893f96e1 100644
--- a/src/video/windows/SDL_windowskeyboard.c
+++ b/src/video/windows/SDL_windowskeyboard.c
@@ -1740,5 +1740,3 @@ void WIN_ClearComposition(_THIS)
 #endif /* SDL_DISABLE_WINDOWS_IME */
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowskeyboard.h b/src/video/windows/SDL_windowskeyboard.h
index 92f60b5d9e..2d7ee9e77e 100644
--- a/src/video/windows/SDL_windowskeyboard.h
+++ b/src/video/windows/SDL_windowskeyboard.h
@@ -38,5 +38,3 @@ extern SDL_bool WIN_IsTextInputShown(_THIS);
 extern SDL_bool IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, struct SDL_VideoData *videodata);
 
 #endif /* SDL_windowskeyboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsmessagebox.c b/src/video/windows/SDL_windowsmessagebox.c
index b827cddd0c..c57ca8b99a 100644
--- a/src/video/windows/SDL_windowsmessagebox.c
+++ b/src/video/windows/SDL_windowsmessagebox.c
@@ -1041,5 +1041,3 @@ int WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsmessagebox.h b/src/video/windows/SDL_windowsmessagebox.h
index fc2cc2cdd8..aa05630a65 100644
--- a/src/video/windows/SDL_windowsmessagebox.h
+++ b/src/video/windows/SDL_windowsmessagebox.h
@@ -25,5 +25,3 @@
 extern int WIN_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsmodes.c b/src/video/windows/SDL_windowsmodes.c
index 0f304f49d2..310f20e78d 100644
--- a/src/video/windows/SDL_windowsmodes.c
+++ b/src/video/windows/SDL_windowsmodes.c
@@ -842,5 +842,3 @@ void WIN_QuitModes(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsmodes.h b/src/video/windows/SDL_windowsmodes.h
index 6a8e9832a6..e21fddafca 100644
--- a/src/video/windows/SDL_windowsmodes.h
+++ b/src/video/windows/SDL_windowsmodes.h
@@ -48,5 +48,3 @@ extern void WIN_RefreshDisplays(_THIS);
 extern void WIN_QuitModes(_THIS);
 
 #endif /* SDL_windowsmodes_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsmouse.c b/src/video/windows/SDL_windowsmouse.c
index 1296b6202b..45b56991f5 100644
--- a/src/video/windows/SDL_windowsmouse.c
+++ b/src/video/windows/SDL_windowsmouse.c
@@ -487,5 +487,3 @@ void WIN_UpdateMouseSystemScale()
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsmouse.h b/src/video/windows/SDL_windowsmouse.h
index 89ee74e7d0..5483bab627 100644
--- a/src/video/windows/SDL_windowsmouse.h
+++ b/src/video/windows/SDL_windowsmouse.h
@@ -32,5 +32,3 @@ extern void WIN_SetCursorPos(int x, int y);
 extern void WIN_UpdateMouseSystemScale();
 
 #endif /* SDL_windowsmouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsopengl.c b/src/video/windows/SDL_windowsopengl.c
index fa1d57eac1..46b384bb1d 100644
--- a/src/video/windows/SDL_windowsopengl.c
+++ b/src/video/windows/SDL_windowsopengl.c
@@ -915,5 +915,3 @@ WIN_GL_SetPixelFormatFrom(_THIS, SDL_Window *fromWindow, SDL_Window *toWindow)
 #endif /* SDL_VIDEO_OPENGL_WGL */
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsopengl.h b/src/video/windows/SDL_windowsopengl.h
index 9268f8d2bc..8deeb4fa14 100644
--- a/src/video/windows/SDL_windowsopengl.h
+++ b/src/video/windows/SDL_windowsopengl.h
@@ -177,5 +177,3 @@ extern SDL_bool WIN_GL_SetPixelFormatFrom(_THIS, SDL_Window *fromWindow, SDL_Win
 #endif /* SDL_VIDEO_OPENGL_WGL */
 
 #endif /* SDL_windowsopengl_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsopengles.c b/src/video/windows/SDL_windowsopengles.c
index bbd76d0bcf..dd2b6aa770 100644
--- a/src/video/windows/SDL_windowsopengles.c
+++ b/src/video/windows/SDL_windowsopengles.c
@@ -141,5 +141,3 @@ WIN_GLES_GetEGLSurface(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS && SDL_VIDEO_OPENGL_EGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsopengles.h b/src/video/windows/SDL_windowsopengles.h
index 2db6619e54..b6f88f3e68 100644
--- a/src/video/windows/SDL_windowsopengles.h
+++ b/src/video/windows/SDL_windowsopengles.h
@@ -46,5 +46,3 @@ extern SDL_EGLSurface WIN_GLES_GetEGLSurface(_THIS, SDL_Window *window);
 #endif /* SDL_VIDEO_OPENGL_EGL */
 
 #endif /* SDL_winopengles_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsvideo.h b/src/video/windows/SDL_windowsvideo.h
index fe88e770d9..b61a8f6f16 100644
--- a/src/video/windows/SDL_windowsvideo.h
+++ b/src/video/windows/SDL_windowsvideo.h
@@ -469,5 +469,3 @@ extern SDL_bool D3D_LoadDLL(void **pD3DDLL, IDirect3D9 **pDirect3D9Interface);
 extern SDL_bool WIN_IsPerMonitorV2DPIAware(_THIS);
 
 #endif /* SDL_windowsvideo_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsvulkan.c b/src/video/windows/SDL_windowsvulkan.c
index 16299748ce..a201e00e66 100644
--- a/src/video/windows/SDL_windowsvulkan.c
+++ b/src/video/windows/SDL_windowsvulkan.c
@@ -169,5 +169,3 @@ SDL_bool WIN_Vulkan_CreateSurface(_THIS,
 }
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsvulkan.h b/src/video/windows/SDL_windowsvulkan.h
index d5a3fa0e55..7b15c78ece 100644
--- a/src/video/windows/SDL_windowsvulkan.h
+++ b/src/video/windows/SDL_windowsvulkan.h
@@ -48,5 +48,3 @@ SDL_bool WIN_Vulkan_CreateSurface(_THIS,
 #endif
 
 #endif /* SDL_windowsvulkan_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowswindow.c b/src/video/windows/SDL_windowswindow.c
index 0f44abc07c..47455c5a60 100644
--- a/src/video/windows/SDL_windowswindow.c
+++ b/src/video/windows/SDL_windowswindow.c
@@ -1411,5 +1411,3 @@ int WIN_FlashWindow(_THIS, SDL_Window *window, SDL_FlashOperation operation)
 #endif /*!defined(__XBOXONE__) && !defined(__XBOXSERIES__)*/
 
 #endif /* SDL_VIDEO_DRIVER_WINDOWS */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowswindow.h b/src/video/windows/SDL_windowswindow.h
index e5df761ada..450561c9bf 100644
--- a/src/video/windows/SDL_windowswindow.h
+++ b/src/video/windows/SDL_windowswindow.h
@@ -114,5 +114,3 @@ extern int WIN_FlashWindow(_THIS, SDL_Window *window, SDL_FlashOperation operati
 #endif
 
 #endif /* SDL_windowswindow_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/wmmsg.h b/src/video/windows/wmmsg.h
index bd748d2daa..5e8ec8ce75 100644
--- a/src/video/windows/wmmsg.h
+++ b/src/video/windows/wmmsg.h
@@ -1048,5 +1048,3 @@ const char *wmtab[] = {
     "UNKNOWN (1023)",
     "WM_USER"
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtevents.cpp b/src/video/winrt/SDL_winrtevents.cpp
index e229c7b98b..30fa7e60af 100644
--- a/src/video/winrt/SDL_winrtevents.cpp
+++ b/src/video/winrt/SDL_winrtevents.cpp
@@ -141,5 +141,3 @@ void WINRT_CycleXAMLThread(void)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINRT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtevents_c.h b/src/video/winrt/SDL_winrtevents_c.h
index 547a6aaa0d..113c191f83 100644
--- a/src/video/winrt/SDL_winrtevents_c.h
+++ b/src/video/winrt/SDL_winrtevents_c.h
@@ -79,5 +79,3 @@ extern SDL_bool WINRT_IsScreenKeyboardShown(_THIS, SDL_Window *window);
 extern void WINRT_CycleXAMLThread(void);
 
 #endif // ifdef __cplusplus_winrt
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtgamebar.cpp b/src/video/winrt/SDL_winrtgamebar.cpp
index b0edc8c167..b1bbe0759a 100644
--- a/src/video/winrt/SDL_winrtgamebar.cpp
+++ b/src/video/winrt/SDL_winrtgamebar.cpp
@@ -183,5 +183,3 @@ void WINRT_QuitGameBar(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINRT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtgamebar_cpp.h b/src/video/winrt/SDL_winrtgamebar_cpp.h
index d8ba85a09b..cf7b1ba37c 100644
--- a/src/video/winrt/SDL_winrtgamebar_cpp.h
+++ b/src/video/winrt/SDL_winrtgamebar_cpp.h
@@ -31,5 +31,3 @@ extern void WINRT_QuitGameBar(_THIS);
 #endif
 
 #endif /* SDL_winrtgamebar_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtmessagebox.cpp b/src/video/winrt/SDL_winrtmessagebox.cpp
index ef7b809e2e..1887d8c77d 100644
--- a/src/video/winrt/SDL_winrtmessagebox.cpp
+++ b/src/video/winrt/SDL_winrtmessagebox.cpp
@@ -109,5 +109,3 @@ static String ^ WINRT_UTF8ToPlatformString(const char *str) {
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINRT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtmessagebox.h b/src/video/winrt/SDL_winrtmessagebox.h
index 0291abe700..431c568642 100644
--- a/src/video/winrt/SDL_winrtmessagebox.h
+++ b/src/video/winrt/SDL_winrtmessagebox.h
@@ -25,5 +25,3 @@
 extern int WINRT_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
 
 #endif /* SDL_VIDEO_DRIVER_WINRT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtmouse.cpp b/src/video/winrt/SDL_winrtmouse.cpp
index 39d8f61235..70f0678ef8 100644
--- a/src/video/winrt/SDL_winrtmouse.cpp
+++ b/src/video/winrt/SDL_winrtmouse.cpp
@@ -231,5 +231,3 @@ void WINRT_QuitMouse(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINRT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtmouse_c.h b/src/video/winrt/SDL_winrtmouse_c.h
index 2ad8092411..4c4c330540 100644
--- a/src/video/winrt/SDL_winrtmouse_c.h
+++ b/src/video/winrt/SDL_winrtmouse_c.h
@@ -36,5 +36,3 @@ extern SDL_bool WINRT_UsingRelativeMouseMode;
 #endif
 
 #endif /* SDL_winrtmouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtopengles.cpp b/src/video/winrt/SDL_winrtopengles.cpp
index 6743cf19c5..6164d6d993 100644
--- a/src/video/winrt/SDL_winrtopengles.cpp
+++ b/src/video/winrt/SDL_winrtopengles.cpp
@@ -205,5 +205,3 @@ SDL_EGL_CreateContext_impl(WINRT)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtopengles.h b/src/video/winrt/SDL_winrtopengles.h
index bb5bb6e228..482e1309aa 100644
--- a/src/video/winrt/SDL_winrtopengles.h
+++ b/src/video/winrt/SDL_winrtopengles.h
@@ -65,5 +65,3 @@ typedef EGLDisplay(EGLAPIENTRY *eglGetPlatformDisplayEXT_Function)(EGLenum, void
 #endif /* SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL */
 
 #endif /* SDL_winrtopengles_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtvideo.cpp b/src/video/winrt/SDL_winrtvideo.cpp
index ba5f82b502..16aede7565 100644
--- a/src/video/winrt/SDL_winrtvideo.cpp
+++ b/src/video/winrt/SDL_winrtvideo.cpp
@@ -860,5 +860,3 @@ void WINRT_SuspendScreenSaver(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_WINRT */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11clipboard.c b/src/video/x11/SDL_x11clipboard.c
index 515c8fa798..90c039ad97 100644
--- a/src/video/x11/SDL_x11clipboard.c
+++ b/src/video/x11/SDL_x11clipboard.c
@@ -272,5 +272,3 @@ X11_HasPrimarySelectionText(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11clipboard.h b/src/video/x11/SDL_x11clipboard.h
index f3c014384e..784dbb5538 100644
--- a/src/video/x11/SDL_x11clipboard.h
+++ b/src/video/x11/SDL_x11clipboard.h
@@ -45,5 +45,3 @@ extern Atom X11_GetSDLCutBufferClipboardExternalFormat(Display *display, enum ES
 extern Atom X11_GetSDLCutBufferClipboardInternalFormat(Display *display, enum ESDLX11ClipboardMimeType mime_type);
 
 #endif /* SDL_x11clipboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11dyn.c b/src/video/x11/SDL_x11dyn.c
index 56dbca51d8..c6859ccc1c 100644
--- a/src/video/x11/SDL_x11dyn.c
+++ b/src/video/x11/SDL_x11dyn.c
@@ -201,5 +201,3 @@ int SDL_X11_LoadSymbols(void)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11dyn.h b/src/video/x11/SDL_x11dyn.h
index f53707e7a8..5ab8d231bc 100644
--- a/src/video/x11/SDL_x11dyn.h
+++ b/src/video/x11/SDL_x11dyn.h
@@ -103,4 +103,3 @@ extern SDL_DYNX11FN_XGetICValues X11_XGetICValues;
 #endif
 
 #endif /* !defined SDL_x11dyn_h_ */
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index bf7759b7c8..40892edae7 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -1762,5 +1762,3 @@ void X11_SuspendScreenSaver(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11events.h b/src/video/x11/SDL_x11events.h
index c82b20c580..ff4c7ad75d 100644
--- a/src/video/x11/SDL_x11events.h
+++ b/src/video/x11/SDL_x11events.h
@@ -30,5 +30,3 @@ extern void X11_SuspendScreenSaver(_THIS);
 extern void X11_ReconcileKeyboardState(_THIS);
 
 #endif /* SDL_x11events_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11framebuffer.c b/src/video/x11/SDL_x11framebuffer.c
index e5da1938e6..3cd1fa5907 100644
--- a/src/video/x11/SDL_x11framebuffer.c
+++ b/src/video/x11/SDL_x11framebuffer.c
@@ -248,5 +248,3 @@ void X11_DestroyWindowFramebuffer(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11framebuffer.h b/src/video/x11/SDL_x11framebuffer.h
index f3f17616ff..ec4625434e 100644
--- a/src/video/x11/SDL_x11framebuffer.h
+++ b/src/video/x11/SDL_x11framebuffer.h
@@ -32,5 +32,3 @@ extern int X11_UpdateWindowFramebuffer(_THIS, SDL_Window *window,
 extern void X11_DestroyWindowFramebuffer(_THIS, SDL_Window *window);
 
 #endif /* SDL_x11framebuffer_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11keyboard.c b/src/video/x11/SDL_x11keyboard.c
index 81bc375b7e..56d07caa78 100644
--- a/src/video/x11/SDL_x11keyboard.c
+++ b/src/video/x11/SDL_x11keyboard.c
@@ -477,5 +477,3 @@ X11_IsScreenKeyboardShown(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11keyboard.h b/src/video/x11/SDL_x11keyboard.h
index 9a5a49e162..05b764cade 100644
--- a/src/video/x11/SDL_x11keyboard.h
+++ b/src/video/x11/SDL_x11keyboard.h
@@ -36,5 +36,3 @@ extern SDL_bool X11_IsScreenKeyboardShown(_THIS, SDL_Window *window);
 extern KeySym X11_KeyCodeToSym(_THIS, KeyCode, unsigned char group);
 
 #endif /* SDL_x11keyboard_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11messagebox.c b/src/video/x11/SDL_x11messagebox.c
index 03ba2801a6..591a8c6b29 100644
--- a/src/video/x11/SDL_x11messagebox.c
+++ b/src/video/x11/SDL_x11messagebox.c
@@ -854,5 +854,3 @@ int X11_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
 #endif
 }
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11messagebox.h b/src/video/x11/SDL_x11messagebox.h
index bb85a65254..71fde632fe 100644
--- a/src/video/x11/SDL_x11messagebox.h
+++ b/src/video/x11/SDL_x11messagebox.h
@@ -29,5 +29,3 @@ extern int X11_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *but
 #endif /* SDL_VIDEO_DRIVER_X11 */
 
 #endif /* SDL_x11messagebox_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
index eeef81bd7e..92f8f8126d 100644
--- a/src/video/x11/SDL_x11modes.c
+++ b/src/video/x11/SDL_x11modes.c
@@ -889,5 +889,3 @@ int X11_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay *sdl_display, SDL_Rect *r
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11modes.h b/src/video/x11/SDL_x11modes.h
index d3715061df..9d8c40b862 100644
--- a/src/video/x11/SDL_x11modes.h
+++ b/src/video/x11/SDL_x11modes.h
@@ -70,5 +70,3 @@ extern void X11_HandleXRandREvent(_THIS, const XEvent *xevent);
 #endif
 
 #endif /* SDL_x11modes_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11mouse.c b/src/video/x11/SDL_x11mouse.c
index cb8f2b579c..80383a0617 100644
--- a/src/video/x11/SDL_x11mouse.c
+++ b/src/video/x11/SDL_x11mouse.c
@@ -490,5 +490,3 @@ void X11_QuitMouse(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11mouse.h b/src/video/x11/SDL_x11mouse.h
index 9bdfb8705f..425f67ae8d 100644
--- a/src/video/x11/SDL_x11mouse.h
+++ b/src/video/x11/SDL_x11mouse.h
@@ -38,5 +38,3 @@ extern void X11_InitMouse(_THIS);
 extern void X11_QuitMouse(_THIS);
 
 #endif /* SDL_x11mouse_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11opengl.c b/src/video/x11/SDL_x11opengl.c
index 9ca03894c9..08e5444f56 100644
--- a/src/video/x11/SDL_x11opengl.c
+++ b/src/video/x11/SDL_x11opengl.c
@@ -967,5 +967,3 @@ void X11_GL_DeleteContext(_THIS, SDL_GLContext context)
 #endif /* SDL_VIDEO_OPENGL_GLX */
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11opengl.h b/src/video/x11/SDL_x11opengl.h
index c3f8df6215..ffad38e97d 100644
--- a/src/video/x11/SDL_x11opengl.h
+++ b/src/video/x11/SDL_x11opengl.h
@@ -82,5 +82,3 @@ extern void X11_GL_DeleteContext(_THIS, SDL_GLContext context);
 #endif /* SDL_VIDEO_OPENGL_GLX */
 
 #endif /* SDL_x11opengl_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11opengles.c b/src/video/x11/SDL_x11opengles.c
index 8b50c0aeb6..a15d89b8a6 100644
--- a/src/video/x11/SDL_x11opengles.c
+++ b/src/video/x11/SDL_x11opengles.c
@@ -113,5 +113,3 @@ SDL_EGL_SwapWindow_impl(X11)
     SDL_EGL_MakeCurrent_impl(X11)
 
 #endif /* SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_OPENGL_EGL */
-
-    /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11opengles.h b/src/video/x11/SDL_x11opengles.h
index 55b71af87b..7be6b8314b 100644
--- a/src/video/x11/SDL_x11opengles.h
+++ b/src/video/x11/SDL_x11opengles.h
@@ -53,5 +53,3 @@ extern SDL_EGLSurface X11_GLES_GetEGLSurface(_THIS, SDL_Window *window);
 #endif /* SDL_VIDEO_OPENGL_EGL */
 
 #endif /* SDL_x11opengles_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
index 9af2320bf9..0b634e2f33 100644
--- a/src/video/x11/SDL_x11sym.h
+++ b/src/video/x11/SDL_x11sym.h
@@ -320,5 +320,3 @@ SDL_X11_SYM(void,XShapeCombineMask,(Display *dpy,Window dest,int dest_kind,int x
 #undef SDL_X11_SYM
 
 /* *INDENT-ON* */ /* clang-format on */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11touch.c b/src/video/x11/SDL_x11touch.c
index cb20ab9203..35f55c020b 100644
--- a/src/video/x11/SDL_x11touch.c
+++ b/src/video/x11/SDL_x11touch.c
@@ -44,5 +44,3 @@ void X11_ResetTouch(_THIS)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11touch.h b/src/video/x11/SDL_x11touch.h
index 1a15019001..87f46c5f35 100644
--- a/src/video/x11/SDL_x11touch.h
+++ b/src/video/x11/SDL_x11touch.h
@@ -28,5 +28,3 @@ extern void X11_QuitTouch(_THIS);
 extern void X11_ResetTouch(_THIS);
 
 #endif /* SDL_x11touch_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11video.h b/src/video/x11/SDL_x11video.h
index 33e98d3465..1e58fe506d 100644
--- a/src/video/x11/SDL_x11video.h
+++ b/src/video/x11/SDL_x11video.h
@@ -159,5 +159,3 @@ typedef struct SDL_VideoData
 extern SDL_bool X11_UseDirectColorVisuals(void);
 
 #endif /* SDL_x11video_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11vulkan.h b/src/video/x11/SDL_x11vulkan.h
index 4875b647d6..f342f33e30 100644
--- a/src/video/x11/SDL_x11vulkan.h
+++ b/src/video/x11/SDL_x11vulkan.h
@@ -44,5 +44,3 @@ SDL_bool X11_Vulkan_CreateSurface(_THIS,
 #endif
 
 #endif /* SDL_x11vulkan_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
index 72066d9d62..711e6745fe 100644
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@@ -1774,5 +1774,3 @@ int SDL_X11_SetWindowTitle(Display *display, Window xwindow, char *title)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11window.h b/src/video/x11/SDL_x11window.h
index 18e5483036..71e87d5877 100644
--- a/src/video/x11/SDL_x11window.h
+++ b/src/video/x11/SDL_x11window.h
@@ -118,5 +118,3 @@ extern int X11_FlashWindow(_THIS, SDL_Window *window, SDL_FlashOperation operati
 int SDL_X11_SetWindowTitle(Display *display, Window xwindow, char *title);
 
 #endif /* SDL_x11window_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11xfixes.c b/src/video/x11/SDL_x11xfixes.c
index 5c31b2e0b9..9fe2c6dc16 100644
--- a/src/video/x11/SDL_x11xfixes.c
+++ b/src/video/x11/SDL_x11xfixes.c
@@ -195,5 +195,3 @@ void X11_DestroyPointerBarrier(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_DRIVER_X11_XFIXES */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11xfixes.h b/src/video/x11/SDL_x11xfixes.h
index ccf88785e3..ac2c98a980 100644
--- a/src/video/x11/SDL_x11xfixes.h
+++ b/src/video/x11/SDL_x11xfixes.h
@@ -37,5 +37,3 @@ extern void X11_DestroyPointerBarrier(_THIS, SDL_Window *window);
 #endif /* SDL_VIDEO_DRIVER_X11_XFIXES */
 
 #endif /* SDL_x11xfixes_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c
index 92d64b1230..7a00ea51bd 100644
--- a/src/video/x11/SDL_x11xinput2.c
+++ b/src/video/x11/SDL_x11xinput2.c
@@ -524,5 +524,3 @@ void X11_Xinput2UngrabTouch(_THIS, SDL_Window *window)
 }
 
 #endif /* SDL_VIDEO_DRIVER_X11 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/x11/SDL_x11xinput2.h b/src/video/x11/SDL_x11xinput2.h
index 1a6f7a1041..8e10d31471 100644
--- a/src/video/x11/SDL_x11xinput2.h
+++ b/src/video/x11/SDL_x11xinput2.h
@@ -40,5 +40,3 @@ extern void X11_Xinput2GrabTouch(_THIS, SDL_Window *window);
 extern void X11_Xinput2UngrabTouch(_THIS, SDL_Window *window);
 
 #endif /* SDL_x11xinput2_h_ */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/checkkeys.c b/test/checkkeys.c
index 0985dace9f..ebc331f8bd 100644
--- a/test/checkkeys.c
+++ b/test/checkkeys.c
@@ -308,5 +308,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/checkkeysthreads.c b/test/checkkeysthreads.c
index bbe031264b..5fc9a78960 100644
--- a/test/checkkeysthreads.c
+++ b/test/checkkeysthreads.c
@@ -294,5 +294,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/controllermap.c b/test/controllermap.c
index a9fadf13cf..71c613f011 100644
--- a/test/controllermap.c
+++ b/test/controllermap.c
@@ -801,5 +801,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/loopwave.c b/test/loopwave.c
index e2a2ada508..eccee138b7 100644
--- a/test/loopwave.c
+++ b/test/loopwave.c
@@ -176,5 +176,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/loopwavequeue.c b/test/loopwavequeue.c
index ff85c29447..3acd92fba6 100644
--- a/test/loopwavequeue.c
+++ b/test/loopwavequeue.c
@@ -144,5 +144,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testatomic.c b/test/testatomic.c
index 4b3eca50cc..fbbb999b55 100644
--- a/test/testatomic.c
+++ b/test/testatomic.c
@@ -715,5 +715,3 @@ int main(int argc, char *argv[])
     RunFIFOTest(SDL_TRUE);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testaudiocapture.c b/test/testaudiocapture.c
index b20d9180f8..3f6b12717b 100644
--- a/test/testaudiocapture.c
+++ b/test/testaudiocapture.c
@@ -166,5 +166,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testaudiohotplug.c b/test/testaudiohotplug.c
index 5d145f8d4a..a5d3c73a00 100644
--- a/test/testaudiohotplug.c
+++ b/test/testaudiohotplug.c
@@ -199,5 +199,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testaudioinfo.c b/test/testaudioinfo.c
index f262e92dcf..d6c9029806 100644
--- a/test/testaudioinfo.c
+++ b/test/testaudioinfo.c
@@ -101,5 +101,3 @@ int main(int argc, char **argv)
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation.c b/test/testautomation.c
index 4c69d6cc0d..0f2da2168a 100644
--- a/test/testautomation.c
+++ b/test/testautomation.c
@@ -117,5 +117,3 @@ int main(int argc, char *argv[])
     quit(result);
     return result;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_audio.c b/test/testautomation_audio.c
index a68f89bc99..57647dcc62 100644
--- a/test/testautomation_audio.c
+++ b/test/testautomation_audio.c
@@ -1046,5 +1046,3 @@ SDLTest_TestSuiteReference audioTestSuite = {
     audioTests,
     _audioTearDown
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_clipboard.c b/test/testautomation_clipboard.c
index 8d55ac4670..f02148f281 100644
--- a/test/testautomation_clipboard.c
+++ b/test/testautomation_clipboard.c
@@ -329,5 +329,3 @@ SDLTest_TestSuiteReference clipboardTestSuite = {
     clipboardTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_events.c b/test/testautomation_events.c
index 49bfe37772..11ad51164b 100644
--- a/test/testautomation_events.c
+++ b/test/testautomation_events.c
@@ -194,5 +194,3 @@ SDLTest_TestSuiteReference eventsTestSuite = {
     eventsTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_guid.c b/test/testautomation_guid.c
index 1844523707..912def97ca 100644
--- a/test/testautomation_guid.c
+++ b/test/testautomation_guid.c
@@ -155,5 +155,3 @@ SDLTest_TestSuiteReference guidTestSuite = {
     guidTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_hints.c b/test/testautomation_hints.c
index 5061950542..e7705ee29a 100644
--- a/test/testautomation_hints.c
+++ b/test/testautomation_hints.c
@@ -260,5 +260,3 @@ SDLTest_TestSuiteReference hintsTestSuite = {
     hintsTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_joystick.c b/test/testautomation_joystick.c
index 542708c439..d2e69e2f9d 100644
--- a/test/testautomation_joystick.c
+++ b/test/testautomation_joystick.c
@@ -88,5 +88,3 @@ SDLTest_TestSuiteReference joystickTestSuite = {
     joystickTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_keyboard.c b/test/testautomation_keyboard.c
index 63a64b9861..aac060f5f2 100644
--- a/test/testautomation_keyboard.c
+++ b/test/testautomation_keyboard.c
@@ -700,5 +700,3 @@ SDLTest_TestSuiteReference keyboardTestSuite = {
     keyboardTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_main.c b/test/testautomation_main.c
index 84a5f7adb1..36a61b6755 100644
--- a/test/testautomation_main.c
+++ b/test/testautomation_main.c
@@ -174,5 +174,3 @@ SDLTest_TestSuiteReference mainTestSuite = {
     mainTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_math.c b/test/testautomation_math.c
index 92b1d58f2b..7103854e01 100644
--- a/test/testautomation_math.c
+++ b/test/testautomation_math.c
@@ -3355,5 +3355,3 @@ SDLTest_TestSuiteReference mathTestSuite = {
     mathTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_mouse.c b/test/testautomation_mouse.c
index 3256ba343b..a30997a114 100644
--- a/test/testautomation_mouse.c
+++ b/test/testautomation_mouse.c
@@ -655,5 +655,3 @@ SDLTest_TestSuiteReference mouseTestSuite = {
     mouseTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_pixels.c b/test/testautomation_pixels.c
index f8ac35dd66..18f7ee73ac 100644
--- a/test/testautomation_pixels.c
+++ b/test/testautomation_pixels.c
@@ -415,5 +415,3 @@ SDLTest_TestSuiteReference pixelsTestSuite = {
     pixelsTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_platform.c b/test/testautomation_platform.c
index 4bec67a6fe..a66d5b704d 100644
--- a/test/testautomation_platform.c
+++ b/test/testautomation_platform.c
@@ -600,5 +600,3 @@ SDLTest_TestSuiteReference platformTestSuite = {
     platformTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_rect.c b/test/testautomation_rect.c
index a91254d00a..96d6477c6b 100644
--- a/test/testautomation_rect.c
+++ b/test/testautomation_rect.c
@@ -1852,5 +1852,3 @@ SDLTest_TestSuiteReference rectTestSuite = {
     rectTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_render.c b/test/testautomation_render.c
index c5a01fd343..5af00bf55d 100644
--- a/test/testautomation_render.c
+++ b/test/testautomation_render.c
@@ -1161,5 +1161,3 @@ SDLTest_TestSuiteReference renderTestSuite = {
     renderTests,
     CleanupDestroyRenderer
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_rwops.c b/test/testautomation_rwops.c
index b57d9f94ae..39dff6dd44 100644
--- a/test/testautomation_rwops.c
+++ b/test/testautomation_rwops.c
@@ -650,5 +650,3 @@ SDLTest_TestSuiteReference rwopsTestSuite = {
     rwopsTests,
     RWopsTearDown
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_sdltest.c b/test/testautomation_sdltest.c
index fc093e4b24..f65a51ba5d 100644
--- a/test/testautomation_sdltest.c
+++ b/test/testautomation_sdltest.c
@@ -1296,5 +1296,3 @@ SDLTest_TestSuiteReference sdltestTestSuite = {
     sdltestTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_stdlib.c b/test/testautomation_stdlib.c
index 1714b138e8..f818e7a0f4 100644
--- a/test/testautomation_stdlib.c
+++ b/test/testautomation_stdlib.c
@@ -595,5 +595,3 @@ SDLTest_TestSuiteReference stdlibTestSuite = {
     stdlibTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_surface.c b/test/testautomation_surface.c
index a8ff8a1079..2f5ba256d5 100644
--- a/test/testautomation_surface.c
+++ b/test/testautomation_surface.c
@@ -818,5 +818,3 @@ SDLTest_TestSuiteReference surfaceTestSuite = {
     _surfaceTearDown
 
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_syswm.c b/test/testautomation_syswm.c
index b25aaa0f6b..528ef5f223 100644
--- a/test/testautomation_syswm.c
+++ b/test/testautomation_syswm.c
@@ -53,5 +53,3 @@ SDLTest_TestSuiteReference syswmTestSuite = {
     syswmTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_timer.c b/test/testautomation_timer.c
index cf61de6d4e..bea77e80fa 100644
--- a/test/testautomation_timer.c
+++ b/test/testautomation_timer.c
@@ -195,5 +195,3 @@ SDLTest_TestSuiteReference timerTestSuite = {
     timerTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testautomation_video.c b/test/testautomation_video.c
index c78ecaefac..6b5ac14da3 100644
--- a/test/testautomation_video.c
+++ b/test/testautomation_video.c
@@ -1924,5 +1924,3 @@ SDLTest_TestSuiteReference videoTestSuite = {
     videoTests,
     NULL
 };
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testbounds.c b/test/testbounds.c
index de1bd1b099..47303fecca 100644
--- a/test/testbounds.c
+++ b/test/testbounds.c
@@ -36,5 +36,3 @@ int main(int argc, char **argv)
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testcustomcursor.c b/test/testcustomcursor.c
index 0aad0a325f..b0323061c6 100644
--- a/test/testcustomcursor.c
+++ b/test/testcustomcursor.c
@@ -320,5 +320,3 @@ int main(int argc, char *argv[])
     /* keep the compiler happy ... */
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testdisplayinfo.c b/test/testdisplayinfo.c
index cbbd21a383..8dc248a598 100644
--- a/test/testdisplayinfo.c
+++ b/test/testdisplayinfo.c
@@ -91,5 +91,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testdraw2.c b/test/testdraw2.c
index 06b5c2e46a..ac33ae5c53 100644
--- a/test/testdraw2.c
+++ b/test/testdraw2.c
@@ -308,5 +308,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testdrawchessboard.c b/test/testdrawchessboard.c
index ae3c4d75a5..6e021527a3 100644
--- a/test/testdrawchessboard.c
+++ b/test/testdrawchessboard.c
@@ -132,5 +132,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testdropfile.c b/test/testdropfile.c
index 9884d88a43..e2f882dec4 100644
--- a/test/testdropfile.c
+++ b/test/testdropfile.c
@@ -94,5 +94,3 @@ int main(int argc, char *argv[])
     /* keep the compiler happy ... */
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testerror.c b/test/testerror.c
index 57834b65c8..21ae4bd5d8 100644
--- a/test/testerror.c
+++ b/test/testerror.c
@@ -79,5 +79,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testevdev.c b/test/testevdev.c
index c36b3d740f..4738229f74 100644
--- a/test/testevdev.c
+++ b/test/testevdev.c
@@ -1040,5 +1040,3 @@ int main(int argc, char *argv[])
 {
     return run_test() ? 0 : 1;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testfile.c b/test/testfile.c
index 484a172100..03dbeb550e 100644
--- a/test/testfile.c
+++ b/test/testfile.c
@@ -356,5 +356,3 @@ int main(int argc, char *argv[])
     cleanup();
     return 0; /* all ok */
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testfilesystem.c b/test/testfilesystem.c
index 425f60fc35..6006fa8717 100644
--- a/test/testfilesystem.c
+++ b/test/testfilesystem.c
@@ -57,5 +57,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testgamecontroller.c b/test/testgamecontroller.c
index 211397d0cc..e8adb18c4c 100644
--- a/test/testgamecontroller.c
+++ b/test/testgamecontroller.c
@@ -961,5 +961,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testgeometry.c b/test/testgeometry.c
index 1509888ee4..f3899f8a3c 100644
--- a/test/testgeometry.c
+++ b/test/testgeometry.c
@@ -262,5 +262,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testgl2.c b/test/testgl2.c
index b5abb64915..c8c7ddee73 100644
--- a/test/testgl2.c
+++ b/test/testgl2.c
@@ -428,5 +428,3 @@ int main(int argc, char *argv[])
 }
 
 #endif /* HAVE_OPENGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testgles.c b/test/testgles.c
index 3b598d9420..40f8aee0dd 100644
--- a/test/testgles.c
+++ b/test/testgles.c
@@ -339,5 +339,3 @@ int main(int argc, char *argv[])
 }
 
 #endif /* HAVE_OPENGLES */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testgles2.c b/test/testgles2.c
index 2dec561bc4..0b30b96b1f 100644
--- a/test/testgles2.c
+++ b/test/testgles2.c
@@ -899,5 +899,3 @@ int main(int argc, char *argv[])
 }
 
 #endif /* HAVE_OPENGLES2 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testgles2_sdf.c b/test/testgles2_sdf.c
index 33e9a0d89c..8d1803476c 100644
--- a/test/testgles2_sdf.c
+++ b/test/testgles2_sdf.c
@@ -788,5 +788,3 @@ int main(int argc, char *argv[])
 }
 
 #endif /* HAVE_OPENGLES2 */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testhaptic.c b/test/testhaptic.c
index 3f02466bc8..2efb5d3364 100644
--- a/test/testhaptic.c
+++ b/test/testhaptic.c
@@ -363,5 +363,3 @@ HapticPrintSupported(SDL_Haptic *ptr)
         SDL_Log("      status\n");
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testhittesting.c b/test/testhittesting.c
index a10079e0b8..337205144f 100644
--- a/test/testhittesting.c
+++ b/test/testhittesting.c
@@ -139,5 +139,3 @@ int main(int argc, char **argv)
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testhotplug.c b/test/testhotplug.c
index 2b090b1510..2fe7850f3a 100644
--- a/test/testhotplug.c
+++ b/test/testhotplug.c
@@ -133,5 +133,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testiconv.c b/test/testiconv.c
index f9903a11d1..fb0fc6c692 100644
--- a/test/testiconv.c
+++ b/test/testiconv.c
@@ -95,5 +95,3 @@ int main(int argc, char *argv[])
     SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Total errors: %d\n", errors);
     return errors ? errors + 1 : 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testime.c b/test/testime.c
index 000f7e8ee3..a6f7651184 100644
--- a/test/testime.c
+++ b/test/testime.c
@@ -790,5 +790,3 @@ int main(int argc, char *argv[])
     SDLTest_CommonQuit(state);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testintersections.c b/test/testintersections.c
index 3ea4c2fa5f..47c70ee44c 100644
--- a/test/testintersections.c
+++ b/test/testintersections.c
@@ -371,5 +371,3 @@ int main(int argc, char *argv[])
     }
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testjoystick.c b/test/testjoystick.c
index 0af97d616f..8b26f5177f 100644
--- a/test/testjoystick.c
+++ b/test/testjoystick.c
@@ -319,5 +319,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testkeys.c b/test/testkeys.c
index 5319daa830..1ed549fc53 100644
--- a/test/testkeys.c
+++ b/test/testkeys.c
@@ -35,5 +35,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testloadso.c b/test/testloadso.c
index 8f91ddd33a..01afed3360 100644
--- a/test/testloadso.c
+++ b/test/testloadso.c
@@ -76,5 +76,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return retval;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testlocale.c b/test/testlocale.c
index 7699ecac11..1ac6ce8619 100644
--- a/test/testlocale.c
+++ b/test/testlocale.c
@@ -63,5 +63,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testlock.c b/test/testlock.c
index 88d35a9a8b..6e233b3015 100644
--- a/test/testlock.c
+++ b/test/testlock.c
@@ -127,5 +127,3 @@ int main(int argc, char *argv[])
 
     return 0; /* Never reached */
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testmessage.c b/test/testmessage.c
index c538b851e2..6a1cad8156 100644
--- a/test/testmessage.c
+++ b/test/testmessage.c
@@ -210,5 +210,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testmouse.c b/test/testmouse.c
index 51a03d98b5..7fc143fd50 100644
--- a/test/testmouse.c
+++ b/test/testmouse.c
@@ -295,5 +295,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testmultiaudio.c b/test/testmultiaudio.c
index cb1d0bb6ee..906cda3cf7 100644
--- a/test/testmultiaudio.c
+++ b/test/testmultiaudio.c
@@ -199,5 +199,3 @@ int main(int argc, char **argv)
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testnative.c b/test/testnative.c
index f8356987c4..41df7b41a0 100644
--- a/test/testnative.c
+++ b/test/testnative.c
@@ -198,5 +198,3 @@ int main(int argc, char *argv[])
 
     return 0; /* to prevent compiler warning */
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testnativew32.c b/test/testnativew32.c
index fd96d3774b..30471d6c03 100644
--- a/test/testnativew32.c
+++ b/test/testnativew32.c
@@ -86,5 +86,3 @@ DestroyWindowNative(void *window)
 }
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testnativex11.c b/test/testnativex11.c
index 874c9dd685..e382cafa64 100644
--- a/test/testnativex11.c
+++ b/test/testnativex11.c
@@ -53,5 +53,3 @@ DestroyWindowX11(void *window)
 }
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testoffscreen.c b/test/testoffscreen.c
index e7112e8c2e..a1f0bd4fd5 100644
--- a/test/testoffscreen.c
+++ b/test/testoffscreen.c
@@ -164,5 +164,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testoverlay2.c b/test/testoverlay2.c
index f76532cc14..8056d20fc0 100644
--- a/test/testoverlay2.c
+++ b/test/testoverlay2.c
@@ -511,5 +511,3 @@ int main(int argc, char **argv)
     quit(0);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testplatform.c b/test/testplatform.c
index 732656ac71..504e2ffcdc 100644
--- a/test/testplatform.c
+++ b/test/testplatform.c
@@ -461,5 +461,3 @@ int main(int argc, char *argv[])
 
     return status;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testpower.c b/test/testpower.c
index 2277cbf475..34c19183d7 100644
--- a/test/testpower.c
+++ b/test/testpower.c
@@ -75,5 +75,3 @@ int main(int argc, char *argv[])
 }
 
 /* end of testpower.c ... */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testqsort.c b/test/testqsort.c
index 3d4ceda291..1a123232d3 100644
--- a/test/testqsort.c
+++ b/test/testqsort.c
@@ -99,5 +99,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testrelative.c b/test/testrelative.c
index ad9a610b2e..d01d7449dc 100644
--- a/test/testrelative.c
+++ b/test/testrelative.c
@@ -130,5 +130,3 @@ int main(int argc, char *argv[])
     SDLTest_CommonQuit(state);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testrendercopyex.c b/test/testrendercopyex.c
index 170b111aae..1cb99d81bb 100644
--- a/test/testrendercopyex.c
+++ b/test/testrendercopyex.c
@@ -170,5 +170,3 @@ int main(int argc, char *argv[])
     quit(0);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testrendertarget.c b/test/testrendertarget.c
index 2071decc6b..2017213ec8 100644
--- a/test/testrendertarget.c
+++ b/test/testrendertarget.c
@@ -284,5 +284,3 @@ int main(int argc, char *argv[])
     quit(0);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testresample.c b/test/testresample.c
index 80fa7a935c..7d40778f81 100644
--- a/test/testresample.c
+++ b/test/testresample.c
@@ -118,5 +118,3 @@ int main(int argc, char **argv)
 } /* main */
 
 /* end of testresample.c ... */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testrumble.c b/test/testrumble.c
index be7b718eab..52304a7633 100644
--- a/test/testrumble.c
+++ b/test/testrumble.c
@@ -135,5 +135,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testscale.c b/test/testscale.c
index 9e3d49d84d..d1286a9ed5 100644
--- a/test/testscale.c
+++ b/test/testscale.c
@@ -161,5 +161,3 @@ int main(int argc, char *argv[])
     quit(0);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testsem.c b/test/testsem.c
index 5d3411d4ce..027d46edeb 100644
--- a/test/testsem.c
+++ b/test/testsem.c
@@ -282,5 +282,3 @@ int main(int argc, char **argv)
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testsensor.c b/test/testsensor.c
index 203f21d83e..7afb62c956 100644
--- a/test/testsensor.c
+++ b/test/testsensor.c
@@ -118,5 +118,3 @@ int main(int argc, char **argv)
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testshader.c b/test/testshader.c
index da1668c48d..65fe44e860 100644
--- a/test/testshader.c
+++ b/test/testshader.c
@@ -521,5 +521,3 @@ int main(int argc, char *argv[])
 }
 
 #endif /* HAVE_OPENGL */
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testshape.c b/test/testshape.c
index 605f072d80..7adbefae7b 100644
--- a/test/testshape.c
+++ b/test/testshape.c
@@ -206,5 +206,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testsprite2.c b/test/testsprite2.c
index 4b59ce295f..49c0a94eab 100644
--- a/test/testsprite2.c
+++ b/test/testsprite2.c
@@ -585,5 +585,3 @@ int main(int argc, char *argv[])
     quit(0);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testspriteminimal.c b/test/testspriteminimal.c
index 41a14880e9..0f984e573c 100644
--- a/test/testspriteminimal.c
+++ b/test/testspriteminimal.c
@@ -142,5 +142,3 @@ int main(int argc, char *argv[])
 
     return 0; /* to prevent compiler warning */
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/teststreaming.c b/test/teststreaming.c
index 7d7efe3c0f..0b19c6ade0 100644
--- a/test/teststreaming.c
+++ b/test/teststreaming.c
@@ -193,5 +193,3 @@ int main(int argc, char **argv)
     quit(0);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testsurround.c b/test/testsurround.c
index dad9fb153c..7241a15cb5 100644
--- a/test/testsurround.c
+++ b/test/testsurround.c
@@ -200,5 +200,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testthread.c b/test/testthread.c
index 011bf39835..0730a3add9 100644
--- a/test/testthread.c
+++ b/test/testthread.c
@@ -137,5 +137,3 @@ int main(int argc, char *argv[])
     SDL_Quit(); /* Never reached */
     return 0;   /* Never reached */
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testtimer.c b/test/testtimer.c
index 7f17c97af9..1718b5e99c 100644
--- a/test/testtimer.c
+++ b/test/testtimer.c
@@ -136,5 +136,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testurl.c b/test/testurl.c
index c9622567b7..e000c4a58e 100644
--- a/test/testurl.c
+++ b/test/testurl.c
@@ -41,5 +41,3 @@ int main(int argc, char **argv)
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testutils.c b/test/testutils.c
index 4cd730c8dd..a28e2b6ba4 100644
--- a/test/testutils.c
+++ b/test/testutils.c
@@ -149,5 +149,3 @@ LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent,
     }
     return texture;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testver.c b/test/testver.c
index b2a432c4be..44cf0f4f09 100644
--- a/test/testver.c
+++ b/test/testver.c
@@ -40,5 +40,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testviewport.c b/test/testviewport.c
index 1e250022bd..fc5c679621 100644
--- a/test/testviewport.c
+++ b/test/testviewport.c
@@ -226,5 +226,3 @@ int main(int argc, char *argv[])
     quit(0);
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testvulkan.c b/test/testvulkan.c
index d9cfc7e884..9edbbd0142 100644
--- a/test/testvulkan.c
+++ b/test/testvulkan.c
@@ -1154,5 +1154,3 @@ int main(int argc, char **argv)
 }
 
 #endif
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testwm2.c b/test/testwm2.c
index b38db49f69..c9cff35141 100644
--- a/test/testwm2.c
+++ b/test/testwm2.c
@@ -293,5 +293,3 @@ int main(int argc, char *argv[])
     /* keep the compiler happy ... */
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testyuv.c b/test/testyuv.c
index 76228fac6b..8630bc370d 100644
--- a/test/testyuv.c
+++ b/test/testyuv.c
@@ -444,5 +444,3 @@ int main(int argc, char **argv)
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testyuv_cvt.c b/test/testyuv_cvt.c
index f6fb4efda4..54b46caabc 100644
--- a/test/testyuv_cvt.c
+++ b/test/testyuv_cvt.c
@@ -294,5 +294,3 @@ int CalculateYUVPitch(Uint32 format, int width)
         return 0;
     }
 }
-
-/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/torturethread.c b/test/torturethread.c
index 0ede9e7d24..4afb6b7737 100644
--- a/test/torturethread.c
+++ b/test/torturethread.c
@@ -109,5 +109,3 @@ int main(int argc, char *argv[])
     SDL_Quit();
     return 0;
 }
-
-/* vi: set ts=4 sw=4 expandtab: */