diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index c20435ee..262b5915 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -1912,6 +1912,24 @@
 #endif
 #endif /* PPP_SERVER */
 
+#ifndef EAP_DEFREQTIME
+#define	EAP_DEFREQTIME                  20      /* Time to wait for peer request */
+#endif
+
+#ifndef EAP_DEFALLOWREQ
+#define	EAP_DEFALLOWREQ                 20      /* max # times to accept requests */
+#endif
+
+#if PPP_SERVER
+#ifndef EAP_DEFTIMEOUT
+#define	EAP_DEFTIMEOUT                  6       /* Timeout (seconds) for rexmit */
+#endif
+
+#ifndef EAP_DEFTRANSMITS
+#define	EAP_DEFTRANSMITS                10      /* max # times to transmit */
+#endif
+#endif /* PPP_SERVER */
+
 /* Default number of times we receive our magic number from the peer
    before deciding the link is looped-back. */
 #ifndef LCP_DEFLOOPBACKFAIL
diff --git a/src/include/netif/ppp/eap.h b/src/include/netif/ppp/eap.h
index 328046c1..112c4e71 100644
--- a/src/include/netif/ppp/eap.h
+++ b/src/include/netif/ppp/eap.h
@@ -149,10 +149,12 @@ typedef struct eap_state {
 /*
  * Timeouts.
  */
+#if 0 /* moved to opt.h */
 #define	EAP_DEFTIMEOUT		3	/* Timeout (seconds) for rexmit */
 #define	EAP_DEFTRANSMITS	10	/* max # times to transmit */
 #define	EAP_DEFREQTIME		20	/* Time to wait for peer request */
 #define	EAP_DEFALLOWREQ		20	/* max # times to accept requests */
+#endif /* moved to opt.h */
 
 void eap_authwithpeer(ppp_pcb *pcb, char *localname);
 void eap_authpeer(ppp_pcb *pcb, char *localname);