kc3-lang/SDL

diff --git a/Xcode-iOS/Demos/src/rectangles.c b/Xcode-iOS/Demos/src/rectangles.c
index 035e4f9..86fce49 100644
--- a/Xcode-iOS/Demos/src/rectangles.c
+++ b/Xcode-iOS/Demos/src/rectangles.c
@@ -37,7 +37,7 @@ render(SDL_Renderer *renderer)
 int
 main(int argc, char *argv[])
 {
-    if (SDL_Init(SDL_INIT_VIDEO/* | SDL_INIT_AUDIO*/) < 0)
+    if (SDL_Init(SDL_INIT_VIDEO/* | SDL_INIT_AUDIO */) < 0)
     {
         printf("Unable to initialize SDL");
     }
diff --git a/include/SDL.h b/include/SDL.h
index 8b8a61c..67dd30f 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 7bd669d..ae51dfc 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 0b6f28a..bf57852 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 09eef29..921920d 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 c58edcc..81e8c70 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 229b268..1128563 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 b997b5e..77d5fde 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 da555c9..c2a025e 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 2667403..5b91f04 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 4f2c506..57274fa 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 5e17cba..5b6d9c4 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 1e8e0d9..bf520ba 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 0461ff7..e2f1161 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 d3f8748..7c7cf43 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 7fa9c10..6f9c23c 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 fece797..4b9628c 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 00381aa..d22c9fc 100644
--- a/include/SDL_test_harness.h
+++ b/include/SDL_test_harness.h
@@ -43,30 +43,30 @@ 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);
 
 /**
diff --git a/include/SDL_video.h b/include/SDL_video.h
index 30c7393..3a2ac83 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_wave.c b/src/audio/SDL_wave.c
index 18fdcac..4956f1f 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 13cc77b..93de9d7 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 6e0a283..f5cf1a0 100644
--- a/src/audio/psp/SDL_pspaudio.c
+++ b/src/audio/psp/SDL_pspaudio.c
@@ -63,7 +63,7 @@ PSPAUD_OpenDevice(_THIS, const char *devname, int iscapture)
     this->spec.freq = 44100;
 
     /* Update the fragment size as size in bytes. */
