diff --git a/Xcode-iOS/Demos/src/fireworks.c b/Xcode-iOS/Demos/src/fireworks.c
index b2a4d095dcca2..6c60dd1259bb7 100644
--- a/Xcode-iOS/Demos/src/fireworks.c
+++ b/Xcode-iOS/Demos/src/fireworks.c
@@ -196,7 +196,7 @@ explodeEmitter(struct particle *emitter)
         float speed = randomFloat(0.00, powf(0.17, exponent));
         speed = powf(speed, 1.0f / exponent);
 
-        /*select the particle at the end of our array */
+        /* select the particle at the end of our array */
         struct particle *p = &particles[num_active_particles];
 
         /* set the particles properties */
diff --git a/Xcode-iOS/Demos/src/keyboard.c b/Xcode-iOS/Demos/src/keyboard.c
index fd903ff864cf9..4fb45b94ae1f7 100644
--- a/Xcode-iOS/Demos/src/keyboard.c
+++ b/Xcode-iOS/Demos/src/keyboard.c
@@ -80,7 +80,7 @@ fontMapping map[TABLE_SIZE] = {
     {SDL_SCANCODE_7, 1, 0, 23}, /* 7 */
     {SDL_SCANCODE_8, 1, 0, 24}, /* 8 */
     {SDL_SCANCODE_9, 1, 0, 25}, /* 9 */
-    {SDL_SCANCODE_SPACE, 1, 0, 0},      /*' ' */
+    {SDL_SCANCODE_SPACE, 1, 0, 0},      /* ' ' */
     {SDL_SCANCODE_1, 0, KMOD_SHIFT, 1}, /* ! */
     {SDL_SCANCODE_SLASH, 0, KMOD_SHIFT, 31},    /* ? */
     {SDL_SCANCODE_SLASH, 1, 0, 15},     /* / */
diff --git a/Xcode-iOS/Demos/src/touch.c b/Xcode-iOS/Demos/src/touch.c
index e811967b1423b..c81dcbc223a83 100644
--- a/Xcode-iOS/Demos/src/touch.c
+++ b/Xcode-iOS/Demos/src/touch.c
@@ -92,7 +92,7 @@ main(int argc, char *argv[])
                                 SDL_WINDOW_BORDERLESS);
     renderer = SDL_CreateRenderer(window, 0, 0);
 
-    /*load brush texture */
+    /* load brush texture */
     initializeTexture(renderer);
 
     /* fill canvass initially with all black */
diff --git a/include/SDL.h b/include/SDL.h
index 67dd30f50de18..c0c067ca58def 100644
--- a/include/SDL.h
+++ b/include/SDL.h
@@ -106,7 +106,7 @@ extern "C" {
  *  These are the flags which may be passed to SDL_Init().  You should
  *  specify the subsystems which you will be using in your application.
  */
-/*@{ */
+/* @{ */
 #define SDL_INIT_TIMER          0x00000001
 #define SDL_INIT_AUDIO          0x00000010
 #define SDL_INIT_VIDEO          0x00000020  /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
@@ -119,7 +119,7 @@ extern "C" {
                 SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
                 SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \
             )
-/*@} */
+/* @} */
 
 /**
  *  This function initializes  the subsystems specified by \c flags
diff --git a/include/SDL_atomic.h b/include/SDL_atomic.h
index ae51dfc12eb5d..48b0053a0f444 100644
--- a/include/SDL_atomic.h
+++ b/include/SDL_atomic.h
@@ -91,7 +91,7 @@ extern "C" {
  * The spin lock functions and type are required and can not be
  * emulated because they are used in the atomic emulation code.
  */
-/*@{ */
+/* @{ */
 
 typedef int SDL_SpinLock;
 
@@ -118,7 +118,7 @@ extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock);
  */
 extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock);
 
-/*@} *//*SDL AtomicLock */
+/* @} *//* SDL AtomicLock */
 
 
 /**
diff --git a/include/SDL_audio.h b/include/SDL_audio.h
index bf57852e4c20d..b9da236fc5725 100644
--- a/include/SDL_audio.h
+++ b/include/SDL_audio.h
@@ -66,7 +66,7 @@ typedef Uint16 SDL_AudioFormat;
 /**
  *  \name Audio flags
  */
-/*@{ */
+/* @{ */
 
 #define SDL_AUDIO_MASK_BITSIZE       (0xFF)
 #define SDL_AUDIO_MASK_DATATYPE      (1<<8)
@@ -85,7 +85,7 @@ typedef Uint16 SDL_AudioFormat;
  *
  *  Defaults to LSB byte order.
  */
-/*@{ */
+/* @{ */
 #define AUDIO_U8        0x0008  /**< Unsigned 8-bit samples */
 #define AUDIO_S8        0x8008  /**< Signed 8-bit samples */
 #define AUDIO_U16LSB    0x0010  /**< Unsigned 16-bit samples */
@@ -94,30 +94,30 @@ typedef Uint16 SDL_AudioFormat;
 #define AUDIO_S16MSB    0x9010  /**< As above, but big-endian byte order */
 #define AUDIO_U16       AUDIO_U16LSB
 #define AUDIO_S16       AUDIO_S16LSB
-/*@} */
+/* @} */
 
 /**
  *  \name int32 support
  */
-/*@{ */
+/* @{ */
 #define AUDIO_S32LSB    0x8020  /**< 32-bit integer samples */
 #define AUDIO_S32MSB    0x9020  /**< As above, but big-endian byte order */
 #define AUDIO_S32       AUDIO_S32LSB
-/*@} */
+/* @} */
 
 /**
  *  \name float32 support
  */
-/*@{ */
+/* @{ */
 #define AUDIO_F32LSB    0x8120  /**< 32-bit floating point samples */
 #define AUDIO_F32MSB    0x9120  /**< As above, but big-endian byte order */
 #define AUDIO_F32       AUDIO_F32LSB
-/*@} */
+/* @} */
 
 /**
  *  \name Native audio byte ordering
  */
-/*@{ */
+/* @{ */
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
 #define AUDIO_U16SYS    AUDIO_U16LSB
 #define AUDIO_S16SYS    AUDIO_S16LSB
@@ -129,21 +129,21 @@ typedef Uint16 SDL_AudioFormat;
 #define AUDIO_S32SYS    AUDIO_S32MSB
 #define AUDIO_F32SYS    AUDIO_F32MSB
 #endif
-/*@} */
+/* @} */
 
 /**
  *  \name Allow change flags
  *
  *  Which audio format changes are allowed when opening a device.
  */
-/*@{ */
+/* @{ */
 #define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE    0x00000001
 #define SDL_AUDIO_ALLOW_FORMAT_CHANGE       0x00000002
 #define SDL_AUDIO_ALLOW_CHANNELS_CHANGE     0x00000004
 #define SDL_AUDIO_ALLOW_ANY_CHANGE          (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE)
-/*@} */
+/* @} */
 
-/*@} *//*Audio flags */
+/* @} *//* Audio flags */
 
 /**
  *  This function is called when the audio device needs more data.
@@ -218,10 +218,10 @@ typedef struct SDL_AudioCVT
  *  These functions return the list of built in audio drivers, in the
  *  order that they are normally initialized by default.
  */
-/*@{ */
+/* @{ */
 extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void);
 extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
-/*@} */
+/* @} */
 
 /**
  *  \name Initialization and cleanup
@@ -230,10 +230,10 @@ extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
  *            you have a specific need to specify the audio driver you want to
  *            use.  You should normally use SDL_Init() or SDL_InitSubSystem().
  */
-/*@{ */
+/* @{ */
 extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
 extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
-/*@} */
+/* @} */
 
 /**
  *  This function returns the name of the current audio driver, or NULL
@@ -359,7 +359,7 @@ extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
  *
  *  Get the current audio state.
  */
-/*@{ */
+/* @{ */
 typedef enum
 {
     SDL_AUDIO_STOPPED = 0,
@@ -370,7 +370,7 @@ extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void);
 
 extern DECLSPEC SDL_AudioStatus SDLCALL
 SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
-/*@} *//*Audio State */
+/* @} *//* Audio State */
 
 /**
  *  \name Pause audio functions
@@ -381,11 +381,11 @@ SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
  *  data for your callback function after opening the audio device.
  *  Silence will be written to the audio device during the pause.
  */
-/*@{ */
+/* @{ */
 extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
 extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev,
                                                   int pause_on);
-/*@} *//*Pause audio functions */
+/* @} *//* Pause audio functions */
 
 /**
  *  This function loads a WAVE from the data source, automatically freeing
@@ -482,12 +482,12 @@ extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst,
  *  the callback function is not running.  Do not call these from the callback
  *  function or you will cause deadlock.
  */
-/*@{ */
+/* @{ */
 extern DECLSPEC void SDLCALL SDL_LockAudio(void);
 extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev);
 extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
 extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev);
-/*@} *//*Audio lock functions */
+/* @} *//* Audio lock functions */
 
 /**
  *  This function shuts down audio processing and closes the audio device.
diff --git a/include/SDL_config_psp.h b/include/SDL_config_psp.h
index 921920db55853..31ac2b2b70abf 100644
--- a/include/SDL_config_psp.h
+++ b/include/SDL_config_psp.h
@@ -99,8 +99,8 @@
 #define HAVE_SQRT   1
 #define HAVE_SETJMP 1
 #define HAVE_NANOSLEEP  1
-/*#define HAVE_SYSCONF  1 */
-/*#define HAVE_SIGACTION    1 */
+/* #define HAVE_SYSCONF  1 */
+/* #define HAVE_SIGACTION    1 */
 
 
 /* PSP isn't that sophisticated */
diff --git a/include/SDL_endian.h b/include/SDL_endian.h
index 81e8c70e73273..3450316c0af0e 100644
--- a/include/SDL_endian.h
+++ b/include/SDL_endian.h
@@ -33,10 +33,10 @@
 /**
  *  \name The two types of endianness
  */
-/*@{ */
+/* @{ */
 #define SDL_LIL_ENDIAN  1234
 #define SDL_BIG_ENDIAN  4321
-/*@} */
+/* @} */
 
 #ifndef SDL_BYTEORDER           /* Not defined in SDL_config.h? */
 #ifdef __linux__
@@ -206,7 +206,7 @@ SDL_SwapFloat(float x)
  *  \name Swap to native
  *  Byteswap item from the specified endianness to the native endianness.
  */
-/*@{ */
+/* @{ */
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
 #define SDL_SwapLE16(X) (X)
 #define SDL_SwapLE32(X) (X)
@@ -226,7 +226,7 @@ SDL_SwapFloat(float x)
 #define SDL_SwapBE64(X) (X)
 #define SDL_SwapFloatBE(X)  (X)
 #endif
-/*@} *//*Swap to native */
+/* @} *//* Swap to native */
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
diff --git a/include/SDL_error.h b/include/SDL_error.h
index 11285633f67a7..2b8bb4165f606 100644
--- a/include/SDL_error.h
+++ b/include/SDL_error.h
@@ -48,7 +48,7 @@ extern DECLSPEC void SDLCALL SDL_ClearError(void);
  *  \internal
  *  Private error reporting function - used internally.
  */
-/*@{ */
+/* @{ */
 #define SDL_OutOfMemory()   SDL_Error(SDL_ENOMEM)
 #define SDL_Unsupported()   SDL_Error(SDL_UNSUPPORTED)
 #define SDL_InvalidParamError(param)    SDL_SetError("Parameter '%s' is invalid", (param))
@@ -63,7 +63,7 @@ typedef enum
 } SDL_errorcode;
 /* SDL_Error() unconditionally returns -1. */
 extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
-/*@} *//*Internal error functions */
+/* @} *//* Internal error functions */
 
 /* Ends C function definitions when using C++ */
 #ifdef __cplusplus
diff --git a/include/SDL_events.h b/include/SDL_events.h
index 77d5fde234982..c08903073a9b1 100644
--- a/include/SDL_events.h
+++ b/include/SDL_events.h
@@ -541,7 +541,7 @@ typedef union SDL_Event
  */
 extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
 
-/*@{ */
+/* @{ */
 typedef enum
 {
     SDL_ADDEVENT,
@@ -570,7 +570,7 @@ typedef enum
 extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
                                            SDL_eventaction action,
                                            Uint32 minType, Uint32 maxType);
-/*@} */
+/* @} */
 
 /**
  *  Checks to see if certain event types are in the event queue.
@@ -681,7 +681,7 @@ extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter,
 extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
                                               void *userdata);
 
-/*@{ */
+/* @{ */
 #define SDL_QUERY   -1
 #define SDL_IGNORE   0
 #define SDL_DISABLE  0
@@ -697,7 +697,7 @@ extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
  *     current processing state of the specified event.
  */
 extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state);
-/*@} */
+/* @} */
 #define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY)
 
 /**
diff --git a/include/SDL_haptic.h b/include/SDL_haptic.h
index c2a025ef2d098..a029eb9969084 100644
--- a/include/SDL_haptic.h
+++ b/include/SDL_haptic.h
@@ -140,12 +140,12 @@ typedef struct _SDL_Haptic SDL_Haptic;
  *
  *  Different haptic features a device can have.
  */
-/*@{ */
+/* @{ */
 
 /**
  *  \name Haptic effects
  */
-/*@{ */
+/* @{ */
 
 /**
  *  \brief Constant effect supported.
@@ -177,7 +177,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
 #define SDL_HAPTIC_LEFTRIGHT     (1<<2)
 
 /* !!! FIXME: put this back when we have more bits in 2.1 */
-/*#define SDL_HAPTIC_SQUARE     (1<<2) */
+/* #define SDL_HAPTIC_SQUARE     (1<<2) */
 
 /**
  *  \brief Triangle wave effect supported.
@@ -262,7 +262,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
  */
 #define SDL_HAPTIC_CUSTOM     (1<<11)
 
-/*@} *//*Haptic effects */
+/* @} *//* Haptic effects */
 
 /* These last few are features the device has, not effects */
 
@@ -305,7 +305,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
 /**
  * \name Direction encodings
  */
-/*@{ */
+/* @{ */
 
 /**
  *  \brief Uses polar coordinates for the direction.
@@ -328,9 +328,9 @@ typedef struct _SDL_Haptic SDL_Haptic;
  */
 #define SDL_HAPTIC_SPHERICAL  2
 
-/*@} *//*Direction encodings */
+/* @} *//* Direction encodings */
 
-/*@} *//*Haptic features */
+/* @} *//* Haptic features */
 
 /*
  * Misc defines.
diff --git a/include/SDL_joystick.h b/include/SDL_joystick.h
index 5b91f04cea4a3..b0e4b5dab8580 100644
--- a/include/SDL_joystick.h
+++ b/include/SDL_joystick.h
@@ -187,7 +187,7 @@ extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
 /**
  *  \name Hat positions
  */
-/*@{ */
+/* @{ */
 #define SDL_HAT_CENTERED    0x00
 #define SDL_HAT_UP      0x01
 #define SDL_HAT_RIGHT       0x02
@@ -197,7 +197,7 @@ extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
 #define SDL_HAT_RIGHTDOWN   (SDL_HAT_RIGHT|SDL_HAT_DOWN)
 #define SDL_HAT_LEFTUP      (SDL_HAT_LEFT|SDL_HAT_UP)
 #define SDL_HAT_LEFTDOWN    (SDL_HAT_LEFT|SDL_HAT_DOWN)
-/*@} */
+/* @} */
 
 /**
  *  Get the current state of a POV hat on a joystick.
diff --git a/include/SDL_mutex.h b/include/SDL_mutex.h
index 57274fa156d8c..2b5df0ec33b49 100644
--- a/include/SDL_mutex.h
+++ b/include/SDL_mutex.h
@@ -52,7 +52,7 @@ extern "C" {
 /**
  *  \name Mutex functions
  */
-/*@{ */
+/* @{ */
 
 /* The SDL mutex structure, defined in SDL_sysmutex.c */
 struct SDL_mutex;
@@ -94,13 +94,13 @@ extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex);
  */
 extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex);
 
-/*@} *//*Mutex functions */
+/* @} *//* Mutex functions */
 
 
 /**
  *  \name Semaphore functions
  */
-/*@{ */
+/* @{ */
 
 /* The SDL semaphore structure, defined in SDL_syssem.c */
 struct SDL_semaphore;
@@ -154,13 +154,13 @@ extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem);
  */
 extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem);
 
-/*@} *//*Semaphore functions */
+/* @} *//* Semaphore functions */
 
 
 /**
  *  \name Condition variable functions
  */
-/*@{ */
+/* @{ */
 
 /* The SDL condition variable structure, defined in SDL_syscond.c */
 struct SDL_cond;
@@ -237,7 +237,7 @@ extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex);
 extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
                                                 SDL_mutex * mutex, Uint32 ms);
 
-/*@} *//*Condition variable functions */
+/* @} *//* Condition variable functions */
 
 
 /* Ends C function definitions when using C++ */
