diff --git a/apps/cms.c b/apps/cms.c
index bb85a200eda885524248bd2c7617c82b8aa92254..0534fdd071116af214cb6213b077607de7518085 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -104,7 +104,7 @@ typedef struct cms_key_param_st cms_key_param;
 struct cms_key_param_st
 	{
 	int idx;
-	STACK_OF(OPENSSL_STRING)*param;
+	STACK_OF(OPENSSL_STRING) *param;
 	cms_key_param *next;
 	};
 
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
index ec75035ce345952a9b6db18927e29f86d3a9d4c7..47bb4005b077454d5606a6e8722451aff58af2d0 100644
--- a/crypto/x509/x509_lu.c
+++ b/crypto/x509/x509_lu.c
@@ -741,7 +741,7 @@ void X509_STORE_set_verify_cb(X509_STORE *ctx,
 	}
 
 void X509_STORE_set_lookup_crls_cb(X509_STORE *ctx,
-		STACK_OF(X509_CRL)* (*cb)(X509_STORE_CTX *ctx, X509_NAME *nm))
+		STACK_OF(X509_CRL) *(*cb)(X509_STORE_CTX *ctx, X509_NAME *nm))
 	{
 	ctx->lookup_crls = cb;
 	}
diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h
index 9b16c3b6aff784216fa935c0a39ff9127bd8af59..35cbc556d3b6dc5971a1d4f09b5a258a4c8824e3 100644
--- a/crypto/x509/x509_vfy.h
+++ b/crypto/x509/x509_vfy.h
@@ -449,7 +449,7 @@ void X509_STORE_set_verify_cb(X509_STORE *ctx,
 				  int (*verify_cb)(int, X509_STORE_CTX *));
 
 void X509_STORE_set_lookup_crls_cb(X509_STORE *ctx,
-		STACK_OF(X509_CRL)* (*cb)(X509_STORE_CTX *ctx, X509_NAME *nm));
+		STACK_OF(X509_CRL) *(*cb)(X509_STORE_CTX *ctx, X509_NAME *nm));
 
 X509_STORE_CTX *X509_STORE_CTX_new(void);
 
diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c
index c9a6e79838c36f7528745883b20613ad9bf09da6..01c07f48364d8731b9d11c8de12361fbdbb91c67 100644
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509v3/v3_utl.c
@@ -1274,7 +1274,7 @@ static int ipv6_hex(unsigned char *out, const char *in, int inlen)
 	}
 
 
-int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk,
+int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
 						unsigned long chtype)
 	{
 	CONF_VALUE *v;
diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h
index 3da224348bfe57ba2db36b8f8f98428bcef2987f..965ac53499965f7669fffd9c7fb8fc7ff0299ff5 100644
--- a/crypto/x509v3/x509v3.h
+++ b/crypto/x509v3/x509v3.h
@@ -741,7 +741,7 @@ int X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags);
 ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
 ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
 int a2i_ipadd(unsigned char *ipout, const char *ipasc);
-int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE)*dn_sk,
+int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
 						unsigned long chtype);
 
 void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index fcaaa7bf703860b8e1dc348f7bcbd09e812fffcf..e27a92882e6c738df4ec1d7e09920327ce776c68 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3729,10 +3729,10 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg)
 	case SSL_CTRL_CHAIN:
 		if (larg)
 			return ssl_cert_set1_chain(s, NULL,
-						(STACK_OF (X509) *)parg);
+						(STACK_OF(X509) *)parg);
 		else
 			return ssl_cert_set0_chain(s, NULL,
-						(STACK_OF (X509) *)parg);
+						(STACK_OF(X509) *)parg);
 
 	case SSL_CTRL_CHAIN_CERT:
 		if (larg)
@@ -4299,10 +4299,10 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
 	case SSL_CTRL_CHAIN:
 		if (larg)
 			return ssl_cert_set1_chain(NULL, ctx,
-						(STACK_OF (X509) *)parg);
+						(STACK_OF(X509) *)parg);
 		else
 			return ssl_cert_set0_chain(NULL, ctx,
-						(STACK_OF (X509) *)parg);
+						(STACK_OF(X509) *)parg);
 
 	case SSL_CTRL_CHAIN_CERT:
 		if (larg)