-/*  SDL_CalculateAudioSpec(this->spec); MOD*/
+/*  SDL_CalculateAudioSpec(this->spec); MOD */
     switch (this->spec.format) {
     case AUDIO_U8:
         this->spec.silence = 0x80;
@@ -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
@@ -162,7 +162,7 @@ static int
 PSPAUD_Init(SDL_AudioDriverImpl * impl)
 {
 
-    /* Set the function pointers*/
+    /* Set the function pointers */
     impl->OpenDevice = PSPAUD_OpenDevice;
     impl->PlayDevice = PSPAUD_PlayDevice;
     impl->WaitDevice = PSPAUD_WaitDevice;
@@ -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;
@@ -189,7 +189,7 @@ AudioBootStrap PSPAUD_bootstrap = {
     "psp", "PSP audio driver", PSPAUD_Init, 0
 };
 
- /* SDL_AUDI*/
+ /* SDL_AUDI */
 
 
 
diff --git a/src/core/android/SDL_android.c b/src/core/android/SDL_android.c
index 8af2926..df963fd 100644
--- a/src/core/android/SDL_android.c
+++ b/src/core/android/SDL_android.c
@@ -40,8 +40,8 @@
 #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)
 
@@ -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 @@ fallback:
         /* 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 );
@@ -878,7 +878,7 @@ static int Internal_Android_JNI_FileClose(SDL_RWops* ctx, bool release)
         else {
             jobject inputStream = (jobject)ctx->hidden.androidio.inputStreamRef;
 
-            /* inputStream.close();*/
+            /* inputStream.close(); */
             jmethodID mid = (*mEnv)->GetMethodID(mEnv, (*mEnv)->GetObjectClass(mEnv, inputStream),
                     "close", "()V");
             (*mEnv)->CallVoidMethod(mEnv, inputStream, mid);
@@ -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 e95fd46..3ce0f49 100644
--- a/src/core/android/SDL_android.h
+++ b/src/core/android/SDL_android.h
@@ -34,7 +34,7 @@ extern "C" {
 
 /* 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_DeleteContext(void);*/
+extern SDL_bool Android_JNI_DeleteContext(void); */
 extern void Android_JNI_SwapWindow();
 extern void Android_JNI_SetActivityTitle(const char *title);
 extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
diff --git a/src/events/SDL_gesture.c b/src/events/SDL_gesture.c
index 617ea0b..908c030 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)
@@ -159,7 +159,7 @@ int SDL_SaveDollarTemplate(SDL_GestureID gestureId, SDL_RWops *src)
 }
 
 /*path is an already sampled set of points
-Returns the index of the gesture on success, or -1*/
+Returns the index of the gesture on success, or -1 */
 static int SDL_AddDollarGesture_one(SDL_GestureTouch* inTouch, SDL_FloatPoint* path)
 {
     SDL_DollarTemplate* dollarTemplate;
@@ -196,7 +196,7 @@ static int SDL_AddDollarGesture(SDL_GestureTouch* inTouch, SDL_FloatPoint* path)
             if (index < 0)
                 return -1;
         }
-        /* Use the index of the last one added.*/
+        /* Use the index of the last one added. */
         return index;
     } else {
         return SDL_AddDollarGesture_one(inTouch, 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++;
@@ -245,7 +245,7 @@ int SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src)
 
 static float dollarDifference(SDL_FloatPoint* points,SDL_FloatPoint* templ,float ang)
 {
-    /*  SDL_FloatPoint p[DOLLARNPOINTS];*/
+    /*  SDL_FloatPoint p[DOLLARNPOINTS]; */
     float dist = 0;
     SDL_FloatPoint p;
     int i;
@@ -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|)*/
+                /* 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,7 +598,7 @@ 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].dtheta = dtheta;
@@ -609,19 +609,19 @@ void SDL_GestureProcessEvent(SDL_Event* event)
                 knob.r += dDist/numDownFingers;
                 knob.ang += dtheta;
                 printf("thetaSum = %f, distSum = %f\n",gdtheta,gdDist);
-                printf("id: %i dTheta = %f, dDist = %f\n",j,dtheta,dDist);*/
+                printf("id: %i dTheta = %f, dDist = %f\n",j,dtheta,dDist); */
                 SDL_SendGestureMulti(inTouch,dtheta,dDist);
             }
             else {
                 /*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].cv.y = 0; */
             }
             /*inTouch->gestureLast[j].f.p.x = x;
             inTouch->gestureLast[j].f.p.y = y;
             break;
-            pressure?*/
+            pressure? */
         }
 
         if (event->type == SDL_FINGERDOWN) {
@@ -632,7 +632,7 @@ void SDL_GestureProcessEvent(SDL_Event* event)
             inTouch->centroid.y = (inTouch->centroid.y*(inTouch->numDownFingers - 1)+
                                    y)/inTouch->numDownFingers;
             /*printf("Finger Down: (%f,%f). Centroid: (%f,%f\n",x,y,
-                 inTouch->centroid.x,inTouch->centroid.y);*/
+                 inTouch->centroid.x,inTouch->centroid.y); */
 
 #ifdef ENABLE_DOLLAR
             inTouch->dollarPath.length = 0;
diff --git a/src/events/SDL_keyboard.c b/src/events/SDL_keyboard.c
index a3ed168..4577857 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 e9404f0..fa30361 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 ec88904..72a336d 100644
--- a/src/haptic/darwin/SDL_syshaptic.c
+++ b/src/haptic/darwin/SDL_syshaptic.c
@@ -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:
@@ -982,7 +982,7 @@ SDL_SYS_HapticEffectType(Uint16 type)
 
     /* !!! FIXME: put this back when we have more bits in 2.1 */
     /*case SDL_HAPTIC_SQUARE:
-        return kFFEffectType_Square_ID;*/
+        return kFFEffectType_Square_ID; */
 
     case SDL_HAPTIC_SINE:
         return kFFEffectType_Sine_ID;
