Remove unused includes.

43 files changed, 44 insertions, 305 deletions

diff --git a/usr.sbin/ppp/alias_cmd.c b/usr.sbin/ppp/alias_cmd.c
index 223df087efdd..907797199bb8 100644
--- a/usr.sbin/ppp/alias_cmd.c
+++ b/usr.sbin/ppp/alias_cmd.c
@@ -2,7 +2,7 @@
  * The code in this file was written by Eivind Eklund <perhaps@yes.no>,
  * who places it in the public domain without restriction.
  *
- *	$Id: alias_cmd.c,v 1.12.2.2 1998/02/10 03:23:05 brian Exp $
+ *	$Id: alias_cmd.c,v 1.12.2.3 1998/04/03 19:25:20 brian Exp $
  */
 
 #include <sys/param.h>
@@ -10,7 +10,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -18,7 +17,6 @@
 
 #include "defs.h"
 #include "command.h"
-#include "mbuf.h"
 #include "log.h"
 #include "loadalias.h"
 #include "vars.h"
diff --git a/usr.sbin/ppp/arp.c b/usr.sbin/ppp/arp.c
index a112730706e6..a6479d586a31 100644
--- a/usr.sbin/ppp/arp.c
+++ b/usr.sbin/ppp/arp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: arp.c,v 1.27.2.9 1998/03/20 19:47:38 brian Exp $
+ * $Id: arp.c,v 1.27.2.10 1998/04/03 19:21:04 brian Exp $
  *
  */
 
@@ -26,33 +26,27 @@
  */
 
 #include <sys/param.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/route.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
-#include <net/if_types.h>
 #include <netinet/if_ether.h>
 #include <arpa/inet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/sysctl.h>
-#include <sys/uio.h>
 #include <unistd.h>
 
 #include "command.h"
 #include "mbuf.h"
 #include "log.h"
 #include "id.h"
-#include "route.h"
 #include "timer.h"
 #include "fsm.h"
 #include "defs.h"
diff --git a/usr.sbin/ppp/async.c b/usr.sbin/ppp/async.c
index d835bdf02b3a..d7c066dd30bf 100644
--- a/usr.sbin/ppp/async.c
+++ b/usr.sbin/ppp/async.c
@@ -17,14 +17,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: async.c,v 1.15.2.8 1998/03/13 00:43:50 brian Exp $
+ * $Id: async.c,v 1.15.2.9 1998/04/03 19:21:05 brian Exp $
  *
  */
 #include <sys/param.h>
-#include <netinet/in.h>
 
-#include <stdio.h>
-#include <string.h>
 #include <termios.h>
 
 #include "command.h"
@@ -37,9 +34,6 @@
 #include "hdlc.h"
 #include "lcp.h"
 #include "lcpproto.h"
-#include "modem.h"
-#include "loadalias.h"
-#include "vars.h"
 #include "async.h"
 #include "throughput.h"
 #include "ccp.h"
diff --git a/usr.sbin/ppp/auth.c b/usr.sbin/ppp/auth.c
index 72b9c51f8ab5..da2c0dd84ff3 100644
--- a/usr.sbin/ppp/auth.c
+++ b/usr.sbin/ppp/auth.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: auth.c,v 1.27.2.17 1998/04/03 19:23:52 brian Exp $
+ * $Id: auth.c,v 1.27.2.18 1998/04/03 19:25:21 brian Exp $
  *
  *	TODO:
  *		o Implement check against with registered IP addresses.
@@ -27,11 +27,9 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <assert.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <string.h>
-#include <termios.h>
 #include <unistd.h>
 
 #include "command.h"
@@ -50,11 +48,9 @@
 #include "lcp.h"
 #include "lqr.h"
 #include "hdlc.h"
-#include "async.h"
 #include "ccp.h"
 #include "link.h"
 #include "descriptor.h"
-#include "physical.h"
 #include "chat.h"
 #include "lcpproto.h"
 #include "filter.h"
diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index 2d68de8cf5a3..51c4418a3220 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -23,11 +23,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bundle.c,v 1.1.2.38 1998/04/04 13:01:19 brian Exp $
+ *	$Id: bundle.c,v 1.1.2.39 1998/04/05 22:48:00 brian Exp $
  */
 
 #include <sys/param.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <net/if.h>
@@ -60,10 +59,6 @@
 #include "ipcp.h"
 #include "filter.h"
 #include "descriptor.h"
-#include "loadalias.h"
-#include "vars.h"
-#include "arp.h"
-#include "systems.h"
 #include "route.h"
 #include "lcp.h"
 #include "ccp.h"
@@ -73,10 +68,8 @@
 #include "async.h"
 #include "physical.h"
 #include "modem.h"
-#include "main.h"
 #include "auth.h"
 #include "lcpproto.h"
-#include "pap.h"
 #include "chap.h"
 #include "tun.h"
 #include "prompt.h"
diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index f8fe5a1eb282..94614e90d0e4 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ccp.c,v 1.30.2.30 1998/04/03 19:23:53 brian Exp $
+ * $Id: ccp.c,v 1.30.2.31 1998/04/03 19:25:24 brian Exp $
  *
  *	TODO:
  *		o Support other compression protocols
@@ -29,7 +29,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <termios.h>
 
 #include "command.h"
@@ -57,12 +56,6 @@
 #include "link.h"
 #include "mp.h"
 #include "bundle.h"
-#include "chat.h"
-#include "auth.h"
-#include "chap.h"
-#include "async.h"
-#include "physical.h"
-#include "datalink.h"
 
 static void CcpSendConfigReq(struct fsm *);
 static void CcpSentTerminateReq(struct fsm *);
diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 7affed8f5048..27cd86e0cca4 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: chap.c,v 1.28.2.20 1998/04/03 19:24:42 brian Exp $
+ * $Id: chap.c,v 1.28.2.21 1998/04/03 19:26:18 brian Exp $
  *
  *	TODO:
  */
@@ -26,21 +26,13 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <ctype.h>
 #ifdef HAVE_DES
-#include <md4.h>
 #endif
 #include <md5.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <termios.h>
-#include <time.h>
-#include <unistd.h>
 #ifdef __OpenBSD__
-#include <util.h>
 #else
-#include <libutil.h>
 #endif
 
 #include "command.h"
@@ -49,13 +41,10 @@
 #include "defs.h"
 #include "timer.h"
 #include "fsm.h"
-#include "chap_ms.h"
 #include "lcpproto.h"
 #include "lcp.h"
 #include "lqr.h"
 #include "hdlc.h"
-#include "loadalias.h"
-#include "vars.h"
 #include "auth.h"
 #include "chap.h"
 #include "async.h"
diff --git a/usr.sbin/ppp/chap_ms.c b/usr.sbin/ppp/chap_ms.c
index d0767d05fd8d..841bbc57b802 100644
--- a/usr.sbin/ppp/chap_ms.c
+++ b/usr.sbin/ppp/chap_ms.c
@@ -19,19 +19,15 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: chap_ms.c,v 1.5 1998/01/21 02:15:10 brian Exp $
+ * $Id: chap_ms.c,v 1.5.4.1 1998/03/16 22:53:08 brian Exp $
  *
  */
 
 #include <sys/types.h>
 
 #include <des.h>
-#include <stdio.h>
 #include <string.h>
-#include <sys/time.h>
 
-#include "command.h"
-#include "mbuf.h"
 #include "chap_ms.h"
 
 /* unused, for documentation only */
diff --git a/usr.sbin/ppp/chat.c b/usr.sbin/ppp/chat.c
index 41d2ede0ed66..00587d82a7e3 100644
--- a/usr.sbin/ppp/chat.c
+++ b/usr.sbin/ppp/chat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: chat.c,v 1.44.2.18 1998/04/03 19:21:11 brian Exp $
+ *	$Id: chat.c,v 1.44.2.19 1998/04/03 19:24:43 brian Exp $
  */
 
 #include <sys/param.h>
@@ -31,15 +31,11 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <setjmp.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 #include <termios.h>
 #include <unistd.h>
@@ -49,9 +45,6 @@
 #include "log.h"
 #include "defs.h"
 #include "timer.h"
-#include "loadalias.h"
-#include "vars.h"
-#include "modem.h"
 #include "lqr.h"
 #include "hdlc.h"
 #include "throughput.h"
@@ -63,10 +56,8 @@
 #include "descriptor.h"
 #include "physical.h"
 #include "chat.h"
-#include "prompt.h"
 #include "mp.h"
 #include "auth.h"
-#include "pap.h"
 #include "chap.h"
 #include "slcompress.h"
 #include "iplist.h"
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index c2a362557eca..c5533de59d15 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: command.c,v 1.131.2.52 1998/04/04 10:34:27 brian Exp $
+ * $Id: command.c,v 1.131.2.53 1998/04/05 22:48:08 brian Exp $
  *
  */
 #include <sys/param.h>
@@ -32,17 +32,14 @@
 #ifndef NOALIAS
 #include <alias.h>
 #endif
-#include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <sys/wait.h>
 #include <termios.h>
-#include <time.h>
 #include <unistd.h>
 
 #include "command.h"
@@ -70,7 +67,6 @@
 #include "main.h"
 #include "route.h"
 #include "ccp.h"
-#include "ip.h"
 #include "auth.h"
 #include "async.h"
 #include "link.h"
diff --git a/usr.sbin/ppp/datalink.c b/usr.sbin/ppp/datalink.c
index 13f2f986f4e3..75961b00ba3e 100644
--- a/usr.sbin/ppp/datalink.c
+++ b/usr.sbin/ppp/datalink.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: datalink.c,v 1.1.2.32 1998/04/03 19:26:20 brian Exp $
+ *	$Id: datalink.c,v 1.1.2.33 1998/04/05 22:48:12 brian Exp $
  */
 
 #include <sys/param.h>
