diff --git a/src/include/netif/ppp/fsm.h b/src/include/netif/ppp/fsm.h
index 139ff7fb..d4318c5e 100644
--- a/src/include/netif/ppp/fsm.h
+++ b/src/include/netif/ppp/fsm.h
@@ -152,10 +152,12 @@ typedef struct fsm_callbacks {
 /*
  * Timeouts.
  */
+#if 0 /* moved to opt.h */
 #define DEFTIMEOUT	3	/* Timeout time in seconds */
 #define DEFMAXTERMREQS	2	/* Maximum Terminate-Request transmissions */
 #define DEFMAXCONFREQS	10	/* Maximum Configure-Request transmissions */
 #define DEFMAXNAKLOOPS	5	/* Maximum number of nak loops */
+#endif /* moved to opt.h */
 
 
 /*
diff --git a/src/include/netif/ppp/upap.h b/src/include/netif/ppp/upap.h
index 3d1075b2..d6185da9 100644
--- a/src/include/netif/ppp/upap.h
+++ b/src/include/netif/ppp/upap.h
@@ -90,8 +90,8 @@
  */
 #if 0 /* moved to opt.h */
 #define UPAP_DEFTIMEOUT	3	/* Timeout (seconds) for retransmitting req */
-#endif /* moved to opt.h */
 #define UPAP_DEFREQTIME	30	/* Time to wait for auth-req from peer */
+#endif /* moved to opt.h */
 
 /*
  * Each interface is described by upap structure.
diff --git a/src/netif/ppp/fsm.c b/src/netif/ppp/fsm.c
index 8ffc7cfd..ad04dcb9 100644
--- a/src/netif/ppp/fsm.c
+++ b/src/netif/ppp/fsm.c
@@ -79,10 +79,10 @@ void fsm_init(fsm *f) {
     f->state = PPP_FSM_INITIAL;
     f->flags = 0;
     f->id = 0;				/* XXX Start with random id? */
-    f->timeouttime = DEFTIMEOUT;
-    f->maxconfreqtransmits = DEFMAXCONFREQS;
-    f->maxtermtransmits = DEFMAXTERMREQS;
-    f->maxnakloops = DEFMAXNAKLOOPS;
+    f->timeouttime = FSM_DEFTIMEOUT;
+    f->maxconfreqtransmits = FSM_DEFMAXCONFREQS;
+    f->maxtermtransmits = FSM_DEFMAXTERMREQS;
+    f->maxnakloops = FSM_DEFMAXNAKLOOPS;
     f->term_reason_len = 0;
 }
 
diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c
index 097c7376..fe355cae 100644
--- a/src/netif/ppp/ppp.c
+++ b/src/netif/ppp/ppp.c
@@ -258,8 +258,8 @@ ppp_pcb *ppp_new(void) {
   /* default configuration */
   pcb->settings.usepeerdns = 1;
 #if CHAP_SUPPORT
-  pcb->settings.chap_timeout_time = 3;
-  pcb->settings.chap_max_transmits = 10;
+  pcb->settings.chap_timeout_time = CHAP_DEFTIMEOUT;
+  pcb->settings.chap_max_transmits = CHAP_DEFTRANSMITS;
 #endif /* CHAP_SUPPPORT */
   pcb->settings.lcp_loopbackfail = DEFLOOPBACKFAIL;
   pcb->settings.lcp_echo_interval = LCP_ECHOINTERVAL;