kc3-lang/SDL

diff --git a/src/audio/android/SDL_androidaudio.h b/src/audio/android/SDL_androidaudio.h
index e41b259..370acbb 100644
--- a/src/audio/android/SDL_androidaudio.h
+++ b/src/audio/android/SDL_androidaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_androidaudio_h
-#define _SDL_androidaudio_h
+#ifndef SDL_androidaudio_h_
+#define SDL_androidaudio_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -37,6 +37,6 @@ struct SDL_PrivateAudioData
 void ANDROIDAUDIO_ResumeDevices(void);
 void ANDROIDAUDIO_PauseDevices(void);
 
-#endif /* _SDL_androidaudio_h */
+#endif /* SDL_androidaudio_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/arts/SDL_artsaudio.h b/src/audio/arts/SDL_artsaudio.h
index b718099..50c9ae0 100644
--- a/src/audio/arts/SDL_artsaudio.h
+++ b/src/audio/arts/SDL_artsaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_artsaudio_h
-#define _SDL_artsaudio_h
+#ifndef SDL_artsaudio_h_
+#define SDL_artsaudio_h_
 
 #include <artsc.h>
 
@@ -48,6 +48,6 @@ struct SDL_PrivateAudioData
 };
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
 
-#endif /* _SDL_artsaudio_h */
+#endif /* SDL_artsaudio_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 72d8893..87d0f83 100644
--- a/src/audio/coreaudio/SDL_coreaudio.h
+++ b/src/audio/coreaudio/SDL_coreaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_coreaudio_h
-#define _SDL_coreaudio_h
+#ifndef SDL_coreaudio_h_
+#define SDL_coreaudio_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -63,5 +63,6 @@ struct SDL_PrivateAudioData
 #endif
 };
 
-#endif /* _SDL_coreaudio_h */
+#endif /* SDL_coreaudio_h_ */
+
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/directsound/SDL_directsound.h b/src/audio/directsound/SDL_directsound.h
index 3f4e7d9..c19dc63 100644
--- a/src/audio/directsound/SDL_directsound.h
+++ b/src/audio/directsound/SDL_directsound.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_directsound_h
-#define _SDL_directsound_h
+#ifndef SDL_directsound_h_
+#define SDL_directsound_h_
 
 #include "../../core/windows/SDL_directx.h"
 
@@ -42,6 +42,6 @@ struct SDL_PrivateAudioData
     Uint8 *locked_buf;
 };
 
-#endif /* _SDL_directsound_h */
+#endif /* SDL_directsound_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/emscripten/SDL_emscriptenaudio.h b/src/audio/emscripten/SDL_emscriptenaudio.h
index c059c67..aeaef4a 100644
--- a/src/audio/emscripten/SDL_emscriptenaudio.h
+++ b/src/audio/emscripten/SDL_emscriptenaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_emscriptenaudio_h
-#define _SDL_emscriptenaudio_h
+#ifndef SDL_emscriptenaudio_h_
+#define SDL_emscriptenaudio_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -33,5 +33,6 @@ struct SDL_PrivateAudioData
     int unused;
 };
 
-#endif /* _SDL_emscriptenaudio_h */
+#endif /* SDL_emscriptenaudio_h_ */
+
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/esd/SDL_esdaudio.h b/src/audio/esd/SDL_esdaudio.h
index afdfd0b..fd4ca96 100644
--- a/src/audio/esd/SDL_esdaudio.h
+++ b/src/audio/esd/SDL_esdaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_esdaudio_h
-#define _SDL_esdaudio_h
+#ifndef SDL_esdaudio_h_
+#define SDL_esdaudio_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -46,5 +46,6 @@ struct SDL_PrivateAudioData
 };
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
 
-#endif /* _SDL_esdaudio_h */
+#endif /* SDL_esdaudio_h_ */
+
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/fusionsound/SDL_fsaudio.h b/src/audio/fusionsound/SDL_fsaudio.h
index b70ce37..67bd5c2 100644
--- a/src/audio/fusionsound/SDL_fsaudio.h
+++ b/src/audio/fusionsound/SDL_fsaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_fsaudio_h
-#define _SDL_fsaudio_h
+#ifndef SDL_fsaudio_h_
+#define SDL_fsaudio_h_
 
 #include <fusionsound/fusionsound.h>
 
@@ -45,5 +45,6 @@ struct SDL_PrivateAudioData
 
 };
 
-#endif /* _SDL_fsaudio_h */
+#endif /* SDL_fsaudio_h_ */
+
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/haiku/SDL_haikuaudio.h b/src/audio/haiku/SDL_haikuaudio.h
index c704289..6ed5b26 100644
--- a/src/audio/haiku/SDL_haikuaudio.h
+++ b/src/audio/haiku/SDL_haikuaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_haikuaudio_h
-#define _SDL_haikuaudio_h
+#ifndef SDL_haikuaudio_h_
+#define SDL_haikuaudio_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -33,6 +33,6 @@ struct SDL_PrivateAudioData
     BSoundPlayer *audio_obj;
 };
 
-#endif /* _SDL_haikuaudio_h */
+#endif /* SDL_haikuaudio_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/jack/SDL_jackaudio.h b/src/audio/jack/SDL_jackaudio.h
index f5dbb3e..91fc696 100644
--- a/src/audio/jack/SDL_jackaudio.h
+++ b/src/audio/jack/SDL_jackaudio.h
@@ -18,8 +18,8 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef _SDL_jackaudio_h
-#define _SDL_jackaudio_h
+#ifndef SDL_jackaudio_h_
+#define SDL_jackaudio_h_
 
 #include <jack/jack.h>
 
@@ -37,6 +37,6 @@ struct SDL_PrivateAudioData
     jack_port_t **sdlports;
 };
 
-#endif /* _SDL_jackaudio_h */
+#endif /* SDL_jackaudio_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/nacl/SDL_naclaudio.h b/src/audio/nacl/SDL_naclaudio.h
index e56a8b4..12249ae 100644
--- a/src/audio/nacl/SDL_naclaudio.h
+++ b/src/audio/nacl/SDL_naclaudio.h
@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_naclaudio_h
-#define _SDL_naclaudio_h
+#ifndef SDL_naclaudio_h_
+#define SDL_naclaudio_h_
 
 #include "SDL_audio.h"
 #include "../SDL_sysaudio.h"
@@ -38,4 +38,6 @@ typedef struct SDL_PrivateAudioData {
   PP_Resource audio;
 } SDL_PrivateAudioData;
 
-#endif /* _SDL_naclaudio_h */
+#endif /* SDL_naclaudio_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/netbsd/SDL_netbsdaudio.h b/src/audio/netbsd/SDL_netbsdaudio.h
index e7d850b..a4ec89c 100644
--- a/src/audio/netbsd/SDL_netbsdaudio.h
+++ b/src/audio/netbsd/SDL_netbsdaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_netbsdaudio_h
-#define _SDL_netbsdaudio_h
+#ifndef SDL_netbsdaudio_h_
+#define SDL_netbsdaudio_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -43,6 +43,6 @@ struct SDL_PrivateAudioData
 
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
 
-#endif /* _SDL_netbsdaudio_h */
+#endif /* SDL_netbsdaudio_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/paudio/SDL_paudio.h b/src/audio/paudio/SDL_paudio.h
index 8133991..c2938ee 100644
--- a/src/audio/paudio/SDL_paudio.h
+++ b/src/audio/paudio/SDL_paudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_paudio_h
-#define _SDL_paudio_h
+#ifndef SDL_paudio_h_
+#define SDL_paudio_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -43,6 +43,6 @@ struct SDL_PrivateAudioData
 };
 #define FUDGE_TICKS 10      /* The scheduler overhead ticks per frame */
 
-#endif /* _SDL_paudio_h */
+#endif /* SDL_paudio_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/psp/SDL_pspaudio.h b/src/audio/psp/SDL_pspaudio.h
index 8b4891d..df56d82 100644
--- a/src/audio/psp/SDL_pspaudio.h
+++ b/src/audio/psp/SDL_pspaudio.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_pspaudio_h
-#define _SDL_pspaudio_h
+#ifndef SDL_pspaudio_h_
+#define SDL_pspaudio_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -40,6 +40,6 @@ struct SDL_PrivateAudioData {
     int     next_buffer;
 };
 
-#endif /* _SDL_pspaudio_h */
-/* vim: ts=4 sw=4
- */
+#endif /* SDL_pspaudio_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/sndio/SDL_sndioaudio.h b/src/audio/sndio/SDL_sndioaudio.h
index b20be19..e6733b4 100644
--- a/src/audio/sndio/SDL_sndioaudio.h
+++ b/src/audio/sndio/SDL_sndioaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_sndioaudio_h
-#define _SDL_sndioaudio_h
+#ifndef SDL_sndioaudio_h_
+#define SDL_sndioaudio_h_
 
 #include <poll.h>
 #include <sndio.h>
@@ -44,6 +44,6 @@ struct SDL_PrivateAudioData
     struct pollfd *pfd;
 };
 
-#endif /* _SDL_sndioaudio_h */
+#endif /* SDL_sndioaudio_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/sun/SDL_sunaudio.h b/src/audio/sun/SDL_sunaudio.h
index 20f079b..5cf0458 100644
--- a/src/audio/sun/SDL_sunaudio.h
+++ b/src/audio/sun/SDL_sunaudio.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_sunaudio_h
-#define _SDL_sunaudio_h
+#ifndef SDL_sunaudio_h_
+#define SDL_sunaudio_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -42,6 +42,6 @@ struct SDL_PrivateAudioData
     int frequency;              /* The audio frequency in KHz */
 };
 
-#endif /* _SDL_sunaudio_h */
+#endif /* SDL_sunaudio_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/winmm/SDL_winmm.h b/src/audio/winmm/SDL_winmm.h
index bab61a4..9628f08 100644
--- a/src/audio/winmm/SDL_winmm.h
+++ b/src/audio/winmm/SDL_winmm.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_winmm_h
-#define _SDL_winmm_h
+#ifndef SDL_winmm_h_
+#define SDL_winmm_h_
 
 #include "../SDL_sysaudio.h"
 
@@ -40,6 +40,6 @@ struct SDL_PrivateAudioData
     int next_buffer;
 };
 
-#endif /* _SDL_winmm_h */
+#endif /* SDL_winmm_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/audio/xaudio2/SDL_xaudio2.h b/src/audio/xaudio2/SDL_xaudio2.h
index 48dbfa2..cbfd3cd 100644
--- a/src/audio/xaudio2/SDL_xaudio2.h
+++ b/src/audio/xaudio2/SDL_xaudio2.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_XAUDIO2_H
-#define _SDL_XAUDIO2_H
+#ifndef SDL_XAUDIO2_H_
+#define SDL_XAUDIO2_H_
 
 #include <windows.h>
 #include <mmreg.h>
@@ -381,6 +381,6 @@ const struct IXAudio2VoiceCallbackVtbl
 
 #pragma pack(pop)   /* Undo pragma push */
 
-#endif  /* _SDL_XAUDIO2_H */
+#endif  /* SDL_XAUDIO2_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 5933f3e..4226c6e 100644
--- a/src/core/windows/SDL_directx.h
+++ b/src/core/windows/SDL_directx.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_directx_h
-#define _SDL_directx_h
+#ifndef SDL_directx_h_
+#define SDL_directx_h_
 
 /* Include all of the DirectX 8.0 headers and adds any necessary tweaks */
 
@@ -106,6 +106,6 @@
 typedef struct { int unused; } DIDEVICEINSTANCE;
 #endif
 
-#endif /* _SDL_directx_h */
+#endif /* SDL_directx_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/windows/SDL_xinput.h b/src/core/windows/SDL_xinput.h
index 74bfd38..de18380 100644
--- a/src/core/windows/SDL_xinput.h
+++ b/src/core/windows/SDL_xinput.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_xinput_h
-#define _SDL_xinput_h
+#ifndef SDL_xinput_h_
+#define SDL_xinput_h_
 
 #ifdef HAVE_XINPUT_H
 
@@ -172,6 +172,6 @@ extern DWORD SDL_XInputVersion;  /* ((major << 16) & 0xFF00) | (minor & 0xFF) */
 
 #endif /* HAVE_XINPUT_H */
 