@@ -31,7 +31,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <alias.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -41,8 +40,6 @@
 #include "mbuf.h"
 #include "log.h"
 #include "defs.h"
-#include "loadalias.h"
-#include "vars.h"
 #include "timer.h"
 #include "fsm.h"
 #include "lcp.h"
@@ -62,7 +59,6 @@
 #include "bundle.h"
 #include "chat.h"
 #include "auth.h"
-#include "main.h"
 #include "modem.h"
 #include "prompt.h"
 #include "lcpproto.h"
diff --git a/usr.sbin/ppp/deflate.c b/usr.sbin/ppp/deflate.c
index 88ea15470706..428b9547ebce 100644
--- a/usr.sbin/ppp/deflate.c
+++ b/usr.sbin/ppp/deflate.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: deflate.c,v 1.6.4.7 1998/03/13 00:44:00 brian Exp $
+ *	$Id: deflate.c,v 1.6.4.8 1998/03/17 22:29:08 brian Exp $
  */
 
 #include <sys/param.h>
@@ -36,7 +36,6 @@
 #include "command.h"
 #include "mbuf.h"
 #include "log.h"
-#include "defs.h"
 #include "loadalias.h"
 #include "vars.h"
 #include "timer.h"
@@ -46,8 +45,6 @@
 #include "lcp.h"
 #include "ccp.h"
 #include "lcpproto.h"
-#include "throughput.h"
-#include "link.h"
 #include "deflate.h"
 
 /* Our state */
diff --git a/usr.sbin/ppp/defs.c b/usr.sbin/ppp/defs.c
index 74242929c9e0..d9c086b346bf 100644
--- a/usr.sbin/ppp/defs.c
+++ b/usr.sbin/ppp/defs.c
@@ -23,25 +23,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: defs.c,v 1.11.4.5 1998/03/25 18:38:44 brian Exp $
+ *	$Id: defs.c,v 1.11.4.6 1998/04/03 19:25:29 brian Exp $
  */
 
-#include <sys/param.h>
-#include <netinet/in.h>
 
-#include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 
 #include "defs.h"
-#include "command.h"
-#include "mbuf.h"
-#include "log.h"
-#include "loadalias.h"
-#include "vars.h"
 
 int mode = MODE_INTER;
 static char dstsystem[50];
diff --git a/usr.sbin/ppp/filter.c b/usr.sbin/ppp/filter.c
index 3bd066373bc7..542b70cc4657 100644
--- a/usr.sbin/ppp/filter.c
+++ b/usr.sbin/ppp/filter.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: filter.c,v 1.22.2.11 1998/04/03 19:25:00 brian Exp $
+ * $Id: filter.c,v 1.22.2.12 1998/04/03 19:25:30 brian Exp $
  *
  *	TODO: Shoud send ICMP error message when we discard packets.
  */
@@ -37,9 +37,7 @@
 #include "command.h"
 #include "mbuf.h"
 #include "log.h"
-#include "loadalias.h"
 #include "defs.h"
-#include "vars.h"
 #include "iplist.h"
 #include "timer.h"
 #include "throughput.h"
diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 4963a27cb3f3..d5bd14bd486d 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: fsm.c,v 1.27.2.24 1998/03/24 18:46:55 brian Exp $
+ * $Id: fsm.c,v 1.27.2.25 1998/04/03 19:21:20 brian Exp $
  *
  *  TODO:
  *		o Refer loglevel for log output
@@ -25,10 +25,7 @@
  */
 #include <sys/param.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <termios.h>
 
@@ -43,7 +40,6 @@
 #include "lcpproto.h"
 #include "lcp.h"
 #include "ccp.h"
-#include "modem.h"
 #include "loadalias.h"
 #include "vars.h"
 #include "throughput.h"
@@ -51,17 +47,6 @@
 #include "link.h"
 #include "descriptor.h"
 #include "physical.h"
-#include "iplist.h"
-#include "slcompress.h"
-#include "ipcp.h"
-#include "filter.h"
-#include "mp.h"
-#include "bundle.h"
-#include "auth.h"
-#include "chat.h"
-#include "chap.h"
-#include "pap.h"
-#include "datalink.h"
 
 static void FsmSendConfigReq(struct fsm *);
 static void FsmSendTerminateReq(struct fsm *);
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index 26c626416607..08c41d373e96 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: hdlc.c,v 1.28.2.22 1998/04/03 19:21:22 brian Exp $
+ * $Id: hdlc.c,v 1.28.2.23 1998/04/03 19:25:32 brian Exp $
  *
  *	TODO:
  */
@@ -50,9 +50,6 @@
 #include "chap.h"
 #include "lcp.h"
 #include "async.h"
-#include "loadalias.h"
-#include "vars.h"
-#include "modem.h"
 #include "ccp.h"
 #include "link.h"
 #include "descriptor.h"
