summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-20 14:26:16 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-20 14:26:16 +0200
commit5534c2817ead2a96dc6097970dc7adc5efc76907 (patch)
tree869cb06e32f1e21d92d9f4bf4d88a26d4ceb96a4
parent40ade0886ea5ce98434864ecffe77eb8ccf9f60a (diff)
downloadguile-5534c2817ead2a96dc6097970dc7adc5efc76907.tar.gz
Remove useless "classes: h_files" from Guile headers.
* libguile/__scm.h: * libguile/alist.h: * libguile/array-handle.h: * libguile/array-map.h: * libguile/arrays.h: * libguile/async.h: * libguile/backtrace.h: * libguile/bitvectors.h: * libguile/boolean.h: * libguile/chars.h: * libguile/chooks.h: * libguile/continuations.h: * libguile/debug-malloc.h: * libguile/debug.h: * libguile/deprecation.h: * libguile/dynl.h: * libguile/dynstack.h: * libguile/dynwind.h: * libguile/eq.h: * libguile/error.h: * libguile/eval.h: * libguile/evalext.h: * libguile/expand.h: * libguile/extensions.h: * libguile/feature.h: * libguile/filesys.h: * libguile/fluids.h: * libguile/fports.h: * libguile/gc-inline.h: * libguile/gc.h: * libguile/generalized-arrays.h: * libguile/generalized-vectors.h: * libguile/gettext.h: * libguile/goops.h: * libguile/gsubr.h: * libguile/guardians.h: * libguile/hash.h: * libguile/hashtab.h: * libguile/hooks.h: * libguile/i18n.h: * libguile/init.h: * libguile/inline.h: * libguile/ioext.h: * libguile/iselect.h: * libguile/keywords.h: * libguile/list.h: * libguile/load.h: * libguile/macros.h: * libguile/mallocs.c: * libguile/mallocs.h: * libguile/memoize.h: * libguile/modules.h: * libguile/net_db.h: * libguile/null-threads.h: * libguile/numbers.h: * libguile/objprop.h: * libguile/options.h: * libguile/pairs.h: * libguile/poll.h: * libguile/ports.h: * libguile/posix-w32.h: * libguile/posix.h: * libguile/print.h: * libguile/procprop.h: * libguile/procs.h: * libguile/promises.h: * libguile/pthread-threads.h: * libguile/random.h: * libguile/rdelim.h: * libguile/read.h: * libguile/regex-posix.h: * libguile/rw.h: * libguile/scmsigs.h: * libguile/script.h: * libguile/simpos.h: * libguile/smob.h: * libguile/snarf.h: * libguile/socket.h: * libguile/sort.h: * libguile/srcprop.h: * libguile/stackchk.h: * libguile/stacks.h: * libguile/stime.h: * libguile/strings.h: * libguile/strorder.h: * libguile/strports.h: * libguile/struct.h: * libguile/symbols.h: * libguile/syscalls.h: * libguile/tags.h: * libguile/threads.h: * libguile/throw.h: * libguile/trees.h: * libguile/unicode.h: * libguile/uniform.h: * libguile/values.h: * libguile/variable.h: * libguile/vectors.h: * libguile/vports.h: * libguile/weak-list.h: * libguile/weak-set.h: * libguile/weak-table.h: * libguile/weak-vector.h: Remove "classes: h_files". Reformat copyrights if needed.
-rw-r--r--libguile/__scm.h2
-rw-r--r--libguile/alist.h2
-rw-r--r--libguile/array-handle.h2
-rw-r--r--libguile/array-map.h6
-rw-r--r--libguile/arrays.h2
-rw-r--r--libguile/async.h6
-rw-r--r--libguile/backtrace.h5
-rw-r--r--libguile/bitvectors.h2
-rw-r--r--libguile/boolean.h2
-rw-r--r--libguile/chars.h2
-rw-r--r--libguile/chooks.h2
-rw-r--r--libguile/continuations.h2
-rw-r--r--libguile/debug-malloc.h5
-rw-r--r--libguile/debug.h6
-rw-r--r--libguile/deprecation.h5
-rw-r--r--libguile/dynl.h5
-rw-r--r--libguile/dynstack.h2
-rw-r--r--libguile/dynwind.h5
-rw-r--r--libguile/eq.h5
-rw-r--r--libguile/error.h2
-rw-r--r--libguile/eval.h6
-rw-r--r--libguile/evalext.h5
-rw-r--r--libguile/expand.h2
-rw-r--r--libguile/extensions.h2
-rw-r--r--libguile/feature.h6
-rw-r--r--libguile/filesys.h2
-rw-r--r--libguile/fluids.h2
-rw-r--r--libguile/fports.h2
-rw-r--r--libguile/gc-inline.h6
-rw-r--r--libguile/gc.h2
-rw-r--r--libguile/generalized-arrays.h2
-rw-r--r--libguile/generalized-vectors.h6
-rw-r--r--libguile/gettext.h5
-rw-r--r--libguile/goops.h2
-rw-r--r--libguile/gsubr.h2
-rw-r--r--libguile/guardians.h5
-rw-r--r--libguile/hash.h6
-rw-r--r--libguile/hashtab.h2
-rw-r--r--libguile/hooks.h2
-rw-r--r--libguile/i18n.h5
-rw-r--r--libguile/init.h5
-rw-r--r--libguile/inline.h2
-rw-r--r--libguile/ioext.h5
-rw-r--r--libguile/iselect.h6
-rw-r--r--libguile/keywords.h2
-rw-r--r--libguile/list.h2
-rw-r--r--libguile/load.h5
-rw-r--r--libguile/macros.h5
-rw-r--r--libguile/mallocs.c3
-rw-r--r--libguile/mallocs.h5
-rw-r--r--libguile/memoize.h6
-rw-r--r--libguile/modules.h2
-rw-r--r--libguile/net_db.h5
-rw-r--r--libguile/null-threads.h5
-rw-r--r--libguile/numbers.h2
-rw-r--r--libguile/objprop.h5
-rw-r--r--libguile/options.h5
-rw-r--r--libguile/pairs.h2
-rw-r--r--libguile/poll.h5
-rw-r--r--libguile/ports.h2
-rw-r--r--libguile/posix-w32.h5
-rw-r--r--libguile/posix.h6
-rw-r--r--libguile/print.h2
-rw-r--r--libguile/procprop.h5
-rw-r--r--libguile/procs.h2
-rw-r--r--libguile/promises.h6
-rw-r--r--libguile/pthread-threads.h5
-rw-r--r--libguile/random.h2
-rw-r--r--libguile/rdelim.h5
-rw-r--r--libguile/read.h5
-rw-r--r--libguile/regex-posix.h2
-rw-r--r--libguile/rw.h4
-rw-r--r--libguile/scmsigs.h5
-rw-r--r--libguile/script.h5
-rw-r--r--libguile/simpos.h5
-rw-r--r--libguile/smob.h2
-rw-r--r--libguile/snarf.h2
-rw-r--r--libguile/socket.h5
-rw-r--r--libguile/sort.h5
-rw-r--r--libguile/srcprop.h2
-rw-r--r--libguile/stackchk.h5
-rw-r--r--libguile/stacks.h2
-rw-r--r--libguile/stime.h5
-rw-r--r--libguile/strings.h2
-rw-r--r--libguile/strorder.h5
-rw-r--r--libguile/strports.h2
-rw-r--r--libguile/struct.h2
-rw-r--r--libguile/symbols.h2
-rw-r--r--libguile/syscalls.h2
-rw-r--r--libguile/tags.h4
-rw-r--r--libguile/threads.h2
-rw-r--r--libguile/throw.h5
-rw-r--r--libguile/trees.h6
-rw-r--r--libguile/unicode.h5
-rw-r--r--libguile/uniform.h2
-rw-r--r--libguile/values.h5
-rw-r--r--libguile/variable.h2
-rw-r--r--libguile/vectors.h2
-rw-r--r--libguile/vports.h5
-rw-r--r--libguile/weak-list.h2
-rw-r--r--libguile/weak-set.h2
-rw-r--r--libguile/weak-table.h2
-rw-r--r--libguile/weak-vector.h5
103 files changed, 105 insertions, 272 deletions
diff --git a/libguile/__scm.h b/libguile/__scm.h
index 0be29648f..5faefe351 100644
--- a/libguile/__scm.h
+++ b/libguile/__scm.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM___SCM_H
#define SCM___SCM_H
diff --git a/libguile/alist.h b/libguile/alist.h
index 2462452ec..ce2fec684 100644
--- a/libguile/alist.h
+++ b/libguile/alist.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_ALIST_H
#define SCM_ALIST_H
diff --git a/libguile/array-handle.h b/libguile/array-handle.h
index 0bca9b1e0..1d19bf966 100644
--- a/libguile/array-handle.h
+++ b/libguile/array-handle.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_ARRAY_HANDLE_H
#define SCM_ARRAY_HANDLE_H
diff --git a/libguile/array-map.h b/libguile/array-map.h
index 12351d13a..924202946 100644
--- a/libguile/array-map.h
+++ b/libguile/array-map.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_ARRAY_MAP_H
#define SCM_ARRAY_MAP_H
-/* Copyright (C) 1995, 1996, 1997, 2000, 2006, 2008, 2009, 2010,
- * 2011, 2013, 2015 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997,2000,2006,2008-2011,2013,2015,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/arrays.h b/libguile/arrays.h
index 6b126f97a..aedca3529 100644
--- a/libguile/arrays.h
+++ b/libguile/arrays.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_ARRAY_H
#define SCM_ARRAY_H
diff --git a/libguile/async.h b/libguile/async.h
index 2bca16df9..f0b888cc7 100644
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_ASYNC_H
#define SCM_ASYNC_H
-/* Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2008, 2009, 2011
- * 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998,2000-2002,2004-2006,2008-2009,2011,2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/backtrace.h b/libguile/backtrace.h
index 59de89dae..7e9649522 100644
--- a/libguile/backtrace.h
+++ b/libguile/backtrace.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_BACKTRACE_H
#define SCM_BACKTRACE_H
-/* Copyright (C) 1996,1998,1999,2000,2001, 2004, 2006, 2008, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1998-2001,2004,2006,2008,2010-2011,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/bitvectors.h b/libguile/bitvectors.h
index d15b61532..ce679d6d7 100644
--- a/libguile/bitvectors.h
+++ b/libguile/bitvectors.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_BITVECTORS_H
#define SCM_BITVECTORS_H
diff --git a/libguile/boolean.h b/libguile/boolean.h
index dca9a56bd..c741d2516 100644
--- a/libguile/boolean.h
+++ b/libguile/boolean.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_BOOLEAN_H
#define SCM_BOOLEAN_H
diff --git a/libguile/chars.h b/libguile/chars.h
index 36b2ee803..2d61575e1 100644
--- a/libguile/chars.h
+++ b/libguile/chars.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_CHARS_H
#define SCM_CHARS_H
diff --git a/libguile/chooks.h b/libguile/chooks.h
index 873c36fc3..1a55b71b6 100644
--- a/libguile/chooks.h
+++ b/libguile/chooks.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_CHOOKS_H
#define SCM_CHOOKS_H
diff --git a/libguile/continuations.h b/libguile/continuations.h
index edebcf2a6..92ac41aaf 100644
--- a/libguile/continuations.h
+++ b/libguile/continuations.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_CONTINUATIONS_H
#define SCM_CONTINUATIONS_H
diff --git a/libguile/debug-malloc.h b/libguile/debug-malloc.h
index 7830adbac..585d979cf 100644
--- a/libguile/debug-malloc.h
+++ b/libguile/debug-malloc.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_DEBUG_MALLOC_H
#define SCM_DEBUG_MALLOC_H
-/* Copyright (C) 2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2001,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/debug.h b/libguile/debug.h
index ab301a003..2a884156b 100644
--- a/libguile/debug.h
+++ b/libguile/debug.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_DEBUG_H
#define SCM_DEBUG_H
-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2004,2008,2009,2010,2011,2012,2013,2015
- * Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2002,2004,2008-2013,2015,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/deprecation.h b/libguile/deprecation.h
index 06027c694..26b73b969 100644
--- a/libguile/deprecation.h
+++ b/libguile/deprecation.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_DEPRECATION_H
#define SCM_DEPRECATION_H
-/* Copyright (C) 2001, 2006, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2006,2008-2009, 2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/dynl.h b/libguile/dynl.h
index e735bccfa..7cf507faf 100644
--- a/libguile/dynl.h
+++ b/libguile/dynl.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_DYNL_H
#define SCM_DYNL_H
-/* Copyright (C) 1996,1998,2000,2001, 2006, 2008, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1998,2000-2001,2006,2008,2010,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/dynstack.h b/libguile/dynstack.h
index e44fdf7f5..7706be236 100644
--- a/libguile/dynstack.h
+++ b/libguile/dynstack.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_DYNSTACK_H
#define SCM_DYNSTACK_H
diff --git a/libguile/dynwind.h b/libguile/dynwind.h
index 9ade05c0b..9bbc5b727 100644
--- a/libguile/dynwind.h
+++ b/libguile/dynwind.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_DYNWIND_H
#define SCM_DYNWIND_H
-/* Copyright (C) 1995,1996,1998,1999,2000,2003,2004, 2006, 2008, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2000,2003-2004,2006,2008,2011-2012,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/eq.h b/libguile/eq.h
index c09d6670b..d41d5038e 100644
--- a/libguile/eq.h
+++ b/libguile/eq.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_EQ_H
#define SCM_EQ_H
-/* Copyright (C) 1995,1996,2000, 2006, 2008, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,2000,2006,2008,2010,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/error.h b/libguile/error.h
index 883c2db6a..39058d411 100644
--- a/libguile/error.h
+++ b/libguile/error.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_ERROR_H
#define SCM_ERROR_H
diff --git a/libguile/eval.h b/libguile/eval.h
index 9e5f65467..1705d4ee4 100644
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_EVAL_H
#define SCM_EVAL_H
-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2003,2004,2008,2009,2010,2011,2012
- * Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2004,2008-2012,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/evalext.h b/libguile/evalext.h
index 7718ec621..96762355c 100644
--- a/libguile/evalext.h
+++ b/libguile/evalext.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_EVALEXT_H
#define SCM_EVALEXT_H
-/* Copyright (C) 1998,1999,2000, 2003, 2006, 2008, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2000,2003,2006,2008,2011,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/expand.h b/libguile/expand.h
index 86821eefc..74e01f374 100644
--- a/libguile/expand.h
+++ b/libguile/expand.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_EXPAND_H
#define SCM_EXPAND_H
diff --git a/libguile/extensions.h b/libguile/extensions.h
index 03622cacd..525f34e61 100644
--- a/libguile/extensions.h
+++ b/libguile/extensions.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_EXTENSIONS_H
#define SCM_EXTENSIONS_H
diff --git a/libguile/feature.h b/libguile/feature.h
index 467f9ed74..f8d222263 100644
--- a/libguile/feature.h
+++ b/libguile/feature.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_FEATURE_H
#define SCM_FEATURE_H
-/* Copyright (C) 1995, 1996, 1999, 2000, 2001, 2006, 2007, 2008,
- * 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1999-2001,2006-2008,2011,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/filesys.h b/libguile/filesys.h
index 39a917f56..801b18e79 100644
--- a/libguile/filesys.h
+++ b/libguile/filesys.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_FILESYS_H
#define SCM_FILESYS_H
diff --git a/libguile/fluids.h b/libguile/fluids.h
index b132f50ac..f9e0ba564 100644
--- a/libguile/fluids.h
+++ b/libguile/fluids.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_FLUIDS_H
#define SCM_FLUIDS_H
diff --git a/libguile/fports.h b/libguile/fports.h
index 2a96a6d1a..f3e7ce99e 100644
--- a/libguile/fports.h
+++ b/libguile/fports.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_FPORTS_H
#define SCM_FPORTS_H
diff --git a/libguile/gc-inline.h b/libguile/gc-inline.h
index fcbe5a54e..ab8813e3b 100644
--- a/libguile/gc-inline.h
+++ b/libguile/gc-inline.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_GC_INLINE_H
#define SCM_GC_INLINE_H
-/* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2004,2006-2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/gc.h b/libguile/gc.h
index 354c017f1..50d7f8817 100644
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_GC_H
#define SCM_GC_H
diff --git a/libguile/generalized-arrays.h b/libguile/generalized-arrays.h
index bd4a276aa..b282e98f4 100644
--- a/libguile/generalized-arrays.h
+++ b/libguile/generalized-arrays.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_GENERALIZED_ARRAYS_H
#define SCM_GENERALIZED_ARRAYS_H
diff --git a/libguile/generalized-vectors.h b/libguile/generalized-vectors.h
index 9df8a0c0a..895210fff 100644
--- a/libguile/generalized-vectors.h
+++ b/libguile/generalized-vectors.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_GENERALIZED_VECTORS_H
#define SCM_GENERALIZED_VECTORS_H
-/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009, 2013
- * Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997,1999-2001,2004,2006,2008-2009,2013,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/gettext.h b/libguile/gettext.h
index d4576bd6a..07e518adc 100644
--- a/libguile/gettext.h
+++ b/libguile/gettext.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_GETTEXT_H
#define SCM_GETTEXT_H
-/* Copyright (C) 2004, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2004,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/goops.h b/libguile/goops.h
index a3c32b8e3..8ef9e80ab 100644
--- a/libguile/goops.h
+++ b/libguile/goops.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_GOOPS_H
#define SCM_GOOPS_H
diff --git a/libguile/gsubr.h b/libguile/gsubr.h
index 51999149c..defdc73b4 100644
--- a/libguile/gsubr.h
+++ b/libguile/gsubr.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_GSUBR_H
#define SCM_GSUBR_H
diff --git a/libguile/guardians.h b/libguile/guardians.h
index a23026d6c..d4b0376e9 100644
--- a/libguile/guardians.h
+++ b/libguile/guardians.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_GUARDIANS_H
#define SCM_GUARDIANS_H
-/* Copyright (C) 1998,2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000-2001,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/hash.h b/libguile/hash.h
index 9085bc037..f8b57f916 100644
--- a/libguile/hash.h
+++ b/libguile/hash.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_HASH_H
#define SCM_HASH_H
-/* Copyright (C) 1995, 1996, 2000, 2006, 2008, 2011,
- * 2015 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,2000,2006,2008,2011,2015,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/hashtab.h b/libguile/hashtab.h
index 834e527b4..094bc8cde 100644
--- a/libguile/hashtab.h
+++ b/libguile/hashtab.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_HASHTAB_H
#define SCM_HASHTAB_H
diff --git a/libguile/hooks.h b/libguile/hooks.h
index d1a76ccf1..2cca55e77 100644
--- a/libguile/hooks.h
+++ b/libguile/hooks.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_HOOKS_H
#define SCM_HOOKS_H
diff --git a/libguile/i18n.h b/libguile/i18n.h
index c2792aca0..7735d8afd 100644
--- a/libguile/i18n.h
+++ b/libguile/i18n.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_I18N_H
#define SCM_I18N_H
-/* Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2006,2008-2009,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/init.h b/libguile/init.h
index bc6cddf93..35dd7f367 100644
--- a/libguile/init.h
+++ b/libguile/init.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_INIT_H
#define SCM_INIT_H
-/* Copyright (C) 1995,1996,1997,2000, 2006, 2008, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997,2000,2006,2008,2011,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/inline.h b/libguile/inline.h
index 57e0ecfba..4c1781375 100644
--- a/libguile/inline.h
+++ b/libguile/inline.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_INLINE_H
#define SCM_INLINE_H
diff --git a/libguile/ioext.h b/libguile/ioext.h
index 1b7b93aaf..0a1fb7dbc 100644
--- a/libguile/ioext.h
+++ b/libguile/ioext.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_IOEXT_H
#define SCM_IOEXT_H
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998,2000-2001,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/iselect.h b/libguile/iselect.h
index 945ad14af..8a526038a 100644
--- a/libguile/iselect.h
+++ b/libguile/iselect.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_ISELECT_H
#define SCM_ISELECT_H
-/* Copyright (C) 1997,1998,2000,2001, 2002, 2006,
- * 2013 Free Software Foundation, Inc.
+/* Copyright (C) 1997-1998,2000-2002,2006,2013,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/keywords.h b/libguile/keywords.h
index 5f3390341..fd9b061f4 100644
--- a/libguile/keywords.h
+++ b/libguile/keywords.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_KEYWORDS_H
#define SCM_KEYWORDS_H
diff --git a/libguile/list.h b/libguile/list.h
index c5813e981..663463817 100644
--- a/libguile/list.h
+++ b/libguile/list.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_LIST_H
#define SCM_LIST_H
diff --git a/libguile/load.h b/libguile/load.h
index 986948d3f..5002ec85b 100644
--- a/libguile/load.h
+++ b/libguile/load.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_LOAD_H
#define SCM_LOAD_H
-/* Copyright (C) 1995,1996,1998,2000,2001, 2006, 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998,2000-2001,2006,2008-2011,2013,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/macros.h b/libguile/macros.h
index de2496e1e..e7ba4467d 100644
--- a/libguile/macros.h
+++ b/libguile/macros.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_MACROS_H
#define SCM_MACROS_H
-/* Copyright (C) 1998,2000,2001,2002,2003, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000-2003,2006,2008-2010,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index 865bb5f74..54ebe46dd 100644
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -1,5 +1,4 @@
-/* classes: src_files
- * Copyright (C) 1995-1998,2000-2001,2006,2011,2014,2018
+/* Copyright (C) 1995-1998,2000-2001,2006,2011,2014,2018
* Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/libguile/mallocs.h b/libguile/mallocs.h
index 9c797e9f8..c3052bb8f 100644
--- a/libguile/mallocs.h
+++ b/libguile/mallocs.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_MALLOCS_H
#define SCM_MALLOCS_H
-/* Copyright (C) 1995,2000, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,2000,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/memoize.h b/libguile/memoize.h
index 23c030674..2c02faed8 100644
--- a/libguile/memoize.h
+++ b/libguile/memoize.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_MEMOIZE_H
#define SCM_MEMOIZE_H
-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2004,2008,2009,2010,2011,2013,2014
- * Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2002,2004,2008-2011,2013-2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/modules.h b/libguile/modules.h
index 48cc2df28..168dccf80 100644
--- a/libguile/modules.h
+++ b/libguile/modules.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_MODULES_H
#define SCM_MODULES_H
diff --git a/libguile/net_db.h b/libguile/net_db.h
index 68b2a8b0c..1b6399b1d 100644
--- a/libguile/net_db.h
+++ b/libguile/net_db.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_NET_DB_H
#define SCM_NET_DB_H
-/* Copyright (C) 1995,2000,2001, 2006, 2008, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1995,2000-2001,2006,2008,2010,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/null-threads.h b/libguile/null-threads.h
index dcb14e6a7..5239c3d75 100644
--- a/libguile/null-threads.h
+++ b/libguile/null-threads.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_NULL_THREADS_H
#define SCM_NULL_THREADS_H
-/* Copyright (C) 2005, 2006, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2005-2006,2010,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/numbers.h b/libguile/numbers.h
index 1164d1916..406ac138b 100644
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_NUMBERS_H
#define SCM_NUMBERS_H
diff --git a/libguile/objprop.h b/libguile/objprop.h
index f9a2e945d..8f3bbb6c9 100644
--- a/libguile/objprop.h
+++ b/libguile/objprop.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_OBJPROP_H
#define SCM_OBJPROP_H
-/* Copyright (C) 1995,2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,2000-2001,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/options.h b/libguile/options.h
index 8ea960b3c..f723a04af 100644
--- a/libguile/options.h
+++ b/libguile/options.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_OPTIONS_H
#define SCM_OPTIONS_H
-/* Copyright (C) 1995,1996,2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,2000-2001,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/pairs.h b/libguile/pairs.h
index 6b80a4012..ce0f00084 100644
--- a/libguile/pairs.h
+++ b/libguile/pairs.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_PAIRS_H
#define SCM_PAIRS_H
diff --git a/libguile/poll.h b/libguile/poll.h
index ab3195008..cf323e67f 100644
--- a/libguile/poll.h
+++ b/libguile/poll.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_POLL_H
#define SCM_POLL_H
-/* Copyright (C) 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2010,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/ports.h b/libguile/ports.h
index e8171a8a7..1872ca4d0 100644
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_PORTS_H
#define SCM_PORTS_H
diff --git a/libguile/posix-w32.h b/libguile/posix-w32.h
index f11a25e49..6fc607d56 100644
--- a/libguile/posix-w32.h
+++ b/libguile/posix-w32.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_POSIX_W32_H
#define SCM_POSIX_W32_H
-/* Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2006,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/posix.h b/libguile/posix.h
index 078edf5eb..2d1bbf1f5 100644
--- a/libguile/posix.h
+++ b/libguile/posix.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_POSIX_H
#define SCM_POSIX_H
-/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2003, 2006, 2008,
- * 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998,2000-2001,2003,2006,2008-2011,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/print.h b/libguile/print.h
index 21e86f402..31714a7a1 100644
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_PRINT_H
#define SCM_PRINT_H
diff --git a/libguile/procprop.h b/libguile/procprop.h
index 41d0753e3..f087d4b0d 100644
--- a/libguile/procprop.h
+++ b/libguile/procprop.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_PROCPROP_H
#define SCM_PROCPROP_H
-/* Copyright (C) 1995,1996,1998,2000, 2006, 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998,2000,2006,2008-2011,2013,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/procs.h b/libguile/procs.h
index ec8443fc2..2d218856e 100644
--- a/libguile/procs.h
+++ b/libguile/procs.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_PROCS_H
#define SCM_PROCS_H
diff --git a/libguile/promises.h b/libguile/promises.h
index 66349b5ab..ac41cea19 100644
--- a/libguile/promises.h
+++ b/libguile/promises.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_PROMISES_H
#define SCM_PROMISES_H
-/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2003,2004,2008,2009
- * Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998-2004,2008-2009,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/pthread-threads.h b/libguile/pthread-threads.h
index b5fae4e89..70e5669c1 100644
--- a/libguile/pthread-threads.h
+++ b/libguile/pthread-threads.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_PTHREADS_THREADS_H
#define SCM_PTHREADS_THREADS_H
-/* Copyright (C) 2002, 2005, 2006, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2002,2005-2006,2011,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/random.h b/libguile/random.h
index 57afdbf56..fb8b4049b 100644
--- a/libguile/random.h
+++ b/libguile/random.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_RANDOM_H
#define SCM_RANDOM_H
diff --git a/libguile/rdelim.h b/libguile/rdelim.h
index 2e401e4fe..55b46c399 100644
--- a/libguile/rdelim.h
+++ b/libguile/rdelim.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_RDELIM_H
#define SCM_RDELIM_H
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998,2000-2001,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/read.h b/libguile/read.h
index 3c47afdd0..d5dc7854b 100644
--- a/libguile/read.h
+++ b/libguile/read.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_READ_H
#define SCM_READ_H
-/* Copyright (C) 1995,1996,2000, 2006, 2008, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,2000,2006,2008-2009,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/regex-posix.h b/libguile/regex-posix.h
index 3a84b37e7..8d9053b06 100644
--- a/libguile/regex-posix.h
+++ b/libguile/regex-posix.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_REGEX_POSIX_H
#define SCM_REGEX_POSIX_H
diff --git a/libguile/rw.h b/libguile/rw.h
index d54f1b3ef..4a57325a6 100644
--- a/libguile/rw.h
+++ b/libguile/rw.h
@@ -1,9 +1,7 @@
-/* classes: h_files */
-
#ifndef SCM_RW_H
#define SCM_RW_H
-/* Copyright (C) 2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2006,2008,2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/scmsigs.h b/libguile/scmsigs.h
index fce372849..5463b9e61 100644
--- a/libguile/scmsigs.h
+++ b/libguile/scmsigs.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_SCMSIGS_H
#define SCM_SCMSIGS_H
-/* Copyright (C) 1995,1996,1997,1998,2000, 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998,2000,2002,2006-2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/script.h b/libguile/script.h
index cf0162a40..dbdca3bde 100644
--- a/libguile/script.h
+++ b/libguile/script.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_SCRIPT_H
#define SCM_SCRIPT_H
-/* Copyright (C) 1997,1998,2000, 2006, 2008, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1997-1998,2000,2006,2008,2011,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/simpos.h b/libguile/simpos.h
index 9ebb0c52b..b4b9b81f4 100644
--- a/libguile/simpos.h
+++ b/libguile/simpos.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_SIMPOS_H
#define SCM_SIMPOS_H
-/* Copyright (C) 1995,1996,1997,1998,2000, 2006, 2008, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998,2000,2006,2008,2013,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/smob.h b/libguile/smob.h
index addcdcbc4..b77898bdf 100644
--- a/libguile/smob.h
+++ b/libguile/smob.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_SMOB_H
#define SCM_SMOB_H
diff --git a/libguile/snarf.h b/libguile/snarf.h
index ff18a3ecc..fa4a60a56 100644
--- a/libguile/snarf.h
+++ b/libguile/snarf.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_SNARF_H
#define SCM_SNARF_H
diff --git a/libguile/socket.h b/libguile/socket.h
index d7c368a22..b4f6a6dab 100644
--- a/libguile/socket.h
+++ b/libguile/socket.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_SOCKET_H
#define SCM_SOCKET_H
-/* Copyright (C) 1995,1996,1997,2000,2001, 2004, 2005, 2006, 2008, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1997,2000-2001,2004-2006,2008,2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/sort.h b/libguile/sort.h
index 3ae86c2f3..763127ec2 100644
--- a/libguile/sort.h
+++ b/libguile/sort.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_SORT_H
#define SCM_SORT_H
-/* Copyright (C) 1999,2000, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2000,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/srcprop.h b/libguile/srcprop.h
index 6f417efa2..214cd812f 100644
--- a/libguile/srcprop.h
+++ b/libguile/srcprop.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_SRCPROP_H
#define SCM_SRCPROP_H
diff --git a/libguile/stackchk.h b/libguile/stackchk.h
index 23dbdba7b..591b23451 100644
--- a/libguile/stackchk.h
+++ b/libguile/stackchk.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_STACKCHK_H
#define SCM_STACKCHK_H
-/* Copyright (C) 1995,1996,1998,2000, 2003, 2006, 2008, 2009, 2010, 2011, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998,2000,2003,2006,2008-2011,2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/stacks.h b/libguile/stacks.h
index 498a90169..2041a49b5 100644
--- a/libguile/stacks.h
+++ b/libguile/stacks.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_STACKS_H
#define SCM_STACKS_H
diff --git a/libguile/stime.h b/libguile/stime.h
index e41f79730..271982255 100644
--- a/libguile/stime.h
+++ b/libguile/stime.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_STIME_H
#define SCM_STIME_H
-/* Copyright (C) 1995,1996,1997,1998,2000, 2003, 2006, 2008, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1998,2000,2003,2006,2008,2011,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/strings.h b/libguile/strings.h
index ff67679db..1f3f26904 100644
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_STRINGS_H
#define SCM_STRINGS_H
diff --git a/libguile/strorder.h b/libguile/strorder.h
index 2c004e48a..8f6dfd5ab 100644
--- a/libguile/strorder.h
+++ b/libguile/strorder.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_STRORDER_H
#define SCM_STRORDER_H
-/* Copyright (C) 1995,1996,2000, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,2000,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/strports.h b/libguile/strports.h
index 0c1fa1d5d..bb49121d2 100644
--- a/libguile/strports.h
+++ b/libguile/strports.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_STRPORTS_H
#define SCM_STRPORTS_H
diff --git a/libguile/struct.h b/libguile/struct.h
index 398221a8b..f66a664f8 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_STRUCT_H
#define SCM_STRUCT_H
diff --git a/libguile/symbols.h b/libguile/symbols.h
index 2dcc5c2ab..243c2f462 100644
--- a/libguile/symbols.h
+++ b/libguile/symbols.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_SYMBOLS_H
#define SCM_SYMBOLS_H
diff --git a/libguile/syscalls.h b/libguile/syscalls.h
index 34918758d..8078e182d 100644
--- a/libguile/syscalls.h
+++ b/libguile/syscalls.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_SYSCALLS_H
#define SCM_SYSCALLS_H
diff --git a/libguile/tags.h b/libguile/tags.h
index 50f3538df..4b5a1b0a9 100644
--- a/libguile/tags.h
+++ b/libguile/tags.h
@@ -1,9 +1,7 @@
-/* classes: h_files */
-
#ifndef SCM_TAGS_H
#define SCM_TAGS_H
-/* Copyright (C) 1995-2004,2008-2015,2017
+/* Copyright (C) 1995-2004,2008-2015,2017-2018
* Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
diff --git a/libguile/threads.h b/libguile/threads.h
index e46211eeb..365733439 100644
--- a/libguile/threads.h
+++ b/libguile/threads.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_THREADS_H
#define SCM_THREADS_H
diff --git a/libguile/throw.h b/libguile/throw.h
index 499b7c882..04cdfb361 100644
--- a/libguile/throw.h
+++ b/libguile/throw.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_THROW_H
#define SCM_THROW_H
-/* Copyright (C) 1995,1996,1998,2000, 2006, 2008, 2010, 2014, 2017 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,1998,2000,2006,2008,2010,2014,2017-2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/trees.h b/libguile/trees.h
index 70d32ad7d..99b92980a 100644
--- a/libguile/trees.h
+++ b/libguile/trees.h
@@ -1,10 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_TREES_H
#define SCM_TREES_H
-/* Copyright (C) 2009
- * Free Software Foundation, Inc.
+/* Copyright (C) 2009,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/unicode.h b/libguile/unicode.h
index 88261c109..0e0d427da 100644
--- a/libguile/unicode.h
+++ b/libguile/unicode.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_UNICODE_H
#define SCM_UNICODE_H
-/* Copyright (C) 2014 Free Software Foundation, Inc.
+/* Copyright (C) 2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
diff --git a/libguile/uniform.h b/libguile/uniform.h
index 8312f1d50..6faf0d4c7 100644
--- a/libguile/uniform.h
+++ b/libguile/uniform.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_UNIFORM_H
#define SCM_UNIFORM_H
diff --git a/libguile/values.h b/libguile/values.h
index 3dbd0b742..d4b5cd3d8 100644
--- a/libguile/values.h
+++ b/libguile/values.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_VALUES_H
#define SCM_VALUES_H
-/* Copyright (C) 2000,2001, 2006, 2008, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2001,2006,2008,2012,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/variable.h b/libguile/variable.h
index fda1fb34e..89e54a365 100644
--- a/libguile/variable.h
+++ b/libguile/variable.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_VARIABLE_H
#define SCM_VARIABLE_H
diff --git a/libguile/vectors.h b/libguile/vectors.h
index fa7dc038e..91cfbb4f7 100644
--- a/libguile/vectors.h
+++ b/libguile/vectors.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_VECTORS_H
#define SCM_VECTORS_H
diff --git a/libguile/vports.h b/libguile/vports.h
index ae64dd438..edb3d9988 100644
--- a/libguile/vports.h
+++ b/libguile/vports.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_VPORTS_H
#define SCM_VPORTS_H
-/* Copyright (C) 1995,1996,2000, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,2000,2006,2008,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
diff --git a/libguile/weak-list.h b/libguile/weak-list.h
index 43e0be966..f1afd6724 100644
--- a/libguile/weak-list.h
+++ b/libguile/weak-list.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_WEAK_LIST_H
#define SCM_WEAK_LIST_H
diff --git a/libguile/weak-set.h b/libguile/weak-set.h
index 6352c9b42..01dfc2270 100644
--- a/libguile/weak-set.h
+++ b/libguile/weak-set.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_WEAK_SET_H
#define SCM_WEAK_SET_H
diff --git a/libguile/weak-table.h b/libguile/weak-table.h
index 1fe59543e..75f032841 100644
--- a/libguile/weak-table.h
+++ b/libguile/weak-table.h
@@ -1,5 +1,3 @@
-/* classes: h_files */
-
#ifndef SCM_WEAK_TABLE_H
#define SCM_WEAK_TABLE_H
diff --git a/libguile/weak-vector.h b/libguile/weak-vector.h
index 11395a5da..67102071f 100644
--- a/libguile/weak-vector.h
+++ b/libguile/weak-vector.h
@@ -1,9 +1,8 @@
-/* classes: h_files */
-
#ifndef SCM_WEAK_VECTOR_H
#define SCM_WEAK_VECTOR_H
-/* Copyright (C) 1995,1996,2000,2001, 2003, 2006, 2008, 2009, 2011, 2014 Free Software Foundation, Inc.
+/* Copyright (C) 1995-1996,2000-2001,2003,2006,2008-2009,2011,2014,2018
+ * Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License