320 files changed, 0 insertions, 636 deletions

diff --git a/lib/msun/amd64/e_fmod.S b/lib/msun/amd64/e_fmod.S
index 6163134e6c30..2562bf326d41 100644
--- a/lib/msun/amd64/e_fmod.S
+++ b/lib/msun/amd64/e_fmod.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(fmod)
 	movsd	%xmm0,-8(%rsp)
 	movsd	%xmm1,-16(%rsp)
diff --git a/lib/msun/amd64/e_fmodf.S b/lib/msun/amd64/e_fmodf.S
index 4b52040cab95..a0676625cc5e 100644
--- a/lib/msun/amd64/e_fmodf.S
+++ b/lib/msun/amd64/e_fmodf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(fmodf)
 	movss	%xmm0,-4(%rsp)
 	movss	%xmm1,-8(%rsp)
diff --git a/lib/msun/amd64/e_fmodl.S b/lib/msun/amd64/e_fmodl.S
index 8f7a3b544fac..f27d38f1a107 100644
--- a/lib/msun/amd64/e_fmodl.S
+++ b/lib/msun/amd64/e_fmodl.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(fmodl)
 	fldt	24(%rsp)
 	fldt	8(%rsp)
diff --git a/lib/msun/amd64/e_remainder.S b/lib/msun/amd64/e_remainder.S
index 9d6085617213..c17542e71aa8 100644
--- a/lib/msun/amd64/e_remainder.S
+++ b/lib/msun/amd64/e_remainder.S
@@ -36,8 +36,6 @@
 #include <machine/asm.h>
 
 RCSID("from: FreeBSD: src/lib/msun/i387/e_remainder.S,v 1.8 2005/02/04 14:08:32 das Exp")
-__FBSDID("$FreeBSD$")
-
 ENTRY(remainder)
 	movsd	%xmm0,-8(%rsp)
 	movsd	%xmm1,-16(%rsp)
diff --git a/lib/msun/amd64/e_remainderf.S b/lib/msun/amd64/e_remainderf.S
index d78595f7b40a..de4df521148f 100644
--- a/lib/msun/amd64/e_remainderf.S
+++ b/lib/msun/amd64/e_remainderf.S
@@ -6,8 +6,6 @@
 #include <machine/asm.h>
 
 RCSID("from: $NetBSD: e_remainderf.S,v 1.2 1995/05/08 23:49:47 jtc Exp $")
-__FBSDID("$FreeBSD$")
-
 ENTRY(remainderf)
 	movss	%xmm0,-4(%rsp)
 	movss	%xmm1,-8(%rsp)
diff --git a/lib/msun/amd64/e_remainderl.S b/lib/msun/amd64/e_remainderl.S
index 977934b9d4e2..704939b5dcfa 100644
--- a/lib/msun/amd64/e_remainderl.S
+++ b/lib/msun/amd64/e_remainderl.S
@@ -34,9 +34,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$")
-
 ENTRY(remainderl)
 	fldt	24(%rsp)
 	fldt	8(%rsp)
diff --git a/lib/msun/amd64/e_sqrt.S b/lib/msun/amd64/e_sqrt.S
index 6f9eeff95c71..3a49f8f05441 100644
--- a/lib/msun/amd64/e_sqrt.S
+++ b/lib/msun/amd64/e_sqrt.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-	
 ENTRY(sqrt)
 	sqrtsd	%xmm0, %xmm0
 	ret
diff --git a/lib/msun/amd64/e_sqrtf.S b/lib/msun/amd64/e_sqrtf.S
index 25df7b1fe316..d299980be6d0 100644
--- a/lib/msun/amd64/e_sqrtf.S
+++ b/lib/msun/amd64/e_sqrtf.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-	
 ENTRY(sqrtf)
 	sqrtss	%xmm0, %xmm0
 	ret
diff --git a/lib/msun/amd64/e_sqrtl.S b/lib/msun/amd64/e_sqrtl.S
index 2726bf06e04c..8fd42546cea9 100644
--- a/lib/msun/amd64/e_sqrtl.S
+++ b/lib/msun/amd64/e_sqrtl.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-	
 ENTRY(sqrtl)
 	fldt	8(%rsp)
 	fsqrt
diff --git a/lib/msun/amd64/s_llrint.S b/lib/msun/amd64/s_llrint.S
index ab098465cd57..6e07e3f26cd3 100644
--- a/lib/msun/amd64/s_llrint.S
+++ b/lib/msun/amd64/s_llrint.S
@@ -1,6 +1,4 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-	
 /* sizeof(long) == sizeof(long long) */
 #define	fn	llrint
 #include "s_lrint.S"
diff --git a/lib/msun/amd64/s_llrintf.S b/lib/msun/amd64/s_llrintf.S
index e810e40b640d..dd951647464a 100644
--- a/lib/msun/amd64/s_llrintf.S
+++ b/lib/msun/amd64/s_llrintf.S
@@ -1,6 +1,4 @@
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-	
 /* sizeof(long) == sizeof(long long) */
 #define	fn	llrintf
 #include "s_lrintf.S"
diff --git a/lib/msun/amd64/s_llrintl.S b/lib/msun/amd64/s_llrintl.S
index 69c7041558a8..9d304e2793f3 100644
--- a/lib/msun/amd64/s_llrintl.S
+++ b/lib/msun/amd64/s_llrintl.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(llrintl)
 	fldt	8(%rsp)
 	subq	$8,%rsp
diff --git a/lib/msun/amd64/s_logbl.S b/lib/msun/amd64/s_logbl.S
index 857ef7628b0d..918ebb2c1d27 100644
--- a/lib/msun/amd64/s_logbl.S
+++ b/lib/msun/amd64/s_logbl.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(logbl)
 	fldt	8(%rsp)
 	fxtract
diff --git a/lib/msun/amd64/s_lrint.S b/lib/msun/amd64/s_lrint.S
index 5a5d28540c21..7e8b6243eafd 100644
--- a/lib/msun/amd64/s_lrint.S
+++ b/lib/msun/amd64/s_lrint.S
@@ -27,7 +27,6 @@
 #include <machine/asm.h>
 
 #ifndef fn
-__FBSDID("$FreeBSD$")
 #define	fn	lrint
 #endif
 
diff --git a/lib/msun/amd64/s_lrintf.S b/lib/msun/amd64/s_lrintf.S
index 0c25a7f4c01e..26ae000def02 100644
--- a/lib/msun/amd64/s_lrintf.S
+++ b/lib/msun/amd64/s_lrintf.S
@@ -27,7 +27,6 @@
 #include <machine/asm.h>
 
 #ifndef fn
-__FBSDID("$FreeBSD$")
 #define	fn	lrintf
 #endif
 
diff --git a/lib/msun/amd64/s_lrintl.S b/lib/msun/amd64/s_lrintl.S
index bffdeb6386cc..14c99e0ef237 100644
--- a/lib/msun/amd64/s_lrintl.S
+++ b/lib/msun/amd64/s_lrintl.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(lrintl)
 	fldt	8(%rsp)
 	subq	$8,%rsp
diff --git a/lib/msun/amd64/s_remquo.S b/lib/msun/amd64/s_remquo.S
index f000c360924f..4ac4c1fd1c16 100644
--- a/lib/msun/amd64/s_remquo.S
+++ b/lib/msun/amd64/s_remquo.S
@@ -29,8 +29,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(remquo)
 	movsd	%xmm0,-8(%rsp)
 	movsd	%xmm1,-16(%rsp)
diff --git a/lib/msun/amd64/s_remquof.S b/lib/msun/amd64/s_remquof.S
index 3b2cd2db37bb..d682670031de 100644
--- a/lib/msun/amd64/s_remquof.S
+++ b/lib/msun/amd64/s_remquof.S
@@ -29,8 +29,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(remquof)
 	movss	%xmm0,-4(%rsp)
 	movss	%xmm1,-8(%rsp)
diff --git a/lib/msun/amd64/s_remquol.S b/lib/msun/amd64/s_remquol.S
index 42a5ea207544..5479d676aaf2 100644
--- a/lib/msun/amd64/s_remquol.S
+++ b/lib/msun/amd64/s_remquol.S
@@ -29,8 +29,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(remquol)
 	fldt    24(%rsp)
 	fldt    8(%rsp)
diff --git a/lib/msun/amd64/s_scalbn.S b/lib/msun/amd64/s_scalbn.S
index 3dc25ad49d40..a855c3f1ac27 100644
--- a/lib/msun/amd64/s_scalbn.S
+++ b/lib/msun/amd64/s_scalbn.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(scalbn)
 	movsd	%xmm0,-8(%rsp)
 	movl	%edi,-12(%rsp)
diff --git a/lib/msun/amd64/s_scalbnf.S b/lib/msun/amd64/s_scalbnf.S
index 5ab4eec58446..32051444ef08 100644
--- a/lib/msun/amd64/s_scalbnf.S
+++ b/lib/msun/amd64/s_scalbnf.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(scalbnf)
 	movss	%xmm0,-8(%rsp)
 	movl	%edi,-4(%rsp)
diff --git a/lib/msun/amd64/s_scalbnl.S b/lib/msun/amd64/s_scalbnl.S
index 021d329ff1a0..1c9222fb0e82 100644
--- a/lib/msun/amd64/s_scalbnl.S
+++ b/lib/msun/amd64/s_scalbnl.S
@@ -4,7 +4,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
 /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
 
 ENTRY(scalbnl)
diff --git a/lib/msun/bsdsrc/b_exp.c b/lib/msun/bsdsrc/b_exp.c
index c667293ed7c6..398755a0aaeb 100644
--- a/lib/msun/bsdsrc/b_exp.c
+++ b/lib/msun/bsdsrc/b_exp.c
@@ -31,8 +31,6 @@
 
 /* @(#)exp.c	8.1 (Berkeley) 6/4/93 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* EXP(X)
  * RETURN THE EXPONENTIAL OF X
  * DOUBLE PRECISION (IEEE 53 bits, VAX D FORMAT 56 BITS)
diff --git a/lib/msun/bsdsrc/b_log.c b/lib/msun/bsdsrc/b_log.c
index 9d09ac754706..aeec29368412 100644
--- a/lib/msun/bsdsrc/b_log.c
+++ b/lib/msun/bsdsrc/b_log.c
@@ -31,8 +31,6 @@
 
 /* @(#)log.c	8.2 (Berkeley) 11/30/93 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* Table-driven natural logarithm.
  *
  * This code was derived, with minor modifications, from:
diff --git a/lib/msun/bsdsrc/b_tgamma.c b/lib/msun/bsdsrc/b_tgamma.c
index 493ced3769c7..cc9f8f70297e 100644
--- a/lib/msun/bsdsrc/b_tgamma.c
+++ b/lib/msun/bsdsrc/b_tgamma.c
@@ -44,8 +44,6 @@
 
 /* @(#)gamma.c	8.1 (Berkeley) 6/4/93 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/i387/e_exp.S b/lib/msun/i387/e_exp.S
index a89ba4256044..fa3a498a5e6d 100644
--- a/lib/msun/i387/e_exp.S
+++ b/lib/msun/i387/e_exp.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 /* e^x = 2^(x * log2(e)) */
 ENTRY(exp)
 	/*
diff --git a/lib/msun/i387/e_fmod.S b/lib/msun/i387/e_fmod.S
index 421cbba9be68..e0af3cb2e9c0 100644
--- a/lib/msun/i387/e_fmod.S
+++ b/lib/msun/i387/e_fmod.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(fmod)
 	fldl	12(%esp)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/e_fmodf.S b/lib/msun/i387/e_fmodf.S
index e269447226e9..60d1773e1e85 100644
--- a/lib/msun/i387/e_fmodf.S
+++ b/lib/msun/i387/e_fmodf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(fmodf)
 	flds	8(%esp)
 	flds	4(%esp)
diff --git a/lib/msun/i387/e_fmodl.S b/lib/msun/i387/e_fmodl.S
index 57e986c3d9f4..34e49925c300 100644
--- a/lib/msun/i387/e_fmodl.S
+++ b/lib/msun/i387/e_fmodl.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(fmodl)
 	fldt	16(%esp)
 	fldt	4(%esp)
diff --git a/lib/msun/i387/e_log.S b/lib/msun/i387/e_log.S
index 103e118249a3..3ac99a3fdd72 100644
--- a/lib/msun/i387/e_log.S
+++ b/lib/msun/i387/e_log.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(log)
 	fldln2
 	fldl	4(%esp)
diff --git a/lib/msun/i387/e_log10.S b/lib/msun/i387/e_log10.S
index 6ab4a5dc6932..ed1c7349a5dd 100644
--- a/lib/msun/i387/e_log10.S
+++ b/lib/msun/i387/e_log10.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(log10)
 	fldlg2
 	fldl	4(%esp)
diff --git a/lib/msun/i387/e_log10f.S b/lib/msun/i387/e_log10f.S
index fc75674115d9..c7925a117f72 100644
--- a/lib/msun/i387/e_log10f.S
+++ b/lib/msun/i387/e_log10f.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: e_log10f.S,v 1.1 1996/07/03 16:50:22 jtc Exp $") */
 
 ENTRY(log10f)
