diff --git a/fuzz/magic_fuzzer.c b/fuzz/magic_fuzzer.c
index 4aa219a5..ff7861b4 100644
--- a/fuzz/magic_fuzzer.c
+++ b/fuzz/magic_fuzzer.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,11 +28,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: magic_fuzzer.c,v 1.2 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: magic_fuzzer.c,v 1.3 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/apprentice.c b/src/apprentice.c
index 2ed4ae34..ca930042 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -34,11 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: apprentice.c,v 1.332 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: apprentice.c,v 1.333 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/apptype.c b/src/apptype.c
index 13f24c01..74c52d6d 100644
--- a/src/apptype.c
+++ b/src/apptype.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Adapted from: apptype.c, Written by Eberhard Mattes and put into the
  * public domain
@@ -29,11 +27,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: apptype.c,v 1.15 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: apptype.c,v 1.16 2022/09/24 20:30:13 christos Exp $")
 #endif /* lint */
 
 #include <stdlib.h>
diff --git a/src/ascmagic.c b/src/ascmagic.c
index bd48bedd..18d3b882 100644
--- a/src/ascmagic.c
+++ b/src/ascmagic.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -37,11 +35,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: ascmagic.c,v 1.111 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: ascmagic.c,v 1.112 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/asctime_r.c b/src/asctime_r.c
index 416ef522..c76ca693 100644
--- a/src/asctime_r.c
+++ b/src/asctime_r.c
@@ -1,14 +1,8 @@
-/*	$NetBSD$	*/
-
-/*	$File: asctime_r.c,v 1.2 2022/09/24 20:22:21 christos Exp $	*/
+/*	$File: asctime_r.c,v 1.3 2022/09/24 20:30:13 christos Exp $	*/
 
 #include "file.h"
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: asctime_r.c,v 1.2 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: asctime_r.c,v 1.3 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 #include <time.h>
 #include <string.h>
diff --git a/src/asprintf.c b/src/asprintf.c
index 10eb5a0e..ae84ab9c 100644
--- a/src/asprintf.c
+++ b/src/asprintf.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -31,11 +29,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: asprintf.c,v 1.6 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: asprintf.c,v 1.7 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 int asprintf(char **ptr, const char *fmt, ...)
diff --git a/src/buffer.c b/src/buffer.c
index f68c12db..ac9fd155 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Christos Zoulas 2017.
  * All Rights Reserved.
@@ -29,11 +27,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: buffer.c,v 1.9 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: buffer.c,v 1.10 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/cdf.c b/src/cdf.c
index 241b843b..36a6031e 100644
--- a/src/cdf.c
+++ b/src/cdf.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*-
  * Copyright (c) 2008 Christos Zoulas
  * All rights reserved.
@@ -37,11 +35,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: cdf.c,v 1.122 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: cdf.c,v 1.123 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include <assert.h>
diff --git a/src/cdf.h b/src/cdf.h
index dcc652be..05056668 100644
--- a/src/cdf.h
+++ b/src/cdf.h
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*-
  * Copyright (c) 2008 Christos Zoulas
  * All rights reserved.
diff --git a/src/cdf_time.c b/src/cdf_time.c
index b3440714..63a68fed 100644
--- a/src/cdf_time.c
+++ b/src/cdf_time.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*-
  * Copyright (c) 2008 Christos Zoulas
  * All rights reserved.
@@ -29,11 +27,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: cdf_time.c,v 1.22 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: cdf_time.c,v 1.23 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include <time.h>
diff --git a/src/compress.c b/src/compress.c
index d1db37bd..3dbb6f02 100644
--- a/src/compress.c
+++ b/src/compress.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -37,11 +35,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: compress.c,v 1.148 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: compress.c,v 1.149 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include "magic.h"
diff --git a/src/ctime_r.c b/src/ctime_r.c
index 97b00080..60ff1c51 100644
--- a/src/ctime_r.c
+++ b/src/ctime_r.c
@@ -1,14 +1,8 @@
-/*	$NetBSD$	*/
-
-/*	$File: ctime_r.c,v 1.2 2022/09/24 20:22:21 christos Exp $	*/
+/*	$File: ctime_r.c,v 1.3 2022/09/24 20:30:13 christos Exp $	*/
 
 #include "file.h"
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: ctime_r.c,v 1.2 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: ctime_r.c,v 1.3 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 #include <time.h>
 #include <string.h>
