diff --git a/src/netif/ppp/chap-md5.c b/src/netif/ppp/chap-md5.c
index 62b69c5f..9239723f 100644
--- a/src/netif/ppp/chap-md5.c
+++ b/src/netif/ppp/chap-md5.c
@@ -41,7 +41,12 @@
 #include "chap-new.h"
 #include "chap-md5.h"
 #include "magic.h"
+
+#if LWIP_INCLUDED_POLARSSL_MD5
+#include "polarssl/lwip_md5.h"
+#else
 #include "polarssl/md5.h"
+#endif
 
 #define MD5_HASH_SIZE		16
 #define MD5_MIN_CHALLENGE	16
diff --git a/src/netif/ppp/chap_ms.c b/src/netif/ppp/chap_ms.c
index b9f55b34..64762dbc 100644
--- a/src/netif/ppp/chap_ms.c
+++ b/src/netif/ppp/chap_ms.c
@@ -91,12 +91,27 @@
 
 #include "chap-new.h"
 #include "chap_ms.h"
-#include "polarssl/md4.h"
-#include "polarssl/sha1.h"
-#include "polarssl/des.h"
 #include "pppcrypt.h"
 #include "magic.h"
 
+#if LWIP_INCLUDED_POLARSSL_MD4
+#include "polarssl/lwip_md4.h"
+#else
+#include "polarssl/md4.h"
+#endif
+
+#if LWIP_INCLUDED_POLARSSL_SHA1
+#include "polarssl/lwip_sha1.h"
+#else
+#include "polarssl/sha1.h"
+#endif
+
+#if LWIP_INCLUDED_POLARSSL_DES
+#include "polarssl/lwip_des.h"
+#else
+#include "polarssl/des.h"
+#endif
+
 #define SHA1_SIGNATURE_SIZE 20
 
 static void	ascii2unicode (char[], int, u_char[]);
diff --git a/src/netif/ppp/eap.c b/src/netif/ppp/eap.c
index cb947f67..7fb3ed64 100644
--- a/src/netif/ppp/eap.c
+++ b/src/netif/ppp/eap.c
@@ -48,7 +48,12 @@
 
 #include "ppp_impl.h"
 
+#if LWIP_INCLUDED_POLARSSL_MD5
+#include "polarssl/lwip_md5.h"
+#else
 #include "polarssl/md5.h"
+#endif
+
 #include "eap.h"
 
 #ifdef USE_SRP
diff --git a/src/netif/ppp/magic.c b/src/netif/ppp/magic.c
index 45237b0a..5dea7320 100644
--- a/src/netif/ppp/magic.c
+++ b/src/netif/ppp/magic.c
@@ -77,7 +77,12 @@
 
 #include "ppp_impl.h"
 
+#if LWIP_INCLUDED_POLARSSL_MD5
+#include "polarssl/lwip_md5.h"
+#else
 #include "polarssl/md5.h"
+#endif
+
 #include "magic.h"
 
 #if PPP_MD5_RANDM /* Using MD5 for better randomness if enabled */
diff --git a/src/netif/ppp/polarssl/des.c b/src/netif/ppp/polarssl/lwip_des.c
similarity index 99%
rename from src/netif/ppp/polarssl/des.c
rename to src/netif/ppp/polarssl/lwip_des.c
index 2e2a61c3..07c00513 100644
--- a/src/netif/ppp/polarssl/des.c
+++ b/src/netif/ppp/polarssl/lwip_des.c
@@ -42,7 +42,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_DES
 
-#include "des.h"
+#include "lwip_des.h"
 
 /*
  * 32-bit integer manipulation macros (big endian)
diff --git a/src/netif/ppp/polarssl/des.h b/src/netif/ppp/polarssl/lwip_des.h
similarity index 100%
rename from src/netif/ppp/polarssl/des.h
rename to src/netif/ppp/polarssl/lwip_des.h
diff --git a/src/netif/ppp/polarssl/md4.c b/src/netif/ppp/polarssl/lwip_md4.c
similarity index 99%
rename from src/netif/ppp/polarssl/md4.c
rename to src/netif/ppp/polarssl/lwip_md4.c
index bf7f9347..b654542e 100644
--- a/src/netif/ppp/polarssl/md4.c
+++ b/src/netif/ppp/polarssl/lwip_md4.c
@@ -42,7 +42,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_MD4
 
-#include "md4.h"
+#include "lwip_md4.h"
 
 /*
  * 32-bit integer manipulation macros (little endian)
diff --git a/src/netif/ppp/polarssl/md4.h b/src/netif/ppp/polarssl/lwip_md4.h
similarity index 100%
rename from src/netif/ppp/polarssl/md4.h
rename to src/netif/ppp/polarssl/lwip_md4.h
diff --git a/src/netif/ppp/polarssl/md5.c b/src/netif/ppp/polarssl/lwip_md5.c
similarity index 99%
rename from src/netif/ppp/polarssl/md5.c
rename to src/netif/ppp/polarssl/lwip_md5.c
index e2854a1b..38ad9d41 100644
--- a/src/netif/ppp/polarssl/md5.c
+++ b/src/netif/ppp/polarssl/lwip_md5.c
@@ -41,7 +41,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_MD5
 
-#include "md5.h"
+#include "lwip_md5.h"
 
 /*
  * 32-bit integer manipulation macros (little endian)
diff --git a/src/netif/ppp/polarssl/md5.h b/src/netif/ppp/polarssl/lwip_md5.h
similarity index 100%
rename from src/netif/ppp/polarssl/md5.h
rename to src/netif/ppp/polarssl/lwip_md5.h
diff --git a/src/netif/ppp/polarssl/sha1.c b/src/netif/ppp/polarssl/lwip_sha1.c
similarity index 99%
rename from src/netif/ppp/polarssl/sha1.c
rename to src/netif/ppp/polarssl/lwip_sha1.c
index 5d7a59c8..2d62fdfe 100644
--- a/src/netif/ppp/polarssl/sha1.c
+++ b/src/netif/ppp/polarssl/lwip_sha1.c
@@ -41,7 +41,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_SHA1
 
-#include "sha1.h"
+#include "lwip_sha1.h"
 
 /*
  * 32-bit integer manipulation macros (big endian)
diff --git a/src/netif/ppp/polarssl/sha1.h b/src/netif/ppp/polarssl/lwip_sha1.h
similarity index 100%
rename from src/netif/ppp/polarssl/sha1.h
rename to src/netif/ppp/polarssl/lwip_sha1.h