[m-dev.] [m-users.] Closed source Mercury projects on Windows

Mark Brown mark at mercurylang.org
Thu Jun 7 12:37:02 AEST 2018
Previous message: [m-dev.] [m-users.] Closed source Mercury projects on Windows
Next message: [m-dev.] [m-users.] Closed source Mercury projects on Windows
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
On Wed, Jun 6, 2018 at 8:15 PM, Zoltan Somogyi
<zoltan.somogyi at runbox.com> wrote:
>
>
> On Wed, 6 Jun 2018 15:54:03 +1000 (AEST), Julien Fischer <jfischer at opturion.com> wrote:
>> It's probably better to get this dealt with once and for all.
>
> Agreed.

You're probably both right; I'm just a little concerned about
accidentally overreaching. Anyway, I've gone through extras, samples,
and some other stuff too - attached is a diff for updates to
COPYING.LIB and references to it in copyright messages. Could the two
of you please review as much of this very boring diff as you can
stand?

Note that the wording of the copyright message still works for extras
packages even if they happen to have a COPYING.LIB file of their own,
which a couple do.

Mark
-------------- next part --------------
Update the COPYING.LIB file and references to it.

Discussion of these changes can be found on the Mercury developers
mailing list archives from June 2018.

COPYING.LIB:
    Add a special linking exception to the LGPL.

*:
    Update references to COPYING.LIB.

    Clean up some minor errors that have accumulated in copyright
    messages.

-------------- next part --------------
diff --git a/COPYING.LIB b/COPYING.LIB
index eb685a5..49edafc 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -1,3 +1,29 @@
+In the following, "Mercury Core Libraries" refers to all source
+code in the following directories of this distribution:
+
+    browser, java/runtime, library, mdbcomp, runtime, trace
+
+(No other part of this distribution is automatically linked into an
+executable program by the Mercury system.)
+
+The Mercury Core Libraries are distributed under the terms of the
+GNU Library General Public License (LGPL) version 2 (included below).
+
+As a special exception to the GNU Library General Public License, you
+may link, statically or dynamically, a "work that uses the Mercury
+Core Libraries" with the Mercury Core Libraries to produce an
+executable file containing portions of the Mercury Core Libraries,
+and distribute that executable file under terms of your choice,
+without any of the additional requirements listed in clause 6 of the
+GNU Library General Public License. This exception does not however
+invalidate any other reasons why the executable file might be covered
+by the GNU Library General Public License. If you modify the Mercury
+Core Libraries, you may extend this exception to your version, but you
+are not obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+
+----------------------------------------------------------------------
+
 		  GNU LIBRARY GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
diff --git a/browser/browse.m b/browser/browse.m
index 9f6f149..78a7c14 100644
--- a/browser/browse.m
+++ b/browser/browse.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2007, 2009-2010 The University of Melbourne.
-% Copyright (C) 2017 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: browse.m.
diff --git a/browser/browser_info.m b/browser/browser_info.m
index e2fc5b7..0bc717a 100644
--- a/browser/browser_info.m
+++ b/browser/browser_info.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000-2007, 2009-2010 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: browser_info.m
diff --git a/browser/browser_term.m b/browser/browser_term.m
index 4dcaf0f..8b33d5b 100644
--- a/browser/browser_term.m
+++ b/browser/browser_term.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2004-2006, 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: browser_term.m.
diff --git a/browser/collect_lib.m b/browser/collect_lib.m
index 22c28e4..8fab0b4 100644
--- a/browser/collect_lib.m
+++ b/browser/collect_lib.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999-2002, 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: collect_lib.m.
diff --git a/browser/cterm.m b/browser/cterm.m
index 9053747..35152e0 100644
--- a/browser/cterm.m
+++ b/browser/cterm.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: cterm.m.
diff --git a/browser/debugger_interface.m b/browser/debugger_interface.m
index c6aa067..e8fd7da 100644
--- a/browser/debugger_interface.m
+++ b/browser/debugger_interface.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2001, 2003, 2005-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: debugger_interface.m.
diff --git a/browser/declarative_analyser.m b/browser/declarative_analyser.m
index 70b1c3f..849dbde 100644
--- a/browser/declarative_analyser.m
+++ b/browser/declarative_analyser.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999-2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: declarative_analyser.m
diff --git a/browser/declarative_debugger.m b/browser/declarative_debugger.m
index fe4e746..6cfd955 100644
--- a/browser/declarative_debugger.m
+++ b/browser/declarative_debugger.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999-2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: declarative_debugger.m.
diff --git a/browser/declarative_edt.m b/browser/declarative_edt.m
index 04d76ea..60c2dd4 100644
--- a/browser/declarative_edt.m
+++ b/browser/declarative_edt.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999-2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: declarative_edt.m
diff --git a/browser/declarative_execution.m b/browser/declarative_execution.m
index 02a437a..31cb837 100644
--- a/browser/declarative_execution.m
+++ b/browser/declarative_execution.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999-2007, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: declarative_execution.m.
diff --git a/browser/declarative_oracle.m b/browser/declarative_oracle.m
index 6e8a9ee..4bdd46b 100644
--- a/browser/declarative_oracle.m
+++ b/browser/declarative_oracle.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999-2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: declarative_oracle.m
diff --git a/browser/declarative_tree.m b/browser/declarative_tree.m
index 93914e4..ca8746b 100644
--- a/browser/declarative_tree.m
+++ b/browser/declarative_tree.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2002-2008, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: declarative_tree.m
diff --git a/browser/declarative_user.m b/browser/declarative_user.m
index 5297e87..f6fa42d 100644
--- a/browser/declarative_user.m
+++ b/browser/declarative_user.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999-2007, 2009, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: declarative_user.m.
diff --git a/browser/diff.m b/browser/diff.m
index cea9ab5..bca687a 100644
--- a/browser/diff.m
+++ b/browser/diff.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: diff.m.
diff --git a/browser/dl.m b/browser/dl.m
index 3265f4e..a2fea0e 100644
--- a/browser/dl.m
+++ b/browser/dl.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: dl.m.
diff --git a/browser/frame.m b/browser/frame.m
index 41ba4c5..b1f1a9c 100644
--- a/browser/frame.m
+++ b/browser/frame.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2000, 2003, 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: frame.m.
diff --git a/browser/help.m b/browser/help.m
index 7e0b1fb..7ff3afd 100644
--- a/browser/help.m
+++ b/browser/help.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2000, 2003-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: help.m.
diff --git a/browser/interactive_query.m b/browser/interactive_query.m
index c1e6df7..4be26d7 100644
--- a/browser/interactive_query.m
+++ b/browser/interactive_query.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999-2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: interactive_query.m.
diff --git a/browser/io_action.m b/browser/io_action.m
index d4025e9..9c7667f 100644
--- a/browser/io_action.m
+++ b/browser/io_action.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2002, 2004-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: io_action.m.
diff --git a/browser/listing.m b/browser/listing.m
index 8128792..c62ff85 100644
--- a/browser/listing.m
+++ b/browser/listing.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2007, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
-% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: listing.m.
diff --git a/browser/mdb.m b/browser/mdb.m
index ce63998..68590a9 100644
--- a/browser/mdb.m
+++ b/browser/mdb.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2006 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 
 :- module mdb.
diff --git a/browser/mer_browser.m b/browser/mer_browser.m
index 5d1b695..ce41871 100644
--- a/browser/mer_browser.m
+++ b/browser/mer_browser.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2002, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 % File: mer_browser.m
 % Main author: stayl
diff --git a/browser/name_mangle.m b/browser/name_mangle.m
index ede2787..e05912a 100644
--- a/browser/name_mangle.m
+++ b/browser/name_mangle.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2000,2002, 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: name_mangle.m.
diff --git a/browser/parse.m b/browser/parse.m
index cd52fd1..9cd80a5 100644
--- a/browser/parse.m
+++ b/browser/parse.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2007, 2009 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: parse.m.
diff --git a/browser/percent_encoding.m b/browser/percent_encoding.m
index fce1c9e..24f5ad5 100644
--- a/browser/percent_encoding.m
+++ b/browser/percent_encoding.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: percent_encoding.m.
diff --git a/browser/set_cc.m b/browser/set_cc.m
index 87f6048..193618d 100644
--- a/browser/set_cc.m
+++ b/browser/set_cc.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2002-2003, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % set_cc is an implementation of sets which uses compare_representation
diff --git a/browser/sized_pretty.m b/browser/sized_pretty.m
index 6ffb393..5cad734 100644
--- a/browser/sized_pretty.m
+++ b/browser/sized_pretty.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2001-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: sized_pretty.m:
diff --git a/browser/term_rep.m b/browser/term_rep.m
index 50a4ec8..380faf9 100644
--- a/browser/term_rep.m
+++ b/browser/term_rep.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: term_rep.m.
diff --git a/browser/term_to_html.m b/browser/term_to_html.m
index f856d93..a8cb0ff 100644
--- a/browser/term_to_html.m
+++ b/browser/term_to_html.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: term_to_html.m.
diff --git a/browser/tree234_cc.m b/browser/tree234_cc.m
index c19b3bc..3733527 100644
--- a/browser/tree234_cc.m
+++ b/browser/tree234_cc.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1997,1999-2000,2002, 2004, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % tree234_cc implements a map (dictionary) using 2-3-4 trees. This is
diff --git a/browser/util.m b/browser/util.m
index ab0f1b4..33876b4 100644
--- a/browser/util.m
+++ b/browser/util.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2002, 2004-2007, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 
 :- module mdb.util.
diff --git a/extras/Mmakefile b/extras/Mmakefile
index 9055816..2ccd05f 100644
--- a/extras/Mmakefile
+++ b/extras/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab ft=make
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2002-2003, 2005, 2007, 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015-2016, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 #
 # This Mmakefile provides some targets for building and installing most
diff --git a/extras/align_right/Mmakefile b/extras/align_right/Mmakefile
index 191113d..724be20 100644
--- a/extras/align_right/Mmakefile
+++ b/extras/align_right/Mmakefile
@@ -1,9 +1,8 @@
 #-----------------------------------------------------------------------------#
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
-# Copyright (C) 2016 The Mercury team.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2016, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/base64/Makefile b/extras/base64/Makefile
index 34f300d..704c460 100644
--- a/extras/base64/Makefile
+++ b/extras/base64/Makefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # Build the base64 encoder / decoder library using mmc --make.
diff --git a/extras/base64/Mmakefile b/extras/base64/Mmakefile
index c4b8546..60ed657 100644
--- a/extras/base64/Mmakefile
+++ b/extras/base64/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # This is file exists so that do an `mmake' from the top-level of the extras
diff --git a/extras/cgi/Mmakefile b/extras/cgi/Mmakefile
index e18a671..93351ff 100644
--- a/extras/cgi/Mmakefile
+++ b/extras/cgi/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002-2004 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/cgi/cgi.m b/extras/cgi/cgi.m
index 7dd093d..39d4e9c 100644
--- a/extras/cgi/cgi.m
+++ b/extras/cgi/cgi.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-2001, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: cgi.m.
diff --git a/extras/cgi/html.m b/extras/cgi/html.m
index 5bf309e..7d3497f 100644
--- a/extras/cgi/html.m
+++ b/extras/cgi/html.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 
 % File: html.m.
diff --git a/extras/cgi/mercury_www.m b/extras/cgi/mercury_www.m
index 5de1efb..8e0912c 100644
--- a/extras/cgi/mercury_www.m
+++ b/extras/cgi/mercury_www.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1998 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
diff --git a/extras/complex_numbers/Mmakefile b/extras/complex_numbers/Mmakefile
index 56d4f73..7c3c48d 100644
--- a/extras/complex_numbers/Mmakefile
+++ b/extras/complex_numbers/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002-2003 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/complex_numbers/complex.m b/extras/complex_numbers/complex.m
index b9ef9b2..1aa0da2 100644
--- a/extras/complex_numbers/complex.m
+++ b/extras/complex_numbers/complex.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998, 2001, 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: complex.m.
diff --git a/extras/complex_numbers/complex_float.m b/extras/complex_numbers/complex_float.m
index d176a28..8343b29 100644
--- a/extras/complex_numbers/complex_float.m
+++ b/extras/complex_numbers/complex_float.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998, 2001, 2004-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 
 % File: complex_float.m.
diff --git a/extras/complex_numbers/complex_imag.m b/extras/complex_numbers/complex_imag.m
index dd2eee5..b23162d 100644
--- a/extras/complex_numbers/complex_imag.m
+++ b/extras/complex_numbers/complex_imag.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998, 2001, 2004-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 
 % File: complex_imag.m.
diff --git a/extras/complex_numbers/complex_numbers.m b/extras/complex_numbers/complex_numbers.m
index 273ad73..0cbdb67 100644
--- a/extras/complex_numbers/complex_numbers.m
+++ b/extras/complex_numbers/complex_numbers.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998, 2001, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 
 :- module complex_numbers.
diff --git a/extras/complex_numbers/float_complex.m b/extras/complex_numbers/float_complex.m
index 5fcac4b..b3416b3 100644
--- a/extras/complex_numbers/float_complex.m
+++ b/extras/complex_numbers/float_complex.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998,2001, 2004-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: float_complex.m.
diff --git a/extras/complex_numbers/float_imag.m b/extras/complex_numbers/float_imag.m
index ac5cb8f..53c3ce4 100644
--- a/extras/complex_numbers/float_imag.m
+++ b/extras/complex_numbers/float_imag.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998, 2001, 2004-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 
 % File: float_imag.m.
diff --git a/extras/complex_numbers/imag.m b/extras/complex_numbers/imag.m
index 6f8fdea..1143e0a 100644
--- a/extras/complex_numbers/imag.m
+++ b/extras/complex_numbers/imag.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998,2001, 2004-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: imag.m.
diff --git a/extras/complex_numbers/imag_complex.m b/extras/complex_numbers/imag_complex.m
index 7ac9a19..eaba4ed 100644
--- a/extras/complex_numbers/imag_complex.m
+++ b/extras/complex_numbers/imag_complex.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998, 2001, 2004-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: imag_complex.m.
diff --git a/extras/complex_numbers/imag_float.m b/extras/complex_numbers/imag_float.m
index 1bc744d..3d67b5c 100644
--- a/extras/complex_numbers/imag_float.m
+++ b/extras/complex_numbers/imag_float.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998, 2001, 2004-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: imag_float.m.
diff --git a/extras/curses/Mmakefile b/extras/curses/Mmakefile
index 4374e08..bc238e0 100644
--- a/extras/curses/Mmakefile
+++ b/extras/curses/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2000-2003 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015-2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # This is needed to avoid conflicts with `bool'
diff --git a/extras/dynamic_linking/Mmakefile b/extras/dynamic_linking/Mmakefile
index cd6e681..eac3341 100644
--- a/extras/dynamic_linking/Mmakefile
+++ b/extras/dynamic_linking/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2000-2005 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015-2016, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/error/Mmakefile b/extras/error/Mmakefile
index a38c701..712cb62 100644
--- a/extras/error/Mmakefile
+++ b/extras/error/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2003, 2008 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/fixed/Makefile b/extras/fixed/Makefile
index 71c6284..31ddd1b 100644
--- a/extras/fixed/Makefile
+++ b/extras/fixed/Makefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # Build the fixed point arithmetic library using mmc --make.
diff --git a/extras/fixed/Mmakefile b/extras/fixed/Mmakefile
index b3222bb..05dd1da 100644
--- a/extras/fixed/Mmakefile
+++ b/extras/fixed/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # This is file exists so that do an `mmake' from the top-level of the extras
diff --git a/extras/fixed/fixed.m b/extras/fixed/fixed.m
index cf8b58f..6ab851b 100644
--- a/extras/fixed/fixed.m
+++ b/extras/fixed/fixed.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: fixed.m
diff --git a/extras/fixed/mercury_fixed.m b/extras/fixed/mercury_fixed.m
index 7b7b537..598ed0b 100644
--- a/extras/fixed/mercury_fixed.m
+++ b/extras/fixed/mercury_fixed.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 
 :- module mercury_fixed.
diff --git a/extras/graphics/easyx/easyx.m b/extras/graphics/easyx/easyx.m
index 4830644..d7ad0ba 100644
--- a/extras/graphics/easyx/easyx.m
+++ b/extras/graphics/easyx/easyx.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004, 2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % easyx.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/graphics/easyx/samples/bounce.m b/extras/graphics/easyx/samples/bounce.m
index ce1bd75..eef88f3 100644
--- a/extras/graphics/easyx/samples/bounce.m
+++ b/extras/graphics/easyx/samples/bounce.m
@@ -1,8 +1,8 @@
+% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
-% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
+% Copyright (C) 2014, 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 % bounce.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/graphics/easyx/samples/mclock.m b/extras/graphics/easyx/samples/mclock.m
index 526ab93..9a025fa 100644
--- a/extras/graphics/easyx/samples/mclock.m
+++ b/extras/graphics/easyx/samples/mclock.m
@@ -1,8 +1,8 @@
+% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
-% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
+% Copyright (C) 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % mclock.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/graphics/easyx/samples/moveball.m b/extras/graphics/easyx/samples/moveball.m
index 718d8d9..01d8d75 100644
--- a/extras/graphics/easyx/samples/moveball.m
+++ b/extras/graphics/easyx/samples/moveball.m
@@ -1,8 +1,8 @@
+% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
-% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % moveball.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/graphics/easyx/samples/scribble.m b/extras/graphics/easyx/samples/scribble.m
index 8136159..2eed04e 100644
--- a/extras/graphics/easyx/samples/scribble.m
+++ b/extras/graphics/easyx/samples/scribble.m
@@ -1,8 +1,8 @@
+% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
-% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % scribble.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/graphics/easyx/xlib.m b/extras/graphics/easyx/xlib.m
index 5b96165..f63d849 100644
--- a/extras/graphics/easyx/xlib.m
+++ b/extras/graphics/easyx/xlib.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % xlib.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/graphics/mercury_cairo/cairo.font_options.m b/extras/graphics/mercury_cairo/cairo.font_options.m
index 2e52ef5..951b2d7 100644
--- a/extras/graphics/mercury_cairo/cairo.font_options.m
+++ b/extras/graphics/mercury_cairo/cairo.font_options.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %----------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.image.m b/extras/graphics/mercury_cairo/cairo.image.m
index b7c000f..60f871f 100644
--- a/extras/graphics/mercury_cairo/cairo.image.m
+++ b/extras/graphics/mercury_cairo/cairo.image.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2015-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.m b/extras/graphics/mercury_cairo/cairo.m
index c12a3fb..b2728cf 100644
--- a/extras/graphics/mercury_cairo/cairo.m
+++ b/extras/graphics/mercury_cairo/cairo.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2015, 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.matrix.m b/extras/graphics/mercury_cairo/cairo.matrix.m
index 06b1ae7..2564f74 100644
--- a/extras/graphics/mercury_cairo/cairo.matrix.m
+++ b/extras/graphics/mercury_cairo/cairo.matrix.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au.
diff --git a/extras/graphics/mercury_cairo/cairo.path.m b/extras/graphics/mercury_cairo/cairo.path.m
index 709c4c6..514614f 100644
--- a/extras/graphics/mercury_cairo/cairo.path.m
+++ b/extras/graphics/mercury_cairo/cairo.path.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2015-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.pattern.m b/extras/graphics/mercury_cairo/cairo.pattern.m
index 667a99f..700339e 100644
--- a/extras/graphics/mercury_cairo/cairo.pattern.m
+++ b/extras/graphics/mercury_cairo/cairo.pattern.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.pdf.m b/extras/graphics/mercury_cairo/cairo.pdf.m
index 904cba5..c166ecc 100644
--- a/extras/graphics/mercury_cairo/cairo.pdf.m
+++ b/extras/graphics/mercury_cairo/cairo.pdf.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2015-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.png.m b/extras/graphics/mercury_cairo/cairo.png.m
index a3784b5..914296b 100644
--- a/extras/graphics/mercury_cairo/cairo.png.m
+++ b/extras/graphics/mercury_cairo/cairo.png.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.ps.m b/extras/graphics/mercury_cairo/cairo.ps.m
index bb344c0..c394b52 100644
--- a/extras/graphics/mercury_cairo/cairo.ps.m
+++ b/extras/graphics/mercury_cairo/cairo.ps.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2015-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.recording.m b/extras/graphics/mercury_cairo/cairo.recording.m
index 096079f..0106bad 100644
--- a/extras/graphics/mercury_cairo/cairo.recording.m
+++ b/extras/graphics/mercury_cairo/cairo.recording.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2015-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Peter Wang
diff --git a/extras/graphics/mercury_cairo/cairo.region.m b/extras/graphics/mercury_cairo/cairo.region.m
index fe042b3..8ed163b 100644
--- a/extras/graphics/mercury_cairo/cairo.region.m
+++ b/extras/graphics/mercury_cairo/cairo.region.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %----------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.surface.m b/extras/graphics/mercury_cairo/cairo.surface.m
index 74eb439..14517dd 100644
--- a/extras/graphics/mercury_cairo/cairo.surface.m
+++ b/extras/graphics/mercury_cairo/cairo.surface.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.svg.m b/extras/graphics/mercury_cairo/cairo.svg.m
index 99d2636..eeb9901 100644
--- a/extras/graphics/mercury_cairo/cairo.svg.m
+++ b/extras/graphics/mercury_cairo/cairo.svg.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2015-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.text.m b/extras/graphics/mercury_cairo/cairo.text.m
index 91bf562..2a8dcba 100644
--- a/extras/graphics/mercury_cairo/cairo.text.m
+++ b/extras/graphics/mercury_cairo/cairo.text.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %----------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/cairo.transformations.m b/extras/graphics/mercury_cairo/cairo.transformations.m
index d4101d8..b5eee66 100644
--- a/extras/graphics/mercury_cairo/cairo.transformations.m
+++ b/extras/graphics/mercury_cairo/cairo.transformations.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %----------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Author: Julien Fischer <juliensf at csse.unimelb.edu.au>
diff --git a/extras/graphics/mercury_cairo/mercury_cairo.m b/extras/graphics/mercury_cairo/mercury_cairo.m
index 59f2c13..72dbbfb 100644
--- a/extras/graphics/mercury_cairo/mercury_cairo.m
+++ b/extras/graphics/mercury_cairo/mercury_cairo.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 
 :- module mercury_cairo.
diff --git a/extras/graphics/mercury_glfw/glfw.m b/extras/graphics/mercury_glfw/glfw.m
index 98b5b52..30eb413 100644
--- a/extras/graphics/mercury_glfw/glfw.m
+++ b/extras/graphics/mercury_glfw/glfw.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % A Mercury binding to GLFW version 2.7.
diff --git a/extras/graphics/mercury_glfw/mercury_glfw.m b/extras/graphics/mercury_glfw/mercury_glfw.m
index ea4e626..033ec87 100644
--- a/extras/graphics/mercury_glfw/mercury_glfw.m
+++ b/extras/graphics/mercury_glfw/mercury_glfw.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % 
 % file: mercury_glfw.m
diff --git a/extras/graphics/mercury_glut/glut.callback.m b/extras/graphics/mercury_glut/glut.callback.m
index b6e099c..9b60c8a 100644
--- a/extras/graphics/mercury_glut/glut.callback.m
+++ b/extras/graphics/mercury_glut/glut.callback.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004-2007 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: glut.callback.m.
diff --git a/extras/graphics/mercury_glut/glut.color_map.m b/extras/graphics/mercury_glut/glut.color_map.m
index b336645..c656e39 100644
--- a/extras/graphics/mercury_glut/glut.color_map.m
+++ b/extras/graphics/mercury_glut/glut.color_map.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004-2007, 2012 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: glut.color_map.m.
diff --git a/extras/graphics/mercury_glut/glut.font.m b/extras/graphics/mercury_glut/glut.font.m
index 5463b47..9e63e7f 100644
--- a/extras/graphics/mercury_glut/glut.font.m
+++ b/extras/graphics/mercury_glut/glut.font.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004-2007, 2012 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: glut.font.m.
diff --git a/extras/graphics/mercury_glut/glut.m b/extras/graphics/mercury_glut/glut.m
index c8d5c9e..2ebe24e 100644
--- a/extras/graphics/mercury_glut/glut.m
+++ b/extras/graphics/mercury_glut/glut.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004-2007, 2012 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: glut.m.
diff --git a/extras/graphics/mercury_glut/glut.model.m b/extras/graphics/mercury_glut/glut.model.m
index 3eda8bc..3e3efbd 100644
--- a/extras/graphics/mercury_glut/glut.model.m
+++ b/extras/graphics/mercury_glut/glut.model.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004-2006, 2012 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: glut.model.m.
diff --git a/extras/graphics/mercury_glut/glut.overlay.m b/extras/graphics/mercury_glut/glut.overlay.m
index 44bd467..99c2377 100644
--- a/extras/graphics/mercury_glut/glut.overlay.m
+++ b/extras/graphics/mercury_glut/glut.overlay.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: glut.overlay.m.
diff --git a/extras/graphics/mercury_glut/glut.window.m b/extras/graphics/mercury_glut/glut.window.m
index 59bb655..394c6ed 100644
--- a/extras/graphics/mercury_glut/glut.window.m
+++ b/extras/graphics/mercury_glut/glut.window.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004-2007, 2012 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: glut.window.m.
diff --git a/extras/graphics/mercury_glut/mercury_glut.m b/extras/graphics/mercury_glut/mercury_glut.m
index e67bd21..3f4a822 100644
--- a/extras/graphics/mercury_glut/mercury_glut.m
+++ b/extras/graphics/mercury_glut/mercury_glut.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2004 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % 
 % file: mercury_glut.m