diff --git a/src/der.c b/src/der.c
index 7c03b7e8..3a036517 100644
--- a/src/der.c
+++ b/src/der.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*-
  * Copyright (c) 2016 Christos Zoulas
  * All rights reserved.
@@ -37,11 +35,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: der.c,v 1.26 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: der.c,v 1.27 2022/09/24 20:30:13 christos Exp $")
 #endif
 #else
 #define SIZE_T_FORMAT "z"
diff --git a/src/der.h b/src/der.h
index 279e01a5..33332392 100644
--- a/src/der.h
+++ b/src/der.h
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*-
  * Copyright (c) 2016 Christos Zoulas
  * All rights reserved.
diff --git a/src/dprintf.c b/src/dprintf.c
index eea799ee..1b29dae1 100644
--- a/src/dprintf.c
+++ b/src/dprintf.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -30,11 +28,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: dprintf.c,v 1.3 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: dprintf.c,v 1.4 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include <assert.h>
diff --git a/src/elfclass.h b/src/elfclass.h
index 6fbad84d..936d8dc9 100644
--- a/src/elfclass.h
+++ b/src/elfclass.h
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Christos Zoulas 2008.
  * All Rights Reserved.
diff --git a/src/encoding.c b/src/encoding.c
index 660d1fd7..0aea1236 100644
--- a/src/encoding.c
+++ b/src/encoding.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -37,11 +35,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: encoding.c,v 1.40 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: encoding.c,v 1.41 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/file.c b/src/file.c
index 2edec958..cb9845a7 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -34,11 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: file.c,v 1.206 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: file.c,v 1.207 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/file.h b/src/file.h
index aa4ba5fc..359a12a9 100644
--- a/src/file.h
+++ b/src/file.h
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -29,7 +27,7 @@
  */
 /*
  * file.h - definitions for file(1) program
- * @(#)$File: file.h,v 1.238 2022/09/24 20:22:21 christos Exp $
+ * @(#)$File: file.h,v 1.239 2022/09/24 20:30:13 christos Exp $
  */
 
 #ifndef __file_h__
diff --git a/src/file_opts.h b/src/file_opts.h
index e510b27f..6d137441 100644
--- a/src/file_opts.h
+++ b/src/file_opts.h
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Table of command-line options
  *
diff --git a/src/fmtcheck.c b/src/fmtcheck.c
index 119a9f2d..868d06fd 100644
--- a/src/fmtcheck.c
+++ b/src/fmtcheck.c
@@ -1,6 +1,4 @@
-/*	$NetBSD$	*/
-
-/*	NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp 	*/
+/*	$NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,11 +30,7 @@
 
 #include "file.h"
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: fmtcheck.c,v 1.5 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: fmtcheck.c,v 1.6 2022/09/24 20:30:13 christos Exp $")
 #endif /* lint */
 
 #include <stdio.h>
diff --git a/src/fsmagic.c b/src/fsmagic.c
index 47501e6b..14e247e6 100644
--- a/src/fsmagic.c
+++ b/src/fsmagic.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -34,11 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: fsmagic.c,v 1.83 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: fsmagic.c,v 1.84 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/funcs.c b/src/funcs.c
index eec61c53..35193099 100644
--- a/src/funcs.c
+++ b/src/funcs.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Christos Zoulas 2003.
  * All Rights Reserved.
@@ -29,11 +27,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: funcs.c,v 1.133 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: funcs.c,v 1.134 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/getline.c b/src/getline.c
index 7cacbd6a..b00de01b 100644
--- a/src/getline.c
+++ b/src/getline.c
@@ -1,6 +1,4 @@
-/*	$NetBSD$	*/
-
-/*	NetBSD: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp 	*/
+/*	$NetBSD: getline.c,v 1.2 2014/09/16 17:23:50 christos Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
diff --git a/src/getopt_long.c b/src/getopt_long.c
index afd1e891..cae754b9 100644
--- a/src/getopt_long.c
+++ b/src/getopt_long.c
@@ -1,6 +1,4 @@
-/*	$NetBSD$	*/
-
-/*	NetBSD: getopt_long.c,v 1.21.4.1 2008/01/09 01:34:14 matt Exp 	*/
+/*	$NetBSD: getopt_long.c,v 1.21.4.1 2008/01/09 01:34:14 matt Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,11 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: getopt_long.c,v 1.8 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: getopt_long.c,v 1.9 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include <assert.h>
diff --git a/src/gmtime_r.c b/src/gmtime_r.c
index f0a8e262..29e9662b 100644
--- a/src/gmtime_r.c
+++ b/src/gmtime_r.c
@@ -1,14 +1,8 @@
-/*	$NetBSD$	*/
-
-/*	$File: gmtime_r.c,v 1.3 2022/09/24 20:22:21 christos Exp $	*/
+/*	$File: gmtime_r.c,v 1.4 2022/09/24 20:30:13 christos Exp $	*/
 
 #include "file.h"
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: gmtime_r.c,v 1.3 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: gmtime_r.c,v 1.4 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 #include <time.h>
 #include <string.h>
