diff --git a/libguile/bdw-gc.h b/libguile/bdw-gc.h
index 4ccde9b2a..4c4f32baa 100644
--- a/libguile/bdw-gc.h
+++ b/libguile/bdw-gc.h
@@ -1,7 +1,8 @@
 #ifndef SCM_BDW_GC_H
 #define SCM_BDW_GC_H
 
-/* Copyright 2006, 2008, 2009, 2011, 2012, 2013, 2014, 2018 Free Software Foundation, Inc.
+/* Copyright 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/bytevectors.h b/libguile/bytevectors.h
index a216f6f02..2afbb3375 100644
--- a/libguile/bytevectors.h
+++ b/libguile/bytevectors.h
@@ -1,7 +1,8 @@
 #ifndef SCM_BYTEVECTORS_H
 #define SCM_BYTEVECTORS_H
 
-/* Copyright 2009, 2011, 2018 Free Software Foundation, Inc.
+/* Copyright 2009,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/cache-internal.h b/libguile/cache-internal.h
index 30e506696..c0aed2a72 100644
--- a/libguile/cache-internal.h
+++ b/libguile/cache-internal.h
@@ -2,7 +2,7 @@
 #define SCM_CACHE_INTERNAL_H
 
 /* Copyright 2016,2018
- * Free Software Foundation, Inc.
+ *   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/control.h b/libguile/control.h
index e8878bf1b..126e62cef 100644
--- a/libguile/control.h
+++ b/libguile/control.h
@@ -1,4 +1,5 @@
-/* Copyright 2010-2013, 2018  Free Software Foundation, Inc.
+/* Copyright 2010-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/deprecated.h b/libguile/deprecated.h
index 3c902e798..f5720202f 100644
--- a/libguile/deprecated.h
+++ b/libguile/deprecated.h
@@ -1,7 +1,8 @@
 #ifndef SCM_DEPRECATED_H
 #define SCM_DEPRECATED_H
 
-/* Copyright 2003-2007, 2009-2018 Free Software Foundation, Inc.
+/* Copyright 2003-2007,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/deprecation.h b/libguile/deprecation.h
index da4ebf947..1683b172e 100644
--- a/libguile/deprecation.h
+++ b/libguile/deprecation.h
@@ -1,7 +1,7 @@
 #ifndef SCM_DEPRECATION_H
 #define SCM_DEPRECATION_H
 
-/* Copyright 2001,2006,2008-2009, 2018
+/* Copyright 2001,2006,2008-2009,2018
  *   Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
diff --git a/libguile/dynstack.h b/libguile/dynstack.h
index 4d3bc3106..77c5cc5c6 100644
--- a/libguile/dynstack.h
+++ b/libguile/dynstack.h
@@ -1,7 +1,8 @@
 #ifndef SCM_DYNSTACK_H
 #define SCM_DYNSTACK_H
 
-/* Copyright 2012-2013,2018 Free Software Foundation, Inc.
+/* Copyright 2012-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/extensions.h b/libguile/extensions.h
index 6d2f9aab4..bd68cd4e7 100644
--- a/libguile/extensions.h
+++ b/libguile/extensions.h
@@ -1,7 +1,8 @@
 #ifndef SCM_EXTENSIONS_H
 #define SCM_EXTENSIONS_H
 
-/* Copyright 2001, 2006, 2008, 2018 Free Software Foundation, Inc.
+/* Copyright 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/fdes-finalizers.h b/libguile/fdes-finalizers.h
index 2f5ae2940..22ff704d6 100644
--- a/libguile/fdes-finalizers.h
+++ b/libguile/fdes-finalizers.h
@@ -1,7 +1,8 @@
 #ifndef SCM_FDES_FINALIZERS_H
 #define SCM_FDES_FINALIZERS_H
 
-/* Copyright 2016, 2018  Free Software Foundation, Inc.
+/* Copyright 2016,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/finalizers.h b/libguile/finalizers.h
index 5ebc3cb84..b97101492 100644
--- a/libguile/finalizers.h
+++ b/libguile/finalizers.h
@@ -1,7 +1,8 @@
 #ifndef SCM_FINALIZERS_H
 #define SCM_FINALIZERS_H
 
-/* Copyright 2012, 2013, 2014, 2018 Free Software Foundation, Inc.
+/* Copyright 2012, 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/foreign-object.h b/libguile/foreign-object.h
index 83eb2d1b7..3755b4fe3 100644
--- a/libguile/foreign-object.h
+++ b/libguile/foreign-object.h
@@ -1,7 +1,8 @@
 #ifndef SCM_FOREIGN_OBJECT_H
 #define SCM_FOREIGN_OBJECT_H
 
-/* Copyright 2014, 2018 Free Software Foundation, Inc.
+/* Copyright 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/foreign.h b/libguile/foreign.h
index 2f3033ecb..b5a7e25ab 100644
--- a/libguile/foreign.h
+++ b/libguile/foreign.h
@@ -1,7 +1,8 @@
 #ifndef SCM_FOREIGN_H
 #define SCM_FOREIGN_H
 
-/* Copyright 2010-2013,2016,2018  Free Software Foundation, Inc.
+/* Copyright 2010-2013,2016,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/frames.h b/libguile/frames.h
index 88f9372e6..034e744de 100644
--- a/libguile/frames.h
+++ b/libguile/frames.h
@@ -1,5 +1,6 @@
-/* Copyright 2001, 2009-2015, 2018 Free Software Foundation, Inc.
- * * 
+/* Copyright 2001,2009-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
  * as published by the Free Software Foundation; either version 3 of
diff --git a/libguile/instructions.h b/libguile/instructions.h
index 4f2c7a60c..542f18f15 100644
--- a/libguile/instructions.h
+++ b/libguile/instructions.h
@@ -1,4 +1,5 @@
-/* Copyright 2001, 2009, 2012-2013, 2018 Free Software Foundation, Inc.
+/* Copyright 2001,2009,2012-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/loader.h b/libguile/loader.h
index 4163781fd..772ce967f 100644
--- a/libguile/loader.h
+++ b/libguile/loader.h
@@ -1,4 +1,5 @@
-/* Copyright 2001, 2009-2015, 2018 Free Software Foundation, Inc.
+/* Copyright 2001,2009-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/locale-categories.h b/libguile/locale-categories.h
index 13d60b108..5e529606d 100644
--- a/libguile/locale-categories.h
+++ b/libguile/locale-categories.h
@@ -1,4 +1,5 @@
-/* Copyright 2006, 2008, 2014, 2018 Free Software Foundation, Inc.
+/* Copyright 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/numbers.h b/libguile/numbers.h
index 4530ba65c..eb49abf98 100644
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -1,8 +1,8 @@
 #ifndef SCM_NUMBERS_H
 #define SCM_NUMBERS_H
 
-/* Copyright 1995, 1996, 1998, 2000-2006, 2008-2011, 2013, 2014,
- *   2016-2018 Free Software Foundation, Inc.
+/* Copyright 1995-1996,1998,2000-2006,2008-2011,2013-2014,2016-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-internal.h b/libguile/ports-internal.h
index 9c398d49e..dee9cba1b 100644
--- a/libguile/ports-internal.h
+++ b/libguile/ports-internal.h
@@ -1,7 +1,8 @@
 /*
  * ports-internal.h - internal-only declarations for ports.
  *
- * Copyright 2013, 2018 Free Software Foundation, Inc.
+ * Copyright 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/print.h b/libguile/print.h
index 8212625c2..11c5e130f 100644
--- a/libguile/print.h
+++ b/libguile/print.h
@@ -1,8 +1,8 @@
 #ifndef SCM_PRINT_H
 #define SCM_PRINT_H
 
-/* Copyright 1995-1996,1998,2000-2001,2003-2004,2006,2008,
- *   2010,2012,2017-2018  Free Software Foundation, Inc.
+/* Copyright 1995-1996,1998,2000-2001,2003-2004,2006,2008,2010,2012,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/private-options.h b/libguile/private-options.h
index 07b3ff9bb..4f5620f43 100644
--- a/libguile/private-options.h
+++ b/libguile/private-options.h
@@ -1,10 +1,5 @@
-/*
- * private-options.h - private declarations for option handling
- *
- * We put this in a private header, since layout of data structures
- * is an implementation detail that we want to hide.
- * 
- * Copyright 2007, 2009, 2010, 2011, 2014, 2018 Free Software Foundation, Inc.
+/* Copyright 2007,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/procs.h b/libguile/procs.h
index 266a2e4b1..7912b2408 100644
--- a/libguile/procs.h
+++ b/libguile/procs.h
@@ -1,8 +1,8 @@
 #ifndef SCM_PROCS_H
 #define SCM_PROCS_H
 
-/* Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2006, 2008, 2009,
- *   2012, 2013, 2018 Free Software Foundation, Inc.
+/* Copyright 1995-1996,1998-2001,2006,2008-2009,2012-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/programs.h b/libguile/programs.h
index 61a809a9d..64ff0d24b 100644
--- a/libguile/programs.h
+++ b/libguile/programs.h
@@ -1,4 +1,5 @@
-/* Copyright 2001, 2009-2014, 2018 Free Software Foundation, Inc.
+/* Copyright 2001,2009-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/r6rs-ports.h b/libguile/r6rs-ports.h
index 0dfbeeb65..405651336 100644
--- a/libguile/r6rs-ports.h
+++ b/libguile/r6rs-ports.h
@@ -1,7 +1,8 @@
 #ifndef SCM_R6RS_PORTS_H
 #define SCM_R6RS_PORTS_H
 
-/* Copyright 2009, 2010, 2011, 2013, 2018 Free Software Foundation, Inc.
+/* Copyright 2009-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/rw.h b/libguile/rw.h
index 4d96ec145..8a779cc00 100644
--- a/libguile/rw.h
+++ b/libguile/rw.h
@@ -1,7 +1,8 @@
 #ifndef SCM_RW_H
 #define SCM_RW_H
 
-/* Copyright 2001,2006,2008,2018 Free Software Foundation, Inc.
+/* Copyright 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/scmconfig.h.top b/libguile/scmconfig.h.top
index 77e37d4d9..f29f3870e 100644
--- a/libguile/scmconfig.h.top
+++ b/libguile/scmconfig.h.top
@@ -1,4 +1,5 @@
-/* Copyright 2003,2006,2018 Free Software Foundation, Inc.
+/* Copyright 2003,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/srfi-4.h b/libguile/srfi-4.h
index 6a882826b..a7bf60017 100644
--- a/libguile/srfi-4.h
+++ b/libguile/srfi-4.h
@@ -2,7 +2,8 @@
 #define SCM_SRFI_4_H
 /* srfi-4.c --- Homogeneous numeric vector datatypes.
  *
- * 	Copyright 2001, 2004, 2006, 2008, 2009, 2010, 2011, 2014, 2018 Free Software Foundation, Inc.
+ * Copyright 2001,2004,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/srfi-60.h b/libguile/srfi-60.h
index 57c595b86..a3f23f6f7 100644
--- a/libguile/srfi-60.h
+++ b/libguile/srfi-60.h
@@ -1,6 +1,7 @@
 /* srfi-60.h --- SRFI-60 procedures for Guile
  *
- * 	Copyright 2005, 2006, 2010, 2018 Free Software Foundation, Inc.
+ * Copyright 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/strings.h b/libguile/strings.h
index b7926a6f8..4ffac16f9 100644
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -1,8 +1,8 @@
 #ifndef SCM_STRINGS_H
 #define SCM_STRINGS_H
 
-/* Copyright 1995-1998,2000-2001,2004-2006,2008-2011,2013,
- *   2015-2016,2018 Free Software Foundation, Inc.
+/* Copyright 1995-1998,2000-2001,2004-2006,2008-2011,2013,2015-2016,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/struct.h b/libguile/struct.h
index faf291df1..db2f2eaf2 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -1,8 +1,8 @@
 #ifndef SCM_STRUCT_H
 #define SCM_STRUCT_H
 
-/* Copyright 1995,1997,1999-2001, 2006-2013, 2015,
- *               2017-2018 Free Software Foundation, Inc.
+/* Copyright 1995,1997,1999-2001,2006-2013,2015,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/syntax.h b/libguile/syntax.h
index 42bdeab7c..22f54116d 100644
--- a/libguile/syntax.h
+++ b/libguile/syntax.h
@@ -1,7 +1,8 @@
 #ifndef SCM_SYNTAX_H
 #define SCM_SYNTAX_H
 
-/* Copyright 2017-2018 Free Software Foundation, Inc.
+/* Copyright 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/vm-builtins.h b/libguile/vm-builtins.h
index ae529ea6f..e878c64f2 100644
--- a/libguile/vm-builtins.h
+++ b/libguile/vm-builtins.h
@@ -1,4 +1,5 @@
-/* Copyright 2013, 2018 Free Software Foundation, Inc.
+/* Copyright 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/vm-expand.h b/libguile/vm-expand.h
index c83c22e4b..a3338d478 100644
--- a/libguile/vm-expand.h
+++ b/libguile/vm-expand.h
@@ -1,4 +1,5 @@
-/* Copyright 2001, 2018 Free Software Foundation, Inc.
+/* Copyright 2001,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/vm.h b/libguile/vm.h
index d4f187418..5f27fed8d 100644
--- a/libguile/vm.h
+++ b/libguile/vm.h
@@ -1,4 +1,5 @@
-/* Copyright 2001, 2009-2015, 2017-2018 Free Software Foundation, Inc.
+/* Copyright 2001,2009-2015,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/weak-list.h b/libguile/weak-list.h
index 8b22aa8cf..44e56c0db 100644
--- a/libguile/weak-list.h
+++ b/libguile/weak-list.h
@@ -1,7 +1,8 @@
 #ifndef SCM_WEAK_LIST_H
 #define SCM_WEAK_LIST_H
 
-/* Copyright 2016, 2018 Free Software Foundation, Inc.
+/* Copyright 2016,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-set.h b/libguile/weak-set.h
index b185e455e..beccbd5fe 100644
--- a/libguile/weak-set.h
+++ b/libguile/weak-set.h
@@ -1,7 +1,8 @@
 #ifndef SCM_WEAK_SET_H
 #define SCM_WEAK_SET_H
 
-/* Copyright 2011,2018 Free Software Foundation, Inc.
+/* Copyright 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/weak-table.h b/libguile/weak-table.h
index 7de656fba..0b28df2ef 100644
--- a/libguile/weak-table.h
+++ b/libguile/weak-table.h
@@ -1,7 +1,8 @@
 #ifndef SCM_WEAK_TABLE_H
 #define SCM_WEAK_TABLE_H
 
-/* Copyright 2011-2012,2018 Free Software Foundation, Inc.
+/* Copyright 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