24 files changed, 26 insertions, 6 deletions

diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index f0c8f94ee805f..be55a6a94e0de 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -44,6 +44,7 @@
 #include <libutil.h>
 #endif
 #include <paths.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index 03c56b4939b8b..78ea13ab15d50 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -35,6 +35,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>	/* memcpy() on some archs */
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index cf12305de01e9..ffa806b01f7bb 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -42,6 +42,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index a9a05b8fda1f9..9f1448577ad77 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -34,6 +34,7 @@
 #include <sys/un.h>
 
 #include <ctype.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index 61f03ab472a51..994c09072260c 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.c
@@ -36,6 +36,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 45a89511f1cd8..27077dcef7cc5 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -31,6 +31,7 @@
 #include <sys/param.h>
 #include <sys/un.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/iface.c b/usr.sbin/ppp/iface.c
index 922d1f05ef08e..05951d4da1160 100644
--- a/usr.sbin/ppp/iface.c
+++ b/usr.sbin/ppp/iface.c
@@ -45,6 +45,7 @@
 
 #include <errno.h>
 #include <string.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index 0a06e8b4cd36b..4ebf4b3ac5f33 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -42,6 +42,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <resolv.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/ppp/ipv6cp.c b/usr.sbin/ppp/ipv6cp.c
index 5db92bbdd4da5..b2e30f7a36099 100644
--- a/usr.sbin/ppp/ipv6cp.c
+++ b/usr.sbin/ppp/ipv6cp.c
@@ -35,6 +35,7 @@
 #include <net/if.h>
 #include <sys/un.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index e620a2f3c83f9..bfc7376d9e67c 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -36,6 +36,7 @@
 #include <sys/un.h>
 
 #include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index 6a2481cd42f10..d5aaca3dd3ef0 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -34,6 +34,7 @@
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/main.c b/usr.sbin/ppp/main.c
index fe5f2dcc1aebd..7517663240c9d 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -40,6 +40,7 @@
 #include <fcntl.h>
 #include <paths.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 4ba547e231dc7..5bf8199289601 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -30,6 +30,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
index 7e71dadbed824..3fd9b95c232c2 100644
--- a/usr.sbin/ppp/mp.c
+++ b/usr.sbin/ppp/mp.c
@@ -37,8 +37,9 @@
 
 #include <errno.h>
 #include <paths.h>
-#include <stdlib.h>
+#include <stdarg.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index 6bdb3cf74700e..deb9932fc5792 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -37,6 +37,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/ncp.c b/usr.sbin/ppp/ncp.c
index ea031444189a7..e1acafbfc46ba 100644
--- a/usr.sbin/ppp/ncp.c
+++ b/usr.sbin/ppp/ncp.c
@@ -36,6 +36,7 @@
 
 #include <errno.h>
 #include <resolv.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/physical.c b/usr.sbin/ppp/physical.c
index 2fab9740dd0ce..29ea189fa159a 100644
--- a/usr.sbin/ppp/physical.c
+++ b/usr.sbin/ppp/physical.c
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/prompt.h b/usr.sbin/ppp/prompt.h
index 4bae142098bea..0489338257900 100644
--- a/usr.sbin/ppp/prompt.h
+++ b/usr.sbin/ppp/prompt.h
@@ -75,14 +75,11 @@ extern void prompt_Printf(struct prompt *, const char *, ...)
 #else
 extern void prompt_Printf(struct prompt *, const char *, ...);
 #endif
-#ifndef _BSD_VA_LIST_
-#define _BSD_VA_LIST_ __va_list
-#endif
 #ifdef __GNUC__
-extern void prompt_vPrintf(struct prompt *, const char *, _BSD_VA_LIST_)
+extern void prompt_vPrintf(struct prompt *, const char *, va_list)
 			   __attribute__ ((format (printf, 2, 0)));
 #else
-extern void prompt_vPrintf(struct prompt *, const char *, _BSD_VA_LIST_);
+extern void prompt_vPrintf(struct prompt *, const char *, va_list);
 #endif
 #define PROMPT_DONT_WANT_INT 1
 #define PROMPT_WANT_INT 0
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index f9118df74fd28..d0890e8e1a452 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -49,6 +49,7 @@
 #ifndef NODES
 #include <md5.h>
 #endif
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index e1a99c17ea67e..398bf693b9a88 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.c
@@ -41,6 +41,7 @@
 #include <sys/un.h>
 
 #include <errno.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index 0c13bde3ca572..03f7b866d98b0 100644
--- a/usr.sbin/ppp/server.c
+++ b/usr.sbin/ppp/server.c
@@ -33,6 +33,7 @@
 #include <sys/un.h>
 
 #include <errno.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index 5bf45e5ad4bea..bebd599b2bd3b 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.c
@@ -31,6 +31,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <termios.h>
diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c
index b0bb241724dc1..f6bc9b57d1d3a 100644
--- a/usr.sbin/ppp/throughput.c
+++ b/usr.sbin/ppp/throughput.c
@@ -28,6 +28,7 @@
 
 #include <sys/types.h>
 
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index 9c4fc9f105996..77b2af7e4f441 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -30,6 +30,7 @@
 
 #include <errno.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>