diff --git a/src/is_csv.c b/src/is_csv.c
index a64ae1f5..597d7756 100644
--- a/src/is_csv.c
+++ b/src/is_csv.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*-
  * Copyright (c) 2019 Christos Zoulas
  * All rights reserved.
@@ -34,11 +32,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: is_csv.c,v 1.9 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: is_csv.c,v 1.10 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include <string.h>
diff --git a/src/is_json.c b/src/is_json.c
index d9a5b850..d01b020d 100644
--- a/src/is_json.c
+++ b/src/is_json.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*-
  * Copyright (c) 2018 Christos Zoulas
  * All rights reserved.
@@ -34,11 +32,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: is_json.c,v 1.28 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: is_json.c,v 1.29 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include "magic.h"
diff --git a/src/is_tar.c b/src/is_tar.c
index 810b9946..c45facc8 100644
--- a/src/is_tar.c
+++ b/src/is_tar.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -42,11 +40,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: is_tar.c,v 1.48 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: is_tar.c,v 1.49 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include "magic.h"
diff --git a/src/localtime_r.c b/src/localtime_r.c
index f816c61c..8d3032a5 100644
--- a/src/localtime_r.c
+++ b/src/localtime_r.c
@@ -1,14 +1,8 @@
-/*	$NetBSD$	*/
-
-/*	$File: localtime_r.c,v 1.3 2022/09/24 20:22:21 christos Exp $	*/
+/*	$File: localtime_r.c,v 1.4 2022/09/24 20:30:13 christos Exp $	*/
 
 #include "file.h"
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: localtime_r.c,v 1.3 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: localtime_r.c,v 1.4 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 #include <time.h>
 #include <string.h>
diff --git a/src/magic.c b/src/magic.c
index 8305d9e6..916eea23 100644
--- a/src/magic.c
+++ b/src/magic.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Christos Zoulas 2003.
  * All Rights Reserved.
@@ -35,11 +33,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: magic.c,v 1.118 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: magic.c,v 1.119 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/memtest.c b/src/memtest.c
index 62330916..da0f10bd 100644
--- a/src/memtest.c
+++ b/src/memtest.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Christos Zoulas 2021.
  * All Rights Reserved.
@@ -29,11 +27,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: memtest.c,v 1.5 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: memtest.c,v 1.6 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include <sys/types.h>
diff --git a/src/mygetopt.h b/src/mygetopt.h
index 922527e7..d7667626 100644
--- a/src/mygetopt.h
+++ b/src/mygetopt.h
@@ -1,6 +1,4 @@
-/*	$NetBSD$	*/
-
-/*	NetBSD: getopt.h,v 1.8 2007/11/06 19:21:18 christos Exp 	*/
+/*	$NetBSD: getopt.h,v 1.8 2007/11/06 19:21:18 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/src/pread.c b/src/pread.c
index e2cbdec0..dfaad3b0 100644
--- a/src/pread.c
+++ b/src/pread.c
@@ -1,12 +1,6 @@
-/*	$NetBSD$	*/
-
 #include "file.h"
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: pread.c,v 1.4 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: pread.c,v 1.5 2022/09/24 20:30:13 christos Exp $")
 #endif  /* lint */
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/print.c b/src/print.c
index 3ca51e20..bf1887e0 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -34,11 +32,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: print.c,v 1.94 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: print.c,v 1.95 2022/09/24 20:30:13 christos Exp $")
 #endif  /* lint */
 
 #include <string.h>
diff --git a/src/readcdf.c b/src/readcdf.c
index f848c01f..b631723a 100644
--- a/src/readcdf.c
+++ b/src/readcdf.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*-
  * Copyright (c) 2008, 2016 Christos Zoulas
  * All rights reserved.
@@ -28,11 +26,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: readcdf.c,v 1.77 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: readcdf.c,v 1.78 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include <assert.h>
diff --git a/src/readelf.c b/src/readelf.c
index 769bac68..7c55b8b0 100644
--- a/src/readelf.c
+++ b/src/readelf.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Christos Zoulas 2003.
  * All Rights Reserved.