diff --git a/usr.sbin/ppp/id.c b/usr.sbin/ppp/id.c
index 27b506ab8706..3de2ddefb89c 100644
--- a/usr.sbin/ppp/id.c
+++ b/usr.sbin/ppp/id.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: id.c,v 1.6.4.1 1998/02/08 11:07:30 brian Exp $
+ *	$Id: id.c,v 1.6.4.2 1998/02/19 02:08:44 brian Exp $
  */
 
 #include <sys/types.h>
@@ -36,14 +36,12 @@
 #include <sysexits.h>
 #include <unistd.h>
 #ifdef __OpenBSD__
-#include <util.h>
 #else
 #include <libutil.h>
 #endif
 #include <utmp.h>
 
 #include "command.h"
-#include "mbuf.h"
 #include "log.h"
 #include "main.h"
 #include "id.h"
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 184715ab5a9d..74c0defe73ca 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -17,18 +17,13 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ip.c,v 1.38.2.17 1998/04/03 19:21:24 brian Exp $
+ * $Id: ip.c,v 1.38.2.18 1998/04/03 19:25:02 brian Exp $
  *
  *	TODO:
  *		o Return ICMP message for filterd packet
  *		  and optionaly record it into log.
  */
 #include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <sys/select.h>
-#include <net/if_tun.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
@@ -44,7 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <termios.h>
 #include <unistd.h>
 
 #include "command.h"
@@ -69,7 +63,6 @@
 #include "mp.h"
 #include "bundle.h"
 #include "vjcomp.h"
-#include "modem.h"
 #include "tun.h"
 #include "ip.h"
 
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index 978d021115e9..ca02ee731688 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipcp.c,v 1.50.2.30 1998/04/03 19:25:04 brian Exp $
+ * $Id: ipcp.c,v 1.50.2.31 1998/04/03 19:25:33 brian Exp $
  *
  *	TODO:
  *		o More RFC1772 backwoard compatibility
@@ -29,7 +29,6 @@
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>
-#include <sys/time.h>
 #include <net/if.h>
 #include <sys/sockio.h>
 
@@ -57,8 +56,6 @@
 #include "loadalias.h"
 #include "vars.h"
 #include "vjcomp.h"
-#include "ip.h"
-#include "route.h"
 #include "lqr.h"
 #include "hdlc.h"
 #include "async.h"
diff --git a/usr.sbin/ppp/iplist.c b/usr.sbin/ppp/iplist.c
index 6e6ecd1f25d9..add57a3492da 100644
--- a/usr.sbin/ppp/iplist.c
+++ b/usr.sbin/ppp/iplist.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: iplist.c,v 1.3 1997/12/23 22:38:54 brian Exp $
+ *	$Id: iplist.c,v 1.4 1997/12/24 09:29:03 brian Exp $
  */
 
 #include <sys/types.h>
@@ -34,7 +34,6 @@
 #include <string.h>
 
 #include "command.h"
-#include "mbuf.h"
 #include "log.h"
 #include "defs.h"
 #include "iplist.h"
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index db8234740f1c..0d40ddaf1550 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -17,28 +17,17 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lcp.c,v 1.55.2.38 1998/04/03 19:26:21 brian Exp $
+ * $Id: lcp.c,v 1.55.2.39 1998/04/05 19:02:46 brian Exp $
  *
  * TODO:
  *	o Limit data field length by MRU
  */
 #include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <sys/select.h>
-#include <net/if_tun.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 
 #include <signal.h>
-#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
 #include <termios.h>
 #include <unistd.h>
 
@@ -49,33 +38,18 @@
 #include "timer.h"
 #include "fsm.h"
 #include "lcp.h"
-#include "iplist.h"
 #include "throughput.h"
-#include "slcompress.h"
-#include "ipcp.h"
 #include "lcpproto.h"
-#include "filter.h"
 #include "descriptor.h"
 #include "lqr.h"
 #include "hdlc.h"
 #include "ccp.h"
 #include "loadalias.h"
 #include "vars.h"
-#include "auth.h"
-#include "pap.h"
-#include "chap.h"
 #include "async.h"
-#include "main.h"
-#include "ip.h"
-#include "modem.h"
-#include "tun.h"
 #include "link.h"
 #include "physical.h"
-#include "mp.h"
-#include "bundle.h"
 #include "prompt.h"
