From: Sascha Wildner <saw@online.de>
Date: Sun, 17 Jun 2012 14:57:24 +0000 (+0200)
Subject: Remove unneeded inclusions of <sys/cdefs.h> throughout the tree.
X-Git-Url: https://gitweb.dragonflybsd.org/~uqs/games.git/commitdiff_plain

Remove unneeded inclusions of <sys/cdefs.h> throughout the tree.
---

diff --git a/lib/libstand/netif.c b/lib/libstand/netif.c
index 29ac20c8bc..c78caa18ef 100644
--- a/lib/libstand/netif.c
+++ b/lib/libstand/netif.c
@@ -1,5 +1,4 @@
 /*	$NetBSD: netif.c,v 1.10 1997/09/06 13:57:14 drochner Exp $	*/
-/* $DragonFly: src/lib/libstand/netif.c,v 1.3 2005/12/11 02:27:26 swildner Exp $							*/
 
 /*
  * Copyright (c) 1993 Adam Glass
@@ -34,7 +33,6 @@
 
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/mount.h>
 #include <string.h>
 
diff --git a/lib/libstand/strcasecmp.c b/lib/libstand/strcasecmp.c
index 1bdc006f1e..3499c38965 100644
--- a/lib/libstand/strcasecmp.c
+++ b/lib/libstand/strcasecmp.c
@@ -31,10 +31,8 @@
  * SUCH DAMAGE.
  *
  * @(#)strcasecmp.c	8.1 (Berkeley) 6/4/93
- * $DragonFly: src/lib/libstand/strcasecmp.c,v 1.4 2005/12/11 02:27:26 swildner Exp $
  */
 
-#include <sys/cdefs.h>
 #include <string.h>
 #include "stand.h"
 
diff --git a/lib/libthread_xu/thread/thr_kern.c b/lib/libthread_xu/thread/thr_kern.c
index 9c7202dda3..efaf1824b9 100644
--- a/lib/libthread_xu/thread/thr_kern.c
+++ b/lib/libthread_xu/thread/thr_kern.c
@@ -22,11 +22,8 @@
  * 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.
- *
- * $DragonFly: src/lib/libthread_xu/thread/thr_kern.c,v 1.5 2008/09/30 16:57:06 swildner Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/signalvar.h>
 #include <sys/rtprio.h>
diff --git a/lib/libthread_xu/thread/thr_list.c b/lib/libthread_xu/thread/thr_list.c
index 4915bc5424..17558d5202 100644
--- a/lib/libthread_xu/thread/thr_list.c
+++ b/lib/libthread_xu/thread/thr_list.c
@@ -23,11 +23,8 @@
  * 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.
- *
- * $DragonFly: src/lib/libthread_xu/thread/thr_list.c,v 1.7 2006/04/06 13:03:09 davidxu Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff --git a/lib/libthread_xu/thread/thr_printf.c b/lib/libthread_xu/thread/thr_printf.c
index 07e49f88ec..c9cbf4c7bf 100644
--- a/lib/libthread_xu/thread/thr_printf.c
+++ b/lib/libthread_xu/thread/thr_printf.c
@@ -22,11 +22,8 @@
  * 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.
- *
- * $DragonFly: src/lib/libthread_xu/thread/thr_printf.c,v 1.1 2005/02/01 12:38:27 davidxu Exp $
  */
 