diff --git a/lib/msun/i387/e_logf.S b/lib/msun/i387/e_logf.S
index 01511af1c750..e122afcace52 100644
--- a/lib/msun/i387/e_logf.S
+++ b/lib/msun/i387/e_logf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: e_logf.S,v 1.2 1996/07/06 00:15:45 jtc Exp $") */
 
 ENTRY(logf)
diff --git a/lib/msun/i387/e_remainder.S b/lib/msun/i387/e_remainder.S
index 0be86388ef47..163ad74120ce 100644
--- a/lib/msun/i387/e_remainder.S
+++ b/lib/msun/i387/e_remainder.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(remainder)
 	fldl	12(%esp)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/e_remainderf.S b/lib/msun/i387/e_remainderf.S
index 38987e5bf4db..fcd46c3e4183 100644
--- a/lib/msun/i387/e_remainderf.S
+++ b/lib/msun/i387/e_remainderf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: e_remainderf.S,v 1.2 1995/05/08 23:49:47 jtc Exp $") */
 
 ENTRY(remainderf)
diff --git a/lib/msun/i387/e_remainderl.S b/lib/msun/i387/e_remainderl.S
index 3dac08836405..d03cd4acb89a 100644
--- a/lib/msun/i387/e_remainderl.S
+++ b/lib/msun/i387/e_remainderl.S
@@ -34,9 +34,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$")
-
 ENTRY(remainderl)
 	fldt	16(%esp)
 	fldt	4(%esp)
diff --git a/lib/msun/i387/e_sqrt.S b/lib/msun/i387/e_sqrt.S
index 85814392553c..7d8653e72097 100644
--- a/lib/msun/i387/e_sqrt.S
+++ b/lib/msun/i387/e_sqrt.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(sqrt)
 	fldl	4(%esp)
 	fsqrt
diff --git a/lib/msun/i387/e_sqrtf.S b/lib/msun/i387/e_sqrtf.S
index 75a9ae2770ab..b8e561b8b875 100644
--- a/lib/msun/i387/e_sqrtf.S
+++ b/lib/msun/i387/e_sqrtf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: e_sqrtf.S,v 1.2 1995/05/08 23:50:14 jtc Exp $") */
 
 ENTRY(sqrtf)
diff --git a/lib/msun/i387/e_sqrtl.S b/lib/msun/i387/e_sqrtl.S
index aec8fbd9e533..c916dbca782b 100644
--- a/lib/msun/i387/e_sqrtl.S
+++ b/lib/msun/i387/e_sqrtl.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(sqrtl)
 	fldt	4(%esp)
 	fsqrt
diff --git a/lib/msun/i387/invtrig.c b/lib/msun/i387/invtrig.c
index d300663b282d..523f022e0546 100644
--- a/lib/msun/i387/invtrig.c
+++ b/lib/msun/i387/invtrig.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <stdint.h>
 
 #define STRUCT_DECLS
diff --git a/lib/msun/i387/s_ceil.S b/lib/msun/i387/s_ceil.S
index 71019ec6090f..08fd2d500cf1 100644
--- a/lib/msun/i387/s_ceil.S
+++ b/lib/msun/i387/s_ceil.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(ceil)
 	pushl	%ebp
 	movl	%esp,%ebp
diff --git a/lib/msun/i387/s_ceilf.S b/lib/msun/i387/s_ceilf.S
index 44480dededac..27e2f3b4c02f 100644
--- a/lib/msun/i387/s_ceilf.S
+++ b/lib/msun/i387/s_ceilf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: s_ceilf.S,v 1.3 1995/05/08 23:52:44 jtc Exp $") */
 
 ENTRY(ceilf)
diff --git a/lib/msun/i387/s_ceill.S b/lib/msun/i387/s_ceill.S
index 8ed48aa1e603..4f60c07d9ac7 100644
--- a/lib/msun/i387/s_ceill.S
+++ b/lib/msun/i387/s_ceill.S
@@ -4,8 +4,6 @@
  */
 	
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(ceill)
 	pushl	%ebp
 	movl	%esp,%ebp
diff --git a/lib/msun/i387/s_copysign.S b/lib/msun/i387/s_copysign.S
index 63a916f31272..6f69db1245f6 100644
--- a/lib/msun/i387/s_copysign.S
+++ b/lib/msun/i387/s_copysign.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(copysign)
 	movl	16(%esp),%edx
 	andl	$0x80000000,%edx
diff --git a/lib/msun/i387/s_copysignf.S b/lib/msun/i387/s_copysignf.S
index 7ad1a64b3adc..cab971c888f0 100644
--- a/lib/msun/i387/s_copysignf.S
+++ b/lib/msun/i387/s_copysignf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: s_copysignf.S,v 1.3 1995/05/08 23:53:25 jtc Exp $") */
 
 ENTRY(copysignf)
diff --git a/lib/msun/i387/s_copysignl.S b/lib/msun/i387/s_copysignl.S
index b4143c0dcee9..7751792eb3b5 100644
--- a/lib/msun/i387/s_copysignl.S
+++ b/lib/msun/i387/s_copysignl.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(copysignl)
 	movl	24(%esp),%edx
 	andl	$0x8000,%edx
diff --git a/lib/msun/i387/s_cos.S b/lib/msun/i387/s_cos.S
index 9951ab0674aa..299f90b689bb 100644
--- a/lib/msun/i387/s_cos.S
+++ b/lib/msun/i387/s_cos.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(cos)
 	fldl	4(%esp)
 	fcos
diff --git a/lib/msun/i387/s_finite.S b/lib/msun/i387/s_finite.S
index 010785670d27..aec5afeb27ed 100644
--- a/lib/msun/i387/s_finite.S
+++ b/lib/msun/i387/s_finite.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(finite)
 	movl	8(%esp),%eax
 	andl	$0x7ff00000, %eax
diff --git a/lib/msun/i387/s_floor.S b/lib/msun/i387/s_floor.S
index f9d1ab976897..b3a6621931f9 100644
--- a/lib/msun/i387/s_floor.S
+++ b/lib/msun/i387/s_floor.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(floor)
 	pushl	%ebp
 	movl	%esp,%ebp
diff --git a/lib/msun/i387/s_floorf.S b/lib/msun/i387/s_floorf.S
index ecd9307f7b3d..65eb5b604f56 100644
--- a/lib/msun/i387/s_floorf.S
+++ b/lib/msun/i387/s_floorf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: s_floorf.S,v 1.3 1995/05/09 00:04:32 jtc Exp $") */
 
 ENTRY(floorf)
diff --git a/lib/msun/i387/s_floorl.S b/lib/msun/i387/s_floorl.S
index ae9e91baf216..b202c15db4f5 100644
--- a/lib/msun/i387/s_floorl.S
+++ b/lib/msun/i387/s_floorl.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(floorl)
 	pushl	%ebp
 	movl	%esp,%ebp
diff --git a/lib/msun/i387/s_llrint.S b/lib/msun/i387/s_llrint.S
index ded12a763424..ea9bea24f2fe 100644
--- a/lib/msun/i387/s_llrint.S
+++ b/lib/msun/i387/s_llrint.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(llrint)
 	fldl	4(%esp)
 	subl	$8,%esp
diff --git a/lib/msun/i387/s_llrintf.S b/lib/msun/i387/s_llrintf.S
index 4372b7d6b29b..31afcd0fdc41 100644
--- a/lib/msun/i387/s_llrintf.S
+++ b/lib/msun/i387/s_llrintf.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-	
 ENTRY(llrintf)
 	flds	4(%esp)
 	subl	$8,%esp
diff --git a/lib/msun/i387/s_llrintl.S b/lib/msun/i387/s_llrintl.S
index aa349cbc1aae..3a5239080bdf 100644
--- a/lib/msun/i387/s_llrintl.S
+++ b/lib/msun/i387/s_llrintl.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(llrintl)
 	fldt	4(%esp)
 	subl	$8,%esp
diff --git a/lib/msun/i387/s_logb.S b/lib/msun/i387/s_logb.S
index 8304aa240efc..d49e15db3e15 100644
--- a/lib/msun/i387/s_logb.S
+++ b/lib/msun/i387/s_logb.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(logb)
 	fldl	4(%esp)
 	fxtract
diff --git a/lib/msun/i387/s_logbf.S b/lib/msun/i387/s_logbf.S
index 960f6f15c61f..383b189182be 100644
--- a/lib/msun/i387/s_logbf.S
+++ b/lib/msun/i387/s_logbf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: s_logbf.S,v 1.3 1995/05/09 00:15:12 jtc Exp $") */
 
 ENTRY(logbf)
diff --git a/lib/msun/i387/s_logbl.S b/lib/msun/i387/s_logbl.S
index f175e7b51a40..e6eb369a5ecd 100644
--- a/lib/msun/i387/s_logbl.S
+++ b/lib/msun/i387/s_logbl.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(logbl)
 	fldt	4(%esp)
 	fxtract
diff --git a/lib/msun/i387/s_lrint.S b/lib/msun/i387/s_lrint.S
index e138c523b1da..0203bda5c2cf 100644
--- a/lib/msun/i387/s_lrint.S
+++ b/lib/msun/i387/s_lrint.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(lrint)
 	fldl	4(%esp)
 	subl	$4,%esp
diff --git a/lib/msun/i387/s_lrintf.S b/lib/msun/i387/s_lrintf.S
index 7571b7f1dd0b..75f70d4b8de6 100644
--- a/lib/msun/i387/s_lrintf.S
+++ b/lib/msun/i387/s_lrintf.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-	
 ENTRY(lrintf)
 	flds	4(%esp)
 	subl	$4,%esp
diff --git a/lib/msun/i387/s_lrintl.S b/lib/msun/i387/s_lrintl.S
index 9a8b467a3c13..3aeef8e03324 100644
--- a/lib/msun/i387/s_lrintl.S
+++ b/lib/msun/i387/s_lrintl.S
@@ -25,8 +25,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(lrintl)
 	fldt	4(%esp)
 	subl	$4,%esp
diff --git a/lib/msun/i387/s_remquo.S b/lib/msun/i387/s_remquo.S
index 5fc43886224f..07c327e29c88 100644
--- a/lib/msun/i387/s_remquo.S
+++ b/lib/msun/i387/s_remquo.S
@@ -29,8 +29,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(remquo)
 	fldl	12(%esp)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_remquof.S b/lib/msun/i387/s_remquof.S
index 32ee3997839c..6cad8ec57cb2 100644
--- a/lib/msun/i387/s_remquof.S
+++ b/lib/msun/i387/s_remquof.S
@@ -29,8 +29,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(remquof)
 	flds	8(%esp)
 	flds	4(%esp)
diff --git a/lib/msun/i387/s_remquol.S b/lib/msun/i387/s_remquol.S
index 59a62cbefe7d..435bb15352ed 100644
--- a/lib/msun/i387/s_remquol.S
+++ b/lib/msun/i387/s_remquol.S
@@ -29,8 +29,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$"); 
-	
 ENTRY(remquol)
 	fldt	16(%esp)
 	fldt	4(%esp)
diff --git a/lib/msun/i387/s_rint.S b/lib/msun/i387/s_rint.S
index 130819bfce5a..d78658a973be 100644
--- a/lib/msun/i387/s_rint.S
+++ b/lib/msun/i387/s_rint.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(rint)
 	fldl	4(%esp)
 	frndint
diff --git a/lib/msun/i387/s_rintf.S b/lib/msun/i387/s_rintf.S
index e188ae4c7f07..51ecf8c6c1d5 100644
--- a/lib/msun/i387/s_rintf.S
+++ b/lib/msun/i387/s_rintf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: s_rintf.S,v 1.3 1995/05/09 00:17:22 jtc Exp $") */
 
 ENTRY(rintf)