-#include "chat.h"
-#include "datalink.h"
 
 /* for received LQRs */
 struct lqrreq {
diff --git a/usr.sbin/ppp/link.c b/usr.sbin/ppp/link.c
index a2795618ec60..ecd964c2e62c 100644
--- a/usr.sbin/ppp/link.c
+++ b/usr.sbin/ppp/link.c
@@ -23,14 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *  $Id: link.c,v 1.1.2.15 1998/04/03 19:21:33 brian Exp $
+ *  $Id: link.c,v 1.1.2.16 1998/04/03 19:25:36 brian Exp $
  *
  */
 
 #include <sys/param.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 
 #include <stdio.h>
 #include <termios.h>
@@ -38,26 +35,16 @@
 #include "command.h"
 #include "mbuf.h"
 #include "log.h"
-#include "defs.h"
 #include "timer.h"
 #include "lqr.h"
 #include "hdlc.h"
 #include "throughput.h"
 #include "lcpproto.h"
-#include "loadalias.h"
-#include "vars.h"
 #include "fsm.h"
-#include "iplist.h"
-#include "slcompress.h"
-#include "ipcp.h"
-#include "filter.h"
 #include "descriptor.h"
-#include "async.h"
 #include "lcp.h"
 #include "ccp.h"
 #include "link.h"
-#include "mp.h"
-#include "bundle.h"
 #include "prompt.h"
 
 void
diff --git a/usr.sbin/ppp/loadalias.c b/usr.sbin/ppp/loadalias.c
index a95de6506f3a..11a3e57560d8 100644
--- a/usr.sbin/ppp/loadalias.c
+++ b/usr.sbin/ppp/loadalias.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: loadalias.c,v 1.13 1998/01/14 01:23:05 brian Exp $
+ *	$Id: loadalias.c,v 1.14 1998/01/19 22:59:57 brian Exp $
  */
 
 #include <sys/param.h>
@@ -34,16 +34,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <unistd.h>
 
 #include "command.h"
-#include "mbuf.h"
 #include "log.h"
-#include "systems.h"
 #include "id.h"
 #include "loadalias.h"
-#include "defs.h"
 #include "vars.h"
 
 #define _PATH_ALIAS_PREFIX "/usr/lib/libalias.so.2."
diff --git a/usr.sbin/ppp/log.c b/usr.sbin/ppp/log.c
index e8ad3e05b6c4..9b42df1bba67 100644
--- a/usr.sbin/ppp/log.c
+++ b/usr.sbin/ppp/log.c
@@ -23,11 +23,10 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: log.c,v 1.25.2.3 1998/04/03 19:26:40 brian Exp $
+ *	$Id: log.c,v 1.25.2.4 1998/04/05 18:25:32 brian Exp $
  */
 
 #include <sys/param.h>
-#include <netinet/in.h>
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -38,9 +37,6 @@
 #include "command.h"
 #include "mbuf.h"
 #include "log.h"
-#include "loadalias.h"
-#include "defs.h"
-#include "vars.h"
 #include "descriptor.h"
 #include "prompt.h"
 
diff --git a/usr.sbin/ppp/lqr.c b/usr.sbin/ppp/lqr.c
index d7d3c69470e7..dc396ebe7b81 100644
--- a/usr.sbin/ppp/lqr.c
+++ b/usr.sbin/ppp/lqr.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lqr.c,v 1.22.2.18 1998/04/03 19:21:34 brian Exp $
+ * $Id: lqr.c,v 1.22.2.19 1998/04/03 19:26:35 brian Exp $
  *
  *	o LQR based on RFC1333
  *
@@ -31,7 +31,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.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 ebc2037faf13..2d08733e94a8 100644
--- a/usr.sbin/ppp/main.c
+++ b/usr.sbin/ppp/main.c
@@ -17,32 +17,23 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: main.c,v 1.121.2.43 1998/04/03 19:25:42 brian Exp $
+ * $Id: main.c,v 1.121.2.44 1998/04/05 18:25:33 brian Exp $
  *
  *	TODO:
  *		o Add commands for traffic summary, version display, etc.
  *		o Add signal handler for misc controls.
  */
 #include <sys/param.h>
-#include <sys/time.h>
-#include <sys/select.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_tun.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <arpa/inet.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
 #include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <sys/time.h>
-#include <sys/wait.h>
 #include <termios.h>
 #include <unistd.h>
 
@@ -53,7 +44,6 @@
 #include "id.h"
 #include "timer.h"
 #include "fsm.h"
-#include "modem.h"
 #include "lqr.h"
 #include "hdlc.h"
 #include "lcp.h"
@@ -74,12 +64,8 @@
 #include "ip.h"
 #include "sig.h"
 #include "main.h"
-#include "vjcomp.h"
-#include "async.h"
 #include "pathnames.h"
 #include "tun.h"
-#include "route.h"
-#include "physical.h"
 #include "server.h"
 #include "prompt.h"
 #include "chat.h"
diff --git a/usr.sbin/ppp/mbuf.c b/usr.sbin/ppp/mbuf.c
index 5bec0f7aa891..d96292cb7bae 100644
--- a/usr.sbin/ppp/mbuf.c
+++ b/usr.sbin/ppp/mbuf.c
@@ -17,11 +17,10 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: mbuf.c,v 1.13.2.6 1998/04/03 19:21:38 brian Exp $
+ * $Id: mbuf.c,v 1.13.2.7 1998/04/03 19:25:43 brian Exp $
  *
  */
 #include <sys/param.h>
-#include <netinet/in.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -32,9 +31,6 @@
 #include "command.h"
 #include "mbuf.h"
 #include "log.h"
-#include "defs.h"
-#include "loadalias.h"
-#include "vars.h"
 #include "descriptor.h"
 #include "prompt.h"
 #include "main.h"
diff --git a/usr.sbin/ppp/modem.c b/usr.sbin/ppp/modem.c
index a2a97856930e..73f7c136c86a 100644
--- a/usr.sbin/ppp/modem.c
+++ b/usr.sbin/ppp/modem.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: modem.c,v 1.77.2.43 1998/04/03 19:25:45 brian Exp $
+ * $Id: modem.c,v 1.77.2.44 1998/04/03 19:26:22 brian Exp $
  *
  *  TODO:
  */
@@ -35,11 +35,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <unistd.h>
 #ifdef __OpenBSD__
-#include <util.h>
 #else
 #include <libutil.h>
 #endif
@@ -54,11 +52,7 @@
 #include "lqr.h"
 #include "hdlc.h"
 #include "lcp.h"
-#include "ip.h"
 #include "modem.h"
-#include "loadalias.h"
-#include "vars.h"
-#include "main.h"
 #include "throughput.h"
 #include "async.h"
 #include "iplist.h"
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c
index 29f494f9c219..853a119dc89a 100644
--- a/usr.sbin/ppp/mp.c
+++ b/usr.sbin/ppp/mp.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: mp.c,v 1.1.2.1 1998/04/03 19:21:44 brian Exp $
  */
 
 #include <sys/types.h>
@@ -31,7 +31,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <termios.h>
@@ -62,7 +61,6 @@
 #include "lcpproto.h"
 #include "filter.h"
 #include "mp.h"
-#include "pap.h"
 #include "chap.h"
 #include "datalink.h"
 #include "bundle.h"
diff --git a/usr.sbin/ppp/pap.c b/usr.sbin/ppp/pap.c
index 9198178a03dd..99914f3cf573 100644
--- a/usr.sbin/ppp/pap.c
+++ b/usr.sbin/ppp/pap.c
@@ -18,7 +18,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: pap.c,v 1.20.2.21 1998/04/03 19:24:46 brian Exp $
+ * $Id: pap.c,v 1.20.2.22 1998/04/03 19:26:25 brian Exp $
  *
  *	TODO:
  */
@@ -27,16 +27,9 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <pwd.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
 #include <termios.h>
-#include <unistd.h>
 #ifdef __OpenBSD__
-#include <util.h>
 #else
-#include <libutil.h>
 #endif
 
 #include "command.h"
@@ -48,8 +41,6 @@
 #include "lcp.h"
 #include "auth.h"
 #include "pap.h"
-#include "loadalias.h"
-#include "vars.h"
 #include "lqr.h"
 #include "hdlc.h"
 #include "lcpproto.h"
diff --git a/usr.sbin/ppp/physical.c b/usr.sbin/ppp/physical.c
index 5eed49cf2c0c..ff65f09ba00a 100644
--- a/usr.sbin/ppp/physical.c
+++ b/usr.sbin/ppp/physical.c
@@ -16,17 +16,14 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *  $Id: physical.c,v 1.1.2.19 1998/03/20 19:48:16 brian Exp $
+ *  $Id: physical.c,v 1.1.2.20 1998/04/03 19:21:49 brian Exp $
  *
  */
 
 #include <sys/param.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 
 #include <sys/tty.h>
-#include <sys/uio.h>
 
 #include <assert.h>
 #include <stdio.h>
@@ -38,7 +35,6 @@
 
 /* XXX Name space pollution from vars.h */
 #include <netinet/in.h>
-#include <alias.h>
 
 #include "defs.h"
 #include "command.h"
@@ -62,17 +58,6 @@
 #include "physical.h"
 
 #include "vars.h"
-#include "iplist.h"
-#include "slcompress.h"
-#include "ipcp.h"
-#include "filter.h"
-#include "mp.h"
-#include "auth.h"
-#include "chap.h"
-#include "pap.h"
-#include "chat.h"
-#include "datalink.h"
-#include "bundle.h"
 #include "log.h"
 #include "id.h"
 
diff --git a/usr.sbin/ppp/pred.c b/usr.sbin/ppp/pred.c
index 0150b8d6bb03..b11d067ad611 100644
--- a/usr.sbin/ppp/pred.c
+++ b/usr.sbin/ppp/pred.c
@@ -26,20 +26,18 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pred.c,v 1.20.2.5 1998/03/13 00:44:22 brian Exp $
+ *	$Id: pred.c,v 1.20.2.6 1998/03/17 22:29:12 brian Exp $
  */
 
 #include <sys/param.h>
 #include <netinet/in.h>
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "command.h"
 #include "mbuf.h"
 #include "log.h"
-#include "defs.h"
 #include "loadalias.h"
 #include "vars.h"
 #include "timer.h"
@@ -49,8 +47,6 @@
 #include "lcpproto.h"
 #include "lcp.h"
 #include "ccp.h"
-#include "throughput.h"
-#include "link.h"
 #include "pred.h"
 
 /* The following hash code is the heart of the algorithm:
diff --git a/usr.sbin/ppp/prompt.c b/usr.sbin/ppp/prompt.c
index 95c7552380b3..5ddaac6001ff 100644
--- a/usr.sbin/ppp/prompt.c
+++ b/usr.sbin/ppp/prompt.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: prompt.c,v 1.1.2.20 1998/04/04 10:34:28 brian Exp $
+ *	$Id: prompt.c,v 1.1.2.21 1998/04/05 18:25:33 brian Exp $
  */
 
 #include <sys/param.h>
@@ -37,7 +37,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/fcntl.h>
-#include <sys/stat.h>
 #include <termios.h>
 #include <unistd.h>
 
@@ -50,9 +49,6 @@
 #include "fsm.h"
 #include "lcp.h"
 #include "auth.h"
-#include "loadalias.h"
-#include "vars.h"
-#include "main.h"
 #include "iplist.h"
 #include "throughput.h"
 #include "slcompress.h"
diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c
index 2588a272bf04..8c2055181cb1 100644
--- a/usr.sbin/ppp/route.c
+++ b/usr.sbin/ppp/route.c
@@ -17,12 +17,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: route.c,v 1.42.2.14 1998/04/03 19:21:51 brian Exp $
+ * $Id: route.c,v 1.42.2.15 1998/04/03 19:25:52 brian Exp $
  *
  */
 
 #include <sys/param.h>
-#include <sys/time.h>
 #include <sys/socket.h>
 #include <net/if_types.h>
 #include <net/route.h>
@@ -34,28 +33,21 @@
 #include <netinet/ip.h>
 
 #include <errno.h>
-#include <machine/endian.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/ioctl.h>
 #include <sys/sysctl.h>
 #include <termios.h>
-#include <unistd.h>
 
 #include "command.h"
 #include "mbuf.h"
 #include "log.h"
-#include "loadalias.h"
 #include "defs.h"
-#include "vars.h"
-#include "id.h"
 #include "iplist.h"
 #include "timer.h"
 #include "throughput.h"
 #include "lqr.h"
 #include "hdlc.h"
-#include "async.h"
 #include "fsm.h"
 #include "lcp.h"
 #include "ccp.h"
diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index 51976c2820ce..1bd01e015eae 100644
--- a/usr.sbin/ppp/server.c
+++ b/usr.sbin/ppp/server.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: server.c,v 1.16.2.10 1998/04/03 19:21:51 brian Exp $
+ *	$Id: server.c,v 1.16.2.11 1998/04/03 19:25:54 brian Exp $
  */
 
 #include <sys/param.h>
@@ -44,15 +44,12 @@
 #include "command.h"
 #include "mbuf.h"
 #include "log.h"
-#include "loadalias.h"
 #include "defs.h"
-#include "vars.h"
 #include "descriptor.h"
 #include "server.h"
 #include "id.h"
 #include "prompt.h"
 #include "timer.h"
-#include "auth.h"
 #include "lqr.h"
 #include "hdlc.h"
 #include "fsm.h"
diff --git a/usr.sbin/ppp/sig.c b/usr.sbin/ppp/sig.c
index 3cf1a30b3e03..646d6ad52bfb 100644
--- a/usr.sbin/ppp/sig.c
+++ b/usr.sbin/ppp/sig.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sig.c,v 1.11 1997/12/21 12:11:08 brian Exp $
+ *	$Id: sig.c,v 1.11.2.1 1998/03/08 23:44:48 brian Exp $
  */
 
 #include <sys/types.h>
@@ -31,7 +31,6 @@
 #include <signal.h>
 
 #include "command.h"
-#include "mbuf.h"
 #include "log.h"
 #include "sig.h"
 
diff --git a/usr.sbin/ppp/slcompress.c b/usr.sbin/ppp/slcompress.c
index 6b7c7d3cd66f..aad9b5e654d1 100644
--- a/usr.sbin/ppp/slcompress.c
+++ b/usr.sbin/ppp/slcompress.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: slcompress.c,v 1.15.2.4 1998/04/03 19:21:52 brian Exp $
+ * $Id: slcompress.c,v 1.15.2.5 1998/04/03 19:25:56 brian Exp $
  *
  *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
  *	- Initial distribution.
@@ -38,8 +38,6 @@
 #include "log.h"
 #include "defs.h"
 #include "slcompress.h"
-#include "loadalias.h"
-#include "vars.h"
 #include "descriptor.h"
 #include "prompt.h"
 #include "timer.h"
diff --git a/usr.sbin/ppp/systems.c b/usr.sbin/ppp/systems.c
index 765cc2b9f567..ef9ef0778406 100644
--- a/usr.sbin/ppp/systems.c
+++ b/usr.sbin/ppp/systems.c
@@ -17,12 +17,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: systems.c,v 1.35.2.3 1998/02/09 19:24:03 brian Exp $
+ * $Id: systems.c,v 1.35.2.4 1998/04/03 19:25:58 brian Exp $
  *
  *  TODO:
  */
 #include <sys/param.h>
-#include <netinet/in.h>
 
 #include <ctype.h>
 #include <pwd.h>
@@ -32,17 +31,10 @@
 #include <unistd.h>
 
 #include "command.h"
-#include "mbuf.h"
 #include "log.h"
 #include "id.h"
 #include "defs.h"
-#include "timer.h"
-#include "fsm.h"
-#include "loadalias.h"
 #include "pathnames.h"
-#include "vars.h"
-#include "descriptor.h"
-#include "server.h"
 #include "systems.h"
 
 #define issep(ch) ((ch) == ' ' || (ch) == '\t')
diff --git a/usr.sbin/ppp/throughput.c b/usr.sbin/ppp/throughput.c
index c641a952f212..f1bdb6670881 100644
--- a/usr.sbin/ppp/throughput.c
+++ b/usr.sbin/ppp/throughput.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: throughput.c,v 1.4.4.2 1998/04/03 19:21:53 brian Exp $
+ *	$Id: throughput.c,v 1.4.4.3 1998/04/03 19:25:59 brian Exp $
  */
 
 #include <sys/param.h>
@@ -34,11 +34,9 @@
 #include <time.h>
 
 #include "command.h"
-#include "mbuf.h"
 #include "log.h"
 #include "timer.h"
 #include "throughput.h"
-#include "defs.h"
 #include "loadalias.h"
 #include "vars.h"
 #include "descriptor.h"
diff --git a/usr.sbin/ppp/timer.c b/usr.sbin/ppp/timer.c
index 282d9dd9d6e5..a50ce7958a0f 100644
--- a/usr.sbin/ppp/timer.c
+++ b/usr.sbin/ppp/timer.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: timer.c,v 1.27.2.1 1998/04/03 19:21:54 brian Exp $
+ * $Id: timer.c,v 1.27.2.2 1998/04/03 19:26:01 brian Exp $
  *
  *  TODO:
  */
@@ -30,7 +30,6 @@
 #include <unistd.h>
 
 #include "command.h"
-#include "mbuf.h"
 #include "log.h"
 #include "sig.h"
 #include "timer.h"
diff --git a/usr.sbin/ppp/tun.c b/usr.sbin/ppp/tun.c
index b49f5c78a5ba..173ff4fb017a 100644
--- a/usr.sbin/ppp/tun.c
+++ b/usr.sbin/ppp/tun.c
@@ -23,20 +23,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: tun.c,v 1.6.4.10 1998/04/03 19:21:55 brian Exp $
+ *	$Id: tun.c,v 1.6.4.11 1998/04/03 19:24:05 brian Exp $
  */
 
 #include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
 #include <netinet/in.h>
-#include <net/if.h>
-#include <sys/select.h>
 #include <net/if_tun.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
-#include <stdio.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
@@ -48,8 +43,6 @@
 #include "lqr.h"
 #include "hdlc.h"
 #include "defs.h"
-#include "loadalias.h"
-#include "vars.h"
 #include "fsm.h"
 #include "throughput.h"
 #include "iplist.h"
diff --git a/usr.sbin/ppp/vars.c b/usr.sbin/ppp/vars.c
index 8fb151d570a2..d635bc5753a6 100644
--- a/usr.sbin/ppp/vars.c
+++ b/usr.sbin/ppp/vars.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: vars.c,v 1.45.2.23 1998/04/03 19:26:02 brian Exp $
+ * $Id: vars.c,v 1.45.2.24 1998/04/03 19:26:28 brian Exp $
  *
  */
 #include <sys/param.h>
@@ -27,28 +27,15 @@
 #include <string.h>
 
 #include "command.h"
-#include "mbuf.h"
 #include "log.h"
-#include "defs.h"
-#include "timer.h"
-#include "fsm.h"
-#include "lqr.h"
-#include "hdlc.h"
 #include "termios.h"
 #include "loadalias.h"
 #include "vars.h"
-#include "auth.h"
-#include "lcp.h"
-#include "async.h"
-#include "throughput.h"
-#include "ccp.h"
-#include "link.h"
 #include "descriptor.h"
-#include "physical.h"
 #include "prompt.h"
 
 char VarVersion[] = "PPP Version 2.0-beta";
-char VarLocalVersion[] = "$Date: 1998/04/03 19:26:02 $";
+char VarLocalVersion[] = "$Date: 1998/04/03 19:26:28 $";
 
 /*
  * Order of conf option is important. See vars.h.
diff --git a/usr.sbin/ppp/vjcomp.c b/usr.sbin/ppp/vjcomp.c
index 66fab1ad64f6..3cd3b44e3c09 100644
--- a/usr.sbin/ppp/vjcomp.c
+++ b/usr.sbin/ppp/vjcomp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: vjcomp.c,v 1.16.2.10 1998/03/20 19:48:28 brian Exp $
+ * $Id: vjcomp.c,v 1.16.2.11 1998/04/03 19:21:56 brian Exp $
  *
  *  TODO:
  */
@@ -27,7 +27,6 @@
 #include <netinet/ip.h>
 
 #include <stdio.h>
-#include <string.h>
 
 #include "command.h"
 #include "mbuf.h"