-#endif /* _SDL_xinput_h */
+#endif /* SDL_xinput_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/core/winrt/SDL_winrtapp_common.h b/src/core/winrt/SDL_winrtapp_common.h
index 8294479..2e6c81f 100644
--- a/src/core/winrt/SDL_winrtapp_common.h
+++ b/src/core/winrt/SDL_winrtapp_common.h
@@ -20,12 +20,12 @@
 */
 #include "SDL_config.h"
 
-#ifndef _SDL_winrtapp_common_h
-#define _SDL_winrtapp_common_h
+#ifndef SDL_winrtapp_common_h_
+#define SDL_winrtapp_common_h_
 
 /* A pointer to the app's C-style main() function (which is a different
    function than the WinRT app's actual entry point).
  */
 extern int (*WINRT_SDLAppEntryPoint)(int, char **);
 
-#endif // ifndef _SDL_winrtapp_common_h
+#endif // SDL_winrtapp_common_h_
diff --git a/src/core/winrt/SDL_winrtapp_xaml.h b/src/core/winrt/SDL_winrtapp_xaml.h
index 895e2b5..cd827a6 100644
--- a/src/core/winrt/SDL_winrtapp_xaml.h
+++ b/src/core/winrt/SDL_winrtapp_xaml.h
@@ -20,8 +20,8 @@
 */
 #include "SDL_config.h"
 
-#ifndef _SDL_winrtapp_xaml_h
-#define _SDL_winrtapp_xaml_h
+#ifndef SDL_winrtapp_xaml_h_
+#define SDL_winrtapp_xaml_h_
 
 #include "SDL_stdinc.h"
 
@@ -30,4 +30,4 @@ extern SDL_bool WINRT_XAMLWasEnabled;
 extern int SDL_WinRTInitXAMLApp(int (*mainFunction)(int, char **), void * backgroundPanelAsIInspectable);
 #endif // ifdef __cplusplus
 
-#endif // ifndef _SDL_winrtapp_xaml_h
+#endif // SDL_winrtapp_xaml_h_
diff --git a/src/haptic/windows/SDL_windowshaptic_c.h b/src/haptic/windows/SDL_windowshaptic_c.h
index 0d62227..0a66db0 100644
--- a/src/haptic/windows/SDL_windowshaptic_c.h
+++ b/src/haptic/windows/SDL_windowshaptic_c.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowshaptic_c_h
-#define _SDL_windowshaptic_c_h
+#ifndef SDL_windowshaptic_c_h_
+#define SDL_windowshaptic_c_h_
 
 #include "SDL_thread.h"
 #include "../SDL_syshaptic.h"
@@ -82,7 +82,7 @@ extern SDL_hapticlist_item *SDL_hapticlist;
 extern int SDL_SYS_AddHapticDevice(SDL_hapticlist_item *item);
 extern int SDL_SYS_RemoveHapticDevice(SDL_hapticlist_item *prev, SDL_hapticlist_item *item);
 
-#endif /* _SDL_windowshaptic_c_h */
+#endif /* SDL_windowshaptic_c_h_ */
 
 /* 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 140eda1..a934773 100644
--- a/src/joystick/android/SDL_sysjoystick_c.h
+++ b/src/joystick/android/SDL_sysjoystick_c.h
@@ -23,8 +23,8 @@
 
 #ifdef SDL_JOYSTICK_ANDROID
 
-#ifndef _SDL_sysjoystick_c_h
-#define _SDL_sysjoystick_c_h
+#ifndef SDL_sysjoystick_c_h_
+#define SDL_sysjoystick_c_h_
 
 #include "../SDL_sysjoystick.h"
 
@@ -51,7 +51,7 @@ typedef struct SDL_joylist_item
 
 typedef SDL_joylist_item joystick_hwdata;
 
-#endif /* _SDL_sysjoystick_c_h */
+#endif /* SDL_sysjoystick_c_h_ */
 
 #endif /* SDL_JOYSTICK_ANDROID */
 
diff --git a/src/thread/windows/SDL_systhread_c.h b/src/thread/windows/SDL_systhread_c.h
index 9d55269..1e5d39d 100644
--- a/src/thread/windows/SDL_systhread_c.h
+++ b/src/thread/windows/SDL_systhread_c.h
@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_systhread_c_h
-#define _SDL_systhread_c_h
+#ifndef SDL_systhread_c_h_
+#define SDL_systhread_c_h_
 
 #include "../../core/windows/SDL_windows.h"
 
 typedef HANDLE SYS_ThreadHandle;
 
-#endif /* _SDL_systhread_c_h */
+#endif /* SDL_systhread_c_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidclipboard.h b/src/video/android/SDL_androidclipboard.h
index 59d0741..d1818b0 100644
--- a/src/video/android/SDL_androidclipboard.h
+++ b/src/video/android/SDL_androidclipboard.h
@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_androidclipboard_h
-#define _SDL_androidclipboard_h
+#ifndef SDL_androidclipboard_h_
+#define SDL_androidclipboard_h_
 
 extern int Android_SetClipboardText(_THIS, const char *text);
 extern char *Android_GetClipboardText(_THIS);
 extern SDL_bool Android_HasClipboardText(_THIS);
 
-#endif /* _SDL_androidclipboard_h */
+#endif /* SDL_androidclipboard_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidgl.h b/src/video/android/SDL_androidgl.h
index d44abc3..5e96d2c 100644
--- a/src/video/android/SDL_androidgl.h
+++ b/src/video/android/SDL_androidgl.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_androidgl_h
-#define _SDL_androidgl_h
+#ifndef SDL_androidgl_h_
+#define SDL_androidgl_h_
 
 SDL_GLContext Android_GLES_CreateContext(_THIS, SDL_Window * window);
 int Android_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
@@ -29,6 +29,6 @@ int Android_GLES_SwapWindow(_THIS, SDL_Window * window);
 int Android_GLES_LoadLibrary(_THIS, const char *path);
 
 
-#endif /* _SDL_androidgl_h */
+#endif /* SDL_androidgl_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidmouse.h b/src/video/android/SDL_androidmouse.h
index b712ac4..ffee18b 100644
--- a/src/video/android/SDL_androidmouse.h
+++ b/src/video/android/SDL_androidmouse.h
@@ -19,14 +19,14 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_androidmouse_h
-#define _SDL_androidmouse_h
+#ifndef SDL_androidmouse_h_
+#define SDL_androidmouse_h_
 
 #include "SDL_androidvideo.h"
 
 extern void Android_InitMouse(void);
 extern void Android_OnMouse( int button, int action, float x, float y);
 
-#endif /* _SDL_androidmouse_h */
+#endif /* SDL_androidmouse_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidvideo.h b/src/video/android/SDL_androidvideo.h
index 5b43cbf..f061dd5 100644
--- a/src/video/android/SDL_androidvideo.h
+++ b/src/video/android/SDL_androidvideo.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_androidvideo_h
-#define _SDL_androidvideo_h
+#ifndef SDL_androidvideo_h_
+#define SDL_androidvideo_h_
 
 #include "SDL_mutex.h"
 #include "SDL_rect.h"
@@ -44,6 +44,6 @@ extern SDL_sem *Android_PauseSem, *Android_ResumeSem;
 extern SDL_Window *Android_Window;
 
 
-#endif /* _SDL_androidvideo_h */
+#endif /* SDL_androidvideo_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidvulkan.h b/src/video/android/SDL_androidvulkan.h
index 1b7d797..b06fece 100644
--- a/src/video/android/SDL_androidvulkan.h
+++ b/src/video/android/SDL_androidvulkan.h
@@ -26,8 +26,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_androidvulkan_h
-#define _SDL_androidvulkan_h
+#ifndef SDL_androidvulkan_h_
+#define SDL_androidvulkan_h_
 
 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
@@ -47,6 +47,6 @@ SDL_bool Android_Vulkan_CreateSurface(_THIS,
 
 #endif
 
-#endif /* _SDL_androidvulkan_h */
+#endif /* SDL_androidvulkan_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/android/SDL_androidwindow.h b/src/video/android/SDL_androidwindow.h
index 2f7d7f5..b3445a4 100644
--- a/src/video/android/SDL_androidwindow.h
+++ b/src/video/android/SDL_androidwindow.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_androidwindow_h
-#define _SDL_androidwindow_h
+#ifndef SDL_androidwindow_h_
+#define SDL_androidwindow_h_
 
 #include "../../core/android/SDL_android.h"
 #include "../SDL_egl_c.h"
@@ -39,6 +39,6 @@ typedef struct
     
 } SDL_WindowData;
 
-#endif /* _SDL_androidwindow_h */
+#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 5b2c995..2f134b4 100644
--- a/src/video/cocoa/SDL_cocoaclipboard.h
+++ b/src/video/cocoa/SDL_cocoaclipboard.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoaclipboard_h
-#define _SDL_cocoaclipboard_h
+#ifndef SDL_cocoaclipboard_h_
+#define SDL_cocoaclipboard_h_
 
 /* Forward declaration */
 struct SDL_VideoData;
@@ -31,6 +31,6 @@ extern char *Cocoa_GetClipboardText(_THIS);
 extern SDL_bool Cocoa_HasClipboardText(_THIS);
 extern void Cocoa_CheckClipboardUpdate(struct SDL_VideoData * data);
 
-#endif /* _SDL_cocoaclipboard_h */
+#endif /* SDL_cocoaclipboard_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaevents.h b/src/video/cocoa/SDL_cocoaevents.h
index 9cde8a0..73011d0 100644
--- a/src/video/cocoa/SDL_cocoaevents.h
+++ b/src/video/cocoa/SDL_cocoaevents.h
@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoaevents_h
-#define _SDL_cocoaevents_h
+#ifndef SDL_cocoaevents_h_
+#define SDL_cocoaevents_h_
 
 extern void Cocoa_RegisterApp(void);
 extern void Cocoa_PumpEvents(_THIS);
 extern void Cocoa_SuspendScreenSaver(_THIS);
 
-#endif /* _SDL_cocoaevents_h */
+#endif /* SDL_cocoaevents_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoakeyboard.h b/src/video/cocoa/SDL_cocoakeyboard.h
index 8eeeb9f..1d63023 100644
--- a/src/video/cocoa/SDL_cocoakeyboard.h
+++ b/src/video/cocoa/SDL_cocoakeyboard.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoakeyboard_h
-#define _SDL_cocoakeyboard_h
+#ifndef SDL_cocoakeyboard_h_
+#define SDL_cocoakeyboard_h_
 
 extern void Cocoa_InitKeyboard(_THIS);
 extern void Cocoa_HandleKeyEvent(_THIS, NSEvent * event);
@@ -31,6 +31,6 @@ extern void Cocoa_StartTextInput(_THIS);
 extern void Cocoa_StopTextInput(_THIS);
 extern void Cocoa_SetTextInputRect(_THIS, SDL_Rect *rect);
 
-#endif /* _SDL_cocoakeyboard_h */
+#endif /* SDL_cocoakeyboard_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoametalview.h b/src/video/cocoa/SDL_cocoametalview.h
index be96b2b..039830b 100644
--- a/src/video/cocoa/SDL_cocoametalview.h
+++ b/src/video/cocoa/SDL_cocoametalview.h
@@ -26,8 +26,8 @@
  * how to add a CAMetalLayer backed view.
  */
 
-#ifndef _SDL_cocoametalview_h
-#define _SDL_cocoametalview_h
+#ifndef SDL_cocoametalview_h_
+#define SDL_cocoametalview_h_
 
 #import "../SDL_sysvideo.h"
 #import "SDL_cocoawindow.h"
@@ -55,7 +55,7 @@ SDL_cocoametalview* Cocoa_Mtl_AddMetalView(SDL_Window* window);
 
 void Cocoa_Mtl_GetDrawableSize(SDL_Window * window, int * w, int * h);
 
-#endif /* _SDL_cocoametalview_h */
+#endif /* SDL_cocoametalview_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
 
