diff --git a/src/api/tcpip.c b/src/api/tcpip.c
index 44fb0989..72794f12 100644
--- a/src/api/tcpip.c
+++ b/src/api/tcpip.c
@@ -47,7 +47,7 @@
 #include "lwip/tcpip.h"
 #include "lwip/init.h"
 #include "netif/etharp.h"
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 
 /* global variables */
 static tcpip_init_done_fn tcpip_init_done;
diff --git a/src/core/init.c b/src/core/init.c
index e3865698..0a9e287a 100644
--- a/src/core/init.c
+++ b/src/core/init.c
@@ -60,7 +60,7 @@
 #include "lwip/nd6.h"
 #include "lwip/mld6.h"
 #include "lwip/api.h"
-#include "ppp.h"
+#include "netif/ppp/ppp.h"
 
 /* Compile-time sanity checks for configuration errors.
  * These can be done independently of LWIP_DEBUG, without penalty.
diff --git a/src/core/memp.c b/src/core/memp.c
index 9db9a5e5..4a55f8f2 100644
--- a/src/core/memp.c
+++ b/src/core/memp.c
@@ -57,8 +57,9 @@
 #include "lwip/snmp_structs.h"
 #include "lwip/snmp_msg.h"
 #include "lwip/dns.h"
-#include "netif/ppp_oe.h"
-#include "netif/pppol2tp.h"
+#include "netif/ppp/ppp.h"
+#include "netif/ppp/pppoe.h"
+#include "netif/ppp/pppol2tp.h"
 #include "lwip/nd6.h"
 #include "lwip/ip6_frag.h"
 #include "lwip/mld6.h"
diff --git a/src/include/lwip/pppapi.h b/src/include/lwip/pppapi.h
index ae1e001a..a4d5b356 100644
--- a/src/include/lwip/pppapi.h
+++ b/src/include/lwip/pppapi.h
@@ -33,7 +33,7 @@
 #if LWIP_PPP_API /* don't build if not configured for use in lwipopts.h */
 
 #include "lwip/sys.h"