diff --git a/src/haptic/linux/SDL_syshaptic.c b/src/haptic/linux/SDL_syshaptic.c
index ad34fc2..1c2500c 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:
@@ -626,7 +626,7 @@ SDL_SYS_ToFFEffect(struct ff_effect *dest, SDL_HapticEffect * src)
             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)
-            dest->u.periodic.waveform = FF_SQUARE;*/
+            dest->u.periodic.waveform = FF_SQUARE; */
         else if (periodic->type == SDL_HAPTIC_TRIANGLE)
             dest->u.periodic.waveform = FF_TRIANGLE;
         else if (periodic->type == SDL_HAPTIC_SAWTOOTHUP)
diff --git a/src/haptic/windows/SDL_syshaptic.c b/src/haptic/windows/SDL_syshaptic.c
index 9b13496..6d77973 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:
@@ -1166,7 +1166,7 @@ SDL_SYS_HapticEffectType(SDL_HapticEffect * effect)
 
     /* !!! FIXME: put this back when we have more bits in 2.1 */
     /*case SDL_HAPTIC_SQUARE:
-        return &GUID_Square;*/
+        return &GUID_Square; */
 
     case SDL_HAPTIC_SINE:
         return &GUID_Sine;
diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
index 912be05..0a4ad6b 100644
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -52,7 +52,7 @@ struct _SDL_HatMapping
  */
 #define k_nMaxHatEntries 0x3f + 1
 
-/* our in memory mapping db between joystick objects and controller mappings*/
+/* our in memory mapping db between joystick objects and controller mappings */
 struct _SDL_ControllerMapping
 {
     SDL_JoystickGUID guid;
diff --git a/src/joystick/SDL_joystick.c b/src/joystick/SDL_joystick.c
index b119709..4e08624 100644
--- a/src/joystick/SDL_joystick.c
+++ b/src/joystick/SDL_joystick.c
@@ -488,14 +488,14 @@ SDL_PrivateJoystickShouldIgnoreEvent()
 
     if (SDL_WasInit(SDL_INIT_VIDEO)) {
         if (SDL_GetKeyboardFocus() == NULL) {
-            /* Video is initialized and we don't have focus, ignore the event.*/
+            /* Video is initialized and we don't have focus, ignore the event. */
             return SDL_TRUE;
         } else {
             return SDL_FALSE;
         }
     }
 
-    /* Video subsystem wasn't initialized, always allow the event*/
+    /* Video subsystem wasn't initialized, always allow the event */
     return SDL_FALSE;
 }
 
diff --git a/src/joystick/darwin/SDL_sysjoystick.c b/src/joystick/darwin/SDL_sysjoystick.c
index 4e50e4d..2251d0d 100644
--- a/src/joystick/darwin/SDL_sysjoystick.c
+++ b/src/joystick/darwin/SDL_sysjoystick.c
@@ -771,7 +771,7 @@ SDL_SYS_JoystickInit(void)
             ("Joystick: Failed to get HID CFMutableDictionaryRef via IOServiceMatching.");
     }
 
-    /*/ Now search I/O Registry for matching devices. */
+    / */ Now search I/O Registry for matching devices. */
     result =
         IOServiceGetMatchingServices(masterPort, hidMatchDictionary,
                                      &hidObjectIterator);
