diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 88ccb27c4..09b1dfcf8 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -1204,8 +1204,7 @@ struct mbedtls_ssl_session
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
     mbedtls_ssl_tls13_application_secrets MBEDTLS_PRIVATE(app_secrets);
-
-#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
+#endif
 };
 
 /*
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index d37102657..2de52314d 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -262,7 +262,7 @@ int mbedtls_ssl_session_copy( mbedtls_ssl_session *dst,
         return mbedtls_ssl_session_set_hostname( dst,
                                                  src->hostname );
     }
-#endif
+#endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SERVER_NAME_INDICATION */
 #endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_CLI_C */
 
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
@@ -2022,8 +2022,6 @@ static int ssl_tls13_session_save( const mbedtls_ssl_session *session,
     memcpy( p, session->resumption_key, session->resumption_key_len );
     p += session->resumption_key_len;
 
-
-
 #if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_SRV_C)
     if( session->endpoint == MBEDTLS_SSL_IS_SERVER )
     {