-#include "ppp.h"
+#include "netif/ppp/ppp.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/netif/ppp/ccp.h b/src/include/netif/ppp/ccp.h
similarity index 100%
rename from src/netif/ppp/ccp.h
rename to src/include/netif/ppp/ccp.h
diff --git a/src/netif/ppp/chap-md5.h b/src/include/netif/ppp/chap-md5.h
similarity index 100%
rename from src/netif/ppp/chap-md5.h
rename to src/include/netif/ppp/chap-md5.h
diff --git a/src/netif/ppp/chap-new.h b/src/include/netif/ppp/chap-new.h
similarity index 100%
rename from src/netif/ppp/chap-new.h
rename to src/include/netif/ppp/chap-new.h
diff --git a/src/netif/ppp/chap_ms.h b/src/include/netif/ppp/chap_ms.h
similarity index 100%
rename from src/netif/ppp/chap_ms.h
rename to src/include/netif/ppp/chap_ms.h
diff --git a/src/netif/ppp/eap.h b/src/include/netif/ppp/eap.h
similarity index 100%
rename from src/netif/ppp/eap.h
rename to src/include/netif/ppp/eap.h
diff --git a/src/netif/ppp/ecp.h b/src/include/netif/ppp/ecp.h
similarity index 100%
rename from src/netif/ppp/ecp.h
rename to src/include/netif/ppp/ecp.h
diff --git a/src/netif/ppp/eui64.h b/src/include/netif/ppp/eui64.h
similarity index 100%
rename from src/netif/ppp/eui64.h
rename to src/include/netif/ppp/eui64.h
diff --git a/src/netif/ppp/fsm.h b/src/include/netif/ppp/fsm.h
similarity index 100%
rename from src/netif/ppp/fsm.h
rename to src/include/netif/ppp/fsm.h
diff --git a/src/netif/ppp/ipcp.h b/src/include/netif/ppp/ipcp.h
similarity index 100%
rename from src/netif/ppp/ipcp.h
rename to src/include/netif/ppp/ipcp.h
diff --git a/src/netif/ppp/ipv6cp.h b/src/include/netif/ppp/ipv6cp.h
similarity index 100%
rename from src/netif/ppp/ipv6cp.h
rename to src/include/netif/ppp/ipv6cp.h
diff --git a/src/netif/ppp/lcp.h b/src/include/netif/ppp/lcp.h
similarity index 100%
rename from src/netif/ppp/lcp.h
rename to src/include/netif/ppp/lcp.h
diff --git a/src/netif/ppp/magic.h b/src/include/netif/ppp/magic.h
similarity index 100%
rename from src/netif/ppp/magic.h
rename to src/include/netif/ppp/magic.h
diff --git a/src/netif/ppp/polarssl/lwip_des.h b/src/include/netif/ppp/polarssl/des.h
similarity index 100%
rename from src/netif/ppp/polarssl/lwip_des.h
rename to src/include/netif/ppp/polarssl/des.h
diff --git a/src/netif/ppp/polarssl/lwip_md4.h b/src/include/netif/ppp/polarssl/md4.h
similarity index 100%
rename from src/netif/ppp/polarssl/lwip_md4.h
rename to src/include/netif/ppp/polarssl/md4.h
diff --git a/src/netif/ppp/polarssl/lwip_md5.h b/src/include/netif/ppp/polarssl/md5.h
similarity index 100%
rename from src/netif/ppp/polarssl/lwip_md5.h
rename to src/include/netif/ppp/polarssl/md5.h
diff --git a/src/netif/ppp/polarssl/lwip_sha1.h b/src/include/netif/ppp/polarssl/sha1.h
similarity index 100%
rename from src/netif/ppp/polarssl/lwip_sha1.h
rename to src/include/netif/ppp/polarssl/sha1.h
diff --git a/src/netif/ppp/ppp.h b/src/include/netif/ppp/ppp.h
similarity index 99%
rename from src/netif/ppp/ppp.h
rename to src/include/netif/ppp/ppp.h
index 0f41ee45..1bbf4a7e 100644
--- a/src/netif/ppp/ppp.h
+++ b/src/include/netif/ppp/ppp.h
@@ -145,10 +145,10 @@ typedef struct ppp_pcb_s ppp_pcb;
 #endif /* EAP_SUPPORT */
 
 #if PPPOE_SUPPORT
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 #endif /* PPPOE_SUPPORT */
 #if PPPOL2TP_SUPPORT
-#include "netif/pppol2tp.h"
+#include "netif/ppp/pppol2tp.h"
 #endif /* PPPOL2TP_SUPPORT */
 
 /*
diff --git a/src/netif/ppp/ppp_impl.h b/src/include/netif/ppp/ppp_impl.h
similarity index 100%
rename from src/netif/ppp/ppp_impl.h
rename to src/include/netif/ppp/ppp_impl.h
diff --git a/src/netif/ppp/pppcrypt.h b/src/include/netif/ppp/pppcrypt.h
similarity index 100%
rename from src/netif/ppp/pppcrypt.h
rename to src/include/netif/ppp/pppcrypt.h
diff --git a/src/netif/ppp/pppdebug.h b/src/include/netif/ppp/pppdebug.h
similarity index 100%
rename from src/netif/ppp/pppdebug.h
rename to src/include/netif/ppp/pppdebug.h
diff --git a/src/include/netif/ppp_oe.h b/src/include/netif/ppp/pppoe.h
similarity index 99%
rename from src/include/netif/ppp_oe.h
rename to src/include/netif/ppp/pppoe.h
index 02006f33..8385d9af 100644
--- a/src/include/netif/ppp_oe.h
+++ b/src/include/netif/ppp/pppoe.h
@@ -1,5 +1,5 @@
 /*****************************************************************************
-* ppp_oe.h - PPP Over Ethernet implementation for lwIP.
+* pppoe.h - PPP Over Ethernet implementation for lwIP.
 *
 * Copyright (c) 2006 by Marc Boucher, Services Informatiques (MBSI) inc.
 *
diff --git a/src/include/netif/pppol2tp.h b/src/include/netif/ppp/pppol2tp.h
similarity index 100%
rename from src/include/netif/pppol2tp.h
rename to src/include/netif/ppp/pppol2tp.h
diff --git a/src/netif/ppp/upap.h b/src/include/netif/ppp/upap.h
similarity index 100%
rename from src/netif/ppp/upap.h
rename to src/include/netif/ppp/upap.h
diff --git a/src/netif/ppp/vj.h b/src/include/netif/ppp/vj.h
similarity index 100%
rename from src/netif/ppp/vj.h
rename to src/include/netif/ppp/vj.h
diff --git a/src/netif/etharp.c b/src/netif/etharp.c
index 1b7eb988..dd29ca46 100644
--- a/src/netif/etharp.c
+++ b/src/netif/etharp.c
@@ -58,7 +58,7 @@
 #include "lwip/ip6.h"
 
 #if PPPOE_SUPPORT
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 #endif /* PPPOE_SUPPORT */
 
 #include <string.h>