diff --git a/src/video/cocoa/SDL_cocoamodes.h b/src/video/cocoa/SDL_cocoamodes.h
index edeb472..f90962d 100644
--- a/src/video/cocoa/SDL_cocoamodes.h
+++ b/src/video/cocoa/SDL_cocoamodes.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoamodes_h
-#define _SDL_cocoamodes_h
+#ifndef SDL_cocoamodes_h_
+#define SDL_cocoamodes_h_
 
 typedef struct
 {
@@ -41,6 +41,6 @@ extern int Cocoa_GetDisplayDPI(_THIS, SDL_VideoDisplay * display, float * ddpi, 
 extern int Cocoa_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
 extern void Cocoa_QuitModes(_THIS);
 
-#endif /* _SDL_cocoamodes_h */
+#endif /* SDL_cocoamodes_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoamouse.h b/src/video/cocoa/SDL_cocoamouse.h
index ac8bb6f..8bcc68f 100644
--- a/src/video/cocoa/SDL_cocoamouse.h
+++ b/src/video/cocoa/SDL_cocoamouse.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoamouse_h
-#define _SDL_cocoamouse_h
+#ifndef SDL_cocoamouse_h_
+#define SDL_cocoamouse_h_
 
 #include "SDL_cocoavideo.h"
 
@@ -47,6 +47,6 @@ typedef struct {
 + (NSCursor *)invisibleCursor;
 @end
 
-#endif /* _SDL_cocoamouse_h */
+#endif /* SDL_cocoamouse_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoamousetap.h b/src/video/cocoa/SDL_cocoamousetap.h
index 0483d9f..f80cccb 100644
--- a/src/video/cocoa/SDL_cocoamousetap.h
+++ b/src/video/cocoa/SDL_cocoamousetap.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoamousetap_h
-#define _SDL_cocoamousetap_h
+#ifndef SDL_cocoamousetap_h_
+#define SDL_cocoamousetap_h_
 
 #include "SDL_cocoamouse.h"
 
@@ -29,6 +29,6 @@ extern void Cocoa_InitMouseEventTap(SDL_MouseData *driverdata);
 extern void Cocoa_EnableMouseEventTap(SDL_MouseData *driverdata, SDL_bool enabled);
 extern void Cocoa_QuitMouseEventTap(SDL_MouseData *driverdata);
 
-#endif /* _SDL_cocoamousetap_h */
+#endif /* SDL_cocoamousetap_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoaopengl.h b/src/video/cocoa/SDL_cocoaopengl.h
index 8f474cf..d9cefd3 100644
--- a/src/video/cocoa/SDL_cocoaopengl.h
+++ b/src/video/cocoa/SDL_cocoaopengl.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoaopengl_h
-#define _SDL_cocoaopengl_h
+#ifndef SDL_cocoaopengl_h_
+#define SDL_cocoaopengl_h_
 
 #if SDL_VIDEO_OPENGL_CGL
 
@@ -63,6 +63,6 @@ extern void Cocoa_GL_DeleteContext(_THIS, SDL_GLContext context);
 
 #endif /* SDL_VIDEO_OPENGL_CGL */
 
-#endif /* _SDL_cocoaopengl_h */
+#endif /* SDL_cocoaopengl_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoashape.h b/src/video/cocoa/SDL_cocoashape.h
index efa6c37..73923ca 100644
--- a/src/video/cocoa/SDL_cocoashape.h
+++ b/src/video/cocoa/SDL_cocoashape.h
@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoashape_h
-#define _SDL_cocoashape_h
+#ifndef SDL_cocoashape_h_
+#define SDL_cocoashape_h_
 
 #include "SDL_stdinc.h"
 #include "SDL_video.h"
@@ -40,4 +40,6 @@ extern SDL_WindowShaper* Cocoa_CreateShaper(SDL_Window* window);
 extern int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
 extern int Cocoa_ResizeWindowShape(SDL_Window *window);
 
-#endif
+#endif /* SDL_cocoashape_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/cocoa/SDL_cocoavideo.h b/src/video/cocoa/SDL_cocoavideo.h
index faa505d..2c5ab92 100644
--- a/src/video/cocoa/SDL_cocoavideo.h
+++ b/src/video/cocoa/SDL_cocoavideo.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoavideo_h
-#define _SDL_cocoavideo_h
+#ifndef SDL_cocoavideo_h_
+#define SDL_cocoavideo_h_
 
 #include "SDL_opengl.h"
 
@@ -113,6 +113,6 @@ typedef struct SDL_VideoData
 /* Utility functions */
 extern NSImage * Cocoa_CreateImage(SDL_Surface * surface);
 
-#endif /* _SDL_cocoavideo_h */
+#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 1d43405..db1bd34 100644
--- a/src/video/cocoa/SDL_cocoavulkan.h
+++ b/src/video/cocoa/SDL_cocoavulkan.h
@@ -27,8 +27,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoavulkan_h
-#define _SDL_cocoavulkan_h
+#ifndef SDL_cocoavulkan_h_
+#define SDL_cocoavulkan_h_
 
 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
@@ -50,6 +50,6 @@ void Cocoa_Vulkan_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h);
 
 #endif
 
-#endif /* _SDL_cocoavulkan_h */
+#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 9467e53..d5502b2 100644
--- a/src/video/cocoa/SDL_cocoawindow.h
+++ b/src/video/cocoa/SDL_cocoawindow.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_cocoawindow_h
-#define _SDL_cocoawindow_h
+#ifndef SDL_cocoawindow_h_
+#define SDL_cocoawindow_h_
 
 #import <Cocoa/Cocoa.h>
 
@@ -142,6 +142,6 @@ extern void Cocoa_DestroyWindow(_THIS, SDL_Window * window);
 extern SDL_bool Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info);
 extern int Cocoa_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
 
-#endif /* _SDL_cocoawindow_h */
+#endif /* SDL_cocoawindow_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/directfb/SDL_DirectFB_WM.h b/src/video/directfb/SDL_DirectFB_WM.h
index eaf18f7..7258c5e 100644
--- a/src/video/directfb/SDL_DirectFB_WM.h
+++ b/src/video/directfb/SDL_DirectFB_WM.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_directfb_wm_h
-#define _SDL_directfb_wm_h
+#ifndef SDL_directfb_wm_h_
+#define SDL_directfb_wm_h_
 
 #include "SDL_DirectFB_video.h"
 
@@ -51,6 +51,6 @@ extern DFBResult DirectFB_WM_GetClientSize(_THIS, SDL_Window * window,
                                            int *cw, int *ch);
 
 
-#endif /* _SDL_directfb_wm_h */
+#endif /* SDL_directfb_wm_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/directfb/SDL_DirectFB_dyn.h b/src/video/directfb/SDL_DirectFB_dyn.h
index 9e3bdaa..87af6de 100644
--- a/src/video/directfb/SDL_DirectFB_dyn.h
+++ b/src/video/directfb/SDL_DirectFB_dyn.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_DirectFB_dyn_h
-#define _SDL_DirectFB_dyn_h
+#ifndef SDL_DirectFB_dyn_h_
+#define SDL_DirectFB_dyn_h_
 
 #define DFB_SYMS \
     DFB_SYM(DFBResult, DirectFBError, (const char *msg, DFBResult result), (msg, result), return) \
@@ -36,4 +36,6 @@
 int SDL_DirectFB_LoadLibrary(void);
 void SDL_DirectFB_UnLoadLibrary(void);
 
-#endif
+#endif /* SDL_DirectFB_dyn_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/directfb/SDL_DirectFB_events.h b/src/video/directfb/SDL_DirectFB_events.h
index 668a01e..e4ff390 100644
--- a/src/video/directfb/SDL_DirectFB_events.h
+++ b/src/video/directfb/SDL_DirectFB_events.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_DirectFB_events_h
-#define _SDL_DirectFB_events_h
+#ifndef SDL_DirectFB_events_h_
+#define SDL_DirectFB_events_h_
 
 #include "../SDL_sysvideo.h"
 
@@ -29,4 +29,6 @@ extern void DirectFB_InitKeyboard(_THIS);
 extern void DirectFB_QuitKeyboard(_THIS);
 extern void DirectFB_PumpEventsWindow(_THIS);
 
-#endif
+#endif /* SDL_DirectFB_events_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/directfb/SDL_DirectFB_modes.h b/src/video/directfb/SDL_DirectFB_modes.h
index 6c2bb6f..6c310c9 100644
--- a/src/video/directfb/SDL_DirectFB_modes.h
+++ b/src/video/directfb/SDL_DirectFB_modes.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_directfb_modes_h
-#define _SDL_directfb_modes_h
+#ifndef SDL_directfb_modes_h_
+#define SDL_directfb_modes_h_
 
 #include <directfb.h>
 
@@ -54,6 +54,6 @@ extern void DirectFB_QuitModes(_THIS);
 
 extern void DirectFB_SetContext(_THIS, SDL_Window *window);
 
-#endif /* _SDL_directfb_modes_h */
+#endif /* SDL_directfb_modes_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/directfb/SDL_DirectFB_mouse.h b/src/video/directfb/SDL_DirectFB_mouse.h
index 884aae7..c793c22 100644
--- a/src/video/directfb/SDL_DirectFB_mouse.h
+++ b/src/video/directfb/SDL_DirectFB_mouse.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_DirectFB_mouse_h
-#define _SDL_DirectFB_mouse_h
+#ifndef SDL_DirectFB_mouse_h_
+#define SDL_DirectFB_mouse_h_
 
 #include <directfb.h>
 
@@ -39,6 +39,6 @@ struct _DFB_CursorData
 extern void DirectFB_InitMouse(_THIS);
 extern void DirectFB_QuitMouse(_THIS);
 
-#endif /* _SDL_DirectFB_mouse_h */
+#endif /* SDL_DirectFB_mouse_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/directfb/SDL_DirectFB_opengl.h b/src/video/directfb/SDL_DirectFB_opengl.h
index c1da406..c074bc6 100644
--- a/src/video/directfb/SDL_DirectFB_opengl.h
+++ b/src/video/directfb/SDL_DirectFB_opengl.h
@@ -20,8 +20,8 @@
 */
 
 
-#ifndef _SDL_directfb_opengl_h
-#define _SDL_directfb_opengl_h
+#ifndef SDL_directfb_opengl_h_
+#define SDL_directfb_opengl_h_
 
 #include "SDL_DirectFB_video.h"
 
@@ -59,6 +59,6 @@ extern void DirectFB_GL_DestroyWindowContexts(_THIS, SDL_Window * window);
 
 #endif /* SDL_DIRECTFB_OPENGL */
 
-#endif /* _SDL_directfb_opengl_h */
+#endif /* SDL_directfb_opengl_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/directfb/SDL_DirectFB_shape.h b/src/video/directfb/SDL_DirectFB_shape.h
index 85a625d..9da5aef 100644
--- a/src/video/directfb/SDL_DirectFB_shape.h
+++ b/src/video/directfb/SDL_DirectFB_shape.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_DirectFB_shape_h
-#define _SDL_DirectFB_shape_h
+#ifndef SDL_DirectFB_shape_h_
+#define SDL_DirectFB_shape_h_
 
 #include <directfb.h>
 
@@ -35,4 +35,4 @@ extern SDL_WindowShaper* DirectFB_CreateShaper(SDL_Window* window);
 extern int DirectFB_ResizeWindowShape(SDL_Window* window);
 extern int DirectFB_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode);
 
-#endif /* _SDL_DirectFB_shape_h */
+#endif /* SDL_DirectFB_shape_h_ */
diff --git a/src/video/directfb/SDL_DirectFB_video.h b/src/video/directfb/SDL_DirectFB_video.h
index f8ac05f..d40f856 100644
--- a/src/video/directfb/SDL_DirectFB_video.h
+++ b/src/video/directfb/SDL_DirectFB_video.h
@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_DirectFB_video_h
-#define _SDL_DirectFB_video_h
+#ifndef SDL_DirectFB_video_h_
+#define SDL_DirectFB_video_h_
 
 #include <directfb.h>
 #include <directfb_version.h>
@@ -167,4 +167,4 @@ DFBSurfacePixelFormat DirectFB_SDLToDFBPixelFormat(Uint32 format);
 void DirectFB_SetSupportedPixelFormats(SDL_RendererInfo *ri);
 
 