diff --git a/src/libm/e_atan2.c b/src/libm/e_atan2.c
index 3f1ee57..f2aa236 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/math_private.h b/src/libm/math_private.h
index c5ab63d..9a08b10 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/main/android/SDL_android_main.c b/src/main/android/SDL_android_main.c
index 649bd4f..e2889db 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 bb235b0..2577045 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 b51cb01..a098944 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 697a974..facb89e 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 1e62621..162713e 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/psp/SDL_render_psp.c b/src/render/psp/SDL_render_psp.c
index 3b7666c..5b10437 100644
--- a/src/render/psp/SDL_render_psp.c
+++ b/src/render/psp/SDL_render_psp.c
@@ -458,7 +458,7 @@ PSP_WindowEvent(SDL_Renderer * renderer, const SDL_WindowEvent *event)
 static int
 PSP_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture)
 {
-/*      PSP_RenderData *renderdata = (PSP_RenderData *) renderer->driverdata;*/
+/*      PSP_RenderData *renderdata = (PSP_RenderData *) renderer->driverdata; */
     PSP_TextureData* psp_texture = (PSP_TextureData*) SDL_calloc(1, sizeof(*psp_texture));;
 
     if(!psp_texture)
@@ -528,7 +528,7 @@ static int
 PSP_UpdateTexture(SDL_Renderer * renderer, SDL_Texture * texture,
                    const SDL_Rect * rect, const void *pixels, int pitch)
 {
-/*  PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata;*/
+/*  PSP_TextureData *psp_texture = (PSP_TextureData *) texture->driverdata; */
     const Uint8 *src;
     Uint8 *dst;
     int row, length,dpitch;
@@ -895,8 +895,8 @@ PSP_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
         sceGuColor(0xFFFFFFFF);
     }
 
-/*      x += width * 0.5f;*/
-/*      y += height * 0.5f;*/
+/*      x += width * 0.5f; */
+/*      y += height * 0.5f; */
     x += centerx;
     y += centery;
 
@@ -904,8 +904,8 @@ PSP_RenderCopyEx(SDL_Renderer * renderer, SDL_Texture * texture,
 
     MathSincos(degToRad(angle), &s, &c);
 
-/*      width *= 0.5f;*/
-/*      height *= 0.5f;*/
+/*      width *= 0.5f; */
+/*      height *= 0.5f; */
     width  -= centerx;
     height -= centery;
 
@@ -968,7 +968,7 @@ PSP_RenderPresent(SDL_Renderer * renderer)
     sceGuFinish();
     sceGuSync(0,0);
 
-/*  if(data->vsync)*/
+/*  if(data->vsync) */
         sceDisplayWaitVblankStart();
 
     data->backbuffer = data->frontbuffer;
@@ -1007,8 +1007,8 @@ PSP_DestroyRenderer(SDL_Renderer * renderer)
         StartDrawing(renderer);
 
         sceGuTerm();
-/*      vfree(data->backbuffer);*/
-/*      vfree(data->frontbuffer);*/
+/*      vfree(data->backbuffer); */
+/*      vfree(data->frontbuffer); */
 
         data->initialized = SDL_FALSE;
         data->displayListAvail = SDL_FALSE;
diff --git a/src/render/software/SDL_rotate.c b/src/render/software/SDL_rotate.c
index b315535..538d10c 100644
--- a/src/render/software/SDL_rotate.c
+++ b/src/render/software/SDL_rotate.c
@@ -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,7 +391,7 @@ 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;
     }
@@ -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/video/SDL_blit_A.c b/src/video/SDL_blit_A.c
index 9ef4a07..ca08876 100644
--- a/src/video/SDL_blit_A.c
+++ b/src/video/SDL_blit_A.c
@@ -355,18 +355,18 @@ BlitRGBtoRGBPixelAlphaMMX(SDL_BlitInfo * info)
 		} else if (alpha == amask) {
 			*dstp = *srcp;
 		} else {
-			src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB)*/
+			src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB) */
 			src1 = _mm_unpacklo_pi8(src1, mm_zero); /* 0A0R0G0B -> src1 */
 
