diff --git a/usr.bin/doscmd/AsyncIO.c b/usr.bin/doscmd/AsyncIO.c
index e92fc55a9348..565e8e6cce37 100644
--- a/usr.bin/doscmd/AsyncIO.c
+++ b/usr.bin/doscmd/AsyncIO.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI AsyncIO.c,v 2.2 1996/04/08 19:32:10 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/usr.bin/doscmd/ParseBuffer.c b/usr.bin/doscmd/ParseBuffer.c
index 1618048dd6f0..a053a08df0f6 100644
--- a/usr.bin/doscmd/ParseBuffer.c
+++ b/usr.bin/doscmd/ParseBuffer.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI ParseBuffer.c,v 2.2 1996/04/08 19:32:15 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/usr.bin/doscmd/bios.c b/usr.bin/doscmd/bios.c
index 2d977e9b091e..0577c74b7501 100644
--- a/usr.bin/doscmd/bios.c
+++ b/usr.bin/doscmd/bios.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI bios.c,v 2.3 1996/04/08 19:32:19 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 #include "mouse.h"
 #include "com.h"
diff --git a/usr.bin/doscmd/callback.c b/usr.bin/doscmd/callback.c
index 0e36d083ec3c..d5ce42804d31 100644
--- a/usr.bin/doscmd/callback.c
+++ b/usr.bin/doscmd/callback.c
@@ -1,8 +1,7 @@
-/* No copyright?!
-**
-** $FreeBSD$
-*/
+/* No copyright?! */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/queue.h>
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/cmos.c b/usr.bin/doscmd/cmos.c
index 9715c9bc2246..d899e9653037 100644
--- a/usr.bin/doscmd/cmos.c
+++ b/usr.bin/doscmd/cmos.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI cmos.c,v 2.3 1996/04/08 19:32:20 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 
 #define ALARM_ON     ((unsigned char) 0x20)
diff --git a/usr.bin/doscmd/config.c b/usr.bin/doscmd/config.c
index 492d31d2e890..0c3b2f00d4da 100644
--- a/usr.bin/doscmd/config.c
+++ b/usr.bin/doscmd/config.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI config.c,v 2.2 1996/04/08 19:32:22 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <ctype.h>
diff --git a/usr.bin/doscmd/cpu.c b/usr.bin/doscmd/cpu.c
index 56f5f163b142..d1e84e6dd958 100644
--- a/usr.bin/doscmd/cpu.c
+++ b/usr.bin/doscmd/cpu.c
@@ -22,10 +22,11 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 #include "video.h"
 
diff --git a/usr.bin/doscmd/crt0.c b/usr.bin/doscmd/crt0.c
index ec9c706f7f5c..b51603f5a75f 100644
--- a/usr.bin/doscmd/crt0.c
+++ b/usr.bin/doscmd/crt0.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI crt0.c,v 2.2 1996/04/08 19:32:24 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 char **environ;
 char *__progname;
 
diff --git a/usr.bin/doscmd/cwd.c b/usr.bin/doscmd/cwd.c
index 2e5415a3803b..7931d83c1c9f 100644
--- a/usr.bin/doscmd/cwd.c
+++ b/usr.bin/doscmd/cwd.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI cwd.c,v 2.2 1996/04/08 19:32:25 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/usr.bin/doscmd/debug.c b/usr.bin/doscmd/debug.c
index bbae1454deda..8c2a46f613e6 100644
--- a/usr.bin/doscmd/debug.c
+++ b/usr.bin/doscmd/debug.c
@@ -30,10 +30,10 @@
  * SUCH DAMAGE.
  *
  * from: BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <stdarg.h>
 