diff --git a/src/netif/ethernetif.c b/src/netif/ethernetif.c
index 46900bdb..ad4d2dcb 100644
--- a/src/netif/ethernetif.c
+++ b/src/netif/ethernetif.c
@@ -54,7 +54,7 @@
 #include "lwip/snmp.h"
 #include "lwip/ethip6.h"
 #include "netif/etharp.h"
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 
 /* Define those to better describe your network interface. */
 #define IFNAME0 'e'
diff --git a/src/netif/ppp/auth.c b/src/netif/ppp/auth.c
index 9cc62a5d..e150ff6b 100644
--- a/src/netif/ppp/auth.c
+++ b/src/netif/ppp/auth.c
@@ -103,28 +103,28 @@
 #include <time.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
 #if CCP_SUPPORT
-#include "ccp.h"
+#include "netif/ppp/ccp.h"
 #endif /* CCP_SUPPORT */
 #if ECP_SUPPORT
-#include "ecp.h"
+#include "netif/ppp/ecp.h"
 #endif /* ECP_SUPPORT */
-#include "ipcp.h"
+#include "netif/ppp/ipcp.h"
 #if PAP_SUPPORT
-#include "upap.h"
+#include "netif/ppp/upap.h"
 #endif /* PAP_SUPPORT */
 #if CHAP_SUPPORT
-#include "chap-new.h"
+#include "netif/ppp/chap-new.h"
 #endif /* CHAP_SUPPORT */
 #if EAP_SUPPORT
-#include "eap.h"
+#include "netif/ppp/eap.h"
 #endif /* EAP_SUPPORT */
 #if CBCP_SUPPORT
-#include "cbcp.h"
+#include "netif/ppp/cbcp.h"
 #endif
 
 #if 0 /* UNUSED */
diff --git a/src/netif/ppp/ccp.c b/src/netif/ppp/ccp.c
index de1ad4e8..2117fcab 100644
--- a/src/netif/ppp/ccp.c
+++ b/src/netif/ppp/ccp.c
@@ -34,15 +34,15 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "ccp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ccp.h"
 #include <net/ppp-comp.h>
 
 #ifdef MPPE
-#include "chap_ms.h"	/* mppe_xxxx_key, mppe_keys_set */
-#include "lcp.h"	/* lcp_close(), lcp_fsm */
+#include "netif/ppp/chap_ms.h"	/* mppe_xxxx_key, mppe_keys_set */
+#include "netif/ppp/lcp.h"	/* lcp_close(), lcp_fsm */
 #endif
 
 /*
diff --git a/src/netif/ppp/chap-md5.c b/src/netif/ppp/chap-md5.c
index 9239723f..5e0fc714 100644
--- a/src/netif/ppp/chap-md5.c
+++ b/src/netif/ppp/chap-md5.c
@@ -36,14 +36,14 @@
 #include <string.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "chap-new.h"
-#include "chap-md5.h"
-#include "magic.h"
+#include "netif/ppp/chap-new.h"
+#include "netif/ppp/chap-md5.h"
+#include "netif/ppp/magic.h"
 
 #if LWIP_INCLUDED_POLARSSL_MD5
-#include "polarssl/lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 #else
 #include "polarssl/md5.h"
 #endif
diff --git a/src/netif/ppp/chap-new.c b/src/netif/ppp/chap-new.c
index f98719e4..242c9163 100644
--- a/src/netif/ppp/chap-new.c
+++ b/src/netif/ppp/chap-new.c
@@ -36,16 +36,16 @@
 #include <string.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
 #if 0 /* UNUSED */
 #include "session.h"
 #endif /* UNUSED */
 