diff --git a/extras/graphics/mercury_opengl/Mmakefile b/extras/graphics/mercury_opengl/Mmakefile
index 3d5489c..981ec48 100644
--- a/extras/graphics/mercury_opengl/Mmakefile
+++ b/extras/graphics/mercury_opengl/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1997, 2003-2007 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # To build the OpenGL binding, do the following:
diff --git a/extras/graphics/mercury_opengl/mercury_opengl.m b/extras/graphics/mercury_opengl/mercury_opengl.m
index 76c7c92..e8ec8eb 100644
--- a/extras/graphics/mercury_opengl/mercury_opengl.m
+++ b/extras/graphics/mercury_opengl/mercury_opengl.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998, 2003 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
diff --git a/extras/graphics/mercury_opengl/mglu.m b/extras/graphics/mercury_opengl/mglu.m
index 8d9aa66..0a88642 100644
--- a/extras/graphics/mercury_opengl/mglu.m
+++ b/extras/graphics/mercury_opengl/mglu.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997, 2003-2006 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: mglu.m
diff --git a/extras/graphics/mercury_opengl/mogl.m b/extras/graphics/mercury_opengl/mogl.m
index 15be105..0108f7c 100644
--- a/extras/graphics/mercury_opengl/mogl.m
+++ b/extras/graphics/mercury_opengl/mogl.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997, 2003-2007 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: mogl.m.
diff --git a/extras/graphics/mercury_tcltk/Mmakefile b/extras/graphics/mercury_tcltk/Mmakefile
index c060db4..f4f9d24 100644
--- a/extras/graphics/mercury_tcltk/Mmakefile
+++ b/extras/graphics/mercury_tcltk/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1998, 2001, 2003, 2005 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 include Mercury.options
diff --git a/extras/graphics/mercury_tcltk/Mmakefile.MacOSX b/extras/graphics/mercury_tcltk/Mmakefile.MacOSX
index e3c32d9..27bd0ae 100644
--- a/extras/graphics/mercury_tcltk/Mmakefile.MacOSX
+++ b/extras/graphics/mercury_tcltk/Mmakefile.MacOSX
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2005 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 # To compile the Mercury Tcl/Tk binding on Mac OS 10.3 you must first install
 # the Tcl/Tk Aqua framework, available from http://tcltkaqua.sourceforge.net/.
diff --git a/extras/graphics/mercury_tcltk/mercury_tcltk.m b/extras/graphics/mercury_tcltk/mercury_tcltk.m
index 1039f94..a5195a3 100644
--- a/extras/graphics/mercury_tcltk/mercury_tcltk.m
+++ b/extras/graphics/mercury_tcltk/mercury_tcltk.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 
diff --git a/extras/graphics/mercury_tcltk/mtcltk.m b/extras/graphics/mercury_tcltk/mtcltk.m
index a027d3c..c50d78a 100644
--- a/extras/graphics/mercury_tcltk/mtcltk.m
+++ b/extras/graphics/mercury_tcltk/mtcltk.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998,2000, 2003, 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: mtcltk.m.
diff --git a/extras/graphics/mercury_tcltk/mtk.m b/extras/graphics/mercury_tcltk/mtk.m
index ffeae6e..bb27f15 100644
--- a/extras/graphics/mercury_tcltk/mtk.m
+++ b/extras/graphics/mercury_tcltk/mtk.m
@@ -1,8 +1,8 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-1998,2000, 2003-2006 The University of Melbourne.
 % Copyright (C) 2001 The Rationalizer Intelligent Software AG
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %-----------------------------------------------------------------------------%
 %
diff --git a/extras/java_extras/make_temp.m b/extras/java_extras/make_temp.m
index 9443e83..4a81e8d 100644
--- a/extras/java_extras/make_temp.m
+++ b/extras/java_extras/make_temp.m
@@ -1,9 +1,8 @@
 %-----------------------------------------------------------------------%
 % vim: ft=mercury sts=4 sw=4 et tw=78
 %-----------------------------------------------------------------------%
-% Copyright (C) 2016 The Mercury Team
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016, 2018 The Mercury Team
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------%
 %
 % This module contains alternatives to io.make_temp and
diff --git a/extras/lex/lex.automata.m b/extras/lex/lex.automata.m
index 82900b4..e482047 100644
--- a/extras/lex/lex.automata.m
+++ b/extras/lex/lex.automata.m
@@ -4,10 +4,8 @@
 % lex.automata.m
 % Copyright (C) 2001 Ralph Becket <rbeck at microsoft.com>
 % Copyright (C) 2002, 2010 The University of Melbourne
-% Copyright (C) 2017 The Mercury team.
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 % Fri Aug 18 15:48:09 BST 2000
 %
diff --git a/extras/lex/lex.buf.m b/extras/lex/lex.buf.m
index b40ef95..1be2fc2 100644
--- a/extras/lex/lex.buf.m
+++ b/extras/lex/lex.buf.m
@@ -4,10 +4,8 @@
 % lex.buf.m
 % Copyright (C) 2001 Ralph Becket <rbeck at microsoft.com>
 % Copyright (C) 2002, 2010 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 % Sat Aug 19 16:56:30 BST 2000
 %
diff --git a/extras/lex/lex.convert_NFA_to_DFA.m b/extras/lex/lex.convert_NFA_to_DFA.m
index add1d3f..2c5e602 100644
--- a/extras/lex/lex.convert_NFA_to_DFA.m
+++ b/extras/lex/lex.convert_NFA_to_DFA.m
@@ -5,9 +5,8 @@
 % lex.convert_NFA_to_DFA.m
 % Copyright (C) 2001 Ralph Becket <rbeck at microsoft.com>
 % Copyright (C) 2002, 2010 The University of Melbourne
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 % Fri Aug 18 12:30:25 BST 2000
 %
diff --git a/extras/lex/lex.lexeme.m b/extras/lex/lex.lexeme.m
index a16b696..4c6ece5 100644
--- a/extras/lex/lex.lexeme.m
+++ b/extras/lex/lex.lexeme.m
@@ -9,10 +9,8 @@
 %   of the GNU Lesser General Public License, see the file COPYING.LGPL
 %   in this directory.
 % Copyright (C) 2002, 2010-2011 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 % A lexeme combines a token with a regexp.  The lexer compiles
 % lexemes and returns the longest successful parse in the input
diff --git a/extras/lex/lex.m b/extras/lex/lex.m
index 14a5e71..1bd06b3 100644
--- a/extras/lex/lex.m
+++ b/extras/lex/lex.m
@@ -10,9 +10,8 @@
 %   of the GNU Lesser General Public License, see the file COPYING.LGPL
 %   in this directory.
 % Copyright (C) 2002, 2006, 2010-2011 The University of Melbourne
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 % This module puts everything together, compiling a list of lexemes into state
 % machines and turning the input stream into a token stream.
diff --git a/extras/lex/lex.regexp.m b/extras/lex/lex.regexp.m
index 69f2313..ffb3ea1 100644
--- a/extras/lex/lex.regexp.m
+++ b/extras/lex/lex.regexp.m
@@ -10,9 +10,8 @@
 %   of the GNU Lesser General Public License, see the file COPYING.LGPL
 %   in this directory.
 % Copyright (C) 2002, 2010 The University of Melbourne
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 % Thu Jul 26 07:45:47 UTC 2001
 %
diff --git a/extras/lex/regex.m b/extras/lex/regex.m
index 8530c3a..db1e38c 100644
--- a/extras/lex/regex.m
+++ b/extras/lex/regex.m
@@ -4,6 +4,8 @@
 % regex.m
 % Ralph Becket <rafe at cs.mu.oz.au>
 % Copyright (C) 2002, 2006, 2010 The University of Melbourne
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 % This module provides basic string matching and search and replace
 % functionality using regular expressions defined as strings of the
diff --git a/extras/lex/samples/lex_demo.m b/extras/lex/samples/lex_demo.m
index 1dd7f02..bf51bde 100644
--- a/extras/lex/samples/lex_demo.m
+++ b/extras/lex/samples/lex_demo.m
@@ -9,9 +9,8 @@
 %   The changes made by Rationalizer are contributed under the terms
 %   of the GNU General Public License - see the file COPYING in the
 %   Mercury Distribution.
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 %-----------------------------------------------------------------------------%
 
diff --git a/extras/lex/samples/regex_demo.m b/extras/lex/samples/regex_demo.m
index 71e10b3..d9fc491 100644
--- a/extras/lex/samples/regex_demo.m
+++ b/extras/lex/samples/regex_demo.m
@@ -4,9 +4,8 @@
 % regex_demo.m
 % Ralph Becket <rafe at cs.mu.oz.au>
 % Copyright (C) 2002 The University of Melbourne
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 % Sun Nov 24 11:44:45 EST 2002
 %
diff --git a/extras/lex/tests/cmp_regex_gawk b/extras/lex/tests/cmp_regex_gawk
index 9c853be..bcabc89 100755
--- a/extras/lex/tests/cmp_regex_gawk
+++ b/extras/lex/tests/cmp_regex_gawk
@@ -1,9 +1,8 @@
 #! /usr/bin/gawk -f
 #
 # Copyright (C) 2002 The University of Melbourne
-#
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 
 # This is a gawk program that attempts to mirror what test_regex does
 # for global search and replace.  It scans the files test_regex.in
diff --git a/extras/lex/tests/test_regex.m b/extras/lex/tests/test_regex.m
index 92cc090..81fb9ec 100644
--- a/extras/lex/tests/test_regex.m
+++ b/extras/lex/tests/test_regex.m
@@ -4,9 +4,8 @@
 % test_regex.m
 % Ralph Becket <rafe at cs.mu.oz.au>
 % Copyright (C) 2002 The University of Melbourne
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %
 % Thu Nov 21 15:33:48 EST 2002
 %
diff --git a/extras/log4m/log4m.m b/extras/log4m/log4m.m
index d70a825..dcf5311 100644
--- a/extras/log4m/log4m.m
+++ b/extras/log4m/log4m.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %------------------------------------------------------------------------------%
 /****M* libs/log4m/log4m.m/log4m
  * NAME
diff --git a/extras/logged_output/Mmakefile b/extras/logged_output/Mmakefile
index 0369a7d..41f9b57 100644
--- a/extras/logged_output/Mmakefile
+++ b/extras/logged_output/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2003 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/logged_output/logged_output.m b/extras/logged_output/logged_output.m
index aab2687..aabec27 100644
--- a/extras/logged_output/logged_output.m
+++ b/extras/logged_output/logged_output.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2000, 2005, 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % module:   logged_output.m
diff --git a/extras/logged_output/main.m b/extras/logged_output/main.m
index 361f1ff..f3a9363 100644
--- a/extras/logged_output/main.m
+++ b/extras/logged_output/main.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2000, 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % module:   main.m
diff --git a/extras/monte/Mmakefile b/extras/monte/Mmakefile
index b658f8c..a53d5a8 100644
--- a/extras/monte/Mmakefile
+++ b/extras/monte/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2010 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/moose/Mmakefile b/extras/moose/Mmakefile
index 3323e07..bfa8c32 100644
--- a/extras/moose/Mmakefile
+++ b/extras/moose/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002-2003 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # GRADE = asm_fast.gc.debug
diff --git a/extras/mopenssl/mopenssl.m b/extras/mopenssl/mopenssl.m
index e40c813..82ceca0 100644
--- a/extras/mopenssl/mopenssl.m
+++ b/extras/mopenssl/mopenssl.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2006-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %------------------------------------------------------------------------------%
 %------------------------------------------------------------------------------%
 %
diff --git a/extras/net/echo.m b/extras/net/echo.m
index f891198..0713b2d 100644
--- a/extras/net/echo.m
+++ b/extras/net/echo.m
@@ -1,9 +1,8 @@
 %-----------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB
+% Copyright (C) 2014-2016, 2018 The Mercury Team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: echo
diff --git a/extras/net/errno.m b/extras/net/errno.m
index f3cdc42..19edd0b 100644
--- a/extras/net/errno.m
+++ b/extras/net/errno.m
@@ -1,9 +1,8 @@
 %-----------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB
+% Copyright (C) 2014, 2018 The Mercury Team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: errno.
diff --git a/extras/net/getaddrinfo.m b/extras/net/getaddrinfo.m
index 3e47916..55f6071 100644
--- a/extras/net/getaddrinfo.m
+++ b/extras/net/getaddrinfo.m
@@ -1,9 +1,8 @@
 %-----------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury Team
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB
+% Copyright (C) 2014-2016, 2018 The Mercury Team
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: getaddrinfo
diff --git a/extras/net/net.m b/extras/net/net.m
index 77ac277..f686adb 100644
--- a/extras/net/net.m
+++ b/extras/net/net.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 :- module net.
 
diff --git a/extras/net/netdb.m b/extras/net/netdb.m
index 328c08f..b3c698c 100644
--- a/extras/net/netdb.m
+++ b/extras/net/netdb.m
@@ -1,9 +1,8 @@
 %-----------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014-2015 The Mercury Team
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB
+% Copyright (C) 2014-2015, 2018 The Mercury Team
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: netdb
diff --git a/extras/net/sockets.m b/extras/net/sockets.m
index dc0bd6e..fc2e8e3 100644
--- a/extras/net/sockets.m
+++ b/extras/net/sockets.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: sockets
diff --git a/extras/net/streams.m b/extras/net/streams.m
index fbe5fc1..1f3e980 100644
--- a/extras/net/streams.m
+++ b/extras/net/streams.m
@@ -1,9 +1,8 @@
 %-----------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB
+% Copyright (C) 2014-2016, 2018 The Mercury Team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module:               net.streams.
diff --git a/extras/net/tcp.m b/extras/net/tcp.m
index d219e48..600113c 100644
--- a/extras/net/tcp.m
+++ b/extras/net/tcp.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2000, 2007, 2011 The University of Melbourne
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module:   tcp
diff --git a/extras/net/types.m b/extras/net/types.m
index 326299f..a703fb4 100644
--- a/extras/net/types.m
+++ b/extras/net/types.m
@@ -1,9 +1,8 @@
 %-----------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury Team
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB
+% Copyright (C) 2014-2016, 2018 The Mercury Team
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: types
diff --git a/extras/odbc/odbc.m b/extras/odbc/odbc.m
index a3737c5..c8f5d1d 100644
--- a/extras/odbc/odbc.m
+++ b/extras/odbc/odbc.m
@@ -3,9 +3,8 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 1997 Mission Critical.
 % Copyright (C) 1997-2000, 2002, 2004-2006, 2010 The University of Melbourne.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: odbc.m.
diff --git a/extras/old_term_parser/Makefile b/extras/old_term_parser/Makefile
index a6a8f59..ca82da9 100644
--- a/extras/old_term_parser/Makefile
+++ b/extras/old_term_parser/Makefile
@@ -1,9 +1,8 @@
 #-----------------------------------------------------------------------------#
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
-# Copyright (C) 2017 The Mercury team.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2017-2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # Build the old term parser library using mmc --make.
diff --git a/extras/old_term_parser/old_lexer.m b/extras/old_term_parser/old_lexer.m
index 7aabc67..2929ff6 100644
--- a/extras/old_term_parser/old_lexer.m
+++ b/extras/old_term_parser/old_lexer.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2000, 2003-2008, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: old_lexer.m.
diff --git a/extras/old_term_parser/old_parser.m b/extras/old_term_parser/old_parser.m
index 5f436dd..78b9e25 100644
--- a/extras/old_term_parser/old_parser.m
+++ b/extras/old_term_parser/old_parser.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-2001, 2003-2008, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: old_parser.m.
diff --git a/extras/old_term_parser/old_term.m b/extras/old_term_parser/old_term.m
index f46dd49..c40493d 100644
--- a/extras/old_term_parser/old_term.m
+++ b/extras/old_term_parser/old_term.m
@@ -2,9 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2000,2003-2009,2011-2012 The University of Melbourne.
-% Copyright (C) 2015 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: old_term.m.
diff --git a/extras/old_term_parser/old_term_io.m b/extras/old_term_parser/old_term_io.m
index f52a57f..3cec79d 100644
--- a/extras/old_term_parser/old_term_io.m
+++ b/extras/old_term_parser/old_term_io.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2006, 2009, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: old_term_io.m.
diff --git a/extras/old_term_parser/old_term_parser.m b/extras/old_term_parser/old_term_parser.m
index 38d4177..9725616 100644
--- a/extras/old_term_parser/old_term_parser.m
+++ b/extras/old_term_parser/old_term_parser.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 
 :- module old_term_parser.
diff --git a/extras/old_term_parser/old_varset.m b/extras/old_term_parser/old_varset.m
index d141d56..64d4b55 100644
--- a/extras/old_term_parser/old_varset.m
+++ b/extras/old_term_parser/old_varset.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2000,2002-2007, 2009-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: old_varset.m.
diff --git a/extras/posix/Mmakefile b/extras/posix/Mmakefile
index 1d38b0c..1372b6e 100644
--- a/extras/posix/Mmakefile
+++ b/extras/posix/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002-2004 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/posix/posix.closedir.m b/extras/posix/posix.closedir.m
index 8e16692..2bf94d8 100644
--- a/extras/posix/posix.closedir.m
+++ b/extras/posix/posix.closedir.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.closedir.m.
diff --git a/extras/posix/posix.dup.m b/extras/posix/posix.dup.m
index 8084b73..1fe3fcf 100644
--- a/extras/posix/posix.dup.m
+++ b/extras/posix/posix.dup.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2006-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.dup.m
diff --git a/extras/posix/posix.exec.m b/extras/posix/posix.exec.m
index 4d80c03..b200a90 100644
--- a/extras/posix/posix.exec.m
+++ b/extras/posix/posix.exec.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2006-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.exec.m.
diff --git a/extras/posix/posix.fork.m b/extras/posix/posix.fork.m
index 3438de9..71a0d85 100644
--- a/extras/posix/posix.fork.m
+++ b/extras/posix/posix.fork.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.fork.m
diff --git a/extras/posix/posix.getpid.m b/extras/posix/posix.getpid.m
index 7724c84..e65acd0 100644
--- a/extras/posix/posix.getpid.m
+++ b/extras/posix/posix.getpid.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.getpid.m
diff --git a/extras/posix/posix.kill.m b/extras/posix/posix.kill.m
index c411089..516e9ac 100644
--- a/extras/posix/posix.kill.m
+++ b/extras/posix/posix.kill.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.kill.
diff --git a/extras/posix/posix.lseek.m b/extras/posix/posix.lseek.m
index c67fd46..8020c1a 100644
--- a/extras/posix/posix.lseek.m
+++ b/extras/posix/posix.lseek.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %------------------------------------------------------------------------------%
 % Copyright (C) 1999, 2005, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %------------------------------------------------------------------------------%
 %
 % Module: posix.lseek.m
diff --git a/extras/posix/posix.m b/extras/posix/posix.m
index cf46411..3a1ce5a 100644
--- a/extras/posix/posix.m
+++ b/extras/posix/posix.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1999, 2001 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.m
diff --git a/extras/posix/posix.mkdir.m b/extras/posix/posix.mkdir.m
index 7b129d5..6c4b89d 100644
--- a/extras/posix/posix.mkdir.m
+++ b/extras/posix/posix.mkdir.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.mkdir.m
diff --git a/extras/posix/posix.open.m b/extras/posix/posix.open.m
index 102abb3..050cd4a 100644
--- a/extras/posix/posix.open.m
+++ b/extras/posix/posix.open.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1999, 2001, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.open.
diff --git a/extras/posix/posix.opendir.m b/extras/posix/posix.opendir.m
index 63140ed..aac07dd 100644
--- a/extras/posix/posix.opendir.m
+++ b/extras/posix/posix.opendir.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.opendir.m
diff --git a/extras/posix/posix.pipe.m b/extras/posix/posix.pipe.m
index 44c4987..e127a28 100644
--- a/extras/posix/posix.pipe.m
+++ b/extras/posix/posix.pipe.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.pipe.
diff --git a/extras/posix/posix.read.m b/extras/posix/posix.read.m
index b1e1fd5..0e458e3 100644
--- a/extras/posix/posix.read.m
+++ b/extras/posix/posix.read.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1999, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.read.
diff --git a/extras/posix/posix.readdir.m b/extras/posix/posix.readdir.m
index 0ab279a..8733e73 100644
--- a/extras/posix/posix.readdir.m
+++ b/extras/posix/posix.readdir.m
@@ -1,7 +1,7 @@
 %------------------------------------------------------------------------------%
 % Copyright (C) 2001, 2007, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %------------------------------------------------------------------------------%
 %
 % module: posix__readdir.m
diff --git a/extras/posix/posix.rmdir.m b/extras/posix/posix.rmdir.m
index 32af01d..e9e141c 100644
--- a/extras/posix/posix.rmdir.m
+++ b/extras/posix/posix.rmdir.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.rmdir.
diff --git a/extras/posix/posix.select.m b/extras/posix/posix.select.m
index 7d932c7..038c2a9 100644
--- a/extras/posix/posix.select.m
+++ b/extras/posix/posix.select.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1999-2000, 2004, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.select.
diff --git a/extras/posix/posix.socket.m b/extras/posix/posix.socket.m
index f8238c0..da7176e 100644
--- a/extras/posix/posix.socket.m
+++ b/extras/posix/posix.socket.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1999-2000, 2004, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module posix.socket.
diff --git a/extras/posix/posix.stat.m b/extras/posix/posix.stat.m
index 2c72479..176f30c 100644
--- a/extras/posix/posix.stat.m
+++ b/extras/posix/posix.stat.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2004, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.stat.
diff --git a/extras/posix/posix.wait.m b/extras/posix/posix.wait.m
index 466aabb..426808c 100644
--- a/extras/posix/posix.wait.m
+++ b/extras/posix/posix.wait.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.wait.m
diff --git a/extras/posix/posix.write.m b/extras/posix/posix.write.m
index a9d1050..b001d84 100644
--- a/extras/posix/posix.write.m
+++ b/extras/posix/posix.write.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1999, 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Module: posix.write.
diff --git a/extras/posix/posix_workarounds.c b/extras/posix/posix_workarounds.c
index cc2fdac..d809b58 100644
--- a/extras/posix/posix_workarounds.c
+++ b/extras/posix/posix_workarounds.c
@@ -1,7 +1,7 @@
 /*----------------------------------------------------------------------------*/
 /* Copyright (C) 1999 The University of Melbourne.  			      */
-/* This file may only be copied under the terms of the GNU Library General    */
-/* Public License - see the file COPYING.LIB in the Mercury distribution.     */
+/* Copyright (C) 2018 The Mercury team.                                       */
+/* This file is distributed under the terms specified in COPYING.LIB.         */
 /*----------------------------------------------------------------------------*/
 /*									      */
 /* This file contains a bunch of functions for working on fd_set objects.     */
diff --git a/extras/posix/samples/Mmakefile b/extras/posix/samples/Mmakefile
index 01e60c7..a3550ab 100644
--- a/extras/posix/samples/Mmakefile
+++ b/extras/posix/samples/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2007 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 POSIX_DIR = ..
diff --git a/extras/quickcheck/Mmakefile b/extras/quickcheck/Mmakefile
index 028a956..28d397f 100644
--- a/extras/quickcheck/Mmakefile
+++ b/extras/quickcheck/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2001, 2003 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/quickcheck/qcheck.m b/extras/quickcheck/qcheck.m
index e565c15..927ad12 100644
--- a/extras/quickcheck/qcheck.m
+++ b/extras/quickcheck/qcheck.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2003, 2005-2007, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 %	file 		qcheck.m
diff --git a/extras/quickcheck/rnd.m b/extras/quickcheck/rnd.m
index 4de2d3f..0106f11 100644
--- a/extras/quickcheck/rnd.m
+++ b/extras/quickcheck/rnd.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2001, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % file: rnd.m
 % main author: conway.
