From a860ee982e5ac940ac07ecb968eca85b3d14d059 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Sun, 26 Feb 1995 18:20:36 +0000
Subject: [PATCH] I assume someone had a good reason for breaking this?  Try
 again! For now, I'll content myself with fixing the tree.

---
 usr.sbin/ppp/fsm.h      | 4 ++--
 usr.sbin/ppp/lcp.h      | 4 ++--
 usr.sbin/ppp/lcpproto.h | 4 ++--
 usr.sbin/ppp/log.h      | 4 ++--
 usr.sbin/ppp/modem.h    | 4 ++--
 usr.sbin/ppp/timeout.h  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/usr.sbin/ppp/fsm.h b/usr.sbin/ppp/fsm.h
index d1022179d5fb..741ca8f8bc01 100644
--- a/usr.sbin/ppp/fsm.h
+++ b/usr.sbin/ppp/fsm.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
+ * $Id: fsm.h,v 1.2 1995/02/26 12:17:28 amurai Exp $
  *
  *	TODO:
  */
@@ -26,7 +26,7 @@
 #include "defs.h"
 #include <netinet/in.h>
 #include "timeout.h"
-#include "cdefs.h"
+#include <sys/cdefs.h>
 
 /*
  *  State of machine
diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h
index bda8ca52771f..6447a1ae1d9c 100644
--- a/usr.sbin/ppp/lcp.h
+++ b/usr.sbin/ppp/lcp.h
@@ -15,14 +15,14 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
+ * $Id: lcp.h,v 1.2 1995/02/26 12:17:36 amurai Exp $
  *
  *	TODO:
  */
 
 #ifndef _LCP_H_
 #define _LPC_H_
-#include "cdefs.h"
+#include <sys/cdefs.h>
 
 struct lcpstate {
   u_long  his_mru;
diff --git a/usr.sbin/ppp/lcpproto.h b/usr.sbin/ppp/lcpproto.h
index 63fe9b362579..ea1442f43764 100644
--- a/usr.sbin/ppp/lcpproto.h
+++ b/usr.sbin/ppp/lcpproto.h
@@ -15,14 +15,14 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
+ * $Id: lcpproto.h,v 1.2 1995/02/26 12:17:37 amurai Exp $
  *
  *	TODO:
  */
 
 #ifndef _LCPPROTO_H_
 #define _LCPPROTO_H_
-#include "cdefs.h"
+#include <sys/cdefs.h>
 
 /*
  *  Definition of protocol numbers
diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index e73316ca6ac8..c48ba255b18d 100644
--- a/usr.sbin/ppp/log.h
+++ b/usr.sbin/ppp/log.h
@@ -15,14 +15,14 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id:$
+ * $Id: log.h,v 1.2 1995/02/26 12:17:38 amurai Exp $
  *
  *	TODO:
  */
 
 #ifndef _LOG_H_
 #define	_LOG_H_
-#include "cdefs.h"
+#include <sys/cdefs.h>
 /*
  *  Definition of log level
  */
diff --git a/usr.sbin/ppp/modem.h b/usr.sbin/ppp/modem.h
index cde8fe6e0be4..9afbdb1c8605 100644
--- a/usr.sbin/ppp/modem.h
+++ b/usr.sbin/ppp/modem.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: modem.h,v 1.1.1.1 1995/01/31 06:29:56 amurai Exp $
+ * $Id: modem.h,v 1.2 1995/02/26 12:17:46 amurai Exp $
  *
  *	TODO:
  */
@@ -24,7 +24,7 @@
 #define	_MODEM_H_
 #include <termios.h>
 #include "mbuf.h"
-#include "cdefs.h"
+#include <sys/cdefs.h>
 
 extern int RawModem __P((int));
 extern void UnrawModem __P((int));
diff --git a/usr.sbin/ppp/timeout.h b/usr.sbin/ppp/timeout.h
index 9c8593af19bc..7efb8c5beb2b 100644
--- a/usr.sbin/ppp/timeout.h
+++ b/usr.sbin/ppp/timeout.h
@@ -15,14 +15,14 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: timeout.h,v 1.1.1.1 1995/01/31 06:29:55 amurai Exp $
+ * $Id: timeout.h,v 1.2 1995/02/26 12:18:00 amurai Exp $
  *
  *	TODO:
  */
 
 #ifndef _TIMEOUT_H_
 #define	_TIMEOUT_H_
-#include "cdefs.h"
+#include <sys/cdefs.h>
 
 #define	TICKUNIT	100000			/* Unit in usec */
 #define	SECTICKS	(1000000/TICKUNIT)