-#include "chap-new.h"
-#include "chap-md5.h"
+#include "netif/ppp/chap-new.h"
+#include "netif/ppp/chap-md5.h"
 #if MSCHAP_SUPPORT
-#include "chap_ms.h"
+#include "netif/ppp/chap_ms.h"
 #endif
 
 /* Hook for a plugin to validate CHAP challenge */
diff --git a/src/netif/ppp/chap_ms.c b/src/netif/ppp/chap_ms.c
index 64762dbc..be5331c1 100644
--- a/src/netif/ppp/chap_ms.c
+++ b/src/netif/ppp/chap_ms.c
@@ -87,27 +87,27 @@
 #include <unistd.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "chap-new.h"
-#include "chap_ms.h"
-#include "pppcrypt.h"
-#include "magic.h"
+#include "netif/ppp/chap-new.h"
+#include "netif/ppp/chap_ms.h"
+#include "netif/ppp/pppcrypt.h"
+#include "netif/ppp/magic.h"
 
 #if LWIP_INCLUDED_POLARSSL_MD4
-#include "polarssl/lwip_md4.h"
+#include "netif/ppp/polarssl/md4.h"
 #else
 #include "polarssl/md4.h"
 #endif
 
 #if LWIP_INCLUDED_POLARSSL_SHA1
-#include "polarssl/lwip_sha1.h"
+#include "netif/ppp/polarssl/sha1.h"
 #else
 #include "polarssl/sha1.h"
 #endif
 
 #if LWIP_INCLUDED_POLARSSL_DES
-#include "polarssl/lwip_des.h"
+#include "netif/ppp/polarssl/des.h"
 #else
 #include "polarssl/des.h"
 #endif
@@ -150,8 +150,8 @@ static char *mschap_challenge = NULL;
 static char *mschap2_peer_challenge = NULL;
 #endif
 
-#include "fsm.h"		/* Need to poke MPPE options */
-#include "ccp.h"
+#include "netif/ppp/fsm.h"		/* Need to poke MPPE options */
+#include "netif/ppp/ccp.h"
 #include <net/ppp-comp.h>
 #endif
 
diff --git a/src/netif/ppp/demand.c b/src/netif/ppp/demand.c
index 81d307ec..dbabfa90 100644
--- a/src/netif/ppp/demand.c
+++ b/src/netif/ppp/demand.c
@@ -52,11 +52,11 @@
 #include <pcap-bpf.h>
 #endif
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "ipcp.h"
-#include "lcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ipcp.h"
+#include "netif/ppp/lcp.h"
 
 char *frame;
 int framelen;
diff --git a/src/netif/ppp/eap.c b/src/netif/ppp/eap.c
index dca92d3c..f213d778 100644
--- a/src/netif/ppp/eap.c
+++ b/src/netif/ppp/eap.c
@@ -46,21 +46,21 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT && EAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
 #if LWIP_INCLUDED_POLARSSL_MD5
-#include "polarssl/lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 #else
 #include "polarssl/md5.h"
 #endif
 
-#include "eap.h"
+#include "netif/ppp/eap.h"
 
 #ifdef USE_SRP
 #include <t_pwd.h>
 #include <t_server.h>
 #include <t_client.h>
-#include "pppcrypt.h"
+#include "netif/ppp/pppcrypt.h"
 #endif /* USE_SRP */
 
 #ifndef SHA_DIGESTSIZE