-			dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB)*/
+			dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB) */
 			dst1 = _mm_unpacklo_pi8(dst1, mm_zero); /* 0A0R0G0B -> dst1 */
 
 			mm_alpha = _mm_cvtsi32_si64(alpha); /* alpha -> mm_alpha (0000000A) */
 			mm_alpha = _mm_srli_si64(mm_alpha, ashift); /* mm_alpha >> ashift -> mm_alpha(0000000A) */
 			mm_alpha = _mm_unpacklo_pi16(mm_alpha, mm_alpha); /* 00000A0A -> mm_alpha */
 			mm_alpha2 = _mm_unpacklo_pi32(mm_alpha, mm_alpha); /* 0A0A0A0A -> mm_alpha2 */
-			mm_alpha = _mm_or_si64(mm_alpha2, *(__m64 *) & multmask);	/* 0F0A0A0A -> mm_alpha*/
-			mm_alpha2 = _mm_xor_si64(mm_alpha2, *(__m64 *) & multmask2);	/* 255 - mm_alpha -> mm_alpha*/
+			mm_alpha = _mm_or_si64(mm_alpha2, *(__m64 *) & multmask);	/* 0F0A0A0A -> mm_alpha */
+			mm_alpha2 = _mm_xor_si64(mm_alpha2, *(__m64 *) & multmask2);	/* 255 - mm_alpha -> mm_alpha */
 
 			/* blend */		    
 			src1 = _mm_mullo_pi16(src1, mm_alpha);
@@ -548,18 +548,18 @@ BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo * info)
 		} else if (alpha == amask) {
 			*dstp = *srcp;
 		} else {
-			src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB)*/
+			src1 = _mm_cvtsi32_si64(*srcp); /* src(ARGB) -> src1 (0000ARGB) */
 			src1 = _mm_unpacklo_pi8(src1, mm_zero); /* 0A0R0G0B -> src1 */
 
-			dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB)*/
+			dst1 = _mm_cvtsi32_si64(*dstp); /* dst(ARGB) -> dst1 (0000ARGB) */
 			dst1 = _mm_unpacklo_pi8(dst1, mm_zero); /* 0A0R0G0B -> dst1 */
 
 			mm_alpha = _mm_cvtsi32_si64(alpha); /* alpha -> mm_alpha (0000000A) */
 			mm_alpha = _mm_srli_si64(mm_alpha, ashift); /* mm_alpha >> ashift -> mm_alpha(0000000A) */
 			mm_alpha = _mm_unpacklo_pi16(mm_alpha, mm_alpha); /* 00000A0A -> mm_alpha */
 			mm_alpha2 = _mm_unpacklo_pi32(mm_alpha, mm_alpha); /* 0A0A0A0A -> mm_alpha2 */
-			mm_alpha = _mm_or_si64(mm_alpha2, *(__m64 *) & multmask);	/* 0F0A0A0A -> mm_alpha*/
-			mm_alpha2 = _mm_xor_si64(mm_alpha2, *(__m64 *) & multmask2);	/* 255 - mm_alpha -> mm_alpha*/
+			mm_alpha = _mm_or_si64(mm_alpha2, *(__m64 *) & multmask);	/* 0F0A0A0A -> mm_alpha */
+			mm_alpha2 = _mm_xor_si64(mm_alpha2, *(__m64 *) & multmask2);	/* 255 - mm_alpha -> mm_alpha */
 
 
 			/* blend */		    
diff --git a/src/video/SDL_bmp.c b/src/video/SDL_bmp.c
index df43ed0..81d93f7 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 a99371e..6e9b8e7 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 e9876e4..490714d 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 69980d0..b01d2f3 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 460d53b..9b144cb 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/android/SDL_androidevents.c b/src/video/android/SDL_androidevents.c
index d0a16e1..0357397 100644
--- a/src/video/android/SDL_androidevents.c
+++ b/src/video/android/SDL_androidevents.c
@@ -38,7 +38,7 @@ android_egl_context_restore()
     SDL_WindowData *data = (SDL_WindowData *) Android_Window->driverdata;
     if (SDL_GL_MakeCurrent(Android_Window, (SDL_GLContext) data->egl_context) < 0) {
         /* The context is no longer valid, create a new one */
-        /* FIXME: Notify the user that the context changed and textures need to be re created*/
+        /* FIXME: Notify the user that the context changed and textures need to be re created */
         data->egl_context = (EGLContext) SDL_GL_CreateContext(Android_Window);
         SDL_GL_MakeCurrent(Android_Window, (SDL_GLContext) data->egl_context);
     }