-#endif /* _SDL_DirectFB_video_h */
+#endif /* SDL_DirectFB_video_h_ */
diff --git a/src/video/directfb/SDL_DirectFB_window.h b/src/video/directfb/SDL_DirectFB_window.h
index 1f0a810..248c7e8 100644
--- a/src/video/directfb/SDL_DirectFB_window.h
+++ b/src/video/directfb/SDL_DirectFB_window.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_directfb_window_h
-#define _SDL_directfb_window_h
+#ifndef SDL_directfb_window_h_
+#define SDL_directfb_window_h_
 
 #include "SDL_DirectFB_video.h"
 #include "SDL_DirectFB_WM.h"
@@ -77,6 +77,6 @@ extern SDL_bool DirectFB_GetWindowWMInfo(_THIS, SDL_Window * window,
 extern void DirectFB_AdjustWindowSurface(SDL_Window * window);
 extern int DirectFB_SetWindowOpacity(_THIS, SDL_Window * window, float opacity);
 
-#endif /* _SDL_directfb_window_h */
+#endif /* SDL_directfb_window_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenevents.h b/src/video/emscripten/SDL_emscriptenevents.h
index f6d796f..4179f4e 100644
--- a/src/video/emscripten/SDL_emscriptenevents.h
+++ b/src/video/emscripten/SDL_emscriptenevents.h
@@ -20,8 +20,8 @@
 */
 
 
-#ifndef _SDL_emscriptenevents_h
-#define _SDL_emscriptenevents_h
+#ifndef SDL_emscriptenevents_h_
+#define SDL_emscriptenevents_h_
 
 #include "SDL_emscriptenvideo.h"
 
@@ -34,7 +34,7 @@ Emscripten_UnregisterEventHandlers(SDL_WindowData *data);
 extern EM_BOOL
 Emscripten_HandleCanvasResize(int eventType, const void *reserved, void *userData);
 
-#endif /* _SDL_emscriptenevents_h */
+#endif /* SDL_emscriptenevents_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
 
diff --git a/src/video/emscripten/SDL_emscriptenframebuffer.h b/src/video/emscripten/SDL_emscriptenframebuffer.h
index 0f12b76..1ecb279 100644
--- a/src/video/emscripten/SDL_emscriptenframebuffer.h
+++ b/src/video/emscripten/SDL_emscriptenframebuffer.h
@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_emscriptenframebuffer_h
-#define _SDL_emscriptenframebuffer_h
+#ifndef SDL_emscriptenframebuffer_h_
+#define SDL_emscriptenframebuffer_h_
 
 extern int Emscripten_CreateWindowFramebuffer(_THIS, SDL_Window * window, Uint32 * format, void ** pixels, int *pitch);
 extern int Emscripten_UpdateWindowFramebuffer(_THIS, SDL_Window * window, const SDL_Rect * rects, int numrects);
 extern void Emscripten_DestroyWindowFramebuffer(_THIS, SDL_Window * window);
 
-#endif /* _SDL_emscriptenframebuffer_h */
+#endif /* SDL_emscriptenframebuffer_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenmouse.h b/src/video/emscripten/SDL_emscriptenmouse.h
index 8e2b5f1..2f075ee 100644
--- a/src/video/emscripten/SDL_emscriptenmouse.h
+++ b/src/video/emscripten/SDL_emscriptenmouse.h
@@ -20,8 +20,8 @@
 */
 
 
-#ifndef _SDL_emscriptenmouse_h
-#define _SDL_emscriptenmouse_h
+#ifndef SDL_emscriptenmouse_h_
+#define SDL_emscriptenmouse_h_
 
 #include "SDL_stdinc.h"
 
@@ -37,6 +37,6 @@ Emscripten_InitMouse();
 extern void
 Emscripten_FiniMouse();
 
-#endif /* _SDL_emscriptenmouse_h */
+#endif /* SDL_emscriptenmouse_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenopengles.h b/src/video/emscripten/SDL_emscriptenopengles.h
index b44a8f3..e77efde 100644
--- a/src/video/emscripten/SDL_emscriptenopengles.h
+++ b/src/video/emscripten/SDL_emscriptenopengles.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_emscriptenopengles_h
-#define _SDL_emscriptenopengles_h
+#ifndef SDL_emscriptenopengles_h_
+#define SDL_emscriptenopengles_h_
 
 #if SDL_VIDEO_DRIVER_EMSCRIPTEN && SDL_VIDEO_OPENGL_EGL
 
@@ -44,6 +44,6 @@ extern void Emscripten_GLES_GetDrawableSize(_THIS, SDL_Window * window, int * w,
 
 #endif /* SDL_VIDEO_DRIVER_EMSCRIPTEN && SDL_VIDEO_OPENGL_EGL */
 
-#endif /* _SDL_emscriptenopengles_h */
+#endif /* SDL_emscriptenopengles_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/emscripten/SDL_emscriptenvideo.h b/src/video/emscripten/SDL_emscriptenvideo.h
index 1c280c9..394df09 100644
--- a/src/video/emscripten/SDL_emscriptenvideo.h
+++ b/src/video/emscripten/SDL_emscriptenvideo.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_emscriptenvideo_h
-#define _SDL_emscriptenvideo_h
+#ifndef SDL_emscriptenvideo_h_
+#define SDL_emscriptenvideo_h_
 
 #include "../SDL_sysvideo.h"
 #include "../../events/SDL_touch_c.h"
@@ -53,6 +53,6 @@ typedef struct SDL_WindowData
     SDL_bool has_pointer_lock;
 } SDL_WindowData;
 
-#endif /* _SDL_emscriptenvideo_h */
+#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 97cd311..a20147a 100644
--- a/src/video/haiku/SDL_BWin.h
+++ b/src/video/haiku/SDL_BWin.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_BWin_h
-#define _SDL_BWin_h
+#ifndef SDL_BWin_h_
+#define SDL_BWin_h_
 
 #ifdef __cplusplus
 extern "C" {
@@ -674,6 +674,6 @@ private:
  *                         through a draw cycle.  Occurs when the previous
  *                         buffer provided by DirectConnected() is invalidated.
  */
-#endif
+#endif /* SDL_BWin_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmdyn.h b/src/video/kmsdrm/SDL_kmsdrmdyn.h
index cae942a..2e92762 100644
--- a/src/video/kmsdrm/SDL_kmsdrmdyn.h
+++ b/src/video/kmsdrm/SDL_kmsdrmdyn.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_kmsdrmdyn_h
-#define _SDL_kmsdrmdyn_h
+#ifndef SDL_kmsdrmdyn_h_
+#define SDL_kmsdrmdyn_h_
 
 #include "../../SDL_internal.h"
 
@@ -48,6 +48,6 @@ void SDL_KMSDRM_UnloadSymbols(void);
 }
 #endif
 
-#endif /* !defined _SDL_kmsdrmdyn_h */
+#endif /* SDL_kmsdrmdyn_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmevents.h b/src/video/kmsdrm/SDL_kmsdrmevents.h
index 8033da9..f2354ba 100644
--- a/src/video/kmsdrm/SDL_kmsdrmevents.h
+++ b/src/video/kmsdrm/SDL_kmsdrmevents.h
@@ -21,11 +21,11 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_kmsdrmevents_h
-#define _SDL_kmsdrmevents_h
+#ifndef SDL_kmsdrmevents_h_
+#define SDL_kmsdrmevents_h_
 
 extern void KMSDRM_PumpEvents(_THIS);
 extern void KMSDRM_EventInit(_THIS);
 extern void KMSDRM_EventQuit(_THIS);
 
-#endif /* _SDL_kmsdrmevents_h */
+#endif /* SDL_kmsdrmevents_h_ */
diff --git a/src/video/kmsdrm/SDL_kmsdrmmouse.h b/src/video/kmsdrm/SDL_kmsdrmmouse.h
index b822a85..05c7288 100644
--- a/src/video/kmsdrm/SDL_kmsdrmmouse.h
+++ b/src/video/kmsdrm/SDL_kmsdrmmouse.h
@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_KMSDRM_mouse_h
-#define _SDL_KMSDRM_mouse_h
+#ifndef SDL_KMSDRM_mouse_h_
+#define SDL_KMSDRM_mouse_h_
 
 #include <gbm.h>
 
@@ -37,6 +37,6 @@ typedef struct _KMSDRM_CursorData
 extern void KMSDRM_InitMouse(_THIS);
 extern void KMSDRM_QuitMouse(_THIS);
 
-#endif /* _SDL_KMSDRM_mouse_h */
+#endif /* SDL_KMSDRM_mouse_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/kmsdrm/SDL_kmsdrmopengles.h b/src/video/kmsdrm/SDL_kmsdrmopengles.h
index f3a61fa..7bbb11d 100644
--- a/src/video/kmsdrm/SDL_kmsdrmopengles.h
+++ b/src/video/kmsdrm/SDL_kmsdrmopengles.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_kmsdrmopengles_h
-#define _SDL_kmsdrmopengles_h
+#ifndef SDL_kmsdrmopengles_h_
+#define SDL_kmsdrmopengles_h_
 
 #if SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL
 
@@ -43,6 +43,6 @@ extern int KMSDRM_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext con
 
 #endif /* SDL_VIDEO_DRIVER_KMSDRM && SDL_VIDEO_OPENGL_EGL */
 
-#endif /* _SDL_kmsdrmopengles_h */
+#endif /* SDL_kmsdrmopengles_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirdyn.h b/src/video/mir/SDL_mirdyn.h
index 318255a..6a6e54c 100644
--- a/src/video/mir/SDL_mirdyn.h
+++ b/src/video/mir/SDL_mirdyn.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_mirdyn_h
-#define _SDL_mirdyn_h
+#ifndef SDL_mirdyn_h_
+#define SDL_mirdyn_h_
 
 #include "../../SDL_internal.h"
 
@@ -48,6 +48,6 @@ void SDL_MIR_UnloadSymbols(void);
 }
 #endif
 
-#endif /* !defined _SDL_mirdyn_h */
+#endif /* !defined SDL_mirdyn_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirevents.h b/src/video/mir/SDL_mirevents.h
index 88ac5b3..b87bff8 100644
--- a/src/video/mir/SDL_mirevents.h
+++ b/src/video/mir/SDL_mirevents.h
@@ -23,15 +23,15 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#ifndef _SDL_mirevents_h
-#define _SDL_mirevents_h
+#ifndef SDL_mirevents_h_
+#define SDL_mirevents_h_
 
 #include <mir_toolkit/mir_client_library.h>
 
 extern void
 MIR_HandleEvent(MirWindow*, MirEvent const* ev, void* context);
 
-#endif /* _SDL_mirevents_h */
+#endif /* SDL_mirevents_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
 
diff --git a/src/video/mir/SDL_mirframebuffer.h b/src/video/mir/SDL_mirframebuffer.h
index 82ff384..b632ee7 100644
--- a/src/video/mir/SDL_mirframebuffer.h
+++ b/src/video/mir/SDL_mirframebuffer.h
@@ -23,8 +23,8 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#ifndef _SDL_mirframebuffer_h
-#define _SDL_mirframebuffer_h
+#ifndef SDL_mirframebuffer_h_
+#define SDL_mirframebuffer_h_
 
 #include "../SDL_sysvideo.h"
 