diff --git a/include/SDL_pixels.h b/include/SDL_pixels.h
index 5b6d9c4f7ba6f..99fcd9aac1fdf 100644
--- a/include/SDL_pixels.h
+++ b/include/SDL_pixels.h
@@ -39,10 +39,10 @@ extern "C" {
  *
  *  These define alpha as the opacity of a surface.
  */
-/*@{ */
+/* @{ */
 #define SDL_ALPHA_OPAQUE 255
 #define SDL_ALPHA_TRANSPARENT 0
-/*@} */
+/* @} */
 
 /** Pixel type. */
 enum
diff --git a/include/SDL_platform.h b/include/SDL_platform.h
index bf520ba6d7e24..b4849afec09ec 100644
--- a/include/SDL_platform.h
+++ b/include/SDL_platform.h
@@ -66,7 +66,7 @@
 #endif
 #if defined(ANDROID)
 #undef __ANDROID__
-#undef __LINUX__ /*do we need to do this? */
+#undef __LINUX__ /* do we need to do this? */
 #define __ANDROID__ 1
 #endif
 
diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h
index e2f11616639bb..d2574423827de 100644
--- a/include/SDL_rwops.h
+++ b/include/SDL_rwops.h
@@ -148,7 +148,7 @@ typedef struct SDL_RWops
  *
  *  Functions to create SDL_RWops structures from various data streams.
  */
-/*@{ */
+/* @{ */
 
 extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file,
                                                   const char *mode);
@@ -165,7 +165,7 @@ extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size);
 extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem,
                                                       int size);
 
-/*@} *//*RWFrom functions */
+/* @} *//* RWFrom functions */
 
 
 extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void);
@@ -180,14 +180,14 @@ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area);
  *
  *  Macros to easily read and write from an SDL_RWops structure.
  */
-/*@{ */
+/* @{ */
 #define SDL_RWsize(ctx)         (ctx)->size(ctx)
 #define SDL_RWseek(ctx, offset, whence) (ctx)->seek(ctx, offset, whence)
 #define SDL_RWtell(ctx)         (ctx)->seek(ctx, 0, RW_SEEK_CUR)
 #define SDL_RWread(ctx, ptr, size, n)   (ctx)->read(ctx, ptr, size, n)
 #define SDL_RWwrite(ctx, ptr, size, n)  (ctx)->write(ctx, ptr, size, n)
 #define SDL_RWclose(ctx)        (ctx)->close(ctx)
-/*@} *//*Read/write macros */
+/* @} *//* Read/write macros */
 
 
 /**
@@ -195,7 +195,7 @@ extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area);
  *
  *  Read an item of the specified endianness and return in native format.
  */
-/*@{ */
+/* @{ */
 extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src);
 extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src);
 extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src);
@@ -203,14 +203,14 @@ extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src);
 extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src);
 extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src);
 extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src);
-/*@} *//*Read endian functions */
+/* @} *//* Read endian functions */
 
 /**
  *  \name Write endian functions
  *
  *  Write an item of native format to the specified endianness.
  */
-/*@{ */
+/* @{ */
 extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value);
 extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value);
 extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value);
@@ -218,7 +218,7 @@ extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value);
 extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value);
 extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value);
 extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
-/*@} *//*Write endian functions */
+/* @} *//* Write endian functions */
 
 
 /* Ends C function definitions when using C++ */
diff --git a/include/SDL_scancode.h b/include/SDL_scancode.h
index 7c7cf4322fb83..00b47a3b8088d 100644
--- a/include/SDL_scancode.h
+++ b/include/SDL_scancode.h
@@ -49,7 +49,7 @@ typedef enum
      *
      *  These values are from usage page 0x07 (USB keyboard page).
      */
-    /*@{ */
+    /* @{ */
 
     SDL_SCANCODE_A = 4,
     SDL_SCANCODE_B = 5,
@@ -339,14 +339,14 @@ typedef enum
                                  *   special KMOD_MODE for it I'm adding it here
                                  */
 
-    /*@} *//*Usage page 0x07 */
+    /* @} *//* Usage page 0x07 */
 
     /**
      *  \name Usage page 0x0C
      *
      *  These values are mapped from usage page 0x0C (USB consumer page).
      */
-    /*@{ */
+    /* @{ */
 
     SDL_SCANCODE_AUDIONEXT = 258,
     SDL_SCANCODE_AUDIOPREV = 259,
@@ -366,14 +366,14 @@ typedef enum
     SDL_SCANCODE_AC_REFRESH = 273,
     SDL_SCANCODE_AC_BOOKMARKS = 274,
 
-    /*@} *//*Usage page 0x0C */
+    /* @} *//* Usage page 0x0C */
 
     /**
      *  \name Walther keys
      *
      *  These are values that Christian Walther added (for mac keyboard?).
      */
-    /*@{ */
+    /* @{ */
 
     SDL_SCANCODE_BRIGHTNESSDOWN = 275,
     SDL_SCANCODE_BRIGHTNESSUP = 276,
@@ -388,7 +388,7 @@ typedef enum
     SDL_SCANCODE_APP1 = 283,
     SDL_SCANCODE_APP2 = 284,
 
-    /*@} *//*Walther keys */
+    /* @} *//* Walther keys */
 
     /* Add any other keys here. */
 
diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
index 6f9c23cacf312..8f17d5519a451 100644
--- a/include/SDL_stdinc.h
+++ b/include/SDL_stdinc.h
@@ -89,7 +89,7 @@
  *  Use proper C++ casts when compiled as C++ to be compatible with the option
  *  -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above).
  */
-/*@{ */
+/* @{ */
 #ifdef __cplusplus
 #define SDL_reinterpret_cast(type, expression) reinterpret_cast<type>(expression)
 #define SDL_static_cast(type, expression) static_cast<type>(expression)
@@ -99,7 +99,7 @@
 #define SDL_static_cast(type, expression) ((type)(expression))
 #define SDL_const_cast(type, expression) ((type)(expression))
 #endif
-/*@} *//*Cast operators */
+/* @} *//* Cast operators */
 
 /* Define a four character code as a Uint32 */
 #define SDL_FOURCC(A, B, C, D) \
@@ -111,7 +111,7 @@
 /**
  *  \name Basic data types
  */