diff --git a/src/netif/ppp/ecp.c b/src/netif/ppp/ecp.c
index 4c469b9a..f2645055 100644
--- a/src/netif/ppp/ecp.c
+++ b/src/netif/ppp/ecp.c
@@ -62,10 +62,10 @@
 
 #include <string.h>
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "ecp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ecp.h"
 
 #if PPP_OPTIONS
 static option_t ecp_option_list[] = {
diff --git a/src/netif/ppp/eui64.c b/src/netif/ppp/eui64.c
index aeeaa1a3..e23a34e8 100644
--- a/src/netif/ppp/eui64.c
+++ b/src/netif/ppp/eui64.c
@@ -38,8 +38,8 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT && PPP_IPV6_SUPPORT  /* don't build if not configured for use in lwipopts.h */
 
-#include "ppp_impl.h"
-#include "eui64.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/eui64.h"
 
 /*
  * eui64_ntoa - Make an ascii representation of an interface identifier
diff --git a/src/netif/ppp/fsm.c b/src/netif/ppp/fsm.c
index 60daf6ee..4c3cf53a 100644
--- a/src/netif/ppp/fsm.c
+++ b/src/netif/ppp/fsm.c
@@ -55,9 +55,9 @@
 #include <sys/types.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
+#include "netif/ppp/fsm.h"
 
 static void fsm_timeout (void *);
 static void fsm_rconfreq(fsm *f, u_char id, u_char *inp, int len);
diff --git a/src/netif/ppp/ipcp.c b/src/netif/ppp/ipcp.c
index 1f1e249a..b7300f3c 100644
--- a/src/netif/ppp/ipcp.c
+++ b/src/netif/ppp/ipcp.c
@@ -59,10 +59,10 @@
 #include <arpa/inet.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "ipcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ipcp.h"
 
 #if 0 /* UNUSED */
 /* global vars */
diff --git a/src/netif/ppp/ipv6cp.c b/src/netif/ppp/ipv6cp.c
index cfccb7f4..14b83f90 100644
--- a/src/netif/ppp/ipv6cp.c
+++ b/src/netif/ppp/ipv6cp.c
@@ -163,11 +163,11 @@
 #include <arpa/inet.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
-#include "fsm.h"
-#include "ipcp.h"
-#include "ipv6cp.h"
-#include "magic.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/ipcp.h"
+#include "netif/ppp/ipv6cp.h"
+#include "netif/ppp/magic.h"
 
 /* global vars */
 #if 0 /* UNUSED */
diff --git a/src/netif/ppp/lcp.c b/src/netif/ppp/lcp.c
index cf5bbef5..01a889d0 100644
--- a/src/netif/ppp/lcp.c
+++ b/src/netif/ppp/lcp.c
@@ -53,14 +53,14 @@
 #include <stdlib.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
 #if CHAP_SUPPORT
-#include "chap-new.h"
+#include "netif/ppp/chap-new.h"
 #endif /* CHAP_SUPPORT */
-#include "magic.h"
+#include "netif/ppp/magic.h"
 
 /*
  * When the link comes up we want to be able to wait for a short while,
diff --git a/src/netif/ppp/magic.c b/src/netif/ppp/magic.c
index fd5b159c..86aef275 100644
--- a/src/netif/ppp/magic.c
+++ b/src/netif/ppp/magic.c
@@ -75,13 +75,13 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
 
-#include "ppp_impl.h"
-#include "magic.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/magic.h"
 
 #if PPP_MD5_RANDM /* Using MD5 for better randomness if enabled */
 
 #if LWIP_INCLUDED_POLARSSL_MD5
-#include "polarssl/lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 #else
 #include "polarssl/md5.h"
 #endif
diff --git a/src/netif/ppp/multilink.c b/src/netif/ppp/multilink.c
index bb36fbd2..883ecd00 100644
--- a/src/netif/ppp/multilink.c
+++ b/src/netif/ppp/multilink.c
@@ -49,11 +49,11 @@
 #include <netinet/in.h>
 #include <unistd.h>
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
-#include "tdb.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
+#include "netif/ppp/tdb.h"
 
 bool endpoint_specified;	/* user gave explicit endpoint discriminator */
 char *bundle_id;		/* identifier for our bundle */
diff --git a/src/netif/ppp/polarssl/lwip_des.c b/src/netif/ppp/polarssl/des.c
similarity index 99%
rename from src/netif/ppp/polarssl/lwip_des.c
rename to src/netif/ppp/polarssl/des.c
index 07c00513..e6a7a0dd 100644
--- a/src/netif/ppp/polarssl/lwip_des.c
+++ b/src/netif/ppp/polarssl/des.c
@@ -42,7 +42,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_DES
 
-#include "lwip_des.h"
+#include "netif/ppp/polarssl/des.h"
 
 /*
  * 32-bit integer manipulation macros (big endian)
diff --git a/src/netif/ppp/polarssl/lwip_md4.c b/src/netif/ppp/polarssl/md4.c
similarity index 99%
rename from src/netif/ppp/polarssl/lwip_md4.c
rename to src/netif/ppp/polarssl/md4.c
index b654542e..aea6ed8f 100644
--- a/src/netif/ppp/polarssl/lwip_md4.c
+++ b/src/netif/ppp/polarssl/md4.c
@@ -42,7 +42,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_MD4
 
-#include "lwip_md4.h"
+#include "netif/ppp/polarssl/md4.h"
 
 /*
  * 32-bit integer manipulation macros (little endian)
diff --git a/src/netif/ppp/polarssl/lwip_md5.c b/src/netif/ppp/polarssl/md5.c
similarity index 99%
rename from src/netif/ppp/polarssl/lwip_md5.c
rename to src/netif/ppp/polarssl/md5.c
index 38ad9d41..c5e08a0d 100644
--- a/src/netif/ppp/polarssl/lwip_md5.c
+++ b/src/netif/ppp/polarssl/md5.c
@@ -41,7 +41,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_MD5
 
-#include "lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 
 /*
  * 32-bit integer manipulation macros (little endian)
diff --git a/src/netif/ppp/polarssl/lwip_sha1.c b/src/netif/ppp/polarssl/sha1.c
similarity index 99%
rename from src/netif/ppp/polarssl/lwip_sha1.c
rename to src/netif/ppp/polarssl/sha1.c
index 2d62fdfe..f71ec416 100644
--- a/src/netif/ppp/polarssl/lwip_sha1.c
+++ b/src/netif/ppp/polarssl/sha1.c
@@ -41,7 +41,7 @@
 #include "lwip/opt.h"
 #if LWIP_INCLUDED_POLARSSL_SHA1
 
-#include "lwip_sha1.h"
+#include "netif/ppp/polarssl/sha1.h"
 
 /*
  * 32-bit integer manipulation macros (big endian)
diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c
index bb5ad627..c7725658 100644
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -92,40 +92,40 @@
 #include "lwip/sys.h"
 #include "lwip/ip.h" /* for ip_input() */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
-#include "ipcp.h"
-#include "magic.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
+#include "netif/ppp/ipcp.h"
+#include "netif/ppp/magic.h"
 
 #if PAP_SUPPORT
-#include "upap.h"
+#include "netif/ppp/upap.h"
 #endif /* PAP_SUPPORT */
 #if CHAP_SUPPORT
-#include "chap-new.h"
+#include "netif/ppp/chap-new.h"
 #endif /* CHAP_SUPPORT */
 #if EAP_SUPPORT
-#include "eap.h"
+#include "netif/ppp/eap.h"
 #endif /* EAP_SUPPORT */
 #if CCP_SUPPORT
-#include "ccp.h"
+#include "netif/ppp/ccp.h"
 #endif /* EAP_SUPPORT */
 #if ECP_SUPPORT
-#include "ecp.h"
+#include "netif/ppp/ecp.h"
 #endif /* EAP_SUPPORT */
 #if VJ_SUPPORT
-#include "vj.h"
+#include "netif/ppp/vj.h"
 #endif /* VJ_SUPPORT */
 #if PPP_IPV6_SUPPORT
-#include "ipv6cp.h"
+#include "netif/ppp/ipv6cp.h"
 #endif /* PPP_IPV6_SUPPORT */
 
 #if PPPOE_SUPPORT
-#include "netif/ppp_oe.h"
+#include "netif/ppp/pppoe.h"
 #endif /* PPPOE_SUPPORT */
 #if PPPOL2TP_SUPPORT
-#include "netif/pppol2tp.h"
+#include "netif/ppp/pppol2tp.h"
 #endif /* PPPOL2TP_SUPPORT */
 
 /* Global variables */
diff --git a/src/netif/ppp/pppcrypt.c b/src/netif/ppp/pppcrypt.c
index dd6963e8..097f702b 100644
--- a/src/netif/ppp/pppcrypt.c
+++ b/src/netif/ppp/pppcrypt.c
@@ -33,9 +33,9 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT && MSCHAP_SUPPORT /* don't build if not necessary */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "pppcrypt.h"
+#include "netif/ppp/pppcrypt.h"
 
 
 static u_char pppcrypt_get_7bits(u_char *input, int startBit) {
diff --git a/src/netif/ppp/ppp_oe.c b/src/netif/ppp/pppoe.c
similarity index 99%
rename from src/netif/ppp/ppp_oe.c
rename to src/netif/ppp/pppoe.c
index 84a47aeb..65dd39df 100644
--- a/src/netif/ppp/ppp_oe.c
+++ b/src/netif/ppp/pppoe.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
-* ppp_oe.c - PPP Over Ethernet implementation for lwIP.
+* pppoe.c - PPP Over Ethernet implementation for lwIP.
 *
 * Copyright (c) 2006 by Marc Boucher, Services Informatiques (MBSI) inc.
 *
@@ -80,8 +80,8 @@
 #include "lwip/memp.h"
 #include "lwip/stats.h"
 
-#include "ppp_impl.h"
-#include "netif/ppp_oe.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/pppoe.h"
 
 /* Add a 16 bit unsigned value to a buffer pointed to by PTR */
 #define PPPOE_ADD_16(PTR, VAL) \
diff --git a/src/netif/ppp/pppol2tp.c b/src/netif/ppp/pppol2tp.c
index aa595a82..3a8eb7d8 100644
--- a/src/netif/ppp/pppol2tp.c
+++ b/src/netif/ppp/pppol2tp.c
@@ -58,14 +58,14 @@
 #include "lwip/netif.h"
 #include "lwip/udp.h"
 
-#include "ppp_impl.h"
-#include "netif/pppol2tp.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/pppol2tp.h"
 
-#include "magic.h"
+#include "netif/ppp/magic.h"
 
 #if PPPOL2TP_AUTH_SUPPORT
 #if LWIP_INCLUDED_POLARSSL_MD5
-#include "polarssl/lwip_md5.h"
+#include "netif/ppp/polarssl/md5.h"
 #else
 #include "polarssl/md5.h"
 #endif
diff --git a/src/netif/ppp/upap.c b/src/netif/ppp/upap.c
index eb55ec11..8f3a44c9 100644
--- a/src/netif/ppp/upap.c
+++ b/src/netif/ppp/upap.c
@@ -52,9 +52,9 @@
 #include <string.h>
 #endif /* UNUSED */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "upap.h"
+#include "netif/ppp/upap.h"
 
 #if PPP_OPTIONS
 /*
diff --git a/src/netif/ppp/utils.c b/src/netif/ppp/utils.c
index 074f8e94..833a5a76 100644
--- a/src/netif/ppp/utils.c
+++ b/src/netif/ppp/utils.c
@@ -60,10 +60,10 @@
 
 #include <ctype.h>  /* isdigit() */
 
-#include "ppp_impl.h"
+#include "netif/ppp/ppp_impl.h"
 
-#include "fsm.h"
-#include "lcp.h"
+#include "netif/ppp/fsm.h"
+#include "netif/ppp/lcp.h"
 
 #if defined(SUNOS4)
 extern char *strerror();
diff --git a/src/netif/ppp/vj.c b/src/netif/ppp/vj.c
index 79752512..792e16c9 100644
--- a/src/netif/ppp/vj.c
+++ b/src/netif/ppp/vj.c
@@ -31,10 +31,10 @@
 #include "lwip/opt.h"
 #if PPP_SUPPORT && VJ_SUPPORT /* don't build if not configured for use in lwipopts.h */
 
-#include "ppp_impl.h"
-#include "pppdebug.h"
+#include "netif/ppp/ppp_impl.h"
+#include "netif/ppp/pppdebug.h"
 
-#include "vj.h"
+#include "netif/ppp/vj.h"
 
 #include <string.h>