diff --git a/src/video/bwindow/SDL_BWin.h b/src/video/bwindow/SDL_BWin.h
index 9540bd3..d61b5c2 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;
         }
 
@@ -463,7 +463,7 @@ private:
 
 /*FIXME: Why were these here?
  if false: be_app->SetCursor(B_HAND_CURSOR);
- if true:  SDL_SetCursor(NULL);*/
+ if true:  SDL_SetCursor(NULL); */
     }
 
     void _MouseButtonEvent(int32 buttons) {
diff --git a/src/video/bwindow/SDL_bopengl.h b/src/video/bwindow/SDL_bopengl.h
index a7e924b..4e1a5cf 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 8241d9b..c9f683c 100644
--- a/src/video/directfb/SDL_DirectFB_WM.c
+++ b/src/video/directfb/SDL_DirectFB_WM.c
@@ -351,7 +351,7 @@ DirectFB_WM_ProcessEvent(_THIS, SDL_Window * window, DFBWindowEvent * evt)
                         dy = 0;
                     SDL_DFB_CHECK(dfbwin->GetSize(dfbwin, &cw, &ch));
 
-                    /* necessary to trigger an event - ugly*/
+                    /* necessary to trigger an event - ugly */
                     SDL_DFB_CHECK(dfbwin->DisableEvents(dfbwin, DWET_ALL));
                     SDL_DFB_CHECK(dfbwin->Resize(dfbwin, cw + dx + 1, ch + dy));
                     SDL_DFB_CHECK(dfbwin->EnableEvents(dfbwin, DWET_ALL));
diff --git a/src/video/directfb/SDL_DirectFB_events.c b/src/video/directfb/SDL_DirectFB_events.c
index 483ba9c..9c34754 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);
diff --git a/src/video/directfb/SDL_DirectFB_render.c b/src/video/directfb/SDL_DirectFB_render.c
index 958793d..e40dcbe 100644
--- a/src/video/directfb/SDL_DirectFB_render.c
+++ b/src/video/directfb/SDL_DirectFB_render.c
@@ -131,7 +131,7 @@ SDL_RenderDriver DirectFB_RenderDriver = {
       (SDL_BLENDMODE_NONE | SDL_BLENDMODE_MASK | SDL_BLENDMODE_BLEND |
       SDL_BLENDMODE_ADD | SDL_BLENDMODE_MOD),
      (SDL_SCALEMODE_NONE | SDL_SCALEMODE_FAST |
-      SDL_SCALEMODE_SLOW | SDL_SCALEMODE_BEST),*/
+      SDL_SCALEMODE_SLOW | SDL_SCALEMODE_BEST), */
      0,
      {
              /* formats filled in later */
@@ -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;
     }
 }
diff --git a/src/video/psp/SDL_pspevents.c b/src/video/psp/SDL_pspevents.c
index 54cd4e7..e2746c6 100644
--- a/src/video/psp/SDL_pspevents.c
+++ b/src/video/psp/SDL_pspevents.c
@@ -118,7 +118,7 @@ void PSP_PumpEvents(_THIS)
                         pressed = scanData->pressed;
                 sym.scancode = raw;
                 sym.sym = keymap[raw];
-                /* not tested*/
+                /* not tested */
                 /*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.c b/src/video/psp/SDL_pspvideo.c
index ed5ab1c..64b48eb 100644
--- a/src/video/psp/SDL_pspvideo.c
+++ b/src/video/psp/SDL_pspvideo.c
@@ -306,7 +306,7 @@ PSP_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info)
 }
 
 
-/* TO Write Me*/
+/* TO Write Me */
 SDL_bool PSP_HasScreenKeyboardSupport(_THIS)
 {
     return SDL_FALSE;
diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
index bf7d011..516d4e2 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 4bdfd1c..385039f 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 b66b94b..be33832 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_x11window.c b/src/video/x11/SDL_x11window.c
index 60acd70..4b70f66 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;
 }
