diff --git a/include/mbedtls/pkcs12.h b/include/mbedtls/pkcs12.h
index f78ea3c..d472d90 100644
--- a/include/mbedtls/pkcs12.h
+++ b/include/mbedtls/pkcs12.h
@@ -31,23 +31,23 @@
 #include <stddef.h>
 
 /** Bad input parameters to function. */
-#define MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA                 -0x1F80
+#define MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA -0x1F80
 /** Feature not available, e.g. unsupported encryption scheme. */
-#define MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE            -0x1F00
+#define MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE -0x1F00
 /** PBE ASN.1 data not as expected. */
-#define MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT             -0x1E80
+#define MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT -0x1E80
 /** Given private key password does not allow for correct decryption. */
-#define MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH              -0x1E00
+#define MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH -0x1E00
 
 /** encryption/decryption key */
-#define MBEDTLS_PKCS12_DERIVE_KEY       1
+#define MBEDTLS_PKCS12_DERIVE_KEY 1
 /** initialization vector     */
-#define MBEDTLS_PKCS12_DERIVE_IV        2
+#define MBEDTLS_PKCS12_DERIVE_IV 2
 /** integrity / MAC key       */
-#define MBEDTLS_PKCS12_DERIVE_MAC_KEY   3
+#define MBEDTLS_PKCS12_DERIVE_MAC_KEY 3
 
-#define MBEDTLS_PKCS12_PBE_DECRYPT      0
-#define MBEDTLS_PKCS12_PBE_ENCRYPT      1
+#define MBEDTLS_PKCS12_PBE_DECRYPT 0
+#define MBEDTLS_PKCS12_PBE_ENCRYPT 1
 
 #ifdef __cplusplus
 extern "C" {
@@ -71,11 +71,15 @@
  *
  * \return           0 if successful, or a MBEDTLS_ERR_XXX code
  */
-int mbedtls_pkcs12_pbe( mbedtls_asn1_buf *pbe_params, int mode,
-                mbedtls_cipher_type_t cipher_type, mbedtls_md_type_t md_type,
-                const unsigned char *pwd,  size_t pwdlen,
-                const unsigned char *input, size_t len,
-                unsigned char *output );
+int mbedtls_pkcs12_pbe(mbedtls_asn1_buf *pbe_params,
+                       int mode,
+                       mbedtls_cipher_type_t cipher_type,
+                       mbedtls_md_type_t md_type,
+                       const unsigned char *pwd,
+                       size_t pwdlen,
+                       const unsigned char *input,
+                       size_t len,
+                       unsigned char *output);
 
 #endif /* MBEDTLS_ASN1_PARSE_C */
 
@@ -100,10 +104,15 @@
  *
  * \return          0 if successful, or a MD, BIGNUM type error.
  */
-int mbedtls_pkcs12_derivation( unsigned char *data, size_t datalen,
-                       const unsigned char *pwd, size_t pwdlen,
-                       const unsigned char *salt, size_t saltlen,
-                       mbedtls_md_type_t mbedtls_md, int id, int iterations );
+int mbedtls_pkcs12_derivation(unsigned char *data,
+                              size_t datalen,
+                              const unsigned char *pwd,
+                              size_t pwdlen,
+                              const unsigned char *salt,
+                              size_t saltlen,
+                              mbedtls_md_type_t mbedtls_md,
+                              int id,
+                              int iterations);
 
 #ifdef __cplusplus
 }