diff --git a/lib/msun/i387/s_rintl.S b/lib/msun/i387/s_rintl.S
index 8be8d96ebcdb..0efb554302d3 100644
--- a/lib/msun/i387/s_rintl.S
+++ b/lib/msun/i387/s_rintl.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(rintl)
 	fldt	4(%esp)
 	frndint
diff --git a/lib/msun/i387/s_scalbn.S b/lib/msun/i387/s_scalbn.S
index 94d73e48e036..ee5eabaecb1e 100644
--- a/lib/msun/i387/s_scalbn.S
+++ b/lib/msun/i387/s_scalbn.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(scalbn)
 	fildl	12(%esp)
 	fldl	4(%esp)
diff --git a/lib/msun/i387/s_scalbnf.S b/lib/msun/i387/s_scalbnf.S
index d61888bde21f..ce1377c87920 100644
--- a/lib/msun/i387/s_scalbnf.S
+++ b/lib/msun/i387/s_scalbnf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
 
 ENTRY(scalbnf)
diff --git a/lib/msun/i387/s_scalbnl.S b/lib/msun/i387/s_scalbnl.S
index 3881f8177b78..6c81c7d586ef 100644
--- a/lib/msun/i387/s_scalbnl.S
+++ b/lib/msun/i387/s_scalbnl.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: s_scalbnf.S,v 1.4 1999/01/02 05:15:40 kristerw Exp $") */
 
 ENTRY(scalbnl)
diff --git a/lib/msun/i387/s_significand.S b/lib/msun/i387/s_significand.S
index ac0ffcf7b90d..38003bb4bf2e 100644
--- a/lib/msun/i387/s_significand.S
+++ b/lib/msun/i387/s_significand.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(significand)
 	fldl	4(%esp)
 	fxtract
diff --git a/lib/msun/i387/s_significandf.S b/lib/msun/i387/s_significandf.S
index 985ad970cf44..b2f7f03da83e 100644
--- a/lib/msun/i387/s_significandf.S
+++ b/lib/msun/i387/s_significandf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-
-__FBSDID("$FreeBSD$");
 /* RCSID("$NetBSD: s_significandf.S,v 1.3 1995/05/09 00:24:07 jtc Exp $") */
 
 ENTRY(significandf)
diff --git a/lib/msun/i387/s_sin.S b/lib/msun/i387/s_sin.S
index eb047540d736..affe27894ba1 100644
--- a/lib/msun/i387/s_sin.S
+++ b/lib/msun/i387/s_sin.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(sin)
 	fldl	4(%esp)
 	fsin
diff --git a/lib/msun/i387/s_tan.S b/lib/msun/i387/s_tan.S
index 182b9f76459e..e14b223def4c 100644
--- a/lib/msun/i387/s_tan.S
+++ b/lib/msun/i387/s_tan.S
@@ -34,8 +34,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(tan)
 	fldl	4(%esp)
 	fptan
diff --git a/lib/msun/i387/s_trunc.S b/lib/msun/i387/s_trunc.S
index 61bbc537556a..1124d5430090 100644
--- a/lib/msun/i387/s_trunc.S
+++ b/lib/msun/i387/s_trunc.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(trunc)
 	pushl	%ebp
 	movl	%esp,%ebp
diff --git a/lib/msun/i387/s_truncf.S b/lib/msun/i387/s_truncf.S
index 4c6c3f1f2cab..332834ff2085 100644
--- a/lib/msun/i387/s_truncf.S
+++ b/lib/msun/i387/s_truncf.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(truncf)
 	pushl	%ebp
 	movl	%esp,%ebp
diff --git a/lib/msun/i387/s_truncl.S b/lib/msun/i387/s_truncl.S
index a52471966b90..16181b61f8ba 100644
--- a/lib/msun/i387/s_truncl.S
+++ b/lib/msun/i387/s_truncl.S
@@ -4,8 +4,6 @@
  */
 
 #include <machine/asm.h>
-__FBSDID("$FreeBSD$")
-
 ENTRY(truncl)
 	pushl	%ebp
 	movl	%esp,%ebp
diff --git a/lib/msun/ld128/e_lgammal_r.c b/lib/msun/ld128/e_lgammal_r.c
index 53d3af17d89d..e3d97b6d18b7 100644
--- a/lib/msun/ld128/e_lgammal_r.c
+++ b/lib/msun/ld128/e_lgammal_r.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See e_lgamma_r.c for complete comments.
  *
diff --git a/lib/msun/ld128/e_powl.c b/lib/msun/ld128/e_powl.c
index 12b92a1a98b9..fd8b57b66bd5 100644
--- a/lib/msun/ld128/e_powl.c
+++ b/lib/msun/ld128/e_powl.c
@@ -60,8 +60,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/msun/ld128/e_rem_pio2l.h b/lib/msun/ld128/e_rem_pio2l.h
index fcef399a83a6..35ed0b865a7c 100644
--- a/lib/msun/ld128/e_rem_pio2l.h
+++ b/lib/msun/ld128/e_rem_pio2l.h
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* ld128 version of __ieee754_rem_pio2l(x,y)
  * 
  * return the remainder of x rem pi/2 in y[0]+y[1] 
diff --git a/lib/msun/ld128/invtrig.c b/lib/msun/ld128/invtrig.c
index 3ba767ba598a..cd9a276b68d1 100644
--- a/lib/msun/ld128/invtrig.c
+++ b/lib/msun/ld128/invtrig.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "invtrig.h"
 
 /*
diff --git a/lib/msun/ld128/k_cosl.c b/lib/msun/ld128/k_cosl.c
index 422357bf8a6c..8280378c429c 100644
--- a/lib/msun/ld128/k_cosl.c
+++ b/lib/msun/ld128/k_cosl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ld128 version of k_cos.c.  See ../src/k_cos.c for most comments.
  */
diff --git a/lib/msun/ld128/k_expl.h b/lib/msun/ld128/k_expl.h
index 3faf7a7f097a..71924f16c8a4 100644
--- a/lib/msun/ld128/k_expl.h
+++ b/lib/msun/ld128/k_expl.h
@@ -31,8 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ld128 version of k_expl.h.  See ../ld80/s_expl.c for most comments.
  *
diff --git a/lib/msun/ld128/k_sinl.c b/lib/msun/ld128/k_sinl.c
index 09472d65f5c9..ca54f9f1a630 100644
--- a/lib/msun/ld128/k_sinl.c
+++ b/lib/msun/ld128/k_sinl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ld128 version of k_sin.c.  See ../src/k_sin.c for most comments.
  */
diff --git a/lib/msun/ld128/k_tanl.c b/lib/msun/ld128/k_tanl.c
index d7ec0b93d0ee..daff6b2bde8c 100644
--- a/lib/msun/ld128/k_tanl.c
+++ b/lib/msun/ld128/k_tanl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ld128 version of k_tan.c.  See ../src/k_tan.c for most comments.
  */
diff --git a/lib/msun/ld128/s_cexpl.c b/lib/msun/ld128/s_cexpl.c
index a7b81c764153..1e4141f162c5 100644
--- a/lib/msun/ld128/s_cexpl.c
+++ b/lib/msun/ld128/s_cexpl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/ld128/s_erfl.c b/lib/msun/ld128/s_erfl.c
index e29c9691f45d..43ba2f0bed8b 100644
--- a/lib/msun/ld128/s_erfl.c
+++ b/lib/msun/ld128/s_erfl.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See s_erf.c for complete comments.
  *
diff --git a/lib/msun/ld128/s_exp2l.c b/lib/msun/ld128/s_exp2l.c
index bcbdc5f50170..74ae8c2daad8 100644
--- a/lib/msun/ld128/s_exp2l.c
+++ b/lib/msun/ld128/s_exp2l.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <stdint.h>
 
diff --git a/lib/msun/ld128/s_expl.c b/lib/msun/ld128/s_expl.c
index 0274a8f302db..6d6c22d917fe 100644
--- a/lib/msun/ld128/s_expl.c
+++ b/lib/msun/ld128/s_expl.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ld128 version of s_expl.c.  See ../ld80/s_expl.c for most comments.
  */
diff --git a/lib/msun/ld128/s_logl.c b/lib/msun/ld128/s_logl.c
index bc538840a760..8961dd0c96db 100644
--- a/lib/msun/ld128/s_logl.c
+++ b/lib/msun/ld128/s_logl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /**
  * Implementation of the natural logarithm of x for 128-bit format.
  *
diff --git a/lib/msun/ld80/e_lgammal_r.c b/lib/msun/ld80/e_lgammal_r.c
index f56758b18917..cfd73b408b87 100644
--- a/lib/msun/ld80/e_lgammal_r.c
+++ b/lib/msun/ld80/e_lgammal_r.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See e_lgamma_r.c for complete comments.
  *
diff --git a/lib/msun/ld80/e_powl.c b/lib/msun/ld80/e_powl.c
index ea25354c2aa2..2daf26aab93b 100644
--- a/lib/msun/ld80/e_powl.c
+++ b/lib/msun/ld80/e_powl.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <math.h>
 
 #include "math_private.h"
@@ -117,8 +115,6 @@ __p1evll(long double x, long double *PP, int n)
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/msun/ld80/e_rem_pio2l.h b/lib/msun/ld80/e_rem_pio2l.h
index 9a5c64ca9943..d9e4d3a0941f 100644
--- a/lib/msun/ld80/e_rem_pio2l.h
+++ b/lib/msun/ld80/e_rem_pio2l.h
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* ld80 version of __ieee754_rem_pio2l(x,y)
  * 
  * return the remainder of x rem pi/2 in y[0]+y[1] 
diff --git a/lib/msun/ld80/invtrig.c b/lib/msun/ld80/invtrig.c
index 879009b0c7b2..0e2d49546391 100644
--- a/lib/msun/ld80/invtrig.c
+++ b/lib/msun/ld80/invtrig.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "invtrig.h"
 
 /*
diff --git a/lib/msun/ld80/k_cosl.c b/lib/msun/ld80/k_cosl.c
index 6dde6adad2dd..e76d429b90ef 100644
--- a/lib/msun/ld80/k_cosl.c
+++ b/lib/msun/ld80/k_cosl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ld80 version of k_cos.c.  See ../src/k_cos.c for most comments.
  */
diff --git a/lib/msun/ld80/k_expl.h b/lib/msun/ld80/k_expl.h
index b93fef8440dc..8c3617e4b177 100644
--- a/lib/msun/ld80/k_expl.h
+++ b/lib/msun/ld80/k_expl.h
@@ -31,8 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See s_expl.c for more comments about __k_expl().
  *
diff --git a/lib/msun/ld80/k_sinl.c b/lib/msun/ld80/k_sinl.c
index af5598dbadf1..21c1946b5e1b 100644
--- a/lib/msun/ld80/k_sinl.c
+++ b/lib/msun/ld80/k_sinl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ld80 version of k_sin.c.  See ../src/k_sin.c for most comments.
  */
diff --git a/lib/msun/ld80/k_tanl.c b/lib/msun/ld80/k_tanl.c
index 80ceef61f1c4..4965c669979f 100644
--- a/lib/msun/ld80/k_tanl.c
+++ b/lib/msun/ld80/k_tanl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ld80 version of k_tan.c.  See ../src/k_tan.c for most comments.
  */
diff --git a/lib/msun/ld80/s_cexpl.c b/lib/msun/ld80/s_cexpl.c
index 2d7624fac337..81a4d727561b 100644
--- a/lib/msun/ld80/s_cexpl.c
+++ b/lib/msun/ld80/s_cexpl.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 #ifdef __i386__
diff --git a/lib/msun/ld80/s_erfl.c b/lib/msun/ld80/s_erfl.c
index 1ae2f9092705..362b4f07d6bc 100644
--- a/lib/msun/ld80/s_erfl.c
+++ b/lib/msun/ld80/s_erfl.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See s_erf.c for complete comments.
  *
diff --git a/lib/msun/ld80/s_exp2l.c b/lib/msun/ld80/s_exp2l.c
index a7125e4162ea..94aecf1843cd 100644
--- a/lib/msun/ld80/s_exp2l.c
+++ b/lib/msun/ld80/s_exp2l.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <stdint.h>
 
diff --git a/lib/msun/ld80/s_expl.c b/lib/msun/ld80/s_expl.c
index a41de4d6d1d8..065e02fae1b0 100644
--- a/lib/msun/ld80/s_expl.c
+++ b/lib/msun/ld80/s_expl.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /**
  * Compute the exponential of x for Intel 80-bit format.  This is based on:
  *
diff --git a/lib/msun/ld80/s_logl.c b/lib/msun/ld80/s_logl.c
index abe778249549..459374d7d164 100644
--- a/lib/msun/ld80/s_logl.c
+++ b/lib/msun/ld80/s_logl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /**
  * Implementation of the natural logarithm of x for Intel 80-bit format.
  *
diff --git a/lib/msun/src/catrig.c b/lib/msun/src/catrig.c
index 82061b5ba433..929811a09a3b 100644
--- a/lib/msun/src/catrig.c
+++ b/lib/msun/src/catrig.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 
diff --git a/lib/msun/src/catrigf.c b/lib/msun/src/catrigf.c
index fb4a6bf5d471..7feecfc5de38 100644
--- a/lib/msun/src/catrigf.c
+++ b/lib/msun/src/catrigf.c
@@ -41,8 +41,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 
diff --git a/lib/msun/src/catrigl.c b/lib/msun/src/catrigl.c
index e66f87a24a4b..7cc3c1431731 100644
--- a/lib/msun/src/catrigl.c
+++ b/lib/msun/src/catrigl.c
@@ -40,8 +40,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 
diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c
index 6623355baa7c..275d0ebb7756 100644
--- a/lib/msun/src/e_acos.c
+++ b/lib/msun/src/e_acos.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* acos(x)
  * Method :                  
  *	acos(x)  = pi/2 - asin(x)
diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c
index 64f1c5afb182..29f6d4a78495 100644
--- a/lib/msun/src/e_acosf.c
+++ b/lib/msun/src/e_acosf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c
index 7947995820d0..d50f5513ee59 100644
--- a/lib/msun/src/e_acosh.c
+++ b/lib/msun/src/e_acosh.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* acosh(x)
  * Method :
  *	Based on 
diff --git a/lib/msun/src/e_acoshf.c b/lib/msun/src/e_acoshf.c
index 781ccf2a1151..df12609671cf 100644
--- a/lib/msun/src/e_acoshf.c
+++ b/lib/msun/src/e_acoshf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_acoshl.c b/lib/msun/src/e_acoshl.c
index b9f3aed67e63..8f3d3963e7cf 100644
--- a/lib/msun/src/e_acoshl.c
+++ b/lib/msun/src/e_acoshl.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See e_acosh.c for complete comments.
  *
diff --git a/lib/msun/src/e_acosl.c b/lib/msun/src/e_acosl.c
index d33c8fedab8a..524fa756a103 100644
--- a/lib/msun/src/e_acosl.c
+++ b/lib/msun/src/e_acosl.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See comments in e_acos.c.
  * Converted to long double by David Schultz <das@FreeBSD.ORG>.
diff --git a/lib/msun/src/e_asin.c b/lib/msun/src/e_asin.c
index fa180ab5701b..ae6e496850e1 100644
--- a/lib/msun/src/e_asin.c
+++ b/lib/msun/src/e_asin.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* asin(x)
  * Method :                  
  *	Since  asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ...
diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c
index db4b9b6034f7..391c15870f84 100644
--- a/lib/msun/src/e_asinf.c
+++ b/lib/msun/src/e_asinf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_asinl.c b/lib/msun/src/e_asinl.c
index a85765f1bf56..d0cff2f536fa 100644
--- a/lib/msun/src/e_asinl.c
+++ b/lib/msun/src/e_asinl.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See comments in e_asin.c.
  * Converted to long double by David Schultz <das@FreeBSD.ORG>.
diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c
index 0b2e72102edb..f4d3ed2e00db 100644
--- a/lib/msun/src/e_atan2.c
+++ b/lib/msun/src/e_atan2.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* atan2(y,x)
  * Method :
  *	1. Reduce y to positive by atan2(y,x)=-atan2(-y,x).
diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c
index 4ea001df974a..af8c00851476 100644
--- a/lib/msun/src/e_atan2f.c
+++ b/lib/msun/src/e_atan2f.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_atan2l.c b/lib/msun/src/e_atan2l.c
index 94ebdec54322..722334f76791 100644
--- a/lib/msun/src/e_atan2l.c
+++ b/lib/msun/src/e_atan2l.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See comments in e_atan2.c.
  * Converted to long double by David Schultz <das@FreeBSD.ORG>.
diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c
index 41f3bcaca26d..3eabaaf82403 100644
--- a/lib/msun/src/e_atanh.c
+++ b/lib/msun/src/e_atanh.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* atanh(x)
  * Method :
  *    1.Reduced x to positive by atanh(-x) = -atanh(x)
diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c
index 46643beb5ab0..134513e5b817 100644
--- a/lib/msun/src/e_atanhf.c
+++ b/lib/msun/src/e_atanhf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_atanhl.c b/lib/msun/src/e_atanhl.c
index 11d56ea52e7f..66a301f52ab6 100644
--- a/lib/msun/src/e_atanhl.c
+++ b/lib/msun/src/e_atanhl.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See e_atanh.c for complete comments.
  *
diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c
index 071663eb4e15..56ec7d56093d 100644
--- a/lib/msun/src/e_cosh.c
+++ b/lib/msun/src/e_cosh.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* cosh(x)
  * Method : 
  * mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2
diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c
index 1673315d7b31..8c5457e24a51 100644
--- a/lib/msun/src/e_coshf.c
+++ b/lib/msun/src/e_coshf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_coshl.c b/lib/msun/src/e_coshl.c
index 4e3b28311e79..de54b8183bbb 100644
--- a/lib/msun/src/e_coshl.c
+++ b/lib/msun/src/e_coshl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See e_cosh.c for complete comments.
  *
diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c
index 59da39217391..afbcdb3db7b6 100644
--- a/lib/msun/src/e_exp.c
+++ b/lib/msun/src/e_exp.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* exp(x)
  * Returns the exponential of x.
  *
diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c
index 620d341be274..2dbce9dd870d 100644
--- a/lib/msun/src/e_expf.c
+++ b/lib/msun/src/e_expf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c
index 6d5f5332cb85..fdfb56c2a475 100644
--- a/lib/msun/src/e_fmod.c
+++ b/lib/msun/src/e_fmod.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* 
  * fmod(x,y)
  * Return x mod y in exact arithmetic
diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c
index 3cef9213c1e5..0e6633fbe739 100644
--- a/lib/msun/src/e_fmodf.c
+++ b/lib/msun/src/e_fmodf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * fmodf(x,y)
  * Return x mod y in exact arithmetic
diff --git a/lib/msun/src/e_fmodl.c b/lib/msun/src/e_fmodl.c
index ad3bcc34c9a2..8a348ee117e7 100644
--- a/lib/msun/src/e_fmodl.c
+++ b/lib/msun/src/e_fmodl.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <stdint.h>
 
diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c
index a13f3e22c08b..7757337b59af 100644
--- a/lib/msun/src/e_gamma.c
+++ b/lib/msun/src/e_gamma.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* gamma(x)
  * Return the logarithm of the Gamma function of x.
  *
diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c
index 2d996cabca20..f204685c3f7a 100644
--- a/lib/msun/src/e_gamma_r.c
+++ b/lib/msun/src/e_gamma_r.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* gamma_r(x, signgamp)
  * Reentrant version of the logarithm of the Gamma function 
  * with user provide pointer for the sign of Gamma(x). 
diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c
index 563c1482282d..3afef79de53a 100644
--- a/lib/msun/src/e_gammaf.c
+++ b/lib/msun/src/e_gammaf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* gammaf(x)
  * Return the logarithm of the Gamma function of x.
  *
diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c
index d7fc2db1e96c..5b3bd535aa42 100644
--- a/lib/msun/src/e_gammaf_r.c
+++ b/lib/msun/src/e_gammaf_r.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* gammaf_r(x, signgamp)
  * Reentrant version of the logarithm of the Gamma function
  * with user provide pointer for the sign of Gamma(x).
diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c
index 8e3f9317b3a6..8d9c2b11dd97 100644
--- a/lib/msun/src/e_hypot.c
+++ b/lib/msun/src/e_hypot.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* hypot(x,y)
  *
  * Method :                  
diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c
index a3b8c866697b..c976fd33014d 100644
--- a/lib/msun/src/e_hypotf.c
+++ b/lib/msun/src/e_hypotf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_hypotl.c b/lib/msun/src/e_hypotl.c
index fc43538dfa65..0a89e3a0e218 100644
--- a/lib/msun/src/e_hypotl.c
+++ b/lib/msun/src/e_hypotl.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* long double version of hypot().  See e_hypot.c for most comments. */
 
 #include <float.h>
diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c
index c43ab6996b4a..20e0d36b162e 100644
--- a/lib/msun/src/e_j0.c
+++ b/lib/msun/src/e_j0.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* j0(x), y0(x)
  * Bessel function of the first and second kinds of order zero.
  * Method -- j0(x):
diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c
index 290be04fc900..1cb318d80851 100644
--- a/lib/msun/src/e_j0f.c
+++ b/lib/msun/src/e_j0f.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See e_j0.c for complete comments.
  */
diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c
index ee3f6fcc69d4..7c7812325cc2 100644
--- a/lib/msun/src/e_j1.c
+++ b/lib/msun/src/e_j1.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* j1(x), y1(x)
  * Bessel function of the first and second kinds of order zero.
  * Method -- j1(x):
diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c
index e1f4498b71af..c022557c4d6b 100644
--- a/lib/msun/src/e_j1f.c
+++ b/lib/msun/src/e_j1f.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See e_j1.c for complete comments.
  */
diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c
index 6b876ce69554..9735b03429ff 100644
--- a/lib/msun/src/e_jn.c
+++ b/lib/msun/src/e_jn.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * jn(n, x), yn(n, x)
  * floating point Bessel's function of the 1st and 2nd kind
diff --git a/lib/msun/src/e_jnf.c b/lib/msun/src/e_jnf.c
index ba586226dae5..2eadaa1cc07b 100644
--- a/lib/msun/src/e_jnf.c
+++ b/lib/msun/src/e_jnf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See e_jn.c for complete comments.
  */
diff --git a/lib/msun/src/e_lgamma.c b/lib/msun/src/e_lgamma.c
index 9c4a30e6e135..1d74db1c6af8 100644
--- a/lib/msun/src/e_lgamma.c
+++ b/lib/msun/src/e_lgamma.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* lgamma(x)
  * Return the logarithm of the Gamma function of x.
  *
diff --git a/lib/msun/src/e_lgamma_r.c b/lib/msun/src/e_lgamma_r.c
index c020b638e7c7..38efe4385631 100644
--- a/lib/msun/src/e_lgamma_r.c
+++ b/lib/msun/src/e_lgamma_r.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* lgamma_r(x, signgamp)
  * Reentrant version of the logarithm of the Gamma function
  * with user provide pointer for the sign of Gamma(x).
diff --git a/lib/msun/src/e_lgammaf.c b/lib/msun/src/e_lgammaf.c
index 00a816c35c37..b3073557c92d 100644
--- a/lib/msun/src/e_lgammaf.c
+++ b/lib/msun/src/e_lgammaf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* lgammaf(x)
  * Return the logarithm of the Gamma function of x.
  *
diff --git a/lib/msun/src/e_lgammaf_r.c b/lib/msun/src/e_lgammaf_r.c
index fdd23218e58d..86f554f3bd38 100644
--- a/lib/msun/src/e_lgammaf_r.c
+++ b/lib/msun/src/e_lgammaf_r.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_lgammal.c b/lib/msun/src/e_lgammal.c
index ebc2fc78cbb1..c45a62a7268e 100644
--- a/lib/msun/src/e_lgammal.c
+++ b/lib/msun/src/e_lgammal.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_log.c b/lib/msun/src/e_log.c
index 03ce82061375..5dff93c66c5e 100644
--- a/lib/msun/src/e_log.c
+++ b/lib/msun/src/e_log.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* log(x)
  * Return the logrithm of x
  *
diff --git a/lib/msun/src/e_log10.c b/lib/msun/src/e_log10.c
index 595c23808941..89efd791265d 100644
--- a/lib/msun/src/e_log10.c
+++ b/lib/msun/src/e_log10.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * Return the base 10 logarithm of x.  See e_log.c and k_log.h for most
  * comments.
diff --git a/lib/msun/src/e_log10f.c b/lib/msun/src/e_log10f.c
index d0c3a53c88ea..f240d14fca27 100644
--- a/lib/msun/src/e_log10f.c
+++ b/lib/msun/src/e_log10f.c
@@ -10,8 +10,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * Float version of e_log10.c.  See the latter for most comments.
  */
diff --git a/lib/msun/src/e_log2.c b/lib/msun/src/e_log2.c
index 10b1c00d50de..eb099171f669 100644
--- a/lib/msun/src/e_log2.c
+++ b/lib/msun/src/e_log2.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * Return the base 2 logarithm of x.  See e_log.c and k_log.h for most
  * comments.
diff --git a/lib/msun/src/e_log2f.c b/lib/msun/src/e_log2f.c
index 956f33a344a0..7c1b5c032bdc 100644
--- a/lib/msun/src/e_log2f.c
+++ b/lib/msun/src/e_log2f.c
@@ -10,8 +10,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * Float version of e_log2.c.  See the latter for most comments.
  */
diff --git a/lib/msun/src/e_logf.c b/lib/msun/src/e_logf.c
index 68a4d5d88342..2bbdd068591c 100644
--- a/lib/msun/src/e_logf.c
+++ b/lib/msun/src/e_logf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_pow.c b/lib/msun/src/e_pow.c
index adc64c99852f..8b62c49abe4a 100644
--- a/lib/msun/src/e_pow.c
+++ b/lib/msun/src/e_pow.c
@@ -10,8 +10,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* pow(x,y) return x**y
  *
  *		      n
diff --git a/lib/msun/src/e_powf.c b/lib/msun/src/e_powf.c
index f5a2c70c7c26..ff872ab46327 100644
--- a/lib/msun/src/e_powf.c
+++ b/lib/msun/src/e_powf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_rem_pio2.c b/lib/msun/src/e_rem_pio2.c
index 47b651351a8c..ef4107af94cb 100644
--- a/lib/msun/src/e_rem_pio2.c
+++ b/lib/msun/src/e_rem_pio2.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* __ieee754_rem_pio2(x,y)
  * 
  * return the remainder of x rem pi/2 in y[0]+y[1] 
diff --git a/lib/msun/src/e_rem_pio2f.c b/lib/msun/src/e_rem_pio2f.c
index 597f6139f248..26f6bc85791b 100644
--- a/lib/msun/src/e_rem_pio2f.c
+++ b/lib/msun/src/e_rem_pio2f.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* __ieee754_rem_pio2f(x,y)
  *
  * return the remainder of x rem pi/2 in *y
diff --git a/lib/msun/src/e_remainder.c b/lib/msun/src/e_remainder.c
index 13156d8cbc65..bd1ce8950619 100644
--- a/lib/msun/src/e_remainder.c
+++ b/lib/msun/src/e_remainder.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* remainder(x,p)
  * Return :                  
  * 	returns  x REM p  =  x - [x/p]*p as if in infinite 
diff --git a/lib/msun/src/e_remainderf.c b/lib/msun/src/e_remainderf.c
index e0dcfd181dfd..053ae45c4a10 100644
--- a/lib/msun/src/e_remainderf.c
+++ b/lib/msun/src/e_remainderf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_remainderl.c b/lib/msun/src/e_remainderl.c
index 229567334567..4606cf874d75 100644
--- a/lib/msun/src/e_remainderl.c
+++ b/lib/msun/src/e_remainderl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <math.h>
 
 long double
diff --git a/lib/msun/src/e_scalb.c b/lib/msun/src/e_scalb.c
index 84a68939b836..8a38ddb68d81 100644
--- a/lib/msun/src/e_scalb.c
+++ b/lib/msun/src/e_scalb.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * scalb(x, fn) is provide for
  * passing various standard test suite. One 
diff --git a/lib/msun/src/e_scalbf.c b/lib/msun/src/e_scalbf.c
index 28483a5e2826..ca94a9fb1634 100644
--- a/lib/msun/src/e_scalbf.c
+++ b/lib/msun/src/e_scalbf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_sinh.c b/lib/msun/src/e_sinh.c
index 9fe89996a098..b19a4a2f7d48 100644
--- a/lib/msun/src/e_sinh.c
+++ b/lib/msun/src/e_sinh.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* sinh(x)
  * Method : 
  * mathematically sinh(x) if defined to be (exp(x)-exp(-x))/2
diff --git a/lib/msun/src/e_sinhf.c b/lib/msun/src/e_sinhf.c
index 082beb14fb14..7aa177b69f11 100644
--- a/lib/msun/src/e_sinhf.c
+++ b/lib/msun/src/e_sinhf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/e_sinhl.c b/lib/msun/src/e_sinhl.c
index 38d3df195969..121bace1d6c1 100644
--- a/lib/msun/src/e_sinhl.c
+++ b/lib/msun/src/e_sinhl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See e_sinh.c for complete comments.
  *
diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c
index 5460dd0dbddd..ea588c97f5d1 100644
--- a/lib/msun/src/e_sqrt.c
+++ b/lib/msun/src/e_sqrt.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/e_sqrtl.c b/lib/msun/src/e_sqrtl.c
index 67c777f960d7..beb4e7a9c948 100644
--- a/lib/msun/src/e_sqrtl.c
+++ b/lib/msun/src/e_sqrtl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 
diff --git a/lib/msun/src/k_cos.c b/lib/msun/src/k_cos.c
index c4702e65b282..8cc9a0e83efe 100644
--- a/lib/msun/src/k_cos.c
+++ b/lib/msun/src/k_cos.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * __kernel_cos( x,  y )
  * kernel cos function on [-pi/4, pi/4], pi/4 ~ 0.785398164
diff --git a/lib/msun/src/k_cosf.c b/lib/msun/src/k_cosf.c
index f7a2c0ae15c2..a93011b52c0d 100644
--- a/lib/msun/src/k_cosf.c
+++ b/lib/msun/src/k_cosf.c
@@ -16,7 +16,6 @@
 
 #ifndef INLINE_KERNEL_COSDF
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_exp.c b/lib/msun/src/k_exp.c
index 1b86cd6852d3..ce8e3591827a 100644
--- a/lib/msun/src/k_exp.c
+++ b/lib/msun/src/k_exp.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 
 #include "math.h"
diff --git a/lib/msun/src/k_expf.c b/lib/msun/src/k_expf.c
index 7071632c35c8..61478214e736 100644
--- a/lib/msun/src/k_expf.c
+++ b/lib/msun/src/k_expf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 
 #include "math.h"
diff --git a/lib/msun/src/k_log.h b/lib/msun/src/k_log.h
index aaff8bd9000e..f15227139324 100644
--- a/lib/msun/src/k_log.h
+++ b/lib/msun/src/k_log.h
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * k_log1p(f):
  * Return log(1+f) - f for 1+f in ~[sqrt(2)/2, sqrt(2)].
diff --git a/lib/msun/src/k_logf.h b/lib/msun/src/k_logf.h
index 71c547e888ae..3f637cd6a9ec 100644
--- a/lib/msun/src/k_logf.h
+++ b/lib/msun/src/k_logf.h
@@ -10,8 +10,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * Float version of k_log.h.  See the latter for most comments.
  */
diff --git a/lib/msun/src/k_rem_pio2.c b/lib/msun/src/k_rem_pio2.c
index 0a717f768428..952bebb6ed2d 100644
--- a/lib/msun/src/k_rem_pio2.c
+++ b/lib/msun/src/k_rem_pio2.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * __kernel_rem_pio2(x,y,e0,nx,prec)
  * double x[],y[]; int e0,nx,prec;
diff --git a/lib/msun/src/k_sin.c b/lib/msun/src/k_sin.c
index 12ee8c143a5d..6d24a0f21d92 100644
--- a/lib/msun/src/k_sin.c
+++ b/lib/msun/src/k_sin.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* __kernel_sin( x, y, iy)
  * kernel sin function on ~[-pi/4, pi/4] (except on -0), pi/4 ~ 0.7854
  * Input x is assumed to be bounded by ~pi/4 in magnitude.
diff --git a/lib/msun/src/k_sincos.h b/lib/msun/src/k_sincos.h
index 6f03be29776a..a29a57c06342 100644
--- a/lib/msun/src/k_sincos.h
+++ b/lib/msun/src/k_sincos.h
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 static const double
 S1  = -1.66666666666666324348e-01, /* 0xBFC55555, 0x55555549 */
 S2  =  8.33333333332248946124e-03, /* 0x3F811111, 0x1110F8A6 */
diff --git a/lib/msun/src/k_sincosf.h b/lib/msun/src/k_sincosf.h
index 073986db8818..01f5d48b23ee 100644
--- a/lib/msun/src/k_sincosf.h
+++ b/lib/msun/src/k_sincosf.h
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* |sin(x)/x - s(x)| < 2**-37.5 (~[-4.89e-12, 4.824e-12]). */
 static const double
 S1 = -0x15555554cbac77.0p-55,	/* -0.166666666416265235595 */
diff --git a/lib/msun/src/k_sincosl.h b/lib/msun/src/k_sincosl.h
index 6425f14a1ea0..918d49f54f54 100644
--- a/lib/msun/src/k_sincosl.h
+++ b/lib/msun/src/k_sincosl.h
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #if LDBL_MANT_DIG == 64		/* ld80 version of k_sincosl.c. */
 
 #if defined(__amd64__) || defined(__i386__)
diff --git a/lib/msun/src/k_sinf.c b/lib/msun/src/k_sinf.c
index 0841759b17f7..ef547e36bf50 100644
--- a/lib/msun/src/k_sinf.c
+++ b/lib/msun/src/k_sinf.c
@@ -16,7 +16,6 @@
 
 #ifndef INLINE_KERNEL_SINDF
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/k_tan.c b/lib/msun/src/k_tan.c
index 2e86c3bf6488..5ebcddda09e6 100644
--- a/lib/msun/src/k_tan.c
+++ b/lib/msun/src/k_tan.c
@@ -12,8 +12,6 @@
 
 /* INDENT OFF */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* __kernel_tan( x, y, k )
  * kernel tan function on ~[-pi/4, pi/4] (except on -0), pi/4 ~ 0.7854
  * Input x is assumed to be bounded by ~pi/4 in magnitude.
diff --git a/lib/msun/src/k_tanf.c b/lib/msun/src/k_tanf.c
index 5be14458b80c..6ab7be71e323 100644
--- a/lib/msun/src/k_tanf.c
+++ b/lib/msun/src/k_tanf.c
@@ -15,7 +15,6 @@
 
 #ifndef INLINE_KERNEL_TANDF
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 #endif
 
 #include "math.h"
diff --git a/lib/msun/src/s_asinh.c b/lib/msun/src/s_asinh.c
index a1b9169bef99..a8bad118f6b3 100644
--- a/lib/msun/src/s_asinh.c
+++ b/lib/msun/src/s_asinh.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* asinh(x)
  * Method :
  *	Based on
diff --git a/lib/msun/src/s_asinhf.c b/lib/msun/src/s_asinhf.c
index 72bcefed9343..822b0187ad09 100644
--- a/lib/msun/src/s_asinhf.c
+++ b/lib/msun/src/s_asinhf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_asinhl.c b/lib/msun/src/s_asinhl.c
index ba28f599c3ca..d80405821ff4 100644
--- a/lib/msun/src/s_asinhl.c
+++ b/lib/msun/src/s_asinhl.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See s_asinh.c for complete comments.
  *
diff --git a/lib/msun/src/s_atan.c b/lib/msun/src/s_atan.c
index 566f5dc7b99b..d2bfacf52ab6 100644
--- a/lib/msun/src/s_atan.c
+++ b/lib/msun/src/s_atan.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* atan(x)
  * Method
  *   1. Reduce x to positive by atan(x) = -atan(-x).
diff --git a/lib/msun/src/s_atanf.c b/lib/msun/src/s_atanf.c
index b3a371f3712e..30666fe0b66a 100644
--- a/lib/msun/src/s_atanf.c
+++ b/lib/msun/src/s_atanf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_atanl.c b/lib/msun/src/s_atanl.c
index ff29c3ce8a18..b85cb131035f 100644
--- a/lib/msun/src/s_atanl.c
+++ b/lib/msun/src/s_atanl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See comments in s_atan.c.
  * Converted to long double by David Schultz <das@FreeBSD.ORG>.
diff --git a/lib/msun/src/s_carg.c b/lib/msun/src/s_carg.c
index f203198ecbc7..45714bbdb18a 100644
--- a/lib/msun/src/s_carg.c
+++ b/lib/msun/src/s_carg.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_cargf.c b/lib/msun/src/s_cargf.c
index 6ea487cdb88d..c4d53006b542 100644
--- a/lib/msun/src/s_cargf.c
+++ b/lib/msun/src/s_cargf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_cargl.c b/lib/msun/src/s_cargl.c
index ba3943822f66..d7f8206e9608 100644
--- a/lib/msun/src/s_cargl.c
+++ b/lib/msun/src/s_cargl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_cbrt.c b/lib/msun/src/s_cbrt.c
index 4353d340a1ac..afb601bf0fb6 100644
--- a/lib/msun/src/s_cbrt.c
+++ b/lib/msun/src/s_cbrt.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include "math.h"
 #include "math_private.h"
diff --git a/lib/msun/src/s_cbrtf.c b/lib/msun/src/s_cbrtf.c
index 454f97484b7b..f013e1f1eb6f 100644
--- a/lib/msun/src/s_cbrtf.c
+++ b/lib/msun/src/s_cbrtf.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_cbrtl.c b/lib/msun/src/s_cbrtl.c
index b15c96ecde03..3ed939cccf92 100644
--- a/lib/msun/src/s_cbrtl.c
+++ b/lib/msun/src/s_cbrtl.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #ifdef __i386__
 #include <ieeefp.h>
diff --git a/lib/msun/src/s_ccosh.c b/lib/msun/src/s_ccosh.c
index 0fd9206da349..95ed3a32ddd7 100644
--- a/lib/msun/src/s_ccosh.c
+++ b/lib/msun/src/s_ccosh.c
@@ -39,8 +39,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_ccoshf.c b/lib/msun/src/s_ccoshf.c
index 2db840362bad..ba97a390c832 100644
--- a/lib/msun/src/s_ccoshf.c
+++ b/lib/msun/src/s_ccoshf.c
@@ -31,8 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_ceil.c b/lib/msun/src/s_ceil.c
index 929f813de0a2..9c041b2a94e1 100644
--- a/lib/msun/src/s_ceil.c
+++ b/lib/msun/src/s_ceil.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ceil(x)
  * Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_ceilf.c b/lib/msun/src/s_ceilf.c
index 23bfe04e89a9..3cb0e11688bf 100644
--- a/lib/msun/src/s_ceilf.c
+++ b/lib/msun/src/s_ceilf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_ceill.c b/lib/msun/src/s_ceill.c
index 2d1045fe60d1..28c0881e8da6 100644
--- a/lib/msun/src/s_ceill.c
+++ b/lib/msun/src/s_ceill.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * ceill(x)
  * Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_cexp.c b/lib/msun/src/s_cexp.c
index 8db763d9f8ee..056d273f6932 100644
--- a/lib/msun/src/s_cexp.c
+++ b/lib/msun/src/s_cexp.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/src/s_cexpf.c b/lib/msun/src/s_cexpf.c
index 7247301704e3..872e9253daa5 100644
--- a/lib/msun/src/s_cexpf.c
+++ b/lib/msun/src/s_cexpf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_clog.c b/lib/msun/src/s_clog.c
index 8150fa7f8bce..e51ff5230e45 100644
--- a/lib/msun/src/s_clog.c
+++ b/lib/msun/src/s_clog.c
@@ -25,8 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 
diff --git a/lib/msun/src/s_clogf.c b/lib/msun/src/s_clogf.c
index 19a94453ea37..761f91b12efa 100644
--- a/lib/msun/src/s_clogf.c
+++ b/lib/msun/src/s_clogf.c
@@ -25,8 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 
diff --git a/lib/msun/src/s_clogl.c b/lib/msun/src/s_clogl.c
index e59a1377afd8..78244961df5c 100644
--- a/lib/msun/src/s_clogl.c
+++ b/lib/msun/src/s_clogl.c
@@ -25,8 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 #ifdef __i386__
diff --git a/lib/msun/src/s_copysign.c b/lib/msun/src/s_copysign.c
index a5f3870e6261..2a9923a2480a 100644
--- a/lib/msun/src/s_copysign.c
+++ b/lib/msun/src/s_copysign.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * copysign(double x, double y)
  * copysign(x,y) returns a value with the magnitude of x and
diff --git a/lib/msun/src/s_copysignf.c b/lib/msun/src/s_copysignf.c
index 05ca1e368d89..a35b07ccbb5b 100644
--- a/lib/msun/src/s_copysignf.c
+++ b/lib/msun/src/s_copysignf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * copysignf(float x, float y)
  * copysignf(x,y) returns a value with the magnitude of x and
diff --git a/lib/msun/src/s_cos.c b/lib/msun/src/s_cos.c
index 29804f4cb6cb..97f72a15ce4d 100644
--- a/lib/msun/src/s_cos.c
+++ b/lib/msun/src/s_cos.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* cos(x)
  * Return cosine function of x.
  *
diff --git a/lib/msun/src/s_cosf.c b/lib/msun/src/s_cosf.c
index b701fd27ac57..a0ba8598f7e6 100644
--- a/lib/msun/src/s_cosf.c
+++ b/lib/msun/src/s_cosf.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_cosl.c b/lib/msun/src/s_cosl.c
index 6f0b36f479e6..00c24ce13d12 100644
--- a/lib/msun/src/s_cosl.c
+++ b/lib/msun/src/s_cosl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * Limited testing on pseudorandom numbers drawn within [-2e8:4e8] shows
  * an accuracy of <= 0.7412 ULP.
diff --git a/lib/msun/src/s_cpow.c b/lib/msun/src/s_cpow.c
index cdc57bd4677d..735d38956380 100644
--- a/lib/msun/src/s_cpow.c
+++ b/lib/msun/src/s_cpow.c
@@ -44,8 +44,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/src/s_cpowf.c b/lib/msun/src/s_cpowf.c
index aeb773b02e31..aefcd7619de1 100644
--- a/lib/msun/src/s_cpowf.c
+++ b/lib/msun/src/s_cpowf.c
@@ -44,8 +44,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 #include "math_private.h"
diff --git a/lib/msun/src/s_cpowl.c b/lib/msun/src/s_cpowl.c
index 5d43b55a7b68..342dfcff8481 100644
--- a/lib/msun/src/s_cpowl.c
+++ b/lib/msun/src/s_cpowl.c
@@ -44,8 +44,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 #include "math_private.h"
diff --git a/lib/msun/src/s_cproj.c b/lib/msun/src/s_cproj.c
index 5b0d4ed0636c..75cb083baf17 100644
--- a/lib/msun/src/s_cproj.c
+++ b/lib/msun/src/s_cproj.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/src/s_cprojf.c b/lib/msun/src/s_cprojf.c
index 0d76e75c70fc..aadc5ef35cbd 100644
--- a/lib/msun/src/s_cprojf.c
+++ b/lib/msun/src/s_cprojf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_cprojl.c b/lib/msun/src/s_cprojl.c
index 7fc35d212f5c..78e3e9a6fdca 100644
--- a/lib/msun/src/s_cprojl.c
+++ b/lib/msun/src/s_cprojl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_csinh.c b/lib/msun/src/s_csinh.c
index b3928ce87eb2..1bd78b1e49bf 100644
--- a/lib/msun/src/s_csinh.c
+++ b/lib/msun/src/s_csinh.c
@@ -39,8 +39,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_csinhf.c b/lib/msun/src/s_csinhf.c
index a8d6f2d1da59..b1f333955e53 100644
--- a/lib/msun/src/s_csinhf.c
+++ b/lib/msun/src/s_csinhf.c
@@ -31,8 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_csqrt.c b/lib/msun/src/s_csqrt.c
index d96c34446f1f..afac4db17b61 100644
--- a/lib/msun/src/s_csqrt.c
+++ b/lib/msun/src/s_csqrt.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/src/s_csqrtf.c b/lib/msun/src/s_csqrtf.c
index e3ef4d0f65a7..ece9f6c13657 100644
--- a/lib/msun/src/s_csqrtf.c
+++ b/lib/msun/src/s_csqrtf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_csqrtl.c b/lib/msun/src/s_csqrtl.c
index d5641337d036..b0fc37c902f1 100644
--- a/lib/msun/src/s_csqrtl.c
+++ b/lib/msun/src/s_csqrtl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/src/s_ctanh.c b/lib/msun/src/s_ctanh.c
index aa4e10c749a3..33186510a8a3 100644
--- a/lib/msun/src/s_ctanh.c
+++ b/lib/msun/src/s_ctanh.c
@@ -66,8 +66,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_ctanhf.c b/lib/msun/src/s_ctanhf.c
index e9ebe4f01037..c2fb2f8618f6 100644
--- a/lib/msun/src/s_ctanhf.c
+++ b/lib/msun/src/s_ctanhf.c
@@ -31,8 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_erf.c b/lib/msun/src/s_erf.c
index ab2dc19058bd..6fc9e56d11af 100644
--- a/lib/msun/src/s_erf.c
+++ b/lib/msun/src/s_erf.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* double erf(double x)
  * double erfc(double x)
  *			     x
diff --git a/lib/msun/src/s_erff.c b/lib/msun/src/s_erff.c
index d6cfbd227678..bf011b312bfb 100644
--- a/lib/msun/src/s_erff.c
+++ b/lib/msun/src/s_erff.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_exp2.c b/lib/msun/src/s_exp2.c
index 1dd9673dcc75..5bf9d65975e0 100644
--- a/lib/msun/src/s_exp2.c
+++ b/lib/msun/src/s_exp2.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_exp2f.c b/lib/msun/src/s_exp2f.c
index c5b4c8e60e28..f94cfaf9ce96 100644
--- a/lib/msun/src/s_exp2f.c
+++ b/lib/msun/src/s_exp2f.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_expm1.c b/lib/msun/src/s_expm1.c
index 844f10360fe6..154a5d8148a5 100644
--- a/lib/msun/src/s_expm1.c
+++ b/lib/msun/src/s_expm1.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* expm1(x)
  * Returns exp(x)-1, the exponential of x minus 1.
  *
diff --git a/lib/msun/src/s_expm1f.c b/lib/msun/src/s_expm1f.c
index b47daac2eb35..831c0caa6db8 100644
--- a/lib/msun/src/s_expm1f.c
+++ b/lib/msun/src/s_expm1f.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_fabs.c b/lib/msun/src/s_fabs.c
index 48aab252db3c..ec071d481ac6 100644
--- a/lib/msun/src/s_fabs.c
+++ b/lib/msun/src/s_fabs.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * fabs(x) returns the absolute value of x.
  */
diff --git a/lib/msun/src/s_fabsf.c b/lib/msun/src/s_fabsf.c
index e9383d0db37c..501676253385 100644
--- a/lib/msun/src/s_fabsf.c
+++ b/lib/msun/src/s_fabsf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * fabsf(x) returns the absolute value of x.
  */
diff --git a/lib/msun/src/s_fdim.c b/lib/msun/src/s_fdim.c
index b81dbacbfce0..580ab4605f92 100644
--- a/lib/msun/src/s_fdim.c
+++ b/lib/msun/src/s_fdim.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <math.h>
 
 #define	DECL(type, fn)			\
diff --git a/lib/msun/src/s_finite.c b/lib/msun/src/s_finite.c
index 4c5135290a45..c6b1cfa6d111 100644
--- a/lib/msun/src/s_finite.c
+++ b/lib/msun/src/s_finite.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * finite(x) returns 1 is x is finite, else 0;
  * no branching!
diff --git a/lib/msun/src/s_finitef.c b/lib/msun/src/s_finitef.c
index c62239e44515..94e527257c06 100644
--- a/lib/msun/src/s_finitef.c
+++ b/lib/msun/src/s_finitef.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * finitef(x) returns 1 is x is finite, else 0;
  * no branching!
diff --git a/lib/msun/src/s_floor.c b/lib/msun/src/s_floor.c
index 65f696a1578d..1746cf27f016 100644
--- a/lib/msun/src/s_floor.c
+++ b/lib/msun/src/s_floor.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * floor(x)
  * Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_floorf.c b/lib/msun/src/s_floorf.c
index 6b510dee3a80..145a50321046 100644
--- a/lib/msun/src/s_floorf.c
+++ b/lib/msun/src/s_floorf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * floorf(x)
  * Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_floorl.c b/lib/msun/src/s_floorl.c
index 6cec3e781cd2..ee9a391ffe41 100644
--- a/lib/msun/src/s_floorl.c
+++ b/lib/msun/src/s_floorl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * floorl(x)
  * Return x rounded toward -inf to integral value
diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c
index 2fd7075a7f5a..0788bb2d47e8 100644
--- a/lib/msun/src/s_fma.c
+++ b/lib/msun/src/s_fma.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/src/s_fmaf.c b/lib/msun/src/s_fmaf.c
index ae979cb4a0af..c433f523fe08 100644
--- a/lib/msun/src/s_fmaf.c
+++ b/lib/msun/src/s_fmaf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c
index a0622a295531..0d5e2c0bc98f 100644
--- a/lib/msun/src/s_fmal.c
+++ b/lib/msun/src/s_fmal.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/src/s_fmax.c b/lib/msun/src/s_fmax.c
index 42bd11c426d0..aca4e0585cdd 100644
--- a/lib/msun/src/s_fmax.c
+++ b/lib/msun/src/s_fmax.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_fmaxf.c b/lib/msun/src/s_fmaxf.c
index 10667d382798..8684fb6bb68c 100644
--- a/lib/msun/src/s_fmaxf.c
+++ b/lib/msun/src/s_fmaxf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <math.h>
 
 #include "fpmath.h"
diff --git a/lib/msun/src/s_fmaxl.c b/lib/msun/src/s_fmaxl.c
index bf42587824d5..d0c1a806bdaf 100644
--- a/lib/msun/src/s_fmaxl.c
+++ b/lib/msun/src/s_fmaxl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <math.h>
 
 #include "fpmath.h"
diff --git a/lib/msun/src/s_fmin.c b/lib/msun/src/s_fmin.c
index e79071d2faa7..aa67d161ec34 100644
--- a/lib/msun/src/s_fmin.c
+++ b/lib/msun/src/s_fmin.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_fminf.c b/lib/msun/src/s_fminf.c
index 19ffd4289467..01e52d9becdc 100644
--- a/lib/msun/src/s_fminf.c
+++ b/lib/msun/src/s_fminf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <math.h>
 
 #include "fpmath.h"
diff --git a/lib/msun/src/s_fminl.c b/lib/msun/src/s_fminl.c
index c906f1d3eb6c..f79a08d6c774 100644
--- a/lib/msun/src/s_fminl.c
+++ b/lib/msun/src/s_fminl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <math.h>
 
 #include "fpmath.h"
diff --git a/lib/msun/src/s_frexp.c b/lib/msun/src/s_frexp.c
index 318a99166878..ee234d247300 100644
--- a/lib/msun/src/s_frexp.c
+++ b/lib/msun/src/s_frexp.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * for non-zero x
  *	x = frexp(arg,&exp);
diff --git a/lib/msun/src/s_frexpf.c b/lib/msun/src/s_frexpf.c
index 5a7c4862d28d..6b39e6ff8b2b 100644
--- a/lib/msun/src/s_frexpf.c
+++ b/lib/msun/src/s_frexpf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_ilogb.c b/lib/msun/src/s_ilogb.c
index a930bc9eccc7..0b076edbd9b5 100644
--- a/lib/msun/src/s_ilogb.c
+++ b/lib/msun/src/s_ilogb.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* ilogb(double x)
  * return the binary exponent of non-zero x
  * ilogb(0) = FP_ILOGB0
diff --git a/lib/msun/src/s_ilogbf.c b/lib/msun/src/s_ilogbf.c
index 93fe2958bdd9..ff3df1fc5b90 100644
--- a/lib/msun/src/s_ilogbf.c
+++ b/lib/msun/src/s_ilogbf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <limits.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_ilogbl.c b/lib/msun/src/s_ilogbl.c
index 3211f44090a2..f45cd7b67159 100644
--- a/lib/msun/src/s_ilogbl.c
+++ b/lib/msun/src/s_ilogbl.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <limits.h>
 #include <math.h>
diff --git a/lib/msun/src/s_llrint.c b/lib/msun/src/s_llrint.c
index 7c959ec950ae..460c4a07d5e3 100644
--- a/lib/msun/src/s_llrint.c
+++ b/lib/msun/src/s_llrint.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		double
 #define	roundit		rint
 #define dtype		long long
diff --git a/lib/msun/src/s_llrintf.c b/lib/msun/src/s_llrintf.c
index 7ec6015238d3..3ed16799f47f 100644
--- a/lib/msun/src/s_llrintf.c
+++ b/lib/msun/src/s_llrintf.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		float
 #define	roundit		rintf
 #define dtype		long long
diff --git a/lib/msun/src/s_llrintl.c b/lib/msun/src/s_llrintl.c
index 6ef83759c314..fed23f32fd6f 100644
--- a/lib/msun/src/s_llrintl.c
+++ b/lib/msun/src/s_llrintl.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		long double
 #define	roundit		rintl
 #define dtype		long long
diff --git a/lib/msun/src/s_llround.c b/lib/msun/src/s_llround.c
index 827dfc1f6367..f8e76134b654 100644
--- a/lib/msun/src/s_llround.c
+++ b/lib/msun/src/s_llround.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		double
 #define	roundit		round
 #define dtype		long long
diff --git a/lib/msun/src/s_llroundf.c b/lib/msun/src/s_llroundf.c
index c037a18d5708..753fd96265aa 100644
--- a/lib/msun/src/s_llroundf.c
+++ b/lib/msun/src/s_llroundf.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		float
 #define	roundit		roundf
 #define dtype		long long
diff --git a/lib/msun/src/s_llroundl.c b/lib/msun/src/s_llroundl.c
index 02c44eb4bdec..b5a97d97f2ae 100644
--- a/lib/msun/src/s_llroundl.c
+++ b/lib/msun/src/s_llroundl.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		long double
 #define	roundit		roundl
 #define dtype		long long
diff --git a/lib/msun/src/s_log1p.c b/lib/msun/src/s_log1p.c
index 3cc77bda2ec8..61b03f00f33b 100644
--- a/lib/msun/src/s_log1p.c
+++ b/lib/msun/src/s_log1p.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* double log1p(double x)
  *
  * Method :
diff --git a/lib/msun/src/s_log1pf.c b/lib/msun/src/s_log1pf.c
index df04c6756e8d..d53fc7144e1d 100644
--- a/lib/msun/src/s_log1pf.c
+++ b/lib/msun/src/s_log1pf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_logb.c b/lib/msun/src/s_logb.c
index a47e35489a4b..b5ffff4fd11a 100644
--- a/lib/msun/src/s_logb.c
+++ b/lib/msun/src/s_logb.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * double logb(x)
  * IEEE 754 logb. Included to pass IEEE test suite. Not recommend.
diff --git a/lib/msun/src/s_logbf.c b/lib/msun/src/s_logbf.c
index 3ab190d9862f..658c7d3a15c3 100644
--- a/lib/msun/src/s_logbf.c
+++ b/lib/msun/src/s_logbf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_logbl.c b/lib/msun/src/s_logbl.c
index ee1a91fd8385..280c302ac014 100644
--- a/lib/msun/src/s_logbl.c
+++ b/lib/msun/src/s_logbl.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <limits.h>
 #include <math.h>
diff --git a/lib/msun/src/s_lrint.c b/lib/msun/src/s_lrint.c
index be00cbb6a91a..f4e56ac34b69 100644
--- a/lib/msun/src/s_lrint.c
+++ b/lib/msun/src/s_lrint.c
@@ -31,7 +31,6 @@
 #include <math.h>
 
 #ifndef type
-__FBSDID("$FreeBSD$");
 #define type		double
 #define	roundit		rint
 #define dtype		long
diff --git a/lib/msun/src/s_lrintf.c b/lib/msun/src/s_lrintf.c
index a757ded233a3..ca7cb99a3cf2 100644
--- a/lib/msun/src/s_lrintf.c
+++ b/lib/msun/src/s_lrintf.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		float
 #define	roundit		rintf
 #define dtype		long
diff --git a/lib/msun/src/s_lrintl.c b/lib/msun/src/s_lrintl.c
index 497b442f32d7..7eedbc707c6e 100644
--- a/lib/msun/src/s_lrintl.c
+++ b/lib/msun/src/s_lrintl.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		long double
 #define	roundit		rintl
 #define dtype		long
diff --git a/lib/msun/src/s_lround.c b/lib/msun/src/s_lround.c
index 00f4b95aeb89..0b305918adc3 100644
--- a/lib/msun/src/s_lround.c
+++ b/lib/msun/src/s_lround.c
@@ -32,7 +32,6 @@
 #include <math.h>
 
 #ifndef type
-__FBSDID("$FreeBSD$");
 #define type		double
 #define	roundit		round
 #define dtype		long
diff --git a/lib/msun/src/s_lroundf.c b/lib/msun/src/s_lroundf.c
index e24fe7f81902..e27e6a2fe187 100644
--- a/lib/msun/src/s_lroundf.c
+++ b/lib/msun/src/s_lroundf.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		float
 #define	roundit		roundf
 #define dtype		long
diff --git a/lib/msun/src/s_lroundl.c b/lib/msun/src/s_lroundl.c
index e410827e2622..cfd43bc7fbf1 100644
--- a/lib/msun/src/s_lroundl.c
+++ b/lib/msun/src/s_lroundl.c
@@ -1,6 +1,4 @@
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #define type		long double
 #define	roundit		roundl
 #define dtype		long
diff --git a/lib/msun/src/s_modff.c b/lib/msun/src/s_modff.c
index 062259c66f64..57f59117a878 100644
--- a/lib/msun/src/s_modff.c
+++ b/lib/msun/src/s_modff.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_nearbyint.c b/lib/msun/src/s_nearbyint.c
index ae6ffdecd474..96604594c499 100644
--- a/lib/msun/src/s_nearbyint.c
+++ b/lib/msun/src/s_nearbyint.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_nextafter.c b/lib/msun/src/s_nextafter.c
index 52dd21cb2f9c..99c65b11aeba 100644
--- a/lib/msun/src/s_nextafter.c
+++ b/lib/msun/src/s_nextafter.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* IEEE functions
  *	nextafter(x,y)
  *	return the next machine floating-point number of x in the
diff --git a/lib/msun/src/s_nextafterf.c b/lib/msun/src/s_nextafterf.c
index 96e21eff896e..18e046324957 100644
--- a/lib/msun/src/s_nextafterf.c
+++ b/lib/msun/src/s_nextafterf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_nextafterl.c b/lib/msun/src/s_nextafterl.c
index 9c61a436a661..168dbb4ed093 100644
--- a/lib/msun/src/s_nextafterl.c
+++ b/lib/msun/src/s_nextafterl.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* IEEE functions
  *	nextafter(x,y)
  *	return the next machine floating-point number of x in the
diff --git a/lib/msun/src/s_nexttoward.c b/lib/msun/src/s_nexttoward.c
index b2a50d3139de..d876ba2bfebc 100644
--- a/lib/msun/src/s_nexttoward.c
+++ b/lib/msun/src/s_nexttoward.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * We assume that a long double has a 15-bit exponent.  On systems
  * where long double is the same as double, nexttoward() is an alias
diff --git a/lib/msun/src/s_nexttowardf.c b/lib/msun/src/s_nexttowardf.c
index 9ddfff961bff..03d8cc5e4729 100644
--- a/lib/msun/src/s_nexttowardf.c
+++ b/lib/msun/src/s_nexttowardf.c
@@ -10,8 +10,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "fpmath.h"
diff --git a/lib/msun/src/s_remquo.c b/lib/msun/src/s_remquo.c
index 6a111dfc6e10..e3aac25230e0 100644
--- a/lib/msun/src/s_remquo.c
+++ b/lib/msun/src/s_remquo.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_remquof.c b/lib/msun/src/s_remquof.c
index f4c101620682..c42bd8c4320d 100644
--- a/lib/msun/src/s_remquof.c
+++ b/lib/msun/src/s_remquof.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_remquol.c b/lib/msun/src/s_remquol.c
index a9f5813d0424..a0f93d4fcae0 100644
--- a/lib/msun/src/s_remquol.c
+++ b/lib/msun/src/s_remquol.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <stdint.h>
 
diff --git a/lib/msun/src/s_rint.c b/lib/msun/src/s_rint.c
index c56f8fb264ba..96faf6a007ee 100644
--- a/lib/msun/src/s_rint.c
+++ b/lib/msun/src/s_rint.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * rint(x)
  * Return x rounded to integral value according to the prevailing
diff --git a/lib/msun/src/s_rintf.c b/lib/msun/src/s_rintf.c
index f8743a4f0f81..328738f0ba0c 100644
--- a/lib/msun/src/s_rintf.c
+++ b/lib/msun/src/s_rintf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <stdint.h>
 
diff --git a/lib/msun/src/s_rintl.c b/lib/msun/src/s_rintl.c
index 790edbcf6204..15bce02e219d 100644
--- a/lib/msun/src/s_rintl.c
+++ b/lib/msun/src/s_rintl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <math.h>
 
diff --git a/lib/msun/src/s_round.c b/lib/msun/src/s_round.c
index a112bc592392..04d49c220973 100644
--- a/lib/msun/src/s_round.c
+++ b/lib/msun/src/s_round.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_roundf.c b/lib/msun/src/s_roundf.c
index bb6f77c78c34..795d88df3050 100644
--- a/lib/msun/src/s_roundf.c
+++ b/lib/msun/src/s_roundf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_roundl.c b/lib/msun/src/s_roundl.c
index 9e85423a54ea..05cb3e9f4918 100644
--- a/lib/msun/src/s_roundl.c
+++ b/lib/msun/src/s_roundl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #ifdef __i386__
 #include <ieeefp.h>
diff --git a/lib/msun/src/s_scalbln.c b/lib/msun/src/s_scalbln.c
index e8c637793f44..ff402b0f8fab 100644
--- a/lib/msun/src/s_scalbln.c
+++ b/lib/msun/src/s_scalbln.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <math.h>
 
 #define	NMAX	65536
diff --git a/lib/msun/src/s_significand.c b/lib/msun/src/s_significand.c
index eed80ece1cc4..29ff0cc29807 100644
--- a/lib/msun/src/s_significand.c
+++ b/lib/msun/src/s_significand.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * significand(x) computes just
  * 	scalb(x, (double) -ilogb(x)),
diff --git a/lib/msun/src/s_significandf.c b/lib/msun/src/s_significandf.c
index b33ab7b6f6b2..9fd919d65a91 100644
--- a/lib/msun/src/s_significandf.c
+++ b/lib/msun/src/s_significandf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_sin.c b/lib/msun/src/s_sin.c
index 17ea84695d75..e9cd928d300b 100644
--- a/lib/msun/src/s_sin.c
+++ b/lib/msun/src/s_sin.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* sin(x)
  * Return sine function of x.
  *
diff --git a/lib/msun/src/s_sincos.c b/lib/msun/src/s_sincos.c
index 85e8d740829b..028ce416280a 100644
--- a/lib/msun/src/s_sincos.c
+++ b/lib/msun/src/s_sincos.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_sincosf.c b/lib/msun/src/s_sincosf.c
index 755ff05d481d..ee9f03444944 100644
--- a/lib/msun/src/s_sincosf.c
+++ b/lib/msun/src/s_sincosf.c
@@ -16,8 +16,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_sincosl.c b/lib/msun/src/s_sincosl.c
index 3dd34575f894..2d3833c93d46 100644
--- a/lib/msun/src/s_sincosl.c
+++ b/lib/msun/src/s_sincosl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #ifdef __i386__
 #include <ieeefp.h>
diff --git a/lib/msun/src/s_sinf.c b/lib/msun/src/s_sinf.c
index 41b5dc11827a..9837e80bb6ff 100644
--- a/lib/msun/src/s_sinf.c
+++ b/lib/msun/src/s_sinf.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_sinl.c b/lib/msun/src/s_sinl.c
index c5ee10679b92..605a4b4b6272 100644
--- a/lib/msun/src/s_sinl.c
+++ b/lib/msun/src/s_sinl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #ifdef __i386__
 #include <ieeefp.h>
diff --git a/lib/msun/src/s_tan.c b/lib/msun/src/s_tan.c
index 196c27e7ce36..be5154e89468 100644
--- a/lib/msun/src/s_tan.c
+++ b/lib/msun/src/s_tan.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* tan(x)
  * Return tangent function of x.
  *
diff --git a/lib/msun/src/s_tanf.c b/lib/msun/src/s_tanf.c
index 4fe8c17c0acd..1b72cd6cae91 100644
--- a/lib/msun/src/s_tanf.c
+++ b/lib/msun/src/s_tanf.c
@@ -15,8 +15,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 
 #include "math.h"
diff --git a/lib/msun/src/s_tanh.c b/lib/msun/src/s_tanh.c
index 6d26c695dd3b..1dbd1d4630eb 100644
--- a/lib/msun/src/s_tanh.c
+++ b/lib/msun/src/s_tanh.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /* Tanh(x)
  * Return the Hyperbolic Tangent of x
  *
diff --git a/lib/msun/src/s_tanhf.c b/lib/msun/src/s_tanhf.c
index f537be4fd0be..986404f52f5a 100644
--- a/lib/msun/src/s_tanhf.c
+++ b/lib/msun/src/s_tanhf.c
@@ -14,8 +14,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"
 
diff --git a/lib/msun/src/s_tanhl.c b/lib/msun/src/s_tanhl.c
index b7531866dd99..3ee5b50bd2c8 100644
--- a/lib/msun/src/s_tanhl.c
+++ b/lib/msun/src/s_tanhl.c
@@ -13,8 +13,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * See s_tanh.c for complete comments.
  *
diff --git a/lib/msun/src/s_tanl.c b/lib/msun/src/s_tanl.c
index c21e38d7f712..1e9d7263c289 100644
--- a/lib/msun/src/s_tanl.c
+++ b/lib/msun/src/s_tanl.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * Limited testing on pseudorandom numbers drawn within [0:4e8] shows
  * an accuracy of <= 1.5 ULP where 247024 values of x out of 40 million
diff --git a/lib/msun/src/s_tgammaf.c b/lib/msun/src/s_tgammaf.c
index 6cbd356a87c1..3bf937ce958d 100644
--- a/lib/msun/src/s_tgammaf.c
+++ b/lib/msun/src/s_tgammaf.c
@@ -27,8 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <math.h>
 
 /*
diff --git a/lib/msun/src/s_trunc.c b/lib/msun/src/s_trunc.c
index 63a6753748e0..4bd1249544ea 100644
--- a/lib/msun/src/s_trunc.c
+++ b/lib/msun/src/s_trunc.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * trunc(x)
  * Return x rounded toward 0 to integral value
diff --git a/lib/msun/src/s_truncf.c b/lib/msun/src/s_truncf.c
index 384eaee55006..8d15c78d69da 100644
--- a/lib/msun/src/s_truncf.c
+++ b/lib/msun/src/s_truncf.c
@@ -11,8 +11,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * truncf(x)
  * Return x rounded toward 0 to integral value
diff --git a/lib/msun/src/s_truncl.c b/lib/msun/src/s_truncl.c
index 9e2b51132535..f54608ac7ab0 100644
--- a/lib/msun/src/s_truncl.c
+++ b/lib/msun/src/s_truncl.c
@@ -12,8 +12,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
  * truncl(x)
  * Return x rounded toward 0 to integral value
diff --git a/lib/msun/src/w_cabs.c b/lib/msun/src/w_cabs.c
index 543b8581044d..dfae649b9906 100644
--- a/lib/msun/src/w_cabs.c
+++ b/lib/msun/src/w_cabs.c
@@ -6,8 +6,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/src/w_cabsl.c b/lib/msun/src/w_cabsl.c
index b715e0c340d8..943413c31106 100644
--- a/lib/msun/src/w_cabsl.c
+++ b/lib/msun/src/w_cabsl.c
@@ -8,8 +8,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <math.h>
 
diff --git a/lib/msun/tests/cexp_test.c b/lib/msun/tests/cexp_test.c
index bb5b45b38492..a23e448ee62a 100644
--- a/lib/msun/tests/cexp_test.c
+++ b/lib/msun/tests/cexp_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 
 #include <complex.h>
diff --git a/lib/msun/tests/conj_test.c b/lib/msun/tests/conj_test.c
index d0256c13b229..313f284925c3 100644
--- a/lib/msun/tests/conj_test.c
+++ b/lib/msun/tests/conj_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <complex.h>
 #include <fenv.h>
 #include <math.h>
diff --git a/lib/msun/tests/csqrt_test.c b/lib/msun/tests/csqrt_test.c
index 895aec481b60..1154c0fc016a 100644
--- a/lib/msun/tests/csqrt_test.c
+++ b/lib/msun/tests/csqrt_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 
 #include <complex.h>
diff --git a/lib/msun/tests/ctrig_test.c b/lib/msun/tests/ctrig_test.c
index f5d52a0c06f1..dd03d11fdbd1 100644
--- a/lib/msun/tests/ctrig_test.c
+++ b/lib/msun/tests/ctrig_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <complex.h>
 #include <fenv.h>
diff --git a/lib/msun/tests/exponential_test.c b/lib/msun/tests/exponential_test.c
index 280f3e483d06..9dc3b2698744 100644
--- a/lib/msun/tests/exponential_test.c
+++ b/lib/msun/tests/exponential_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/tests/fenv_test.c b/lib/msun/tests/fenv_test.c
index 7750764406d7..9069921d8eaf 100644
--- a/lib/msun/tests/fenv_test.c
+++ b/lib/msun/tests/fenv_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <assert.h>
diff --git a/lib/msun/tests/fma_test.c b/lib/msun/tests/fma_test.c
index 2855877c68d0..e6a34e0f2afa 100644
--- a/lib/msun/tests/fma_test.c
+++ b/lib/msun/tests/fma_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <fenv.h>
 #include <float.h>
diff --git a/lib/msun/tests/fmaxmin_test.c b/lib/msun/tests/fmaxmin_test.c
index 12d845b76395..51956b1084af 100644
--- a/lib/msun/tests/fmaxmin_test.c
+++ b/lib/msun/tests/fmaxmin_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/tests/invctrig_test.c b/lib/msun/tests/invctrig_test.c
index 179499f9f0b2..170fb1cad3a3 100644
--- a/lib/msun/tests/invctrig_test.c
+++ b/lib/msun/tests/invctrig_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <complex.h>
 #include <fenv.h>
diff --git a/lib/msun/tests/invtrig_test.c b/lib/msun/tests/invtrig_test.c
index 90ebcc5dfdad..8c6fdb7c6e2f 100644
--- a/lib/msun/tests/invtrig_test.c
+++ b/lib/msun/tests/invtrig_test.c
@@ -31,8 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/tests/logarithm_test.c b/lib/msun/tests/logarithm_test.c
index e372e889cb82..9da4ad3ba407 100644
--- a/lib/msun/tests/logarithm_test.c
+++ b/lib/msun/tests/logarithm_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <fenv.h>
 #include <float.h>
diff --git a/lib/msun/tests/lrint_test.c b/lib/msun/tests/lrint_test.c
index a2a93180e97e..29ba82222642 100644
--- a/lib/msun/tests/lrint_test.c
+++ b/lib/msun/tests/lrint_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <limits.h>
 #include <math.h>
diff --git a/lib/msun/tests/lround_test.c b/lib/msun/tests/lround_test.c
index ddb2b2cea9b3..a61672617081 100644
--- a/lib/msun/tests/lround_test.c
+++ b/lib/msun/tests/lround_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <limits.h>
 #include <math.h>
diff --git a/lib/msun/tests/nan_test.c b/lib/msun/tests/nan_test.c
index 8913596f6e15..75c28d45fb78 100644
--- a/lib/msun/tests/nan_test.c
+++ b/lib/msun/tests/nan_test.c
@@ -30,8 +30,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <fenv.h>
 #include <float.h>
diff --git a/lib/msun/tests/nearbyint_test.c b/lib/msun/tests/nearbyint_test.c
index 25950eedd5d0..9dcdbdf6b852 100644
--- a/lib/msun/tests/nearbyint_test.c
+++ b/lib/msun/tests/nearbyint_test.c
@@ -33,8 +33,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <fenv.h>
 #include <math.h>
diff --git a/lib/msun/tests/next_test.c b/lib/msun/tests/next_test.c
index 763b1cc14e60..282e47d783a0 100644
--- a/lib/msun/tests/next_test.c
+++ b/lib/msun/tests/next_test.c
@@ -29,8 +29,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <fenv.h>
 #include <float.h>
 #include <math.h>
diff --git a/lib/msun/tests/rem_test.c b/lib/msun/tests/rem_test.c
index 96c3822aba9d..9e5b8c302948 100644
--- a/lib/msun/tests/rem_test.c
+++ b/lib/msun/tests/rem_test.c
@@ -31,8 +31,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <math.h>
 #include <stdio.h>
diff --git a/lib/msun/tests/trig_test.c b/lib/msun/tests/trig_test.c
index 2660c3f2c476..d1d831e07c71 100644
--- a/lib/msun/tests/trig_test.c
+++ b/lib/msun/tests/trig_test.c
@@ -34,8 +34,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 
 #include <fenv.h>