@@ -823,7 +823,7 @@ X11_SetWindowSize(_THIS, SDL_Window * window)
     }
     if (!(window->flags & SDL_WINDOW_RESIZABLE)) {
          /* Apparently, if the X11 Window is set to a 'non-resizable' window, you cannot resize it using the XResizeWindow, thus
-            we must set the size hints to adjust the window size.*/
+            we must set the size hints to adjust the window size. */
          XSizeHints *sizehints = XAllocSizeHints();
          long userhints;
 
diff --git a/src/video/x11/SDL_x11xinput2.c b/src/video/x11/SDL_x11xinput2.c
index 1b86c67..01b4da3 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 56a4b90..ff42f74 100644
--- a/src/video/x11/SDL_x11xinput2.h
+++ b/src/video/x11/SDL_x11xinput2.h
@@ -25,7 +25,7 @@
 
 #ifndef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
 /*Define XGenericEventCookie as forward declaration when
- *xinput2 is not available in order to compile*/
+ *xinput2 is not available in order to compile */
 struct XGenericEventCookie;
 typedef struct XGenericEventCookie XGenericEventCookie;
 #endif
diff --git a/test/testautomation_audio.c b/test/testautomation_audio.c
index 90b08ac..50c1614 100644
--- a/test/testautomation_audio.c
+++ b/test/testautomation_audio.c
@@ -643,7 +643,7 @@ int audio_lockUnlockOpenAudioDevice()
          SDL_Delay(10);
          SDLTest_Log("Simulate callback processing - delay");
 
-         /* Unlock again*/
+         /* Unlock again */
          SDL_UnlockAudioDevice(id);
          SDLTest_AssertPass("SDL_UnlockAudioDevice(%i)", id);
 
diff --git a/test/testautomation_events.c b/test/testautomation_events.c
index 638607e..f9eb5bb 100644
--- a/test/testautomation_events.c
+++ b/test/testautomation_events.c
@@ -58,7 +58,7 @@ events_pushPumpAndPollUserevent(void *arg)
    event1.user.data1 = (void *)&_userdataValue1;
    event1.user.data2 = (void *)&_userdataValue2;
 
-   /* Push a user event onto the queue and force queue update*/
+   /* Push a user event onto the queue and force queue update */
    SDL_PushEvent(&event1);
    SDLTest_AssertPass("Call to SDL_PushEvent()");
    SDL_PumpEvents();
@@ -101,7 +101,7 @@ events_addDelEventWatch(void *arg)
    SDL_AddEventWatch(_events_sampleNullEventFilter, NULL);
    SDLTest_AssertPass("Call to SDL_AddEventWatch()");
 
-   /* Push a user event onto the queue and force queue update*/
+   /* Push a user event onto the queue and force queue update */
    SDL_PushEvent(&event);
    SDLTest_AssertPass("Call to SDL_PushEvent()");
    SDL_PumpEvents();
@@ -112,7 +112,7 @@ events_addDelEventWatch(void *arg)
    SDL_DelEventWatch(_events_sampleNullEventFilter, NULL);
    SDLTest_AssertPass("Call to SDL_DelEventWatch()");
 
-   /* Push a user event onto the queue and force queue update*/
+   /* Push a user event onto the queue and force queue update */
    _eventFilterCalled = 0;
    SDL_PushEvent(&event);
    SDLTest_AssertPass("Call to SDL_PushEvent()");
@@ -152,7 +152,7 @@ events_addDelEventWatchWithUserdata(void *arg)
    SDL_AddEventWatch(_events_sampleNullEventFilter, (void *)&_userdataValue);
    SDLTest_AssertPass("Call to SDL_AddEventWatch()");
 
-   /* Push a user event onto the queue and force queue update*/
+   /* Push a user event onto the queue and force queue update */
    SDL_PushEvent(&event);
    SDLTest_AssertPass("Call to SDL_PushEvent()");
    SDL_PumpEvents();
@@ -163,7 +163,7 @@ events_addDelEventWatchWithUserdata(void *arg)
    SDL_DelEventWatch(_events_sampleNullEventFilter, (void *)&_userdataValue);
    SDLTest_AssertPass("Call to SDL_DelEventWatch()");
 
-   /* Push a user event onto the queue and force queue update*/
+   /* Push a user event onto the queue and force queue update */
    _eventFilterCalled = 0;
    SDL_PushEvent(&event);
    SDLTest_AssertPass("Call to SDL_PushEvent()");
diff --git a/test/testautomation_pixels.c b/test/testautomation_pixels.c
index 48f9838..3c0f63b 100644
--- a/test/testautomation_pixels.c
+++ b/test/testautomation_pixels.c
@@ -411,7 +411,7 @@ pixels_calcGammaRamp(void *arg)
   int changed;
   Uint16 magic = 0xbeef;
 
-  /* Allocate temp ramp array and fill with some value*/
+  /* Allocate temp ramp array and fill with some value */
   ramp = (Uint16 *)SDL_malloc(256 * sizeof(Uint16));
   SDLTest_AssertCheck(ramp != NULL, "Validate temp ramp array could be allocated");
   if (ramp == NULL) return TEST_ABORTED;
diff --git a/test/testautomation_video.c b/test/testautomation_video.c
index 4606109..350f0d0 100644
--- a/test/testautomation_video.c
+++ b/test/testautomation_video.c
@@ -876,7 +876,7 @@ video_getWindowId(void *arg)
   /* Clean up */
   _destroyVideoSuiteTestWindow(window);
 
-  /* Get window from ID for closed window*/
+  /* Get window from ID for closed window */
   result = SDL_GetWindowFromID(id);
   SDLTest_AssertPass("Call to SDL_GetWindowID(%d/closed_window)", id);
   SDLTest_AssertCheck(result == NULL, "Verify result is NULL");
diff --git a/test/testgesture.c b/test/testgesture.c
index 3e0fc9d..9c1959b 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 c28d0df..6f523c5 100644
--- a/test/testhaptic.c
+++ b/test/testhaptic.c
@@ -280,7 +280,7 @@ HapticPrintSupported(SDL_Haptic * haptic)
         SDL_Log("      sine\n");
     /* !!! FIXME: put this back when we have more bits in 2.1 */
     /*if (supported & SDL_HAPTIC_SQUARE)
-        SDL_Log("      square\n");*/
+        SDL_Log("      square\n"); */
     if (supported & SDL_HAPTIC_TRIANGLE)
         SDL_Log("      triangle\n");
     if (supported & SDL_HAPTIC_SAWTOOTHUP)
diff --git a/test/testime.c b/test/testime.c
index 2975e84..0baf437 100644
--- a/test/testime.c
+++ b/test/testime.c
@@ -343,7 +343,7 @@ int main(int argc, char *argv[]) {
                     SDL_Log("text inputed: %s\n", text);
 
                     /* After text inputed, we can clear up markedText because it */
-                    /* is committed*/
+                    /* is committed */
                     markedText[0] = 0;
                     Redraw();
                     break;
diff --git a/test/testmessage.c b/test/testmessage.c
index 9faa390..254bd9b 100644
--- a/test/testmessage.c
+++ b/test/testmessage.c
@@ -10,7 +10,7 @@
   freely.
 */
 
-/* Simple test of the SDL MessageBox API*/
+/* Simple test of the SDL MessageBox API */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/testoverlay2.c b/test/testoverlay2.c
index 23e1e1f..addbc27 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 2ba739e..6c26a7a 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 6a11795..7c987fe 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;