@@ -29,11 +27,7 @@
 #include "file.h"
 
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: readelf.c,v 1.185 2022/09/24 20:22:21 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: readelf.c,v 1.186 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #ifdef BUILTIN_ELF
diff --git a/src/readelf.h b/src/readelf.h
index 7ff65b72..809d3f75 100644
--- a/src/readelf.h
+++ b/src/readelf.h
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Christos Zoulas 2003.
  * All Rights Reserved.
diff --git a/src/seccomp.c b/src/seccomp.c
index f49d4057..70d9b104 100644
--- a/src/seccomp.c
+++ b/src/seccomp.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,11 +27,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: seccomp.c,v 1.23 2022/09/24 20:22:22 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: seccomp.c,v 1.24 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #if HAVE_LIBSECCOMP
diff --git a/src/softmagic.c b/src/softmagic.c
index e7bb3d5b..99ef302a 100644
--- a/src/softmagic.c
+++ b/src/softmagic.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -34,11 +32,7 @@
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: softmagic.c,v 1.330 2022/09/24 20:22:22 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: softmagic.c,v 1.331 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include "magic.h"
diff --git a/src/strcasestr.c b/src/strcasestr.c
index 009ae0bc..3db407f3 100644
--- a/src/strcasestr.c
+++ b/src/strcasestr.c
@@ -1,6 +1,4 @@
-/*	$NetBSD$	*/
-
-/*	NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp 	*/
+/*	$NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -35,8 +33,8 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp ");
-__RCSID("NetBSD: strncasecmp.c,v 1.2 2007/06/04 18:19:27 christos Exp ");
+__RCSID("$NetBSD: strcasestr.c,v 1.3 2005/11/29 03:12:00 christos Exp $");
+__RCSID("$NetBSD: strncasecmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "file.h"
diff --git a/src/strlcat.c b/src/strlcat.c
index 590333f1..978340cd 100644
--- a/src/strlcat.c
+++ b/src/strlcat.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
 
 /*
@@ -21,11 +19,7 @@
 /* OPENBSD ORIGINAL: lib/libc/string/strlcat.c */
 #include "file.h"
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: strlcat.c,v 1.4 2022/09/24 20:22:22 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: strlcat.c,v 1.5 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include <sys/types.h>
diff --git a/src/strlcpy.c b/src/strlcpy.c
index a8b5a985..ed1f4ccb 100644
--- a/src/strlcpy.c
+++ b/src/strlcpy.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*	$OpenBSD: strlcpy.c,v 1.10 2005/08/08 08:05:37 espie Exp $	*/
 
 /*
@@ -21,11 +19,7 @@
 /* OPENBSD ORIGINAL: lib/libc/string/strlcpy.c */
 #include "file.h"
 #ifndef lint
-#if 0
-FILE_RCSID("@(#)$File: strlcpy.c,v 1.4 2022/09/24 20:22:22 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: strlcpy.c,v 1.5 2022/09/24 20:30:13 christos Exp $")
 #endif
 
 #include <sys/types.h>
diff --git a/src/tar.h b/src/tar.h
index ed77e226..401757b8 100644
--- a/src/tar.h
+++ b/src/tar.h
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -34,7 +32,7 @@
  *
  * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.
  *
- * $File: tar.h,v 1.14 2022/09/24 20:22:22 christos Exp $ # checkin only
+ * $File: tar.h,v 1.15 2022/09/24 20:30:13 christos Exp $ # checkin only
  */
 
 /*
diff --git a/src/vasprintf.c b/src/vasprintf.c
index 9757a22e..940e8a4a 100644
--- a/src/vasprintf.c
+++ b/src/vasprintf.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -110,11 +108,7 @@ you use strange formats.
 #include "file.h"
 
 #ifndef	lint
-#if 0
-FILE_RCSID("@(#)$File: vasprintf.c,v 1.22 2022/09/24 20:22:22 christos Exp $")
-#else
-__RCSID("$NetBSD$");
-#endif
+FILE_RCSID("@(#)$File: vasprintf.c,v 1.23 2022/09/24 20:30:13 christos Exp $")
 #endif	/* lint */
 
 #include <assert.h>
diff --git a/tests/test.c b/tests/test.c
index 02117708..6c229bc0 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -1,5 +1,3 @@
-/*	$NetBSD$	*/
-
 /*
  * Copyright (c) Christos Zoulas 2003.
  * All Rights Reserved.