diff --git a/usr.bin/doscmd/disktab.c b/usr.bin/doscmd/disktab.c
index 0fa9d07cdf82..3ab43b8b32fe 100644
--- a/usr.bin/doscmd/disktab.c
+++ b/usr.bin/doscmd/disktab.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI disktab.c,v 2.2 1996/04/08 19:32:27 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /* XXX goaway (requires change to config.c) */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/dos.c b/usr.bin/doscmd/dos.c
index 90b0b1232910..478c8ce665ab 100644
--- a/usr.bin/doscmd/dos.c
+++ b/usr.bin/doscmd/dos.c
@@ -30,10 +30,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI int21.c,v 2.2 1996/04/08 19:32:51 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/usr.bin/doscmd/doscmd.c b/usr.bin/doscmd/doscmd.c
index cec22eedc430..c1da1d52a7c7 100644
--- a/usr.bin/doscmd/doscmd.c
+++ b/usr.bin/doscmd/doscmd.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mman.h>
diff --git a/usr.bin/doscmd/doscmd_loader.c b/usr.bin/doscmd/doscmd_loader.c
index d219ad52b46e..a3df6814c405 100644
--- a/usr.bin/doscmd/doscmd_loader.c
+++ b/usr.bin/doscmd/doscmd_loader.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI doscmd_loader.c,v 2.3 1996/04/08 19:32:33 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <a.out.h>
diff --git a/usr.bin/doscmd/ems.c b/usr.bin/doscmd/ems.c
index 72065f7bfc98..400781a6cf88 100644
--- a/usr.bin/doscmd/ems.c
+++ b/usr.bin/doscmd/ems.c
@@ -24,10 +24,11 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /* 
  * EMS memory emulation
  *
diff --git a/usr.bin/doscmd/emuint.c b/usr.bin/doscmd/emuint.c
index 8e321c0cbcf2..1bb4f86fe85e 100644
--- a/usr.bin/doscmd/emuint.c
+++ b/usr.bin/doscmd/emuint.c
@@ -24,10 +24,11 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <ctype.h>
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/exe.c b/usr.bin/doscmd/exe.c
index 27ee694acba0..c21960996517 100644
--- a/usr.bin/doscmd/exe.c
+++ b/usr.bin/doscmd/exe.c
@@ -28,9 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI exe.c,v 2.2 1996/04/08 19:32:34 bostic Exp
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <ctype.h>
diff --git a/usr.bin/doscmd/i386-pinsn.c b/usr.bin/doscmd/i386-pinsn.c
index 8b20fac06429..f36c4791483f 100644
--- a/usr.bin/doscmd/i386-pinsn.c
+++ b/usr.bin/doscmd/i386-pinsn.c
@@ -19,8 +19,6 @@ You should have received a copy of the GNU General Public License
 along with GDB; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-/* $FreeBSD$ */
-
 /*
  * 80386 instruction printer by Pace Willisson (pace@prep.ai.mit.edu)
  * July 1988
@@ -35,6 +33,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  * the Intel manual for details.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdio.h>
 #include <ctype.h>
 
diff --git a/usr.bin/doscmd/int.c b/usr.bin/doscmd/int.c
index b13ff4668654..3974213d0770 100644
--- a/usr.bin/doscmd/int.c
+++ b/usr.bin/doscmd/int.c
@@ -1,9 +1,6 @@
 /*
 ** No copyright?!
-**
-** $FreeBSD$
 */
-
 /*
  * Notes:
  *   1) Second PIC is not implemented.
@@ -23,6 +20,9 @@
  *
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 
 struct IRQ {
diff --git a/usr.bin/doscmd/int10.c b/usr.bin/doscmd/int10.c
index 1b33b4aa06b1..5f3892d71f0c 100644
--- a/usr.bin/doscmd/int10.c
+++ b/usr.bin/doscmd/int10.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI int10.c,v 2.3 1996/04/08 19:32:40 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <unistd.h>
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int13.c b/usr.bin/doscmd/int13.c
index 039a6414de7b..a52daea8f2b4 100644
--- a/usr.bin/doscmd/int13.c
+++ b/usr.bin/doscmd/int13.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI int13.c,v 2.3 1996/04/08 19:32:43 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/usr.bin/doscmd/int14.c b/usr.bin/doscmd/int14.c
index a9c9a687bf6e..f4b3d5f33a2d 100644
--- a/usr.bin/doscmd/int14.c
+++ b/usr.bin/doscmd/int14.c
@@ -31,10 +31,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI int14.c,v 2.2 1996/04/08 19:32:45 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/usr.bin/doscmd/int16.c b/usr.bin/doscmd/int16.c
index 60ea83e38e23..920cd15d1203 100644
--- a/usr.bin/doscmd/int16.c
+++ b/usr.bin/doscmd/int16.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI int16.c,v 2.2 1996/04/08 19:32:47 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 #include "tty.h"
 
diff --git a/usr.bin/doscmd/int17.c b/usr.bin/doscmd/int17.c
index ee693a8360d6..c5699b84d4d6 100644
--- a/usr.bin/doscmd/int17.c
+++ b/usr.bin/doscmd/int17.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI int17.c,v 2.2 1996/04/08 19:32:48 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <paths.h>
diff --git a/usr.bin/doscmd/int1a.c b/usr.bin/doscmd/int1a.c
index ff7df30f8376..0c5696882af1 100644
--- a/usr.bin/doscmd/int1a.c
+++ b/usr.bin/doscmd/int1a.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI int1a.c,v 2.2 1996/04/08 19:32:49 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 
 static inline int
diff --git a/usr.bin/doscmd/int2f.c b/usr.bin/doscmd/int2f.c
index e4ab619a4f8e..4ac534902b2a 100644
--- a/usr.bin/doscmd/int2f.c
+++ b/usr.bin/doscmd/int2f.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI int2f.c,v 2.2 1996/04/08 19:32:53 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 #include "dispatch.h"
 #include "tty.h"
diff --git a/usr.bin/doscmd/intff.c b/usr.bin/doscmd/intff.c
index 5586c4ea1e72..a86bbc33a735 100644
--- a/usr.bin/doscmd/intff.c
+++ b/usr.bin/doscmd/intff.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI intff.c,v 2.2 1996/04/08 19:32:56 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <ctype.h>
 #include <unistd.h>
diff --git a/usr.bin/doscmd/mem.c b/usr.bin/doscmd/mem.c
index 2f9f117c33c0..540bb8f9919d 100644
--- a/usr.bin/doscmd/mem.c
+++ b/usr.bin/doscmd/mem.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI mem.c,v 2.2 1996/04/08 19:32:57 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdio.h>
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/mouse.c b/usr.bin/doscmd/mouse.c
index 1aa4ae05bd07..6d44789e28cd 100644
--- a/usr.bin/doscmd/mouse.c
+++ b/usr.bin/doscmd/mouse.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI int33.c,v 2.2 1996/04/08 19:32:54 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 #include "mouse.h"
 
diff --git a/usr.bin/doscmd/net.c b/usr.bin/doscmd/net.c
index b899d96599a8..55e291a6067d 100644
--- a/usr.bin/doscmd/net.c
+++ b/usr.bin/doscmd/net.c
@@ -1,10 +1,12 @@
 /*
 ** No copyright!
 **
-** $FreeBSD$
-**
 ** NetBIOS etc. hooks.
 */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 
 static void