@@ -41,7 +41,7 @@ MIR_UpdateWindowFramebuffer(_THIS, SDL_Window* sdl_window,
 extern void
 MIR_DestroyWindowFramebuffer(_THIS, SDL_Window* sdl_window);
 
-#endif /* _SDL_mirframebuffer_h */
+#endif /* SDL_mirframebuffer_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
 
diff --git a/src/video/mir/SDL_mirmouse.h b/src/video/mir/SDL_mirmouse.h
index 427310d..63cc8c7 100644
--- a/src/video/mir/SDL_mirmouse.h
+++ b/src/video/mir/SDL_mirmouse.h
@@ -23,8 +23,8 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#ifndef _SDL_mirmouse_h
-#define _SDL_mirmouse_h
+#ifndef SDL_mirmouse_h_
+#define SDL_mirmouse_h_
 
 extern void
 MIR_InitMouse();
@@ -32,6 +32,6 @@ MIR_InitMouse();
 extern void
 MIR_FiniMouse();
 
-#endif /* _SDL_mirmouse_h */
+#endif /* SDL_mirmouse_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_miropengl.h b/src/video/mir/SDL_miropengl.h
index 169d43d..538b9a9 100644
--- a/src/video/mir/SDL_miropengl.h
+++ b/src/video/mir/SDL_miropengl.h
@@ -23,8 +23,8 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#ifndef _SDL_miropengl_h
-#define _SDL_miropengl_h
+#ifndef SDL_miropengl_h_
+#define SDL_miropengl_h_
 
 #include "SDL_mirwindow.h"
 
@@ -48,6 +48,6 @@ MIR_GL_CreateContext(_THIS, SDL_Window* window);
 extern int
 MIR_GL_LoadLibrary(_THIS, const char* path);
 
-#endif /* _SDL_miropengl_h */
+#endif /* SDL_miropengl_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirvideo.h b/src/video/mir/SDL_mirvideo.h
index a065725..c29890b 100644
--- a/src/video/mir/SDL_mirvideo.h
+++ b/src/video/mir/SDL_mirvideo.h
@@ -23,8 +23,8 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#ifndef _SDL_mirvideo_h_
-#define _SDL_mirvideo_h_
+#ifndef SDL_mirvideo_h__
+#define SDL_mirvideo_h__
 
 #include <EGL/egl.h>
 #include <mir_toolkit/mir_client_library.h>
@@ -44,6 +44,6 @@ typedef struct
 extern Uint32
 MIR_GetSDLPixelFormat(MirPixelFormat format);
 
-#endif /* _SDL_mirvideo_h_ */
+#endif /* SDL_mirvideo_h__ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirvulkan.h b/src/video/mir/SDL_mirvulkan.h
index c0e36cf..4b3981c 100644
--- a/src/video/mir/SDL_mirvulkan.h
+++ b/src/video/mir/SDL_mirvulkan.h
@@ -26,8 +26,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_mirvulkan_h
-#define _SDL_mirvulkan_h
+#ifndef SDL_mirvulkan_h_
+#define SDL_mirvulkan_h_
 
 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
@@ -47,6 +47,6 @@ SDL_bool MIR_Vulkan_CreateSurface(_THIS,
 
 #endif
 
-#endif /* _SDL_mirvulkan_h */
+#endif /* SDL_mirvulkan_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/mir/SDL_mirwindow.h b/src/video/mir/SDL_mirwindow.h
index 90f13ca..a5f1ed8 100644
--- a/src/video/mir/SDL_mirwindow.h
+++ b/src/video/mir/SDL_mirwindow.h
@@ -23,8 +23,8 @@
   Contributed by Brandon Schaefer, <brandon.schaefer@canonical.com>
 */
 
-#ifndef _SDL_mirwindow_h
-#define _SDL_mirwindow_h
+#ifndef SDL_mirwindow_h_
+#define SDL_mirwindow_h_
 
 #include "../SDL_sysvideo.h"
 #include "SDL_syswm.h"
@@ -87,7 +87,7 @@ MIR_SetWindowGammaRamp(_THIS, SDL_Window* window, Uint16 const* ramp);
 extern int
 MIR_GetWindowGammaRamp(_THIS, SDL_Window* window, Uint16* ramp);
 
-#endif /* _SDL_mirwindow_h */
+#endif /* SDL_mirwindow_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
 
diff --git a/src/video/nacl/SDL_naclevents_c.h b/src/video/nacl/SDL_naclevents_c.h
index 5928bcd..6129b45 100644
--- a/src/video/nacl/SDL_naclevents_c.h
+++ b/src/video/nacl/SDL_naclevents_c.h
@@ -20,11 +20,11 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_naclevents_c_h
-#define _SDL_naclevents_c_h
+#ifndef SDL_naclevents_c_h_
+#define SDL_naclevents_c_h_
 
 #include "SDL_naclvideo.h"
 
 extern void NACL_PumpEvents(_THIS);
 
-#endif /* _SDL_naclevents_c_h */
+#endif /* SDL_naclevents_c_h_ */
diff --git a/src/video/nacl/SDL_naclopengles.h b/src/video/nacl/SDL_naclopengles.h
index 8ca1564..befdd4d 100644
--- a/src/video/nacl/SDL_naclopengles.h
+++ b/src/video/nacl/SDL_naclopengles.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_naclopengles_h
-#define _SDL_naclopengles_h
+#ifndef SDL_naclopengles_h_
+#define SDL_naclopengles_h_
 
 extern int NACL_GLES_LoadLibrary(_THIS, const char *path);
 extern void *NACL_GLES_GetProcAddress(_THIS, const char *proc);
@@ -33,6 +33,6 @@ extern int NACL_GLES_GetSwapInterval(_THIS);
 extern int NACL_GLES_SwapWindow(_THIS, SDL_Window * window);
 extern void NACL_GLES_DeleteContext(_THIS, SDL_GLContext context);
 
-#endif /* _SDL_naclopengles_h */
+#endif /* SDL_naclopengles_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/nacl/SDL_naclvideo.h b/src/video/nacl/SDL_naclvideo.h
index 6801202..6ee18b9 100644
--- a/src/video/nacl/SDL_naclvideo.h
+++ b/src/video/nacl/SDL_naclvideo.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_naclvideo_h
-#define _SDL_naclvideo_h
+#ifndef SDL_naclvideo_h_
+#define SDL_naclvideo_h_
 
 #include "../SDL_sysvideo.h"
 #include "ppapi_simple/ps_interface.h"
@@ -64,4 +64,4 @@ typedef struct SDL_VideoData {
 extern void NACL_SetScreenResolution(int width, int height, Uint32 format);
 
 
-#endif /* _SDL_naclvideo_h */
+#endif /* SDL_naclvideo_h_ */
diff --git a/src/video/nacl/SDL_naclwindow.h b/src/video/nacl/SDL_naclwindow.h
index 1c21352..487fbdb 100644
--- a/src/video/nacl/SDL_naclwindow.h
+++ b/src/video/nacl/SDL_naclwindow.h
@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_naclwindow_h
-#define _SDL_naclwindow_h
+#ifndef SDL_naclwindow_h_
+#define SDL_naclwindow_h_
 
 extern int NACL_CreateWindow(_THIS, SDL_Window * window);
 extern void NACL_SetWindowTitle(_THIS, SDL_Window * window);
 extern void NACL_DestroyWindow(_THIS, SDL_Window * window);
 
-#endif /* _SDL_naclwindow_h */
+#endif /* SDL_naclwindow_h_ */
 
 /* 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 068db50..ea1deab 100644
--- a/src/video/psp/SDL_pspgl_c.h
+++ b/src/video/psp/SDL_pspgl_c.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_pspgl_c_h
-#define _SDL_pspgl_c_h
+#ifndef SDL_pspgl_c_h_
+#define SDL_pspgl_c_h_
 
 
 #include <GLES/egl.h>
@@ -49,4 +49,6 @@ extern int PSP_GL_SetSwapInterval(_THIS, int interval);
 extern int PSP_GL_GetSwapInterval(_THIS);
 
 
-#endif /* _SDL_pspgl_c_h */
+#endif /* SDL_pspgl_c_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/psp/SDL_pspvideo.h b/src/video/psp/SDL_pspvideo.h
index 5b5bd82..58391cc 100644
--- a/src/video/psp/SDL_pspvideo.h
+++ b/src/video/psp/SDL_pspvideo.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_pspvideo_h
-#define _SDL_pspvideo_h
+#ifndef SDL_pspvideo_h_
+#define SDL_pspvideo_h_
 
 #include <GLES/egl.h>
 
@@ -97,6 +97,6 @@ void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window);
 void PSP_HideScreenKeyboard(_THIS, SDL_Window *window);
 SDL_bool PSP_IsScreenKeyboardShown(_THIS, SDL_Window *window);
 
-#endif /* _SDL_pspvideo_h */
+#endif /* SDL_pspvideo_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpievents_c.h b/src/video/raspberry/SDL_rpievents_c.h
index fe11327..bcb8433 100644
--- a/src/video/raspberry/SDL_rpievents_c.h
+++ b/src/video/raspberry/SDL_rpievents_c.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_rpievents_c_h
-#define _SDL_rpievents_c_h
+#ifndef SDL_rpievents_c_h_
+#define SDL_rpievents_c_h_
 
 #include "SDL_rpivideo.h"
 
@@ -28,4 +28,4 @@ void RPI_PumpEvents(_THIS);
 void RPI_EventInit(_THIS);
 void RPI_EventQuit(_THIS);
 
-#endif /* _SDL_rpievents_c_h */
+#endif /* SDL_rpievents_c_h_ */
diff --git a/src/video/raspberry/SDL_rpimouse.h b/src/video/raspberry/SDL_rpimouse.h
index 412ca5b..f0ba4a4 100644
--- a/src/video/raspberry/SDL_rpimouse.h
+++ b/src/video/raspberry/SDL_rpimouse.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_RPI_mouse_h
-#define _SDL_RPI_mouse_h
+#ifndef SDL_RPI_mouse_h_
+#define SDL_RPI_mouse_h_
 
 #include "../SDL_sysvideo.h"
 
@@ -38,6 +38,6 @@ struct _RPI_CursorData
 extern void RPI_InitMouse(_THIS);
 extern void RPI_QuitMouse(_THIS);
 
-#endif /* _SDL_RPI_mouse_h */
+#endif /* SDL_RPI_mouse_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/raspberry/SDL_rpiopengles.h b/src/video/raspberry/SDL_rpiopengles.h
index d106476..4a8b8d6 100644
--- a/src/video/raspberry/SDL_rpiopengles.h
+++ b/src/video/raspberry/SDL_rpiopengles.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_rpiopengles_h
-#define _SDL_rpiopengles_h
+#ifndef SDL_rpiopengles_h_
+#define SDL_rpiopengles_h_
 
 #if SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL
 
@@ -43,6 +43,6 @@ extern int RPI_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext contex
 
 #endif /* SDL_VIDEO_DRIVER_RPI && SDL_VIDEO_OPENGL_EGL */
 
-#endif /* _SDL_rpiopengles_h */
+#endif /* SDL_rpiopengles_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitclipboard.h b/src/video/uikit/SDL_uikitclipboard.h
index 8ade270..b888238 100644
--- a/src/video/uikit/SDL_uikitclipboard.h
+++ b/src/video/uikit/SDL_uikitclipboard.h
@@ -18,8 +18,8 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef _SDL_uikitclipboard_h
-#define _SDL_uikitclipboard_h
+#ifndef SDL_uikitclipboard_h_
+#define SDL_uikitclipboard_h_
 
 #include "../SDL_sysvideo.h"
 
@@ -30,6 +30,6 @@ extern SDL_bool UIKit_HasClipboardText(_THIS);
 extern void UIKit_InitClipboard(_THIS);
 extern void UIKit_QuitClipboard(_THIS);
 
-#endif /* _SDL_uikitclipboard_h */
+#endif /* SDL_uikitclipboard_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitevents.h b/src/video/uikit/SDL_uikitevents.h
index 958b9f7..e5b15ad 100644
--- a/src/video/uikit/SDL_uikitevents.h
+++ b/src/video/uikit/SDL_uikitevents.h
@@ -18,13 +18,13 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef _SDL_uikitevents_h
-#define _SDL_uikitevents_h
+#ifndef SDL_uikitevents_h_
+#define SDL_uikitevents_h_
 
 #include "../SDL_sysvideo.h"
 
 extern void UIKit_PumpEvents(_THIS);
 
-#endif /* _SDL_uikitevents_h */
+#endif /* SDL_uikitevents_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitmetalview.h b/src/video/uikit/SDL_uikitmetalview.h
index 0099f58..a26c356 100644
--- a/src/video/uikit/SDL_uikitmetalview.h
+++ b/src/video/uikit/SDL_uikitmetalview.h
@@ -26,8 +26,8 @@
  * how to add a CAMetalLayer backed view.
  */
 
-#ifndef _SDL_uikitmetalview_h
-#define _SDL_uikitmetalview_h
+#ifndef SDL_uikitmetalview_h_
+#define SDL_uikitmetalview_h_
 
 #import "../SDL_sysvideo.h"
 #import "SDL_uikitwindow.h"
@@ -50,4 +50,6 @@ SDL_uikitmetalview* UIKit_Mtl_AddMetalView(SDL_Window* window);
 
 void UIKit_Mtl_GetDrawableSize(SDL_Window * window, int * w, int * h);
 
-#endif /* _SDL_uikitmetalview_h */
+#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 79dcfc8..4620eea 100644
--- a/src/video/uikit/SDL_uikitmodes.h
+++ b/src/video/uikit/SDL_uikitmodes.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_uikitmodes_h
-#define _SDL_uikitmodes_h
+#ifndef SDL_uikitmodes_h_
+#define SDL_uikitmodes_h_
 
 #include "SDL_uikitvideo.h"
 
@@ -45,6 +45,6 @@ extern int UIKit_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMo
 extern void UIKit_QuitModes(_THIS);
 extern int UIKit_GetDisplayUsableBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect);
 
-#endif /* _SDL_uikitmodes_h */
+#endif /* SDL_uikitmodes_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitopengles.h b/src/video/uikit/SDL_uikitopengles.h
index a24f267..0244964 100644
--- a/src/video/uikit/SDL_uikitopengles.h
+++ b/src/video/uikit/SDL_uikitopengles.h
@@ -18,8 +18,8 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef _SDL_uikitopengles
-#define _SDL_uikitopengles
+#ifndef SDL_uikitopengles_
+#define SDL_uikitopengles_
 
 #include "../SDL_sysvideo.h"
 
@@ -35,6 +35,6 @@ extern int UIKit_GL_LoadLibrary(_THIS, const char *path);
 
 extern void UIKit_GL_RestoreCurrentContext(void);
 
-#endif
+#endif /* SDL_uikitopengles_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitvideo.h b/src/video/uikit/SDL_uikitvideo.h
index daa1b7d..736888c 100644
--- a/src/video/uikit/SDL_uikitvideo.h
+++ b/src/video/uikit/SDL_uikitvideo.h
@@ -18,8 +18,8 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef _SDL_uikitvideo_h
-#define _SDL_uikitvideo_h
+#ifndef SDL_uikitvideo_h_
+#define SDL_uikitvideo_h_
 
 #include "../SDL_sysvideo.h"
 
@@ -41,6 +41,6 @@ void UIKit_SuspendScreenSaver(_THIS);
 
 SDL_bool UIKit_IsSystemVersionAtLeast(double version);
 
-#endif /* _SDL_uikitvideo_h */
+#endif /* SDL_uikitvideo_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitvulkan.h b/src/video/uikit/SDL_uikitvulkan.h
index f06c111..e5376b7 100644
--- a/src/video/uikit/SDL_uikitvulkan.h
+++ b/src/video/uikit/SDL_uikitvulkan.h
@@ -26,8 +26,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_uikitvulkan_h
-#define _SDL_uikitvulkan_h
+#ifndef SDL_uikitvulkan_h_
+#define SDL_uikitvulkan_h_
 
 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
@@ -49,6 +49,6 @@ void UIKit_Vulkan_GetDrawableSize(_THIS, SDL_Window *window, int *w, int *h);
 
 #endif
 
-#endif /* _SDL_uikitvulkan_h */
+#endif /* SDL_uikitvulkan_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/uikit/SDL_uikitwindow.h b/src/video/uikit/SDL_uikitwindow.h
index edad5db..ba1d3a1 100644
--- a/src/video/uikit/SDL_uikitwindow.h
+++ b/src/video/uikit/SDL_uikitwindow.h
@@ -18,8 +18,8 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#ifndef _SDL_uikitwindow_h
-#define _SDL_uikitwindow_h
+#ifndef SDL_uikitwindow_h_
+#define SDL_uikitwindow_h_
 
 #include "../SDL_sysvideo.h"
 #import "SDL_uikitvideo.h"
@@ -51,6 +51,6 @@ extern NSUInteger UIKit_GetSupportedOrientations(SDL_Window * window);
 
 @end
 
-#endif /* _SDL_uikitwindow_h */
+#endif /* SDL_uikitwindow_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivanteopengles.h b/src/video/vivante/SDL_vivanteopengles.h
index a25d582..49163b5 100644
--- a/src/video/vivante/SDL_vivanteopengles.h
+++ b/src/video/vivante/SDL_vivanteopengles.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_vivanteopengles_h
-#define _SDL_vivanteopengles_h
+#ifndef SDL_vivanteopengles_h_
+#define SDL_vivanteopengles_h_
 
 #if SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL
 
@@ -43,6 +43,6 @@ extern int VIVANTE_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext co
 
 #endif /* SDL_VIDEO_DRIVER_VIVANTE && SDL_VIDEO_OPENGL_EGL */
 
-#endif /* _SDL_vivanteopengles_h */
+#endif /* SDL_vivanteopengles_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivanteplatform.h b/src/video/vivante/SDL_vivanteplatform.h
index b16e70d..23cb406 100644
--- a/src/video/vivante/SDL_vivanteplatform.h
+++ b/src/video/vivante/SDL_vivanteplatform.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_vivanteplatform_h
-#define _SDL_vivanteplatform_h
+#ifndef SDL_vivanteplatform_h_
+#define SDL_vivanteplatform_h_
 
 #if SDL_VIDEO_DRIVER_VIVANTE
 
@@ -40,6 +40,6 @@ extern void VIVANTE_CleanupPlatform(_THIS);
 
 #endif /* SDL_VIDEO_DRIVER_VIVANTE */
 
-#endif /* _SDL_vivanteplatform_h */
+#endif /* SDL_vivanteplatform_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/vivante/SDL_vivantevideo.h b/src/video/vivante/SDL_vivantevideo.h
index 405261c..53c84da 100644
--- a/src/video/vivante/SDL_vivantevideo.h
+++ b/src/video/vivante/SDL_vivantevideo.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_vivantevideo_h
-#define _SDL_vivantevideo_h
+#ifndef SDL_vivantevideo_h_
+#define SDL_vivantevideo_h_
 
 #include "../../SDL_internal.h"
 #include "../SDL_sysvideo.h"
@@ -86,6 +86,6 @@ SDL_bool VIVANTE_GetWindowWMInfo(_THIS, SDL_Window * window,
 /* Event functions */
 void VIVANTE_PumpEvents(_THIS);
 
-#endif /* _SDL_vivantevideo_h */
+#endif /* SDL_vivantevideo_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandclipboard.h b/src/video/wayland/SDL_waylandclipboard.h
index f2e2d87..8bd7b5c 100644
--- a/src/video/wayland/SDL_waylandclipboard.h
+++ b/src/video/wayland/SDL_waylandclipboard.h
@@ -20,13 +20,13 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandclipboard_h
-#define _SDL_waylandclipboard_h
+#ifndef SDL_waylandclipboard_h_
+#define SDL_waylandclipboard_h_
 
 extern int Wayland_SetClipboardText(_THIS, const char *text);
 extern char *Wayland_GetClipboardText(_THIS);
 extern SDL_bool Wayland_HasClipboardText(_THIS);
 
-#endif /* _SDL_waylandclipboard_h */
+#endif /* SDL_waylandclipboard_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylanddatamanager.h b/src/video/wayland/SDL_waylanddatamanager.h
index 74b2675..a40ecaf 100644
--- a/src/video/wayland/SDL_waylanddatamanager.h
+++ b/src/video/wayland/SDL_waylanddatamanager.h
@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylanddatamanager_h
-#define _SDL_waylanddatamanager_h
+#ifndef SDL_waylanddatamanager_h_
+#define SDL_waylanddatamanager_h_
 
 #include "SDL_waylandvideo.h"
 #include "SDL_waylandwindow.h"
@@ -97,9 +97,7 @@ extern int Wayland_data_device_set_selection(SDL_WaylandDataDevice *device,
                                              SDL_WaylandDataSource *source);
 extern int Wayland_data_device_set_serial(SDL_WaylandDataDevice *device,
                                           uint32_t serial);
-#endif /* _SDL_waylanddatamanager_h */
+#endif /* SDL_waylanddatamanager_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
 
-
-
diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
index f6965cb..fa45f92 100644
--- a/src/video/wayland/SDL_waylanddyn.h
+++ b/src/video/wayland/SDL_waylanddyn.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_waylanddyn_h
-#define _SDL_waylanddyn_h
+#ifndef SDL_waylanddyn_h_
+#define SDL_waylanddyn_h_
 
 #include "../../SDL_internal.h"
 
@@ -102,6 +102,6 @@ void SDL_WAYLAND_UnloadSymbols(void);
 #include "wayland-client-protocol.h"
 #include "wayland-egl.h"
 
-#endif /* !defined _SDL_waylanddyn_h */
+#endif /* SDL_waylanddyn_h_ */
 
 /* 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 fe83132..ec61620 100644
--- a/src/video/wayland/SDL_waylandevents_c.h
+++ b/src/video/wayland/SDL_waylandevents_c.h
@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandevents_h
-#define _SDL_waylandevents_h
+#ifndef SDL_waylandevents_h_
+#define SDL_waylandevents_h_
 
 #include "SDL_waylandvideo.h"
 #include "SDL_waylandwindow.h"
@@ -46,6 +46,6 @@ extern int Wayland_input_unlock_pointer(struct SDL_WaylandInput *input);
 extern void Wayland_display_add_relative_pointer_manager(SDL_VideoData *d, uint32_t id);
 extern void Wayland_display_destroy_relative_pointer_manager(SDL_VideoData *d);
 
-#endif /* _SDL_waylandevents_h */
+#endif /* SDL_waylandevents_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandopengles.h b/src/video/wayland/SDL_waylandopengles.h
index 1130783..4d683c0 100644
--- a/src/video/wayland/SDL_waylandopengles.h
+++ b/src/video/wayland/SDL_waylandopengles.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandopengles_h
-#define _SDL_waylandopengles_h
+#ifndef SDL_waylandopengles_h_
+#define SDL_waylandopengles_h_
 
 #include "../SDL_sysvideo.h"
 #include "../SDL_egl_c.h"
@@ -43,4 +43,6 @@ extern int Wayland_GLES_SwapWindow(_THIS, SDL_Window * window);
 extern int Wayland_GLES_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context);
 extern void Wayland_GLES_DeleteContext(_THIS, SDL_GLContext context);
 
-#endif /* _SDL_waylandopengles_h */
+#endif /* SDL_waylandopengles_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandtouch.h b/src/video/wayland/SDL_waylandtouch.h
index f94bb7c..41d5f8a 100644
--- a/src/video/wayland/SDL_waylandtouch.h
+++ b/src/video/wayland/SDL_waylandtouch.h
@@ -23,8 +23,8 @@
 
 #ifdef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
 
-#ifndef _SDL_waylandtouch_h
-#define _SDL_waylandtouch_h
+#ifndef SDL_waylandtouch_h_
+#define SDL_waylandtouch_h_
 
 #include "SDL_waylandvideo.h"
 #include <stdint.h>
@@ -347,6 +347,6 @@ qt_windowmanager_open_url(struct qt_windowmanager *qt_windowmanager, uint32_t re
              QT_WINDOWMANAGER_OPEN_URL, remaining, url);
 }
 