-#include <sys/cdefs.h>
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c
index 080a35d661..ba2dc14ff8 100644
--- a/lib/libutil/logwtmp.c
+++ b/lib/libutil/logwtmp.c
@@ -28,10 +28,8 @@
  *
  * @(#)logwtmp.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libutil/logwtmp.c,v 1.14 2000/01/15 03:26:54 shin Exp $
- * $DragonFly: src/lib/libutil/logwtmp.c,v 1.5 2007/12/30 13:44:33 matthias Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/socket.h>
diff --git a/lib/libutil/trimdomain.c b/lib/libutil/trimdomain.c
index 891fcf1983..db08ea3518 100644
--- a/lib/libutil/trimdomain.c
+++ b/lib/libutil/trimdomain.c
@@ -1,4 +1,3 @@
-/* $DragonFly: src/lib/libutil/trimdomain.c,v 1.2 2005/03/04 04:31:11 cpressey Exp $ */
 /*
  * Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
  *   Based on original work by Atsushi Murai <amurai@FreeBSD.org>
@@ -28,7 +27,6 @@
  * $FreeBSD: /repoman/r/ncvs/src/lib/libutil/trimdomain.c,v 1.5 2003/10/18 10:04:16 markm Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 
 #include <string.h>
diff --git a/lib/pam_module/pam_nologin/pam_nologin.c b/lib/pam_module/pam_nologin/pam_nologin.c
index 6c982be7f7..5a8521957f 100644
--- a/lib/pam_module/pam_nologin/pam_nologin.c
+++ b/lib/pam_module/pam_nologin/pam_nologin.c
@@ -34,11 +34,8 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libpam/modules/pam_nologin/pam_nologin.c,v 1.13 2007/06/14 13:07:06 yar Exp $
- * $DragonFly: src/lib/pam_module/pam_nologin/pam_nologin.c,v 1.1 2008/01/02 17:41:30 matthias Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/sbin/devfsctl/devfsctl.c b/sbin/devfsctl/devfsctl.c
index 4fc9221b54..f8738e335d 100644
--- a/sbin/devfsctl/devfsctl.c
+++ b/sbin/devfsctl/devfsctl.c
@@ -33,7 +33,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/syslimits.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
diff --git a/sbin/fsck/fsutil.c b/sbin/fsck/fsutil.c
index 9e7c3e00a9..9f7b4cfde1 100644
--- a/sbin/fsck/fsutil.c
+++ b/sbin/fsck/fsutil.c
@@ -35,8 +35,6 @@
  * $FreeBSD: src/sbin/fsck/fsutil.c,v 1.2.2.1 2001/08/01 05:47:55 obrien Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/sbin/fsck_msdosfs/boot.c b/sbin/fsck_msdosfs/boot.c
index 2df6a21d8d..8ab695f83d 100644
--- a/sbin/fsck_msdosfs/boot.c
+++ b/sbin/fsck_msdosfs/boot.c
@@ -31,12 +31,8 @@
  *
  * $NetBSD: boot.c,v 1.5 1997/10/17 11:19:23 ws Exp $
  * $FreeBSD: src/sbin/fsck_msdosfs/boot.c,v 1.1.2.1 2001/08/01 05:47:55 obrien Exp $
- * $DragonFly: src/sbin/fsck_msdosfs/boot.c,v 1.3 2003/09/28 14:39:17 hmp Exp $
  */
 
-
-#include <sys/cdefs.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/sbin/fsck_msdosfs/check.c b/sbin/fsck_msdosfs/check.c
index db37ebd27d..4068f9a54f 100644
--- a/sbin/fsck_msdosfs/check.c
+++ b/sbin/fsck_msdosfs/check.c
@@ -31,12 +31,8 @@
  *
  * $NetBSD: check.c,v 1.10 2000/04/25 23:02:51 jdolecek Exp $
  * $FreeBSD: src/sbin/fsck_msdosfs/check.c,v 1.1.2.1 2001/08/01 05:47:55 obrien Exp $
- * $DragonFly: src/sbin/fsck_msdosfs/check.c,v 1.3 2003/09/28 14:39:17 hmp Exp $
  */
 
-
-#include <sys/cdefs.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index 01024ab69e..2c17bf1985 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -35,9 +35,6 @@
  * $FreeBSD: src/sbin/fsck_msdosfs/dir.c,v 1.1.2.1 2001/08/01 05:47:55 obrien Exp $
  */
 
-
-#include <sys/cdefs.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sbin/fsck_msdosfs/fat.c b/sbin/fsck_msdosfs/fat.c
index 04ff466fde..0cad90e112 100644
--- a/sbin/fsck_msdosfs/fat.c
+++ b/sbin/fsck_msdosfs/fat.c
@@ -31,12 +31,8 @@
  *
  * $NetBSD: fat.c,v 1.12 2000/10/10 20:24:52 is Exp $
  * $FreeBSD: src/sbin/fsck_msdosfs/fat.c,v 1.1.2.1 2001/08/01 05:47:56 obrien Exp $
- * $DragonFly: src/sbin/fsck_msdosfs/fat.c,v 1.4 2003/11/01 17:15:58 drhodus Exp $
  */
 
-
-#include <sys/cdefs.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/sbin/fsck_msdosfs/main.c b/sbin/fsck_msdosfs/main.c
index 324edbc844..6501bea132 100644
--- a/sbin/fsck_msdosfs/main.c
+++ b/sbin/fsck_msdosfs/main.c
@@ -33,9 +33,6 @@
  * $FreeBSD: src/sbin/fsck_msdosfs/main.c,v 1.4.2.1 2001/08/01 05:47:56 obrien Exp $
  */
 
-
-#include <sys/cdefs.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
diff --git a/sbin/iscontrol/auth_subr.c b/sbin/iscontrol/auth_subr.c
index f861e13825..84c6d66d33 100644
--- a/sbin/iscontrol/auth_subr.c
+++ b/sbin/iscontrol/auth_subr.c
@@ -29,8 +29,6 @@
  | $Id: auth_subr.c,v 2.2 2007/06/01 08:09:37 danny Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sbin/iscontrol/config.c b/sbin/iscontrol/config.c
index a729ad4b69..dd5c0083c5 100644
--- a/sbin/iscontrol/config.c
+++ b/sbin/iscontrol/config.c
@@ -28,8 +28,6 @@
  | $Id: config.c,v 2.1 2006/11/12 08:06:51 danny Exp danny $
  */
 
-#include <sys/cdefs.h>
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c
index 711704fa10..a256c73970 100644
--- a/sbin/iscontrol/fsm.c
+++ b/sbin/iscontrol/fsm.c
@@ -29,8 +29,6 @@
  | $Id: fsm.c,v 2.8 2007/05/19 16:34:21 danny Exp danny $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c
index c337da6610..999cec4455 100644
--- a/sbin/iscontrol/iscontrol.c
+++ b/sbin/iscontrol/iscontrol.c
@@ -31,8 +31,6 @@
  | the user level initiator (client)
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sbin/iscontrol/login.c b/sbin/iscontrol/login.c
index fbde361b9c..b6ebaf8cb4 100644
--- a/sbin/iscontrol/login.c
+++ b/sbin/iscontrol/login.c
@@ -28,8 +28,6 @@
  | $Id: login.c,v 1.4 2007/04/27 07:40:40 danny Exp danny $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sbin/iscontrol/misc.c b/sbin/iscontrol/misc.c
index 60f26a33ad..933bc34a06 100644
--- a/sbin/iscontrol/misc.c
+++ b/sbin/iscontrol/misc.c
@@ -29,8 +29,6 @@
  | $Id: misc.c,v 2.1 2006/11/12 08:06:51 danny Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/sbin/iscontrol/pdu.c b/sbin/iscontrol/pdu.c
index 9dc08f16af..c92809ea6c 100644
--- a/sbin/iscontrol/pdu.c
+++ b/sbin/iscontrol/pdu.c
@@ -28,8 +28,6 @@
  | $Id: pdu.c,v 2.2 2006/12/01 09:11:56 danny Exp danny $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/uio.h>
diff --git a/sbin/kldstat/kldstat.c b/sbin/kldstat/kldstat.c
index 982f5145e3..5b045df37c 100644
--- a/sbin/kldstat/kldstat.c
+++ b/sbin/kldstat/kldstat.c
@@ -24,11 +24,8 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sbin/kldstat/kldstat.c,v 1.20 2007/10/22 04:12:57 jb Exp $
- * $DragonFly: src/sbin/kldstat/kldstat.c,v 1.5 2008/01/08 15:27:57 matthias Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <err.h>
 #include <stdint.h>
 #include <stdio.h>
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 22c39296ef..f5e7c02dc3 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -4,7 +4,6 @@
  * MDDRIVER.C - test driver for MD2, MD4 and MD5
  *
  * $FreeBSD: src/sbin/md5/md5.c,v 1.35 2006/01/17 15:35:57 phk Exp $
- * $DragonFly: src/sbin/md5/md5.c,v 1.4 2008/01/16 14:18:57 matthias Exp $
  */
 
 /*
@@ -20,8 +19,6 @@
  *  documentation and/or software.
  */
 
-#include <sys/cdefs.h>
-
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/sbin/mount_hpfs/mount_hpfs.c b/sbin/mount_hpfs/mount_hpfs.c
index d5c64235c7..139c63dbbb 100644
--- a/sbin/mount_hpfs/mount_hpfs.c
+++ b/sbin/mount_hpfs/mount_hpfs.c
@@ -31,7 +31,6 @@
  * $FreeBSD: src/sbin/mount_hpfs/mount_hpfs.c,v 1.1 1999/12/09 19:09:15 semenu Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
diff --git a/sbin/mount_ntfs/mount_ntfs.c b/sbin/mount_ntfs/mount_ntfs.c
index 31a69b8456..172c09a42d 100644
--- a/sbin/mount_ntfs/mount_ntfs.c
+++ b/sbin/mount_ntfs/mount_ntfs.c
@@ -32,7 +32,6 @@
  *
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #define NTFS
 #include <sys/mount.h>
diff --git a/sbin/savecore/savecore.c b/sbin/savecore/savecore.c
index 5c69954c68..938f8acc3f 100644
--- a/sbin/savecore/savecore.c
+++ b/sbin/savecore/savecore.c
@@ -64,8 +64,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/kerneldump.h>
 #include <sys/diskslice.h>
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index 35e72ce913..3c3370fe07 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -78,7 +78,6 @@
  * $FreeBSD: src/usr.bin/chat/chat.c,v 1.21 2003/10/31 06:22:03 kientzle Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index 740e23cb3d..1186f63b7e 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -25,11 +25,8 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/ktrdump/ktrdump.c,v 1.10 2005/05/21 09:55:06 ru Exp $
- * $DragonFly: src/usr.bin/ktrdump/ktrdump.c,v 1.13 2008/11/10 02:05:31 swildner Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/types.h>
 #include <sys/ktr.h>
 #include <sys/mman.h>
diff --git a/usr.bin/netstat/ipsec.c b/usr.bin/netstat/ipsec.c
index 6fb7dda160..4172a91051 100644
--- a/usr.bin/netstat/ipsec.c
+++ b/usr.bin/netstat/ipsec.c
@@ -1,5 +1,4 @@
 /*	$FreeBSD: src/usr.bin/netstat/ipsec.c,v 1.1.2.3 2001/08/10 09:07:09 ru Exp $	*/
-/*	$DragonFly: src/usr.bin/netstat/ipsec.c,v 1.2 2003/06/17 04:29:30 dillon Exp $	*/
 /*	$NetBSD: inet.c,v 1.35.2.1 1999/04/29 14:57:08 perry Exp $	*/
 /*	$KAME: ipsec.c,v 1.25 2001/03/12 09:04:39 itojun Exp $	*/
 
@@ -68,8 +67,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index e280d32a55..ba20e430ab 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -35,11 +35,8 @@
  *
  * @(#) Copyright (c) 1999 The NetBSD Foundation, Inc.  All rights reserved.
  * $FreeBSD: src/usr.bin/nl/nl.c,v 1.2.2.2 2002/07/15 06:18:43 tjr Exp $
- * $DragonFly: src/usr.bin/nl/nl.c,v 1.3 2003/10/04 20:36:49 hmp Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/types.h>
 
 #include <err.h>
diff --git a/usr.bin/stat/stat.c b/usr.bin/stat/stat.c
index b345226906..cc16ed53c0 100644
--- a/usr.bin/stat/stat.c
+++ b/usr.bin/stat/stat.c
@@ -35,10 +35,8 @@
  *
  * $NetBSD: stat.c,v 1.13 2003/07/25 03:21:17 atatat Exp $
  * $FreeBSD: src/usr.bin/stat/stat.c,v 1.6 2003/10/06 01:55:17 dougb Exp $
- * $DragonFly: src/usr.bin/stat/stat.c,v 1.6 2005/06/29 00:24:49 corecode Exp $
  */
 
-#include <sys/cdefs.h>
 #if HAVE_CONFIG_H
 #include "config.h" 
 #else  /* HAVE_CONFIG_H */
diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c
index 317dabe9c3..64de173f4e 100644
--- a/usr.bin/systat/icmp6.c
+++ b/usr.bin/systat/icmp6.c
@@ -32,11 +32,8 @@
  *
  * @(#)mbufs.c     8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/systat/icmp6.c,v 1.3 2006/04/30 04:47:23 bde Exp $
- * $DragonFly: src/usr.bin/systat/icmp6.c,v 1.3 2008/10/16 01:52:33 swildner Exp $
  */
 
-#include <sys/cdefs.h>
-
 #ifdef INET6
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c
index 5400393af8..00aaceb114 100644
--- a/usr.bin/systat/ip6.c
+++ b/usr.bin/systat/ip6.c
@@ -32,11 +32,8 @@
  *
  * @(#)mbufs.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/systat/ip6.c,v 1.3 2006/04/30 04:47:23 bde Exp $
- * $DragonFly: src/usr.bin/systat/ip6.c,v 1.2 2008/10/16 01:52:33 swildner Exp $
  */
 
-#include <sys/cdefs.h>
-
 #ifdef INET6
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/usr.bin/systat/sensors.c b/usr.bin/systat/sensors.c
index 8293986f0d..79c9400162 100644
--- a/usr.bin/systat/sensors.c
+++ b/usr.bin/systat/sensors.c
@@ -1,5 +1,4 @@
 /* $OpenBSD: sensors.c,v 1.11 2007/03/23 14:48:22 ckuethe Exp $ */
-/* $DragonFly: src/usr.bin/systat/sensors.c,v 1.2 2008/11/10 04:59:45 swildner Exp $ */
 
 /*
  * Copyright (c) 2007 Deanna Phillips <deanna@openbsd.org>
@@ -19,7 +18,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/sensors.h>
diff --git a/usr.bin/telnet/sys_bsd.c b/usr.bin/telnet/sys_bsd.c
index 98d141ec98..d11bfd28a3 100644
--- a/usr.bin/telnet/sys_bsd.c
+++ b/usr.bin/telnet/sys_bsd.c
@@ -32,11 +32,9 @@
  *
  * @(#)sys_bsd.c	8.4 (Berkeley) 5/30/95
  * $FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.2.8.4 2002/04/13 10:59:08 markm Exp $
- * $DragonFly: src/crypto/telnet/telnet/sys_bsd.c,v 1.2 2003/06/17 04:24:37 dillon Exp $
 
  */
 
-#include <sys/cdefs.h>
 #include <stdlib.h>
 #include <err.h>
 
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index 2309b74063..2670b0fffd 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -32,10 +32,8 @@
  *
  * @(#)str.c	8.2 (Berkeley) 4/28/95
  * $FreeBSD: src/usr.bin/tr/str.c,v 1.10.2.2 2002/07/29 12:59:33 tjr Exp $
- * $DragonFly: src/usr.bin/tr/str.c,v 1.4 2004/08/30 18:06:50 eirikn Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <ctype.h>
diff --git a/usr.sbin/ancontrol/ancontrol.c b/usr.sbin/ancontrol/ancontrol.c
index 7bcd9f00cc..822ef95ca0 100644
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@@ -34,7 +34,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
diff --git a/usr.sbin/kbdmap/kbdmap.c b/usr.sbin/kbdmap/kbdmap.c
index b50204fc24..6330363e44 100644
--- a/usr.sbin/kbdmap/kbdmap.c
+++ b/usr.sbin/kbdmap/kbdmap.c
@@ -24,10 +24,8 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.sbin/kbdmap/kbdmap.c,v 1.2 2002/10/27 17:44:33 wollman Exp $
- * $DragonFly: src/usr.sbin/kbdmap/kbdmap.c,v 1.1 2004/06/21 01:37:42 cpressey Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 
diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c
index 5c2c50f3ee..729c59b314 100644
--- a/usr.sbin/lastlogin/lastlogin.c
+++ b/usr.sbin/lastlogin/lastlogin.c
@@ -31,10 +31,8 @@
  *
  * $NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $
  * $FreeBSD: src/usr.sbin/lastlogin/lastlogin.c,v 1.2.2.2 2001/07/19 05:02:46 kris Exp $
- * $DragonFly: src/usr.sbin/lastlogin/lastlogin.c,v 1.5 2004/11/13 16:14:33 liamfoy Exp $
  */
 
-#include <sys/cdefs.h>
 #include <sys/user.h>
 
 #include <err.h>
diff --git a/usr.sbin/lpr/lpc/cmdtab.c b/usr.sbin/lpr/lpc/cmdtab.c
index f8e5d0c443..43d9313ad9 100644
--- a/usr.sbin/lpr/lpc/cmdtab.c
+++ b/usr.sbin/lpr/lpc/cmdtab.c
@@ -32,11 +32,8 @@
  *
  * @(#)cmdtab.c	8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.sbin/lpr/lpc/cmdtab.c,v 1.3.2.7 2002/07/26 03:12:07 gad Exp $
- * $DragonFly: src/usr.sbin/lpr/lpc/cmdtab.c,v 1.2 2003/06/17 04:29:56 dillon Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include "lpc.h"
 #include "extern.h"
 
diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c
index 7047b051e8..d1937b63a0 100644
--- a/usr.sbin/moused/moused.c
+++ b/usr.sbin/moused/moused.c
@@ -47,9 +47,9 @@
 /*
  * $FreeBSD: src/usr.sbin/moused/moused.c,v 1.69 2005/01/06 08:38:29 philip Exp $
  */
+
 #include <machine/console.h>
 #include <sys/mouse.h>
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/consio.h>
 #include <sys/linker.h>
diff --git a/usr.sbin/resident/resident.c b/usr.sbin/resident/resident.c
index 1b290ea8ba..08e7aa8f82 100644
--- a/usr.sbin/resident/resident.c
+++ b/usr.sbin/resident/resident.c
@@ -22,12 +22,8 @@
  * 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.
- *
- * $DragonFly: src/usr.sbin/resident/resident.c,v 1.8 2005/04/22 16:59:46 liamfoy Exp $
  */
 
-#include <sys/cdefs.h>
-
 #include <sys/param.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
diff --git a/usr.sbin/rpc.ypupdated/ypupdated_server.c b/usr.sbin/rpc.ypupdated/ypupdated_server.c
index 19025412ab..3343c2fb6b 100644
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@@ -36,14 +36,12 @@
  * Columbia University, New York City
  *
  * $FreeBSD: src/usr.sbin/rpc.ypupdated/ypupdated_server.c,v 1.7 2003/05/03 21:06:40 obrien Exp $
- * $DragonFly: src/usr.sbin/rpc.ypupdated/ypupdated_server.c,v 1.3 2005/11/25 00:32:49 swildner Exp $
  */
 
 #include <stdio.h>
 #include <rpc/rpc.h>
 #include <rpc/key_prot.h>
 #include <sys/param.h>
-#include <sys/cdefs.h>
 #include <rpcsvc/yp.h>
 #include "ypupdate_prot.h"
 #include "ypupdated_extern.h"