diff --git a/usr.bin/doscmd/port.c b/usr.bin/doscmd/port.c
index 9b26836fd860..a65b1be7450d 100644
--- a/usr.bin/doscmd/port.c
+++ b/usr.bin/doscmd/port.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI port.c,v 2.2 1996/04/08 19:33:03 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/ioctl.h>
 #include <machine/sysarch.h>
 
diff --git a/usr.bin/doscmd/setver.c b/usr.bin/doscmd/setver.c
index 5826567373ed..da40c1b90a2e 100644
--- a/usr.bin/doscmd/setver.c
+++ b/usr.bin/doscmd/setver.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI setver.c,v 2.2 1996/04/08 19:33:04 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 
 #if 1 /*XXXXX*/
diff --git a/usr.bin/doscmd/signal.c b/usr.bin/doscmd/signal.c
index b0de9b95c205..34937ec08666 100644
--- a/usr.bin/doscmd/signal.c
+++ b/usr.bin/doscmd/signal.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI signal.c,v 2.2 1996/04/08 19:33:06 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 #include "trap.h"
 
diff --git a/usr.bin/doscmd/timer.c b/usr.bin/doscmd/timer.c
index d2eec93a646b..eff7bb620f29 100644
--- a/usr.bin/doscmd/timer.c
+++ b/usr.bin/doscmd/timer.c
@@ -1,8 +1,10 @@
 /*
 ** No copyright?!
-**
-** $FreeBSD$
 */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 
 static void
diff --git a/usr.bin/doscmd/trace.c b/usr.bin/doscmd/trace.c
index 20517e87ff85..a171dad9de9f 100644
--- a/usr.bin/doscmd/trace.c
+++ b/usr.bin/doscmd/trace.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI trace.c,v 2.2 1996/04/08 19:33:07 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "doscmd.h"
 #include "trap.h"
 
diff --git a/usr.bin/doscmd/trap.c b/usr.bin/doscmd/trap.c
index 4eb86886cab1..dbf3960e0c01 100644
--- a/usr.bin/doscmd/trap.c
+++ b/usr.bin/doscmd/trap.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI trap.c,v 2.3 1996/04/08 19:33:08 bostic Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <machine/trap.h>
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/tty.c b/usr.bin/doscmd/tty.c
index 2a2ae3938621..685f1ba3b13c 100644
--- a/usr.bin/doscmd/tty.c
+++ b/usr.bin/doscmd/tty.c
@@ -28,10 +28,11 @@
  * SUCH DAMAGE.
  *
  *	BSDI tty.c,v 2.4 1996/04/08 22:03:27 prb Exp
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -248,8 +249,8 @@ console_init()
     int fd;
     caddr_t addr;
 
-    if ((fd = open("/dev/vga", 2)) < 0) {
-	perror("/dev/vga");
+    if ((fd = open(_PATH_DEV "vga", 2)) < 0) {
+	perror(_PATH_DEV "vga");
 	quit(1);
     }
     addr = mmap((caddr_t)0xA0000, 5 * 64 * 1024,
diff --git a/usr.bin/doscmd/video.c b/usr.bin/doscmd/video.c
index 3874a8cf2f59..204fd121052a 100644
--- a/usr.bin/doscmd/video.c
+++ b/usr.bin/doscmd/video.c
@@ -22,10 +22,11 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <err.h>
diff --git a/usr.bin/doscmd/xms.c b/usr.bin/doscmd/xms.c
index a067d521f7dc..395d09a0cc4a 100644
--- a/usr.bin/doscmd/xms.c
+++ b/usr.bin/doscmd/xms.c
@@ -24,10 +24,11 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*
  * XMS memory manmagement 
  *