-#endif /* _SDL_waylandtouch_h */
+#endif /* SDL_waylandtouch_h_ */
 
 #endif /* SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
diff --git a/src/video/wayland/SDL_waylandvideo.h b/src/video/wayland/SDL_waylandvideo.h
index 89cc700..60d60f0 100644
--- a/src/video/wayland/SDL_waylandvideo.h
+++ b/src/video/wayland/SDL_waylandvideo.h
@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandvideo_h
-#define _SDL_waylandvideo_h
+#ifndef SDL_waylandvideo_h_
+#define SDL_waylandvideo_h_
 
 #include <EGL/egl.h>
 #include "wayland-util.h"
@@ -66,6 +66,6 @@ typedef struct {
     int relative_mouse_mode;
 } SDL_VideoData;
 
-#endif /* _SDL_waylandvideo_h */
+#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 5ad4f4d..8002085 100644
--- a/src/video/wayland/SDL_waylandvulkan.h
+++ b/src/video/wayland/SDL_waylandvulkan.h
@@ -26,8 +26,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandvulkan_h
-#define _SDL_waylandvulkan_h
+#ifndef SDL_waylandvulkan_h_
+#define SDL_waylandvulkan_h_
 
 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
@@ -47,6 +47,6 @@ SDL_bool Wayland_Vulkan_CreateSurface(_THIS,
 
 #endif
 
-#endif /* _SDL_waylandvulkan_h */
+#endif /* SDL_waylandvulkan_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/wayland/SDL_waylandwindow.h b/src/video/wayland/SDL_waylandwindow.h
index fde5e54..8898847 100644
--- a/src/video/wayland/SDL_waylandwindow.h
+++ b/src/video/wayland/SDL_waylandwindow.h
@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_waylandwindow_h
-#define _SDL_waylandwindow_h
+#ifndef SDL_waylandwindow_h_
+#define SDL_waylandwindow_h_
 
 #include "../SDL_sysvideo.h"
 #include "SDL_syswm.h"
@@ -61,6 +61,6 @@ extern SDL_bool
 Wayland_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info);
 extern int Wayland_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
 