-/*@{ */
+/* @{ */
 
 typedef enum
 {
@@ -153,7 +153,7 @@ typedef int64_t Sint64;
  */
 typedef uint64_t Uint64;
 
-/*@} *//*Basic data types */
+/* @} *//* Basic data types */
 
 
 #define SDL_COMPILE_TIME_ASSERT(name, x)               \
diff --git a/include/SDL_surface.h b/include/SDL_surface.h
index 4b9628c727d50..4062012dfd270 100644
--- a/include/SDL_surface.h
+++ b/include/SDL_surface.h
@@ -48,12 +48,12 @@ extern "C" {
  *  \internal
  *  Used internally (read-only).
  */
-/*@{ */
+/* @{ */
 #define SDL_SWSURFACE       0           /**< Just here for compatibility */
 #define SDL_PREALLOC        0x00000001  /**< Surface uses preallocated memory */
 #define SDL_RLEACCEL        0x00000002  /**< Surface is RLE encoded */
 #define SDL_DONTFREE        0x00000004  /**< Surface is referenced internally */
-/*@} *//*Surface flags */
+/* @} *//* Surface flags */
 
 /**
  *  Evaluates to true if the surface needs to be locked before access.
diff --git a/include/SDL_test_harness.h b/include/SDL_test_harness.h
index d22c9fcbc6049..935038e904285 100644
--- a/include/SDL_test_harness.h
+++ b/include/SDL_test_harness.h
@@ -43,43 +43,43 @@ extern "C" {
 #endif
 
 
-/*! Definitions for test case structures */
+/* ! Definitions for test case structures */
 #define TEST_ENABLED  1
 #define TEST_DISABLED 0
 
-/*! Definition of all the possible test return values of the test case method */
+/* ! Definition of all the possible test return values of the test case method */
 #define TEST_ABORTED        -1
 #define TEST_STARTED         0
 #define TEST_COMPLETED       1
 #define TEST_SKIPPED         2
 
-/*! Definition of all the possible test results for the harness */
+/* ! Definition of all the possible test results for the harness */
 #define TEST_RESULT_PASSED              0
 #define TEST_RESULT_FAILED              1
 #define TEST_RESULT_NO_ASSERT           2
 #define TEST_RESULT_SKIPPED             3
 #define TEST_RESULT_SETUP_FAILURE       4
 
-/*!< Function pointer to a test case setup function (run before every test) */
+/* !< Function pointer to a test case setup function (run before every test) */
 typedef void (*SDLTest_TestCaseSetUpFp)(void *arg);
 
-/*!< Function pointer to a test case function */
+/* !< Function pointer to a test case function */
 typedef int (*SDLTest_TestCaseFp)(void *arg);
 
-/*!< Function pointer to a test case teardown function (run after every test) */
+/* !< Function pointer to a test case teardown function (run after every test) */
 typedef void  (*SDLTest_TestCaseTearDownFp)(void *arg);
 
 /**
  * Holds information about a single test case.
  */
 typedef struct SDLTest_TestCaseReference {
-    /*!< Func2Stress */
+    /* !< Func2Stress */
     SDLTest_TestCaseFp testCase;
-    /*!< Short name (or function name) "Func2Stress" */
+    /* !< Short name (or function name) "Func2Stress" */
     char *name;
-    /*!< Long name or full description "This test pushes func2() to the limit." */
+    /* !< Long name or full description "This test pushes func2() to the limit." */
     char *description;
-    /*!< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */
+    /* !< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */
     int enabled;
 } SDLTest_TestCaseReference;
 
@@ -87,13 +87,13 @@ typedef struct SDLTest_TestCaseReference {
  * Holds information about a test suite (multiple test cases).
  */
 typedef struct SDLTest_TestSuiteReference {
-    /*!< "PlatformSuite" */
+    /* !< "PlatformSuite" */
     char *name;
-    /*!< The function that is run before each test. NULL skips. */
+    /* !< The function that is run before each test. NULL skips. */
     SDLTest_TestCaseSetUpFp testSetUp;
-    /*!< The test cases that are run as part of the suite. Last item should be NULL. */
+    /* !< The test cases that are run as part of the suite. Last item should be NULL. */
     const SDLTest_TestCaseReference **testCases;
-    /*!< The function that is run after each test. NULL skips. */
+    /* !< The function that is run after each test. NULL skips. */
     SDLTest_TestCaseTearDownFp testTearDown;
 } SDLTest_TestSuiteReference;
 
diff --git a/include/SDL_video.h b/include/SDL_video.h
index 3a2ac83ae9283..d4133b0266fc3 100644
--- a/include/SDL_video.h
+++ b/include/SDL_video.h
@@ -821,7 +821,7 @@ extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void);
 /**
  *  \name OpenGL support functions
  */
-/*@{ */
+/* @{ */
 
 /**
  *  \brief Dynamically load an OpenGL library.
@@ -939,7 +939,7 @@ extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window);
  */
 extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
 
-/*@} *//*OpenGL support functions */
+/* @} *//* OpenGL support functions */
 
 
 /* Ends C function definitions when using C++ */
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 4d53e82b18388..69e6bf138b5b4 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -419,7 +419,7 @@ SDL_RunAudio(void *devicep)
                     if (istream == NULL) {
                         istream = device->fake_stream;
                     }
-                    /*SDL_memcpy(istream, device->convert.buf, device->convert.len_cvt); */
+                    /* SDL_memcpy(istream, device->convert.buf, device->convert.len_cvt); */
                     SDL_StreamWrite(&device->streamer, device->convert.buf,
                                     device->convert.len_cvt);
                 } else {
diff --git a/src/audio/SDL_wave.c b/src/audio/SDL_wave.c
index 4956f1f41fe04..d9ff165369ff3 100644
--- a/src/audio/SDL_wave.c
+++ b/src/audio/SDL_wave.c
@@ -61,7 +61,7 @@ InitMS_ADPCM(WaveFMT * format)
         SDL_SwapLE16(format->bitspersample);
     rogue_feel = (Uint8 *) format + sizeof(*format);
     if (sizeof(*format) == 16) {
-        /*const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */
+        /* const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */
         rogue_feel += sizeof(Uint16);
     }
     MS_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
@@ -242,7 +242,7 @@ InitIMA_ADPCM(WaveFMT * format)
         SDL_SwapLE16(format->bitspersample);
     rogue_feel = (Uint8 *) format + sizeof(*format);
     if (sizeof(*format) == 16) {
-        /*const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */
+        /* const Uint16 extra_info = ((rogue_feel[1] << 8) | rogue_feel[0]); */
         rogue_feel += sizeof(Uint16);
     }
     IMA_ADPCM_state.wSamplesPerBlock = ((rogue_feel[1] << 8) | rogue_feel[0]);
diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c
index 93de9d7e4d487..7c57924161c4b 100644
--- a/src/audio/alsa/SDL_alsa_audio.c
+++ b/src/audio/alsa/SDL_alsa_audio.c
@@ -304,7 +304,7 @@ ALSA_PlayDevice(_THIS)
 
     while ( frames_left > 0 && this->enabled ) {
         /* !!! FIXME: This works, but needs more testing before going live */
-        /*ALSA_snd_pcm_wait(this->hidden->pcm_handle, -1); */
+        /* ALSA_snd_pcm_wait(this->hidden->pcm_handle, -1); */
         status = ALSA_snd_pcm_writei(this->hidden->pcm_handle,
                                      sample_buf, frames_left);
 
diff --git a/src/audio/psp/SDL_pspaudio.c b/src/audio/psp/SDL_pspaudio.c
index f5cf1a01e0afd..8576d95e19fe4 100644
--- a/src/audio/psp/SDL_pspaudio.c
+++ b/src/audio/psp/SDL_pspaudio.c
@@ -76,7 +76,7 @@ PSPAUD_OpenDevice(_THIS, const char *devname, int iscapture)
     this->spec.size *= this->spec.channels;
     this->spec.size *= this->spec.samples;
 
-/*========================================== */
+/* ========================================== */
 
     /* Allocate the mixing buffer.  Its size and starting address must
        be a multiple of 64 bytes.  Our sample count is already a multiple of
@@ -171,7 +171,7 @@ PSPAUD_Init(SDL_AudioDriverImpl * impl)
     impl->CloseDevice = PSPAUD_CloseDevice;
     impl->ThreadInit = PSPAUD_ThreadInit;
 
-    /*PSP audio device */
+    /* PSP audio device */
     impl->OnlyHasDefaultOutputDevice = 1;
 /*
     impl->HasCaptureSupport = 1;
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index df963fdaa3a2b..00592e87afe39 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -40,13 +40,13 @@
 #include <sys/types.h>
 #include <unistd.h>
 #define LOG_TAG "SDL_android"
-/*#define LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__) */
-/*#define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__) */
+/* #define LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__) */
+/* #define LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__) */
 #define LOGI(...) do {} while (false)
 #define LOGE(...) do {} while (false)
 
 /* Uncomment this to log messages entering and exiting methods in this file */
-/*#define DEBUG_JNI */
+/* #define DEBUG_JNI */
 
 static void Android_JNI_ThreadDestroyed(void*);
 
@@ -680,7 +680,7 @@ static int Internal_Android_JNI_FileOpen(SDL_RWops* ctx)
     if (false) {
 fallback:
         /* Disabled log message because of spam on the Nexus 7 */
-        /*__android_log_print(ANDROID_LOG_DEBUG, "SDL", "Falling back to legacy InputStream method for opening file"); */
+        /* __android_log_print(ANDROID_LOG_DEBUG, "SDL", "Falling back to legacy InputStream method for opening file"); */
 
         /* Try the old method using InputStream */
         ctx->hidden.androidio.assetFileDescriptorRef = NULL;
@@ -688,7 +688,7 @@ static int Internal_Android_JNI_FileOpen(SDL_RWops* ctx)
         /* inputStream = assetManager.open(<filename>); */
         mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, assetManager),
                 "open", "(Ljava/lang/String;I)Ljava/io/InputStream;");
-        inputStream = (*mEnv)->CallObjectMethod(mEnv, assetManager, mid, fileNameJString, 1 /*ACCESS_RANDOM */);
+        inputStream = (*mEnv)->CallObjectMethod(mEnv, assetManager, mid, fileNameJString, 1 /* ACCESS_RANDOM */);
         if (Android_JNI_ExceptionOccurred(false)) {
             goto failure;
         }
@@ -790,7 +790,7 @@ size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer,
 
     if (ctx->hidden.androidio.assetFileDescriptorRef) {
         size_t bytesMax = size * maxnum;
-        if (ctx->hidden.androidio.size != -1 /*UNKNOWN_LENGTH */ && ctx->hidden.androidio.position + bytesMax > ctx->hidden.androidio.size) {
+        if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && ctx->hidden.androidio.position + bytesMax > ctx->hidden.androidio.size) {
             bytesMax = ctx->hidden.androidio.size - ctx->hidden.androidio.position;
         }
         size_t result = read(ctx->hidden.androidio.fd, buffer, bytesMax );
@@ -909,12 +909,12 @@ Sint64 Android_JNI_FileSeek(SDL_RWops* ctx, Sint64 offset, int whence)
     if (ctx->hidden.androidio.assetFileDescriptorRef) {
         switch (whence) {
             case RW_SEEK_SET:
-                if (ctx->hidden.androidio.size != -1 /*UNKNOWN_LENGTH */ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
+                if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
                 offset += ctx->hidden.androidio.offset;
                 break;
             case RW_SEEK_CUR:
                 offset += ctx->hidden.androidio.position;
-                if (ctx->hidden.androidio.size != -1 /*UNKNOWN_LENGTH */ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
+                if (ctx->hidden.androidio.size != -1 /* UNKNOWN_LENGTH */ && offset > ctx->hidden.androidio.size) offset = ctx->hidden.androidio.size;
                 offset += ctx->hidden.androidio.offset;
                 break;
             case RW_SEEK_END:
diff --git a/src/core/android/SDL_android.h b/src/core/android/SDL_android.h
index 3ce0f496d16eb..feb7a60237df8 100644
--- a/src/core/android/SDL_android.h
+++ b/src/core/android/SDL_android.h
@@ -33,7 +33,7 @@ extern "C" {
 #include "SDL_rect.h"
 
 /* Interface from the SDL library into the Android Java activity */
-/*extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion, int red, int green, int blue, int alpha, int buffer, int depth, int stencil, int buffers, int samples);
+/* extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion, int red, int green, int blue, int alpha, int buffer, int depth, int stencil, int buffers, int samples);
 extern SDL_bool Android_JNI_DeleteContext(void); */
 extern void Android_JNI_SwapWindow();
 extern void Android_JNI_SetActivityTitle(const char *title);
diff --git a/src/events/SDL_gesture.c b/src/events/SDL_gesture.c
index 908c030cce9b7..20ce57b573ac3 100644
--- a/src/events/SDL_gesture.c
+++ b/src/events/SDL_gesture.c
@@ -121,8 +121,8 @@ static int SaveTemplate(SDL_DollarTemplate *templ, SDL_RWops * src)
     if (src == NULL) return 0;
 
 
-    /*No Longer storing the Hash, rehash on load */
-    /*if(SDL_RWops.write(src,&(templ->hash),sizeof(templ->hash),1) != 1) return 0; */
+    /* No Longer storing the Hash, rehash on load */
+    /* if(SDL_RWops.write(src,&(templ->hash),sizeof(templ->hash),1) != 1) return 0; */
 
     if (SDL_RWwrite(src,templ->path,
                     sizeof(templ->path[0]),DOLLARNPOINTS) != DOLLARNPOINTS)
@@ -158,7 +158,7 @@ int SDL_SaveDollarTemplate(SDL_GestureID gestureId, SDL_RWops *src)
     return SDL_SetError("Unknown gestureId");
 }
 
-/*path is an already sampled set of points
+/* path is an already sampled set of points
 Returns the index of the gesture on success, or -1 */
 static int SDL_AddDollarGesture_one(SDL_GestureTouch* inTouch, SDL_FloatPoint* path)
 {
@@ -223,16 +223,16 @@ int SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src)
            DOLLARNPOINTS) break;
 
         if (touchId >= 0) {
-            /*printf("Adding loaded gesture to 1 touch\n"); */
+            /* printf("Adding loaded gesture to 1 touch\n"); */
             if (SDL_AddDollarGesture(touch, templ.path) >= 0)
                 loaded++;
         }
         else {
-            /*printf("Adding to: %i touches\n",SDL_numGestureTouches); */
+            /* printf("Adding to: %i touches\n",SDL_numGestureTouches); */
             for (i = 0; i < SDL_numGestureTouches; i++) {
                 touch = &SDL_gestureTouch[i];
-                /*printf("Adding loaded gesture to + touches\n"); */
-                /*TODO: What if this fails? */
+                /* printf("Adding loaded gesture to + touches\n"); */
+                /* TODO: What if this fails? */
                 SDL_AddDollarGesture(touch,templ.path);
             }
             loaded++;
@@ -297,7 +297,7 @@ static float bestDollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ)
     return SDL_min(f1,f2);
 }
 
-/*DollarPath contains raw points, plus (possibly) the calculated length */
+/* DollarPath contains raw points, plus (possibly) the calculated length */
 static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
 {
     int i;
@@ -310,7 +310,7 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
     float w,h;
     float length = path->length;
 
-    /*Calculate length if it hasn't already been done */
+    /* Calculate length if it hasn't already been done */
     if (length <= 0) {
         for (i=1;i < path->numPoints; i++) {
             float dx = path->p[i  ].x - path->p[i-1].x;
@@ -319,17 +319,17 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
         }
     }
 
-    /*Resample */
+    /* Resample */
     interval = length/(DOLLARNPOINTS - 1);
     dist = interval;
 
     centroid.x = 0;centroid.y = 0;
 
-    /*printf("(%f,%f)\n",path->p[path->numPoints-1].x,path->p[path->numPoints-1].y); */
+    /* printf("(%f,%f)\n",path->p[path->numPoints-1].x,path->p[path->numPoints-1].y); */
     for (i = 1; i < path->numPoints; i++) {
         float d = (float)(SDL_sqrt((path->p[i-1].x-path->p[i].x)*(path->p[i-1].x-path->p[i].x)+
                                    (path->p[i-1].y-path->p[i].y)*(path->p[i-1].y-path->p[i].y)));
-        /*printf("d = %f dist = %f/%f\n",d,dist,interval); */
+        /* printf("d = %f dist = %f/%f\n",d,dist,interval); */
         while (dist + d > interval) {
             points[numPoints].x = path->p[i-1].x +
                 ((interval-dist)/d)*(path->p[i].x-path->p[i-1].x);
@@ -347,15 +347,15 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
         SDL_SetError("ERROR: NumPoints = %i\n",numPoints);
         return 0;
     }
-    /*copy the last point */
+    /* copy the last point */
     points[DOLLARNPOINTS-1] = path->p[path->numPoints-1];
     numPoints = DOLLARNPOINTS;
 
     centroid.x /= numPoints;
     centroid.y /= numPoints;
 
-    /*printf("Centroid (%f,%f)",centroid.x,centroid.y); */
-    /*Rotate Points so point 0 is left of centroid and solve for the bounding box */
+    /* printf("Centroid (%f,%f)",centroid.x,centroid.y); */
+    /* Rotate Points so point 0 is left of centroid and solve for the bounding box */
     xmin = centroid.x;
     xmax = centroid.x;
     ymin = centroid.y;
@@ -379,7 +379,7 @@ static int dollarNormalize(const SDL_DollarPath *path,SDL_FloatPoint *points)
         if (points[i].y > ymax) ymax = points[i].y;
     }
 
-    /*Scale points to DOLLARSIZE, and translate to the origin */
+    /* Scale points to DOLLARSIZE, and translate to the origin */
     w = xmax-xmin;
     h = ymax-ymin;
 
@@ -400,7 +400,7 @@ static float dollarRecognize(const SDL_DollarPath *path,int *bestTempl,SDL_Gestu
 
     dollarNormalize(path,points);
 
-    /*PrintPath(points); */
+    /* PrintPath(points); */
     *bestTempl = -1;
     for (i = 0; i < touch->numDollarTemplates; i++) {
         float diff = bestDollarDifference(points,touch->dollarTemplate[i].path);
@@ -436,7 +436,7 @@ static SDL_GestureTouch * SDL_GetGestureTouch(SDL_TouchID id)
 {
     int i;
     for (i = 0; i < SDL_numGestureTouches; i++) {
-        /*printf("%i ?= %i\n",SDL_gestureTouch[i].id,id); */
+        /* printf("%i ?= %i\n",SDL_gestureTouch[i].id,id); */
         if (SDL_gestureTouch[i].id == id)
             return &SDL_gestureTouch[i];
     }
@@ -466,7 +466,7 @@ static int SDL_SendGestureDollar(SDL_GestureTouch* touch,
     event.mgesture.y = touch->centroid.y;
     event.dgesture.gestureId = gestureId;
     event.dgesture.error = error;
-    /*A finger came up to trigger this event. */
+    /* A finger came up to trigger this event. */
     event.dgesture.numFingers = touch->numDownFingers + 1;
     return SDL_PushEvent(&event) > 0;
 }
@@ -501,13 +501,13 @@ void SDL_GestureProcessEvent(SDL_Event* event)
         event->type == SDL_FINGERUP) {
         SDL_GestureTouch* inTouch = SDL_GetGestureTouch(event->tfinger.touchId);
 
-        /*Shouldn't be possible */
+        /* Shouldn't be possible */
         if (inTouch == NULL) return;
 
         x = event->tfinger.x;
         y = event->tfinger.y;
 
-        /*Finger Up */
+        /* Finger Up */
         if (event->type == SDL_FINGERUP) {
             inTouch->numDownFingers--;
 
@@ -515,7 +515,7 @@ void SDL_GestureProcessEvent(SDL_Event* event)
             if (inTouch->recording) {
                 inTouch->recording = SDL_FALSE;
                 dollarNormalize(&inTouch->dollarPath,path);
-                /*PrintPath(path); */
+                /* PrintPath(path); */
                 if (recordAll) {
                     index = SDL_AddDollarGesture(NULL,path);
                     for (i = 0; i < SDL_numGestureTouches; i++)
@@ -538,14 +538,14 @@ void SDL_GestureProcessEvent(SDL_Event* event)
                 error = dollarRecognize(&inTouch->dollarPath,
                                         &bestTempl,inTouch);
                 if (bestTempl >= 0){
-                    /*Send Event */
+                    /* Send Event */
                     unsigned long gestureId = inTouch->dollarTemplate[bestTempl].hash;
                     SDL_SendGestureDollar(inTouch,gestureId,error);
-                    /*printf ("%s\n",);("Dollar error: %f\n",error); */
+                    /* printf ("%s\n",);("Dollar error: %f\n",error); */
                 }
             }
 #endif
-            /*inTouch->gestureLast[j] = inTouch->gestureLast[inTouch->numDownFingers]; */
+            /* inTouch->gestureLast[j] = inTouch->gestureLast[inTouch->numDownFingers]; */
             if (inTouch->numDownFingers > 0) {
                 inTouch->centroid.x = (inTouch->centroid.x*(inTouch->numDownFingers+1)-
                                        x)/inTouch->numDownFingers;
@@ -575,22 +575,22 @@ void SDL_GestureProcessEvent(SDL_Event* event)
 
             inTouch->centroid.x += dx/inTouch->numDownFingers;
             inTouch->centroid.y += dy/inTouch->numDownFingers;
-            /*printf("Centrid : (%f,%f)\n",inTouch->centroid.x,inTouch->centroid.y); */
+            /* printf("Centrid : (%f,%f)\n",inTouch->centroid.x,inTouch->centroid.y); */
             if (inTouch->numDownFingers > 1) {
-                SDL_FloatPoint lv; /*Vector from centroid to last x,y position */
-                SDL_FloatPoint v; /*Vector from centroid to current x,y position */
-                /*lv = inTouch->gestureLast[j].cv; */
+                SDL_FloatPoint lv; /* Vector from centroid to last x,y position */
+                SDL_FloatPoint v; /* Vector from centroid to current x,y position */
+                /* lv = inTouch->gestureLast[j].cv; */
                 lv.x = lastP.x - lastCentroid.x;
                 lv.y = lastP.y - lastCentroid.y;
                 lDist = (float)SDL_sqrt(lv.x*lv.x + lv.y*lv.y);
-                /*printf("lDist = %f\n",lDist); */
+                /* printf("lDist = %f\n",lDist); */
                 v.x = x - inTouch->centroid.x;
                 v.y = y - inTouch->centroid.y;
-                /*inTouch->gestureLast[j].cv = v; */
+                /* inTouch->gestureLast[j].cv = v; */
                 Dist = (float)SDL_sqrt(v.x*v.x+v.y*v.y);
                 /* SDL_cos(dTheta) = (v . lv)/(|v| * |lv|) */
 
-                /*Normalize Vectors to simplify angle calculation */
+                /* Normalize Vectors to simplify angle calculation */
                 lv.x/=lDist;
                 lv.y/=lDist;
                 v.x/=Dist;
@@ -598,9 +598,9 @@ void SDL_GestureProcessEvent(SDL_Event* event)
                 dtheta = (float)SDL_atan2(lv.x*v.y - lv.y*v.x,lv.x*v.x + lv.y*v.y);
 
                 dDist = (Dist - lDist);
-                if (lDist == 0) {dDist = 0;dtheta = 0;} /*To avoid impossible values */
+                if (lDist == 0) {dDist = 0;dtheta = 0;} /* To avoid impossible values */
 
-                /*inTouch->gestureLast[j].dDist = dDist;
+                /* inTouch->gestureLast[j].dDist = dDist;
                 inTouch->gestureLast[j].dtheta = dtheta;
 
                 printf("dDist = %f, dTheta = %f\n",dDist,dtheta);
@@ -613,12 +613,12 @@ void SDL_GestureProcessEvent(SDL_Event* event)
                 SDL_SendGestureMulti(inTouch,dtheta,dDist);
             }
             else {
-                /*inTouch->gestureLast[j].dDist = 0;
+                /* inTouch->gestureLast[j].dDist = 0;
                 inTouch->gestureLast[j].dtheta = 0;
                 inTouch->gestureLast[j].cv.x = 0;
                 inTouch->gestureLast[j].cv.y = 0; */
             }
-            /*inTouch->gestureLast[j].f.p.x = x;
+            /* inTouch->gestureLast[j].f.p.x = x;
             inTouch->gestureLast[j].f.p.y = y;
             break;
             pressure? */
@@ -631,7 +631,7 @@ void SDL_GestureProcessEvent(SDL_Event* event)
                                    x)/inTouch->numDownFingers;
             inTouch->centroid.y = (inTouch->centroid.y*(inTouch->numDownFingers - 1)+
                                    y)/inTouch->numDownFingers;
-            /*printf("Finger Down: (%f,%f). Centroid: (%f,%f\n",x,y,
+            /* printf("Finger Down: (%f,%f). Centroid: (%f,%f\n",x,y,
                  inTouch->centroid.x,inTouch->centroid.y); */
 
 #ifdef ENABLE_DOLLAR
diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
index 4577857fa7de4..607046e0ea84d 100644
--- a/src/events/SDL_keyboard.c
+++ b/src/events/SDL_keyboard.c
@@ -28,7 +28,7 @@
 #include "../video/SDL_sysvideo.h"
 
 
-/*#define DEBUG_KEYBOARD */
+/* #define DEBUG_KEYBOARD */
 
 /* Global keyboard information */
 
diff --git a/src/events/SDL_mouse.c b/src/events/SDL_mouse.c
index fa30361b76b59..dd6049af0383e 100644
--- a/src/events/SDL_mouse.c
+++ b/src/events/SDL_mouse.c
@@ -28,7 +28,7 @@
 #include "default_cursor.h"
 #include "../video/SDL_sysvideo.h"
 
-/*#define DEBUG_MOUSE */
+/* #define DEBUG_MOUSE */
 
 /* The mouse state */
 static SDL_Mouse SDL_mouse;
diff --git a/src/haptic/darwin/SDL_syshaptic.c b/src/haptic/darwin/SDL_syshaptic.c
index 72a336dec8fbb..124cc41af6005 100644
--- a/src/haptic/darwin/SDL_syshaptic.c
+++ b/src/haptic/darwin/SDL_syshaptic.c
@@ -93,7 +93,7 @@ FFStrError(HRESULT err)
     case FFERR_DEVICEFULL:
         return "device full";
         /* This should be valid, but for some reason isn't defined... */
-        /*case FFERR_DEVICENOTREG:
+        /* case FFERR_DEVICENOTREG:
            return "device not registered"; */
     case FFERR_DEVICEPAUSED:
         return "device paused";
@@ -343,7 +343,7 @@ GetSupportedFeatures(SDL_Haptic * haptic)
     FF_TEST(FFCAP_ET_CONSTANTFORCE, SDL_HAPTIC_CONSTANT);
     FF_TEST(FFCAP_ET_RAMPFORCE, SDL_HAPTIC_RAMP);
     /* !!! FIXME: put this back when we have more bits in 2.1 */
-    /*FF_TEST(FFCAP_ET_SQUARE, SDL_HAPTIC_SQUARE); */
+    /* FF_TEST(FFCAP_ET_SQUARE, SDL_HAPTIC_SQUARE); */
     FF_TEST(FFCAP_ET_SINE, SDL_HAPTIC_SINE);
     FF_TEST(FFCAP_ET_TRIANGLE, SDL_HAPTIC_TRIANGLE);
     FF_TEST(FFCAP_ET_SAWTOOTHUP, SDL_HAPTIC_SAWTOOTHUP);
@@ -752,7 +752,7 @@ SDL_SYS_ToFFEFFECT(SDL_Haptic * haptic, FFEFFECT * dest,
 
     case SDL_HAPTIC_SINE:
     /* !!! FIXME: put this back when we have more bits in 2.1 */
-    /*case SDL_HAPTIC_SQUARE: */
+    /* case SDL_HAPTIC_SQUARE: */
     case SDL_HAPTIC_TRIANGLE:
     case SDL_HAPTIC_SAWTOOTHUP:
     case SDL_HAPTIC_SAWTOOTHDOWN:
@@ -981,7 +981,7 @@ SDL_SYS_HapticEffectType(Uint16 type)
         return kFFEffectType_RampForce_ID;
 
     /* !!! FIXME: put this back when we have more bits in 2.1 */
-    /*case SDL_HAPTIC_SQUARE:
+    /* case SDL_HAPTIC_SQUARE:
         return kFFEffectType_Square_ID; */
 
     case SDL_HAPTIC_SINE:
diff --git a/src/haptic/linux/SDL_syshaptic.c b/src/haptic/linux/SDL_syshaptic.c
index 1c2500c1e6a5e..4012491964410 100644
--- a/src/haptic/linux/SDL_syshaptic.c
+++ b/src/haptic/linux/SDL_syshaptic.c
@@ -100,7 +100,7 @@ EV_IsHaptic(int fd)
     EV_TEST(FF_CONSTANT, SDL_HAPTIC_CONSTANT);
     EV_TEST(FF_SINE, SDL_HAPTIC_SINE);
     /* !!! FIXME: put this back when we have more bits in 2.1 */
-    /*EV_TEST(FF_SQUARE, SDL_HAPTIC_SQUARE); */
+    /* EV_TEST(FF_SQUARE, SDL_HAPTIC_SQUARE); */
     EV_TEST(FF_TRIANGLE, SDL_HAPTIC_TRIANGLE);
     EV_TEST(FF_SAW_UP, SDL_HAPTIC_SAWTOOTHUP);
     EV_TEST(FF_SAW_DOWN, SDL_HAPTIC_SAWTOOTHDOWN);
@@ -600,7 +600,7 @@ SDL_SYS_ToFFEffect(struct ff_effect *dest, SDL_HapticEffect * src)
 
     case SDL_HAPTIC_SINE:
     /* !!! FIXME: put this back when we have more bits in 2.1 */
-    /*case SDL_HAPTIC_SQUARE: */
+    /* case SDL_HAPTIC_SQUARE: */
     case SDL_HAPTIC_TRIANGLE:
     case SDL_HAPTIC_SAWTOOTHUP:
     case SDL_HAPTIC_SAWTOOTHDOWN:
@@ -625,7 +625,7 @@ SDL_SYS_ToFFEffect(struct ff_effect *dest, SDL_HapticEffect * src)
         if (periodic->type == SDL_HAPTIC_SINE)
             dest->u.periodic.waveform = FF_SINE;
         /* !!! FIXME: put this back when we have more bits in 2.1 */
-        /*else if (periodic->type == SDL_HAPTIC_SQUARE)
+        /* else if (periodic->type == SDL_HAPTIC_SQUARE)
             dest->u.periodic.waveform = FF_SQUARE; */
         else if (periodic->type == SDL_HAPTIC_TRIANGLE)
             dest->u.periodic.waveform = FF_TRIANGLE;
diff --git a/src/haptic/windows/SDL_syshaptic.c b/src/haptic/windows/SDL_syshaptic.c
index 6d77973a6c709..9ba020a8886c2 100644
--- a/src/haptic/windows/SDL_syshaptic.c
+++ b/src/haptic/windows/SDL_syshaptic.c
@@ -304,7 +304,7 @@ DI_EffectCallback(LPCDIEFFECTINFO pei, LPVOID pv)
     EFFECT_TEST(GUID_CustomForce, SDL_HAPTIC_CUSTOM);
     EFFECT_TEST(GUID_Sine, SDL_HAPTIC_SINE);
     /* !!! FIXME: put this back when we have more bits in 2.1 */
-    /*EFFECT_TEST(GUID_Square, SDL_HAPTIC_SQUARE); */
+    /* EFFECT_TEST(GUID_Square, SDL_HAPTIC_SQUARE); */
     EFFECT_TEST(GUID_Triangle, SDL_HAPTIC_TRIANGLE);
     EFFECT_TEST(GUID_SawtoothUp, SDL_HAPTIC_SAWTOOTHUP);
     EFFECT_TEST(GUID_SawtoothDown, SDL_HAPTIC_SAWTOOTHDOWN);
@@ -936,7 +936,7 @@ SDL_SYS_ToDIEFFECT(SDL_Haptic * haptic, DIEFFECT * dest,
 
     case SDL_HAPTIC_SINE:
     /* !!! FIXME: put this back when we have more bits in 2.1 */
-    /*case SDL_HAPTIC_SQUARE: */
+    /* case SDL_HAPTIC_SQUARE: */
     case SDL_HAPTIC_TRIANGLE:
     case SDL_HAPTIC_SAWTOOTHUP:
     case SDL_HAPTIC_SAWTOOTHDOWN:
@@ -1165,7 +1165,7 @@ SDL_SYS_HapticEffectType(SDL_HapticEffect * effect)
         return &GUID_RampForce;
 
     /* !!! FIXME: put this back when we have more bits in 2.1 */
-    /*case SDL_HAPTIC_SQUARE:
+    /* case SDL_HAPTIC_SQUARE:
         return &GUID_Square; */
 
     case SDL_HAPTIC_SINE:
diff --git a/src/libm/e_atan2.c b/src/libm/e_atan2.c
index f2aa236003a6c..f7b91a3e1b6ee 100644
--- a/src/libm/e_atan2.c
+++ b/src/libm/e_atan2.c
@@ -81,8 +81,8 @@ double attribute_hidden __ieee754_atan2(double y, double x)
 		switch(m) {
 		    case 0: return  pi_o_4+tiny;/* atan(+INF,+INF) */
 		    case 1: return -pi_o_4-tiny;/* atan(-INF,+INF) */
-		    case 2: return  3.0*pi_o_4+tiny;/*atan(+INF,-INF) */
-		    case 3: return -3.0*pi_o_4-tiny;/*atan(-INF,-INF) */
+		    case 2: return  3.0*pi_o_4+tiny;/* atan(+INF,-INF) */
+		    case 3: return -3.0*pi_o_4-tiny;/* atan(-INF,-INF) */
 		}
 	    } else {
 		switch(m) {
diff --git a/src/libm/e_pow.c b/src/libm/e_pow.c
index 9145c4b576795..686da2e5564d8 100644
--- a/src/libm/e_pow.c
+++ b/src/libm/e_pow.c
@@ -178,7 +178,7 @@ libm_hidden_proto(scalbn)
          /* special value of x */
          if (lx == 0) {
              if (ix == 0x7ff00000 || ix == 0 || ix == 0x3ff00000) {
-                 z = ax;        /*x is +-0,+-inf,+-1 */
+                 z = ax;        /* x is +-0,+-inf,+-1 */
                  if (hy < 0)
                      z = one / z;       /* z = (1/|x|) */
                  if (hx < 0) {
diff --git a/src/libm/math_private.h b/src/libm/math_private.h
index 9a08b103bdf98..6ab0f35fdaa63 100644
--- a/src/libm/math_private.h
+++ b/src/libm/math_private.h
@@ -17,9 +17,9 @@
 #ifndef _MATH_PRIVATE_H_
 #define _MATH_PRIVATE_H_
 
-/*#include <endian.h> */
+/* #include <endian.h> */
 #include "SDL_endian.h"
-/*#include <sys/types.h> */
+/* #include <sys/types.h> */
 
 #define attribute_hidden
 #define libm_hidden_proto(x)
diff --git a/src/libm/s_scalbn.c b/src/libm/s_scalbn.c
index 74b97944502ed..f824e926d70b8 100644
--- a/src/libm/s_scalbn.c
+++ b/src/libm/s_scalbn.c
@@ -54,7 +54,7 @@ libm_hidden_proto(scalbn)
         GET_HIGH_WORD(hx, x);
         k = ((hx & 0x7ff00000) >> 20) - 54;
         if (n < -50000)
-            return tiny * x;    /*underflow */
+            return tiny * x;    /* underflow */
     }
     if (k == 0x7ff)
         return x + x;           /* NaN or Inf */
@@ -67,9 +67,9 @@ libm_hidden_proto(scalbn)
     }
     if (k <= -54) {
         if (n > 50000)          /* in case integer overflow in n+k */
-            return huge_val * copysign(huge_val, x);    /*overflow */
+            return huge_val * copysign(huge_val, x);    /* overflow */
         else
-            return tiny * copysign(tiny, x);    /*underflow */
+            return tiny * copysign(tiny, x);    /* underflow */
     }
     k += 54;                    /* subnormal result */
     SET_HIGH_WORD(x, (hx & 0x800fffff) | (k << 20));
diff --git a/src/main/android/SDL_android_main.c b/src/main/android/SDL_android_main.c
index e2889dbc94cc0..8f00f39d9027a 100644
--- a/src/main/android/SDL_android_main.c
+++ b/src/main/android/SDL_android_main.c
@@ -30,7 +30,7 @@ void Java_org_libsdl_app_SDLActivity_nativeInit(JNIEnv* env, jclass cls, jobject
     status = SDL_main(1, argv);
 
     /* Do not issue an exit or the whole application will terminate instead of just the SDL thread */
-    /*exit(status); */
+    /* exit(status); */
 }
 
 #endif /* __ANDROID__ */
diff --git a/src/render/SDL_yuv_sw.c b/src/render/SDL_yuv_sw.c
index 257704524f9a6..46b680cd8398a 100644
--- a/src/render/SDL_yuv_sw.c
+++ b/src/render/SDL_yuv_sw.c
@@ -958,10 +958,10 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
             if (SDL_HasMMX() && (Rmask == 0xF800) &&
                 (Gmask == 0x07E0) && (Bmask == 0x001F)
                 && (swdata->w & 15) == 0) {
-/*printf("Using MMX 16-bit 565 dither\n"); */
+/* printf("Using MMX 16-bit 565 dither\n"); */
                 swdata->Display1X = Color565DitherYV12MMX1X;
             } else {
-/*printf("Using C 16-bit dither\n"); */
+/* printf("Using C 16-bit dither\n"); */
                 swdata->Display1X = Color16DitherYV12Mod1X;
             }
 #else
@@ -979,10 +979,10 @@ SDL_SW_SetupYUVDisplay(SDL_SW_YUVTexture * swdata, Uint32 target_format)
             if (SDL_HasMMX() && (Rmask == 0x00FF0000) &&
                 (Gmask == 0x0000FF00) &&
                 (Bmask == 0x000000FF) && (swdata->w & 15) == 0) {
-/*printf("Using MMX 32-bit dither\n"); */
+/* printf("Using MMX 32-bit dither\n"); */
                 swdata->Display1X = ColorRGBDitherYV12MMX1X;
             } else {
-/*printf("Using C 32-bit dither\n"); */
+/* printf("Using C 32-bit dither\n"); */
                 swdata->Display1X = Color32DitherYV12Mod1X;
             }
 #else
diff --git a/src/render/direct3d/SDL_render_d3d.c b/src/render/direct3d/SDL_render_d3d.c
index a0989449450b9..6e72b30d3143b 100644
--- a/src/render/direct3d/SDL_render_d3d.c
+++ b/src/render/direct3d/SDL_render_d3d.c
@@ -874,7 +874,7 @@ GetScaleQuality(void)
 
     if (!hint || *hint == '0' || SDL_strcasecmp(hint, "nearest") == 0) {
         return D3DTEXF_POINT;
-    } else /*if (*hint == '1' || SDL_strcasecmp(hint, "linear") == 0) */ {
+    } else /* if (*hint == '1' || SDL_strcasecmp(hint, "linear") == 0) */ {
         return D3DTEXF_LINEAR;
     }
 }
diff --git a/src/render/opengl/SDL_render_gl.c b/src/render/opengl/SDL_render_gl.c
index facb89e98529a..b1473b07baa95 100644
--- a/src/render/opengl/SDL_render_gl.c
+++ b/src/render/opengl/SDL_render_gl.c
@@ -310,7 +310,7 @@ GL_ResetState(SDL_Renderer *renderer)
     data->glDisable(GL_DEPTH_TEST);
     data->glDisable(GL_CULL_FACE);
     /* This ended up causing video discrepancies between OpenGL and Direct3D */
-    /*data->glEnable(GL_LINE_SMOOTH); */
+    /* data->glEnable(GL_LINE_SMOOTH); */
 
     data->glMatrixMode(GL_MODELVIEW);
     data->glLoadIdentity();
@@ -638,7 +638,7 @@ GL_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
         return -1;
     }
     if ((renderdata->GL_ARB_texture_rectangle_supported)
-        /*&& texture->access != SDL_TEXTUREACCESS_TARGET */){
+        /* && texture->access != SDL_TEXTUREACCESS_TARGET */){
         data->type = GL_TEXTURE_RECTANGLE_ARB;
         texture_w = texture->w;
         texture_h = texture->h;
diff --git a/src/render/opengl/SDL_shaders_gl.c b/src/render/opengl/SDL_shaders_gl.c
index 162713ea7dced..ebf641bb2bc07 100644
--- a/src/render/opengl/SDL_shaders_gl.c
+++ b/src/render/opengl/SDL_shaders_gl.c
@@ -30,7 +30,7 @@
 
 /* OpenGL shader implementation */
 
-/*#define DEBUG_SHADERS */
+/* #define DEBUG_SHADERS */
 
 typedef struct
 {
diff --git a/src/render/software/SDL_rotate.c b/src/render/software/SDL_rotate.c
index 538d10c5c5558..628c8d534920b 100644
--- a/src/render/software/SDL_rotate.c
+++ b/src/render/software/SDL_rotate.c
@@ -42,7 +42,7 @@ Andreas Schiffler -- aschiffler at ferzkopp dot net
 
 /* ---- Internally used structures */
 
-/*!
+/* !
 \brief A 32 bit RGBA pixel.
 */
 typedef struct tColorRGBA {
@@ -52,19 +52,19 @@ typedef struct tColorRGBA {
     Uint8 a;
 } tColorRGBA;
 
-/*!
+/* !
 \brief A 8bit Y/palette pixel.
 */
 typedef struct tColorY {
     Uint8 y;
 } tColorY;
 
-/*!
+/* !
 \brief Returns maximum of two numbers a and b.
 */
 #define MAX(a,b)    (((a) > (b)) ? (a) : (b))
 
-/*!
+/* !
 \brief Number of guard rows added to destination surfaces.
 
 This is a simple but effective workaround for observed issues.
@@ -76,12 +76,12 @@ to a situation where the program can segfault.
 */
 #define GUARD_ROWS (2)
 
-/*!
+/* !
 \brief Lower limit of absolute zoom factor or rotation degrees.
 */
 #define VALUE_LIMIT 0.001
 
-/*!
+/* !
 \brief Returns colorkey info for a surface
 */
 Uint32 _colorkey(SDL_Surface *src)
@@ -92,7 +92,7 @@ Uint32 _colorkey(SDL_Surface *src)
 }
 
 
-/*!
+/* !
 \brief Internal target surface sizing function for rotations with trig result return.
 
 \param width The source surface width.
@@ -134,7 +134,7 @@ void _rotozoomSurfaceSizeTrig(int width, int height, double angle,
 }
 
 
-/*!
+/* !
 \brief Internal 32 bit rotozoomer with optional anti-aliasing.
 
 Rotates and zooms 32 bit RGBA/ABGR 'src' surface to 'dst' surface based on the control
@@ -252,7 +252,7 @@ void _transformSurfaceRGBA(SDL_Surface * src, SDL_Surface * dst, int cx, int cy,
     }
 }
 
-/*!
+/* !
 
 \brief Rotates and zooms 8 bit palette/Y 'src' surface to 'dst' surface without smoothing.
 
@@ -317,7 +317,7 @@ void transformSurfaceY(SDL_Surface * src, SDL_Surface * dst, int cx, int cy, int
 
 
 
-/*!
+/* !
 \brief Rotates and zooms a surface with different horizontal and vertival scaling factors and optional anti-aliasing.
 
 Rotates a 32bit or 8bit 'src' surface to newly created 'dst' surface.
@@ -357,7 +357,7 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
     if (src == NULL)
         return (NULL);
 
-    if (src->flags & SDL_TRUE/*SDL_SRCCOLORKEY */)
+    if (src->flags & SDL_TRUE/* SDL_SRCCOLORKEY */)
     {
         colorkey = _colorkey(src);
         SDL_GetRGB(colorkey, src->format, &r, &g, &b);
@@ -391,14 +391,14 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
         SDL_BlitSurface(src, NULL, rz_src, NULL);
 
         if(colorKeyAvailable)
-            SDL_SetColorKey(src, SDL_TRUE /*SDL_SRCCOLORKEY */, colorkey);
+            SDL_SetColorKey(src, SDL_TRUE /* SDL_SRCCOLORKEY */, colorkey);
         src_converted = 1;
         is32bit = 1;
     }
 
 
     /* Determine target size */
-    /*_rotozoomSurfaceSizeTrig(rz_src->w, rz_src->h, angle, &dstwidth, &dstheight, &cangle, &sangle); */
+    /* _rotozoomSurfaceSizeTrig(rz_src->w, rz_src->h, angle, &dstwidth, &dstheight, &cangle, &sangle); */
 
     /*
     * Calculate target factors from sin/cos and zoom
@@ -459,8 +459,8 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
         /*
         * Turn on source-alpha support
         */
-        /*SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255); */
-        SDL_SetColorKey(rz_dst, /*SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
+        /* SDL_SetAlpha(rz_dst, SDL_SRCALPHA, 255); */
+        SDL_SetColorKey(rz_dst, /* SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
     } else {
         /*
         * Copy palette and colorkey info
@@ -475,7 +475,7 @@ SDL_Surface *_rotateSurface(SDL_Surface * src, double angle, int centerx, int ce
         transformSurfaceY(rz_src, rz_dst, centerx, centery,
             (int) (sangleinv), (int) (cangleinv),
             flipx, flipy);
-        SDL_SetColorKey(rz_dst, /*SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
+        SDL_SetColorKey(rz_dst, /* SDL_SRCCOLORKEY */ SDL_TRUE | SDL_RLEACCEL, _colorkey(rz_src));
     }
     /*
     * Unlock source surface
diff --git a/src/test/SDL_test_assert.c b/src/test/SDL_test_assert.c
index 41a3df68fd98e..6f08d1f5ba58f 100644
--- a/src/test/SDL_test_assert.c
+++ b/src/test/SDL_test_assert.c
@@ -35,10 +35,10 @@ const char *SDLTest_AssertCheckFormat = "Assert '%s': %s";
 /* Assert summary message format */
 const char *SDLTest_AssertSummaryFormat = "Assert Summary: Total=%d Passed=%d Failed=%d";
 
-/*! \brief counts the failed asserts */
+/* ! \brief counts the failed asserts */
 static Uint32 SDLTest_AssertsFailed = 0;
 
-/*! \brief counts the passed asserts */
+/* ! \brief counts the passed asserts */
 static Uint32 SDLTest_AssertsPassed = 0;
 
 /*
diff --git a/src/test/SDL_test_font.c b/src/test/SDL_test_font.c
index 144bcad02a746..b7d2caa2ddec5 100644
--- a/src/test/SDL_test_font.c
+++ b/src/test/SDL_test_font.c
@@ -1569,7 +1569,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 128 0x80 '�'
+    * 128 0x80 '�'
     */
     0x7c,           /* 01111100 */
     0xc6,           /* 11000110 */
@@ -1581,7 +1581,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x78,           /* 01111000 */
 
     /*
-    * 129 0x81 '�'
+    * 129 0x81 '�'
     */
     0xcc,           /* 11001100 */
     0x00,           /* 00000000 */
@@ -1593,7 +1593,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 130 0x82 '�'
+    * 130 0x82 '�'
     */
     0x0c,           /* 00001100 */
     0x18,           /* 00011000 */
@@ -1605,7 +1605,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 131 0x83 '�'
+    * 131 0x83 '�'
     */
     0x7c,           /* 01111100 */
     0x82,           /* 10000010 */
@@ -1617,7 +1617,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 132 0x84 '�'
+    * 132 0x84 '�'
     */
     0xc6,           /* 11000110 */
     0x00,           /* 00000000 */
@@ -1629,7 +1629,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 133 0x85 '�'
+    * 133 0x85 '�'
     */
     0x30,           /* 00110000 */
     0x18,           /* 00011000 */
@@ -1641,7 +1641,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 134 0x86 '�'
+    * 134 0x86 '�'
     */
     0x30,           /* 00110000 */
     0x30,           /* 00110000 */
@@ -1653,7 +1653,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 135 0x87 '�'
+    * 135 0x87 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -1665,7 +1665,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x38,           /* 00111000 */
 
     /*
-    * 136 0x88 '�'
+    * 136 0x88 '�'
     */
     0x7c,           /* 01111100 */
     0x82,           /* 10000010 */
@@ -1677,7 +1677,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 137 0x89 '�'
+    * 137 0x89 '�'
     */
     0xc6,           /* 11000110 */
     0x00,           /* 00000000 */
@@ -1689,7 +1689,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 138 0x8a '�'
+    * 138 0x8a '�'
     */
     0x30,           /* 00110000 */
     0x18,           /* 00011000 */
@@ -1701,7 +1701,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 139 0x8b '�'
+    * 139 0x8b '�'
     */
     0x66,           /* 01100110 */
     0x00,           /* 00000000 */
@@ -1713,7 +1713,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 140 0x8c '�'
+    * 140 0x8c '�'
     */
     0x7c,           /* 01111100 */
     0x82,           /* 10000010 */
@@ -1725,7 +1725,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 141 0x8d '�'
+    * 141 0x8d '�'
     */
     0x30,           /* 00110000 */
     0x18,           /* 00011000 */
@@ -1737,7 +1737,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 142 0x8e '�'
+    * 142 0x8e '�'
     */
     0xc6,           /* 11000110 */
     0x38,           /* 00111000 */
@@ -1749,7 +1749,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 143 0x8f '�'
+    * 143 0x8f '�'
     */
     0x38,           /* 00111000 */
     0x6c,           /* 01101100 */
@@ -1761,7 +1761,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 144 0x90 '�'
+    * 144 0x90 '�'
     */
     0x18,           /* 00011000 */
     0x30,           /* 00110000 */
@@ -1773,7 +1773,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 145 0x91 '�'
+    * 145 0x91 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -1785,7 +1785,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 146 0x92 '�'
+    * 146 0x92 '�'
     */
     0x3e,           /* 00111110 */
     0x6c,           /* 01101100 */
@@ -1797,7 +1797,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 147 0x93 '�'
+    * 147 0x93 '�'
     */
     0x7c,           /* 01111100 */
     0x82,           /* 10000010 */
@@ -1809,7 +1809,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 148 0x94 '�'
+    * 148 0x94 '�'
     */
     0xc6,           /* 11000110 */
     0x00,           /* 00000000 */
@@ -1821,7 +1821,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 149 0x95 '�'
+    * 149 0x95 '�'
     */
     0x30,           /* 00110000 */
     0x18,           /* 00011000 */
@@ -1833,7 +1833,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 150 0x96 '�'
+    * 150 0x96 '�'
     */
     0x78,           /* 01111000 */
     0x84,           /* 10000100 */
@@ -1845,7 +1845,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 151 0x97 '�'
+    * 151 0x97 '�'
     */
     0x60,           /* 01100000 */
     0x30,           /* 00110000 */
@@ -1857,7 +1857,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 152 0x98 '�'
+    * 152 0x98 '�'
     */
     0xc6,           /* 11000110 */
     0x00,           /* 00000000 */
@@ -1869,7 +1869,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0xfc,           /* 11111100 */
 
     /*
-    * 153 0x99 '�'
+    * 153 0x99 '�'
     */
     0xc6,           /* 11000110 */
     0x38,           /* 00111000 */
@@ -1881,7 +1881,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 154 0x9a '�'
+    * 154 0x9a '�'
     */
     0xc6,           /* 11000110 */
     0x00,           /* 00000000 */
@@ -1893,7 +1893,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 155 0x9b '�'
+    * 155 0x9b '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -1905,7 +1905,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 156 0x9c '�'
+    * 156 0x9c '�'
     */
     0x38,           /* 00111000 */
     0x6c,           /* 01101100 */
@@ -1917,7 +1917,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 157 0x9d '�'
+    * 157 0x9d '�'
     */
     0x66,           /* 01100110 */
     0x66,           /* 01100110 */
@@ -1929,7 +1929,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 158 0x9e '�'
+    * 158 0x9e '�'
     */
     0xf8,           /* 11111000 */
     0xcc,           /* 11001100 */
@@ -1941,7 +1941,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0xc7,           /* 11000111 */
 
     /*
-    * 159 0x9f '�'
+    * 159 0x9f '�'
     */
     0x0e,           /* 00001110 */
     0x1b,           /* 00011011 */
@@ -1953,7 +1953,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 160 0xa0 '�'
+    * 160 0xa0 '�'
     */
     0x18,           /* 00011000 */
     0x30,           /* 00110000 */
@@ -1965,7 +1965,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 161 0xa1 '�'
+    * 161 0xa1 '�'
     */
     0x0c,           /* 00001100 */
     0x18,           /* 00011000 */
@@ -1977,7 +1977,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 162 0xa2 '�'
+    * 162 0xa2 '�'
     */
     0x0c,           /* 00001100 */
     0x18,           /* 00011000 */
@@ -1989,7 +1989,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 163 0xa3 '�'
+    * 163 0xa3 '�'
     */
     0x18,           /* 00011000 */
     0x30,           /* 00110000 */
@@ -2001,7 +2001,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 164 0xa4 '�'
+    * 164 0xa4 '�'
     */
     0x76,           /* 01110110 */
     0xdc,           /* 11011100 */
@@ -2013,7 +2013,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 165 0xa5 '�'
+    * 165 0xa5 '�'
     */
     0x76,           /* 01110110 */
     0xdc,           /* 11011100 */
@@ -2025,7 +2025,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 166 0xa6 '�'
+    * 166 0xa6 '�'
     */
     0x3c,           /* 00111100 */
     0x6c,           /* 01101100 */
@@ -2037,7 +2037,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 167 0xa7 '�'
+    * 167 0xa7 '�'
     */
     0x38,           /* 00111000 */
     0x6c,           /* 01101100 */
@@ -2049,7 +2049,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 168 0xa8 '�'
+    * 168 0xa8 '�'
     */
     0x18,           /* 00011000 */
     0x00,           /* 00000000 */
@@ -2061,7 +2061,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 169 0xa9 '�'
+    * 169 0xa9 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2073,7 +2073,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 170 0xaa '�'
+    * 170 0xaa '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2085,7 +2085,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 171 0xab '�'
+    * 171 0xab '�'
     */
     0x63,           /* 01100011 */
     0xe6,           /* 11100110 */
@@ -2097,7 +2097,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x0f,           /* 00001111 */
 
     /*
-    * 172 0xac '�'
+    * 172 0xac '�'
     */
     0x63,           /* 01100011 */
     0xe6,           /* 11100110 */
@@ -2109,7 +2109,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x06,           /* 00000110 */
 
     /*
-    * 173 0xad '�'
+    * 173 0xad '�'
     */
     0x18,           /* 00011000 */
     0x00,           /* 00000000 */
@@ -2121,7 +2121,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 174 0xae '�'
+    * 174 0xae '�'
     */
     0x00,           /* 00000000 */
     0x33,           /* 00110011 */
@@ -2133,7 +2133,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 175 0xaf '�'
+    * 175 0xaf '�'
     */
     0x00,           /* 00000000 */
     0xcc,           /* 11001100 */
@@ -2145,7 +2145,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 176 0xb0 '�'
+    * 176 0xb0 '�'
     */
     0x22,           /* 00100010 */
     0x88,           /* 10001000 */
@@ -2157,7 +2157,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x88,           /* 10001000 */
 
     /*
-    * 177 0xb1 '�'
+    * 177 0xb1 '�'
     */
     0x55,           /* 01010101 */
     0xaa,           /* 10101010 */
@@ -2169,7 +2169,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0xaa,           /* 10101010 */
 
     /*
-    * 178 0xb2 '�'
+    * 178 0xb2 '�'
     */
     0x77,           /* 01110111 */
     0xdd,           /* 11011101 */
@@ -2181,7 +2181,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0xdd,           /* 11011101 */
 
     /*
-    * 179 0xb3 '�'
+    * 179 0xb3 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2193,7 +2193,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 180 0xb4 '�'
+    * 180 0xb4 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2205,7 +2205,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 181 0xb5 '�'
+    * 181 0xb5 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2217,7 +2217,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 182 0xb6 '�'
+    * 182 0xb6 '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2229,7 +2229,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 183 0xb7 '�'
+    * 183 0xb7 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2241,7 +2241,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 184 0xb8 '�'
+    * 184 0xb8 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2253,7 +2253,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 185 0xb9 '�'
+    * 185 0xb9 '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2265,7 +2265,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 186 0xba '�'
+    * 186 0xba '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2277,7 +2277,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 187 0xbb '�'
+    * 187 0xbb '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2289,7 +2289,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 188 0xbc '�'
+    * 188 0xbc '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2301,7 +2301,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 189 0xbd '�'
+    * 189 0xbd '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2313,7 +2313,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 190 0xbe '�'
+    * 190 0xbe '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2325,7 +2325,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 191 0xbf '�'
+    * 191 0xbf '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2337,7 +2337,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 192 0xc0 '�'
+    * 192 0xc0 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2349,7 +2349,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 193 0xc1 '�'
+    * 193 0xc1 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2361,7 +2361,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 194 0xc2 '�'
+    * 194 0xc2 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2373,7 +2373,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 195 0xc3 '�'
+    * 195 0xc3 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2385,7 +2385,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 196 0xc4 '�'
+    * 196 0xc4 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2397,7 +2397,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 197 0xc5 '�'
+    * 197 0xc5 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2409,7 +2409,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 198 0xc6 '�'
+    * 198 0xc6 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2421,7 +2421,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 199 0xc7 '�'
+    * 199 0xc7 '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2433,7 +2433,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 200 0xc8 '�'
+    * 200 0xc8 '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2445,7 +2445,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 201 0xc9 '�'
+    * 201 0xc9 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2457,7 +2457,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 202 0xca '�'
+    * 202 0xca '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2469,7 +2469,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 203 0xcb '�'
+    * 203 0xcb '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2481,7 +2481,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 204 0xcc '�'
+    * 204 0xcc '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2493,7 +2493,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 205 0xcd '�'
+    * 205 0xcd '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2505,7 +2505,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 206 0xce '�'
+    * 206 0xce '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2517,7 +2517,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 207 0xcf '�'
+    * 207 0xcf '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2529,7 +2529,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 208 0xd0 '�'
+    * 208 0xd0 '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2541,7 +2541,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 209 0xd1 '�'
+    * 209 0xd1 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2553,7 +2553,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 210 0xd2 '�'
+    * 210 0xd2 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2565,7 +2565,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 211 0xd3 '�'
+    * 211 0xd3 '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2577,7 +2577,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 212 0xd4 '�'
+    * 212 0xd4 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2589,7 +2589,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 213 0xd5 '�'
+    * 213 0xd5 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2601,7 +2601,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 214 0xd6 '�'
+    * 214 0xd6 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2613,7 +2613,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 215 0xd7 '�'
+    * 215 0xd7 '�'
     */
     0x36,           /* 00110110 */
     0x36,           /* 00110110 */
@@ -2625,7 +2625,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x36,           /* 00110110 */
 
     /*
-    * 216 0xd8 '�'
+    * 216 0xd8 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2637,7 +2637,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 217 0xd9 '�'
+    * 217 0xd9 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2649,7 +2649,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 218 0xda '�'
+    * 218 0xda '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2661,7 +2661,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 219 0xdb '�'
+    * 219 0xdb '�'
     */
     0xff,           /* 11111111 */
     0xff,           /* 11111111 */
@@ -2673,7 +2673,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0xff,           /* 11111111 */
 
     /*
-    * 220 0xdc '�'
+    * 220 0xdc '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2685,7 +2685,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0xff,           /* 11111111 */
 
     /*
-    * 221 0xdd '�'
+    * 221 0xdd '�'
     */
     0xf0,           /* 11110000 */
     0xf0,           /* 11110000 */
@@ -2697,7 +2697,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0xf0,           /* 11110000 */
 
     /*
-    * 222 0xde '�'
+    * 222 0xde '�'
     */
     0x0f,           /* 00001111 */
     0x0f,           /* 00001111 */
@@ -2709,7 +2709,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x0f,           /* 00001111 */
 
     /*
-    * 223 0xdf '�'
+    * 223 0xdf '�'
     */
     0xff,           /* 11111111 */
     0xff,           /* 11111111 */
@@ -2721,7 +2721,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 224 0xe0 '�'
+    * 224 0xe0 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2733,7 +2733,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 225 0xe1 '�'
+    * 225 0xe1 '�'
     */
     0x78,           /* 01111000 */
     0xcc,           /* 11001100 */
@@ -2745,7 +2745,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 226 0xe2 '�'
+    * 226 0xe2 '�'
     */
     0xfe,           /* 11111110 */
     0xc6,           /* 11000110 */
@@ -2757,7 +2757,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 227 0xe3 '�'
+    * 227 0xe3 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2769,7 +2769,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 228 0xe4 '�'
+    * 228 0xe4 '�'
     */
     0xfe,           /* 11111110 */
     0xc6,           /* 11000110 */
@@ -2781,7 +2781,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 229 0xe5 '�'
+    * 229 0xe5 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2793,7 +2793,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 230 0xe6 '�'
+    * 230 0xe6 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2805,7 +2805,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0xc0,           /* 11000000 */
 
     /*
-    * 231 0xe7 '�'
+    * 231 0xe7 '�'
     */
     0x00,           /* 00000000 */
     0x76,           /* 01110110 */
@@ -2817,7 +2817,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 232 0xe8 '�'
+    * 232 0xe8 '�'
     */
     0x7e,           /* 01111110 */
     0x18,           /* 00011000 */
@@ -2829,7 +2829,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x7e,           /* 01111110 */
 
     /*
-    * 233 0xe9 '�'
+    * 233 0xe9 '�'
     */
     0x38,           /* 00111000 */
     0x6c,           /* 01101100 */
@@ -2841,7 +2841,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 234 0xea '�'
+    * 234 0xea '�'
     */
     0x38,           /* 00111000 */
     0x6c,           /* 01101100 */
@@ -2853,7 +2853,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 235 0xeb '�'
+    * 235 0xeb '�'
     */
     0x0e,           /* 00001110 */
     0x18,           /* 00011000 */
@@ -2865,7 +2865,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 236 0xec '�'
+    * 236 0xec '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -2877,7 +2877,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 237 0xed '�'
+    * 237 0xed '�'
     */
     0x06,           /* 00000110 */
     0x0c,           /* 00001100 */
@@ -2889,7 +2889,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0xc0,           /* 11000000 */
 
     /*
-    * 238 0xee '�'
+    * 238 0xee '�'
     */
     0x1e,           /* 00011110 */
     0x30,           /* 00110000 */
@@ -2901,7 +2901,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 239 0xef '�'
+    * 239 0xef '�'
     */
     0x00,           /* 00000000 */
     0x7c,           /* 01111100 */
@@ -2913,7 +2913,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 240 0xf0 '�'
+    * 240 0xf0 '�'
     */
     0x00,           /* 00000000 */
     0xfe,           /* 11111110 */
@@ -2925,7 +2925,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 241 0xf1 '�'
+    * 241 0xf1 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2937,7 +2937,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 242 0xf2 '�'
+    * 242 0xf2 '�'
     */
     0x30,           /* 00110000 */
     0x18,           /* 00011000 */
@@ -2949,7 +2949,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 243 0xf3 '�'
+    * 243 0xf3 '�'
     */
     0x0c,           /* 00001100 */
     0x18,           /* 00011000 */
@@ -2961,7 +2961,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 244 0xf4 '�'
+    * 244 0xf4 '�'
     */
     0x0e,           /* 00001110 */
     0x1b,           /* 00011011 */
@@ -2973,7 +2973,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x18,           /* 00011000 */
 
     /*
-    * 245 0xf5 '�'
+    * 245 0xf5 '�'
     */
     0x18,           /* 00011000 */
     0x18,           /* 00011000 */
@@ -2985,7 +2985,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x70,           /* 01110000 */
 
     /*
-    * 246 0xf6 '�'
+    * 246 0xf6 '�'
     */
     0x00,           /* 00000000 */
     0x18,           /* 00011000 */
@@ -2997,7 +2997,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 247 0xf7 '�'
+    * 247 0xf7 '�'
     */
     0x00,           /* 00000000 */
     0x76,           /* 01110110 */
@@ -3009,7 +3009,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 248 0xf8 '�'
+    * 248 0xf8 '�'
     */
     0x38,           /* 00111000 */
     0x6c,           /* 01101100 */
@@ -3021,7 +3021,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 249 0xf9 '�'
+    * 249 0xf9 '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -3033,7 +3033,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 250 0xfa '�'
+    * 250 0xfa '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -3045,7 +3045,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 251 0xfb '�'
+    * 251 0xfb '�'
     */
     0x0f,           /* 00001111 */
     0x0c,           /* 00001100 */
@@ -3057,7 +3057,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x1c,           /* 00011100 */
 
     /*
-    * 252 0xfc '�'
+    * 252 0xfc '�'
     */
     0x6c,           /* 01101100 */
     0x36,           /* 00110110 */
@@ -3069,7 +3069,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 253 0xfd '�'
+    * 253 0xfd '�'
     */
     0x78,           /* 01111000 */
     0x0c,           /* 00001100 */
@@ -3081,7 +3081,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
     0x00,           /* 00000000 */
 
     /*
-    * 254 0xfe '�'
+    * 254 0xfe '�'
     */
     0x00,           /* 00000000 */
     0x00,           /* 00000000 */
@@ -3109,7 +3109,7 @@ static unsigned char SDLTest_FontData[SDL_TESTFONTDATAMAX] = {
 
 /* ---- Character */
 
-/*!
+/* !
 \brief Global cache for 8x8 pixel font textures created at runtime.
 */
 static SDL_Texture *SDLTest_CharTextureCache[256];
diff --git a/src/test/SDL_test_fuzzer.c b/src/test/SDL_test_fuzzer.c
index 8a27fd0117530..d090c150c6e20 100644
--- a/src/test/SDL_test_fuzzer.c
+++ b/src/test/SDL_test_fuzzer.c
@@ -173,7 +173,7 @@ SDLTest_RandomIntegerInRange(Sint32 pMin, Sint32 pMax)
     return (Sint32)((number % ((max + 1) - min)) + min);
 }
 
-/*!
+/* !
  * Generates a unsigned boundary value between the given boundaries.
  * Boundary values are inclusive. See the examples below.
  * If boundary2 < boundary1, the values are swapped.
@@ -303,7 +303,7 @@ SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL_bool v
                 validDomain);
 }
 
-/*!
+/* !
  * Generates a signed boundary value between the given boundaries.
  * Boundary values are inclusive. See the examples below.
  * If boundary2 < boundary1, the values are swapped.
diff --git a/src/test/SDL_test_harness.c b/src/test/SDL_test_harness.c
index 291874566fc53..c58eae45ac126 100644
--- a/src/test/SDL_test_harness.c
+++ b/src/test/SDL_test_harness.c
@@ -37,7 +37,7 @@ const char *SDLTest_LogSummaryFormat = "%s Summary: Total=%d Passed=%d Failed=%d
 /* Final result message format */
 const char *SDLTest_FinalResultFormat = ">>> %s '%s': %s\n";
 
-/*! \brief Timeout for single test case execution */
+/* ! \brief Timeout for single test case execution */
 static Uint32 SDLTest_TestCaseTimeout = 3600;
 
 /**
diff --git a/src/test/SDL_test_log.c b/src/test/SDL_test_log.c
index c854c0f7d251b..caf3ddde43304 100644
--- a/src/test/SDL_test_log.c
+++ b/src/test/SDL_test_log.c
@@ -39,7 +39,7 @@
 
 #include "SDL_test.h"
 
-/*!
+/* !
  * Converts unix timestamp to its ascii representation in localtime
  *
  * Note: Uses a static buffer internally, so the return value
diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
index 81d93f7ab26cd..108f0b394b70e 100644
--- a/src/video/SDL_bmp.c
+++ b/src/video/SDL_bmp.c
@@ -97,23 +97,23 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
 
     /* The Win32 BMP file header (14 bytes) */
     char magic[2];
-    /*Uint32 bfSize = 0; */
-    /*Uint16 bfReserved1 = 0; */
-    /*Uint16 bfReserved2 = 0; */
+    /* Uint32 bfSize = 0; */
+    /* Uint16 bfReserved1 = 0; */
+    /* Uint16 bfReserved2 = 0; */
     Uint32 bfOffBits = 0;
 
     /* The Win32 BITMAPINFOHEADER struct (40 bytes) */
     Uint32 biSize = 0;
     Sint32 biWidth = 0;
     Sint32 biHeight = 0;
-    /*Uint16 biPlanes = 0; */
+    /* Uint16 biPlanes = 0; */
     Uint16 biBitCount = 0;
     Uint32 biCompression = 0;
-    /*Uint32 biSizeImage = 0; */
-    /*Sint32 biXPelsPerMeter = 0; */
-    /*Sint32 biYPelsPerMeter = 0; */
+    /* Uint32 biSizeImage = 0; */
+    /* Sint32 biXPelsPerMeter = 0; */
+    /* Sint32 biYPelsPerMeter = 0; */
     Uint32 biClrUsed = 0;
-    /*Uint32 biClrImportant = 0; */
+    /* Uint32 biClrImportant = 0; */
 
     /* Make sure we are passed a valid data source */
     surface = NULL;
@@ -136,9 +136,9 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
         was_error = SDL_TRUE;
         goto done;
     }
-    /*bfSize = */ SDL_ReadLE32(src);
-    /*bfReserved1 = */ SDL_ReadLE16(src);
-    /*bfReserved2 = */ SDL_ReadLE16(src);
+    /* bfSize = */ SDL_ReadLE32(src);
+    /* bfReserved1 = */ SDL_ReadLE16(src);
+    /* bfReserved2 = */ SDL_ReadLE16(src);
     bfOffBits = SDL_ReadLE32(src);
 
     /* Read the Win32 BITMAPINFOHEADER */
@@ -146,20 +146,20 @@ SDL_LoadBMP_RW(SDL_RWops * src, int freesrc)
     if (biSize == 12) {
         biWidth = (Uint32) SDL_ReadLE16(src);
         biHeight = (Uint32) SDL_ReadLE16(src);
-        /*biPlanes = */ SDL_ReadLE16(src);
+        /* biPlanes = */ SDL_ReadLE16(src);
         biBitCount = SDL_ReadLE16(src);
         biCompression = BI_RGB;
     } else {
         biWidth = SDL_ReadLE32(src);
         biHeight = SDL_ReadLE32(src);
-        /*biPlanes = */ SDL_ReadLE16(src);
+        /* biPlanes = */ SDL_ReadLE16(src);
         biBitCount = SDL_ReadLE16(src);
         biCompression = SDL_ReadLE32(src);
-        /*biSizeImage = */ SDL_ReadLE32(src);
-        /*biXPelsPerMeter = */ SDL_ReadLE32(src);
-        /*biYPelsPerMeter = */ SDL_ReadLE32(src);
+        /* biSizeImage = */ SDL_ReadLE32(src);
+        /* biXPelsPerMeter = */ SDL_ReadLE32(src);
+        /* biYPelsPerMeter = */ SDL_ReadLE32(src);
         biClrUsed = SDL_ReadLE32(src);
-        /*biClrImportant = */ SDL_ReadLE32(src);
+        /* biClrImportant = */ SDL_ReadLE32(src);
     }
     if (biHeight < 0) {
         topDown = SDL_TRUE;
diff --git a/src/video/SDL_fillrect.c b/src/video/SDL_fillrect.c
index 6e9b8e796b2bf..13236a487fe9d 100644
--- a/src/video/SDL_fillrect.c
+++ b/src/video/SDL_fillrect.c
@@ -119,7 +119,7 @@ SDL_FillRect1SSE(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
 
     SSE_END;
 }
-/*DEFINE_SSE_FILLRECT(1, Uint8) */
+/* DEFINE_SSE_FILLRECT(1, Uint8) */
 DEFINE_SSE_FILLRECT(2, Uint16)
 DEFINE_SSE_FILLRECT(4, Uint32)
 
@@ -212,7 +212,7 @@ SDL_FillRect1MMX(Uint8 *pixels, int pitch, Uint32 color, int w, int h)
 
     MMX_END;
 }
-/*DEFINE_MMX_FILLRECT(1, Uint8) */
+/* DEFINE_MMX_FILLRECT(1, Uint8) */
 DEFINE_MMX_FILLRECT(2, Uint16)
 DEFINE_MMX_FILLRECT(4, Uint32)
 
diff --git a/src/video/SDL_shape.c b/src/video/SDL_shape.c
index 490714de0e51b..308fefce5d761 100644
--- a/src/video/SDL_shape.c
+++ b/src/video/SDL_shape.c
@@ -33,7 +33,7 @@ SDL_Window*
 SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags)
 {
     SDL_Window *result = NULL;
-    result = SDL_CreateWindow(title,-1000,-1000,w,h,(flags | SDL_WINDOW_BORDERLESS) & (~SDL_WINDOW_FULLSCREEN) & (~SDL_WINDOW_RESIZABLE) /*& (~SDL_WINDOW_SHOWN) */);
+    result = SDL_CreateWindow(title,-1000,-1000,w,h,(flags | SDL_WINDOW_BORDERLESS) & (~SDL_WINDOW_FULLSCREEN) & (~SDL_WINDOW_RESIZABLE) /* & (~SDL_WINDOW_SHOWN) */);
     if(result != NULL) {
         result->shaper = SDL_GetVideoDevice()->shape_driver.CreateShaper(result);
         if(result->shaper != NULL) {
diff --git a/src/video/SDL_stretch.c b/src/video/SDL_stretch.c
index b01d2f35eb1eb..3eafc2055d24e 100644
--- a/src/video/SDL_stretch.c
+++ b/src/video/SDL_stretch.c
@@ -38,7 +38,7 @@
      (defined(__GNUC__) && defined(__i386__))) && SDL_ASSEMBLY_ROUTINES
 /* There's a bug with gcc 4.4.1 and -O2 where srcp doesn't get the correct
  * value after the first scanline.  FIXME? */
-/*#define USE_ASM_STRETCH */
+/* #define USE_ASM_STRETCH */
 #endif
 
 #ifdef USE_ASM_STRETCH
diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c
index 9b144cb96d6e5..ee1cf590f1685 100644
--- a/src/video/SDL_surface.c
+++ b/src/video/SDL_surface.c
@@ -963,7 +963,7 @@ SDL_CreateSurfaceOnStack(int width, int height, Uint32 pixel_format,
     surface->h = height;
     surface->pitch = pitch;
     /* We don't actually need to set up the clip rect for our purposes */
-    /*SDL_SetClipRect(surface, NULL); */
+    /* SDL_SetClipRect(surface, NULL); */
 
     /* Allocate an empty mapping */
     SDL_zerop(blitmap);
diff --git a/src/video/bwindow/SDL_BWin.h b/src/video/bwindow/SDL_BWin.h
index d61b5c225eac1..6b6a71e41c352 100644
--- a/src/video/bwindow/SDL_BWin.h
+++ b/src/video/bwindow/SDL_BWin.h
@@ -353,7 +353,7 @@ class SDL_BWin:public BDirectWindow
                - CTRL+Q to close window (and other shortcuts)
                - PrintScreen to make screenshot into /boot/home
                - etc.. */
-            /*BDirectWindow::DispatchMessage(msg, target); */
+            /* BDirectWindow::DispatchMessage(msg, target); */
             break;
         }
 
@@ -461,7 +461,7 @@ class SDL_BWin:public BDirectWindow
         msg.AddBool("focusGained", focusGained);
         _PostWindowEvent(msg);
 
-/*FIXME: Why were these here?
+/* FIXME: Why were these here?
  if false: be_app->SetCursor(B_HAND_CURSOR);
  if true:  SDL_SetCursor(NULL); */
     }
diff --git a/src/video/bwindow/SDL_bopengl.h b/src/video/bwindow/SDL_bopengl.h
index 4e1a5cf7c747e..9ec972eeff3fb 100644
--- a/src/video/bwindow/SDL_bopengl.h
+++ b/src/video/bwindow/SDL_bopengl.h
@@ -29,13 +29,13 @@ extern "C" {
 #include "../SDL_sysvideo.h"
 
 
-extern int BE_GL_LoadLibrary(_THIS, const char *path);                  /*FIXME */
-extern void *BE_GL_GetProcAddress(_THIS, const char *proc);             /*FIXME */
-extern void BE_GL_UnloadLibrary(_THIS);                                 /*TODO */
+extern int BE_GL_LoadLibrary(_THIS, const char *path);                  /* FIXME */
+extern void *BE_GL_GetProcAddress(_THIS, const char *proc);             /* FIXME */
+extern void BE_GL_UnloadLibrary(_THIS);                                 /* TODO */
 extern int BE_GL_MakeCurrent(_THIS, SDL_Window * window,
                               SDL_GLContext context);
-extern int BE_GL_SetSwapInterval(_THIS, int interval);                  /*TODO */
-extern int BE_GL_GetSwapInterval(_THIS);                                /*TODO */
+extern int BE_GL_SetSwapInterval(_THIS, int interval);                  /* TODO */
+extern int BE_GL_GetSwapInterval(_THIS);                                /* TODO */
 extern void BE_GL_SwapWindow(_THIS, SDL_Window * window);
 extern SDL_GLContext BE_GL_CreateContext(_THIS, SDL_Window * window);
 extern void BE_GL_DeleteContext(_THIS, SDL_GLContext context);
diff --git a/src/video/directfb/SDL_DirectFB_WM.c b/src/video/directfb/SDL_DirectFB_WM.c
index c9f683cce17fc..83912bdeda413 100644
--- a/src/video/directfb/SDL_DirectFB_WM.c
+++ b/src/video/directfb/SDL_DirectFB_WM.c
@@ -131,7 +131,7 @@ DirectFB_WM_RedrawLayout(_THIS, SDL_Window * window)
     SDL_DFB_CHECK(s->SetBlittingFlags(s, DSBLIT_NOFX));
 
     LoadFont(_this, window);
-    /*s->SetDrawingFlags(s, DSDRAW_BLEND); */
+    /* s->SetDrawingFlags(s, DSDRAW_BLEND); */
     s->SetColor(s, COLOR_EXPAND(t->frame_color));
     /* top */
     for (i = 0; i < t->top_size; i++)
@@ -203,7 +203,7 @@ DirectFB_WM_AdjustWindowLayout(SDL_Window * window, int flags, int w, int h)
     if (!windata->is_managed)
         windata->theme = theme_none;
     else if (flags & SDL_WINDOW_BORDERLESS)
-        /*desc.caps |= DWCAPS_NODECORATION;) */
+        /* desc.caps |= DWCAPS_NODECORATION;) */
         windata->theme = theme_none;
     else if (flags & SDL_WINDOW_FULLSCREEN) {
         windata->theme = theme_none;
diff --git a/src/video/directfb/SDL_DirectFB_events.c b/src/video/directfb/SDL_DirectFB_events.c
index 9c34754fd6afe..cb669bce17759 100644
--- a/src/video/directfb/SDL_DirectFB_events.c
+++ b/src/video/directfb/SDL_DirectFB_events.c
@@ -132,7 +132,7 @@ MotionAllMice(_THIS, int x, int y)
         SDL_Mouse *mouse = SDL_GetMouse(index);
         mouse->x = mouse->last_x = x;
         mouse->y = mouse->last_y = y;
-        /*SDL_SendMouseMotion(devdata->mouse_id[index], 0, x, y, 0); */
+        /* SDL_SendMouseMotion(devdata->mouse_id[index], 0, x, y, 0); */
     }
 #endif
 }
@@ -233,7 +233,7 @@ ProcessWindowEvent(_THIS, SDL_Window *sdlwin, DFBWindowEvent * evt)
         case DWET_KEYDOWN:
             if (!devdata->use_linux_input) {
                 DirectFB_TranslateKey(_this, evt, &keysym, &unicode);
-                /*printf("Scancode %d  %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
+                /* printf("Scancode %d  %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
                 SDL_SendKeyboardKey_ex(0, SDL_PRESSED, keysym.scancode);
                 if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
                     SDL_zero(text);
@@ -369,7 +369,7 @@ ProcessInputEvent(_THIS, DFBInputEvent * ievt)
         case DIET_KEYPRESS:
             kbd_idx = KbdIndex(_this, ievt->device_id);
             DirectFB_TranslateKeyInputEvent(_this, ievt, &keysym, &unicode);
-            /*printf("Scancode %d  %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
+            /* printf("Scancode %d  %d %d\n", keysym.scancode, evt->key_code, evt->key_id); */
             SDL_SendKeyboardKey_ex(kbd_idx, SDL_PRESSED, keysym.scancode);
             if (SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
                 SDL_zero(text);
@@ -742,7 +742,7 @@ DirectFB_InitKeyboard(_THIS)
 void
 DirectFB_QuitKeyboard(_THIS)
 {
-    /*SDL_DFB_DEVICEDATA(_this); */
+    /* SDL_DFB_DEVICEDATA(_this); */
 
     SDL_KeyboardQuit();
 
diff --git a/src/video/directfb/SDL_DirectFB_render.c b/src/video/directfb/SDL_DirectFB_render.c
index e40dcbebae8c6..d1cd49dfcc764 100644
--- a/src/video/directfb/SDL_DirectFB_render.c
+++ b/src/video/directfb/SDL_DirectFB_render.c
@@ -326,8 +326,8 @@ DirectFB_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
 
     if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) {
         /* Rebind the context to the window area and update matrices */
-        /*SDL_CurrentContext = NULL; */
-        /*data->updateSize = SDL_TRUE; */
+        /* SDL_CurrentContext = NULL; */
+        /* data->updateSize = SDL_TRUE; */
         renddata->size_changed = SDL_TRUE;
    }
 }
@@ -379,7 +379,7 @@ DirectFB_CreateRenderer(SDL_Window * window, Uint32 flags)
 
     /* FIXME: Yet to be tested */
     renderer->RenderReadPixels = DirectFB_RenderReadPixels;
-    /*renderer->RenderWritePixels = DirectFB_RenderWritePixels; */
+    /* renderer->RenderWritePixels = DirectFB_RenderWritePixels; */
 
     renderer->DestroyTexture = DirectFB_DestroyTexture;
     renderer->DestroyRenderer = DirectFB_DestroyRenderer;
@@ -450,7 +450,7 @@ DirectFB_ActivateRenderer(SDL_Renderer * renderer)
     SDL_Window *window = renderer->window;
     SDL_DFB_WINDOWDATA(window);
 
-    if (renddata->size_changed /*|| windata->wm_needs_redraw */) {
+    if (renddata->size_changed /* || windata->wm_needs_redraw */) {
         renddata->size_changed = SDL_FALSE;
     }
 }
@@ -701,7 +701,7 @@ DirectFB_SetTextureBlendMode(SDL_Renderer * renderer, SDL_Texture * texture)
 {
     switch (texture->blendMode) {
     case SDL_BLENDMODE_NONE:
-    /*case SDL_BLENDMODE_MASK: */
+    /* case SDL_BLENDMODE_MASK: */
     case SDL_BLENDMODE_BLEND:
     case SDL_BLENDMODE_ADD:
     case SDL_BLENDMODE_MOD:
@@ -717,7 +717,7 @@ DirectFB_SetDrawBlendMode(SDL_Renderer * renderer)
 {
     switch (renderer->blendMode) {
     case SDL_BLENDMODE_NONE:
-    /*case SDL_BLENDMODE_MASK: */
+    /* case SDL_BLENDMODE_MASK: */
     case SDL_BLENDMODE_BLEND:
     case SDL_BLENDMODE_ADD:
     case SDL_BLENDMODE_MOD:
@@ -916,7 +916,7 @@ PrepareDraw(SDL_Renderer * renderer)
 
     switch (renderer->blendMode) {
     case SDL_BLENDMODE_NONE:
-    /*case SDL_BLENDMODE_MASK: */
+    /* case SDL_BLENDMODE_MASK: */
     case SDL_BLENDMODE_BLEND:
         break;
     case SDL_BLENDMODE_ADD:
diff --git a/src/video/directfb/SDL_DirectFB_shape.c b/src/video/directfb/SDL_DirectFB_shape.c
index 13c3d703ef8c1..358078f15294c 100644
--- a/src/video/directfb/SDL_DirectFB_shape.c
+++ b/src/video/directfb/SDL_DirectFB_shape.c
@@ -31,7 +31,7 @@
 
 SDL_Window*
 DirectFB_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
-    return SDL_CreateWindow(title,x,y,w,h,flags /*| SDL_DFB_WINDOW_SHAPED */);
+    return SDL_CreateWindow(title,x,y,w,h,flags /* | SDL_DFB_WINDOW_SHAPED */);
 }
 
 SDL_WindowShaper*
diff --git a/src/video/directfb/SDL_DirectFB_video.c b/src/video/directfb/SDL_DirectFB_video.c
index d20b5f122d616..4e5eae4ed1a33 100644
--- a/src/video/directfb/SDL_DirectFB_video.c
+++ b/src/video/directfb/SDL_DirectFB_video.c
@@ -258,7 +258,7 @@ DirectFB_VideoInit(_THIS)
                                                      &devdata->events));
     } else {
         SDL_DFB_CHECKERR(dfb->CreateInputEventBuffer(dfb, DICAPS_AXES
-                                                     /*DICAPS_ALL */ ,
+                                                     /* DICAPS_ALL */ ,
                                                      DFB_TRUE,
                                                      &devdata->events));
     }
diff --git a/src/video/directfb/SDL_DirectFB_window.c b/src/video/directfb/SDL_DirectFB_window.c
index cdcb4cce6195a..74c958ab0d66c 100644
--- a/src/video/directfb/SDL_DirectFB_window.c
+++ b/src/video/directfb/SDL_DirectFB_window.c
@@ -155,7 +155,7 @@ DirectFB_CreateWindow(_THIS, SDL_Window * window)
     SDL_DFB_CHECK(windata->dfbwin->RaiseToTop(windata->dfbwin));
 
     /* remember parent */
-    /*windata->sdlwin = window; */
+    /* windata->sdlwin = window; */
 
     /* Add to list ... */
 
diff --git a/src/video/directfb/SDL_DirectFB_window.h b/src/video/directfb/SDL_DirectFB_window.h
index a4a1cc8403097..96afc59ec0675 100644
--- a/src/video/directfb/SDL_DirectFB_window.h
+++ b/src/video/directfb/SDL_DirectFB_window.h
@@ -34,7 +34,7 @@ struct _DFB_WindowData
     IDirectFBSurface        *surface;           /* client drawing surface */
     IDirectFBWindow         *dfbwin;
     IDirectFBEventBuffer    *eventbuffer;
-    /*SDL_Window                *sdlwin; */
+    /* SDL_Window                *sdlwin; */
     SDL_Window              *next;
     Uint8                   opacity;
     DFBRectangle            client;
diff --git a/src/video/psp/SDL_pspevents.c b/src/video/psp/SDL_pspevents.c
index e2746c62859db..87bc52995a11c 100644
--- a/src/video/psp/SDL_pspevents.c
+++ b/src/video/psp/SDL_pspevents.c
@@ -119,7 +119,7 @@ void PSP_PumpEvents(_THIS)
                 sym.scancode = raw;
                 sym.sym = keymap[raw];
                 /* not tested */
-                /*SDL_PrivateKeyboard(pressed?SDL_PRESSED:SDL_RELEASED, &sym); */
+                /* SDL_PrivateKeyboard(pressed?SDL_PRESSED:SDL_RELEASED, &sym); */
                 SDL_SendKeyboardKey((keys & keymap_psp[i].id) ?
                                     SDL_PRESSED : SDL_RELEASED, SDL_GetScancodeFromKey(keymap[raw]);
 
diff --git a/src/video/psp/SDL_pspvideo.h b/src/video/psp/SDL_pspvideo.h
index d4ab32bfe691d..5b6435f56b208 100644
--- a/src/video/psp/SDL_pspvideo.h
+++ b/src/video/psp/SDL_pspvideo.h
@@ -91,7 +91,7 @@ int PSP_GL_GetSwapInterval(_THIS);
 void PSP_GL_SwapWindow(_THIS, SDL_Window * window);
 void PSP_GL_DeleteContext(_THIS, SDL_GLContext context);
 
-/*PSP on screen keyboard */
+/* PSP on screen keyboard */
 SDL_bool PSP_HasScreenKeyboardSupport(_THIS);
 void PSP_ShowScreenKeyboard(_THIS, SDL_Window *window);
 void PSP_HideScreenKeyboard(_THIS, SDL_Window *window);
diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
index 516d4e22dc33e..c33dabfdda6e9 100644
--- a/src/video/windows/SDL_windowsevents.c
+++ b/src/video/windows/SDL_windowsevents.c
@@ -36,7 +36,7 @@
 /* For GET_X_LPARAM, GET_Y_LPARAM. */
 #include <windowsx.h>
 
-/*#define WMMSG_DEBUG */
+/* #define WMMSG_DEBUG */
 #ifdef WMMSG_DEBUG
 #include <stdio.h>
 #include "wmmsg.h"
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index 385039f7e3fe6..6919e77423f44 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -97,7 +97,7 @@ static Atom X11_PickTargetFromAtoms(Display *disp, Atom a0, Atom a1, Atom a2)
     if (a2 != None) atom[count++] = a2;
     return X11_PickTarget(disp, atom, count);
 }
-/*#define DEBUG_XEVENTS */
+/* #define DEBUG_XEVENTS */
 
 struct KeyRepeatCheckData
 {
@@ -384,7 +384,7 @@ X11_DispatchEvent(_THIS)
                    I think it's better to think the ALT key is held down
                    when it's not, then always lose the ALT modifier on Unity.
                  */
-                /*SDL_ResetKeyboard(); */
+                /* SDL_ResetKeyboard(); */
             }
             data->pending_focus = PENDING_FOCUS_IN;
             data->pending_focus_time = SDL_GetTicks() + PENDING_FOCUS_IN_TIME;
diff --git a/src/video/x11/SDL_x11modes.c b/src/video/x11/SDL_x11modes.c
index be3383227d1c1..472416ccda18f 100644
--- a/src/video/x11/SDL_x11modes.c
+++ b/src/video/x11/SDL_x11modes.c
@@ -26,7 +26,7 @@
 #include "SDL_x11video.h"
 #include "edid.h"
 
-/*#define X11MODES_DEBUG */
+/* #define X11MODES_DEBUG */
 
 /* I'm becoming more and more convinced that the application should never
  * use XRandR, and it's the window manager's responsibility to track and
@@ -38,7 +38,7 @@
  *
  * However, many people swear by it, so let them swear at it. :)
 */
-/*#define XRANDR_DISABLED_BY_DEFAULT */
+/* #define XRANDR_DISABLED_BY_DEFAULT */
 
 
 static int
diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
index 79f61e0fb43d4..1ee982b55609e 100644
--- a/src/video/x11/SDL_x11sym.h
+++ b/src/video/x11/SDL_x11sym.h
@@ -176,9 +176,9 @@ SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,KeyCode b,int c),(a,b,c),return)
 SDL_X11_MODULE(UTF8)
 SDL_X11_SYM(int,Xutf8TextListToTextProperty,(Display* a,char** b,int c,XICCEncodingStyle d,XTextProperty* e),(a,b,c,d,e),return)
 SDL_X11_SYM(int,Xutf8LookupString,(XIC a,XKeyPressedEvent* b,char* c,int d,KeySym* e,Status* f),(a,b,c,d,e,f),return)
-/*SDL_X11_SYM(XIC,XCreateIC,(XIM, ...),return)  !!! ARGH! */
+/* SDL_X11_SYM(XIC,XCreateIC,(XIM, ...),return)  !!! ARGH! */
 SDL_X11_SYM(void,XDestroyIC,(XIC a),(a),)
-/*SDL_X11_SYM(char*,XGetICValues,(XIC, ...),return)  !!! ARGH! */
+/* SDL_X11_SYM(char*,XGetICValues,(XIC, ...),return)  !!! ARGH! */
 SDL_X11_SYM(void,XSetICFocus,(XIC a),(a),)
 SDL_X11_SYM(void,XUnsetICFocus,(XIC a),(a),)
 SDL_X11_SYM(XIM,XOpenIM,(Display* a,struct _XrmHashBucketRec* b,char* c,char* d),(a,b,c,d),return)
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
index 4b70f6602c3d5..a5395ac5f40fc 100644
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@@ -131,7 +131,7 @@ X11_SetNetWMState(_THIS, Window xwindow, Uint32 flags)
     SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
     Display *display = videodata->display;
     Atom _NET_WM_STATE = videodata->_NET_WM_STATE;
-    /*Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN; */
+    /* Atom _NET_WM_STATE_HIDDEN = videodata->_NET_WM_STATE_HIDDEN; */
     Atom _NET_WM_STATE_FOCUSED = videodata->_NET_WM_STATE_FOCUSED;
     Atom _NET_WM_STATE_MAXIMIZED_VERT = videodata->_NET_WM_STATE_MAXIMIZED_VERT;
     Atom _NET_WM_STATE_MAXIMIZED_HORZ = videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
@@ -213,7 +213,7 @@ X11_GetNetWMState(_THIS, Window xwindow)
     }
 
     /* FIXME, check the size hints for resizable */
-    /*flags |= SDL_WINDOW_RESIZABLE; */
+    /* flags |= SDL_WINDOW_RESIZABLE; */
 
     return flags;
 }
diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c
index 01b4da34f06e4..6d4b6aaa9873b 100644
--- a/src/video/x11/SDL_x11xinput2.c
+++ b/src/video/x11/SDL_x11xinput2.c
@@ -95,20 +95,20 @@ X11_InitXinput2(_THIS)
         return;
     }
 
-    /*Check supported version */
+    /* Check supported version */
     if(outmajor * 1000 + outminor < major * 1000 + minor) {
-        /*X server does not support the version we want */
+        /* X server does not support the version we want */
         return;
     }
     xinput2_initialized = 1;
 #if SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
-    /*XInput 2.2 */
+    /* XInput 2.2 */
     if(outmajor * 1000 + outminor >= major * 1000 + minor) {
         xinput2_multitouch_supported = 1;
     }
 #endif
 
-    /*Enable  Raw motion events for this display */
+    /* Enable  Raw motion events for this display */
     eventmask.deviceid = XIAllMasterDevices;
     eventmask.mask_len = sizeof(mask);
     eventmask.mask = mask;
@@ -188,7 +188,7 @@ X11_InitXinput2Multitouch(_THIS)
             XIAnyClassInfo *class = dev->classes[j];
             XITouchClassInfo *t = (XITouchClassInfo*)class;
 
-            /*Only touch devices */
+            /* Only touch devices */
             if (class->type != XITouchClass)
                 continue;
 
diff --git a/src/video/x11/SDL_x11xinput2.h b/src/video/x11/SDL_x11xinput2.h
index ff42f7477027a..920c170930254 100644
--- a/src/video/x11/SDL_x11xinput2.h
+++ b/src/video/x11/SDL_x11xinput2.h
@@ -24,7 +24,7 @@
 #define _SDL_x11xinput2_h
 
 #ifndef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
-/*Define XGenericEventCookie as forward declaration when
+/* Define XGenericEventCookie as forward declaration when
  *xinput2 is not available in order to compile */
 struct XGenericEventCookie;
 typedef struct XGenericEventCookie XGenericEventCookie;
diff --git a/src/video/x11/imKStoUCS.h b/src/video/x11/imKStoUCS.h
index 252f9a4bf92bc..cc684c2e3f7a5 100644
--- a/src/video/x11/imKStoUCS.h
+++ b/src/video/x11/imKStoUCS.h
@@ -28,4 +28,4 @@ Project.
 
 extern unsigned int X11_KeySymToUcs4(KeySym keysym);
 
-#endif /*_imKStoUCS_h */
+#endif /* _imKStoUCS_h */
diff --git a/test/testautomation_main.c b/test/testautomation_main.c
index 481e3daaeeab8..ef8f19e9e7235 100644
--- a/test/testautomation_main.c
+++ b/test/testautomation_main.c
@@ -1,7 +1,7 @@
 /**
  * Automated SDL subsystems management test.
  *
- * Written by J�rgen Tjern� "jorgenpt"
+ * Written by J�rgen Tjern� "jorgenpt"
  *
  * Released under Public Domain.
  */
@@ -10,7 +10,7 @@
 #include "SDL_test.h"
 
 
-/*!
+/* !
  * \brief Tests SDL_Init() and SDL_Quit() of Joystick and Haptic subsystems
  * \sa
  * http://wiki.libsdl.org/moin.cgi/SDL_Init
@@ -38,7 +38,7 @@ static int main_testInitQuitJoystickHaptic (void *arg)
 #endif
 }
 
-/*!
+/* !
  * \brief Tests SDL_InitSubSystem() and SDL_QuitSubSystem()
  * \sa
  * http://wiki.libsdl.org/moin.cgi/SDL_Init
diff --git a/test/testautomation_platform.c b/test/testautomation_platform.c
index 06699ad968b4c..19896b48df2b8 100644
--- a/test/testautomation_platform.c
+++ b/test/testautomation_platform.c
@@ -102,7 +102,7 @@ int platform_testEndianessAndSwap(void *arg)
    return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_GetXYZ() functions
  * \sa
  * http://wiki.libsdl.org/moin.cgi/SDL_GetPlatform
@@ -151,7 +151,7 @@ int platform_testGetFunctions (void *arg)
    return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_HasXYZ() functions
  * \sa
  * http://wiki.libsdl.org/moin.cgi/SDL_Has3DNow
@@ -200,7 +200,7 @@ int platform_testHasFunctions (void *arg)
    return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_GetVersion
  * \sa
  * http://wiki.libsdl.org/moin.cgi/SDL_GetVersion
@@ -225,7 +225,7 @@ int platform_testGetVersion(void *arg)
 }
 
 
-/*!
+/* !
  * \brief Tests SDL_VERSION macro
  */
 int platform_testSDLVersion(void *arg)
@@ -248,7 +248,7 @@ int platform_testSDLVersion(void *arg)
 }
 
 
-/*!
+/* !
  * \brief Tests default SDL_Init
  */
 int platform_testDefaultInit(void *arg)
@@ -270,7 +270,7 @@ int platform_testDefaultInit(void *arg)
    return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_Get/Set/ClearError
  * \sa
  * http://wiki.libsdl.org/moin.cgi/SDL_GetError
@@ -322,7 +322,7 @@ int platform_testGetSetClearError(void *arg)
    return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_SetError with empty input
  * \sa
  * http://wiki.libsdl.org/moin.cgi/SDL_SetError
@@ -358,7 +358,7 @@ int platform_testSetErrorEmptyInput(void *arg)
    return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_SetError with invalid input
  * \sa
  * http://wiki.libsdl.org/moin.cgi/SDL_SetError
@@ -422,7 +422,7 @@ int platform_testSetErrorInvalidInput(void *arg)
    return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_GetPowerInfo
  * \sa
  * http://wiki.libsdl.org/moin.cgi/SDL_GetPowerInfo
diff --git a/test/testautomation_rect.c b/test/testautomation_rect.c
index 7d80f8927bced..abf19f593df11 100644
--- a/test/testautomation_rect.c
+++ b/test/testautomation_rect.c
@@ -12,7 +12,7 @@
 
 /* Helper functions */
 
-/*!
+/* !
  * \brief Private helper to check SDL_IntersectRectAndLine results
  */
 void _validateIntersectRectAndLineResults(
@@ -39,7 +39,7 @@ void _validateIntersectRectAndLineResults(
 
 /* Test case functions */
 
-/*!
+/* !
  * \brief Tests SDL_IntersectRectAndLine() clipping cases
  *
  * \sa
@@ -110,7 +110,7 @@ rect_testIntersectRectAndLine (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_IntersectRectAndLine() non-clipping case line inside
  *
  * \sa
@@ -177,7 +177,7 @@ rect_testIntersectRectAndLineInside (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_IntersectRectAndLine() non-clipping cases outside
  *
  * \sa
@@ -232,7 +232,7 @@ rect_testIntersectRectAndLineOutside (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_IntersectRectAndLine() with empty rectangle
  *
  * \sa
@@ -267,7 +267,7 @@ rect_testIntersectRectAndLineEmpty (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Negative tests against SDL_IntersectRectAndLine() with invalid parameters
  *
  * \sa
@@ -302,7 +302,7 @@ rect_testIntersectRectAndLineParam (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Private helper to check SDL_HasIntersection results
  */
 void _validateHasIntersectionResults(
@@ -325,7 +325,7 @@ void _validateHasIntersectionResults(
         refRectB->x, refRectB->y, refRectB->w, refRectB->h);
 }
 
-/*!
+/* !
  * \brief Private helper to check SDL_IntersectRect results
  */
 void _validateIntersectRectResults(
@@ -344,7 +344,7 @@ void _validateIntersectRectResults(
     }
 }
 
-/*!
+/* !
  * \brief Private helper to check SDL_UnionRect results
  */
 void _validateUnionRectResults(
@@ -367,7 +367,7 @@ void _validateUnionRectResults(
         expectedResult->x, expectedResult->y, expectedResult->w, expectedResult->h);
 }
 
-/*!
+/* !
  * \brief Private helper to check SDL_RectEmpty results
  */
 void _validateRectEmptyResults(
@@ -385,7 +385,7 @@ void _validateRectEmptyResults(
         refRect->x, refRect->y, refRect->w, refRect->h);
 }
 
-/*!
+/* !
  * \brief Private helper to check SDL_RectEquals results
  */
 void _validateRectEqualsResults(
@@ -408,7 +408,7 @@ void _validateRectEqualsResults(
         refRectB->x, refRectB->y, refRectB->w, refRectB->h);
 }
 
-/*!
+/* !
  * \brief Tests SDL_IntersectRect() with B fully inside A
  *
  * \sa
@@ -436,7 +436,7 @@ int rect_testIntersectRectInside (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_IntersectRect() with B fully outside A
  *
  * \sa
@@ -464,7 +464,7 @@ int rect_testIntersectRectOutside (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_IntersectRect() with B partially intersecting A
  *
  * \sa
@@ -553,7 +553,7 @@ int rect_testIntersectRectPartial (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_IntersectRect() with 1x1 pixel sized rectangles
  *
  * \sa
@@ -600,7 +600,7 @@ int rect_testIntersectRectPoint (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_IntersectRect() with empty rectangles
  *
  * \sa
@@ -672,7 +672,7 @@ int rect_testIntersectRectEmpty (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Negative tests against SDL_IntersectRect() with invalid parameters
  *
  * \sa
@@ -702,7 +702,7 @@ int rect_testIntersectRectParam(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_HasIntersection() with B fully inside A
  *
  * \sa
@@ -729,7 +729,7 @@ int rect_testHasIntersectionInside (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_HasIntersection() with B fully outside A
  *
  * \sa
@@ -756,7 +756,7 @@ int rect_testHasIntersectionOutside (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_HasIntersection() with B partially intersecting A
  *
  * \sa
@@ -823,7 +823,7 @@ int rect_testHasIntersectionPartial (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_HasIntersection() with 1x1 pixel sized rectangles
  *
  * \sa
@@ -869,7 +869,7 @@ int rect_testHasIntersectionPoint (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_HasIntersection() with empty rectangles
  *
  * \sa
@@ -927,7 +927,7 @@ int rect_testHasIntersectionEmpty (void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Negative tests against SDL_HasIntersection() with invalid parameters
  *
  * \sa
@@ -950,7 +950,7 @@ int rect_testHasIntersectionParam(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Test SDL_EnclosePoints() without clipping
  *
  * \sa
@@ -1020,7 +1020,7 @@ int rect_testEnclosePoints(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Test SDL_EnclosePoints() with repeated input points
  *
  * \sa
@@ -1096,7 +1096,7 @@ int rect_testEnclosePointsRepeatedInput(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Test SDL_EnclosePoints() with clipping
  *
  * \sa
@@ -1195,7 +1195,7 @@ int rect_testEnclosePointsWithClipping(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Negative tests against SDL_EnclosePoints() with invalid parameters
  *
  * \sa
@@ -1223,7 +1223,7 @@ int rect_testEnclosePointsParam(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_UnionRect() where rect B is outside rect A
  *
  * \sa
@@ -1294,7 +1294,7 @@ int rect_testUnionRectOutside(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_UnionRect() where rect A or rect B are empty
  *
  * \sa
@@ -1359,7 +1359,7 @@ int rect_testUnionRectEmpty(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_UnionRect() where rect B is inside rect A
  *
  * \sa
@@ -1423,7 +1423,7 @@ int rect_testUnionRectInside(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Negative tests against SDL_UnionRect() with invalid parameters
  *
  * \sa
@@ -1451,7 +1451,7 @@ int rect_testUnionRectParam(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_RectEmpty() with various inputs
  *
  * \sa
@@ -1494,7 +1494,7 @@ int rect_testRectEmpty(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Negative tests against SDL_RectEmpty() with invalid parameters
  *
  * \sa
@@ -1511,7 +1511,7 @@ int rect_testRectEmptyParam(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Tests SDL_RectEquals() with various inputs
  *
  * \sa
@@ -1541,7 +1541,7 @@ int rect_testRectEquals(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  * \brief Negative tests against SDL_RectEquals() with invalid parameters
  *
  * \sa
@@ -1674,7 +1674,7 @@ static const SDLTest_TestCaseReference rectTest29 =
         { (SDLTest_TestCaseFp)rect_testRectEqualsParam, "rect_testRectEqualsParam", "Negative tests against SDL_RectEquals with invalid parameters", TEST_ENABLED };
 
 
-/*!
+/* !
  * \brief Sequence of Rect test cases; functions that handle simple rectangles including overlaps and merges.
  *
  * \sa
diff --git a/test/testautomation_rwops.c b/test/testautomation_rwops.c
index 7ae19bd7e0350..c8e1c593baa68 100644
--- a/test/testautomation_rwops.c
+++ b/test/testautomation_rwops.c
@@ -165,7 +165,7 @@ _testGenericRWopsValidations(SDL_RWops *rw, int write)
        i);
 }
 
-/*!
+/* !
  * Negative test for SDL_RWFromFile parameters
  *
  * \sa http://wiki.libsdl.org/moin.cgi/SDL_RWFromFile
diff --git a/test/testautomation_surface.c b/test/testautomation_surface.c
index 863a5bd6e1a0f..97cc81d843bd0 100644
--- a/test/testautomation_surface.c
+++ b/test/testautomation_surface.c
@@ -262,7 +262,7 @@ surface_testSaveLoadBitmap(void *arg)
     return TEST_COMPLETED;
 }
 
-/*!
+/* !
  *  Tests surface conversion.
  */
 int
@@ -307,7 +307,7 @@ surface_testSurfaceConversion(void *arg)
 }
 
 
-/*!
+/* !
  *  Tests surface conversion across all pixel formats.
  */
 int
diff --git a/test/testgesture.c b/test/testgesture.c
index 9c1959b52afdb..016506e11e43b 100644
--- a/test/testgesture.c
+++ b/test/testgesture.c
@@ -49,7 +49,7 @@
 #define BPP 4
 #define DEPTH 32
 
-/*MUST BE A POWER OF 2! */
+/* MUST BE A POWER OF 2! */
 #define EVENT_BUF_SIZE 256
 
 
@@ -102,9 +102,9 @@ void setpix(SDL_Surface *screen, float _x, float _y, unsigned int col)
   SDL_memcpy(&colour,pixmem32,screen->format->BytesPerPixel);
 
   SDL_GetRGB(colour,screen->format,&r,&g,&b);
-  /*r = 0;g = 0; b = 0; */
+  /* r = 0;g = 0; b = 0; */
   a = (float)((col>>24)&0xFF);
-  if(a == 0) a = 0xFF; /*Hack, to make things easier. */
+  if(a == 0) a = 0xFF; /* Hack, to make things easier. */
   a /= 0xFF;
   r = (Uint8)(r*(1-a) + ((col>>16)&0xFF)*(a));
   g = (Uint8)(g*(1-a) + ((col>> 8)&0xFF)*(a));
@@ -127,7 +127,7 @@ void drawCircle(SDL_Surface* screen,float x,float y,float r,unsigned int c)
   float xr;
   for(ty = (float)-SDL_fabs(r);ty <= (float)SDL_fabs((int)r);ty++) {
     xr = (float)sqrt(r*r - ty*ty);
-    if(r > 0) { /*r > 0 ==> filled circle */
+    if(r > 0) { /* r > 0 ==> filled circle */
       for(tx=-xr+.5f;tx<=xr-.5;tx++) {
     setpix(screen,x+tx,y+ty,c);
       }
@@ -157,7 +157,7 @@ void DrawScreen(SDL_Surface* screen)
     setpix(screen,(float)x,(float)y,((x%255)<<16) + ((y%255)<<8) + (x+y)%255);
 #endif
 
-  /*draw Touch History */
+  /* draw Touch History */
   for(i = eventWrite; i < eventWrite+EVENT_BUF_SIZE; ++i) {
     const SDL_Event *event = &events[i&(EVENT_BUF_SIZE-1)];
     float age = (float)(i - eventWrite) / EVENT_BUF_SIZE;
@@ -170,7 +170,7 @@ void DrawScreen(SDL_Surface* screen)
       x = event->tfinger.x;
       y = event->tfinger.y;
 
-      /*draw the touch: */
+      /* draw the touch: */
       c = colors[event->tfinger.fingerId%7];
       col = ((unsigned int)(c*(.1+.85))) | (unsigned int)(0xFF*age)<<24;
 
@@ -210,7 +210,7 @@ int main(int argc, char* argv[])
   /* Enable standard application logging */
   SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
 
-  /*gesture variables */
+  /* gesture variables */
   knob.r = .1f;
   knob.ang = 0;
 
@@ -225,7 +225,7 @@ int main(int argc, char* argv[])
   while(!quitting) {
     while(SDL_PollEvent(&event))
       {
-    /*Record _all_ events */
+    /* Record _all_ events */
     events[eventWrite & (EVENT_BUF_SIZE-1)] = event;
     eventWrite++;
 
diff --git a/test/testhaptic.c b/test/testhaptic.c
index 6f523c565670c..1e9dd3bdb5336 100644
--- a/test/testhaptic.c
+++ b/test/testhaptic.c
@@ -279,7 +279,7 @@ HapticPrintSupported(SDL_Haptic * haptic)
     if (supported & SDL_HAPTIC_SINE)
         SDL_Log("      sine\n");
     /* !!! FIXME: put this back when we have more bits in 2.1 */
-    /*if (supported & SDL_HAPTIC_SQUARE)
+    /* if (supported & SDL_HAPTIC_SQUARE)
         SDL_Log("      square\n"); */
     if (supported & SDL_HAPTIC_TRIANGLE)
         SDL_Log("      triangle\n");
diff --git a/test/testoverlay2.c b/test/testoverlay2.c
index addbc27b806a9..4561f984588e9 100644
--- a/test/testoverlay2.c
+++ b/test/testoverlay2.c
@@ -356,7 +356,7 @@ main(int argc, char **argv)
         quit(5);
     }
     /* Uncomment this to check vertex color with a YUV texture */
-    /*SDL_SetTextureColorMod(MooseTexture, 0xff, 0x80, 0x80); */
+    /* SDL_SetTextureColorMod(MooseTexture, 0xff, 0x80, 0x80); */
 
     for (i = 0; i < MOOSEFRAMES_COUNT; i++) {
         Uint8 MooseFrameRGB[MOOSEFRAME_SIZE*3];
diff --git a/test/testrendercopyex.c b/test/testrendercopyex.c
index 6c26a7a519663..5033c1c5f2dae 100644
--- a/test/testrendercopyex.c
+++ b/test/testrendercopyex.c
@@ -127,7 +127,7 @@ Draw(DrawState *s)
 
     /* Update the screen! */
     SDL_RenderPresent(s->renderer);
-    /*SDL_Delay(10); */
+    /* SDL_Delay(10); */
 }
 
 int
diff --git a/test/testshape.c b/test/testshape.c
index 7c987fe4965bf..785ba1acf5836 100644
--- a/test/testshape.c
+++ b/test/testshape.c
@@ -29,11 +29,11 @@ typedef struct LoadedPicture {
 
 void render(SDL_Renderer *renderer,SDL_Texture *texture,SDL_Rect texture_dimensions)
 {
-    /*Clear render-target to blue. */
+    /* Clear render-target to blue. */
     SDL_SetRenderDrawColor(renderer,0x00,0x00,0xff,0xff);
     SDL_RenderClear(renderer);
 
-    /*Render the texture. */
+    /* Render the texture. */
     SDL_RenderCopy(renderer,texture,&texture_dimensions,&texture_dimensions);
 
     SDL_RenderPresent(renderer);
@@ -188,17 +188,17 @@ int main(int argc,char** argv)
         next_time += TICK_INTERVAL;
     }
 
-    /*Free the textures. */
+    /* Free the textures. */
     for(i=0;i<num_pictures;i++)
         SDL_DestroyTexture(pictures[i].texture);
     SDL_DestroyRenderer(renderer);
-    /*Destroy the window. */
+    /* Destroy the window. */
     SDL_DestroyWindow(window);
-    /*Free the original surfaces backing the textures. */
+    /* Free the original surfaces backing the textures. */
     for(i=0;i<num_pictures;i++)
         SDL_FreeSurface(pictures[i].surface);
     SDL_free(pictures);
-    /*Call SDL_VideoQuit() before quitting. */
+    /* Call SDL_VideoQuit() before quitting. */
     SDL_VideoQuit();
 
     return 0;
diff --git a/test/torturethread.c b/test/torturethread.c
index 53a57a9b0dc33..b22ee2af7ae9a 100644
--- a/test/torturethread.c
+++ b/test/torturethread.c
@@ -36,7 +36,7 @@ int SDLCALL
 SubThreadFunc(void *data)
 {
     while (!*(int volatile *) data) {
-        ;                       /*SDL_Delay(10); *//* do nothing */
+        ;                       /* SDL_Delay(10); *//* do nothing */
     }
     return 0;
 }