diff --git a/src/netif/ppp/polarssl/des.c b/src/netif/ppp/polarssl/des.c
index fde4809a..38f3a746 100644
--- a/src/netif/ppp/polarssl/des.c
+++ b/src/netif/ppp/polarssl/des.c
@@ -40,8 +40,7 @@
  */
 
 #include "lwip/opt.h"
-#if PPP_SUPPORT
-#if LWIP_INCLUDED_POLARSSL_DES
+#if PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_DES
 
 #include "netif/ppp/polarssl/des.h"
 
@@ -420,5 +419,4 @@ void des_crypt_ecb( des_context *ctx,
     PUT_ULONG_BE( X, output, 4 );
 }
 
-#endif /* PPP_SUPPORT */
-#endif /* LWIP_INCLUDED_POLARSSL_DES */
+#endif /* PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_DES */
diff --git a/src/netif/ppp/polarssl/md4.c b/src/netif/ppp/polarssl/md4.c
index e7692ad8..8de2eb96 100644
--- a/src/netif/ppp/polarssl/md4.c
+++ b/src/netif/ppp/polarssl/md4.c
@@ -40,8 +40,7 @@
  */
 
 #include "lwip/opt.h"
-#if PPP_SUPPORT
-#if LWIP_INCLUDED_POLARSSL_MD4
+#if PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_MD4
 
 #include "netif/ppp/polarssl/md4.h"
 
@@ -277,5 +276,4 @@ void md4( unsigned char *input, int ilen, unsigned char output[16] )
     md4_finish( &ctx, output );
 }
 
-#endif /* PPP_SUPPORT */
-#endif /* LWIP_INCLUDED_POLARSSL_MD4 */
+#endif /* PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_MD4 */
diff --git a/src/netif/ppp/polarssl/md5.c b/src/netif/ppp/polarssl/md5.c
index 877c9cd1..50aa911f 100644
--- a/src/netif/ppp/polarssl/md5.c
+++ b/src/netif/ppp/polarssl/md5.c
@@ -39,8 +39,7 @@
  */
 
 #include "lwip/opt.h"
-#if PPP_SUPPORT
-#if LWIP_INCLUDED_POLARSSL_MD5
+#if PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_MD5
 
 #include "netif/ppp/polarssl/md5.h"
 
@@ -296,5 +295,4 @@ void md5( unsigned char *input, int ilen, unsigned char output[16] )
     md5_finish( &ctx, output );
 }
 
-#endif /* PPP_SUPPORT */
-#endif /* LWIP_INCLUDED_POLARSSL_MD5 */
+#endif /* PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_MD5 */
diff --git a/src/netif/ppp/polarssl/sha1.c b/src/netif/ppp/polarssl/sha1.c
index 0887b4ea..78fe46ef 100644
--- a/src/netif/ppp/polarssl/sha1.c
+++ b/src/netif/ppp/polarssl/sha1.c
@@ -39,8 +39,7 @@
  */
 
 #include "lwip/opt.h"
-#if PPP_SUPPORT
-#if LWIP_INCLUDED_POLARSSL_SHA1
+#if PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_SHA1
 
 #include "netif/ppp/polarssl/sha1.h"
 
@@ -331,5 +330,4 @@ void sha1( unsigned char *input, int ilen, unsigned char output[20] )
     sha1_finish( &ctx, output );
 }
 
-#endif /* PPP_SUPPORT */
-#endif /* LWIP_INCLUDED_POLARSSL_SHA1 */
+#endif /* PPP_SUPPORT && LWIP_INCLUDED_POLARSSL_SHA1 */