-#endif /* _SDL_waylandwindow_h */
+#endif /* SDL_waylandwindow_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_msctf.h b/src/video/windows/SDL_msctf.h
index 03ced31..b98e75e 100644
--- a/src/video/windows/SDL_msctf.h
+++ b/src/video/windows/SDL_msctf.h
@@ -19,8 +19,8 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef _SDL_msctf_h
-#define _SDL_msctf_h
+#ifndef SDL_msctf_h_
+#define SDL_msctf_h_
 
 #include <unknwn.h>
 
@@ -239,4 +239,4 @@ struct ITfSource
     const struct ITfSourceVtbl *lpVtbl;
 };
 
-#endif /* _SDL_msctf_h */
+#endif /* SDL_msctf_h_ */
diff --git a/src/video/windows/SDL_windowsclipboard.h b/src/video/windows/SDL_windowsclipboard.h
index 94317ec..000e39b 100644
--- a/src/video/windows/SDL_windowsclipboard.h
+++ b/src/video/windows/SDL_windowsclipboard.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowsclipboard_h
-#define _SDL_windowsclipboard_h
+#ifndef SDL_windowsclipboard_h_
+#define SDL_windowsclipboard_h_
 
 /* Forward declaration */
 struct SDL_VideoData;
@@ -31,6 +31,6 @@ extern char *WIN_GetClipboardText(_THIS);
 extern SDL_bool WIN_HasClipboardText(_THIS);
 extern void WIN_CheckClipboardUpdate(struct SDL_VideoData * data);
 
-#endif /* _SDL_windowsclipboard_h */
+#endif /* SDL_windowsclipboard_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsevents.h b/src/video/windows/SDL_windowsevents.h
index 460e3e3..1f8c0cf 100644
--- a/src/video/windows/SDL_windowsevents.h
+++ b/src/video/windows/SDL_windowsevents.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowsevents_h
-#define _SDL_windowsevents_h
+#ifndef SDL_windowsevents_h_
+#define SDL_windowsevents_h_
 
 extern LPTSTR SDL_Appname;
 extern Uint32 SDL_Appstyle;
@@ -31,6 +31,6 @@ extern LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam,
                                        LPARAM lParam);
 extern void WIN_PumpEvents(_THIS);
 
-#endif /* _SDL_windowsevents_h */
+#endif /* SDL_windowsevents_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowskeyboard.h b/src/video/windows/SDL_windowskeyboard.h
index 76a8ddf..cc1955d 100644
--- a/src/video/windows/SDL_windowskeyboard.h
+++ b/src/video/windows/SDL_windowskeyboard.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowskeyboard_h
-#define _SDL_windowskeyboard_h
+#ifndef SDL_windowskeyboard_h_
+#define SDL_windowskeyboard_h_
 
 extern void WIN_InitKeyboard(_THIS);
 extern void WIN_UpdateKeymap(void);
@@ -35,6 +35,6 @@ extern void WIN_SetTextInputRect(_THIS, SDL_Rect *rect);
 
 extern SDL_bool IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, struct SDL_VideoData *videodata);
 
-#endif /* _SDL_windowskeyboard_h */
+#endif /* SDL_windowskeyboard_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsmodes.h b/src/video/windows/SDL_windowsmodes.h
index 94894d8..b953504 100644
--- a/src/video/windows/SDL_windowsmodes.h
+++ b/src/video/windows/SDL_windowsmodes.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowsmodes_h
-#define _SDL_windowsmodes_h
+#ifndef SDL_windowsmodes_h_
+#define SDL_windowsmodes_h_
 
 typedef struct
 {
@@ -42,6 +42,6 @@ extern void WIN_GetDisplayModes(_THIS, SDL_VideoDisplay * display);
 extern int WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
 extern void WIN_QuitModes(_THIS);
 
-#endif /* _SDL_windowsmodes_h */
+#endif /* SDL_windowsmodes_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsmouse.h b/src/video/windows/SDL_windowsmouse.h
index ad00b36..70ea2fc 100644
--- a/src/video/windows/SDL_windowsmouse.h
+++ b/src/video/windows/SDL_windowsmouse.h
@@ -20,14 +20,14 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowsmouse_h
-#define _SDL_windowsmouse_h
+#ifndef SDL_windowsmouse_h_
+#define SDL_windowsmouse_h_
 
 extern HCURSOR SDL_cursor;
 
 extern void WIN_InitMouse(_THIS);
 extern void WIN_QuitMouse(_THIS);
 
-#endif /* _SDL_windowsmouse_h */
+#endif /* SDL_windowsmouse_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsopengl.h b/src/video/windows/SDL_windowsopengl.h
index 1d9fa23..4dc4d8f 100644
--- a/src/video/windows/SDL_windowsopengl.h
+++ b/src/video/windows/SDL_windowsopengl.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowsopengl_h
-#define _SDL_windowsopengl_h
+#ifndef SDL_windowsopengl_h_
+#define SDL_windowsopengl_h_
 
 #if SDL_VIDEO_OPENGL_WGL
 
@@ -137,6 +137,6 @@ extern SDL_bool WIN_GL_SetPixelFormatFrom(_THIS, SDL_Window * fromWindow, SDL_Wi
 
 #endif /* SDL_VIDEO_OPENGL_WGL */
 
-#endif /* _SDL_windowsopengl_h */
+#endif /* SDL_windowsopengl_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsopengles.h b/src/video/windows/SDL_windowsopengles.h
index e8398d2..9b55a9b 100644
--- a/src/video/windows/SDL_windowsopengles.h
+++ b/src/video/windows/SDL_windowsopengles.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_winopengles_h
-#define _SDL_winopengles_h
+#ifndef SDL_winopengles_h_
+#define SDL_winopengles_h_
 
 #if SDL_VIDEO_OPENGL_EGL
 
@@ -44,6 +44,6 @@ extern int WIN_GLES_SetupWindow(_THIS, SDL_Window * window);
 
 #endif /* SDL_VIDEO_OPENGL_EGL */
 
-#endif /* _SDL_winopengles_h */
+#endif /* SDL_winopengles_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsshape.h b/src/video/windows/SDL_windowsshape.h
index b811ab0..09d356f 100644
--- a/src/video/windows/SDL_windowsshape.h
+++ b/src/video/windows/SDL_windowsshape.h
@@ -21,8 +21,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowsshape_h
-#define _SDL_windowsshape_h
+#ifndef SDL_windowsshape_h_
+#define SDL_windowsshape_h_
 
 #include "SDL_video.h"
 #include "SDL_shape.h"
@@ -37,4 +37,4 @@ extern SDL_WindowShaper* Win32_CreateShaper(SDL_Window * window);
 extern int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
 extern int Win32_ResizeWindowShape(SDL_Window *window);
 
-#endif /* _SDL_windowsshape_h */
+#endif /* SDL_windowsshape_h_ */
diff --git a/src/video/windows/SDL_windowsvideo.h b/src/video/windows/SDL_windowsvideo.h
index d3061c6..ed94abd 100644
--- a/src/video/windows/SDL_windowsvideo.h
+++ b/src/video/windows/SDL_windowsvideo.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowsvideo_h
-#define _SDL_windowsvideo_h
+#ifndef SDL_windowsvideo_h_
+#define SDL_windowsvideo_h_
 
 #include "../../core/windows/SDL_windows.h"
 
@@ -194,6 +194,6 @@ extern SDL_bool g_WindowFrameUsableWhileCursorHidden;
 typedef struct IDirect3D9 IDirect3D9;
 extern SDL_bool D3D_LoadDLL( void **pD3DDLL, IDirect3D9 **pDirect3D9Interface );
 
-#endif /* _SDL_windowsvideo_h */
+#endif /* SDL_windowsvideo_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowsvulkan.h b/src/video/windows/SDL_windowsvulkan.h
index 82e6760..adda6bc 100644
--- a/src/video/windows/SDL_windowsvulkan.h
+++ b/src/video/windows/SDL_windowsvulkan.h
@@ -26,8 +26,8 @@
 
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowsvulkan_h
-#define _SDL_windowsvulkan_h
+#ifndef SDL_windowsvulkan_h_
+#define SDL_windowsvulkan_h_
 
 #include "../SDL_vulkan_internal.h"
 #include "../SDL_sysvideo.h"
@@ -47,6 +47,6 @@ SDL_bool WIN_Vulkan_CreateSurface(_THIS,
 
 #endif
 
-#endif /* _SDL_windowsvulkan_h */
+#endif /* SDL_windowsvulkan_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/windows/SDL_windowswindow.h b/src/video/windows/SDL_windowswindow.h
index d923c26..421469b 100644
--- a/src/video/windows/SDL_windowswindow.h
+++ b/src/video/windows/SDL_windowswindow.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_windowswindow_h
-#define _SDL_windowswindow_h
+#ifndef SDL_windowswindow_h_
+#define SDL_windowswindow_h_
 
 #if SDL_VIDEO_OPENGL_EGL   
 #include "../SDL_egl_c.h"
@@ -78,6 +78,6 @@ extern void WIN_OnWindowEnter(_THIS, SDL_Window * window);
 extern void WIN_UpdateClipCursor(SDL_Window *window);
 extern int WIN_SetWindowHitTest(SDL_Window *window, SDL_bool enabled);
 
-#endif /* _SDL_windowswindow_h */
+#endif /* SDL_windowswindow_h_ */
 
 /* 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 0f11ad4..26ffd09 100644
--- a/src/video/winrt/SDL_winrtgamebar_cpp.h
+++ b/src/video/winrt/SDL_winrtgamebar_cpp.h
@@ -20,8 +20,8 @@
 */
 #include "SDL_config.h"
 
-#ifndef _SDL_winrtgamebar_h
-#define _SDL_winrtgamebar_h
+#ifndef SDL_winrtgamebar_h_
+#define SDL_winrtgamebar_h_
 
 #ifdef __cplusplus
 /* These are exported as C++ functions, rather than C, to fix a compilation
@@ -30,6 +30,6 @@ extern void WINRT_InitGameBar(_THIS);
 extern void WINRT_QuitGameBar(_THIS);
 #endif
 
-#endif /* _SDL_winrtgamebar_h */
+#endif /* SDL_winrtgamebar_h_ */
 
 /* 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 8be8341..3c74c67 100644
--- a/src/video/winrt/SDL_winrtmouse_c.h
+++ b/src/video/winrt/SDL_winrtmouse_c.h
@@ -20,8 +20,8 @@
 */
 #include "SDL_config.h"
 
-#ifndef _SDL_winrtmouse_h
-#define _SDL_winrtmouse_h
+#ifndef SDL_winrtmouse_h_
+#define SDL_winrtmouse_h_
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,6 +35,6 @@ extern SDL_bool WINRT_UsingRelativeMouseMode;
 }
 #endif
 
-#endif /* _SDL_winrtmouse_h */
+#endif /* SDL_winrtmouse_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/winrt/SDL_winrtopengles.h b/src/video/winrt/SDL_winrtopengles.h
index b5a5999..f1cdc49 100644
--- a/src/video/winrt/SDL_winrtopengles.h
+++ b/src/video/winrt/SDL_winrtopengles.h
@@ -20,8 +20,8 @@
 */
 #include "SDL_config.h"
 
-#ifndef _SDL_winrtopengles_h
-#define _SDL_winrtopengles_h
+#ifndef SDL_winrtopengles_h_
+#define SDL_winrtopengles_h_
 
 #if SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL
 
@@ -65,6 +65,6 @@ typedef EGLDisplay (EGLAPIENTRY *eglGetPlatformDisplayEXT_Function)(EGLenum, voi
 
 #endif /* SDL_VIDEO_DRIVER_WINRT && SDL_VIDEO_OPENGL_EGL */
 
-#endif /* _SDL_winrtopengles_h */
+#endif /* SDL_winrtopengles_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 881b19d..d94b6a0 100644
--- a/src/video/x11/SDL_x11vulkan.h
+++ b/src/video/x11/SDL_x11vulkan.h
@@ -20,8 +20,8 @@
 */
 #include "../../SDL_internal.h"
 
-#ifndef _SDL_x11vulkan_h
-#define _SDL_x11vulkan_h
+#ifndef SDL_x11vulkan_h_
+#define SDL_x11vulkan_h_
 
 #include "../SDL_vulkan_internal.h"
 
@@ -43,6 +43,6 @@ SDL_bool X11_Vulkan_CreateSurface(_THIS,
 
 #endif
 
-#endif /* _SDL_x11vulkan_h */
+#endif /* SDL_x11vulkan_h_ */
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_action_configparser.h b/visualtest/include/SDL_visualtest_action_configparser.h
index 856f819..3409248 100644
--- a/visualtest/include/SDL_visualtest_action_configparser.h
+++ b/visualtest/include/SDL_visualtest_action_configparser.h
@@ -5,8 +5,8 @@
  * Header file for the parser for action config files.
  */
 
-#ifndef _SDL_visualtest_action_configparser_h
-#define _SDL_visualtest_action_configparser_h
+#ifndef SDL_visualtest_action_configparser_h_
+#define SDL_visualtest_action_configparser_h_
 
 /** The maximum length of one line in the actions file */
 #define MAX_ACTION_LINE_LENGTH 300
@@ -144,4 +144,6 @@ int SDLVisualTest_ParseActionConfig(char* file, SDLVisualTest_ActionQueue* queue
 }
 #endif
 
-#endif /* _SDL_visualtest_action_configparser_h */
\ No newline at end of file
+#endif /* SDL_visualtest_action_configparser_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_exhaustive_variator.h b/visualtest/include/SDL_visualtest_exhaustive_variator.h
index f8f7bc3..6fee88f 100644
--- a/visualtest/include/SDL_visualtest_exhaustive_variator.h
+++ b/visualtest/include/SDL_visualtest_exhaustive_variator.h
@@ -8,8 +8,8 @@
 #include "SDL_visualtest_harness_argparser.h"
 #include "SDL_visualtest_variator_common.h"
 
-#ifndef _SDL_visualtest_exhaustive_variator_h
-#define _SDL_visualtest_exhaustive_variator_h
+#ifndef SDL_visualtest_exhaustive_variator_h_
+#define SDL_visualtest_exhaustive_variator_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -59,4 +59,6 @@ void SDLVisualTest_FreeExhaustiveVariator(SDLVisualTest_ExhaustiveVariator* vari
 }
 #endif
 
-#endif /* _SDL_visualtest_exhaustive_variator_h */
\ No newline at end of file
+#endif /* SDL_visualtest_exhaustive_variator_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_harness_argparser.h b/visualtest/include/SDL_visualtest_harness_argparser.h
index b5fac7e..75420fe 100644
--- a/visualtest/include/SDL_visualtest_harness_argparser.h
+++ b/visualtest/include/SDL_visualtest_harness_argparser.h
@@ -9,8 +9,8 @@
 #include "SDL_visualtest_variator_common.h"
 #include "SDL_visualtest_action_configparser.h"
 
-#ifndef _SDL_visualtest_harness_argparser_h
-#define _SDL_visualtest_harness_argparser_h
+#ifndef SDL_visualtest_harness_argparser_h_
+#define SDL_visualtest_harness_argparser_h_
 
 /** Maximum length of a path string */
 #define MAX_PATH_LEN 300
@@ -70,4 +70,6 @@ void SDLVisualTest_FreeHarnessState(SDLVisualTest_HarnessState* state);
 }
 #endif
 
-#endif /* _SDL_visualtest_harness_argparser_h */
+#endif /* SDL_visualtest_harness_argparser_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_mischelper.h b/visualtest/include/SDL_visualtest_mischelper.h
index 3432389..5faffa5 100644
--- a/visualtest/include/SDL_visualtest_mischelper.h
+++ b/visualtest/include/SDL_visualtest_mischelper.h
@@ -4,8 +4,8 @@
  * Header with miscellaneous helper functions.
  */
 
-#ifndef _SDL_visualtest_mischelper_h
-#define _SDL_visualtest_mischelper_h
+#ifndef SDL_visualtest_mischelper_h_
+#define SDL_visualtest_mischelper_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -23,4 +23,6 @@ void SDLVisualTest_HashString(char* str, char hash[33]);
 }
 #endif
 
-#endif /* _SDL_visualtest_mischelper_h */
\ No newline at end of file
+#endif /* SDL_visualtest_mischelper_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_parsehelper.h b/visualtest/include/SDL_visualtest_parsehelper.h
index f0f654c..0a12c65 100644
--- a/visualtest/include/SDL_visualtest_parsehelper.h
+++ b/visualtest/include/SDL_visualtest_parsehelper.h
@@ -5,8 +5,8 @@
  * Header with some helper functions for parsing strings.
  */
 
-#ifndef _SDL_visualtest_parsehelper_h
-#define _SDL_visualtest_parsehelper_h
+#ifndef SDL_visualtest_parsehelper_h_
+#define SDL_visualtest_parsehelper_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -41,4 +41,6 @@ char** SDLVisualTest_Tokenize(char* str, int max_token_len);
 }
 #endif
 