diff --git a/extras/references/Makefile b/extras/references/Makefile
index f702b6e..62b2963 100644
--- a/extras/references/Makefile
+++ b/extras/references/Makefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # Build the global library using mmc --make.
diff --git a/extras/references/Mercury.options b/extras/references/Mercury.options
index 7f4ac6d..121cfa8 100644
--- a/extras/references/Mercury.options
+++ b/extras/references/Mercury.options
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 MCFLAGS = --use-trail --trail-segments        \
diff --git a/extras/references/Mmakefile b/extras/references/Mmakefile
index b3222bb..05dd1da 100644
--- a/extras/references/Mmakefile
+++ b/extras/references/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 # This is file exists so that do an `mmake' from the top-level of the extras
diff --git a/extras/references/c_reference.h b/extras/references/c_reference.h
index f1bcaf9..6f11395 100644
--- a/extras/references/c_reference.h
+++ b/extras/references/c_reference.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1999-2000,2002 University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 /*
diff --git a/extras/references/nb_reference.m b/extras/references/nb_reference.m
index 31434e2..9d4ac3e 100644
--- a/extras/references/nb_reference.m
+++ b/extras/references/nb_reference.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1998-2000,2002-2003, 2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File      : nb_reference.m
diff --git a/extras/references/reference.m b/extras/references/reference.m
index 68076af..8efd21c 100644
--- a/extras/references/reference.m
+++ b/extras/references/reference.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1998-2000,2002-2004, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File      : reference.m
diff --git a/extras/references/samples/Mmakefile b/extras/references/samples/Mmakefile
index ba33b2a..a01b7f9 100644
--- a/extras/references/samples/Mmakefile
+++ b/extras/references/samples/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1997-1999, 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 MAIN_TARGET = all
diff --git a/extras/references/scoped_update.m b/extras/references/scoped_update.m
index fb9d3dc..1204c22 100644
--- a/extras/references/scoped_update.m
+++ b/extras/references/scoped_update.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1998-1999,2002, 2004, 2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File      : scoped_update.m
diff --git a/extras/references/tests/Mmakefile b/extras/references/tests/Mmakefile
index 26a0f43..deeda45 100644
--- a/extras/references/tests/Mmakefile
+++ b/extras/references/tests/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1997-2000, 2003-2004, 2011 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 MAIN_TARGET = all
diff --git a/extras/references/tests/glob_test.m b/extras/references/tests/glob_test.m
index 59be0c6..b5a1fde 100644
--- a/extras/references/tests/glob_test.m
+++ b/extras/references/tests/glob_test.m
@@ -1,8 +1,8 @@
 %-----------------------------------------------------------------------------%
-% Copyright (C) 1999-2000 Monash University,, 2003, 2006 The University of Melbourne &
-% KU Leuven.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 1999-2000 Monash University.
+% Copyright (C) 2003, 2006 The University of Melbourne & KU Leuven.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 
 % Module to test "statically" allocated references.
diff --git a/extras/show_ops/Mmakefile b/extras/show_ops/Mmakefile
index 2f117a9..dea8fa2 100644
--- a/extras/show_ops/Mmakefile
+++ b/extras/show_ops/Mmakefile
@@ -1,9 +1,8 @@
 #-----------------------------------------------------------------------------#
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
-# Copyright (C) 2015 The Mercury team.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/solver_types/library/Mmakefile b/extras/solver_types/library/Mmakefile
index 240ad23..2d00b98 100644
--- a/extras/solver_types/library/Mmakefile
+++ b/extras/solver_types/library/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2005-2006 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
diff --git a/extras/solver_types/library/any.m b/extras/solver_types/library/any.m
index 18ead45..baf7a04 100644
--- a/extras/solver_types/library/any.m
+++ b/extras/solver_types/library/any.m
@@ -1,7 +1,7 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2005 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % This module is just used to collect the other any_* modules together
 % to form a library.
diff --git a/extras/solver_types/library/any_array.m b/extras/solver_types/library/any_array.m
index 065725d..0787228 100644
--- a/extras/solver_types/library/any_array.m
+++ b/extras/solver_types/library/any_array.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % any_array.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/solver_types/library/any_assoc_list.m b/extras/solver_types/library/any_assoc_list.m
index 91f1a38..9c49936 100644
--- a/extras/solver_types/library/any_assoc_list.m
+++ b/extras/solver_types/library/any_assoc_list.m
@@ -1,8 +1,8 @@
 %-----------------------------------------------------------------------------%
 % vim ft=mercury ts=4 sw=4 et
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % any_any_assoc_list.m
diff --git a/extras/solver_types/library/any_list.m b/extras/solver_types/library/any_list.m
index 5cd926d..0ac799a 100644
--- a/extras/solver_types/library/any_list.m
+++ b/extras/solver_types/library/any_list.m
@@ -1,8 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 % any_list.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/solver_types/library/any_map.m b/extras/solver_types/library/any_map.m
index ec9f750..9927f8b 100644
--- a/extras/solver_types/library/any_map.m
+++ b/extras/solver_types/library/any_map.m
@@ -1,8 +1,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % any_map.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/solver_types/library/any_tree234.m b/extras/solver_types/library/any_tree234.m
index 705f4ee..45b440f 100644
--- a/extras/solver_types/library/any_tree234.m
+++ b/extras/solver_types/library/any_tree234.m
@@ -1,8 +1,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 % any_tree234.m
 % Ralph Becket <rafe at cs.mu.oz.au>
diff --git a/extras/solver_types/library/any_util.m b/extras/solver_types/library/any_util.m
index 36fb0f3..52d45f1 100644
--- a/extras/solver_types/library/any_util.m
+++ b/extras/solver_types/library/any_util.m
@@ -1,8 +1,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % any_util.m
 % Ralph Becket <rafe at cs.mu.OZ.AU>
diff --git a/extras/trail/trail.m b/extras/trail/trail.m
index 4ecc990..f33e1f3 100644
--- a/extras/trail/trail.m
+++ b/extras/trail/trail.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013, 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Author: Mark Brown.
diff --git a/extras/trailed_update/Mmakefile b/extras/trailed_update/Mmakefile
index 5876978..36fb742 100644
--- a/extras/trailed_update/Mmakefile
+++ b/extras/trailed_update/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1997-1998, 2000, 2004, 2010 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 GRADEFLAGS += --use-trail --trail-segments
diff --git a/extras/trailed_update/samples/Mmakefile b/extras/trailed_update/samples/Mmakefile
index ef8c947..3dccdc3 100644
--- a/extras/trailed_update/samples/Mmakefile
+++ b/extras/trailed_update/samples/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1997-2002, 2007, 2010 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 MAIN_TARGET = all
diff --git a/extras/trailed_update/tests/Mmakefile b/extras/trailed_update/tests/Mmakefile
index 94502be..6f14cba 100644
--- a/extras/trailed_update/tests/Mmakefile
+++ b/extras/trailed_update/tests/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 1997-2002, 2006-2007, 2010 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 MAIN_TARGET = all
diff --git a/extras/trailed_update/tests/var_test.m b/extras/trailed_update/tests/var_test.m
index 6a184f6..dd82cd5 100644
--- a/extras/trailed_update/tests/var_test.m
+++ b/extras/trailed_update/tests/var_test.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % Some test cases for extras/trailed_update/var.m.
diff --git a/extras/trailed_update/tr_array.m b/extras/trailed_update/tr_array.m
index 7777e2a..100f73a 100644
--- a/extras/trailed_update/tr_array.m
+++ b/extras/trailed_update/tr_array.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1993-1995, 1997, 1999, 2002, 2005-2006, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 % 
 % File: tr_array.m.
diff --git a/extras/trailed_update/tr_store.m b/extras/trailed_update/tr_store.m
index 664bd86..9793c6d 100644
--- a/extras/trailed_update/tr_store.m
+++ b/extras/trailed_update/tr_store.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997-2000,2002-2003, 2005-2006, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: tr_store.m. 
diff --git a/extras/trailed_update/trailed_update.m b/extras/trailed_update/trailed_update.m
index 1259c0f..9abb232 100644
--- a/extras/trailed_update/trailed_update.m
+++ b/extras/trailed_update/trailed_update.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1998-2000, 2002-2003, 2005-2007, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 
 :- module trailed_update.
diff --git a/extras/trailed_update/unsafe.m b/extras/trailed_update/unsafe.m
index ba4b57d..945bd12 100644
--- a/extras/trailed_update/unsafe.m
+++ b/extras/trailed_update/unsafe.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1997, 2004-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: unsafe.m.
diff --git a/extras/trailed_update/var.m b/extras/trailed_update/var.m
index 5df8ade..483a2ee 100644
--- a/extras/trailed_update/var.m
+++ b/extras/trailed_update/var.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 1998-2000, 2002-2003, 2005-2007, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: var.m
diff --git a/extras/windows_installer_generator/sample/gen_merc_wxs.m b/extras/windows_installer_generator/sample/gen_merc_wxs.m
index 6d6da38..a922ab5 100644
--- a/extras/windows_installer_generator/sample/gen_merc_wxs.m
+++ b/extras/windows_installer_generator/sample/gen_merc_wxs.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: Ian MacLarty (maclarty at cs.mu.oz.au).
diff --git a/extras/windows_installer_generator/wix.m b/extras/windows_installer_generator/wix.m
index d0c175b..7921c59 100644
--- a/extras/windows_installer_generator/wix.m
+++ b/extras/windows_installer_generator/wix.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: Ian MacLarty (maclarty at cs.mu.oz.au).
diff --git a/extras/windows_installer_generator/wix_files.m b/extras/windows_installer_generator/wix_files.m
index 77bcb49..d3773d3 100644
--- a/extras/windows_installer_generator/wix_files.m
+++ b/extras/windows_installer_generator/wix_files.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: Ian MacLarty (maclarty at cs.mu.oz.au).
diff --git a/extras/windows_installer_generator/wix_gui.m b/extras/windows_installer_generator/wix_gui.m
index 6d59f22..eddac55 100644
--- a/extras/windows_installer_generator/wix_gui.m
+++ b/extras/windows_installer_generator/wix_gui.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006, 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: Ian MacLarty (maclarty at cs.mu.oz.au).
diff --git a/extras/windows_installer_generator/wix_installer.m b/extras/windows_installer_generator/wix_installer.m
index 892f8dd..10c20f1 100644
--- a/extras/windows_installer_generator/wix_installer.m
+++ b/extras/windows_installer_generator/wix_installer.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: Ian MacLarty (maclarty at cs.mu.oz.au).
diff --git a/extras/windows_installer_generator/wix_language.m b/extras/windows_installer_generator/wix_language.m
index d7d4690..c039019 100644
--- a/extras/windows_installer_generator/wix_language.m
+++ b/extras/windows_installer_generator/wix_language.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: Ian MacLarty (maclarty at cs.mu.oz.au).
diff --git a/extras/windows_installer_generator/wix_util.m b/extras/windows_installer_generator/wix_util.m
index 4921e1c..78e86d7 100644
--- a/extras/windows_installer_generator/wix_util.m
+++ b/extras/windows_installer_generator/wix_util.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: Ian MacLarty (maclarty at cs.mu.oz.au).
diff --git a/extras/xml/Mmakefile b/extras/xml/Mmakefile
index c4063aa..93631e7 100644
--- a/extras/xml/Mmakefile
+++ b/extras/xml/Mmakefile
@@ -2,8 +2,8 @@
 # vim: ts=8 sw=8 noexpandtab
 #-----------------------------------------------------------------------------#
 # Copyright (C) 2000, 2002 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #-----------------------------------------------------------------------------#
 
 -include ../Mmake.params
diff --git a/extras/xml/parsing.m b/extras/xml/parsing.m
index 2f8d29c..e850b9f 100644
--- a/extras/xml/parsing.m
+++ b/extras/xml/parsing.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2005-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2016-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/extras/xml/tryit.m b/extras/xml/tryit.m
index 9acfb27..ef2143f 100644
--- a/extras/xml/tryit.m
+++ b/extras/xml/tryit.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2001, 2004-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/extras/xml/unicode.m b/extras/xml/unicode.m
index 6c0927f..30a402f 100644
--- a/extras/xml/unicode.m
+++ b/extras/xml/unicode.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2004 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/extras/xml/xml.cat.m b/extras/xml/xml.cat.m
index e3508f7..e07d56c 100644
--- a/extras/xml/xml.cat.m
+++ b/extras/xml/xml.cat.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/extras/xml/xml.doc.m b/extras/xml/xml.doc.m
index 3d92657..daa583e 100644
--- a/extras/xml/xml.doc.m
+++ b/extras/xml/xml.doc.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/extras/xml/xml.dtd.m b/extras/xml/xml.dtd.m
index 2d50208..f8f457c 100644
--- a/extras/xml/xml.dtd.m
+++ b/extras/xml/xml.dtd.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/extras/xml/xml.encoding.m b/extras/xml/xml.encoding.m
index 0e3162c..c3d0801 100644
--- a/extras/xml/xml.encoding.m
+++ b/extras/xml/xml.encoding.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000-2001 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/extras/xml/xml.m b/extras/xml/xml.m
index cc38d22..9b69571 100644
--- a/extras/xml/xml.m
+++ b/extras/xml/xml.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2001 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/extras/xml/xml.ns.m b/extras/xml/xml.ns.m
index 22b79f7..803c45b 100644
--- a/extras/xml/xml.ns.m
+++ b/extras/xml/xml.ns.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2001, 2004-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: xml.ns.m
diff --git a/extras/xml/xml.parse.chars.m b/extras/xml/xml.parse.chars.m
index 1e9f4aa..8389c4c 100644
--- a/extras/xml/xml.parse.chars.m
+++ b/extras/xml/xml.parse.chars.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/extras/xml/xml.parse.m b/extras/xml/xml.parse.m
index fe9b5c9..2470960 100644
--- a/extras/xml/xml.parse.m
+++ b/extras/xml/xml.parse.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2005-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Main author: conway at cs.mu.oz.au.
diff --git a/grade_lib/choose_grade.m b/grade_lib/choose_grade.m
index 059b068..391db95 100644
--- a/grade_lib/choose_grade.m
+++ b/grade_lib/choose_grade.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2016 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This is a program for testing the grade library. It is intended to be used
diff --git a/grade_lib/grade_lib.m b/grade_lib/grade_lib.m
index 2631a0e..7ac8bb3 100644
--- a/grade_lib/grade_lib.m
+++ b/grade_lib/grade_lib.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2016 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This is the top module of a library that handles grades.
diff --git a/grade_lib/grade_setup.m b/grade_lib/grade_setup.m
index 67cb502..5b73d0d 100644
--- a/grade_lib/grade_setup.m
+++ b/grade_lib/grade_setup.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2016 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This module provides predicates that set up a grade problem to be solved.
diff --git a/grade_lib/grade_solver.m b/grade_lib/grade_solver.m
index e26f30d..361ece9 100644
--- a/grade_lib/grade_solver.m
+++ b/grade_lib/grade_solver.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2016 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This module implements the solver for grade problems.
diff --git a/grade_lib/grade_spec.m b/grade_lib/grade_spec.m
index 8cf4621..0d10f1f 100644
--- a/grade_lib/grade_spec.m
+++ b/grade_lib/grade_spec.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2016, 2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This module defines the "terrain" on which the grade solver operates,
diff --git a/grade_lib/grade_state.m b/grade_lib/grade_state.m
index f82f581..b3d9b6c 100644
--- a/grade_lib/grade_state.m
+++ b/grade_lib/grade_state.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2016 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This module defines the state of the constraint solver.
diff --git a/grade_lib/grade_string.m b/grade_lib/grade_string.m
index 313e0c3..675d8bd 100644
--- a/grade_lib/grade_string.m
+++ b/grade_lib/grade_string.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2016, 2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This module provides the means to convert grade structures to strings,
diff --git a/grade_lib/grade_structure.m b/grade_lib/grade_structure.m
index c1dc1e5..7a30c01 100644
--- a/grade_lib/grade_structure.m
+++ b/grade_lib/grade_structure.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2016, 2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % The grade structure is intended to be the tightest possible type
diff --git a/grade_lib/grade_vars.m b/grade_lib/grade_vars.m
index eb2d46b..36d9a35 100644
--- a/grade_lib/grade_vars.m
+++ b/grade_lib/grade_vars.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2016, 2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This module defines grade_vars, a representation for grades that allows
diff --git a/grade_lib/test_grades.m b/grade_lib/test_grades.m
index 9b55132..7877248 100644
--- a/grade_lib/test_grades.m
+++ b/grade_lib/test_grades.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2016 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Test the solver by giving it a set of grade problems to solve,
diff --git a/grade_lib/try_all_grade_structs.m b/grade_lib/try_all_grade_structs.m
index bb80afb..153348e 100644
--- a/grade_lib/try_all_grade_structs.m
+++ b/grade_lib/try_all_grade_structs.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2016, 2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % A test program that checks whether all the possible values of the grade
diff --git a/grade_lib/var_value_names.m b/grade_lib/var_value_names.m
index d5c2e73..64468ae 100644
--- a/grade_lib/var_value_names.m
+++ b/grade_lib/var_value_names.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2016, 2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % Maps the solver_var_ids and solver_var_value_ids to strings and vice versa.
diff --git a/java/runtime/Commit.java b/java/runtime/Commit.java
index 851748e..d6203ac 100644
--- a/java/runtime/Commit.java
+++ b/java/runtime/Commit.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2002 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2017-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This is a throwable class used for the Java implementation of commits.
 // 
diff --git a/java/runtime/Constants.java.in b/java/runtime/Constants.java.in
index 2731d32..d10c308 100644
--- a/java/runtime/Constants.java.in
+++ b/java/runtime/Constants.java.in
@@ -1,8 +1,8 @@
 // @configure_input@
 //
 // Copyright (C) 2001-2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This class is used to store miscellaneous Mercury-related constants.
 // At the moment it just stores the library version.
diff --git a/java/runtime/DuArgLocn.java b/java/runtime/DuArgLocn.java
index 7e9ff5b..2f21028 100644
--- a/java/runtime/DuArgLocn.java
+++ b/java/runtime/DuArgLocn.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/DuExistInfo.java b/java/runtime/DuExistInfo.java
index 3860f8b..35f7760 100644
--- a/java/runtime/DuExistInfo.java
+++ b/java/runtime/DuExistInfo.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/DuExistLocn.java b/java/runtime/DuExistLocn.java
index abb2db8..1360348 100644
--- a/java/runtime/DuExistLocn.java
+++ b/java/runtime/DuExistLocn.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2003 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/DuFunctorDesc.java b/java/runtime/DuFunctorDesc.java
index edc4174..b429224 100644
--- a/java/runtime/DuFunctorDesc.java
+++ b/java/runtime/DuFunctorDesc.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2004, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/DuPtagLayout.java b/java/runtime/DuPtagLayout.java
index 993eed6..f0b2473 100644
--- a/java/runtime/DuPtagLayout.java
+++ b/java/runtime/DuPtagLayout.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2003 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/EnumFunctorDesc.java b/java/runtime/EnumFunctorDesc.java
index 84077a2..dc49364 100644
--- a/java/runtime/EnumFunctorDesc.java
+++ b/java/runtime/EnumFunctorDesc.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2003 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/Exception.java b/java/runtime/Exception.java
index 6d8594f..ebed1fd 100644
--- a/java/runtime/Exception.java
+++ b/java/runtime/Exception.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/ForeignEnumFunctorDesc.java b/java/runtime/ForeignEnumFunctorDesc.java
index e69d35a..2132065 100644
--- a/java/runtime/ForeignEnumFunctorDesc.java
+++ b/java/runtime/ForeignEnumFunctorDesc.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/FunctorSubtypeInfo.java b/java/runtime/FunctorSubtypeInfo.java
index c5b1e9c..daa0fcb 100644
--- a/java/runtime/FunctorSubtypeInfo.java
+++ b/java/runtime/FunctorSubtypeInfo.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2016 The Mercury Team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury Team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/Getopt.java b/java/runtime/Getopt.java
index ff9a185..0d676a9 100644
--- a/java/runtime/Getopt.java
+++ b/java/runtime/Getopt.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2014 The Mercury Team 
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2018 The Mercury Team
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/JavaInternal.java b/java/runtime/JavaInternal.java
index 8a22374..1b19a0a 100644
--- a/java/runtime/JavaInternal.java
+++ b/java/runtime/JavaInternal.java
@@ -1,8 +1,7 @@
 //
 // Copyright (C) 2001-2003, 2009 The University of Melbourne.
-// Copyright (C) 2014 The Mercury Team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2017-2018 The Mercury Team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // All modifications to this file will require changes to:
 // compiler/mlds_to_java.m
diff --git a/java/runtime/MaybeResAddrFunctorDesc.java b/java/runtime/MaybeResAddrFunctorDesc.java
index 098fba5..fd10cff 100644
--- a/java/runtime/MaybeResAddrFunctorDesc.java
+++ b/java/runtime/MaybeResAddrFunctorDesc.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2003 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/MaybeResFunctorDesc.java b/java/runtime/MaybeResFunctorDesc.java
index db56fac..be6a309 100644
--- a/java/runtime/MaybeResFunctorDesc.java
+++ b/java/runtime/MaybeResFunctorDesc.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2003 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/MercuryBitmap.java b/java/runtime/MercuryBitmap.java
index 1ce266a..0c683a3 100644
--- a/java/runtime/MercuryBitmap.java
+++ b/java/runtime/MercuryBitmap.java
@@ -1,8 +1,7 @@
 //
 // Copyright (C) 2001-2002, 2004-2007, 2009-2011 The University of Melbourne
-// Copyright (C) 2014 The Mercury Team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2018 The Mercury Team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/MercuryEnum.java b/java/runtime/MercuryEnum.java
index ff7fd6c..1cbe0b6 100644
--- a/java/runtime/MercuryEnum.java
+++ b/java/runtime/MercuryEnum.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This is the superclass of all classes generated by the Java back-end
 // which correspond to Mercury-defined enumeration types.
diff --git a/java/runtime/MercuryOptions.java b/java/runtime/MercuryOptions.java
index b96323b..472cbb1 100644
--- a/java/runtime/MercuryOptions.java
+++ b/java/runtime/MercuryOptions.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2014 The Mercury Team 
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury Team
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/MercuryRuntime.java b/java/runtime/MercuryRuntime.java
index f25ea44..ff03bcf 100644
--- a/java/runtime/MercuryRuntime.java
+++ b/java/runtime/MercuryRuntime.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2014 The Mercury Team
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2018 The Mercury Team
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/MercuryThread.java b/java/runtime/MercuryThread.java
index 49a4b57..b1a45dc 100644
--- a/java/runtime/MercuryThread.java
+++ b/java/runtime/MercuryThread.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2014 The Mercury Team 
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2018 The Mercury Team
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/MercuryThreadPool.java b/java/runtime/MercuryThreadPool.java
index ddbf778..d16e466 100644
--- a/java/runtime/MercuryThreadPool.java
+++ b/java/runtime/MercuryThreadPool.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2014 The Mercury Team
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury Team
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/MercuryType.java b/java/runtime/MercuryType.java
index b78e3aa..b0417fc 100644
--- a/java/runtime/MercuryType.java
+++ b/java/runtime/MercuryType.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by all classes generated by the Java back-end
 // which correspond to Mercury-defined types.
diff --git a/java/runtime/MercuryWorkerThread.java b/java/runtime/MercuryWorkerThread.java
index df9dc7a..6c28687 100644
--- a/java/runtime/MercuryWorkerThread.java
+++ b/java/runtime/MercuryWorkerThread.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2014 The Mercury Team 
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury Team
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/MethodPtr.java b/java/runtime/MethodPtr.java
index a0002f5..d0d2f34 100644
--- a/java/runtime/MethodPtr.java
+++ b/java/runtime/MethodPtr.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2002 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically 
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr1.java b/java/runtime/MethodPtr1.java
index 5d1a8d3..900080d 100644
--- a/java/runtime/MethodPtr1.java
+++ b/java/runtime/MethodPtr1.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr10.java b/java/runtime/MethodPtr10.java
index c07626e..4fdeee3 100644
--- a/java/runtime/MethodPtr10.java
+++ b/java/runtime/MethodPtr10.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr11.java b/java/runtime/MethodPtr11.java
index 302fcb4..96a136e 100644
--- a/java/runtime/MethodPtr11.java
+++ b/java/runtime/MethodPtr11.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr12.java b/java/runtime/MethodPtr12.java
index 5d3ab2d..7c43417 100644
--- a/java/runtime/MethodPtr12.java
+++ b/java/runtime/MethodPtr12.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr13.java b/java/runtime/MethodPtr13.java
index f54fbaf..d421800 100644
--- a/java/runtime/MethodPtr13.java
+++ b/java/runtime/MethodPtr13.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr14.java b/java/runtime/MethodPtr14.java
index 40884c2..a846430 100644
--- a/java/runtime/MethodPtr14.java
+++ b/java/runtime/MethodPtr14.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr15.java b/java/runtime/MethodPtr15.java
index bd5a643..99ffa20 100644
--- a/java/runtime/MethodPtr15.java
+++ b/java/runtime/MethodPtr15.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr2.java b/java/runtime/MethodPtr2.java
index cd10bf5..04b42ee 100644
--- a/java/runtime/MethodPtr2.java
+++ b/java/runtime/MethodPtr2.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr3.java b/java/runtime/MethodPtr3.java
index 6603937..6662af6 100644
--- a/java/runtime/MethodPtr3.java
+++ b/java/runtime/MethodPtr3.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr4.java b/java/runtime/MethodPtr4.java
index cd13bfc..f3ea5ba 100644
--- a/java/runtime/MethodPtr4.java
+++ b/java/runtime/MethodPtr4.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr5.java b/java/runtime/MethodPtr5.java
index 0ab7d07..86a8da8 100644
--- a/java/runtime/MethodPtr5.java
+++ b/java/runtime/MethodPtr5.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr6.java b/java/runtime/MethodPtr6.java
index 02002fe..1ed220a 100644
--- a/java/runtime/MethodPtr6.java
+++ b/java/runtime/MethodPtr6.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr7.java b/java/runtime/MethodPtr7.java
index cc1443f..89d9e2c 100644
--- a/java/runtime/MethodPtr7.java
+++ b/java/runtime/MethodPtr7.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr8.java b/java/runtime/MethodPtr8.java
index 61b6ce1..fc68aaa 100644
--- a/java/runtime/MethodPtr8.java
+++ b/java/runtime/MethodPtr8.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtr9.java b/java/runtime/MethodPtr9.java
index d0f8b73..fd68193 100644
--- a/java/runtime/MethodPtr9.java
+++ b/java/runtime/MethodPtr9.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/MethodPtrN.java b/java/runtime/MethodPtrN.java
index 8831934..14dcc2c 100644
--- a/java/runtime/MethodPtrN.java
+++ b/java/runtime/MethodPtrN.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This interface is implemented by wrapper classes which are automatically
 // generated by the Java back-end to implement method pointers in Java.
diff --git a/java/runtime/Mmakefile b/java/runtime/Mmakefile
index de92a61..7219926 100644
--- a/java/runtime/Mmakefile
+++ b/java/runtime/Mmakefile
@@ -3,8 +3,8 @@
 #-----------------------------------------------------------------------------#
 
 # Copyright (C) 2004 The University of Melbourne.
-# This file may only be copied under the terms of the GNU Library General
-# Public License - see the file COPYING.LIB in the Mercury distribution.
+# Copyright (C) 2015, 2018 The Mercury team.
+# This file is distributed under the terms specified in COPYING.LIB.
 #
 # This Makefile compiles the shared object for use with
 # jmercury.runtime.Native
diff --git a/java/runtime/Native.c b/java/runtime/Native.c
index 977ff6c..fb7bb11 100644
--- a/java/runtime/Native.c
+++ b/java/runtime/Native.c
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 2004, 2006 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 /*
diff --git a/java/runtime/Native.java.in b/java/runtime/Native.java.in
index 5b0726d..6975758 100644
--- a/java/runtime/Native.java.in
+++ b/java/runtime/Native.java.in
@@ -1,8 +1,8 @@
 // @configure_input@
 //
 // Copyright (C) 2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 //
 // This class exists to provide any native functionality required by the Java
diff --git a/java/runtime/NotagFunctorDesc.java b/java/runtime/NotagFunctorDesc.java
index 1ff3d2f..3bc4079 100644
--- a/java/runtime/NotagFunctorDesc.java
+++ b/java/runtime/NotagFunctorDesc.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2003 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/PredFunc.java b/java/runtime/PredFunc.java
index 5868d83..62ff062 100644
--- a/java/runtime/PredFunc.java
+++ b/java/runtime/PredFunc.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/PseudoTypeInfo.java b/java/runtime/PseudoTypeInfo.java
index 45d9a77..8ca414e 100644
--- a/java/runtime/PseudoTypeInfo.java
+++ b/java/runtime/PseudoTypeInfo.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2004, 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/Ref.java b/java/runtime/Ref.java
index 00b07be..7b40c05 100644
--- a/java/runtime/Ref.java
+++ b/java/runtime/Ref.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This class is used in some cases to hold output values of Mercury
 // procedures exported to Java.
diff --git a/java/runtime/ReservedAddrFunctorDesc.java b/java/runtime/ReservedAddrFunctorDesc.java
index 3b9ecc5..2c4b505 100644
--- a/java/runtime/ReservedAddrFunctorDesc.java
+++ b/java/runtime/ReservedAddrFunctorDesc.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2003-2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 // This corresponds to the C type MR_ReservedAddrFunctorDesc
diff --git a/java/runtime/Sectag_Locn.java b/java/runtime/Sectag_Locn.java
index d166c14..ec466a0 100644
--- a/java/runtime/Sectag_Locn.java
+++ b/java/runtime/Sectag_Locn.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2002 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/Semaphore.java b/java/runtime/Semaphore.java
index f09ebb6..cbfb9de 100644
--- a/java/runtime/Semaphore.java
+++ b/java/runtime/Semaphore.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2014 The Mercury Team
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2018 The Mercury Team
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/Task.java b/java/runtime/Task.java
index 1a2b947..7de478c 100644
--- a/java/runtime/Task.java
+++ b/java/runtime/Task.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2014 The Mercury Team 
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2018 The Mercury Team
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/ThreadStatus.java b/java/runtime/ThreadStatus.java
index 2f40d0f..6eaa454 100644
--- a/java/runtime/ThreadStatus.java
+++ b/java/runtime/ThreadStatus.java
@@ -1,7 +1,6 @@
 //
-// Copyright (C) 2014 The Mercury Team 
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2018 The Mercury Team
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/TypeClassConstraint.java b/java/runtime/TypeClassConstraint.java
index c64b502..34dc258 100644
--- a/java/runtime/TypeClassConstraint.java
+++ b/java/runtime/TypeClassConstraint.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/TypeClassDeclStruct.java b/java/runtime/TypeClassDeclStruct.java
index d643806..07a15b8 100644
--- a/java/runtime/TypeClassDeclStruct.java
+++ b/java/runtime/TypeClassDeclStruct.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/TypeClassId.java b/java/runtime/TypeClassId.java
index efdcf56..029dbf8 100644
--- a/java/runtime/TypeClassId.java
+++ b/java/runtime/TypeClassId.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/TypeClassMethod.java b/java/runtime/TypeClassMethod.java
index c51d3c5..3d7cdb8 100644
--- a/java/runtime/TypeClassMethod.java
+++ b/java/runtime/TypeClassMethod.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/TypeCtorInfo_Struct.java b/java/runtime/TypeCtorInfo_Struct.java
index 788ded1..3f48805 100644
--- a/java/runtime/TypeCtorInfo_Struct.java
+++ b/java/runtime/TypeCtorInfo_Struct.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2004, 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/TypeCtorRep.java b/java/runtime/TypeCtorRep.java
index 280d8ed..1f812ed 100644
--- a/java/runtime/TypeCtorRep.java
+++ b/java/runtime/TypeCtorRep.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/TypeFunctors.java b/java/runtime/TypeFunctors.java
index dd5cad2..3e17117 100644
--- a/java/runtime/TypeFunctors.java
+++ b/java/runtime/TypeFunctors.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2003, 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/TypeInfo_Struct.java b/java/runtime/TypeInfo_Struct.java
index c7f8151..65be692 100644
--- a/java/runtime/TypeInfo_Struct.java
+++ b/java/runtime/TypeInfo_Struct.java
@@ -1,7 +1,7 @@
 //
-// Copyright (C) 2001-2004, 2011, 2014 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2001-2004, 2011 The University of Melbourne.
+// Copyright (C) 2014, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 package jmercury.runtime;
diff --git a/java/runtime/TypeLayout.java b/java/runtime/TypeLayout.java
index 91fdab1..e46b08c 100644
--- a/java/runtime/TypeLayout.java
+++ b/java/runtime/TypeLayout.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2003 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 	
 package jmercury.runtime;
diff --git a/java/runtime/UnreachableDefault.java b/java/runtime/UnreachableDefault.java
index dc4c510..568fc92 100644
--- a/java/runtime/UnreachableDefault.java
+++ b/java/runtime/UnreachableDefault.java
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2001-2002 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 // This exception signals when an unreachable default case of of a switch
 // statement is reached.
diff --git a/library/array.m b/library/array.m
index 1e38f4a..7473dc8 100644
--- a/library/array.m
+++ b/library/array.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-1995, 1997-2012 The University of Melbourne.
 % Copyright (C) 2013-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: array.m.
diff --git a/library/array2d.m b/library/array2d.m
index fa97349..648f960 100644
--- a/library/array2d.m
+++ b/library/array2d.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2003, 2005-2007, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: array2d.m.
diff --git a/library/assoc_list.m b/library/assoc_list.m
index 6a65c25..3f1a072 100644
--- a/library/assoc_list.m
+++ b/library/assoc_list.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-1997, 1999-2001, 2004-2006, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: assoc_list.m.
diff --git a/library/backjump.m b/library/backjump.m
index 4d6366f..9af307b 100644
--- a/library/backjump.m
+++ b/library/backjump.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: backjump.m
diff --git a/library/bag.m b/library/bag.m
index be17484..88f9659 100644
--- a/library/bag.m
+++ b/library/bag.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1999, 2003-2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: bag.m.
diff --git a/library/benchmarking.m b/library/benchmarking.m
index e9dd993..8104070 100644
--- a/library/benchmarking.m
+++ b/library/benchmarking.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: benchmarking.m.
diff --git a/library/bimap.m b/library/bimap.m
index 4c21a04..b98c4a4 100644
--- a/library/bimap.m
+++ b/library/bimap.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et tw=0 wm=0 ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1995,1997,1999,2004-2006,2008,2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: bimap.m.
diff --git a/library/bit_buffer.m b/library/bit_buffer.m
index d18350c..2f3c0f8 100644
--- a/library/bit_buffer.m
+++ b/library/bit_buffer.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007, 2009 The University of Melbourne
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 % File: bit_buffer.m.
 % Main author: stayl.
diff --git a/library/bit_buffer.read.m b/library/bit_buffer.read.m
index 900d937..dfad569 100644
--- a/library/bit_buffer.read.m
+++ b/library/bit_buffer.read.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et tw=0 wm=0 ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007, 2010-2011 The University of Melbourne
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 % File: bit_buffer.read.m.
 % Main author: stayl.
diff --git a/library/bit_buffer.write.m b/library/bit_buffer.write.m
index e762773..2a9f32a 100644
--- a/library/bit_buffer.write.m
+++ b/library/bit_buffer.write.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et tw=0 wm=0 ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007, 2011 The University of Melbourne
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 % File: bit_buffer.write.m.
 % Main author: stayl.
diff --git a/library/bitmap.m b/library/bitmap.m
index 94a431e..78c74ee 100644
--- a/library/bitmap.m
+++ b/library/bitmap.m
@@ -2,9 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2001-2002, 2004-2007, 2009-2011 The University of Melbourne
-% Copyright (C) 2013-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: bitmap.m.
diff --git a/library/bool.m b/library/bool.m
index a87d480..b8b98a8 100644
--- a/library/bool.m
+++ b/library/bool.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1996-1997,2000,2002-2007,2009-2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: bool.m.
diff --git a/library/bt_array.m b/library/bt_array.m
index c5be4ac..a08ae76 100644
--- a/library/bt_array.m
+++ b/library/bt_array.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1997,1999-2000,2002-2003,2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: bt_array.m
diff --git a/library/builtin.m b/library/builtin.m
index 643359d..08198e6 100644
--- a/library/builtin.m
+++ b/library/builtin.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2007, 2010-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: builtin.m.
diff --git a/library/calendar.m b/library/calendar.m
index 2abf9c5..2db1b30 100644
--- a/library/calendar.m
+++ b/library/calendar.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2009-2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: calendar.m.
diff --git a/library/char.m b/library/char.m
index 73b0b80..c428087 100644
--- a/library/char.m
+++ b/library/char.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2008, 2011 The University of Melbourne.
-% Copyright (C) 2013-2015, 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: char.m.
diff --git a/library/construct.m b/library/construct.m
index 4def437..8c8238f 100644
--- a/library/construct.m
+++ b/library/construct.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2002-2009, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: construct.m.
diff --git a/library/cord.m b/library/cord.m
index c0cb988..b24f5a1 100644
--- a/library/cord.m
+++ b/library/cord.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2002-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: cord.m.
diff --git a/library/counter.m b/library/counter.m
index 37a542b..0471815 100644
--- a/library/counter.m
+++ b/library/counter.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2005-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: counter.m.
diff --git a/library/deconstruct.m b/library/deconstruct.m
index 6cdeb18..85e4d68 100644
--- a/library/deconstruct.m
+++ b/library/deconstruct.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2002-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: deconstruct.m.
diff --git a/library/diet.m b/library/diet.m
index c232c10..095203d 100644
--- a/library/diet.m
+++ b/library/diet.m
@@ -1,10 +1,9 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury team.
 % Copyright (C) 2012-2014 YesLogic Pty. Ltd.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: diet.m.
diff --git a/library/digraph.m b/library/digraph.m
index 0201f70..f04d147 100644
--- a/library/digraph.m
+++ b/library/digraph.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-1999,2002-2007,2010-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: digraph.m
diff --git a/library/dir.m b/library/dir.m
index 9a66481..13eaf31 100644
--- a/library/dir.m
+++ b/library/dir.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1995,1997,1999-2000,2002-2012 The University of Melbourne.
-% Copyright (C) 2016 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: dir.m.
diff --git a/library/enum.m b/library/enum.m
index 034a5b2..e17e30d 100644
--- a/library/enum.m
+++ b/library/enum.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000, 2005-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: enum.m.
diff --git a/library/eqvclass.m b/library/eqvclass.m
index 32fc0c5..c3e9cca 100644
--- a/library/eqvclass.m
+++ b/library/eqvclass.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-1997, 1999, 2003-2006, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: eqvclass.m.
diff --git a/library/erlang_builtin.m b/library/erlang_builtin.m
index c3f1986..294983e 100644
--- a/library/erlang_builtin.m
+++ b/library/erlang_builtin.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: erlang_builtin.m.
diff --git a/library/erlang_conf.hrl.in b/library/erlang_conf.hrl.in
index 4fa064d..a9a68c7 100644
--- a/library/erlang_conf.hrl.in
+++ b/library/erlang_conf.hrl.in
@@ -3,8 +3,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: erlang_conf.hrl.in.
diff --git a/library/erlang_rtti_implementation.m b/library/erlang_rtti_implementation.m
index 543b31b..1a2978a 100644
--- a/library/erlang_rtti_implementation.m
+++ b/library/erlang_rtti_implementation.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007, 2009-2012 The University of Melbourne.
-% Copyright (C) 2014-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: erlang_rtti_implementation.m.
diff --git a/library/exception.m b/library/exception.m
index 61aa17a..d770d2f 100644
--- a/library/exception.m
+++ b/library/exception.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1997-2008, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: exception.m.
diff --git a/library/fat_sparse_bitset.m b/library/fat_sparse_bitset.m
index d0a7623..78e7298 100644
--- a/library/fat_sparse_bitset.m
+++ b/library/fat_sparse_bitset.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2011-2012 The University of Melbourne.
 % Copyright (C) 2014, 2016-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: fat_sparse_bitset.m.
diff --git a/library/float.m b/library/float.m
index 2e8e3ca..073b5e2 100644
--- a/library/float.m
+++ b/library/float.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1998,2001-2008,2010, 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: float.m.
diff --git a/library/gc.m b/library/gc.m
index 0af389c..8bcf60c 100644
--- a/library/gc.m
+++ b/library/gc.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999,2001-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: gc.m.
diff --git a/library/getopt.m b/library/getopt.m
index 1257e9c..be2841f 100644
--- a/library/getopt.m
+++ b/library/getopt.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1999,2001-2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: getopt.m.
diff --git a/library/getopt_io.m b/library/getopt_io.m
index fec0a2b..d336e7d 100644
--- a/library/getopt_io.m
+++ b/library/getopt_io.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: getopt_io.m
diff --git a/library/hash_table.m b/library/hash_table.m
index 8d3334d..e2d7fd8 100644
--- a/library/hash_table.m
+++ b/library/hash_table.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2001, 2003-2006, 2010-2012 The University of Melbourne
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: hash_table.m.
diff --git a/library/injection.m b/library/injection.m
index da6a3f7..75dc06d 100644
--- a/library/injection.m
+++ b/library/injection.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: injection.m.
diff --git a/library/int.m b/library/int.m
index cc8f553..36db38c 100644
--- a/library/int.m
+++ b/library/int.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2012 The University of Melbourne.
 % Copyright (C) 2013-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: int.m.
diff --git a/library/int16.m b/library/int16.m
index f9ab1ea..a40b82c 100644
--- a/library/int16.m
+++ b/library/int16.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2017-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: int16.m
diff --git a/library/int32.m b/library/int32.m
index 7cd4782..32b6ee7 100644
--- a/library/int32.m
+++ b/library/int32.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2017-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: int32.m
diff --git a/library/int64.m b/library/int64.m
index e36354c..28d1eab 100644
--- a/library/int64.m
+++ b/library/int64.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: int64.m
diff --git a/library/int8.m b/library/int8.m
index 973621d..46f06af 100644
--- a/library/int8.m
+++ b/library/int8.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2017-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: int8.m
diff --git a/library/integer.m b/library/integer.m
index 9e3f5ab..2f6d4ce 100644
--- a/library/integer.m
+++ b/library/integer.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 1997-2000, 2003-2007, 2011-2012 The University of Melbourne.
 % Copyright (C) 2014-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: integer.m.
diff --git a/library/io.m b/library/io.m
index f93dde4..883d6c7 100644
--- a/library/io.m
+++ b/library/io.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2012 The University of Melbourne.
 % Copyright (C) 2013-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: io.m.
diff --git a/library/lazy.m b/library/lazy.m
index 1ed85ef..4736cde 100644
--- a/library/lazy.m
+++ b/library/lazy.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1999, 2006, 2009-2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % lazy.m - provides support for optional explicit lazy evaluation.
diff --git a/library/lexer.m b/library/lexer.m
index e106016..10d1bb2 100644
--- a/library/lexer.m
+++ b/library/lexer.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2000, 2003-2008, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: lexer.m.
diff --git a/library/library.m b/library/library.m
index c4ba781..3a6472a 100644
--- a/library/library.m
+++ b/library/library.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2007, 2009-2014 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This module imports all the modules in the Mercury library.
diff --git a/library/list.m b/library/list.m
index 7faab5f..50f805d 100644
--- a/library/list.m
+++ b/library/list.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: list.m.
diff --git a/library/map.m b/library/map.m
index 500d78d..b18e3be 100644
--- a/library/map.m
+++ b/library/map.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: map.m.
diff --git a/library/math.m b/library/math.m
index a8bb618..eebd56e 100644
--- a/library/math.m
+++ b/library/math.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-2007, 2011-2012 The University of Melbourne.
-% Copyright (C) 2014, 2016-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2016-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: math.m.
diff --git a/library/maybe.m b/library/maybe.m
index 4dc732f..d05817a 100644
--- a/library/maybe.m
+++ b/library/maybe.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2006, 2010-2011 The University of Melbourne.
-% Copyright (C) 2016 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016-2018 The Mercury Team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: maybe.m.
diff --git a/library/mer_std.m b/library/mer_std.m
index a8c2fa4..60de25c 100644
--- a/library/mer_std.m
+++ b/library/mer_std.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2002 University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 % File: mer_std.m
 % Main author: stayl
diff --git a/library/multi_map.m b/library/multi_map.m
index f6b07ca..1d7fe3a 100644
--- a/library/multi_map.m
+++ b/library/multi_map.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995, 1997, 2000, 2002-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: multi_map.m.
diff --git a/library/mutvar.m b/library/mutvar.m
index bd00bae..3986092 100644
--- a/library/mutvar.m
+++ b/library/mutvar.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2007, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: mutvar.m.
diff --git a/library/ops.m b/library/ops.m
index 4583709..ae03991 100644
--- a/library/ops.m
+++ b/library/ops.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-2008, 2010, 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: ops.m.
diff --git a/library/pair.m b/library/pair.m
index 8ecd958..a45d468 100644
--- a/library/pair.m
+++ b/library/pair.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: pair.m.
diff --git a/library/par_builtin.m b/library/par_builtin.m
index 9918f65c..c78b547 100644
--- a/library/par_builtin.m
+++ b/library/par_builtin.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=8 sw=4 sts=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2006-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: par_builtin.m.
diff --git a/library/parser.m b/library/parser.m
index 02c8eae..936ad2f 100644
--- a/library/parser.m
+++ b/library/parser.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-2001, 2003-2008, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: parser.m.
diff --git a/library/parsing_utils.m b/library/parsing_utils.m
index be1980a..876b0ec 100644
--- a/library/parsing_utils.m
+++ b/library/parsing_utils.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2009-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: parsing_utils.m
diff --git a/library/pprint.m b/library/pprint.m
index f9ecaa7..0d8f4de 100644
--- a/library/pprint.m
+++ b/library/pprint.m
@@ -2,9 +2,8 @@
 % vim:ts=4 sw=4 expandtab tw=0 wm=0 ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000-2007, 2010-2011 The University of Melbourne
-% Copyright (C) 2014-2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: pprint.m
diff --git a/library/pqueue.m b/library/pqueue.m
index a49a592..20f4f92 100644
--- a/library/pqueue.m
+++ b/library/pqueue.m
@@ -3,9 +3,8 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1995, 1997, 1999, 2003-2007, 2009 The University of
 % Melbourne.
-%
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: pqueue.m.
diff --git a/library/pretty_printer.m b/library/pretty_printer.m
index 320d361..260be9c 100644
--- a/library/pretty_printer.m
+++ b/library/pretty_printer.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 expandtab ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007, 2009-2011 The University of Melbourne
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: pretty_printer.m
diff --git a/library/private_builtin.m b/library/private_builtin.m
index 1cbb1fb..54407c4 100644
--- a/library/private_builtin.m
+++ b/library/private_builtin.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2007, 2012 The University of Melbourne.
 % Copyright (C) 2013-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: private_builtin.m.
diff --git a/library/profiling_builtin.m b/library/profiling_builtin.m
index 266bcba..1cc2e3b 100644
--- a/library/profiling_builtin.m
+++ b/library/profiling_builtin.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2001-2006, 2008, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: profiling_builtin.m.
diff --git a/library/prolog.m b/library/prolog.m
index 2f91a90..be560f3 100644
--- a/library/prolog.m
+++ b/library/prolog.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1997-2003, 2005-2006, 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: prolog.m.
diff --git a/library/psqueue.m b/library/psqueue.m
index dd2db0c..0d74cd0 100644
--- a/library/psqueue.m
+++ b/library/psqueue.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury Team
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury Team
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: psqueue.m.
diff --git a/library/queue.m b/library/queue.m
index d5132f5..e86165e 100644
--- a/library/queue.m
+++ b/library/queue.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1995, 1997-1999, 2003-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: queue.m.
diff --git a/library/random.m b/library/random.m
index 844c546..3383599 100644
--- a/library/random.m
+++ b/library/random.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1998,2001-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: random.m
diff --git a/library/ranges.m b/library/ranges.m
index 7720efe..65468ee 100644
--- a/library/ranges.m
+++ b/library/ranges.m
@@ -3,9 +3,8 @@
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2006-2009 The University of Melbourne.
 % Copyright (C) 2013-2016 Opturion Pty Ltd.
-% Copyright (C) 2017 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: ranges.m.
diff --git a/library/rational.m b/library/rational.m
index fb29793..ccf71cd 100644
--- a/library/rational.m
+++ b/library/rational.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1997-1998, 2003-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: rational.m.
diff --git a/library/rbtree.m b/library/rbtree.m
index e6ab37d..f9c3117 100644
--- a/library/rbtree.m
+++ b/library/rbtree.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-2000, 2003-2007, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: rbtree.m.
diff --git a/library/region_builtin.m b/library/region_builtin.m
index 130fc11..79f59b4 100644
--- a/library/region_builtin.m
+++ b/library/region_builtin.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007, 2009-2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: region_builtin.m.
diff --git a/library/require.m b/library/require.m
index b11199d..d058378 100644
--- a/library/require.m
+++ b/library/require.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-1999, 2003, 2005-2006, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: require.m.
diff --git a/library/robdd.m b/library/robdd.m
index e0a0992..e923967 100644
--- a/library/robdd.m
+++ b/library/robdd.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2001-2006, 2009, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: robdd.m.
diff --git a/library/rtree.m b/library/rtree.m
index 7c91136..08b86b6 100644
--- a/library/rtree.m
+++ b/library/rtree.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2006-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: rtree.m.
diff --git a/library/rtti_implementation.m b/library/rtti_implementation.m
index 0564a27..2a71710 100644
--- a/library/rtti_implementation.m
+++ b/library/rtti_implementation.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2001-2007, 2009-2011 The University of Melbourne.
 % Copyright (C) 2014-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: rtti_implementation.m.
diff --git a/library/set.m b/library/set.m
index 9e6fad6..23a8a2b 100644
--- a/library/set.m
+++ b/library/set.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1997, 1999-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: set.m.
diff --git a/library/set_bbbtree.m b/library/set_bbbtree.m
index f14f894..ff49d66 100644
--- a/library/set_bbbtree.m
+++ b/library/set_bbbtree.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-1997, 1999-2006, 2010-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: set_bbbtree.m.
diff --git a/library/set_ctree234.m b/library/set_ctree234.m
index 9df725d..916a59e 100644
--- a/library/set_ctree234.m
+++ b/library/set_ctree234.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006, 2010-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: set_ctree234.m.
diff --git a/library/set_ordlist.m b/library/set_ordlist.m
index d123179..505b8a7 100644
--- a/library/set_ordlist.m
+++ b/library/set_ordlist.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1996-1997,1999-2002, 2004-2006, 2008-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: set_ordlist.m.
diff --git a/library/set_tree234.m b/library/set_tree234.m
index c1f5e02..c916fd3 100644
--- a/library/set_tree234.m
+++ b/library/set_tree234.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2006, 2009-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: set_tree234.m.
diff --git a/library/set_unordlist.m b/library/set_unordlist.m
index 6bfc13c..8c7299b 100644
--- a/library/set_unordlist.m
+++ b/library/set_unordlist.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1995-1997,1999-2002, 2004-2006, 2010-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: set_unordlist.m.
diff --git a/library/solutions.m b/library/solutions.m
index beae9fc..f0745b0 100644
--- a/library/solutions.m
+++ b/library/solutions.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: solutions.m.
diff --git a/library/sparse_bitset.m b/library/sparse_bitset.m
index e04cb59..0737b15 100644
--- a/library/sparse_bitset.m
+++ b/library/sparse_bitset.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000-2007, 2011-2012 The University of Melbourne.
 % Copyright (C) 2014-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: sparse_bitset.m.
diff --git a/library/stack.m b/library/stack.m
index cde510b..40aa76a 100644
--- a/library/stack.m
+++ b/library/stack.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1995, 1997-1999, 2005-2006, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: stack.m.
diff --git a/library/std_util.m b/library/std_util.m
index ea4a5f2..7c919a4 100644
--- a/library/std_util.m
+++ b/library/std_util.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2006, 2008 The University of Melbourne.
-% Copyright (C) 2016 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016, 2018 The Mercury Team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: std_util.m.
diff --git a/library/stm_builtin.m b/library/stm_builtin.m
index e997ad7..c282e2d 100644
--- a/library/stm_builtin.m
+++ b/library/stm_builtin.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007-2009, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: stm_builtin.m.
diff --git a/library/store.m b/library/store.m
index 2a66c9a..c734267 100644
--- a/library/store.m
+++ b/library/store.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1997, 2000-2008, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: store.m.
diff --git a/library/stream.m b/library/stream.m
index 7fb2061..2b04357 100644
--- a/library/stream.m
+++ b/library/stream.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2006-2007, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: stream.m.
diff --git a/library/stream.string_writer.m b/library/stream.string_writer.m
index 8d5524a..c276831 100644
--- a/library/stream.string_writer.m
+++ b/library/stream.string_writer.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2006-2007, 2011 The University of Melbourne.
 % Copyright (C) 2014-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: stream.string_writer.m.
diff --git a/library/string.builder.m b/library/string.builder.m
index c0b429f..df1913a 100644
--- a/library/string.builder.m
+++ b/library/string.builder.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2006-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: string.builder.m.
diff --git a/library/string.format.m b/library/string.format.m
index e76dfee..cbb322f 100644
--- a/library/string.format.m
+++ b/library/string.format.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: string.format.m.
diff --git a/library/string.m b/library/string.m
index fc7b0a5..73939da 100644
--- a/library/string.m
+++ b/library/string.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2012 The University of Melbourne.
 % Copyright (C) 2013-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: string.m.
diff --git a/library/string.parse_runtime.m b/library/string.parse_runtime.m
index fab586d..2fd6e31 100644
--- a/library/string.parse_runtime.m
+++ b/library/string.parse_runtime.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: string.parse_runtime.m.
diff --git a/library/string.parse_util.m b/library/string.parse_util.m
index 69e931d..093e647 100644
--- a/library/string.parse_util.m
+++ b/library/string.parse_util.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: string.parse_runtime.m.
diff --git a/library/string.to_string.m b/library/string.to_string.m
index 9618375..c35c671 100644
--- a/library/string.to_string.m
+++ b/library/string.to_string.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: string.to_string.m.
diff --git a/library/table_builtin.m b/library/table_builtin.m
index 25aeb19..4fcd09b 100644
--- a/library/table_builtin.m
+++ b/library/table_builtin.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1998-2007, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: table_builtin.m.
diff --git a/library/table_statistics.m b/library/table_statistics.m
index 6032b6b..cc74bae 100644
--- a/library/table_statistics.m
+++ b/library/table_statistics.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: table_statistics.m.
diff --git a/library/term.m b/library/term.m
index 46b1fd2..a34f357 100644
--- a/library/term.m
+++ b/library/term.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2000,2003-2009,2011-2012 The University of Melbourne.
 % Copyright (C) 2014-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: term.m.
diff --git a/library/term_conversion.m b/library/term_conversion.m
index aeb1a44..221910f 100644
--- a/library/term_conversion.m
+++ b/library/term_conversion.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2015-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: term_conversion.m.
diff --git a/library/term_io.m b/library/term_io.m
index b1bed73..3fee715 100644
--- a/library/term_io.m
+++ b/library/term_io.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2006, 2009, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: term_io.m.
diff --git a/library/term_size_prof_builtin.m b/library/term_size_prof_builtin.m
index 3167396..8f37c27 100644
--- a/library/term_size_prof_builtin.m
+++ b/library/term_size_prof_builtin.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2003, 2005-2008 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: term_size_prof.m.
diff --git a/library/term_to_xml.m b/library/term_to_xml.m
index a20b4f5..e219f40 100644
--- a/library/term_to_xml.m
+++ b/library/term_to_xml.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2007, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: term_to_xml.m.
diff --git a/library/thread.barrier.m b/library/thread.barrier.m
index 0cf5204..a6062e6 100644
--- a/library/thread.barrier.m
+++ b/library/thread.barrier.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005, 2014 Mission Critical IT.
-% Copyright (C) 2014 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: thread.barrier.m
diff --git a/library/thread.channel.m b/library/thread.channel.m
index 639f454..0c3da2b 100644
--- a/library/thread.channel.m
+++ b/library/thread.channel.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000-2001, 2006-2007 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: thread.channel.m.
diff --git a/library/thread.future.m b/library/thread.future.m
index 270d86a..086a43e 100644
--- a/library/thread.future.m
+++ b/library/thread.future.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury Team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: thread.future.m.
diff --git a/library/thread.m b/library/thread.m
index 06302c7..2ae5d6a 100644
--- a/library/thread.m
+++ b/library/thread.m
@@ -4,8 +4,7 @@
 % Copyright (C) 2000-2001, 2003-2004, 2006-2008, 2010-2011 The University
 % of Melbourne.
 % Copyright (C) 2014-2018 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: thread.m.
diff --git a/library/thread.mvar.m b/library/thread.mvar.m
index 6a287d7..e4104e5 100644
--- a/library/thread.mvar.m
+++ b/library/thread.mvar.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000-2003, 2006-2007, 2011 The University of Melbourne.
-% Copyright (C) 2014, 2016 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2016, 2018 The Mercury Team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: thread.mvar.m.
diff --git a/library/thread.semaphore.m b/library/thread.semaphore.m
index 2fffef6..d758079 100644
--- a/library/thread.semaphore.m
+++ b/library/thread.semaphore.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2000-2001,2003-2004, 2006-2007, 2009-2011 The University of Melbourne.
-% Copyright (C) 2014 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury Team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: thread.semaphore.m.
diff --git a/library/time.m b/library/time.m
index 3285cc4..f6c1b80 100644
--- a/library/time.m
+++ b/library/time.m
@@ -5,8 +5,8 @@
 % "Feel free to use this code or parts of it any way you want."
 %
 % Some portions are Copyright (C) 1999-2007,2009-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: time.m.
diff --git a/library/tree234.m b/library/tree234.m
index d23ec47..3947867 100644
--- a/library/tree234.m
+++ b/library/tree234.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-1997,1999-2000,2002-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: tree234.m.
diff --git a/library/tree_bitset.m b/library/tree_bitset.m
index 71bd11e..43f0b92 100644
--- a/library/tree_bitset.m
+++ b/library/tree_bitset.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2006, 2009-2012 The University of Melbourne.
 % Copyright (C) 2014-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: tree_bitset.m.
diff --git a/library/type_desc.m b/library/type_desc.m
index c7b9c12..4fcf026 100644
--- a/library/type_desc.m
+++ b/library/type_desc.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2002-2007, 2009-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: type_desc.m.
diff --git a/library/uint.m b/library/uint.m
index a5d65a8..a95b79e 100644
--- a/library/uint.m
+++ b/library/uint.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
-% Copyright (C) 2016 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: uint.m
diff --git a/library/uint16.m b/library/uint16.m
index cb8ee03..30b2b3c 100644
--- a/library/uint16.m
+++ b/library/uint16.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2017-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: uint16.m
diff --git a/library/uint32.m b/library/uint32.m
index 5ce6745..14d079f 100644
--- a/library/uint32.m
+++ b/library/uint32.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2017-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: uint32.m
diff --git a/library/uint64.m b/library/uint64.m
index 7e9626c..285cb36 100644
--- a/library/uint64.m
+++ b/library/uint64.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: uint64.m
diff --git a/library/uint8.m b/library/uint8.m
index 181a74b..bcc4a39 100644
--- a/library/uint8.m
+++ b/library/uint8.m
@@ -2,8 +2,7 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2017-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: uint8.m
diff --git a/library/unit.m b/library/unit.m
index 7889efe..36dc34a 100644
--- a/library/unit.m
+++ b/library/unit.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2006 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: unit.m.
diff --git a/library/univ.m b/library/univ.m
index 7ac48a4..c81d6d5 100644
--- a/library/univ.m
+++ b/library/univ.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1994-2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: univ.m.
diff --git a/library/varset.m b/library/varset.m
index a243e75..377323c 100644
--- a/library/varset.m
+++ b/library/varset.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 1993-2000,2002-2007, 2009-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: varset.m.
diff --git a/library/version_array.m b/library/version_array.m
index ec42bc5..ee5a52e 100644
--- a/library/version_array.m
+++ b/library/version_array.m
@@ -2,10 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2004-2012 The University of Melbourne.
-% Copyright (C) 2014 The Mercury Team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
-% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
+% Copyright (C) 2014-2018 The Mercury Team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: version_array.m.
diff --git a/library/version_array2d.m b/library/version_array2d.m
index 8c53cd5..a8f8a16 100644
--- a/library/version_array2d.m
+++ b/library/version_array2d.m
@@ -1,8 +1,8 @@
+% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2004-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
-% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
+% Copyright (C) 2013-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: version_array2d.m.
diff --git a/library/version_bitmap.m b/library/version_bitmap.m
index b017d52..17f01f7 100644
--- a/library/version_bitmap.m
+++ b/library/version_bitmap.m
@@ -1,8 +1,8 @@
+% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2004-2007, 2010-2011 The University of Melbourne
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
-% vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
+% Copyright (C) 2013-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: version_bitmap.m.
diff --git a/library/version_hash_table.m b/library/version_hash_table.m
index 1c1ccc8..e672e50 100644
--- a/library/version_hash_table.m
+++ b/library/version_hash_table.m
@@ -3,8 +3,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2004-2006, 2010-2012 The University of Melbourne.
 % Copyright (C) 2013-2015, 2017-2018 The Mercury team.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: version_hash_table.m.
diff --git a/library/version_store.m b/library/version_store.m
index f1b84ab..842a518 100644
--- a/library/version_store.m
+++ b/library/version_store.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et wm=0 tw=0
 %---------------------------------------------------------------------------%
 % Copyright (C) 2004-2006, 2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013-2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: version_store.m.
diff --git a/mdbcomp/builtin_modules.m b/mdbcomp/builtin_modules.m
index 318bbab..99d3ea9 100644
--- a/mdbcomp/builtin_modules.m
+++ b/mdbcomp/builtin_modules.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury team.
-% This file may only be copied under the terms of the GNU General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This module contains information about various modules of the Mercury
diff --git a/mdbcomp/feedback.automatic_parallelism.m b/mdbcomp/feedback.automatic_parallelism.m
index ef7c531..5afc56e 100644
--- a/mdbcomp/feedback.automatic_parallelism.m
+++ b/mdbcomp/feedback.automatic_parallelism.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: feedback.automatic_parallelism.m.
diff --git a/mdbcomp/feedback.m b/mdbcomp/feedback.m
index bf0bc60..225b987 100644
--- a/mdbcomp/feedback.m
+++ b/mdbcomp/feedback.m
@@ -2,9 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2008-2011 The University of Melbourne.
-% Copyright (C) 2014 The Mercury team.
-% This file may only be copied under the terms of the GNU General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: feedback.m.
diff --git a/mdbcomp/mdbcomp.goal_path.m b/mdbcomp/mdbcomp.goal_path.m
index bcf77ba..929160c 100644
--- a/mdbcomp/mdbcomp.goal_path.m
+++ b/mdbcomp/mdbcomp.goal_path.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: goal_path.m
diff --git a/mdbcomp/mdbcomp.m b/mdbcomp/mdbcomp.m
index 4ea6704..f17773b 100644
--- a/mdbcomp/mdbcomp.m
+++ b/mdbcomp/mdbcomp.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2003, 2005-2006, 2010-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This is the top module of a library that contains information shared
diff --git a/mdbcomp/mer_mdbcomp.m b/mdbcomp/mer_mdbcomp.m
index 655b7bb..859cbaa 100644
--- a/mdbcomp/mer_mdbcomp.m
+++ b/mdbcomp/mer_mdbcomp.m
@@ -1,7 +1,7 @@
 %---------------------------------------------------------------------------%
 % Copyright (C) 2003, 2005 The University of Melbourne.
-% This file may only be copied under the terms of the GNU General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 % File: mer_mdbcomp.m
 %
diff --git a/mdbcomp/prim_data.m b/mdbcomp/prim_data.m
index b7b8078..b2a3082 100644
--- a/mdbcomp/prim_data.m
+++ b/mdbcomp/prim_data.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2009, 2011-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: prim_data.m.
diff --git a/mdbcomp/program_representation.m b/mdbcomp/program_representation.m
index bb50d53..e54a0c4 100644
--- a/mdbcomp/program_representation.m
+++ b/mdbcomp/program_representation.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2001-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: program_representation.m
diff --git a/mdbcomp/rtti_access.m b/mdbcomp/rtti_access.m
index 2b8cb80..de54d85 100644
--- a/mdbcomp/rtti_access.m
+++ b/mdbcomp/rtti_access.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2007, 2009-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: rtti_access.m.
diff --git a/mdbcomp/shared_utilities.m b/mdbcomp/shared_utilities.m
index 1866782..6078a7d 100644
--- a/mdbcomp/shared_utilities.m
+++ b/mdbcomp/shared_utilities.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % This module contains utility predicates that may be useful in several
diff --git a/mdbcomp/slice_and_dice.m b/mdbcomp/slice_and_dice.m
index 4e72a0b..1148869 100644
--- a/mdbcomp/slice_and_dice.m
+++ b/mdbcomp/slice_and_dice.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2007, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: dice.m
diff --git a/mdbcomp/sym_name.m b/mdbcomp/sym_name.m
index db75a48..fd0d67b 100644
--- a/mdbcomp/sym_name.m
+++ b/mdbcomp/sym_name.m
@@ -1,9 +1,8 @@
 %---------------------------------------------------------------------------%
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
-% Copyright (C) 2014 The Mercury team.
-% This file may only be copied under the terms of the GNU General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2014-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: sym_name.m.
diff --git a/mdbcomp/trace_counts.m b/mdbcomp/trace_counts.m
index c7dbe6d..ed262e1 100644
--- a/mdbcomp/trace_counts.m
+++ b/mdbcomp/trace_counts.m
@@ -2,8 +2,8 @@
 % vim: ts=4 sw=4 et ft=mercury
 %---------------------------------------------------------------------------%
 % Copyright (C) 2005-2008, 2010-2012 The University of Melbourne.
-% This file may only be copied under the terms of the GNU General
-% Public License - see the file COPYING in the Mercury distribution.
+% Copyright (C) 2014-2015, 2017-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: trace_counts.m.
diff --git a/runtime/machdeps/alpha_regs.h b/runtime/machdeps/alpha_regs.h
index 4361f4a..add5ed4 100644
--- a/runtime/machdeps/alpha_regs.h
+++ b/runtime/machdeps/alpha_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1994-1998, 2000 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 #ifndef MR_MACHDEPS_ALPHA_REGS_H
diff --git a/runtime/machdeps/arm_regs.h b/runtime/machdeps/arm_regs.h
index 7eb797c..958114d 100644
--- a/runtime/machdeps/arm_regs.h
+++ b/runtime/machdeps/arm_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 2005 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 #ifndef MR_MACHDEPS_ARM_REGS_H
 #define MR_MACHDEPS_ARM_REGS_H
diff --git a/runtime/machdeps/i386_regs.h b/runtime/machdeps/i386_regs.h
index 5ea3b35..cef49ed 100644
--- a/runtime/machdeps/i386_regs.h
+++ b/runtime/machdeps/i386_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1993-1998, 2000, 2003, 2007 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2016, 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 #ifndef MR_MACHDEPS_I386_REGS_H
 #define MR_MACHDEPS_I386_REGS_H
diff --git a/runtime/machdeps/ia64_regs.h b/runtime/machdeps/ia64_regs.h
index 21d3c76..a988208 100644
--- a/runtime/machdeps/ia64_regs.h
+++ b/runtime/machdeps/ia64_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 2004 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 #ifndef MR_MACHDEPS_IA64_REGS_H
diff --git a/runtime/machdeps/m68k.h b/runtime/machdeps/m68k.h
index 6b751f2..50b1e00 100644
--- a/runtime/machdeps/m68k.h
+++ b/runtime/machdeps/m68k.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1997, 2000 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 #ifndef MR_MACHDEPS_M68K_REGS_H
 #define MR_MACHDEPS_M68K_REGS_H
diff --git a/runtime/machdeps/mips_regs.h b/runtime/machdeps/mips_regs.h
index 83a77da..6a7cdd3 100644
--- a/runtime/machdeps/mips_regs.h
+++ b/runtime/machdeps/mips_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1993-1997, 2000 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 #ifndef MR_MACHDEPS_MIPS_REGS_H
 #define MR_MACHDEPS_MIPS_REGS_H
diff --git a/runtime/machdeps/no_regs.h b/runtime/machdeps/no_regs.h
index a98b241..2ca4074 100644
--- a/runtime/machdeps/no_regs.h
+++ b/runtime/machdeps/no_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1994-1998, 2000 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 #ifndef MR_MACHDEPS_NO_REGS_H
 #define MR_MACHDEPS_NO_REGS_H
diff --git a/runtime/machdeps/pa_regs.h b/runtime/machdeps/pa_regs.h
index 9a69dce..dd3d836 100644
--- a/runtime/machdeps/pa_regs.h
+++ b/runtime/machdeps/pa_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1994-1997, 2000 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 #ifndef MR_MACHDEPS_PA_REGS_H
diff --git a/runtime/machdeps/regtest.c b/runtime/machdeps/regtest.c
index f0ee574..c967932 100644
--- a/runtime/machdeps/regtest.c
+++ b/runtime/machdeps/regtest.c
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1993, 1997, 1999 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 /*
diff --git a/runtime/machdeps/regtest2.c b/runtime/machdeps/regtest2.c
index e6ecaeb..caa895b 100644
--- a/runtime/machdeps/regtest2.c
+++ b/runtime/machdeps/regtest2.c
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1993, 1997, 1999 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 /*
diff --git a/runtime/machdeps/rs6000_regs.h b/runtime/machdeps/rs6000_regs.h
index 780b907..6c7915b 100644
--- a/runtime/machdeps/rs6000_regs.h
+++ b/runtime/machdeps/rs6000_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1996-1997, 2000, 2002 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 #ifndef MR_MACHDEPS_RS6000_REGS_H
diff --git a/runtime/machdeps/sparc_regs.h b/runtime/machdeps/sparc_regs.h
index cc98b95..6e8e60e 100644
--- a/runtime/machdeps/sparc_regs.h
+++ b/runtime/machdeps/sparc_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 1993-1997, 2000 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 #ifndef MR_MACHDEPS_SPARC_REGS_H
diff --git a/runtime/machdeps/x86_64_regs.h b/runtime/machdeps/x86_64_regs.h
index 4127be4..d23d8fd 100644
--- a/runtime/machdeps/x86_64_regs.h
+++ b/runtime/machdeps/x86_64_regs.h
@@ -1,7 +1,7 @@
 /*
 ** Copyright (C) 2005-2006 The University of Melbourne.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 #ifndef MR_MACHDEPS_X86_64_REGS_H
 #define MR_MACHDEPS_X86_64_REGS_H
diff --git a/runtime/mercury.c b/runtime/mercury.c
index d64e801..cefd3d8 100644
--- a/runtime/mercury.c
+++ b/runtime/mercury.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1999-2003, 2006, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury.c - This file defines the builtin functions, constants, etc. that
 // are used when generating high-level C code.
diff --git a/runtime/mercury.h b/runtime/mercury.h
index 490cc33..699dc97 100644
--- a/runtime/mercury.h
+++ b/runtime/mercury.h
@@ -2,8 +2,7 @@
 
 // Copyright (C) 1999-2006, 2011 The University of Melbourne.
 // Copyright (C) 2014, 2015-2016, 2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury.h - This file defines the macros, types, etc. that
 // are used when generating high-level C code.
diff --git a/runtime/mercury_accurate_gc.c b/runtime/mercury_accurate_gc.c
index 0499d4b..b5435ee 100644
--- a/runtime/mercury_accurate_gc.c
+++ b/runtime/mercury_accurate_gc.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007, 2009, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module contains the accurate garbage collector.
 //
diff --git a/runtime/mercury_accurate_gc.h b/runtime/mercury_accurate_gc.h
index 4a27182..fddfaa2 100644
--- a/runtime/mercury_accurate_gc.h
+++ b/runtime/mercury_accurate_gc.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-1998, 2000, 2002, 2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_ACCURATE_GC_H
 #define MERCURY_ACCURATE_GC_H
diff --git a/runtime/mercury_agc_debug.c b/runtime/mercury_agc_debug.c
index 59dff50..f7983ba 100644
--- a/runtime/mercury_agc_debug.c
+++ b/runtime/mercury_agc_debug.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007, 2009, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Debugging support for the accurate garbage collector.
 
diff --git a/runtime/mercury_agc_debug.h b/runtime/mercury_agc_debug.h
index 98465db..bd3ad20 100644
--- a/runtime/mercury_agc_debug.h
+++ b/runtime/mercury_agc_debug.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998, 2000, 2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_AGC_DEBUG_H
 #define MERCURY_AGC_DEBUG_H
diff --git a/runtime/mercury_array_macros.h b/runtime/mercury_array_macros.h
index 1903453..2b6ba8b 100644
--- a/runtime/mercury_array_macros.h
+++ b/runtime/mercury_array_macros.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2000,2002, 2004-2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_array_macros.h defines macros for dealing with expandable arrays.
 
diff --git a/runtime/mercury_atomic_ops.c b/runtime/mercury_atomic_ops.c
index 222bcdd..334ecf8 100644
--- a/runtime/mercury_atomic_ops.c
+++ b/runtime/mercury_atomic_ops.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007, 2009-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_atomic_ops.c
 
diff --git a/runtime/mercury_atomic_ops.h b/runtime/mercury_atomic_ops.h
index 7a51e99..ef6719c 100644
--- a/runtime/mercury_atomic_ops.h
+++ b/runtime/mercury_atomic_ops.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007, 2009-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_atomic.h - defines atomic operations and other primitives used by
 // the parallel runtime.
diff --git a/runtime/mercury_backjump.c b/runtime/mercury_backjump.c
index 5e16510..32b81c6 100644
--- a/runtime/mercury_backjump.c
+++ b/runtime/mercury_backjump.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2008 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_backjump.h"
 #include "mercury_thread.h"
diff --git a/runtime/mercury_backjump.h b/runtime/mercury_backjump.h
index 445bb1a..d73c41d 100644
--- a/runtime/mercury_backjump.h
+++ b/runtime/mercury_backjump.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2008, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_backjump.h - code for handling backjumping.
 
diff --git a/runtime/mercury_bitmap.c b/runtime/mercury_bitmap.c
index 3a443e0..9a85355 100644
--- a/runtime/mercury_bitmap.c
+++ b/runtime/mercury_bitmap.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_bitmap.c - bitmap handling
 
diff --git a/runtime/mercury_bitmap.h b/runtime/mercury_bitmap.h
index e27c4c9..f717889 100644
--- a/runtime/mercury_bitmap.h
+++ b/runtime/mercury_bitmap.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_bitmap.h - bitmap handling
 
diff --git a/runtime/mercury_builtin_types.c b/runtime/mercury_builtin_types.c
index a01a743..d0066ee 100644
--- a/runtime/mercury_builtin_types.c
+++ b/runtime/mercury_builtin_types.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002-2007, 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_builtin_types.c
 //
diff --git a/runtime/mercury_builtin_types.h b/runtime/mercury_builtin_types.h
index 8d06d88..52c5869 100644
--- a/runtime/mercury_builtin_types.h
+++ b/runtime/mercury_builtin_types.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002-2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_builtin_types.h
 //
diff --git a/runtime/mercury_builtin_types_proc_layouts.h b/runtime/mercury_builtin_types_proc_layouts.h
index fbc0ebf..a868fc6 100644
--- a/runtime/mercury_builtin_types_proc_layouts.h
+++ b/runtime/mercury_builtin_types_proc_layouts.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2004-2005, 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_builtin_types_proc_layouts.h
 //
diff --git a/runtime/mercury_calls.h b/runtime/mercury_calls.h
index 6f822ed..9e659be 100644
--- a/runtime/mercury_calls.h
+++ b/runtime/mercury_calls.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2000, 2004-2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_calls.h - definitions for calls and returns.
 
diff --git a/runtime/mercury_complexity.h b/runtime/mercury_complexity.h
index 67adc3a..9999eaa 100644
--- a/runtime/mercury_complexity.h
+++ b/runtime/mercury_complexity.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2003 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_complexity.h
 //
diff --git a/runtime/mercury_conf.h.in b/runtime/mercury_conf.h.in
index 5b48b3c..70b26e5 100644
--- a/runtime/mercury_conf.h.in
+++ b/runtime/mercury_conf.h.in
@@ -2,8 +2,7 @@
 
 // Copyright (C) 1995-2003, 2005-2012 The University of Melbourne.
 // Copyright (C) 2013-2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_conf.h.in defines various configuration parameters.
 //
diff --git a/runtime/mercury_conf_param.h b/runtime/mercury_conf_param.h
index 7ca02a9..4429281 100644
--- a/runtime/mercury_conf_param.h
+++ b/runtime/mercury_conf_param.h
@@ -2,8 +2,7 @@
 
 // Copyright (C) 1997-2007, 2009-2011 The University of Melbourne.
 // Copyright (C) 2013-2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_conf_param.h:
 // Defines various configuration parameters.
diff --git a/runtime/mercury_construct.c b/runtime/mercury_construct.c
index ad0fb64..8e1382a 100644
--- a/runtime/mercury_construct.c
+++ b/runtime/mercury_construct.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002-2005, 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_construct.c
 //
diff --git a/runtime/mercury_construct.h b/runtime/mercury_construct.h
index 10f5bf8..80f7f3b 100644
--- a/runtime/mercury_construct.h
+++ b/runtime/mercury_construct.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002, 2005, 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_construct.h
 //
diff --git a/runtime/mercury_context.c b/runtime/mercury_context.c
index 63e8194..dd965ba 100644
--- a/runtime/mercury_context.c
+++ b/runtime/mercury_context.c
@@ -2,8 +2,7 @@
 
 // Copyright (C) 1995-2007, 2009-2011 The University of Melbourne.
 // Copyright (C) 2014, 2016-2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_context.c - handles multithreading stuff.
 
diff --git a/runtime/mercury_context.h b/runtime/mercury_context.h
index 45a97d8..1764da0 100644
--- a/runtime/mercury_context.h
+++ b/runtime/mercury_context.h
@@ -2,8 +2,8 @@
 
 // Copyright (C) 1997-2007, 2009-2011 The University of Melbourne.
 // Copyright (C) 2014-2016, 2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_context.h - defines Mercury multithreading stuff.
 //
diff --git a/runtime/mercury_debug.c b/runtime/mercury_debug.c
index 4b42bfb..900ba57 100644
--- a/runtime/mercury_debug.c
+++ b/runtime/mercury_debug.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1996-2007, 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013-2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include    "mercury_imp.h"
 #include    "mercury_dlist.h"
diff --git a/runtime/mercury_debug.h b/runtime/mercury_debug.h
index 8cd5014..a9a1afd 100644
--- a/runtime/mercury_debug.h
+++ b/runtime/mercury_debug.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2003, 2006, 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_debug.h - definitions for debugging messages
 
diff --git a/runtime/mercury_deconstruct.c b/runtime/mercury_deconstruct.c
index 403666f..24e2497 100644
--- a/runtime/mercury_deconstruct.c
+++ b/runtime/mercury_deconstruct.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002-2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_deconstruct.c
 //
diff --git a/runtime/mercury_deconstruct.h b/runtime/mercury_deconstruct.h
index cdbd275..630b778 100644
--- a/runtime/mercury_deconstruct.h
+++ b/runtime/mercury_deconstruct.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002, 2005, 2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_deconstruct.h
 //
diff --git a/runtime/mercury_deconstruct_macros.h b/runtime/mercury_deconstruct_macros.h
index 0fed54c..66b0387 100644
--- a/runtime/mercury_deconstruct_macros.h
+++ b/runtime/mercury_deconstruct_macros.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002-2004, 2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_deconstruct_macros.h
 //
diff --git a/runtime/mercury_deep_call_port_body.h b/runtime/mercury_deep_call_port_body.h
index 48f461f..57e2257 100644
--- a/runtime/mercury_deep_call_port_body.h
+++ b/runtime/mercury_deep_call_port_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2002, 2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The implementation of {det,semi,non}_call_port_code_{ac,sr}.
 //
diff --git a/runtime/mercury_deep_copy.c b/runtime/mercury_deep_copy.c
index 221a01c..b7b91b6 100644
--- a/runtime/mercury_deep_copy.c
+++ b/runtime/mercury_deep_copy.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module defines the MR_deep_copy() functions.
 //
diff --git a/runtime/mercury_deep_copy.h b/runtime/mercury_deep_copy.h
index 5e94f0b..ea00524 100644
--- a/runtime/mercury_deep_copy.h
+++ b/runtime/mercury_deep_copy.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2000, 2002-2003, 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // deepcopy.h - declares the MR_deep_copy() function.
 
diff --git a/runtime/mercury_deep_copy_body.h b/runtime/mercury_deep_copy_body.h
index 20a9ef3..42ebfb1 100644
--- a/runtime/mercury_deep_copy_body.h
+++ b/runtime/mercury_deep_copy_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2005, 2007, 2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The internals of deep copy.
 //
diff --git a/runtime/mercury_deep_leave_port_body.h b/runtime/mercury_deep_leave_port_body.h
index a5771f0..2614606 100644
--- a/runtime/mercury_deep_leave_port_body.h
+++ b/runtime/mercury_deep_leave_port_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2002, 2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The implementation of {det,semi,non}_{exit,fail}_port_code_{ac,sr}.
 //
diff --git a/runtime/mercury_deep_profiling.c b/runtime/mercury_deep_profiling.c
index a0220d1..561b66f 100644
--- a/runtime/mercury_deep_profiling.c
+++ b/runtime/mercury_deep_profiling.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2008, 2010-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Deep profiling module
 //
diff --git a/runtime/mercury_deep_profiling.h b/runtime/mercury_deep_profiling.h
index 54059f4..80b831f 100644
--- a/runtime/mercury_deep_profiling.h
+++ b/runtime/mercury_deep_profiling.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2004, 2006-2008, 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_deep_profiling.h -- definitions for deep profiling.
 //
diff --git a/runtime/mercury_deep_profiling_hand.h b/runtime/mercury_deep_profiling_hand.h
index b4601ae..605ffd8 100644
--- a/runtime/mercury_deep_profiling_hand.h
+++ b/runtime/mercury_deep_profiling_hand.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001, 2004, 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_deep_profiling_hand.h -- definitions for deep profiling
 // for use in hand-written procedures.
diff --git a/runtime/mercury_deep_rec_depth_actions.h b/runtime/mercury_deep_rec_depth_actions.h
index 29d878d..e1d8577 100644
--- a/runtime/mercury_deep_rec_depth_actions.h
+++ b/runtime/mercury_deep_rec_depth_actions.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2002, 2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file provides macros that library/profiling_builtin.m uses to compose
 // the code fragments passed to mercury_deep_rec_depth_body.h to create the
diff --git a/runtime/mercury_deep_rec_depth_body.h b/runtime/mercury_deep_rec_depth_body.h
index e7cb821..c5b220a 100644
--- a/runtime/mercury_deep_rec_depth_body.h
+++ b/runtime/mercury_deep_rec_depth_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2002, 2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This macro implements the following predicates:
 //  save_recursion_depth{1..9}
diff --git a/runtime/mercury_deep_redo_port_body.h b/runtime/mercury_deep_redo_port_body.h
index e72a681..50e981a 100644
--- a/runtime/mercury_deep_redo_port_body.h
+++ b/runtime/mercury_deep_redo_port_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2002, 2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The implementation of non_redo_port_code_{ac,sr}.
 //
diff --git a/runtime/mercury_dlist.c b/runtime/mercury_dlist.c
index 3d8a754..43f20b6 100644
--- a/runtime/mercury_dlist.c
+++ b/runtime/mercury_dlist.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995, 1997, 1999-2000, 2004-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Linked list module.
 
diff --git a/runtime/mercury_dlist.h b/runtime/mercury_dlist.h
index cb54039..64ab3fd 100644
--- a/runtime/mercury_dlist.h
+++ b/runtime/mercury_dlist.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-1997,2000, 2004-2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_dlist.h - defines a doubly-linked list type.
 
diff --git a/runtime/mercury_dotnet.cs.in b/runtime/mercury_dotnet.cs.in
index 63e6c20..a15bb7b 100644
--- a/runtime/mercury_dotnet.cs.in
+++ b/runtime/mercury_dotnet.cs.in
@@ -1,7 +1,7 @@
 //
 // Copyright (C) 2003-2004, 2010-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 //
 
 // mercury_dotnet.cs - This file defines the system runtime types and
diff --git a/runtime/mercury_dummy.c b/runtime/mercury_dummy.c
index fafb0f1..20f6f4d 100644
--- a/runtime/mercury_dummy.c
+++ b/runtime/mercury_dummy.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-1995, 1997, 1999-2000, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_dummy.h"
 #include "mercury_imp.h"    // we need libmer_dll.h for Windows DLLs
diff --git a/runtime/mercury_dummy.h b/runtime/mercury_dummy.h
index 070fea7..67e3131 100644
--- a/runtime/mercury_dummy.h
+++ b/runtime/mercury_dummy.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-1995, 1997, 1999-2000 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // File: mercury_dummy.h
 // Author: fjh
diff --git a/runtime/mercury_dword.h b/runtime/mercury_dword.h
index 6b4d9e5..cb4b0bd 100644
--- a/runtime/mercury_dword.h
+++ b/runtime/mercury_dword.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998, 2000-2001 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // File: mercury_dword.h
 // Author: zs.
diff --git a/runtime/mercury_engine.c b/runtime/mercury_engine.c
index 4847251..b84f76f 100644
--- a/runtime/mercury_engine.c
+++ b/runtime/mercury_engine.c
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-2001, 2003-2007, 2009-2011 The University of Melbourne.
-// Copyright (C) 2014 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 /*
 INIT mercury_sys_init_engine
diff --git a/runtime/mercury_engine.h b/runtime/mercury_engine.h
index 768a1f7..d51a9a8 100644
--- a/runtime/mercury_engine.h
+++ b/runtime/mercury_engine.h
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1994-2007, 2009-2011 The University of Melbourne.
-// Copyright (C) 2014 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_engine.h - definitions for the Mercury runtime engine.
 //
diff --git a/runtime/mercury_exception_catch_body.h b/runtime/mercury_exception_catch_body.h
index 01368d5..8b872d6 100644
--- a/runtime/mercury_exception_catch_body.h
+++ b/runtime/mercury_exception_catch_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2002, 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The internals of exception:builtin_catch.
 //
diff --git a/runtime/mercury_expanding_array.h b/runtime/mercury_expanding_array.h
index ce6b73c..f5ded1f 100644
--- a/runtime/mercury_expanding_array.h
+++ b/runtime/mercury_expanding_array.h
@@ -2,8 +2,8 @@
 
 // Copyright (C) 2009 Ralph Becket <ralphbecket at gmail.com>
 // Copyright (C) 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // expanding_array.h
 //
diff --git a/runtime/mercury_faultaddr.h b/runtime/mercury_faultaddr.h
index 47900cc..4de78d5 100644
--- a/runtime/mercury_faultaddr.h
+++ b/runtime/mercury_faultaddr.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-1999 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_faultaddr.h:
 // Macros for determining the fault address of a signal.
diff --git a/runtime/mercury_file.c b/runtime/mercury_file.c
index e855914..a64e0e3 100644
--- a/runtime/mercury_file.c
+++ b/runtime/mercury_file.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2000, 2002 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module contains the implementation of Mercury streams using
 // C `FILE *' streams.
diff --git a/runtime/mercury_file.h b/runtime/mercury_file.h
index 7207808..460bd35 100644
--- a/runtime/mercury_file.h
+++ b/runtime/mercury_file.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2000 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_FILE_H
 #define MERCURY_FILE_H
diff --git a/runtime/mercury_float.c b/runtime/mercury_float.c
index ff6d2f9..aae0787 100644
--- a/runtime/mercury_float.c
+++ b/runtime/mercury_float.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997, 2000, 2002, 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013-2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include    "mercury_imp.h"
 #include    <math.h>
diff --git a/runtime/mercury_float.h b/runtime/mercury_float.h
index 4a5bf16..17b3080 100644
--- a/runtime/mercury_float.h
+++ b/runtime/mercury_float.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-1997, 1999-2002, 2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013-2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_float.h - floating point handling
 
diff --git a/runtime/mercury_goto.h b/runtime/mercury_goto.h
index 2d29937..35450fa 100644
--- a/runtime/mercury_goto.h
+++ b/runtime/mercury_goto.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2001, 2003-2007, 2009, 2011-2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_goto.h - definitions for the "portable assembler" non-local gotos
 
diff --git a/runtime/mercury_grade.c b/runtime/mercury_grade.c
index ea91dd5..6298b1f 100644
--- a/runtime/mercury_grade.c
+++ b/runtime/mercury_grade.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_imp.h"
 #include "mercury_grade.h"
diff --git a/runtime/mercury_grade.h b/runtime/mercury_grade.h
index baf9eda..4fd6dbf 100644
--- a/runtime/mercury_grade.h
+++ b/runtime/mercury_grade.h
@@ -2,8 +2,7 @@
 
 // Copyright (C) 1997-2012 The University of Melbourne.
 // Copyright (C) 2013-2014, 2016-2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The main purpose of this file is to define the MR_GRADE_VAR macro,
 // which we use to get the linker to generate an error if the object files
diff --git a/runtime/mercury_hand_compare_body.h b/runtime/mercury_hand_compare_body.h
index 95edc0d..689df95 100644
--- a/runtime/mercury_hand_compare_body.h
+++ b/runtime/mercury_hand_compare_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001, 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The internals of hand-written comparison routines.
 //
diff --git a/runtime/mercury_hand_unify_body.h b/runtime/mercury_hand_unify_body.h
index 650704e..337a356 100644
--- a/runtime/mercury_hand_unify_body.h
+++ b/runtime/mercury_hand_unify_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001, 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The internals of hand-written unification and comparison routines.
 //
diff --git a/runtime/mercury_hand_unify_compare_body.h b/runtime/mercury_hand_unify_compare_body.h
index afc65f8..1924d38 100644
--- a/runtime/mercury_hand_unify_compare_body.h
+++ b/runtime/mercury_hand_unify_compare_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002, 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The internals of hand-written unification and comparison routines.
 //
diff --git a/runtime/mercury_hash_lookup_or_add_body.h b/runtime/mercury_hash_lookup_or_add_body.h
index d04675e..e101f06 100644
--- a/runtime/mercury_hash_lookup_or_add_body.h
+++ b/runtime/mercury_hash_lookup_or_add_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2004, 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The code in this file implements several functions in mercury_tabling.h.
 // It is intended to be used only in that file, in the environment of the
diff --git a/runtime/mercury_hash_table.c b/runtime/mercury_hash_table.c
index 455512a..32ad138 100644
--- a/runtime/mercury_hash_table.c
+++ b/runtime/mercury_hash_table.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-2000, 2004-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Hash table handling module.
 //
diff --git a/runtime/mercury_hash_table.h b/runtime/mercury_hash_table.h
index 20e0e8a..1317d72 100644
--- a/runtime/mercury_hash_table.h
+++ b/runtime/mercury_hash_table.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-1995, 1997-1998,2000, 2004-2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Defines the interface to the hash table module.
 //
diff --git a/runtime/mercury_heap.h b/runtime/mercury_heap.h
index 2dcd3c5..6837af2 100644
--- a/runtime/mercury_heap.h
+++ b/runtime/mercury_heap.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2006, 2010-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_heap.h - definitions for manipulating the Mercury heap.
 //
diff --git a/runtime/mercury_heap_profile.c b/runtime/mercury_heap_profile.c
index aa627db..d648f01 100644
--- a/runtime/mercury_heap_profile.c
+++ b/runtime/mercury_heap_profile.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997, 1999-2001, 2006, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // File: mercury_heap_profile.c.
 // Main authors: zs, fjh, wangp.
diff --git a/runtime/mercury_heap_profile.h b/runtime/mercury_heap_profile.h
index 5f2ffea..0b8db42 100644
--- a/runtime/mercury_heap_profile.h
+++ b/runtime/mercury_heap_profile.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998, 2000-2001, 2006, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // File: mercury_heap_profile.h
 // Main authors: zs, fjh
diff --git a/runtime/mercury_hgc.c b/runtime/mercury_hgc.c
index 67d365f..e7b2cc3 100644
--- a/runtime/mercury_hgc.c
+++ b/runtime/mercury_hgc.c
@@ -2,8 +2,8 @@
 
 // Copyright (C) 2009 Ralph Becket <ralphbecket at gmail.com>
 // Copyright (C) 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // hgc.c - A history-based conservative garbage collector.
 //
diff --git a/runtime/mercury_hgc.h b/runtime/mercury_hgc.h
index d3f8638..9650317 100644
--- a/runtime/mercury_hgc.h
+++ b/runtime/mercury_hgc.h
@@ -3,8 +3,8 @@
 // mercury_hgc.h
 // Copyright (C) 2009 Ralph Becket <ralphbecket at gmail.com>
 // Copyright (C) 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // hgc.h - A history-based conservative garbage collector.
 
diff --git a/runtime/mercury_hlc_types.h b/runtime/mercury_hlc_types.h
index f6bdf82..0e876e1 100644
--- a/runtime/mercury_hlc_types.h
+++ b/runtime/mercury_hlc_types.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_hlc_types.h -
 // Definitions of types needed by the high level C back end.
diff --git a/runtime/mercury_ho_call.c b/runtime/mercury_ho_call.c
index 07ee40c..2f8b2ef 100644
--- a/runtime/mercury_ho_call.c
+++ b/runtime/mercury_ho_call.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module provides much of the functionality for doing higher order
 // calls (with the rest provided by code generation of the generic_call
diff --git a/runtime/mercury_ho_call.h b/runtime/mercury_ho_call.h
index daef902..7b89f23 100644
--- a/runtime/mercury_ho_call.h
+++ b/runtime/mercury_ho_call.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1999-2003, 2005-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_ho_call.h - defines the structure of closures.
 //
diff --git a/runtime/mercury_imp.h b/runtime/mercury_imp.h
index 5bcecc8..e5f4f1a 100644
--- a/runtime/mercury_imp.h
+++ b/runtime/mercury_imp.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-1998,2000,2003-2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_imp.h - defines the interface to the Mercury abstract machine.
 //
diff --git a/runtime/mercury_init.h b/runtime/mercury_init.h
index c03f665..faf72ef 100644
--- a/runtime/mercury_init.h
+++ b/runtime/mercury_init.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-2006, 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_init.h - this file declares stuff defined in the
 // automatically generated *_init.c files. This is also the interface
diff --git a/runtime/mercury_int.c b/runtime/mercury_int.c
index 2cf8b27..530c442 100644
--- a/runtime/mercury_int.c
+++ b/runtime/mercury_int.c
@@ -1,8 +1,7 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_int.h"
 
diff --git a/runtime/mercury_int.h b/runtime/mercury_int.h
index c049046..7951511 100644
--- a/runtime/mercury_int.h
+++ b/runtime/mercury_int.h
@@ -1,8 +1,7 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
-// Copyright (C) 2017 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2017-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_int.h - integer type handling
 
diff --git a/runtime/mercury_label.c b/runtime/mercury_label.c
index 03460d4..ec59f82 100644
--- a/runtime/mercury_label.c
+++ b/runtime/mercury_label.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1994-2001, 2003-2004, 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // label.c defines the label table, which is a pair of hash tables
 // that map from procedure names to addresses and vice versa.
diff --git a/runtime/mercury_label.h b/runtime/mercury_label.h
index 474f770..253013d 100644
--- a/runtime/mercury_label.h
+++ b/runtime/mercury_label.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1994-1998, 2000-2002, 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_label.h defines the interface to the label table, which is a pair of
 // hash tables, one mapping from procedure names and the other from
diff --git a/runtime/mercury_layout_util.c b/runtime/mercury_layout_util.c
index f822640..7b32e03 100644
--- a/runtime/mercury_layout_util.c
+++ b/runtime/mercury_layout_util.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007, 2009, 2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013, 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file implements utilities that can be useful
 // for both the internal and external debuggers.
diff --git a/runtime/mercury_layout_util.h b/runtime/mercury_layout_util.h
index 5641e10..203a097 100644
--- a/runtime/mercury_layout_util.h
+++ b/runtime/mercury_layout_util.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2003, 2005-2006, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_LAYOUT_UTIL_H
 #define MERCURY_LAYOUT_UTIL_H
diff --git a/runtime/mercury_library_types.h b/runtime/mercury_library_types.h
index ea4a813..ccd05fc 100644
--- a/runtime/mercury_library_types.h
+++ b/runtime/mercury_library_types.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2000, 2002-2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_library_types.h - definitions of some basic types used by the
 // Mercury library.
diff --git a/runtime/mercury_make_type_info_body.h b/runtime/mercury_make_type_info_body.h
index 343004b..a331ad0 100644
--- a/runtime/mercury_make_type_info_body.h
+++ b/runtime/mercury_make_type_info_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2000-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file is intended to be #included in mercury_type_info.c to provide
 // the definitions of
diff --git a/runtime/mercury_memory.c b/runtime/mercury_memory.c
index da7c16e..db8d71d 100644
--- a/runtime/mercury_memory.c
+++ b/runtime/mercury_memory.c
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1994-2000,2002-2004, 2006, 2008, 2011 The University of Melbourne.
-// Copyright (C) 2014 The Mercury Team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury Team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module defines the register array and data regions of the
 // execution algorithm.
diff --git a/runtime/mercury_memory.h b/runtime/mercury_memory.h
index dd53413..689ad9c 100644
--- a/runtime/mercury_memory.h
+++ b/runtime/mercury_memory.h
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1994-2000,2002, 2004, 2006, 2008 The University of Melbourne.
-// Copyright (C) 2014 The Mercury Team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury Team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_memory.h:
 // general memory-allocation related stuff for the Mercury runtime.
diff --git a/runtime/mercury_memory_handlers.c b/runtime/mercury_memory_handlers.c
index 6ca040b..6bc867b 100644
--- a/runtime/mercury_memory_handlers.c
+++ b/runtime/mercury_memory_handlers.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998, 2000, 2002, 2005-2007, 2010-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module defines the signal handlers for memory zones.
 // These handlers are invoked when memory is accessed outside of
diff --git a/runtime/mercury_memory_handlers.h b/runtime/mercury_memory_handlers.h
index b25dcb9..1ef4dbd 100644
--- a/runtime/mercury_memory_handlers.h
+++ b/runtime/mercury_memory_handlers.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998,2000 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_memory_handlers.h - signal handlers for the memory zones.
 //
diff --git a/runtime/mercury_memory_zones.c b/runtime/mercury_memory_zones.c
index 41beed6..06db767 100644
--- a/runtime/mercury_memory_zones.c
+++ b/runtime/mercury_memory_zones.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2000, 2002-2007, 2010-2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module defines the MR_MemoryZone data structure and operations
 // for managing the memory zones.
diff --git a/runtime/mercury_memory_zones.h b/runtime/mercury_memory_zones.h
index a08bcf9..dc45e29 100644
--- a/runtime/mercury_memory_zones.h
+++ b/runtime/mercury_memory_zones.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2002, 2004-2006, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_memory_zones.h
 //
diff --git a/runtime/mercury_minimal_model.c b/runtime/mercury_minimal_model.c
index 318c567..bbf3b4b 100644
--- a/runtime/mercury_minimal_model.c
+++ b/runtime/mercury_minimal_model.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2003-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module contains the functions related specifically to the stack copy
 // style of minimal model tabling.
diff --git a/runtime/mercury_minimal_model.h b/runtime/mercury_minimal_model.h
index f967384..9ca53cd 100644
--- a/runtime/mercury_minimal_model.h
+++ b/runtime/mercury_minimal_model.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2003-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_minimal_model.h - definitions of some basic stuff used for the stack
 // copy style of minimal model tabling. For tabling code, the Mercury compiler
diff --git a/runtime/mercury_misc.c b/runtime/mercury_misc.c
index ab91684..77662bf 100644
--- a/runtime/mercury_misc.c
+++ b/runtime/mercury_misc.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1996-2000,2002, 2006, 2010-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include    "mercury_conf.h"
 #ifndef MR_HIGHLEVEL_CODE
diff --git a/runtime/mercury_misc.h b/runtime/mercury_misc.h
index 065f164..7355c19 100644
--- a/runtime/mercury_misc.h
+++ b/runtime/mercury_misc.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2000,2002, 2004, 2006, 2009-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_misc.h - MR_warning(),
 //                  MR_fatal_error()
diff --git a/runtime/mercury_ml_arg_body.h b/runtime/mercury_ml_arg_body.h
index 22e6712..70c4cd1 100644
--- a/runtime/mercury_ml_arg_body.h
+++ b/runtime/mercury_ml_arg_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_ml_arg_body.h
 //
diff --git a/runtime/mercury_ml_deconstruct_body.h b/runtime/mercury_ml_deconstruct_body.h
index 783334a..02f2db3 100644
--- a/runtime/mercury_ml_deconstruct_body.h
+++ b/runtime/mercury_ml_deconstruct_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002, 2004, 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_ml_deconstruct_body.h
 //
diff --git a/runtime/mercury_ml_expand_body.h b/runtime/mercury_ml_expand_body.h
index 7a1dee2..38024cd 100644
--- a/runtime/mercury_ml_expand_body.h
+++ b/runtime/mercury_ml_expand_body.h
@@ -2,8 +2,7 @@
 
 // Copyright (C) 2001-2007, 2012 The University of Melbourne.
 // Copyright (C) 2013, 2015-2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_ml_expand_body.h
 //
diff --git a/runtime/mercury_ml_functor_body.h b/runtime/mercury_ml_functor_body.h
index e797523..deefcf6 100644
--- a/runtime/mercury_ml_functor_body.h
+++ b/runtime/mercury_ml_functor_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002, 2004, 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_ml_functor_body.h
 //
diff --git a/runtime/mercury_mm_own_stacks.c b/runtime/mercury_mm_own_stacks.c
index 27b29cc..ef64113 100644
--- a/runtime/mercury_mm_own_stacks.c
+++ b/runtime/mercury_mm_own_stacks.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2004-2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013-2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module contains the functions related specifically to the own stack
 // style of minimal model tabling.
diff --git a/runtime/mercury_mm_own_stacks.h b/runtime/mercury_mm_own_stacks.h
index 4bdd329..3102865 100644
--- a/runtime/mercury_mm_own_stacks.h
+++ b/runtime/mercury_mm_own_stacks.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2004-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_mm_own_stacks.h:
 // definitions of some basic stuff used for the own stack style of
diff --git a/runtime/mercury_overflow.c b/runtime/mercury_overflow.c
index be8d548..8bd27ee 100644
--- a/runtime/mercury_overflow.c
+++ b/runtime/mercury_overflow.c
@@ -1,8 +1,7 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
-// Copyright (C) 2014 The Mercury team
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_imp.h"
 #include "mercury_overflow.h"
diff --git a/runtime/mercury_overflow.h b/runtime/mercury_overflow.h
index ffcd573..b43e741 100644
--- a/runtime/mercury_overflow.h
+++ b/runtime/mercury_overflow.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-1998,2000-2001, 2005-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_overflow.h - definitions for overflow checks
 
diff --git a/runtime/mercury_par_builtin.c b/runtime/mercury_par_builtin.c
index 47528a2..6bd8e8e 100644
--- a/runtime/mercury_par_builtin.c
+++ b/runtime/mercury_par_builtin.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2009, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_types.h"
 #include "mercury_par_builtin.h"
diff --git a/runtime/mercury_par_builtin.h b/runtime/mercury_par_builtin.h
index a7f3dc9..a7dd000 100644
--- a/runtime/mercury_par_builtin.h
+++ b/runtime/mercury_par_builtin.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2009-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module contains the definitions of the primitive operations we use to
 // implement builtins for parallel grades as C macros. Some of these macros can
diff --git a/runtime/mercury_proc_id.h b/runtime/mercury_proc_id.h
index c8be7b2..3bdf08a 100644
--- a/runtime/mercury_proc_id.h
+++ b/runtime/mercury_proc_id.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2003-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_proc_id.h - definitions for recording procedure ids
 
diff --git a/runtime/mercury_prof.c b/runtime/mercury_prof.c
index 957c1ad..dda0f9d 100644
--- a/runtime/mercury_prof.c
+++ b/runtime/mercury_prof.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-1998, 2000-2002, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Profiling module
 //
diff --git a/runtime/mercury_prof.h b/runtime/mercury_prof.h
index 975da2b..75daa9a 100644
--- a/runtime/mercury_prof.h
+++ b/runtime/mercury_prof.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-1997,2000-2002, 2004-2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_prof.h -- definitions for profiling.
 // (See also mercury_heap_profiling.h and mercury_deep_profiling.h.)
diff --git a/runtime/mercury_prof_mem.c b/runtime/mercury_prof_mem.c
index 26291b6..a2673cb 100644
--- a/runtime/mercury_prof_mem.c
+++ b/runtime/mercury_prof_mem.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1996-1997, 1999-2000, 2002, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // prof_mem.c
 //
diff --git a/runtime/mercury_prof_mem.h b/runtime/mercury_prof_mem.h
index dfb3b11..d39a7ad 100644
--- a/runtime/mercury_prof_mem.h
+++ b/runtime/mercury_prof_mem.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1996-1997, 1999-2000, 2002, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_prof_mem.h - defines memory allocation functions used to hold
 // the tables of profiling counts.
diff --git a/runtime/mercury_prof_time.c b/runtime/mercury_prof_time.c
index 35ad9a9..105e7d9 100644
--- a/runtime/mercury_prof_time.c
+++ b/runtime/mercury_prof_time.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2002, 2005-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_prof_time.c
 //
diff --git a/runtime/mercury_prof_time.h b/runtime/mercury_prof_time.h
index 9d14508..4ce2822 100644
--- a/runtime/mercury_prof_time.h
+++ b/runtime/mercury_prof_time.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_PROF_TIME_H
 #define MERCURY_PROF_TIME_H
diff --git a/runtime/mercury_reg_workarounds.c b/runtime/mercury_reg_workarounds.c
index 2f637f3..0464a48 100644
--- a/runtime/mercury_reg_workarounds.c
+++ b/runtime/mercury_reg_workarounds.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998, 2001-2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // All the functions in this file work around problems caused by
 // our use of global registers conflicting with the use of registers
diff --git a/runtime/mercury_reg_workarounds.h b/runtime/mercury_reg_workarounds.h
index f5490db..f4fb2bc 100644
--- a/runtime/mercury_reg_workarounds.h
+++ b/runtime/mercury_reg_workarounds.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_reg_workarounds.h - MR_assign_structure(), MR_memcpy(), MR_fd_zero()
 
diff --git a/runtime/mercury_region.c b/runtime/mercury_region.c
index 12ddbc9..7df8e21 100644
--- a/runtime/mercury_region.c
+++ b/runtime/mercury_region.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007, 2009, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // file: mercury_region.c
 // main author: qph
diff --git a/runtime/mercury_region.h b/runtime/mercury_region.h
index 651c881..21f09c1 100644
--- a/runtime/mercury_region.h
+++ b/runtime/mercury_region.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007-2009, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // File: mercury_region.h
 // main author: Quan Phan
diff --git a/runtime/mercury_regs.c b/runtime/mercury_regs.c
index b658f57..ed7c895 100644
--- a/runtime/mercury_regs.c
+++ b/runtime/mercury_regs.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997, 2000-2001, 2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_imp.h"
 #include "mercury_regs.h"
diff --git a/runtime/mercury_regs.h b/runtime/mercury_regs.h
index 1208e81..6a8c448 100644
--- a/runtime/mercury_regs.h
+++ b/runtime/mercury_regs.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_REGS_H
 #define MERCURY_REGS_H
diff --git a/runtime/mercury_runtime_util.c b/runtime/mercury_runtime_util.c
index e22f489..6326196 100644
--- a/runtime/mercury_runtime_util.c
+++ b/runtime/mercury_runtime_util.c
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2002, 2006 The University of Melbourne.
-// Copyright (C) 2014 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module contains utility functions for the rest of the Mercury runtime.
 //
diff --git a/runtime/mercury_runtime_util.h b/runtime/mercury_runtime_util.h
index 972ce90..888154e 100644
--- a/runtime/mercury_runtime_util.h
+++ b/runtime/mercury_runtime_util.h
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001,2006 The University of Melbourne.
-// Copyright (C) 2014 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_RUNTIME_UTIL_H
 #define MERCURY_RUNTIME_UTIL_H
diff --git a/runtime/mercury_signal.c b/runtime/mercury_signal.c
index c4df992..fab31a9 100644
--- a/runtime/mercury_signal.c
+++ b/runtime/mercury_signal.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998,2000,2002, 2006, 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module defines functions for setting up signal handlers.
 
diff --git a/runtime/mercury_signal.h b/runtime/mercury_signal.h
index 23a9f44..1c378f9 100644
--- a/runtime/mercury_signal.h
+++ b/runtime/mercury_signal.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998, 2000, 2002, 2004-2005, 2010 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_signal.h - functions for setting up signal handlers.
 //
diff --git a/runtime/mercury_stack_layout.c b/runtime/mercury_stack_layout.c
index 2f864ab..db84b10 100644
--- a/runtime/mercury_stack_layout.c
+++ b/runtime/mercury_stack_layout.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2005-2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file implements utility functions operating on the data structures
 // defined in the corresponding header file.
diff --git a/runtime/mercury_stack_layout.h b/runtime/mercury_stack_layout.h
index f16e2e3..a9e6bdd 100644
--- a/runtime/mercury_stack_layout.h
+++ b/runtime/mercury_stack_layout.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_STACK_LAYOUT_H
 #define MERCURY_STACK_LAYOUT_H
diff --git a/runtime/mercury_stack_trace.c b/runtime/mercury_stack_trace.c
index e8439f7..b77ee6d 100644
--- a/runtime/mercury_stack_trace.c
+++ b/runtime/mercury_stack_trace.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2009,2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_stack_trace.c - implements stack traces.
 //
diff --git a/runtime/mercury_stack_trace.h b/runtime/mercury_stack_trace.h
index 78e184a..f543cc9 100644
--- a/runtime/mercury_stack_trace.h
+++ b/runtime/mercury_stack_trace.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2001,2003-2006,2008,2011-2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_STACK_TRACE_H
 #define MERCURY_STACK_TRACE_H
diff --git a/runtime/mercury_stacks.c b/runtime/mercury_stacks.c
index 2e32b4c..57a0d25 100644
--- a/runtime/mercury_stacks.c
+++ b/runtime/mercury_stacks.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2001, 2003-2006, 2008, 2010-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains code for printing statistics about stack frame sizes,
 // and for manipulating the generator stack, the cut stack and the pneg stack.
diff --git a/runtime/mercury_stacks.h b/runtime/mercury_stacks.h
index f964041..6ac59fd 100644
--- a/runtime/mercury_stacks.h
+++ b/runtime/mercury_stacks.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_stacks.h - definitions for manipulating the det and nondet stacks.
 //
diff --git a/runtime/mercury_std.h b/runtime/mercury_std.h
index d8708d8..844e0bd 100644
--- a/runtime/mercury_std.h
+++ b/runtime/mercury_std.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-1995, 1997-2005, 2011-2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // std.h - "standard" [sic] definitions for C:
 //  MR_bool, MR_TRUE, MR_FALSE, MR_min(), MR_max(), MR_streq(), etc.
diff --git a/runtime/mercury_stm.c b/runtime/mercury_stm.c
index 4499639..76d61a9 100644
--- a/runtime/mercury_stm.c
+++ b/runtime/mercury_stm.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007-2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_stm.c - runtime support for software transactional memory.
 
diff --git a/runtime/mercury_stm.h b/runtime/mercury_stm.h
index b8d9515..f10f611 100644
--- a/runtime/mercury_stm.h
+++ b/runtime/mercury_stm.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007-2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_stm.h - runtime support for software transactional memory.
 
diff --git a/runtime/mercury_string.c b/runtime/mercury_string.c
index 412645f..4c11f3f 100644
--- a/runtime/mercury_string.c
+++ b/runtime/mercury_string.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2000-2002, 2006, 2011-2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_string.c - string handling
 
diff --git a/runtime/mercury_string.h b/runtime/mercury_string.h
index 4848637..7d1bd99 100644
--- a/runtime/mercury_string.h
+++ b/runtime/mercury_string.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2005, 2007, 2011-2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_string.h - string handling
 
diff --git a/runtime/mercury_table_int_fix_index_body.h b/runtime/mercury_table_int_fix_index_body.h
index 18fe619..19fa9eb 100644
--- a/runtime/mercury_table_int_fix_index_body.h
+++ b/runtime/mercury_table_int_fix_index_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This files defines the bodies of the variants of the
 // MR_int_fix_index_lookup_or_add() function.
diff --git a/runtime/mercury_table_int_start_index_body.h b/runtime/mercury_table_int_start_index_body.h
index b6611e0..5617f7a 100644
--- a/runtime/mercury_table_int_start_index_body.h
+++ b/runtime/mercury_table_int_start_index_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This files defines the bodies of the variants of the
 // MR_int_start_index_lookup_or_add() function.
diff --git a/runtime/mercury_table_type_body.h b/runtime/mercury_table_type_body.h
index e7f1e23..5559521 100644
--- a/runtime/mercury_table_type_body.h
+++ b/runtime/mercury_table_type_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2006-2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This files defines the bodies of the various variants of the
 // MR_table_type() function.
diff --git a/runtime/mercury_table_typeinfo_body.h b/runtime/mercury_table_typeinfo_body.h
index e591cd0..eb495ee 100644
--- a/runtime/mercury_table_typeinfo_body.h
+++ b/runtime/mercury_table_typeinfo_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This files defines the bodies of the variants of the
 // MR_type_info_lookup_or_add() function.
diff --git a/runtime/mercury_tabling.c b/runtime/mercury_tabling.c
index de595c4..f5ee699 100644
--- a/runtime/mercury_tabling.c
+++ b/runtime/mercury_tabling.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module contains the functions related to tabling that are not
 // specific to minimal model tabling.
diff --git a/runtime/mercury_tabling.h b/runtime/mercury_tabling.h
index 2898ccd..cdb1a58 100644
--- a/runtime/mercury_tabling.h
+++ b/runtime/mercury_tabling.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2000,2002-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_tabling.h - definitions of some basic stuff used for tabling.
 // For tabling code, the Mercury compiler (compiler/table_gen.m) generates
diff --git a/runtime/mercury_tabling_macros.h b/runtime/mercury_tabling_macros.h
index 6536b49..42fc77a 100644
--- a/runtime/mercury_tabling_macros.h
+++ b/runtime/mercury_tabling_macros.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2000,2002-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_tabling_macros.h
 //
diff --git a/runtime/mercury_tabling_preds.h b/runtime/mercury_tabling_preds.h
index 357041f..670752f 100644
--- a/runtime/mercury_tabling_preds.h
+++ b/runtime/mercury_tabling_preds.h
@@ -2,8 +2,7 @@
 
 // Copyright (C) 2004-2007 The University of Melbourne.
 // Copyright (C) 2016-2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains C macros that represent the bodies of predicates
 // in library/table_builtin.m.
diff --git a/runtime/mercury_tabling_stats_defs.h b/runtime/mercury_tabling_stats_defs.h
index a749f23..67013bc 100644
--- a/runtime/mercury_tabling_stats_defs.h
+++ b/runtime/mercury_tabling_stats_defs.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #define MR_TABLE_DECLARE_KEY_COMPARE_COUNT                                  \
         MR_Integer  key_compare_count = 0;
diff --git a/runtime/mercury_tabling_stats_nodefs.h b/runtime/mercury_tabling_stats_nodefs.h
index 377d252..c564fe1 100644
--- a/runtime/mercury_tabling_stats_nodefs.h
+++ b/runtime/mercury_tabling_stats_nodefs.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #define MR_TABLE_DECLARE_KEY_COMPARE_COUNT
 #define MR_table_record_hash_key_compare_count()            ((void) 0)
diff --git a/runtime/mercury_tabling_stats_undefs.h b/runtime/mercury_tabling_stats_undefs.h
index 07e9926..7a8f062 100644
--- a/runtime/mercury_tabling_stats_undefs.h
+++ b/runtime/mercury_tabling_stats_undefs.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #undef MR_TABLE_DECLARE_KEY_COMPARE_COUNT
 #undef MR_table_record_hash_key_compare_count
diff --git a/runtime/mercury_tags.h b/runtime/mercury_tags.h
index dabd75d..08bff8a 100644
--- a/runtime/mercury_tags.h
+++ b/runtime/mercury_tags.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-2001, 2003-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_tags.h - defines macros for tagging and untagging words.
 // Also defines macros for accessing the Mercury list type from C.
diff --git a/runtime/mercury_term_size.c b/runtime/mercury_term_size.c
index 638dde7..55a1489 100644
--- a/runtime/mercury_term_size.c
+++ b/runtime/mercury_term_size.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2003-2005, 2007, 2009, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_term_size.c
 //
diff --git a/runtime/mercury_term_size.h b/runtime/mercury_term_size.h
index f76f4e4..5758c49 100644
--- a/runtime/mercury_term_size.h
+++ b/runtime/mercury_term_size.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2003, 2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_term_size.h
 //
diff --git a/runtime/mercury_thread.c b/runtime/mercury_thread.c
index 023e761..09e8f3c 100644
--- a/runtime/mercury_thread.c
+++ b/runtime/mercury_thread.c
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2001, 2003, 2005-2007, 2009-2011 The University of Melbourne.
-// Copyright (C) 2014 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_imp.h"
 #include "mercury_regs.h"
diff --git a/runtime/mercury_thread.h b/runtime/mercury_thread.h
index abe6a94..3481b32 100644
--- a/runtime/mercury_thread.h
+++ b/runtime/mercury_thread.h
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-1998, 2000, 2003, 2005-2007, 2009-2011 The University of Melbourne.
-// Copyright (C) 2014-2016 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_THREAD_H
 #define MERCURY_THREAD_H
diff --git a/runtime/mercury_threadscope.c b/runtime/mercury_threadscope.c
index 83fb652..aac97c2 100644
--- a/runtime/mercury_threadscope.c
+++ b/runtime/mercury_threadscope.c
@@ -1,10 +1,9 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
-// Copyright (C) 2009-2011 The University of Melbourne.
 // Copyright (C) 2008-2009 The GHC Team.
-//
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2009-2011 The University of Melbourne.
+// Copyright (C) 2012, 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Event log format
 //
diff --git a/runtime/mercury_threadscope.h b/runtime/mercury_threadscope.h
index 789c818..4aae097 100644
--- a/runtime/mercury_threadscope.h
+++ b/runtime/mercury_threadscope.h
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2009-2011 The University of Melbourne.
-//
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_threadscope.h - defines Mercury threadscope profiling support.
 //
diff --git a/runtime/mercury_timing.c b/runtime/mercury_timing.c
index dfe4c81..4f0c5ec 100644
--- a/runtime/mercury_timing.c
+++ b/runtime/mercury_timing.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-1994,1997,2000, 2005-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // file: timing.c
 // main authors: fjh
diff --git a/runtime/mercury_timing.h b/runtime/mercury_timing.h
index e63d4a0..3e78a87 100644
--- a/runtime/mercury_timing.h
+++ b/runtime/mercury_timing.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1993-1995, 1997, 2000, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_timing.h - interface to timing routines.
 //  Defines `MR_CLOCK_TICKS_PER_SECOND'
diff --git a/runtime/mercury_trace_base.c b/runtime/mercury_trace_base.c
index a4e27df..454574b 100644
--- a/runtime/mercury_trace_base.c
+++ b/runtime/mercury_trace_base.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2008, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_base.c implements the interface between the main part
 // of the runtime system (mainly mercury_wrapper.c) and the part of the
diff --git a/runtime/mercury_trace_base.h b/runtime/mercury_trace_base.h
index 396c257..8ebdd18 100644
--- a/runtime/mercury_trace_base.h
+++ b/runtime/mercury_trace_base.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2009, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_base.h defines the interface between the main part
 // of the runtime system (mainly mercury_wrapper.c) and the part of the
diff --git a/runtime/mercury_trace_term.c b/runtime/mercury_trace_term.c
index 55ac2d7..5e9b3b9 100644
--- a/runtime/mercury_trace_term.c
+++ b/runtime/mercury_trace_term.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2005-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains code to manage terms, for conditional breakpoints.
 //
diff --git a/runtime/mercury_trace_term.h b/runtime/mercury_trace_term.h
index 570e45d..f0136c0 100644
--- a/runtime/mercury_trace_term.h
+++ b/runtime/mercury_trace_term.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2005-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_term.h declares the runtime's facilities to manipulate terms.
 // We use this capability to implement conditional breakpoints.
diff --git a/runtime/mercury_trail.c b/runtime/mercury_trail.c
index 6abbb96..9b80c5a 100644
--- a/runtime/mercury_trail.c
+++ b/runtime/mercury_trail.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2000, 2006-2008, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trail.c - code for the Mercury trail.
 //
diff --git a/runtime/mercury_trail.h b/runtime/mercury_trail.h
index f639b27..28bd638 100644
--- a/runtime/mercury_trail.h
+++ b/runtime/mercury_trail.h
@@ -2,8 +2,7 @@
 
 // Copyright (C) 1997-2000, 2004-2005, 2007-2008 The University of Melbourne.
 // Copyright (C) 2015-2016, 2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trail.h - code for handling the trail.
 //
diff --git a/runtime/mercury_type_desc.c b/runtime/mercury_type_desc.c
index b5b77d4..3dcabfd 100644
--- a/runtime/mercury_type_desc.c
+++ b/runtime/mercury_type_desc.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002-2004, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module exists to handle user-visible descriptions of types and type
 // constructors.
diff --git a/runtime/mercury_type_desc.h b/runtime/mercury_type_desc.h
index 04c3998..1ed7fcc 100644
--- a/runtime/mercury_type_desc.h
+++ b/runtime/mercury_type_desc.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002, 2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TYPE_DESC_H
 #define MERCURY_TYPE_DESC_H
diff --git a/runtime/mercury_type_info.c b/runtime/mercury_type_info.c
index 24b1881..d265dc5 100644
--- a/runtime/mercury_type_info.c
+++ b/runtime/mercury_type_info.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2006, 2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_type_info.c -
 //  Definitions for dealing with type_infos needed by the Mercury
diff --git a/runtime/mercury_type_info.h b/runtime/mercury_type_info.h
index c04decb..4763b85 100644
--- a/runtime/mercury_type_info.h
+++ b/runtime/mercury_type_info.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2007, 2009, 2011-2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Definitions of the types defining the type_ctor_infos, type_infos,
 // pseudo_type_infos, base_typeclass_infos and typeclass_infos generated
diff --git a/runtime/mercury_type_tables.c b/runtime/mercury_type_tables.c
index 9918261..5619dc4 100644
--- a/runtime/mercury_type_tables.c
+++ b/runtime/mercury_type_tables.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2000,2002-2005, 2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module manages tables that list the definitions of the type
 // constructors, type classes and type class instances defined in the program.
diff --git a/runtime/mercury_type_tables.h b/runtime/mercury_type_tables.h
index 3fd03cf..db3ae96 100644
--- a/runtime/mercury_type_tables.h
+++ b/runtime/mercury_type_tables.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2000, 2003, 2005 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_type_tables.h -
 //  This module manages tables that list the definitions of the types and
diff --git a/runtime/mercury_typeclass_info.h b/runtime/mercury_typeclass_info.h
index 1a6d7d2..4fc2f7f 100644
--- a/runtime/mercury_typeclass_info.h
+++ b/runtime/mercury_typeclass_info.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002-2005, 2007, 2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains design for a new runtime representation of typeclass
 // information. It is not used yet; the design we DO use is implemented
diff --git a/runtime/mercury_types.h b/runtime/mercury_types.h
index 5c621a9..11085e5 100644
--- a/runtime/mercury_types.h
+++ b/runtime/mercury_types.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1995-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_types.h - definitions of some basic types used by the
 // code generated by the Mercury compiler and by the Mercury runtime.
diff --git a/runtime/mercury_unify_compare_body.h b/runtime/mercury_unify_compare_body.h
index fe75705..1786887 100644
--- a/runtime/mercury_unify_compare_body.h
+++ b/runtime/mercury_unify_compare_body.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2000-2005, 2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains a piece of code that is included by mercury_ho_call.c
 // six times:
diff --git a/runtime/mercury_univ.h b/runtime/mercury_univ.h
index e4a6903..80fb506 100644
--- a/runtime/mercury_univ.h
+++ b/runtime/mercury_univ.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2003-2004 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_univ.h - definitions for manipulating univs.
 
diff --git a/runtime/mercury_windows.h b/runtime/mercury_windows.h
index f2eadc7..95e73a3 100644
--- a/runtime/mercury_windows.h
+++ b/runtime/mercury_windows.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_windows.h - this header provides a wrapper around windows.h
 // Mercury runtime and library modules should #include this header rather
diff --git a/runtime/mercury_wrapper.c b/runtime/mercury_wrapper.c
index ccd8951..d64d1b5 100644
--- a/runtime/mercury_wrapper.c
+++ b/runtime/mercury_wrapper.c
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1994-2011 The University of Melbourne.
-// Copyright (C) 2014 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // file: mercury_wrapper.c
 // main authors: zs, fjh
diff --git a/runtime/mercury_wrapper.h b/runtime/mercury_wrapper.h
index 64c3805..62c210c 100644
--- a/runtime/mercury_wrapper.h
+++ b/runtime/mercury_wrapper.h
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1994-2011 The University of Melbourne.
-// Copyright (C) 2014 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_wrapper.h - defines the interface to mercury_wrapper.c.
 // See mercury_wrapper.c for documentation.
diff --git a/runtime/mercury_wsdeque.c b/runtime/mercury_wsdeque.c
index 58a6e6f..df0a365 100644
--- a/runtime/mercury_wsdeque.c
+++ b/runtime/mercury_wsdeque.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007, 2010-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_wsdeque.c
 //
diff --git a/runtime/mercury_wsdeque.h b/runtime/mercury_wsdeque.h
index 78cccac..789f1ee 100644
--- a/runtime/mercury_wsdeque.h
+++ b/runtime/mercury_wsdeque.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2007, 2009-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_WSDEQUE_H
 #define MERCURY_WSDEQUE_H
diff --git a/samples/concurrency/dining_philosophers/philo.m b/samples/concurrency/dining_philosophers/philo.m
index 540668f..6b4a28c 100644
--- a/samples/concurrency/dining_philosophers/philo.m
+++ b/samples/concurrency/dining_philosophers/philo.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2000, 2006-2007, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2013, 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: philo.m.
diff --git a/samples/concurrency/dining_philosophers/philo2.m b/samples/concurrency/dining_philosophers/philo2.m
index 0b8350a..346a367 100644
--- a/samples/concurrency/dining_philosophers/philo2.m
+++ b/samples/concurrency/dining_philosophers/philo2.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2000-2003, 2006-2007, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: philo2.m.
diff --git a/samples/concurrency/midimon/concurrent_stream.m b/samples/concurrency/midimon/concurrent_stream.m
index 83cb7b5..3bf16cd 100644
--- a/samples/concurrency/midimon/concurrent_stream.m
+++ b/samples/concurrency/midimon/concurrent_stream.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2000, 2006, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: concurrent_stream.m.
diff --git a/samples/concurrency/midimon/midi.m b/samples/concurrency/midimon/midi.m
index 613cc2b..1a3fedf 100644
--- a/samples/concurrency/midimon/midi.m
+++ b/samples/concurrency/midimon/midi.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %-----------------------------------------------------------------------------%
 % Copyright (C) 2000, 2006, 2010 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2016, 2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %-----------------------------------------------------------------------------%
 %
 % File: midi.m.
diff --git a/scripts/mdb_term_browser.css b/scripts/mdb_term_browser.css
index ce33a76..9932696 100644
--- a/scripts/mdb_term_browser.css
+++ b/scripts/mdb_term_browser.css
@@ -1,7 +1,6 @@
 /*
-** Copyright (C) 2017 The Mercury team.
-** This file may only be copied under the terms of the GNU Library General
-** Public License - see the file COPYING.LIB in the Mercury distribution.
+** Copyright (C) 2017-2018 The Mercury team.
+** This file is distributed under the terms specified in COPYING.LIB.
 */
 
 body {
diff --git a/scripts/mdb_term_browser.js b/scripts/mdb_term_browser.js
index 08d550c..adf05e3 100644
--- a/scripts/mdb_term_browser.js
+++ b/scripts/mdb_term_browser.js
@@ -1,6 +1,5 @@
-// Copyright (C) 2017 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2017-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 const OPEN_DEPTH = 3;
 const OPEN_MAX_ARGS = 10;
diff --git a/ssdb/ssdb.m b/ssdb/ssdb.m
index b683a4e..b41fdcd 100644
--- a/ssdb/ssdb.m
+++ b/ssdb/ssdb.m
@@ -2,8 +2,8 @@
 % vim: ft=mercury ts=4 sw=4 et
 %---------------------------------------------------------------------------%
 % Copyright (C) 2007, 2010-2011 The University of Melbourne.
-% This file may only be copied under the terms of the GNU Library General
-% Public License - see the file COPYING.LIB in the Mercury distribution.
+% Copyright (C) 2015-2018 The Mercury team.
+% This file is distributed under the terms specified in COPYING.LIB.
 %---------------------------------------------------------------------------%
 %
 % File: ssdb.m.
diff --git a/tools/make_port_code b/tools/make_port_code
index 26cb027..61244ff 100755
--- a/tools/make_port_code
+++ b/tools/make_port_code
@@ -30,8 +30,8 @@ trap "/bin/rm $tmp_code $tmp_prolog $tmp_declare_entry $tmp_define_entry $tmp_in
 
 cat > ${tmp_prolog} << END
 // Copyright (C) 2002 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // The contents of this file were generated by the make_port_code script
 // in the tools directory. Do not edit.
diff --git a/trace/mercury_event_parser.y b/trace/mercury_event_parser.y
index e29df22..94fe0ea 100644
--- a/trace/mercury_event_parser.y
+++ b/trace/mercury_event_parser.y
@@ -2,8 +2,8 @@
 // vim: ts=4 sw=4 expandtab ft=yacc
 
 // Copyright (C) 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Grammar for event set specifications.
 
diff --git a/trace/mercury_event_scanner.l b/trace/mercury_event_scanner.l
index 1f39f6e..035823f 100644
--- a/trace/mercury_event_scanner.l
+++ b/trace/mercury_event_scanner.l
@@ -2,8 +2,8 @@
 // vim: ts=4 sw=4 expandtab ft=lex
 
 // Copyright (C) 2006-2007, 2009 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Scanner for solver event specifications.
 
diff --git a/trace/mercury_event_spec.c b/trace/mercury_event_spec.c
index e39bb89..f9edf8d 100644
--- a/trace/mercury_event_spec.c
+++ b/trace/mercury_event_spec.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2002, 2005-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains the functions that we use to manipulate user-defined
 // event types.
diff --git a/trace/mercury_event_spec.h b/trace/mercury_event_spec.h
index dde0e25..2f46461 100644
--- a/trace/mercury_event_spec.h
+++ b/trace/mercury_event_spec.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains the declarations of the types and functions that
 // we use to represent and manipulate user-defined event types.
diff --git a/trace/mercury_event_spec_missing.h b/trace/mercury_event_spec_missing.h
index a635c85..c1e930a 100644
--- a/trace/mercury_event_spec_missing.h
+++ b/trace/mercury_event_spec_missing.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains the declarations that flex and bison should put,
 // or let us programmers put, into the header files they create, but don't.
diff --git a/trace/mercury_trace.c b/trace/mercury_trace.c
index f0387eb..f9f75a7 100644
--- a/trace/mercury_trace.c
+++ b/trace/mercury_trace.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2009, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace.c - implements the top levels of the tracing subsystem,
 // which interface to the automatically generated code in user programs.
diff --git a/trace/mercury_trace.h b/trace/mercury_trace.h
index 1b81940..a287719 100644
--- a/trace/mercury_trace.h
+++ b/trace/mercury_trace.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1997-2003, 2005-2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace.h defines the interface by which the internal and external
 // debuggers can control how the tracing subsystem treats events.
diff --git a/trace/mercury_trace_alias.c b/trace/mercury_trace_alias.c
index 7edc8f8..dc306ef 100644
--- a/trace/mercury_trace_alias.c
+++ b/trace/mercury_trace_alias.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2000,2002-2003, 2005-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_alias.c - implements the table of aliases for the
 // internal debugger.
diff --git a/trace/mercury_trace_alias.h b/trace/mercury_trace_alias.h
index c30d55f..250057a 100644
--- a/trace/mercury_trace_alias.h
+++ b/trace/mercury_trace_alias.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998,2000-2002, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_alias.h
 //
diff --git a/trace/mercury_trace_browse.c b/trace/mercury_trace_browse.c
index 402761b..e73bd6d 100644
--- a/trace/mercury_trace_browse.c
+++ b/trace/mercury_trace_browse.c
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// Copyright (C) 2017 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2017-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_browse.c
 //
diff --git a/trace/mercury_trace_browse.h b/trace/mercury_trace_browse.h
index c65ccbb..e9fa2b1 100644
--- a/trace/mercury_trace_browse.h
+++ b/trace/mercury_trace_browse.h
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2002, 2004-2006 The University of Melbourne.
-// Copyright (C) 2017 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2017-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_browse.h
 //
diff --git a/trace/mercury_trace_cmd_backward.c b/trace/mercury_trace_cmd_backward.c
index 49da0f8..70e3cf7 100644
--- a/trace/mercury_trace_cmd_backward.c
+++ b/trace/mercury_trace_cmd_backward.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2008,2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "backward" category.
 //
diff --git a/trace/mercury_trace_cmd_backward.h b/trace/mercury_trace_cmd_backward.h
index 2b89534..ef2dab0 100644
--- a/trace/mercury_trace_cmd_backward.h
+++ b/trace/mercury_trace_cmd_backward.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_BACKWARD_H
 #define MERCURY_TRACE_CMD_BACKWARD_H
diff --git a/trace/mercury_trace_cmd_breakpoint.c b/trace/mercury_trace_cmd_breakpoint.c
index ec1f566..c6eddb9 100644
--- a/trace/mercury_trace_cmd_breakpoint.c
+++ b/trace/mercury_trace_cmd_breakpoint.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "breakpoint" category.
 //
diff --git a/trace/mercury_trace_cmd_breakpoint.h b/trace/mercury_trace_cmd_breakpoint.h
index 13438ab..81f232e 100644
--- a/trace/mercury_trace_cmd_breakpoint.h
+++ b/trace/mercury_trace_cmd_breakpoint.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_BREAKPOINT_H
 #define MERCURY_TRACE_CMD_BREAKPOINT_H
diff --git a/trace/mercury_trace_cmd_browsing.c b/trace/mercury_trace_cmd_browsing.c
index dce664d..5a821df 100644
--- a/trace/mercury_trace_cmd_browsing.c
+++ b/trace/mercury_trace_cmd_browsing.c
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2008,2010,2012 The University of Melbourne.
-// Copyright (C) 2017 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2017-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "browsing" category.
 //
diff --git a/trace/mercury_trace_cmd_browsing.h b/trace/mercury_trace_cmd_browsing.h
index 21bca3a..ce37430 100644
--- a/trace/mercury_trace_cmd_browsing.h
+++ b/trace/mercury_trace_cmd_browsing.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_BROWSING_H
 #define MERCURY_TRACE_CMD_BROWSING_H
diff --git a/trace/mercury_trace_cmd_dd.c b/trace/mercury_trace_cmd_dd.c
index bea3e56..5f2cec9 100644
--- a/trace/mercury_trace_cmd_dd.c
+++ b/trace/mercury_trace_cmd_dd.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "dd" category.
 //
diff --git a/trace/mercury_trace_cmd_dd.h b/trace/mercury_trace_cmd_dd.h
index 06e02a0..d0f376a 100644
--- a/trace/mercury_trace_cmd_dd.h
+++ b/trace/mercury_trace_cmd_dd.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_DD_H
 #define MERCURY_TRACE_CMD_DD_H
diff --git a/trace/mercury_trace_cmd_developer.c b/trace/mercury_trace_cmd_developer.c
index 676368e..cb724f7 100644
--- a/trace/mercury_trace_cmd_developer.c
+++ b/trace/mercury_trace_cmd_developer.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2008, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2013-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "developer" category.
 //
diff --git a/trace/mercury_trace_cmd_developer.h b/trace/mercury_trace_cmd_developer.h
index 83234cc..a13231e 100644
--- a/trace/mercury_trace_cmd_developer.h
+++ b/trace/mercury_trace_cmd_developer.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006, 2008 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_DEVELOPER_H
 #define MERCURY_TRACE_CMD_DEVELOPER_H
diff --git a/trace/mercury_trace_cmd_exp.c b/trace/mercury_trace_cmd_exp.c
index 6005091..93ca474 100644
--- a/trace/mercury_trace_cmd_exp.c
+++ b/trace/mercury_trace_cmd_exp.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "exp" category.
 //
diff --git a/trace/mercury_trace_cmd_exp.h b/trace/mercury_trace_cmd_exp.h
index ccc3e5e..d86b640 100644
--- a/trace/mercury_trace_cmd_exp.h
+++ b/trace/mercury_trace_cmd_exp.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_EXP_H
 #define MERCURY_TRACE_CMD_EXP_H
diff --git a/trace/mercury_trace_cmd_forward.c b/trace/mercury_trace_cmd_forward.c
index bd5d531..fd8f870 100644
--- a/trace/mercury_trace_cmd_forward.c
+++ b/trace/mercury_trace_cmd_forward.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2008,2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "forward" category.
 //
diff --git a/trace/mercury_trace_cmd_forward.h b/trace/mercury_trace_cmd_forward.h
index f88d541..b1e6d0d 100644
--- a/trace/mercury_trace_cmd_forward.h
+++ b/trace/mercury_trace_cmd_forward.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_FORWARD_H
 #define MERCURY_TRACE_CMD_FORWARD_H
diff --git a/trace/mercury_trace_cmd_help.c b/trace/mercury_trace_cmd_help.c
index d9345ae..cc4a962 100644
--- a/trace/mercury_trace_cmd_help.c
+++ b/trace/mercury_trace_cmd_help.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "help" category.
 //
diff --git a/trace/mercury_trace_cmd_help.h b/trace/mercury_trace_cmd_help.h
index 088fa28..bf31660 100644
--- a/trace/mercury_trace_cmd_help.h
+++ b/trace/mercury_trace_cmd_help.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_HELP_H
 #define MERCURY_TRACE_CMD_HELP_H
diff --git a/trace/mercury_trace_cmd_misc.c b/trace/mercury_trace_cmd_misc.c
index d8cc97d..8404242 100644
--- a/trace/mercury_trace_cmd_misc.c
+++ b/trace/mercury_trace_cmd_misc.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "misc" category.
 //
diff --git a/trace/mercury_trace_cmd_misc.h b/trace/mercury_trace_cmd_misc.h
index 5b1cb89..9e987c3 100644
--- a/trace/mercury_trace_cmd_misc.h
+++ b/trace/mercury_trace_cmd_misc.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_MISC_H
 #define MERCURY_TRACE_CMD_MISC_H
diff --git a/trace/mercury_trace_cmd_parameter.c b/trace/mercury_trace_cmd_parameter.c
index 474f0b2..3a6a7c93 100644
--- a/trace/mercury_trace_cmd_parameter.c
+++ b/trace/mercury_trace_cmd_parameter.c
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007 The University of Melbourne.
-// Copyright (C) 2017 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2017-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "parameter" category.
 //
diff --git a/trace/mercury_trace_cmd_parameter.h b/trace/mercury_trace_cmd_parameter.h
index 4210a44..fdc905b 100644
--- a/trace/mercury_trace_cmd_parameter.h
+++ b/trace/mercury_trace_cmd_parameter.h
@@ -1,9 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007 The University of Melbourne.
-// Copyright (C) 2017 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2017-2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_PARAMETER_H
 #define MERCURY_TRACE_CMD_PARAMETER_H
diff --git a/trace/mercury_trace_cmd_queries.c b/trace/mercury_trace_cmd_queries.c
index 619e472..46ab17c 100644
--- a/trace/mercury_trace_cmd_queries.c
+++ b/trace/mercury_trace_cmd_queries.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "queries" category.
 //
diff --git a/trace/mercury_trace_cmd_queries.h b/trace/mercury_trace_cmd_queries.h
index 228caaf..9a6ea18 100644
--- a/trace/mercury_trace_cmd_queries.h
+++ b/trace/mercury_trace_cmd_queries.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_QUERIES_H
 #define MERCURY_TRACE_CMD_QUERIES_H
diff --git a/trace/mercury_trace_cmd_table_io.c b/trace/mercury_trace_cmd_table_io.c
index 62ae49a..0f3aafa 100644
--- a/trace/mercury_trace_cmd_table_io.c
+++ b/trace/mercury_trace_cmd_table_io.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module implements the mdb commands in the "table_io" category.
 //
diff --git a/trace/mercury_trace_cmd_table_io.h b/trace/mercury_trace_cmd_table_io.h
index d9364f2..8f1c602 100644
--- a/trace/mercury_trace_cmd_table_io.h
+++ b/trace/mercury_trace_cmd_table_io.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_CMD_TABLE_IO_H
 #define MERCURY_TRACE_CMD_TABLE_IO_H
diff --git a/trace/mercury_trace_cmds.h b/trace/mercury_trace_cmds.h
index 14541d9..ba61d59 100644
--- a/trace/mercury_trace_cmds.h
+++ b/trace/mercury_trace_cmds.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_std.h"
 #include "mercury_types.h"
diff --git a/trace/mercury_trace_command_queue.c b/trace/mercury_trace_command_queue.c
index 847ad48..6423dd6 100644
--- a/trace/mercury_trace_command_queue.c
+++ b/trace/mercury_trace_command_queue.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2008 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module looks after a queue of lines containing commands for mdb.
 // Its main use is during initialization.
diff --git a/trace/mercury_trace_command_queue.h b/trace/mercury_trace_command_queue.h
index ab3a842..e51daa0 100644
--- a/trace/mercury_trace_command_queue.h
+++ b/trace/mercury_trace_command_queue.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2008 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_COMMAND_QUEUE_H
 #define MERCURY_TRACE_COMMAND_QUEUE_H
diff --git a/trace/mercury_trace_completion.c b/trace/mercury_trace_completion.c
index d371e96..101abee 100644
--- a/trace/mercury_trace_completion.c
+++ b/trace/mercury_trace_completion.c
@@ -2,8 +2,7 @@
 
 // Copyright (C) 2002, 2005-2006 The University of Melbourne.
 // Copyright (C) 2014-2016, 2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_completion.c
 //
diff --git a/trace/mercury_trace_completion.h b/trace/mercury_trace_completion.h
index f26b4d9..960a0e2 100644
--- a/trace/mercury_trace_completion.h
+++ b/trace/mercury_trace_completion.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2002, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_completion.h
 //
diff --git a/trace/mercury_trace_declarative.c b/trace/mercury_trace_declarative.c
index 40b0902..e6ae9d2 100644
--- a/trace/mercury_trace_declarative.c
+++ b/trace/mercury_trace_declarative.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2009, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // Main authors: Mark Brown, Ian MacLarty
 //
diff --git a/trace/mercury_trace_declarative.h b/trace/mercury_trace_declarative.h
index 7975e72..0e4010c 100644
--- a/trace/mercury_trace_declarative.h
+++ b/trace/mercury_trace_declarative.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2002, 2004-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_DECLARATIVE_H
 #define MERCURY_TRACE_DECLARATIVE_H
diff --git a/trace/mercury_trace_external.c b/trace/mercury_trace_external.c
index 47bdc76..43a3c69 100644
--- a/trace/mercury_trace_external.c
+++ b/trace/mercury_trace_external.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2008,2011-2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains the code that interfaces between the Mercury program
 // being debugged and the external trace analysis process.
diff --git a/trace/mercury_trace_external.h b/trace/mercury_trace_external.h
index 0b39469..82ad8b4 100644
--- a/trace/mercury_trace_external.h
+++ b/trace/mercury_trace_external.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2001, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_EXTERNAL_H
 #define MERCURY_TRACE_EXTERNAL_H
diff --git a/trace/mercury_trace_help.c b/trace/mercury_trace_help.c
index ba0814d..559b6fb 100644
--- a/trace/mercury_trace_help.c
+++ b/trace/mercury_trace_help.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2000,2002-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_help.c
 //
diff --git a/trace/mercury_trace_help.h b/trace/mercury_trace_help.h
index d669462..27fcb62 100644
--- a/trace/mercury_trace_help.h
+++ b/trace/mercury_trace_help.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998,2002, 2005-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_help.h
 //
diff --git a/trace/mercury_trace_hold_vars.c b/trace/mercury_trace_hold_vars.c
index d844ce1..e8fd469 100644
--- a/trace/mercury_trace_hold_vars.c
+++ b/trace/mercury_trace_hold_vars.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2005-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #include "mercury_imp.h"
 #include "mercury_array_macros.h"       // MR_bsearch etc
diff --git a/trace/mercury_trace_hold_vars.h b/trace/mercury_trace_hold_vars.h
index eb21209..397a01d 100644
--- a/trace/mercury_trace_hold_vars.h
+++ b/trace/mercury_trace_hold_vars.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2005-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module looks after the debugger's information about the variables
 // that have been held the user. Held variables start out as variables
diff --git a/trace/mercury_trace_internal.c b/trace/mercury_trace_internal.c
index 62f1612..48eddf1 100644
--- a/trace/mercury_trace_internal.c
+++ b/trace/mercury_trace_internal.c
@@ -2,8 +2,7 @@
 
 // Copyright (C) 1998-2012 The University of Melbourne.
 // Copyright (C) 2013-2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains the top level of the code of the internal, in-process
 // debugger. The functions implementing the commands themselves are in the
diff --git a/trace/mercury_trace_internal.h b/trace/mercury_trace_internal.h
index e4ef18c..b1be9e1 100644
--- a/trace/mercury_trace_internal.h
+++ b/trace/mercury_trace_internal.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2002, 2005-2006, 2008 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 #ifndef MERCURY_TRACE_INTERNAL_H
 #define MERCURY_TRACE_INTERNAL_H
diff --git a/trace/mercury_trace_readline.c b/trace/mercury_trace_readline.c
index e7c3a78..ac790db 100644
--- a/trace/mercury_trace_readline.c
+++ b/trace/mercury_trace_readline.c
@@ -2,8 +2,7 @@
 
 // Copyright (C) 1998-2002, 2005-2007 The University of Melbourne.
 // Copyright (C) 2014-2016, 2018 The Mercury team.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // A simple interface to read a line, normally done using GNU readline.
 //
diff --git a/trace/mercury_trace_readline.h b/trace/mercury_trace_readline.h
index ec78dc3..b5ef845 100644
--- a/trace/mercury_trace_readline.h
+++ b/trace/mercury_trace_readline.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-1999, 2006-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_readline.h: simple interface functions to read a line.
 //
diff --git a/trace/mercury_trace_source.c b/trace/mercury_trace_source.c
index a93aa41..4fda57c 100644
--- a/trace/mercury_trace_source.c
+++ b/trace/mercury_trace_source.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001-2002, 2005-2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_source.c
 //
diff --git a/trace/mercury_trace_source.h b/trace/mercury_trace_source.h
index a70d799..0c1317c 100644
--- a/trace/mercury_trace_source.h
+++ b/trace/mercury_trace_source.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2001, 2006 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // mercury_trace_source.h
 //
diff --git a/trace/mercury_trace_spy.c b/trace/mercury_trace_spy.c
index b108db1..8dd5524 100644
--- a/trace/mercury_trace_spy.c
+++ b/trace/mercury_trace_spy.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2002, 2005-2008, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains code to manage spy points for both
 // the internal and external debuggers.
diff --git a/trace/mercury_trace_spy.h b/trace/mercury_trace_spy.h
index 96050bf..025e92d 100644
--- a/trace/mercury_trace_spy.h
+++ b/trace/mercury_trace_spy.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2001, 2005-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains the declarations of the types and functions that
 // the internal and external debuggers can use to manipulate spy points.
diff --git a/trace/mercury_trace_tables.c b/trace/mercury_trace_tables.c
index 1522eca..e575ebf 100644
--- a/trace/mercury_trace_tables.c
+++ b/trace/mercury_trace_tables.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2007, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file manages a table listing the debuggable modules of the program,
 // and subsidiary tables listing the procedures of each of those modules.
diff --git a/trace/mercury_trace_tables.h b/trace/mercury_trace_tables.h
index 359a334..2840fbd 100644
--- a/trace/mercury_trace_tables.h
+++ b/trace/mercury_trace_tables.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998-2002, 2004-2007 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains the declarations of the tables that contain
 // the identities of the debuggable modules and their procedures.
diff --git a/trace/mercury_trace_util.c b/trace/mercury_trace_util.c
index 4b45af0..7143cdd 100644
--- a/trace/mercury_trace_util.c
+++ b/trace/mercury_trace_util.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 2000-2002,2004-2007,2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains utility functions that can be used by any or all
 // of the various kinds of Mercury debuggers.
diff --git a/trace/mercury_trace_util.h b/trace/mercury_trace_util.h
index 63f5ca8..acbe32a 100644
--- a/trace/mercury_trace_util.h
+++ b/trace/mercury_trace_util.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1998,2000-2002,2004-2007,2012 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module provides utility functions for the debugger.
 //
diff --git a/trace/mercury_trace_vars.c b/trace/mercury_trace_vars.c
index 05b3953..d8af372 100644
--- a/trace/mercury_trace_vars.c
+++ b/trace/mercury_trace_vars.c
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1999-2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2014, 2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This file contains the code for managing information about the
 // variables of the program being debugged for both the internal
diff --git a/trace/mercury_trace_vars.h b/trace/mercury_trace_vars.h
index f820d89..13d314e 100644
--- a/trace/mercury_trace_vars.h
+++ b/trace/mercury_trace_vars.h
@@ -1,8 +1,8 @@
 // vim: ts=4 sw=4 expandtab ft=c
 
 // Copyright (C) 1999-2008, 2011 The University of Melbourne.
-// This file may only be copied under the terms of the GNU Library General
-// Public License - see the file COPYING.LIB in the Mercury distribution.
+// Copyright (C) 2015-2016, 2018 The Mercury team.
+// This file is distributed under the terms specified in COPYING.LIB.
 
 // This module looks after the debugger's information about the variables
 // that are live at a given program point.
Previous message: [m-dev.] [m-users.] Closed source Mercury projects on Windows
Next message: [m-dev.] [m-users.] Closed source Mercury projects on Windows
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the developers mailing list