diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index d890ff9c0..f6a310e50 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -477,7 +477,7 @@ static inline const char *cipher_get_name( const cipher_context_t *ctx )
  *                      POLARSSL_KEY_LENGTH_NONE if ctx has not been
  *                      initialised.
  */
-static inline int cipher_get_key_size ( const cipher_context_t *ctx )
+static inline int cipher_get_key_size( const cipher_context_t *ctx )
 {
     if( NULL == ctx || NULL == ctx->cipher_info )
         return POLARSSL_KEY_LENGTH_NONE;
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 742550852..5cf4b88de 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -2262,8 +2262,8 @@
 //#define POLARSSL_PLATFORM_STD_PRINTF        printf /**< Default printf to use, can be undefined */
 //#define POLARSSL_PLATFORM_STD_SNPRINTF    snprintf /**< Default snprintf to use, can be undefined */
 
-/* To Use Function Macros POLARSSL_PLATFORM_C must be enabled 							*/
-/* POLARSSL_PLATFORM_XXX_MACRO and POLARSSL_PLATFORM_XXX_ALT cannot both be defined 	*/
+/* To Use Function Macros POLARSSL_PLATFORM_C must be enabled */
+/* POLARSSL_PLATFORM_XXX_MACRO and POLARSSL_PLATFORM_XXX_ALT cannot both be defined */
 //#define POLARSSL_PLATFORM_MALLOC_MACRO        malloc /**< Default allocator macro to use, can be undefined */
 //#define POLARSSL_PLATFORM_FREE_MACRO            free /**< Default free macro to use, can be undefined */
 //#define POLARSSL_PLATFORM_EXIT_MACRO            exit /**< Default exit macro to use, can be undefined */
diff --git a/include/polarssl/platform.h b/include/polarssl/platform.h
index 3e76c301b..3c87cbee8 100644
--- a/include/polarssl/platform.h
+++ b/include/polarssl/platform.h
@@ -80,10 +80,10 @@ extern "C" {
  * The function pointers for malloc and free
  */
 #if defined(POLARSSL_PLATFORM_MEMORY)
-#if defined(POLARSSL_PLATFORM_FREE_MACRO) &&\
-	defined(POLARSSL_PLATFORM_MALLOC_MACRO)
-#define polarssl_free    POLARSSL_PLATFORM_FREE_MACRO
-#define polarssl_malloc    POLARSSL_PLATFORM_MALLOC_MACRO
+#if defined(POLARSSL_PLATFORM_FREE_MACRO) && \
+    defined(POLARSSL_PLATFORM_MALLOC_MACRO)
+#define polarssl_free       POLARSSL_PLATFORM_FREE_MACRO
+#define polarssl_malloc     POLARSSL_PLATFORM_MALLOC_MACRO
 #else
 extern void * (*polarssl_malloc)( size_t len );
 extern void (*polarssl_free)( void *ptr );
@@ -100,8 +100,8 @@ int platform_set_malloc_free( void * (*malloc_func)( size_t ),
                               void (*free_func)( void * ) );
 #endif /* POLARSSL_PLATFORM_FREE_MACRO && POLARSSL_PLATFORM_MALLOC_MACRO */
 #else /* !POLARSSL_PLATFORM_MEMORY */
-#define polarssl_free    free
-#define polarssl_malloc    malloc
+#define polarssl_free       free
+#define polarssl_malloc     malloc
 #endif /* POLARSSL_PLATFORM_MEMORY && !POLARSSL_PLATFORM_{FREE,MALLOC}_MACRO */
 
 /*