-#endif /* _SDL_visualtest_parsehelper_h */
+#endif /* SDL_visualtest_parsehelper_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_process.h b/visualtest/include/SDL_visualtest_process.h
index ea65cba..b548690 100644
--- a/visualtest/include/SDL_visualtest_process.h
+++ b/visualtest/include/SDL_visualtest_process.h
@@ -16,8 +16,8 @@
 #error "Unsupported platform."
 #endif
 
-#ifndef _SDL_visualtest_process_h
-#define _SDL_visualtest_process_h
+#ifndef SDL_visualtest_process_h_
+#define SDL_visualtest_process_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -107,5 +107,6 @@ int SDL_GetProcessExitStatus(SDL_ProcessInfo* pinfo, SDL_ProcessExitStatus* ps);
 }
 #endif
 
-#endif /* _SDL_visualtest_process_h */
+#endif /* SDL_visualtest_process_h_ */
 
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_random_variator.h b/visualtest/include/SDL_visualtest_random_variator.h
index 7ec79f2..99a13c2 100644
--- a/visualtest/include/SDL_visualtest_random_variator.h
+++ b/visualtest/include/SDL_visualtest_random_variator.h
@@ -8,8 +8,8 @@
 #include "SDL_visualtest_harness_argparser.h"
 #include "SDL_visualtest_variator_common.h"
 
-#ifndef _SDL_visualtest_random_variator_h
-#define _SDL_visualtest_random_variator_h
+#ifndef SDL_visualtest_random_variator_h_
+#define SDL_visualtest_random_variator_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -56,4 +56,6 @@ void SDLVisualTest_FreeRandomVariator(SDLVisualTest_RandomVariator* variator);
 }
 #endif
 
-#endif /* _SDL_visualtest_random_variator_h */
\ No newline at end of file
+#endif /* SDL_visualtest_random_variator_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_rwhelper.h b/visualtest/include/SDL_visualtest_rwhelper.h
index 470039e..2fbf10e 100644
--- a/visualtest/include/SDL_visualtest_rwhelper.h
+++ b/visualtest/include/SDL_visualtest_rwhelper.h
@@ -7,8 +7,8 @@
 
 #include <SDL_rwops.h>
 
-#ifndef _SDL_visualtest_rwhelper_h
-#define _SDL_visualtest_rwhelper_h
+#ifndef SDL_visualtest_rwhelper_h_
+#define SDL_visualtest_rwhelper_h_
 
 /** Length of the buffer in SDLVisualTest_RWHelperBuffer */
 #define RWOPS_BUFFER_LEN 256
@@ -82,4 +82,6 @@ int SDLVisualTest_RWHelperCountNonEmptyLines(SDL_RWops* rw,
 }
 #endif
 
-#endif /* _SDL_visualtest_rwhelper_h */
\ No newline at end of file
+#endif /* SDL_visualtest_rwhelper_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_screenshot.h b/visualtest/include/SDL_visualtest_screenshot.h
index 96e7d20..1900ea4 100644
--- a/visualtest/include/SDL_visualtest_screenshot.h
+++ b/visualtest/include/SDL_visualtest_screenshot.h
@@ -7,8 +7,8 @@
 
 #include "SDL_visualtest_process.h"
 
-#ifndef _SDL_visualtest_screenshot_h
-#define _SDL_visualtest_screenshot_h
+#ifndef SDL_visualtest_screenshot_h_
+#define SDL_visualtest_screenshot_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -47,4 +47,6 @@ int SDLVisualTest_VerifyScreenshots(char* args, char* test_dir, char* verify_dir
 }
 #endif
 
-#endif /* _SDL_visualtest_screenshot_h */
\ No newline at end of file
+#endif /* SDL_visualtest_screenshot_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_sut_configparser.h b/visualtest/include/SDL_visualtest_sut_configparser.h
index 9296155..42a1088 100644
--- a/visualtest/include/SDL_visualtest_sut_configparser.h
+++ b/visualtest/include/SDL_visualtest_sut_configparser.h
@@ -5,8 +5,8 @@
  * Header for the parser for SUT config files.
  */
 
-#ifndef _SDL_visualtest_sut_configparser_h
-#define _SDL_visualtest_sut_configparser_h
+#ifndef SDL_visualtest_sut_configparser_h_
+#define SDL_visualtest_sut_configparser_h_
 
 /** Maximum length of the name of an SUT option */
 #define MAX_SUTOPTION_NAME_LEN 100
@@ -100,4 +100,6 @@ void SDLVisualTest_FreeSUTConfig(SDLVisualTest_SUTConfig* config);
 }
 #endif
 
-#endif /* _SDL_visualtest_sut_configparser_h */
+#endif /* SDL_visualtest_sut_configparser_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_variator_common.h b/visualtest/include/SDL_visualtest_variator_common.h
index 451e81b..0b7c153 100644
--- a/visualtest/include/SDL_visualtest_variator_common.h
+++ b/visualtest/include/SDL_visualtest_variator_common.h
@@ -8,8 +8,8 @@
 #include <SDL_types.h>
 #include "SDL_visualtest_sut_configparser.h"
 
-#ifndef _SDL_visualtest_variator_common_h
-#define _SDL_visualtest_variator_common_h
+#ifndef SDL_visualtest_variator_common_h_
+#define SDL_visualtest_variator_common_h_
 
 /** The number of variations one integer option would generate */
 #define SDL_SUT_INTEGER_OPTION_TEST_STEPS 3
@@ -117,4 +117,6 @@ int SDLVisualTest_InitVariation(SDLVisualTest_Variation* variation,
 }
 #endif
 
-#endif /* _SDL_visualtest_variator_common_h */
\ No newline at end of file
+#endif /* SDL_visualtest_variator_common_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/visualtest/include/SDL_visualtest_variators.h b/visualtest/include/SDL_visualtest_variators.h
index 7aec36b..ce1e785 100644
--- a/visualtest/include/SDL_visualtest_variators.h
+++ b/visualtest/include/SDL_visualtest_variators.h
@@ -8,8 +8,8 @@
 #include "SDL_visualtest_exhaustive_variator.h"
 #include "SDL_visualtest_random_variator.h"
 
-#ifndef _SDL_visualtest_variators_h
-#define _SDL_visualtest_variators_h
+#ifndef SDL_visualtest_variators_h_
+#define SDL_visualtest_variators_h_
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -61,4 +61,6 @@ void SDLVisualTest_FreeVariator(SDLVisualTest_Variator* variator);
 }
 #endif
 
-#endif /* _SDL_visualtest_variators_h */
\ No newline at end of file
+#endif /* SDL_visualtest_variators_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */