diff --git a/sys/ddb/db_access.c b/sys/ddb/db_access.c
index 04de1083bb9..fa61f3dd9ff 100644
--- a/sys/ddb/db_access.c
+++ b/sys/ddb/db_access.c
@@ -22,14 +22,15 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include <ddb/ddb.h>
diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c
index eaa6aecba76..577e338c600 100644
--- a/sys/ddb/db_break.c
+++ b/sys/ddb/db_break.c
@@ -23,9 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
  */
-
 /*
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
@@ -33,6 +31,10 @@
 /*
  * Breakpoints.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_comconsole.h"
 
 #include <sys/param.h>
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 5221fab8faa..ff895c72acf 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -22,18 +22,18 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
-
 /*
  * Command dispatcher.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/linker_set.h>
 #include <sys/lock.h>
diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c
index 70376bbd3b5..3493115a87b 100644
--- a/sys/ddb/db_elf.c
+++ b/sys/ddb/db_elf.c
@@ -1,6 +1,4 @@
-/* $FreeBSD$ */
 /*	$NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $	*/
-
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -38,6 +36,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_ddb.h"
 
 #ifdef DDB_NOKLDSYM
diff --git a/sys/ddb/db_examine.c b/sys/ddb/db_examine.c
index ccc5ebde64d..aa89022cfb4 100644
--- a/sys/ddb/db_examine.c
+++ b/sys/ddb/db_examine.c
@@ -22,15 +22,15 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/ddb/db_expr.c b/sys/ddb/db_expr.c
index eb627e7bf0d..3495a58117c 100644
--- a/sys/ddb/db_expr.c
+++ b/sys/ddb/db_expr.c
@@ -22,14 +22,15 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include <ddb/ddb.h>
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index ce2e694c581..fa66c0f7bae 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -22,15 +22,15 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cons.h>
diff --git a/sys/ddb/db_kld.c b/sys/ddb/db_kld.c
index 903a589671a..b811f210030 100644
--- a/sys/ddb/db_kld.c
+++ b/sys/ddb/db_kld.c
@@ -23,10 +23,8 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
  *	from db_aout.c,v 1.20 1998/06/07 17:09:36 dfr Exp
  */
-
 /*
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
@@ -35,6 +33,9 @@
  * Symbol table routines for kld maintained kernels.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_ddb.h"
 
 #ifndef DDB_NOKLDSYM
diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c
index 63adf2b07d7..b8b2e3b2231 100644
--- a/sys/ddb/db_lex.c
+++ b/sys/ddb/db_lex.c
@@ -22,10 +22,7 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  *	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
@@ -33,6 +30,10 @@
 /*
  * Lexical analyzer.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include <ddb/ddb.h>
diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c
index e82eea64cc1..b1efb45ae01 100644
--- a/sys/ddb/db_output.c
+++ b/sys/ddb/db_output.c
@@ -22,10 +22,7 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  * 	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
@@ -35,6 +32,9 @@
  * Printf and character output for debugger.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cons.h>
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index 06e9f43da65..60282ad0827 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -23,9 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $FreeBSD$
  */
-
 /*
  * 	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
@@ -34,6 +32,10 @@
 /*
  * Miscellaneous printing.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include <ddb/ddb.h>
diff --git a/sys/ddb/db_ps.c b/sys/ddb/db_ps.c
index abc8c33ab68..0b8ae9e4f75 100644
--- a/sys/ddb/db_ps.c
+++ b/sys/ddb/db_ps.c
@@ -29,9 +29,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/lock.h>
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index a1c0387e719..79b148af4f6 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -22,10 +22,7 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  * 	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
@@ -34,6 +31,10 @@
 /*
  * Commands to run process.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include <vm/vm.h>
diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c
index 08eb1c066aa..2ab3ede07f1 100644
--- a/sys/ddb/db_sym.c
+++ b/sys/ddb/db_sym.c
@@ -22,14 +22,15 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  * 	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/ddb/db_sysctl.c b/sys/ddb/db_sysctl.c
index bc00e112c41..a8bb5df8f23 100644
--- a/sys/ddb/db_sysctl.c
+++ b/sys/ddb/db_sysctl.c
@@ -1,4 +1,3 @@
-
 /*
  * db_sysctl.c
  *
@@ -35,10 +34,11 @@
  * OF SUCH DAMAGE.
  *
  * Author: Archie Cobbs <archie@whistle.com>
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c
index 4409007de68..63c92b203c9 100644
--- a/sys/ddb/db_trap.c
+++ b/sys/ddb/db_trap.c
@@ -22,10 +22,7 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  * 	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
@@ -34,6 +31,10 @@
 /*
  * Trap entry point to kernel debugger.
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c
index b985f783d1a..1b283763e17 100644
--- a/sys/ddb/db_variables.c
+++ b/sys/ddb/db_variables.c
@@ -22,15 +22,15 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  * 	Author: David B. Golub, Carnegie Mellon University
  *	Date:	7/90
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index 127e3bb4203..af3e7d51d16 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -22,15 +22,15 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  * 	Author: Richard P. Draves, Carnegie Mellon University
  *	Date:	10/90
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c
index 3da61d35dd9..69353c13183 100644
--- a/sys/ddb/db_write_cmd.c
+++ b/sys/ddb/db_write_cmd.c
@@ -22,15 +22,15 @@
  *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
- *
- * $FreeBSD$
  */
-
 /*
  *	Author: David B. Golub,  Carnegie Mellon University
  *	Date:	7/90
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 
 #include <ddb/ddb.h>