diff mbox series

[1/9,v2] Replace individual license references with SPDX Identifiers

Message ID 87pn8wlsoq.fsf@redhat.com
State New
Headers show
Series Relicensing Libabigail to Apache 2.0 + LLVM Exception | expand

Commit Message

Dodji Seketeli July 15, 2020, 3:11 p.m. UTC
This patch replaces license headers with SPDX identifiers in all files
containing license headers.  For each file, the SPDX identifier
formally represents its current license.  Note that the list of SPDX
identifiers is available on the SPDX web site at
https://spdx.org/licenses.

For autoconf-archive/ax_prog_python_version.m4 however, there is a
little catch.  Dodji Seketeli wrote this ax_check_python_modules.m4.
Just like the other autoconf-archive macros, it makes sense to have it
under the FSF All Permissive license.  Actually, the terms of that
license was already in the file but then the license header was
wrongly set to GPLv2 with autoconf exception.  So I fixed that in this
commit by setting the SPDX identifier to FSFAP.

	* abigail.m4: Replace the license header with the SPDX identifier
	GPL-3.0-or-later WITH GCC-exception-3.1
	* autoconf-archive/ax_check_python_modules.m4: Correctly set the
	SPDX identifier to FSFAP.
	* autoconf-archive/ax_compare_version.m4: Replace the license
	header with the SPDX identifier FSFAP.
	* autoconf-archive/ax_prog_python_version.m4: Likewise.
	header with the SPDX identifier FSFAP.
	* autoconf-archive/ax_valgrind_check.m4: Likewise.
	* gen-changelog.py: Replace the license header with the SPDX
	identifier LGPL-2.0-or-later.
	* include/abg-comp-filter.h: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* include/abg-comparison.h: Likewise.
	* include/abg-config.h: Likewise.
	* include/abg-corpus.h: Likewise.
	* include/abg-cxx-compat.h: Replace the license header with the
	SPDX identifier LGPL-2.0-or-later.
	* include/abg-diff-utils.h: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later
	* include/abg-dwarf-reader.h: Likewise.
	* include/abg-fwd.h: Likewise.
	* include/abg-hash.h: Likewise.
	* include/abg-ini.h: Likewise.
	* include/abg-interned-str.h: Likewise.
	* include/abg-ir.h: Likewise.
	* include/abg-libxml-utils.h: Likewise.
	* include/abg-libzip-utils.h: Likewise.
	* include/abg-reader.h: Likewise.
	* include/abg-regex.h: Likewise.
	* include/abg-reporter.h: Likewise.
	* include/abg-sptr-utils.h: Likewise.
	* include/abg-suppression.h: Likewise.
	* include/abg-tools-utils.h: Likewise.
	* include/abg-traverse.h: Likewise.
	* include/abg-viz-common.h: Likewise.
	* include/abg-viz-dot.h: Likewise.
	* include/abg-viz-svg.h: Likewise.
	* include/abg-workers.h: Likewise.
	* include/abg-writer.h: Likewise.
	* install-sh: Replace the license header with the SPDX identifier MIT.
	* ltmain.sh: Replace the license header with the SPDX identifier
	GPL-2.0-or-later.
	* src/abg-comp-filter.cc: Replace the license header with the SPDX
	identifier LGPL-3.0-or-later.
	* src/abg-comparison-priv.h: Likewise.
	* src/abg-comparison.cc: Likewise.
	* src/abg-config.cc: Likewise.
	* src/abg-corpus-priv.h: Likewise.
	* src/abg-corpus.cc: Likewise.
	* src/abg-default-reporter.cc: Likewise.
	* src/abg-diff-utils.cc: Likewise.
	* src/abg-dwarf-reader.cc: Likewise.
	* src/abg-elf-helpers.cc: Likewise.
	* src/abg-elf-helpers.h: Likewise.
	* src/abg-regex.cc: Likewise.
	* src/abg-hash.cc: Likewise.
	* src/abg-ini.cc: Likewise.
	* src/abg-internal.h: Likewise.
	* src/abg-ir-priv.h: Likewise.
	* src/abg-ir.cc: Likewise.
	* src/abg-leaf-reporter.cc: Likewise.
	* src/abg-libxml-utils.cc: Likewise.
	* src/abg-libzip-utils.cc: Likewise.
	* src/abg-reader.cc: Likewise.
	* src/abg-reporter-priv.cc: Likewise.
	* src/abg-reporter-priv.h: Likewise.
	* src/abg-sptr-utils.cc: Likewise.
	* src/abg-suppression-priv.h: Likewise.
	* src/abg-suppression.cc: Likewise.
	* src/abg-tools-utils.cc: Likewise.
	* src/abg-traverse.cc: Likewise.
	* src/abg-viz-common.cc: Likewise.
	* src/abg-viz-dot.cc: Likewise.
	* src/abg-viz-svg.cc: Likewise.
	* src/abg-workers.cc: Likewise.
	* src/abg-writer.cc: Likewise.
	* tests/lib/catch.cc: Likewise.
	* tests/lib/catch.hpp: Replace the license header with the SPDX
	identifier BSL-1.0.
	* tests/mockfedabipkgdiff.in: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* tests/print-diff-tree.cc: Likewise.
	* tests/runtestfedabipkgdiff.py.in: Replaace the license header
	with the SPDW identifier GPL-3.0-or-later.
	* tests/test-abicompat.cc: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* tests/test-abidiff-exit.cc: Likewise.
	* tests/test-abidiff.cc: Likewise.
	* tests/test-alt-dwarf-file.cc: Likewise.
	* tests/test-annotate.cc: Likewise.
	* tests/test-cxx-compat.cc: Likewise.
	* tests/test-core-diff.cc: Likewise.
	* tests/test-diff-dwarf-abixml.cc: Likewise.
	* tests/test-diff-dwarf.cc: Likewise.
	* tests/test-diff-filter.cc: Likewise.
	* tests/test-diff-pkg.cc: Likewise.
	* tests/test-diff-suppr.cc: Likewise.
	* tests/test-diff2.cc: Likewise.
	* tests/test-dot.cc: Replace the license header with the
	SPDX identifier GPL-3.0-with-GCC-exception.
	* tests/test-elf-helpers.cc: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* tests/test-ini.cc: Likewise.
	* tests/test-ir-walker.cc: Likewise.
	* tests/test-kmi-whitelist.cc: Likewise.
	* tests/test-lookup-syms.cc: Likewise.
	* tests/test-read-dwarf.cc: Likewise.
	* tests/test-read-write.cc: Likewise.
	* tests/test-svg.cc: Replace the license header with the SPDX
	identifier GPL-3.0-with-GCC-exception.
	* tests/test-symtab.cc: Replace the license header with the SPDX
	identifier LGPL-3.0-or-later.
	* tests/test-tools-utils.cc: Likewise.
	* tests/test-types-stability.cc: Likewise.
	* tests/test-utils.cc: Likewise.
	* tests/test-utils.h: Likewise.
	* tests/test-write-read-archive.cc: Likewise.
	* tools/abiar.cc: Likewise.
	* tools/abicompat.cc: Likewise.
	* tools/abidiff.cc: Likewise.
	* tools/abidw.cc: Likewise.
	* tools/abilint.cc: Likewise.
	* tools/abipkgdiff.cc: Likewise.
	* tools/abisym.cc: Likewise.
	* tools/binilint.cc: Likewise.
	* tools/fedabipkgdiff: Replace the license header with the
	SPDX identifier GPL-3.0-or-later.
	* tools/kmidiff.cc: Likewise.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Signed-off-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
---
 abigail.m4                                  | 26 ++++----------------------
 autoconf-archive/ax_check_python_modules.m4 | 20 +-------------------
 autoconf-archive/ax_compare_version.m4      |  1 +
 autoconf-archive/ax_prog_python_version.m4  |  1 +
 autoconf-archive/ax_valgrind_check.m4       |  1 +
 gen-changelog.py                            | 15 ++-------------
 include/abg-comp-filter.h                   | 17 +----------------
 include/abg-comparison.h                    | 17 +----------------
 include/abg-config.h                        | 17 +----------------
 include/abg-corpus.h                        | 17 +----------------
 include/abg-cxx-compat.h                    | 17 +----------------
 include/abg-diff-utils.h                    | 17 +----------------
 include/abg-dwarf-reader.h                  | 17 +----------------
 include/abg-fwd.h                           | 17 +----------------
 include/abg-hash.h                          | 17 +----------------
 include/abg-ini.h                           | 17 +----------------
 include/abg-interned-str.h                  | 17 +----------------
 include/abg-ir.h                            | 17 +----------------
 include/abg-libxml-utils.h                  | 17 +----------------
 include/abg-libzip-utils.h                  | 17 +----------------
 include/abg-reader.h                        | 17 +----------------
 include/abg-regex.h                         | 19 ++-----------------
 include/abg-reporter.h                      | 17 +----------------
 include/abg-sptr-utils.h                    | 17 +----------------
 include/abg-suppression.h                   | 17 +----------------
 include/abg-tools-utils.h                   | 17 +----------------
 include/abg-traverse.h                      | 17 +----------------
 include/abg-viz-common.h                    | 17 +----------------
 include/abg-viz-dot.h                       | 17 +----------------
 include/abg-viz-svg.h                       | 17 +----------------
 include/abg-workers.h                       | 17 +----------------
 include/abg-writer.h                        | 17 +----------------
 install-sh                                  | 18 +-----------------
 ltmain.sh                                   | 22 +---------------------
 src/abg-comp-filter.cc                      | 17 +----------------
 src/abg-comparison-priv.h                   | 18 +-----------------
 src/abg-comparison.cc                       | 17 +----------------
 src/abg-config.cc                           | 17 +----------------
 src/abg-corpus-priv.h                       | 17 +----------------
 src/abg-corpus.cc                           | 17 +----------------
 src/abg-default-reporter.cc                 | 17 +----------------
 src/abg-diff-utils.cc                       | 17 +----------------
 src/abg-dwarf-reader.cc                     | 17 +----------------
 src/abg-elf-helpers.cc                      | 17 +----------------
 src/abg-elf-helpers.h                       | 17 +----------------
 src/abg-hash.cc                             | 17 +----------------
 src/abg-ini.cc                              | 17 +----------------
 src/abg-internal.h                          | 17 +----------------
 src/abg-ir-priv.h                           | 17 +----------------
 src/abg-ir.cc                               | 17 +----------------
 src/abg-leaf-reporter.cc                    | 17 +----------------
 src/abg-libxml-utils.cc                     | 17 +----------------
 src/abg-libzip-utils.cc                     | 17 +----------------
 src/abg-reader.cc                           | 17 +----------------
 src/abg-regex.cc                            | 17 +----------------
 src/abg-reporter-priv.cc                    | 17 +----------------
 src/abg-reporter-priv.h                     | 17 +----------------
 src/abg-suppression-priv.h                  | 17 +----------------
 src/abg-suppression.cc                      | 17 +----------------
 src/abg-tools-utils.cc                      | 17 +----------------
 src/abg-traverse.cc                         | 17 +----------------
 src/abg-viz-common.cc                       | 17 +----------------
 src/abg-viz-dot.cc                          | 18 +-----------------
 src/abg-viz-svg.cc                          | 17 +----------------
 src/abg-workers.cc                          | 17 +----------------
 src/abg-writer.cc                           | 17 +----------------
 tests/lib/catch.cc                          | 17 +----------------
 tests/lib/catch.hpp                         |  4 ++--
 tests/mockfedabipkgdiff.in                  | 17 +----------------
 tests/print-diff-tree.cc                    | 20 ++------------------
 tests/runtestfedabipkgdiff.py.in            | 17 +----------------
 tests/test-abicompat.cc                     | 17 +----------------
 tests/test-abidiff-exit.cc                  | 17 +----------------
 tests/test-abidiff.cc                       | 17 +----------------
 tests/test-alt-dwarf-file.cc                | 17 +----------------
 tests/test-annotate.cc                      | 17 +----------------
 tests/test-core-diff.cc                     | 19 ++-----------------
 tests/test-cxx-compat.cc                    | 18 +-----------------
 tests/test-diff-dwarf-abixml.cc             | 17 +----------------
 tests/test-diff-dwarf.cc                    | 17 +----------------
 tests/test-diff-filter.cc                   | 17 +----------------
 tests/test-diff-pkg.cc                      | 17 +----------------
 tests/test-diff-suppr.cc                    | 17 +----------------
 tests/test-diff2.cc                         | 20 ++------------------
 tests/test-dot.cc                           | 26 +++-----------------------
 tests/test-elf-helpers.cc                   | 17 +----------------
 tests/test-ini.cc                           | 17 +----------------
 tests/test-ir-walker.cc                     | 17 +----------------
 tests/test-kmi-whitelist.cc                 | 17 +----------------
 tests/test-lookup-syms.cc                   | 17 +----------------
 tests/test-read-dwarf.cc                    | 17 +----------------
 tests/test-read-write.cc                    | 17 +----------------
 tests/test-svg.cc                           | 26 +++-----------------------
 tests/test-symtab.cc                        | 17 +----------------
 tests/test-tools-utils.cc                   | 17 +----------------
 tests/test-types-stability.cc               | 17 +----------------
 tests/test-utils.cc                         | 18 +-----------------
 tests/test-utils.h                          | 17 +----------------
 tests/test-write-read-archive.cc            | 17 +----------------
 tools/abiar.cc                              | 17 +----------------
 tools/abicompat.cc                          | 17 +----------------
 tools/abidiff.cc                            | 17 +----------------
 tools/abidw.cc                              | 17 +----------------
 tools/abilint.cc                            | 17 +----------------
 tools/abipkgdiff.cc                         | 17 +----------------
 tools/abisym.cc                             | 17 +----------------
 tools/binilint.cc                           | 17 +----------------
 tools/fedabipkgdiff                         | 17 +----------------
 tools/kmidiff.cc                            | 17 +----------------
 109 files changed, 122 insertions(+), 1718 deletions(-)

Comments

Jonathan Wakely Sept. 24, 2020, 10:09 a.m. UTC | #1
One remaining issue in v2 of this patch, and two requests for a better
commit message. See below.

On 15/07/20 17:11 +0200, Dodji Seketeli wrote:
>This patch replaces license headers with SPDX identifiers in all files
>containing license headers.  For each file, the SPDX identifier
>formally represents its current license.  Note that the list of SPDX
>identifiers is available on the SPDX web site at
>https://spdx.org/licenses.
>
>For autoconf-archive/ax_prog_python_version.m4 however, there is a
>little catch.  Dodji Seketeli wrote this ax_check_python_modules.m4.
>Just like the other autoconf-archive macros, it makes sense to have it
>under the FSF All Permissive license.  Actually, the terms of that
>license was already in the file but then the license header was
>wrongly set to GPLv2 with autoconf exception.  So I fixed that in this
>commit by setting the SPDX identifier to FSFAP.
>
>	* abigail.m4: Replace the license header with the SPDX identifier
>	GPL-3.0-or-later WITH GCC-exception-3.1
>	* autoconf-archive/ax_check_python_modules.m4: Correctly set the
>	SPDX identifier to FSFAP.
>	* autoconf-archive/ax_compare_version.m4: Replace the license
>	header with the SPDX identifier FSFAP.
>	* autoconf-archive/ax_prog_python_version.m4: Likewise.
>	header with the SPDX identifier FSFAP.
>	* autoconf-archive/ax_valgrind_check.m4: Likewise.
>	* gen-changelog.py: Replace the license header with the SPDX
>	identifier LGPL-2.0-or-later.
>	* include/abg-comp-filter.h: Replace the license header with the
>	SPDX identifier LGPL-3.0-or-later.
>	* include/abg-comparison.h: Likewise.
>	* include/abg-config.h: Likewise.
>	* include/abg-corpus.h: Likewise.
>	* include/abg-cxx-compat.h: Replace the license header with the
>	SPDX identifier LGPL-2.0-or-later.
>	* include/abg-diff-utils.h: Replace the license header with the
>	SPDX identifier LGPL-3.0-or-later
>	* include/abg-dwarf-reader.h: Likewise.
>	* include/abg-fwd.h: Likewise.
>	* include/abg-hash.h: Likewise.
>	* include/abg-ini.h: Likewise.
>	* include/abg-interned-str.h: Likewise.
>	* include/abg-ir.h: Likewise.
>	* include/abg-libxml-utils.h: Likewise.
>	* include/abg-libzip-utils.h: Likewise.
>	* include/abg-reader.h: Likewise.
>	* include/abg-regex.h: Likewise.
>	* include/abg-reporter.h: Likewise.
>	* include/abg-sptr-utils.h: Likewise.
>	* include/abg-suppression.h: Likewise.
>	* include/abg-tools-utils.h: Likewise.
>	* include/abg-traverse.h: Likewise.
>	* include/abg-viz-common.h: Likewise.
>	* include/abg-viz-dot.h: Likewise.
>	* include/abg-viz-svg.h: Likewise.
>	* include/abg-workers.h: Likewise.
>	* include/abg-writer.h: Likewise.
>	* install-sh: Replace the license header with the SPDX identifier MIT.
>	* ltmain.sh: Replace the license header with the SPDX identifier
>	GPL-2.0-or-later.

It would be helpful if the commit log mentioned that this change to
ltmain.sh drops the (redundant?) libtool exception. I know you already
explained why that's OK, but I just noticed it again myself and asked
you about it on IRC. If the commit log mentioned it, I wouldn't need
to wonder if it's an error.

>	* src/abg-comp-filter.cc: Replace the license header with the SPDX
>	identifier LGPL-3.0-or-later.
>	* src/abg-comparison-priv.h: Likewise.
>	* src/abg-comparison.cc: Likewise.
>	* src/abg-config.cc: Likewise.
>	* src/abg-corpus-priv.h: Likewise.
>	* src/abg-corpus.cc: Likewise.
>	* src/abg-default-reporter.cc: Likewise.
>	* src/abg-diff-utils.cc: Likewise.
>	* src/abg-dwarf-reader.cc: Likewise.
>	* src/abg-elf-helpers.cc: Likewise.
>	* src/abg-elf-helpers.h: Likewise.
>	* src/abg-regex.cc: Likewise.
>	* src/abg-hash.cc: Likewise.
>	* src/abg-ini.cc: Likewise.
>	* src/abg-internal.h: Likewise.
>	* src/abg-ir-priv.h: Likewise.
>	* src/abg-ir.cc: Likewise.
>	* src/abg-leaf-reporter.cc: Likewise.
>	* src/abg-libxml-utils.cc: Likewise.
>	* src/abg-libzip-utils.cc: Likewise.
>	* src/abg-reader.cc: Likewise.
>	* src/abg-reporter-priv.cc: Likewise.
>	* src/abg-reporter-priv.h: Likewise.
>	* src/abg-sptr-utils.cc: Likewise.
>	* src/abg-suppression-priv.h: Likewise.
>	* src/abg-suppression.cc: Likewise.
>	* src/abg-tools-utils.cc: Likewise.
>	* src/abg-traverse.cc: Likewise.
>	* src/abg-viz-common.cc: Likewise.
>	* src/abg-viz-dot.cc: Likewise.
>	* src/abg-viz-svg.cc: Likewise.
>	* src/abg-workers.cc: Likewise.
>	* src/abg-writer.cc: Likewise.
>	* tests/lib/catch.cc: Likewise.
>	* tests/lib/catch.hpp: Replace the license header with the SPDX
>	identifier BSL-1.0.

The changelog says "Replace" but actually it's just adding it. Nothing
gets replaced.

>	* tests/mockfedabipkgdiff.in: Replace the license header with the
>	SPDX identifier LGPL-3.0-or-later.

This change looks wrong:

>diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
>index 47c8cc8..ea8efc1 100644
>--- a/tests/mockfedabipkgdiff.in
>+++ b/tests/mockfedabipkgdiff.in
>@@ -1,23 +1,8 @@
> #!/usr/bin/env python
>+# SPDX-License-Identifier: LGPL-3.0-or-later
> # -*- coding: utf-8 -*-
> # -*- Mode: Python
> #
>-# This file is part of the GNU Application Binary Interface Generic
>-# Analysis and Instrumentation Library (libabigail).  This library is
>-# free software; you can redistribute it and/or modify it under the
>-# terms of the GNU General Public License as published by the
>-# Free Software Foundation; either version 3, or (at your option) any
>-# later version.
>-#
>-# This library is distributed in the hope that it will be useful, but
>-# WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>-# General Public License for more details.
>-#
>-# You should have received a copy of the GNU General Public
>-# License along with this program; see the file COPYING-GPLV3.  If
>-# not, see <http:#www.gnu.org/licenses/>.
>-#
> # Author: Dodji Seketeli
> #
> # Based on some preliminary work from Chenxiong Qi, posted to
Jonathan Wakely Sept. 24, 2020, 10:14 a.m. UTC | #2
On 24/09/20 11:09 +0100, Jonathan Wakely wrote:
>One remaining issue in v2 of this patch, and two requests for a better
>commit message. See below.
>
>On 15/07/20 17:11 +0200, Dodji Seketeli wrote:
>>This patch replaces license headers with SPDX identifiers in all files
>>containing license headers.  For each file, the SPDX identifier
>>formally represents its current license.  Note that the list of SPDX
>>identifiers is available on the SPDX web site at
>>https://spdx.org/licenses.
>>
>>For autoconf-archive/ax_prog_python_version.m4 however, there is a
>>little catch.  Dodji Seketeli wrote this ax_check_python_modules.m4.
>>Just like the other autoconf-archive macros, it makes sense to have it
>>under the FSF All Permissive license.  Actually, the terms of that
>>license was already in the file but then the license header was
>>wrongly set to GPLv2 with autoconf exception.  So I fixed that in this
>>commit by setting the SPDX identifier to FSFAP.
>>
>>	* abigail.m4: Replace the license header with the SPDX identifier
>>	GPL-3.0-or-later WITH GCC-exception-3.1
>>	* autoconf-archive/ax_check_python_modules.m4: Correctly set the
>>	SPDX identifier to FSFAP.
>>	* autoconf-archive/ax_compare_version.m4: Replace the license
>>	header with the SPDX identifier FSFAP.
>>	* autoconf-archive/ax_prog_python_version.m4: Likewise.
>>	header with the SPDX identifier FSFAP.
>>	* autoconf-archive/ax_valgrind_check.m4: Likewise.
>>	* gen-changelog.py: Replace the license header with the SPDX
>>	identifier LGPL-2.0-or-later.
>>	* include/abg-comp-filter.h: Replace the license header with the
>>	SPDX identifier LGPL-3.0-or-later.
>>	* include/abg-comparison.h: Likewise.
>>	* include/abg-config.h: Likewise.
>>	* include/abg-corpus.h: Likewise.
>>	* include/abg-cxx-compat.h: Replace the license header with the
>>	SPDX identifier LGPL-2.0-or-later.
>>	* include/abg-diff-utils.h: Replace the license header with the
>>	SPDX identifier LGPL-3.0-or-later
>>	* include/abg-dwarf-reader.h: Likewise.
>>	* include/abg-fwd.h: Likewise.
>>	* include/abg-hash.h: Likewise.
>>	* include/abg-ini.h: Likewise.
>>	* include/abg-interned-str.h: Likewise.
>>	* include/abg-ir.h: Likewise.
>>	* include/abg-libxml-utils.h: Likewise.
>>	* include/abg-libzip-utils.h: Likewise.
>>	* include/abg-reader.h: Likewise.
>>	* include/abg-regex.h: Likewise.
>>	* include/abg-reporter.h: Likewise.
>>	* include/abg-sptr-utils.h: Likewise.
>>	* include/abg-suppression.h: Likewise.
>>	* include/abg-tools-utils.h: Likewise.
>>	* include/abg-traverse.h: Likewise.
>>	* include/abg-viz-common.h: Likewise.
>>	* include/abg-viz-dot.h: Likewise.
>>	* include/abg-viz-svg.h: Likewise.
>>	* include/abg-workers.h: Likewise.
>>	* include/abg-writer.h: Likewise.
>>	* install-sh: Replace the license header with the SPDX identifier MIT.
>>	* ltmain.sh: Replace the license header with the SPDX identifier
>>	GPL-2.0-or-later.
>
>It would be helpful if the commit log mentioned that this change to
>ltmain.sh drops the (redundant?) libtool exception. I know you already
>explained why that's OK, but I just noticed it again myself and asked
>you about it on IRC. If the commit log mentioned it, I wouldn't need
>to wonder if it's an error.

For the record, the previous explanation of this change is here:
https://sourceware.org/pipermail/libabigail/2020q3/002515.html

>>	* src/abg-comp-filter.cc: Replace the license header with the SPDX
>>	identifier LGPL-3.0-or-later.
>>	* src/abg-comparison-priv.h: Likewise.
>>	* src/abg-comparison.cc: Likewise.
>>	* src/abg-config.cc: Likewise.
>>	* src/abg-corpus-priv.h: Likewise.
>>	* src/abg-corpus.cc: Likewise.
>>	* src/abg-default-reporter.cc: Likewise.
>>	* src/abg-diff-utils.cc: Likewise.
>>	* src/abg-dwarf-reader.cc: Likewise.
>>	* src/abg-elf-helpers.cc: Likewise.
>>	* src/abg-elf-helpers.h: Likewise.
>>	* src/abg-regex.cc: Likewise.
>>	* src/abg-hash.cc: Likewise.
>>	* src/abg-ini.cc: Likewise.
>>	* src/abg-internal.h: Likewise.
>>	* src/abg-ir-priv.h: Likewise.
>>	* src/abg-ir.cc: Likewise.
>>	* src/abg-leaf-reporter.cc: Likewise.
>>	* src/abg-libxml-utils.cc: Likewise.
>>	* src/abg-libzip-utils.cc: Likewise.
>>	* src/abg-reader.cc: Likewise.
>>	* src/abg-reporter-priv.cc: Likewise.
>>	* src/abg-reporter-priv.h: Likewise.
>>	* src/abg-sptr-utils.cc: Likewise.
>>	* src/abg-suppression-priv.h: Likewise.
>>	* src/abg-suppression.cc: Likewise.
>>	* src/abg-tools-utils.cc: Likewise.
>>	* src/abg-traverse.cc: Likewise.
>>	* src/abg-viz-common.cc: Likewise.
>>	* src/abg-viz-dot.cc: Likewise.
>>	* src/abg-viz-svg.cc: Likewise.
>>	* src/abg-workers.cc: Likewise.
>>	* src/abg-writer.cc: Likewise.
>>	* tests/lib/catch.cc: Likewise.
>>	* tests/lib/catch.hpp: Replace the license header with the SPDX
>>	identifier BSL-1.0.
>
>The changelog says "Replace" but actually it's just adding it. Nothing
>gets replaced.
>
>>	* tests/mockfedabipkgdiff.in: Replace the license header with the
>>	SPDX identifier LGPL-3.0-or-later.
>
>This change looks wrong:
>
>>diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
>>index 47c8cc8..ea8efc1 100644
>>--- a/tests/mockfedabipkgdiff.in
>>+++ b/tests/mockfedabipkgdiff.in
>>@@ -1,23 +1,8 @@
>>#!/usr/bin/env python
>>+# SPDX-License-Identifier: LGPL-3.0-or-later
>># -*- coding: utf-8 -*-
>># -*- Mode: Python
>>#
>>-# This file is part of the GNU Application Binary Interface Generic
>>-# Analysis and Instrumentation Library (libabigail).  This library is
>>-# free software; you can redistribute it and/or modify it under the
>>-# terms of the GNU General Public License as published by the
>>-# Free Software Foundation; either version 3, or (at your option) any
>>-# later version.
>>-#
>>-# This library is distributed in the hope that it will be useful, but
>>-# WITHOUT ANY WARRANTY; without even the implied warranty of
>>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>-# General Public License for more details.
>>-#
>>-# You should have received a copy of the GNU General Public
>>-# License along with this program; see the file COPYING-GPLV3.  If
>>-# not, see <http:#www.gnu.org/licenses/>.
>>-#
>># Author: Dodji Seketeli
>>#
>># Based on some preliminary work from Chenxiong Qi, posted to
>
Dodji Seketeli Sept. 25, 2020, 8:38 a.m. UTC | #3
Hello Jonathan,

Jonathan Wakely <jwakely@redhat.com> writes:

> One remaining issue in v2 of this patch, and two requests for a better
> commit message. See below.

Oh, right ...

[...]


>>	* ltmain.sh: Replace the license header with the SPDX identifier
>>	GPL-2.0-or-later.
>
> It would be helpful if the commit log mentioned that this change to
> ltmain.sh drops the (redundant?) libtool exception. I know you already
> explained why that's OK, but I just noticed it again myself and asked
> you about it on IRC. If the commit log mentioned it, I wouldn't need
> to wonder if it's an error.

Right.  I have added a hopefully better comment for this.  I am
attaching the resulting patch below.

[...]

>>	* tests/lib/catch.hpp: Replace the license header with the SPDX
>>	identifier BSL-1.0.
>
> The changelog says "Replace" but actually it's just adding it. Nothing
> gets replaced.

Right.  I've updated the changelog.  The reason why we don't replace it
here is that file was generated and merged into this project.  So I
guess we try to not mess with it too much.  Also the license of this
file stays BSL-1.0 after the relicensing.

>
>>	* tests/mockfedabipkgdiff.in: Replace the license header with the
>>	SPDX identifier LGPL-3.0-or-later.
>
> This change looks wrong:
>
>>diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
>>index 47c8cc8..ea8efc1 100644
>>--- a/tests/mockfedabipkgdiff.in
>>+++ b/tests/mockfedabipkgdiff.in
>>@@ -1,23 +1,8 @@
>> #!/usr/bin/env python
>>+# SPDX-License-Identifier: LGPL-3.0-or-later
>> # -*- coding: utf-8 -*-
>> # -*- Mode: Python
>> #
>>-# This file is part of the GNU Application Binary Interface Generic
>>-# Analysis and Instrumentation Library (libabigail).  This library is
>>-# free software; you can redistribute it and/or modify it under the
>>-# terms of the GNU General Public License as published by the
>>-# Free Software Foundation; either version 3, or (at your option) any
>>-# later version.
>>-#
>>-# This library is distributed in the hope that it will be useful, but
>>-# WITHOUT ANY WARRANTY; without even the implied warranty of
>>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>-# General Public License for more details.
>>-#
>>-# You should have received a copy of the GNU General Public
>>-# License along with this program; see the file COPYING-GPLV3.  If
>>-# not, see <http:#www.gnu.org/licenses/>.
>>-#
>> # Author: Dodji Seketeli
>> #
>> # Based on some preliminary work from Chenxiong Qi, posted to
>

Right, I have fixed this so that the SPDX is now GPL-3.0-or-later.

Thanks for catching this issues!

Please find the updated patch below.


From 18567ab775b78c5c0c7f9b9f2315c65b6741a864 Mon Sep 17 00:00:00 2001
From: Matthias Maennich <maennich@google.com>
Date: Sat, 7 Mar 2020 23:46:31 +0000
Subject: [PATCH 1/9] Replace individual license references with SPDX
 Identifiers

This patch replaces license headers with SPDX identifiers in all files
containing license headers.  For each file, the SPDX identifier
formally represents its current license.  Note that the list of SPDX
identifiers is available on the SPDX web site at
https://spdx.org/licenses.

For autoconf-archive/ax_prog_python_version.m4 however, there is a
little catch.  Dodji Seketeli wrote this ax_check_python_modules.m4.
Just like the other autoconf-archive macros, it makes sense to have it
under the FSF All Permissive license.  Actually, the terms of that
license was already in the file but then the license header was
wrongly set to GPLv2 with autoconf exception.  So I fixed that in this
commit by setting the SPDX identifier to FSFAP.

	* abigail.m4: Replace the license header with the SPDX identifier
	GPL-3.0-or-later WITH GCC-exception-3.1
	* autoconf-archive/ax_check_python_modules.m4: Correctly set the
	SPDX identifier to FSFAP.
	* autoconf-archive/ax_compare_version.m4: Replace the license
	header with the SPDX identifier FSFAP.
	* autoconf-archive/ax_prog_python_version.m4: Likewise.
	header with the SPDX identifier FSFAP.
	* autoconf-archive/ax_valgrind_check.m4: Likewise.
	* gen-changelog.py: Replace the license header with the SPDX
	identifier LGPL-2.0-or-later.
	* include/abg-comp-filter.h: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* include/abg-comparison.h: Likewise.
	* include/abg-config.h: Likewise.
	* include/abg-corpus.h: Likewise.
	* include/abg-cxx-compat.h: Replace the license header with the
	SPDX identifier LGPL-2.0-or-later.
	* include/abg-diff-utils.h: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later
	* include/abg-dwarf-reader.h: Likewise.
	* include/abg-fwd.h: Likewise.
	* include/abg-hash.h: Likewise.
	* include/abg-ini.h: Likewise.
	* include/abg-interned-str.h: Likewise.
	* include/abg-ir.h: Likewise.
	* include/abg-libxml-utils.h: Likewise.
	* include/abg-libzip-utils.h: Likewise.
	* include/abg-reader.h: Likewise.
	* include/abg-regex.h: Likewise.
	* include/abg-reporter.h: Likewise.
	* include/abg-sptr-utils.h: Likewise.
	* include/abg-suppression.h: Likewise.
	* include/abg-tools-utils.h: Likewise.
	* include/abg-traverse.h: Likewise.
	* include/abg-viz-common.h: Likewise.
	* include/abg-viz-dot.h: Likewise.
	* include/abg-viz-svg.h: Likewise.
	* include/abg-workers.h: Likewise.
	* include/abg-writer.h: Likewise.
	* install-sh: Replace the license header with the SPDX identifier MIT.
	* ltmain.sh: Replace the license header with the SPDX identifier
	GPL-2.0-or-later.  Note that this file has the libtool special
	exception which allows us to redistribute it under the general
	license of the project.
	* src/abg-comp-filter.cc: Replace the license header with the SPDX
	* src/abg-comparison-priv.h: Likewise.
	* src/abg-comparison.cc: Likewise.
	* src/abg-config.cc: Likewise.
	* src/abg-corpus-priv.h: Likewise.
	* src/abg-corpus.cc: Likewise.
	* src/abg-default-reporter.cc: Likewise.
	* src/abg-diff-utils.cc: Likewise.
	* src/abg-dwarf-reader.cc: Likewise.
	* src/abg-elf-helpers.cc: Likewise.
	* src/abg-elf-helpers.h: Likewise.
	* src/abg-regex.cc: Likewise.
	* src/abg-hash.cc: Likewise.
	* src/abg-ini.cc: Likewise.
	* src/abg-internal.h: Likewise.
	* src/abg-ir-priv.h: Likewise.
	* src/abg-ir.cc: Likewise.
	* src/abg-leaf-reporter.cc: Likewise.
	* src/abg-libxml-utils.cc: Likewise.
	* src/abg-libzip-utils.cc: Likewise.
	* src/abg-reader.cc: Likewise.
	* src/abg-reporter-priv.cc: Likewise.
	* src/abg-reporter-priv.h: Likewise.
	* src/abg-sptr-utils.cc: Likewise.
	* src/abg-suppression-priv.h: Likewise.
	* src/abg-suppression.cc: Likewise.
	* src/abg-tools-utils.cc: Likewise.
	* src/abg-traverse.cc: Likewise.
	* src/abg-viz-common.cc: Likewise.
	* src/abg-viz-dot.cc: Likewise.
	* src/abg-viz-svg.cc: Likewise.
	* src/abg-workers.cc: Likewise.
	* src/abg-writer.cc: Likewise.
	* tests/lib/catch.hpp: Add an SPDX identifier BSL-1.0.
	* tests/lib/catch.cc: Likewise.
	* tests/mockfedabipkgdiff.in: Replace the license header with the
	SPDX identifier GPL-3.0-or-later.
	* tests/print-diff-tree.cc: Likewise.
	* tests/runtestfedabipkgdiff.py.in: Replaace the license header
	with the SPDW identifier GPL-3.0-or-later.
	* tests/test-abicompat.cc: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* tests/test-abidiff-exit.cc: Likewise.
	* tests/test-abidiff.cc: Likewise.
	* tests/test-alt-dwarf-file.cc: Likewise.
	* tests/test-annotate.cc: Likewise.
	* tests/test-cxx-compat.cc: Likewise.
	* tests/test-core-diff.cc: Likewise.
	* tests/test-diff-dwarf-abixml.cc: Likewise.
	* tests/test-diff-dwarf.cc: Likewise.
	* tests/test-diff-filter.cc: Likewise.
	* tests/test-diff-pkg.cc: Likewise.
	* tests/test-diff-suppr.cc: Likewise.
	* tests/test-diff2.cc: Likewise.
	* tests/test-dot.cc: Replace the license header with the
	SPDX identifier GPL-3.0-with-GCC-exception.
	* tests/test-elf-helpers.cc: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* tests/test-ini.cc: Likewise.
	* tests/test-ir-walker.cc: Likewise.
	* tests/test-kmi-whitelist.cc: Likewise.
	* tests/test-lookup-syms.cc: Likewise.
	* tests/test-read-dwarf.cc: Likewise.
	* tests/test-read-write.cc: Likewise.
	* tests/test-svg.cc: Replace the license header with the SPDX
	identifier GPL-3.0-with-GCC-exception.
	* tests/test-symtab.cc: Replace the license header with the SPDX
	identifier LGPL-3.0-or-later.
	* tests/test-tools-utils.cc: Likewise.
	* tests/test-types-stability.cc: Likewise.
	* tests/test-utils.cc: Likewise.
	* tests/test-utils.h: Likewise.
	* tests/test-write-read-archive.cc: Likewise.
	* tools/abiar.cc: Likewise.
	* tools/abicompat.cc: Likewise.
	* tools/abidiff.cc: Likewise.
	* tools/abidw.cc: Likewise.
	* tools/abilint.cc: Likewise.
	* tools/abipkgdiff.cc: Likewise.
	* tools/abisym.cc: Likewise.
	* tools/binilint.cc: Likewise.
	* tools/fedabipkgdiff: Replace the license header with the
	SPDX identifier GPL-3.0-or-later.
	* tools/kmidiff.cc: Likewise.

Signed-off-by: Benjamin De Kosnik <bkoz@gnu.org>
Signed-off-by: Chenxiong Qi <cqi@redhat.com>
Signed-off-by: Ben Woodard <woodard@redhat.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Signed-off-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
Signed-off-by: Matthias Klose <doko@ubuntu.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
Signed-off-by: Ondrej Oprala <ondrej.oprala@gmail.com>
Signed-off-by: Roland McGrath <roland@hack.frob.com>
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 abigail.m4                                  | 26 ++++----------------------
 autoconf-archive/ax_check_python_modules.m4 | 20 +-------------------
 autoconf-archive/ax_compare_version.m4      |  1 +
 autoconf-archive/ax_prog_python_version.m4  |  1 +
 autoconf-archive/ax_valgrind_check.m4       |  1 +
 gen-changelog.py                            | 15 ++-------------
 include/abg-comp-filter.h                   | 17 +----------------
 include/abg-comparison.h                    | 17 +----------------
 include/abg-config.h                        | 17 +----------------
 include/abg-corpus.h                        | 17 +----------------
 include/abg-cxx-compat.h                    | 17 +----------------
 include/abg-diff-utils.h                    | 17 +----------------
 include/abg-dwarf-reader.h                  | 17 +----------------
 include/abg-fwd.h                           | 17 +----------------
 include/abg-hash.h                          | 17 +----------------
 include/abg-ini.h                           | 17 +----------------
 include/abg-interned-str.h                  | 17 +----------------
 include/abg-ir.h                            | 17 +----------------
 include/abg-libxml-utils.h                  | 17 +----------------
 include/abg-libzip-utils.h                  | 17 +----------------
 include/abg-reader.h                        | 17 +----------------
 include/abg-regex.h                         | 19 ++-----------------
 include/abg-reporter.h                      | 17 +----------------
 include/abg-sptr-utils.h                    | 17 +----------------
 include/abg-suppression.h                   | 17 +----------------
 include/abg-tools-utils.h                   | 17 +----------------
 include/abg-traverse.h                      | 17 +----------------
 include/abg-viz-common.h                    | 17 +----------------
 include/abg-viz-dot.h                       | 17 +----------------
 include/abg-viz-svg.h                       | 17 +----------------
 include/abg-workers.h                       | 17 +----------------
 include/abg-writer.h                        | 17 +----------------
 install-sh                                  | 18 +-----------------
 ltmain.sh                                   | 22 +---------------------
 src/abg-comp-filter.cc                      | 17 +----------------
 src/abg-comparison-priv.h                   | 18 +-----------------
 src/abg-comparison.cc                       | 17 +----------------
 src/abg-config.cc                           | 17 +----------------
 src/abg-corpus-priv.h                       | 17 +----------------
 src/abg-corpus.cc                           | 17 +----------------
 src/abg-default-reporter.cc                 | 17 +----------------
 src/abg-diff-utils.cc                       | 17 +----------------
 src/abg-dwarf-reader.cc                     | 17 +----------------
 src/abg-elf-helpers.cc                      | 17 +----------------
 src/abg-elf-helpers.h                       | 17 +----------------
 src/abg-hash.cc                             | 17 +----------------
 src/abg-ini.cc                              | 17 +----------------
 src/abg-internal.h                          | 17 +----------------
 src/abg-ir-priv.h                           | 17 +----------------
 src/abg-ir.cc                               | 17 +----------------
 src/abg-leaf-reporter.cc                    | 17 +----------------
 src/abg-libxml-utils.cc                     | 17 +----------------
 src/abg-libzip-utils.cc                     | 17 +----------------
 src/abg-reader.cc                           | 17 +----------------
 src/abg-regex.cc                            | 17 +----------------
 src/abg-reporter-priv.cc                    | 17 +----------------
 src/abg-reporter-priv.h                     | 17 +----------------
 src/abg-suppression-priv.h                  | 17 +----------------
 src/abg-suppression.cc                      | 17 +----------------
 src/abg-tools-utils.cc                      | 17 +----------------
 src/abg-traverse.cc                         | 17 +----------------
 src/abg-viz-common.cc                       | 17 +----------------
 src/abg-viz-dot.cc                          | 18 +-----------------
 src/abg-viz-svg.cc                          | 17 +----------------
 src/abg-workers.cc                          | 17 +----------------
 src/abg-writer.cc                           | 17 +----------------
 tests/lib/catch.cc                          | 17 +----------------
 tests/lib/catch.hpp                         |  4 ++--
 tests/mockfedabipkgdiff.in                  | 17 +----------------
 tests/print-diff-tree.cc                    | 20 ++------------------
 tests/runtestfedabipkgdiff.py.in            | 17 +----------------
 tests/test-abicompat.cc                     | 17 +----------------
 tests/test-abidiff-exit.cc                  | 17 +----------------
 tests/test-abidiff.cc                       | 17 +----------------
 tests/test-alt-dwarf-file.cc                | 17 +----------------
 tests/test-annotate.cc                      | 17 +----------------
 tests/test-core-diff.cc                     | 19 ++-----------------
 tests/test-cxx-compat.cc                    | 18 +-----------------
 tests/test-diff-dwarf-abixml.cc             | 17 +----------------
 tests/test-diff-dwarf.cc                    | 17 +----------------
 tests/test-diff-filter.cc                   | 17 +----------------
 tests/test-diff-pkg.cc                      | 17 +----------------
 tests/test-diff-suppr.cc                    | 17 +----------------
 tests/test-diff2.cc                         | 20 ++------------------
 tests/test-dot.cc                           | 26 +++-----------------------
 tests/test-elf-helpers.cc                   | 17 +----------------
 tests/test-ini.cc                           | 17 +----------------
 tests/test-ir-walker.cc                     | 17 +----------------
 tests/test-kmi-whitelist.cc                 | 17 +----------------
 tests/test-lookup-syms.cc                   | 17 +----------------
 tests/test-read-dwarf.cc                    | 17 +----------------
 tests/test-read-write.cc                    | 17 +----------------
 tests/test-svg.cc                           | 26 +++-----------------------
 tests/test-symtab.cc                        | 17 +----------------
 tests/test-tools-utils.cc                   | 17 +----------------
 tests/test-types-stability.cc               | 17 +----------------
 tests/test-utils.cc                         | 18 +-----------------
 tests/test-utils.h                          | 17 +----------------
 tests/test-write-read-archive.cc            | 17 +----------------
 tools/abiar.cc                              | 17 +----------------
 tools/abicompat.cc                          | 17 +----------------
 tools/abidiff.cc                            | 17 +----------------
 tools/abidw.cc                              | 17 +----------------
 tools/abilint.cc                            | 17 +----------------
 tools/abipkgdiff.cc                         | 17 +----------------
 tools/abisym.cc                             | 17 +----------------
 tools/binilint.cc                           | 17 +----------------
 tools/fedabipkgdiff                         | 17 +----------------
 tools/kmidiff.cc                            | 17 +----------------
 109 files changed, 122 insertions(+), 1718 deletions(-)

diff --git a/abigail.m4 b/abigail.m4
index 86c769b..2c7626d 100644
--- a/abigail.m4
+++ b/abigail.m4
@@ -1,28 +1,10 @@
+# SPDX-License-Identifier: GPL-3.0-or-later WITH GCC-exception-3.1
+#
 # Copyright (C) 2013-2020 Red Hat, Inc
-# 
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 3, or (at your option) any
-# later version.
-# 
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# Under Section 7 of GPL version 3, you are granted additional
-# permissions described in the GCC Runtime Library Exception, version
-# 3.1, as published by the Free Software Foundation.
-# 
-# You should have received a copy of the GNU General Public License
-# and a copy of the GCC Runtime Library Exception along with this
-# program; see the files COPYING3 and COPYING.RUNTIME respectively.
-# If not, see <http://www.gnu.org/licenses/>.
 #
-#// Author: Dodji Seketeli <dodji@redhat.com>
+# Author: Dodji Seketeli <dodji@redhat.com>
 
+#
 # ABIGAIL_INIT
 #
 # Handle the detection of the libabigail header and library files on
diff --git a/autoconf-archive/ax_check_python_modules.m4 b/autoconf-archive/ax_check_python_modules.m4
index 6538170..d5285db 100644
--- a/autoconf-archive/ax_check_python_modules.m4
+++ b/autoconf-archive/ax_check_python_modules.m4
@@ -1,26 +1,8 @@
+# SPDX-License-Identifier: FSFAP
 # -*- Autoconf -*-
 #
 # ax_check_python_modules.m4 - Macros to locate python modules.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
 # Author: Dodji Seketeli <dodji@seketeli.org>
 #
 
diff --git a/autoconf-archive/ax_compare_version.m4 b/autoconf-archive/ax_compare_version.m4
index 74dc0fd..cddb15d 100644
--- a/autoconf-archive/ax_compare_version.m4
+++ b/autoconf-archive/ax_compare_version.m4
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: FSFAP
 # ===========================================================================
 #    http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
 # ===========================================================================
diff --git a/autoconf-archive/ax_prog_python_version.m4 b/autoconf-archive/ax_prog_python_version.m4
index 628a3e4..626d8eb 100644
--- a/autoconf-archive/ax_prog_python_version.m4
+++ b/autoconf-archive/ax_prog_python_version.m4
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: FSFAP
 # ===========================================================================
 #  http://www.gnu.org/software/autoconf-archive/ax_prog_python_version.html
 # ===========================================================================
diff --git a/autoconf-archive/ax_valgrind_check.m4 b/autoconf-archive/ax_valgrind_check.m4
index d0e3c2d..be83490 100644
--- a/autoconf-archive/ax_valgrind_check.m4
+++ b/autoconf-archive/ax_valgrind_check.m4
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: FSFAP
 # ===========================================================================
 #     http://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html
 # ===========================================================================
diff --git a/gen-changelog.py b/gen-changelog.py
index 9b8e002..3515aa0 100644
--- a/gen-changelog.py
+++ b/gen-changelog.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: LGPL-2.0-or-later
+#
 # -*- mode: python -*-
 #
 # This python program has been copied from
@@ -11,19 +13,6 @@
 # published by the Free Software Foundaion; either version 2, or (at
 # your option) any later version.
 #
-# Thus, this program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Lesser Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program; see the file COPYING-LGPLV2.  If
-# not, see <http://www.gnu.org/licenses/>.
 
 import sys
 import subprocess
diff --git a/include/abg-comp-filter.h b/include/abg-comp-filter.h
index 556bad4..e02b32a 100644
--- a/include/abg-comp-filter.h
+++ b/include/abg-comp-filter.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-comparison.h b/include/abg-comparison.h
index c4eb592..99c852d 100644
--- a/include/abg-comparison.h
+++ b/include/abg-comparison.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_COMPARISON_H__
diff --git a/include/abg-config.h b/include/abg-config.h
index 314fc34..e7fecdb 100644
--- a/include/abg-config.h
+++ b/include/abg-config.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-corpus.h b/include/abg-corpus.h
index 410a9c2..4c2d6d9 100644
--- a/include/abg-corpus.h
+++ b/include/abg-corpus.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-cxx-compat.h b/include/abg-cxx-compat.h
index 7141771..d692464 100644
--- a/include/abg-cxx-compat.h
+++ b/include/abg-cxx-compat.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-2.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2019-2020 Google, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV2.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-diff-utils.h b/include/abg-diff-utils.h
index b59ffa0..60937d1 100644
--- a/include/abg-diff-utils.h
+++ b/include/abg-diff-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/include/abg-dwarf-reader.h b/include/abg-dwarf-reader.h
index d0329ae..628cc33 100644
--- a/include/abg-dwarf-reader.h
+++ b/include/abg-dwarf-reader.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index a2caf9b..dd7d7ed 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-hash.h b/include/abg-hash.h
index 732b145..c698a96 100644
--- a/include/abg-hash.h
+++ b/include/abg-hash.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-ini.h b/include/abg-ini.h
index df79198..60d328d 100644
--- a/include/abg-ini.h
+++ b/include/abg-ini.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-interned-str.h b/include/abg-interned-str.h
index 2bc8f43..6ba4058 100644
--- a/include/abg-interned-str.h
+++ b/include/abg-interned-str.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-ir.h b/include/abg-ir.h
index f17a3bf..413847d 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-libxml-utils.h b/include/abg-libxml-utils.h
index cf167b8..f127962 100644
--- a/include/abg-libxml-utils.h
+++ b/include/abg-libxml-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-libzip-utils.h b/include/abg-libzip-utils.h
index a112279..5e52e06 100644
--- a/include/abg-libzip-utils.h
+++ b/include/abg-libzip-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-reader.h b/include/abg-reader.h
index d86fcb1..39ff744 100644
--- a/include/abg-reader.h
+++ b/include/abg-reader.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-regex.h b/include/abg-regex.h
index 7ab9fc0..d9b5a28 100644
--- a/include/abg-regex.h
+++ b/include/abg-regex.h
@@ -1,22 +1,7 @@
-// -*- mode: C++ -*-
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/include/abg-reporter.h b/include/abg-reporter.h
index 6aec6a6..7e37969 100644
--- a/include/abg-reporter.h
+++ b/include/abg-reporter.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-sptr-utils.h b/include/abg-sptr-utils.h
index 2a12707..6adf54b 100644
--- a/include/abg-sptr-utils.h
+++ b/include/abg-sptr-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/include/abg-suppression.h b/include/abg-suppression.h
index 6383b93..65698c1 100644
--- a/include/abg-suppression.h
+++ b/include/abg-suppression.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_SUPPRESSION_H__
diff --git a/include/abg-tools-utils.h b/include/abg-tools-utils.h
index 12651fc..4c6dfa8 100644
--- a/include/abg-tools-utils.h
+++ b/include/abg-tools-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 ///@file
 
diff --git a/include/abg-traverse.h b/include/abg-traverse.h
index 92a8a24..9b01679 100644
--- a/include/abg-traverse.h
+++ b/include/abg-traverse.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-viz-common.h b/include/abg-viz-common.h
index 948b1f4..5ab3718 100644
--- a/include/abg-viz-common.h
+++ b/include/abg-viz-common.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-viz-dot.h b/include/abg-viz-dot.h
index ac84bd9..ceae3b1 100644
--- a/include/abg-viz-dot.h
+++ b/include/abg-viz-dot.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-viz-svg.h b/include/abg-viz-svg.h
index 567f789..601683a 100644
--- a/include/abg-viz-svg.h
+++ b/include/abg-viz-svg.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-workers.h b/include/abg-workers.h
index 65d3e83..2f3a238 100644
--- a/include/abg-workers.h
+++ b/include/abg-workers.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-writer.h b/include/abg-writer.h
index d44b483..ddb1d2c 100644
--- a/include/abg-writer.h
+++ b/include/abg-writer.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/install-sh b/install-sh
index 377bb86..0a3cd07 100755
--- a/install-sh
+++ b/install-sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: MIT
 # install - install a program, script, or datafile
 
 scriptversion=2011-11-20.07; # UTC
@@ -9,23 +10,6 @@ scriptversion=2011-11-20.07; # UTC
 #
 # Copyright (C) 1994 X Consortium
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
diff --git a/ltmain.sh b/ltmain.sh
index 63ae69d..0208760 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 # libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -7,27 +8,6 @@
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
 # Usage: $progname [OPTION]... [MODE-ARG]...
 #
 # Provide generalized library-building support services.
diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc
index abfa3c0..cf8da79 100644
--- a/src/abg-comp-filter.cc
+++ b/src/abg-comp-filter.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-comparison-priv.h b/src/abg-comparison-priv.h
index b82b5d0..9b9fc5d 100644
--- a/src/abg-comparison-priv.h
+++ b/src/abg-comparison-priv.h
@@ -1,24 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc
index 11f506f..4ac0cda 100644
--- a/src/abg-comparison.cc
+++ b/src/abg-comparison.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-config.cc b/src/abg-config.cc
index 34b7bf4..ddde9d2 100644
--- a/src/abg-config.cc
+++ b/src/abg-config.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the files COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-corpus-priv.h b/src/abg-corpus-priv.h
index ee8c823..d5bab11 100644
--- a/src/abg-corpus-priv.h
+++ b/src/abg-corpus-priv.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc
index 0e8e6d7..4ff5aa8 100644
--- a/src/abg-corpus.cc
+++ b/src/abg-corpus.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index 0b572db..8b5b321 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 
diff --git a/src/abg-diff-utils.cc b/src/abg-diff-utils.cc
index 6c521f6..27519c0 100644
--- a/src/abg-diff-utils.cc
+++ b/src/abg-diff-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <cstring>
 
diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 7257052..9347973 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-elf-helpers.cc b/src/abg-elf-helpers.cc
index ed768d2..24bb678 100644
--- a/src/abg-elf-helpers.cc
+++ b/src/abg-elf-helpers.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-elf-helpers.h b/src/abg-elf-helpers.h
index 647c927..b0fe0c2 100644
--- a/src/abg-elf-helpers.h
+++ b/src/abg-elf-helpers.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-hash.cc b/src/abg-hash.cc
index 5d2861f..184b556 100644
--- a/src/abg-hash.cc
+++ b/src/abg-hash.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-ini.cc b/src/abg-ini.cc
index 5dc438b..3603d95 100644
--- a/src/abg-ini.cc
+++ b/src/abg-ini.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-internal.h b/src/abg-internal.h
index fbe5316..b2e3a39 100644
--- a/src/abg-internal.h
+++ b/src/abg-internal.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_INTERNAL_H__
diff --git a/src/abg-ir-priv.h b/src/abg-ir-priv.h
index 63c63b1..62b1b72 100644
--- a/src/abg-ir-priv.h
+++ b/src/abg-ir-priv.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 2852c09..33b196b 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 //Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-leaf-reporter.cc b/src/abg-leaf-reporter.cc
index c2a766e..8b0c593 100644
--- a/src/abg-leaf-reporter.cc
+++ b/src/abg-leaf-reporter.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 
diff --git a/src/abg-libxml-utils.cc b/src/abg-libxml-utils.cc
index 2c46aad..3178862 100644
--- a/src/abg-libxml-utils.cc
+++ b/src/abg-libxml-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-libzip-utils.cc b/src/abg-libzip-utils.cc
index c0a2944..f96741d 100644
--- a/src/abg-libzip-utils.cc
+++ b/src/abg-libzip-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-reader.cc b/src/abg-reader.cc
index 3157473..63115e3 100644
--- a/src/abg-reader.cc
+++ b/src/abg-reader.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-regex.cc b/src/abg-regex.cc
index 5bcd130..c124df8 100644
--- a/src/abg-regex.cc
+++ b/src/abg-regex.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index 7849114..b6545a9 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #include <libgen.h>
diff --git a/src/abg-reporter-priv.h b/src/abg-reporter-priv.h
index 84cb238..2b1cb3c 100644
--- a/src/abg-reporter-priv.h
+++ b/src/abg-reporter-priv.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_REPORTER_PRIV_H__
diff --git a/src/abg-suppression-priv.h b/src/abg-suppression-priv.h
index deb0826..d0c16a8 100644
--- a/src/abg-suppression-priv.h
+++ b/src/abg-suppression-priv.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index ae7cc95..3ca22bd 100644
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-tools-utils.cc b/src/abg-tools-utils.cc
index bc3d587..efbb4d9 100644
--- a/src/abg-tools-utils.cc
+++ b/src/abg-tools-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 ///@file
 
diff --git a/src/abg-traverse.cc b/src/abg-traverse.cc
index a3cb797..c8e483c 100644
--- a/src/abg-traverse.cc
+++ b/src/abg-traverse.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-viz-common.cc b/src/abg-viz-common.cc
index ab89413..3473c5b 100644
--- a/src/abg-viz-common.cc
+++ b/src/abg-viz-common.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <stdexcept>
 #include <fstream>
diff --git a/src/abg-viz-dot.cc b/src/abg-viz-dot.cc
index d637b6e..5fdeeea 100644
--- a/src/abg-viz-dot.cc
+++ b/src/abg-viz-dot.cc
@@ -1,23 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 
 #include <stdexcept>
 #include <fstream>
diff --git a/src/abg-viz-svg.cc b/src/abg-viz-svg.cc
index 07c78ae..f510af6 100644
--- a/src/abg-viz-svg.cc
+++ b/src/abg-viz-svg.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <stdexcept>
 #include <fstream>
diff --git a/src/abg-workers.cc b/src/abg-workers.cc
index 9035854..3ffd53d 100644
--- a/src/abg-workers.cc
+++ b/src/abg-workers.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index 59060e1..fe44755 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/tests/lib/catch.cc b/tests/lib/catch.cc
index aae1a62..0c56f12 100644
--- a/tests/lib/catch.cc
+++ b/tests/lib/catch.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/lib/catch.hpp b/tests/lib/catch.hpp
index fdb046f..a0a87f2 100644
--- a/tests/lib/catch.hpp
+++ b/tests/lib/catch.hpp
@@ -1,5 +1,5 @@
-/*
- *  Catch v1.12.2
+// SPDX-License-Identifier: BSL-1.0
+/*  Catch v1.12.2
  *  Generated: 2018-05-14 15:10:01.112442
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
index 47c8cc8..346cacf 100644
--- a/tests/mockfedabipkgdiff.in
+++ b/tests/mockfedabipkgdiff.in
@@ -1,23 +1,8 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-or-later
 # -*- coding: utf-8 -*-
 # -*- Mode: Python
 #
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any
-# later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; see the file COPYING-GPLV3.  If
-# not, see <http:#www.gnu.org/licenses/>.
-#
 # Author: Dodji Seketeli
 #
 # Based on some preliminary work from Chenxiong Qi, posted to
diff --git a/tests/print-diff-tree.cc b/tests/print-diff-tree.cc
index 24ad95c..662c954 100644
--- a/tests/print-diff-tree.cc
+++ b/tests/print-diff-tree.cc
@@ -1,25 +1,9 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
-
-// Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2013-2020 Red Hat, Inc.
 //
 // Author: Dodji Seketeli
-//
 
 #include <cstring>
 #include <iostream>
diff --git a/tests/runtestfedabipkgdiff.py.in b/tests/runtestfedabipkgdiff.py.in
index 04429b6..ac2d624 100755
--- a/tests/runtestfedabipkgdiff.py.in
+++ b/tests/runtestfedabipkgdiff.py.in
@@ -1,23 +1,8 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-or-later
 # -*- coding: utf-8 -*-
 # -*- Mode: Python
 #
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any
-# later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; see the file COPYING-GPLV3.  If
-# not, see <http:#www.gnu.org/licenses/>.
-#
 # Author: Chenxiong Qi
 
 '''Runs tests for the fedabipkgdiff program
diff --git a/tests/test-abicompat.cc b/tests/test-abicompat.cc
index 7b02781..7f33c4b 100644
--- a/tests/test-abicompat.cc
+++ b/tests/test-abicompat.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2014-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc
index 6ebe2a0..294a25f 100644
--- a/tests/test-abidiff-exit.cc
+++ b/tests/test-abidiff-exit.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-abidiff.cc b/tests/test-abidiff.cc
index dcb1401..625c141 100644
--- a/tests/test-abidiff.cc
+++ b/tests/test-abidiff.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-alt-dwarf-file.cc b/tests/test-alt-dwarf-file.cc
index cd8769d..2d78f4c 100644
--- a/tests/test-alt-dwarf-file.cc
+++ b/tests/test-alt-dwarf-file.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-annotate.cc b/tests/test-annotate.cc
index ba715cc..c01e483 100644
--- a/tests/test-annotate.cc
+++ b/tests/test-annotate.cc
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Ondrej Oprala
 
 /// @file
diff --git a/tests/test-core-diff.cc b/tests/test-core-diff.cc
index 531f493..298ebc8 100644
--- a/tests/test-core-diff.cc
+++ b/tests/test-core-diff.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
-
-// Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2013-2020 Red Hat, Inc.
 //
 // Author: Dodji Seketeli
 
diff --git a/tests/test-cxx-compat.cc b/tests/test-cxx-compat.cc
index 0a230a5..4dfb41f 100644
--- a/tests/test-cxx-compat.cc
+++ b/tests/test-cxx-compat.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
@@ -27,4 +12,3 @@
 #include "lib/catch.hpp"
 
 #include "abg-cxx-compat.h"
-
diff --git a/tests/test-diff-dwarf-abixml.cc b/tests/test-diff-dwarf-abixml.cc
index f169624..02046d8 100644
--- a/tests/test-diff-dwarf-abixml.cc
+++ b/tests/test-diff-dwarf-abixml.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file compare the ABI of an an elf binary and an abixml file.
diff --git a/tests/test-diff-dwarf.cc b/tests/test-diff-dwarf.cc
index 3b8a626..d65d63a 100644
--- a/tests/test-diff-dwarf.cc
+++ b/tests/test-diff-dwarf.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-diff-filter.cc b/tests/test-diff-filter.cc
index b3b1e91..e3ad156 100644
--- a/tests/test-diff-filter.cc
+++ b/tests/test-diff-filter.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-diff-pkg.cc b/tests/test-diff-pkg.cc
index 8e324da..21c4f89 100644
--- a/tests/test-diff-pkg.cc
+++ b/tests/test-diff-pkg.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Sinny Kumari
 
 /// @file
diff --git a/tests/test-diff-suppr.cc b/tests/test-diff-suppr.cc
index 93476c7..95f287c 100644
--- a/tests/test-diff-suppr.cc
+++ b/tests/test-diff-suppr.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-diff2.cc b/tests/test-diff2.cc
index 85d5aa6..120ec27 100644
--- a/tests/test-diff2.cc
+++ b/tests/test-diff2.cc
@@ -1,25 +1,9 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
-
-// Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2013-2020 Red Hat, Inc.
 //
 // Author: Dodji Seketeli
-//
 
 /// @file
 ///
diff --git a/tests/test-dot.cc b/tests/test-dot.cc
index fab0c19..4e3920a 100644
--- a/tests/test-dot.cc
+++ b/tests/test-dot.cc
@@ -1,27 +1,7 @@
-// Copyright (C) 2013-2019 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License
-// and a copy of the GCC Runtime Library Exception along with this
-// program; see the files COPYING3 and COPYING.RUNTIME respectively.
-// If not, see <http://www.gnu.org/licenses/>.
-
+// SPDX-License-Identifier: GPL-3.0-with-GCC-exception
 // -*- mode: C++ -*-
+//
+// Copyright (C) 2013-2019 Red Hat, Inc.
 
 #include "abg-viz-dot.h"
 
diff --git a/tests/test-elf-helpers.cc b/tests/test-elf-helpers.cc
index 1b36ee2..ca5d7eb 100644
--- a/tests/test-elf-helpers.cc
+++ b/tests/test-elf-helpers.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/test-ini.cc b/tests/test-ini.cc
index 12b1fb6..441f0ee 100644
--- a/tests/test-ini.cc
+++ b/tests/test-ini.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-ir-walker.cc b/tests/test-ir-walker.cc
index 41b6adc..6ebaeb2 100644
--- a/tests/test-ir-walker.cc
+++ b/tests/test-ir-walker.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <string>
 #include <fstream>
diff --git a/tests/test-kmi-whitelist.cc b/tests/test-kmi-whitelist.cc
index bcc5ade..7d45f15 100644
--- a/tests/test-kmi-whitelist.cc
+++ b/tests/test-kmi-whitelist.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/test-lookup-syms.cc b/tests/test-lookup-syms.cc
index 077f33b..f2c1cb6 100644
--- a/tests/test-lookup-syms.cc
+++ b/tests/test-lookup-syms.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-read-dwarf.cc b/tests/test-read-dwarf.cc
index c93f176..93c7bb9 100644
--- a/tests/test-read-dwarf.cc
+++ b/tests/test-read-dwarf.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file read ELF binaries containing DWARF, save them in XML corpus
diff --git a/tests/test-read-write.cc b/tests/test-read-write.cc
index 7d24bee..d709aab 100644
--- a/tests/test-read-write.cc
+++ b/tests/test-read-write.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file read an XML corpus file (in the native Abigail XML format),
 /// save it back and diff the resulting XML file against the input
diff --git a/tests/test-svg.cc b/tests/test-svg.cc
index 4a9d44d..71ec75d 100644
--- a/tests/test-svg.cc
+++ b/tests/test-svg.cc
@@ -1,27 +1,7 @@
-// Copyright (C) 2013-2019 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License
-// and a copy of the GCC Runtime Library Exception along with this
-// program; see the files COPYING3 and COPYING.RUNTIME respectively.
-// If not, see <http://www.gnu.org/licenses/>.
-
+// SPDX-License-Identifier: GPL-3.0-with-GCC-exception
 // -*- mode: C++ -*-
+//
+// Copyright (C) 2013-2019 Red Hat, Inc.
 
 #include "abg-viz-svg.h"
 
diff --git a/tests/test-symtab.cc b/tests/test-symtab.cc
index 20e3071..97e6cad 100644
--- a/tests/test-symtab.cc
+++ b/tests/test-symtab.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/test-tools-utils.cc b/tests/test-tools-utils.cc
index 5597873..0f20a02 100644
--- a/tests/test-tools-utils.cc
+++ b/tests/test-tools-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/tests/test-types-stability.cc b/tests/test-types-stability.cc
index 1c1a531..d0cf99c 100644
--- a/tests/test-types-stability.cc
+++ b/tests/test-types-stability.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-utils.cc b/tests/test-utils.cc
index 4daf7ce..efcdfb7 100644
--- a/tests/test-utils.cc
+++ b/tests/test-utils.cc
@@ -1,23 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 
 #include "test-utils.h"
 
diff --git a/tests/test-utils.h b/tests/test-utils.h
index ec9a520..ec33845 100644
--- a/tests/test-utils.h
+++ b/tests/test-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #ifndef __TEST_UTILS_H__
 #define __TEST_UTILS_H__
diff --git a/tests/test-write-read-archive.cc b/tests/test-write-read-archive.cc
index f682105..539a963 100644
--- a/tests/test-write-read-archive.cc
+++ b/tests/test-write-read-archive.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <cstdlib>
 #include <iostream>
diff --git a/tools/abiar.cc b/tools/abiar.cc
index 22fe375..b73de2f 100644
--- a/tools/abiar.cc
+++ b/tools/abiar.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <sys/types.h>
 #include <sys/stat.h>// The two above is for 'stat'
diff --git a/tools/abicompat.cc b/tools/abicompat.cc
index a5c707d..d7147c6 100644
--- a/tools/abicompat.cc
+++ b/tools/abicompat.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2014-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abidiff.cc b/tools/abidiff.cc
index 6ac81ee..f5b4069 100644
--- a/tools/abidiff.cc
+++ b/tools/abidiff.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abidw.cc b/tools/abidw.cc
index 756a29e..95a0dab 100644
--- a/tools/abidw.cc
+++ b/tools/abidw.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abilint.cc b/tools/abilint.cc
index e9d6f93..fc397a7 100644
--- a/tools/abilint.cc
+++ b/tools/abilint.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc
index 445e240..ea79398 100644
--- a/tools/abipkgdiff.cc
+++ b/tools/abipkgdiff.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2015-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Sinny Kumari
 
 /// @file
diff --git a/tools/abisym.cc b/tools/abisym.cc
index 2da45b4..d6089a8 100644
--- a/tools/abisym.cc
+++ b/tools/abisym.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/binilint.cc b/tools/binilint.cc
index 4f0abaa..94d5595 100644
--- a/tools/binilint.cc
+++ b/tools/binilint.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/fedabipkgdiff b/tools/fedabipkgdiff
index 2191613..644cc1c 100755
--- a/tools/fedabipkgdiff
+++ b/tools/fedabipkgdiff
@@ -1,25 +1,10 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-or-later
 # -*- coding: utf-8 -*-
 # -*- Mode: Python
 #
 # Copyright (C) 2013-2016 Red Hat, Inc.
 #
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any
-# later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; see the file COPYING-GPLV3.  If
-# not, see <http:#www.gnu.org/licenses/>.
-#
 # Author: Chenxiong Qi
 
 from __future__ import print_function
diff --git a/tools/kmidiff.cc b/tools/kmidiff.cc
index 2840eb0..7798cba 100644
--- a/tools/kmidiff.cc
+++ b/tools/kmidiff.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
Jonathan Wakely Sept. 25, 2020, 10:06 a.m. UTC | #4
On 25/09/20 10:38 +0200, Dodji Seketeli wrote:
>Hello Jonathan,
>
>Jonathan Wakely <jwakely@redhat.com> writes:
>
>> One remaining issue in v2 of this patch, and two requests for a better
>> commit message. See below.
>
>Oh, right ...
>
>[...]
>
>
>>>	* ltmain.sh: Replace the license header with the SPDX identifier
>>>	GPL-2.0-or-later.
>>
>> It would be helpful if the commit log mentioned that this change to
>> ltmain.sh drops the (redundant?) libtool exception. I know you already
>> explained why that's OK, but I just noticed it again myself and asked
>> you about it on IRC. If the commit log mentioned it, I wouldn't need
>> to wonder if it's an error.
>
>Right.  I have added a hopefully better comment for this.  I am
>attaching the resulting patch below.
>
>[...]
>
>>>	* tests/lib/catch.hpp: Replace the license header with the SPDX
>>>	identifier BSL-1.0.
>>
>> The changelog says "Replace" but actually it's just adding it. Nothing
>> gets replaced.
>
>Right.  I've updated the changelog.  The reason why we don't replace it
>here is that file was generated and merged into this project.  So I
>guess we try to not mess with it too much.  Also the license of this
>file stays BSL-1.0 after the relicensing.
>
>>
>>>	* tests/mockfedabipkgdiff.in: Replace the license header with the
>>>	SPDX identifier LGPL-3.0-or-later.
>>
>> This change looks wrong:
>>
>>>diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
>>>index 47c8cc8..ea8efc1 100644
>>>--- a/tests/mockfedabipkgdiff.in
>>>+++ b/tests/mockfedabipkgdiff.in
>>>@@ -1,23 +1,8 @@
>>> #!/usr/bin/env python
>>>+# SPDX-License-Identifier: LGPL-3.0-or-later
>>> # -*- coding: utf-8 -*-
>>> # -*- Mode: Python
>>> #
>>>-# This file is part of the GNU Application Binary Interface Generic
>>>-# Analysis and Instrumentation Library (libabigail).  This library is
>>>-# free software; you can redistribute it and/or modify it under the
>>>-# terms of the GNU General Public License as published by the
>>>-# Free Software Foundation; either version 3, or (at your option) any
>>>-# later version.
>>>-#
>>>-# This library is distributed in the hope that it will be useful, but
>>>-# WITHOUT ANY WARRANTY; without even the implied warranty of
>>>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>>>-# General Public License for more details.
>>>-#
>>>-# You should have received a copy of the GNU General Public
>>>-# License along with this program; see the file COPYING-GPLV3.  If
>>>-# not, see <http:#www.gnu.org/licenses/>.
>>>-#
>>> # Author: Dodji Seketeli
>>> #
>>> # Based on some preliminary work from Chenxiong Qi, posted to
>>
>
>Right, I have fixed this so that the SPDX is now GPL-3.0-or-later.
>
>Thanks for catching this issues!
>
>Please find the updated patch below.
>
>
>From 18567ab775b78c5c0c7f9b9f2315c65b6741a864 Mon Sep 17 00:00:00 2001
>From: Matthias Maennich <maennich@google.com>
>Date: Sat, 7 Mar 2020 23:46:31 +0000
>Subject: [PATCH 1/9] Replace individual license references with SPDX
> Identifiers
>
>This patch replaces license headers with SPDX identifiers in all files
>containing license headers.  For each file, the SPDX identifier
>formally represents its current license.  Note that the list of SPDX
>identifiers is available on the SPDX web site at
>https://spdx.org/licenses.
>
>For autoconf-archive/ax_prog_python_version.m4 however, there is a
>little catch.  Dodji Seketeli wrote this ax_check_python_modules.m4.
>Just like the other autoconf-archive macros, it makes sense to have it
>under the FSF All Permissive license.  Actually, the terms of that
>license was already in the file but then the license header was
>wrongly set to GPLv2 with autoconf exception.  So I fixed that in this
>commit by setting the SPDX identifier to FSFAP.
>
>	* abigail.m4: Replace the license header with the SPDX identifier
>	GPL-3.0-or-later WITH GCC-exception-3.1
>	* autoconf-archive/ax_check_python_modules.m4: Correctly set the
>	SPDX identifier to FSFAP.
>	* autoconf-archive/ax_compare_version.m4: Replace the license
>	header with the SPDX identifier FSFAP.
>	* autoconf-archive/ax_prog_python_version.m4: Likewise.
>	header with the SPDX identifier FSFAP.
>	* autoconf-archive/ax_valgrind_check.m4: Likewise.
>	* gen-changelog.py: Replace the license header with the SPDX
>	identifier LGPL-2.0-or-later.
>	* include/abg-comp-filter.h: Replace the license header with the
>	SPDX identifier LGPL-3.0-or-later.
>	* include/abg-comparison.h: Likewise.
>	* include/abg-config.h: Likewise.
>	* include/abg-corpus.h: Likewise.
>	* include/abg-cxx-compat.h: Replace the license header with the
>	SPDX identifier LGPL-2.0-or-later.
>	* include/abg-diff-utils.h: Replace the license header with the
>	SPDX identifier LGPL-3.0-or-later
>	* include/abg-dwarf-reader.h: Likewise.
>	* include/abg-fwd.h: Likewise.
>	* include/abg-hash.h: Likewise.
>	* include/abg-ini.h: Likewise.
>	* include/abg-interned-str.h: Likewise.
>	* include/abg-ir.h: Likewise.
>	* include/abg-libxml-utils.h: Likewise.
>	* include/abg-libzip-utils.h: Likewise.
>	* include/abg-reader.h: Likewise.
>	* include/abg-regex.h: Likewise.
>	* include/abg-reporter.h: Likewise.
>	* include/abg-sptr-utils.h: Likewise.
>	* include/abg-suppression.h: Likewise.
>	* include/abg-tools-utils.h: Likewise.
>	* include/abg-traverse.h: Likewise.
>	* include/abg-viz-common.h: Likewise.
>	* include/abg-viz-dot.h: Likewise.
>	* include/abg-viz-svg.h: Likewise.
>	* include/abg-workers.h: Likewise.
>	* include/abg-writer.h: Likewise.
>	* install-sh: Replace the license header with the SPDX identifier MIT.
>	* ltmain.sh: Replace the license header with the SPDX identifier
>	GPL-2.0-or-later.  Note that this file has the libtool special
>	exception which allows us to redistribute it under the general
>	license of the project.
>	* src/abg-comp-filter.cc: Replace the license header with the SPDX
>	* src/abg-comparison-priv.h: Likewise.
>	* src/abg-comparison.cc: Likewise.
>	* src/abg-config.cc: Likewise.
>	* src/abg-corpus-priv.h: Likewise.
>	* src/abg-corpus.cc: Likewise.
>	* src/abg-default-reporter.cc: Likewise.
>	* src/abg-diff-utils.cc: Likewise.
>	* src/abg-dwarf-reader.cc: Likewise.
>	* src/abg-elf-helpers.cc: Likewise.
>	* src/abg-elf-helpers.h: Likewise.
>	* src/abg-regex.cc: Likewise.
>	* src/abg-hash.cc: Likewise.
>	* src/abg-ini.cc: Likewise.
>	* src/abg-internal.h: Likewise.
>	* src/abg-ir-priv.h: Likewise.
>	* src/abg-ir.cc: Likewise.
>	* src/abg-leaf-reporter.cc: Likewise.
>	* src/abg-libxml-utils.cc: Likewise.
>	* src/abg-libzip-utils.cc: Likewise.
>	* src/abg-reader.cc: Likewise.
>	* src/abg-reporter-priv.cc: Likewise.
>	* src/abg-reporter-priv.h: Likewise.
>	* src/abg-sptr-utils.cc: Likewise.
>	* src/abg-suppression-priv.h: Likewise.
>	* src/abg-suppression.cc: Likewise.
>	* src/abg-tools-utils.cc: Likewise.
>	* src/abg-traverse.cc: Likewise.
>	* src/abg-viz-common.cc: Likewise.
>	* src/abg-viz-dot.cc: Likewise.
>	* src/abg-viz-svg.cc: Likewise.
>	* src/abg-workers.cc: Likewise.
>	* src/abg-writer.cc: Likewise.
>	* tests/lib/catch.hpp: Add an SPDX identifier BSL-1.0.
>	* tests/lib/catch.cc: Likewise.

The patch itself looks fine now, but these two lines in the changelog
have been reordered. That makes it look like the "catch.cc: Likewise."
means that file gets the BSL-1.0 identifier. But actually it gets the
LGPL one. I think it should be this way round, as before:

	* tests/lib/catch.cc: Likewise.
	* tests/lib/catch.hpp: Add an SPDX identifier BSL-1.0.

Looks good apart from that.

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

I think I've signed-off on the whole series now.
Dodji Seketeli Sept. 25, 2020, 12:30 p.m. UTC | #5
Jonathan Wakely <jwakely@redhat.com> writes:

[...]

> The patch itself looks fine now, but these two lines in the changelog
> have been reordered. That makes it look like the "catch.cc: Likewise."
> means that file gets the BSL-1.0 identifier. But actually it gets the
> LGPL one. I think it should be this way round, as before:
>
> 	* tests/lib/catch.cc: Likewise.
> 	* tests/lib/catch.hpp: Add an SPDX identifier BSL-1.0.
>

Pfff, right.  Sorry for the mess-up.

I've fixed, thanks.

> Looks good apart from that.

Thanks!

> Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

I went through the whole series and yes, you've signed off all the
patches!

Thanks!

For the record, below is the updated patch.  It can be browsed in
relicensing branch at: https://sourceware.org/git/?p=libabigail.git;a=shortlog;h=refs/heads/relicensing

From 5393b3fdef615dc7ed3ba1a383a403ed3ec99c05 Mon Sep 17 00:00:00 2001
From: Matthias Maennich <maennich@google.com>
Date: Sat, 7 Mar 2020 23:46:31 +0000
Subject: [PATCH 1/9] Replace individual license references with SPDX
 Identifiers

This patch replaces license headers with SPDX identifiers in all files
containing license headers.  For each file, the SPDX identifier
formally represents its current license.  Note that the list of SPDX
identifiers is available on the SPDX web site at
https://spdx.org/licenses.

For autoconf-archive/ax_prog_python_version.m4 however, there is a
little catch.  Dodji Seketeli wrote this ax_check_python_modules.m4.
Just like the other autoconf-archive macros, it makes sense to have it
under the FSF All Permissive license.  Actually, the terms of that
license was already in the file but then the license header was
wrongly set to GPLv2 with autoconf exception.  So I fixed that in this
commit by setting the SPDX identifier to FSFAP.

	* abigail.m4: Replace the license header with the SPDX identifier
	GPL-3.0-or-later WITH GCC-exception-3.1
	* autoconf-archive/ax_check_python_modules.m4: Correctly set the
	SPDX identifier to FSFAP.
	* autoconf-archive/ax_compare_version.m4: Replace the license
	header with the SPDX identifier FSFAP.
	* autoconf-archive/ax_prog_python_version.m4: Likewise.
	header with the SPDX identifier FSFAP.
	* autoconf-archive/ax_valgrind_check.m4: Likewise.
	* gen-changelog.py: Replace the license header with the SPDX
	identifier LGPL-2.0-or-later.
	* include/abg-comp-filter.h: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* include/abg-comparison.h: Likewise.
	* include/abg-config.h: Likewise.
	* include/abg-corpus.h: Likewise.
	* include/abg-cxx-compat.h: Replace the license header with the
	SPDX identifier LGPL-2.0-or-later.
	* include/abg-diff-utils.h: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later
	* include/abg-dwarf-reader.h: Likewise.
	* include/abg-fwd.h: Likewise.
	* include/abg-hash.h: Likewise.
	* include/abg-ini.h: Likewise.
	* include/abg-interned-str.h: Likewise.
	* include/abg-ir.h: Likewise.
	* include/abg-libxml-utils.h: Likewise.
	* include/abg-libzip-utils.h: Likewise.
	* include/abg-reader.h: Likewise.
	* include/abg-regex.h: Likewise.
	* include/abg-reporter.h: Likewise.
	* include/abg-sptr-utils.h: Likewise.
	* include/abg-suppression.h: Likewise.
	* include/abg-tools-utils.h: Likewise.
	* include/abg-traverse.h: Likewise.
	* include/abg-viz-common.h: Likewise.
	* include/abg-viz-dot.h: Likewise.
	* include/abg-viz-svg.h: Likewise.
	* include/abg-workers.h: Likewise.
	* include/abg-writer.h: Likewise.
	* install-sh: Replace the license header with the SPDX identifier MIT.
	* ltmain.sh: Replace the license header with the SPDX identifier
	GPL-2.0-or-later.  Note that this file has the libtool special
	exception which allows us to redistribute it under the general
	license of the project.
	* src/abg-comp-filter.cc: Replace the license header with the SPDX
	* src/abg-comparison-priv.h: Likewise.
	* src/abg-comparison.cc: Likewise.
	* src/abg-config.cc: Likewise.
	* src/abg-corpus-priv.h: Likewise.
	* src/abg-corpus.cc: Likewise.
	* src/abg-default-reporter.cc: Likewise.
	* src/abg-diff-utils.cc: Likewise.
	* src/abg-dwarf-reader.cc: Likewise.
	* src/abg-elf-helpers.cc: Likewise.
	* src/abg-elf-helpers.h: Likewise.
	* src/abg-regex.cc: Likewise.
	* src/abg-hash.cc: Likewise.
	* src/abg-ini.cc: Likewise.
	* src/abg-internal.h: Likewise.
	* src/abg-ir-priv.h: Likewise.
	* src/abg-ir.cc: Likewise.
	* src/abg-leaf-reporter.cc: Likewise.
	* src/abg-libxml-utils.cc: Likewise.
	* src/abg-libzip-utils.cc: Likewise.
	* src/abg-reader.cc: Likewise.
	* src/abg-reporter-priv.cc: Likewise.
	* src/abg-reporter-priv.h: Likewise.
	* src/abg-sptr-utils.cc: Likewise.
	* src/abg-suppression-priv.h: Likewise.
	* src/abg-suppression.cc: Likewise.
	* src/abg-tools-utils.cc: Likewise.
	* src/abg-traverse.cc: Likewise.
	* src/abg-viz-common.cc: Likewise.
	* src/abg-viz-dot.cc: Likewise.
	* src/abg-viz-svg.cc: Likewise.
	* src/abg-workers.cc: Likewise.
	* src/abg-writer.cc: Likewise.
	* tests/lib/catch.cc: Likewise.
	* tests/lib/catch.hpp: Add an SPDX identifier BSL-1.0.
	* tests/mockfedabipkgdiff.in: Replace the license header with the
	SPDX identifier GPL-3.0-or-later.
	* tests/print-diff-tree.cc: Likewise.
	* tests/runtestfedabipkgdiff.py.in: Replaace the license header
	with the SPDW identifier GPL-3.0-or-later.
	* tests/test-abicompat.cc: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* tests/test-abidiff-exit.cc: Likewise.
	* tests/test-abidiff.cc: Likewise.
	* tests/test-alt-dwarf-file.cc: Likewise.
	* tests/test-annotate.cc: Likewise.
	* tests/test-cxx-compat.cc: Likewise.
	* tests/test-core-diff.cc: Likewise.
	* tests/test-diff-dwarf-abixml.cc: Likewise.
	* tests/test-diff-dwarf.cc: Likewise.
	* tests/test-diff-filter.cc: Likewise.
	* tests/test-diff-pkg.cc: Likewise.
	* tests/test-diff-suppr.cc: Likewise.
	* tests/test-diff2.cc: Likewise.
	* tests/test-dot.cc: Replace the license header with the
	SPDX identifier GPL-3.0-with-GCC-exception.
	* tests/test-elf-helpers.cc: Replace the license header with the
	SPDX identifier LGPL-3.0-or-later.
	* tests/test-ini.cc: Likewise.
	* tests/test-ir-walker.cc: Likewise.
	* tests/test-kmi-whitelist.cc: Likewise.
	* tests/test-lookup-syms.cc: Likewise.
	* tests/test-read-dwarf.cc: Likewise.
	* tests/test-read-write.cc: Likewise.
	* tests/test-svg.cc: Replace the license header with the SPDX
	identifier GPL-3.0-with-GCC-exception.
	* tests/test-symtab.cc: Replace the license header with the SPDX
	identifier LGPL-3.0-or-later.
	* tests/test-tools-utils.cc: Likewise.
	* tests/test-types-stability.cc: Likewise.
	* tests/test-utils.cc: Likewise.
	* tests/test-utils.h: Likewise.
	* tests/test-write-read-archive.cc: Likewise.
	* tools/abiar.cc: Likewise.
	* tools/abicompat.cc: Likewise.
	* tools/abidiff.cc: Likewise.
	* tools/abidw.cc: Likewise.
	* tools/abilint.cc: Likewise.
	* tools/abipkgdiff.cc: Likewise.
	* tools/abisym.cc: Likewise.
	* tools/binilint.cc: Likewise.
	* tools/fedabipkgdiff: Replace the license header with the
	SPDX identifier GPL-3.0-or-later.
	* tools/kmidiff.cc: Likewise.

Signed-off-by: Benjamin De Kosnik <bkoz@gnu.org>
Signed-off-by: Ben Woodard <woodard@redhat.com>
Signed-off-by: Chenxiong Qi <cqi@redhat.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
Signed-off-by: Giuliano Procida <gprocida@google.com>
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
Signed-off-by: Matthias Klose <doko@ubuntu.com>
Signed-off-by: Matthias Maennich <maennich@google.com>
Signed-off-by: Ondrej Oprala <ondrej.oprala@gmail.com>
Signed-off-by: Roland McGrath <roland@hack.frob.com>
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
 abigail.m4                                  | 26 ++++----------------------
 autoconf-archive/ax_check_python_modules.m4 | 20 +-------------------
 autoconf-archive/ax_compare_version.m4      |  1 +
 autoconf-archive/ax_prog_python_version.m4  |  1 +
 autoconf-archive/ax_valgrind_check.m4       |  1 +
 gen-changelog.py                            | 15 ++-------------
 include/abg-comp-filter.h                   | 17 +----------------
 include/abg-comparison.h                    | 17 +----------------
 include/abg-config.h                        | 17 +----------------
 include/abg-corpus.h                        | 17 +----------------
 include/abg-cxx-compat.h                    | 17 +----------------
 include/abg-diff-utils.h                    | 17 +----------------
 include/abg-dwarf-reader.h                  | 17 +----------------
 include/abg-fwd.h                           | 17 +----------------
 include/abg-hash.h                          | 17 +----------------
 include/abg-ini.h                           | 17 +----------------
 include/abg-interned-str.h                  | 17 +----------------
 include/abg-ir.h                            | 17 +----------------
 include/abg-libxml-utils.h                  | 17 +----------------
 include/abg-libzip-utils.h                  | 17 +----------------
 include/abg-reader.h                        | 17 +----------------
 include/abg-regex.h                         | 19 ++-----------------
 include/abg-reporter.h                      | 17 +----------------
 include/abg-sptr-utils.h                    | 17 +----------------
 include/abg-suppression.h                   | 17 +----------------
 include/abg-tools-utils.h                   | 17 +----------------
 include/abg-traverse.h                      | 17 +----------------
 include/abg-viz-common.h                    | 17 +----------------
 include/abg-viz-dot.h                       | 17 +----------------
 include/abg-viz-svg.h                       | 17 +----------------
 include/abg-workers.h                       | 17 +----------------
 include/abg-writer.h                        | 17 +----------------
 install-sh                                  | 18 +-----------------
 ltmain.sh                                   | 22 +---------------------
 src/abg-comp-filter.cc                      | 17 +----------------
 src/abg-comparison-priv.h                   | 18 +-----------------
 src/abg-comparison.cc                       | 17 +----------------
 src/abg-config.cc                           | 17 +----------------
 src/abg-corpus-priv.h                       | 17 +----------------
 src/abg-corpus.cc                           | 17 +----------------
 src/abg-default-reporter.cc                 | 17 +----------------
 src/abg-diff-utils.cc                       | 17 +----------------
 src/abg-dwarf-reader.cc                     | 17 +----------------
 src/abg-elf-helpers.cc                      | 17 +----------------
 src/abg-elf-helpers.h                       | 17 +----------------
 src/abg-hash.cc                             | 17 +----------------
 src/abg-ini.cc                              | 17 +----------------
 src/abg-internal.h                          | 17 +----------------
 src/abg-ir-priv.h                           | 17 +----------------
 src/abg-ir.cc                               | 17 +----------------
 src/abg-leaf-reporter.cc                    | 17 +----------------
 src/abg-libxml-utils.cc                     | 17 +----------------
 src/abg-libzip-utils.cc                     | 17 +----------------
 src/abg-reader.cc                           | 17 +----------------
 src/abg-regex.cc                            | 17 +----------------
 src/abg-reporter-priv.cc                    | 17 +----------------
 src/abg-reporter-priv.h                     | 17 +----------------
 src/abg-suppression-priv.h                  | 17 +----------------
 src/abg-suppression.cc                      | 17 +----------------
 src/abg-tools-utils.cc                      | 17 +----------------
 src/abg-traverse.cc                         | 17 +----------------
 src/abg-viz-common.cc                       | 17 +----------------
 src/abg-viz-dot.cc                          | 18 +-----------------
 src/abg-viz-svg.cc                          | 17 +----------------
 src/abg-workers.cc                          | 17 +----------------
 src/abg-writer.cc                           | 17 +----------------
 tests/lib/catch.cc                          | 17 +----------------
 tests/lib/catch.hpp                         |  4 ++--
 tests/mockfedabipkgdiff.in                  | 17 +----------------
 tests/print-diff-tree.cc                    | 20 ++------------------
 tests/runtestfedabipkgdiff.py.in            | 17 +----------------
 tests/test-abicompat.cc                     | 17 +----------------
 tests/test-abidiff-exit.cc                  | 17 +----------------
 tests/test-abidiff.cc                       | 17 +----------------
 tests/test-alt-dwarf-file.cc                | 17 +----------------
 tests/test-annotate.cc                      | 17 +----------------
 tests/test-core-diff.cc                     | 19 ++-----------------
 tests/test-cxx-compat.cc                    | 18 +-----------------
 tests/test-diff-dwarf-abixml.cc             | 17 +----------------
 tests/test-diff-dwarf.cc                    | 17 +----------------
 tests/test-diff-filter.cc                   | 17 +----------------
 tests/test-diff-pkg.cc                      | 17 +----------------
 tests/test-diff-suppr.cc                    | 17 +----------------
 tests/test-diff2.cc                         | 20 ++------------------
 tests/test-dot.cc                           | 26 +++-----------------------
 tests/test-elf-helpers.cc                   | 17 +----------------
 tests/test-ini.cc                           | 17 +----------------
 tests/test-ir-walker.cc                     | 17 +----------------
 tests/test-kmi-whitelist.cc                 | 17 +----------------
 tests/test-lookup-syms.cc                   | 17 +----------------
 tests/test-read-dwarf.cc                    | 17 +----------------
 tests/test-read-write.cc                    | 17 +----------------
 tests/test-svg.cc                           | 26 +++-----------------------
 tests/test-symtab.cc                        | 17 +----------------
 tests/test-tools-utils.cc                   | 17 +----------------
 tests/test-types-stability.cc               | 17 +----------------
 tests/test-utils.cc                         | 18 +-----------------
 tests/test-utils.h                          | 17 +----------------
 tests/test-write-read-archive.cc            | 17 +----------------
 tools/abiar.cc                              | 17 +----------------
 tools/abicompat.cc                          | 17 +----------------
 tools/abidiff.cc                            | 17 +----------------
 tools/abidw.cc                              | 17 +----------------
 tools/abilint.cc                            | 17 +----------------
 tools/abipkgdiff.cc                         | 17 +----------------
 tools/abisym.cc                             | 17 +----------------
 tools/binilint.cc                           | 17 +----------------
 tools/fedabipkgdiff                         | 17 +----------------
 tools/kmidiff.cc                            | 17 +----------------
 109 files changed, 122 insertions(+), 1718 deletions(-)

diff --git a/abigail.m4 b/abigail.m4
index 86c769b..2c7626d 100644
--- a/abigail.m4
+++ b/abigail.m4
@@ -1,28 +1,10 @@
+# SPDX-License-Identifier: GPL-3.0-or-later WITH GCC-exception-3.1
+#
 # Copyright (C) 2013-2020 Red Hat, Inc
-# 
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 3, or (at your option) any
-# later version.
-# 
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# Under Section 7 of GPL version 3, you are granted additional
-# permissions described in the GCC Runtime Library Exception, version
-# 3.1, as published by the Free Software Foundation.
-# 
-# You should have received a copy of the GNU General Public License
-# and a copy of the GCC Runtime Library Exception along with this
-# program; see the files COPYING3 and COPYING.RUNTIME respectively.
-# If not, see <http://www.gnu.org/licenses/>.
 #
-#// Author: Dodji Seketeli <dodji@redhat.com>
+# Author: Dodji Seketeli <dodji@redhat.com>
 
+#
 # ABIGAIL_INIT
 #
 # Handle the detection of the libabigail header and library files on
diff --git a/autoconf-archive/ax_check_python_modules.m4 b/autoconf-archive/ax_check_python_modules.m4
index 6538170..d5285db 100644
--- a/autoconf-archive/ax_check_python_modules.m4
+++ b/autoconf-archive/ax_check_python_modules.m4
@@ -1,26 +1,8 @@
+# SPDX-License-Identifier: FSFAP
 # -*- Autoconf -*-
 #
 # ax_check_python_modules.m4 - Macros to locate python modules.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
 # Author: Dodji Seketeli <dodji@seketeli.org>
 #
 
diff --git a/autoconf-archive/ax_compare_version.m4 b/autoconf-archive/ax_compare_version.m4
index 74dc0fd..cddb15d 100644
--- a/autoconf-archive/ax_compare_version.m4
+++ b/autoconf-archive/ax_compare_version.m4
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: FSFAP
 # ===========================================================================
 #    http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
 # ===========================================================================
diff --git a/autoconf-archive/ax_prog_python_version.m4 b/autoconf-archive/ax_prog_python_version.m4
index 628a3e4..626d8eb 100644
--- a/autoconf-archive/ax_prog_python_version.m4
+++ b/autoconf-archive/ax_prog_python_version.m4
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: FSFAP
 # ===========================================================================
 #  http://www.gnu.org/software/autoconf-archive/ax_prog_python_version.html
 # ===========================================================================
diff --git a/autoconf-archive/ax_valgrind_check.m4 b/autoconf-archive/ax_valgrind_check.m4
index d0e3c2d..be83490 100644
--- a/autoconf-archive/ax_valgrind_check.m4
+++ b/autoconf-archive/ax_valgrind_check.m4
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: FSFAP
 # ===========================================================================
 #     http://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html
 # ===========================================================================
diff --git a/gen-changelog.py b/gen-changelog.py
index 9b8e002..3515aa0 100644
--- a/gen-changelog.py
+++ b/gen-changelog.py
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: LGPL-2.0-or-later
+#
 # -*- mode: python -*-
 #
 # This python program has been copied from
@@ -11,19 +13,6 @@
 # published by the Free Software Foundaion; either version 2, or (at
 # your option) any later version.
 #
-# Thus, this program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Lesser Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program; see the file COPYING-LGPLV2.  If
-# not, see <http://www.gnu.org/licenses/>.
 
 import sys
 import subprocess
diff --git a/include/abg-comp-filter.h b/include/abg-comp-filter.h
index 556bad4..e02b32a 100644
--- a/include/abg-comp-filter.h
+++ b/include/abg-comp-filter.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-comparison.h b/include/abg-comparison.h
index c4eb592..99c852d 100644
--- a/include/abg-comparison.h
+++ b/include/abg-comparison.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_COMPARISON_H__
diff --git a/include/abg-config.h b/include/abg-config.h
index 314fc34..e7fecdb 100644
--- a/include/abg-config.h
+++ b/include/abg-config.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-corpus.h b/include/abg-corpus.h
index 410a9c2..4c2d6d9 100644
--- a/include/abg-corpus.h
+++ b/include/abg-corpus.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-cxx-compat.h b/include/abg-cxx-compat.h
index 7141771..d692464 100644
--- a/include/abg-cxx-compat.h
+++ b/include/abg-cxx-compat.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-2.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2019-2020 Google, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV2.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-diff-utils.h b/include/abg-diff-utils.h
index b59ffa0..60937d1 100644
--- a/include/abg-diff-utils.h
+++ b/include/abg-diff-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/include/abg-dwarf-reader.h b/include/abg-dwarf-reader.h
index d0329ae..628cc33 100644
--- a/include/abg-dwarf-reader.h
+++ b/include/abg-dwarf-reader.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index a2caf9b..dd7d7ed 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-hash.h b/include/abg-hash.h
index 732b145..c698a96 100644
--- a/include/abg-hash.h
+++ b/include/abg-hash.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-ini.h b/include/abg-ini.h
index df79198..60d328d 100644
--- a/include/abg-ini.h
+++ b/include/abg-ini.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-interned-str.h b/include/abg-interned-str.h
index 2bc8f43..6ba4058 100644
--- a/include/abg-interned-str.h
+++ b/include/abg-interned-str.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-ir.h b/include/abg-ir.h
index f17a3bf..413847d 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-libxml-utils.h b/include/abg-libxml-utils.h
index cf167b8..f127962 100644
--- a/include/abg-libxml-utils.h
+++ b/include/abg-libxml-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-libzip-utils.h b/include/abg-libzip-utils.h
index a112279..5e52e06 100644
--- a/include/abg-libzip-utils.h
+++ b/include/abg-libzip-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-reader.h b/include/abg-reader.h
index d86fcb1..39ff744 100644
--- a/include/abg-reader.h
+++ b/include/abg-reader.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-regex.h b/include/abg-regex.h
index 7ab9fc0..d9b5a28 100644
--- a/include/abg-regex.h
+++ b/include/abg-regex.h
@@ -1,22 +1,7 @@
-// -*- mode: C++ -*-
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/include/abg-reporter.h b/include/abg-reporter.h
index 6aec6a6..7e37969 100644
--- a/include/abg-reporter.h
+++ b/include/abg-reporter.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-sptr-utils.h b/include/abg-sptr-utils.h
index 2a12707..6adf54b 100644
--- a/include/abg-sptr-utils.h
+++ b/include/abg-sptr-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/include/abg-suppression.h b/include/abg-suppression.h
index 6383b93..65698c1 100644
--- a/include/abg-suppression.h
+++ b/include/abg-suppression.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_SUPPRESSION_H__
diff --git a/include/abg-tools-utils.h b/include/abg-tools-utils.h
index 12651fc..4c6dfa8 100644
--- a/include/abg-tools-utils.h
+++ b/include/abg-tools-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 ///@file
 
diff --git a/include/abg-traverse.h b/include/abg-traverse.h
index 92a8a24..9b01679 100644
--- a/include/abg-traverse.h
+++ b/include/abg-traverse.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-viz-common.h b/include/abg-viz-common.h
index 948b1f4..5ab3718 100644
--- a/include/abg-viz-common.h
+++ b/include/abg-viz-common.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-viz-dot.h b/include/abg-viz-dot.h
index ac84bd9..ceae3b1 100644
--- a/include/abg-viz-dot.h
+++ b/include/abg-viz-dot.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-viz-svg.h b/include/abg-viz-svg.h
index 567f789..601683a 100644
--- a/include/abg-viz-svg.h
+++ b/include/abg-viz-svg.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-workers.h b/include/abg-workers.h
index 65d3e83..2f3a238 100644
--- a/include/abg-workers.h
+++ b/include/abg-workers.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-writer.h b/include/abg-writer.h
index d44b483..ddb1d2c 100644
--- a/include/abg-writer.h
+++ b/include/abg-writer.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/install-sh b/install-sh
index 377bb86..0a3cd07 100755
--- a/install-sh
+++ b/install-sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+# SPDX-License-Identifier: MIT
 # install - install a program, script, or datafile
 
 scriptversion=2011-11-20.07; # UTC
@@ -9,23 +10,6 @@ scriptversion=2011-11-20.07; # UTC
 #
 # Copyright (C) 1994 X Consortium
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
diff --git a/ltmain.sh b/ltmain.sh
index 63ae69d..0208760 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 # libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -7,27 +8,6 @@
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
 # Usage: $progname [OPTION]... [MODE-ARG]...
 #
 # Provide generalized library-building support services.
diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc
index abfa3c0..cf8da79 100644
--- a/src/abg-comp-filter.cc
+++ b/src/abg-comp-filter.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-comparison-priv.h b/src/abg-comparison-priv.h
index b82b5d0..9b9fc5d 100644
--- a/src/abg-comparison-priv.h
+++ b/src/abg-comparison-priv.h
@@ -1,24 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc
index 11f506f..4ac0cda 100644
--- a/src/abg-comparison.cc
+++ b/src/abg-comparison.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-config.cc b/src/abg-config.cc
index 34b7bf4..ddde9d2 100644
--- a/src/abg-config.cc
+++ b/src/abg-config.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the files COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-corpus-priv.h b/src/abg-corpus-priv.h
index ee8c823..d5bab11 100644
--- a/src/abg-corpus-priv.h
+++ b/src/abg-corpus-priv.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc
index 0e8e6d7..4ff5aa8 100644
--- a/src/abg-corpus.cc
+++ b/src/abg-corpus.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index 0b572db..8b5b321 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 
diff --git a/src/abg-diff-utils.cc b/src/abg-diff-utils.cc
index 6c521f6..27519c0 100644
--- a/src/abg-diff-utils.cc
+++ b/src/abg-diff-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <cstring>
 
diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 7257052..9347973 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-elf-helpers.cc b/src/abg-elf-helpers.cc
index ed768d2..24bb678 100644
--- a/src/abg-elf-helpers.cc
+++ b/src/abg-elf-helpers.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-elf-helpers.h b/src/abg-elf-helpers.h
index 647c927..b0fe0c2 100644
--- a/src/abg-elf-helpers.h
+++ b/src/abg-elf-helpers.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-hash.cc b/src/abg-hash.cc
index 5d2861f..184b556 100644
--- a/src/abg-hash.cc
+++ b/src/abg-hash.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-ini.cc b/src/abg-ini.cc
index 5dc438b..3603d95 100644
--- a/src/abg-ini.cc
+++ b/src/abg-ini.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-internal.h b/src/abg-internal.h
index fbe5316..b2e3a39 100644
--- a/src/abg-internal.h
+++ b/src/abg-internal.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_INTERNAL_H__
diff --git a/src/abg-ir-priv.h b/src/abg-ir-priv.h
index 63c63b1..62b1b72 100644
--- a/src/abg-ir-priv.h
+++ b/src/abg-ir-priv.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 2852c09..33b196b 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 //Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-leaf-reporter.cc b/src/abg-leaf-reporter.cc
index c2a766e..8b0c593 100644
--- a/src/abg-leaf-reporter.cc
+++ b/src/abg-leaf-reporter.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 
diff --git a/src/abg-libxml-utils.cc b/src/abg-libxml-utils.cc
index 2c46aad..3178862 100644
--- a/src/abg-libxml-utils.cc
+++ b/src/abg-libxml-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-libzip-utils.cc b/src/abg-libzip-utils.cc
index c0a2944..f96741d 100644
--- a/src/abg-libzip-utils.cc
+++ b/src/abg-libzip-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-reader.cc b/src/abg-reader.cc
index 3157473..63115e3 100644
--- a/src/abg-reader.cc
+++ b/src/abg-reader.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-regex.cc b/src/abg-regex.cc
index 5bcd130..c124df8 100644
--- a/src/abg-regex.cc
+++ b/src/abg-regex.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index 7849114..b6545a9 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #include <libgen.h>
diff --git a/src/abg-reporter-priv.h b/src/abg-reporter-priv.h
index 84cb238..2b1cb3c 100644
--- a/src/abg-reporter-priv.h
+++ b/src/abg-reporter-priv.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_REPORTER_PRIV_H__
diff --git a/src/abg-suppression-priv.h b/src/abg-suppression-priv.h
index deb0826..d0c16a8 100644
--- a/src/abg-suppression-priv.h
+++ b/src/abg-suppression-priv.h
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index ae7cc95..3ca22bd 100644
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-tools-utils.cc b/src/abg-tools-utils.cc
index bc3d587..efbb4d9 100644
--- a/src/abg-tools-utils.cc
+++ b/src/abg-tools-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 ///@file
 
diff --git a/src/abg-traverse.cc b/src/abg-traverse.cc
index a3cb797..c8e483c 100644
--- a/src/abg-traverse.cc
+++ b/src/abg-traverse.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-viz-common.cc b/src/abg-viz-common.cc
index ab89413..3473c5b 100644
--- a/src/abg-viz-common.cc
+++ b/src/abg-viz-common.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <stdexcept>
 #include <fstream>
diff --git a/src/abg-viz-dot.cc b/src/abg-viz-dot.cc
index d637b6e..5fdeeea 100644
--- a/src/abg-viz-dot.cc
+++ b/src/abg-viz-dot.cc
@@ -1,23 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 
 #include <stdexcept>
 #include <fstream>
diff --git a/src/abg-viz-svg.cc b/src/abg-viz-svg.cc
index 07c78ae..f510af6 100644
--- a/src/abg-viz-svg.cc
+++ b/src/abg-viz-svg.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <stdexcept>
 #include <fstream>
diff --git a/src/abg-workers.cc b/src/abg-workers.cc
index 9035854..3ffd53d 100644
--- a/src/abg-workers.cc
+++ b/src/abg-workers.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index 59060e1..fe44755 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/tests/lib/catch.cc b/tests/lib/catch.cc
index aae1a62..0c56f12 100644
--- a/tests/lib/catch.cc
+++ b/tests/lib/catch.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/lib/catch.hpp b/tests/lib/catch.hpp
index fdb046f..a0a87f2 100644
--- a/tests/lib/catch.hpp
+++ b/tests/lib/catch.hpp
@@ -1,5 +1,5 @@
-/*
- *  Catch v1.12.2
+// SPDX-License-Identifier: BSL-1.0
+/*  Catch v1.12.2
  *  Generated: 2018-05-14 15:10:01.112442
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
index 47c8cc8..346cacf 100644
--- a/tests/mockfedabipkgdiff.in
+++ b/tests/mockfedabipkgdiff.in
@@ -1,23 +1,8 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-or-later
 # -*- coding: utf-8 -*-
 # -*- Mode: Python
 #
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any
-# later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; see the file COPYING-GPLV3.  If
-# not, see <http:#www.gnu.org/licenses/>.
-#
 # Author: Dodji Seketeli
 #
 # Based on some preliminary work from Chenxiong Qi, posted to
diff --git a/tests/print-diff-tree.cc b/tests/print-diff-tree.cc
index 24ad95c..662c954 100644
--- a/tests/print-diff-tree.cc
+++ b/tests/print-diff-tree.cc
@@ -1,25 +1,9 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
-
-// Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2013-2020 Red Hat, Inc.
 //
 // Author: Dodji Seketeli
-//
 
 #include <cstring>
 #include <iostream>
diff --git a/tests/runtestfedabipkgdiff.py.in b/tests/runtestfedabipkgdiff.py.in
index 04429b6..ac2d624 100755
--- a/tests/runtestfedabipkgdiff.py.in
+++ b/tests/runtestfedabipkgdiff.py.in
@@ -1,23 +1,8 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-or-later
 # -*- coding: utf-8 -*-
 # -*- Mode: Python
 #
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any
-# later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; see the file COPYING-GPLV3.  If
-# not, see <http:#www.gnu.org/licenses/>.
-#
 # Author: Chenxiong Qi
 
 '''Runs tests for the fedabipkgdiff program
diff --git a/tests/test-abicompat.cc b/tests/test-abicompat.cc
index 7b02781..7f33c4b 100644
--- a/tests/test-abicompat.cc
+++ b/tests/test-abicompat.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2014-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc
index 6ebe2a0..294a25f 100644
--- a/tests/test-abidiff-exit.cc
+++ b/tests/test-abidiff-exit.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-abidiff.cc b/tests/test-abidiff.cc
index dcb1401..625c141 100644
--- a/tests/test-abidiff.cc
+++ b/tests/test-abidiff.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-alt-dwarf-file.cc b/tests/test-alt-dwarf-file.cc
index cd8769d..2d78f4c 100644
--- a/tests/test-alt-dwarf-file.cc
+++ b/tests/test-alt-dwarf-file.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-annotate.cc b/tests/test-annotate.cc
index ba715cc..c01e483 100644
--- a/tests/test-annotate.cc
+++ b/tests/test-annotate.cc
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Ondrej Oprala
 
 /// @file
diff --git a/tests/test-core-diff.cc b/tests/test-core-diff.cc
index 531f493..298ebc8 100644
--- a/tests/test-core-diff.cc
+++ b/tests/test-core-diff.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
-
-// Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2013-2020 Red Hat, Inc.
 //
 // Author: Dodji Seketeli
 
diff --git a/tests/test-cxx-compat.cc b/tests/test-cxx-compat.cc
index 0a230a5..4dfb41f 100644
--- a/tests/test-cxx-compat.cc
+++ b/tests/test-cxx-compat.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
@@ -27,4 +12,3 @@
 #include "lib/catch.hpp"
 
 #include "abg-cxx-compat.h"
-
diff --git a/tests/test-diff-dwarf-abixml.cc b/tests/test-diff-dwarf-abixml.cc
index f169624..02046d8 100644
--- a/tests/test-diff-dwarf-abixml.cc
+++ b/tests/test-diff-dwarf-abixml.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file compare the ABI of an an elf binary and an abixml file.
diff --git a/tests/test-diff-dwarf.cc b/tests/test-diff-dwarf.cc
index 3b8a626..d65d63a 100644
--- a/tests/test-diff-dwarf.cc
+++ b/tests/test-diff-dwarf.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-diff-filter.cc b/tests/test-diff-filter.cc
index b3b1e91..e3ad156 100644
--- a/tests/test-diff-filter.cc
+++ b/tests/test-diff-filter.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-diff-pkg.cc b/tests/test-diff-pkg.cc
index 8e324da..21c4f89 100644
--- a/tests/test-diff-pkg.cc
+++ b/tests/test-diff-pkg.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Sinny Kumari
 
 /// @file
diff --git a/tests/test-diff-suppr.cc b/tests/test-diff-suppr.cc
index 93476c7..95f287c 100644
--- a/tests/test-diff-suppr.cc
+++ b/tests/test-diff-suppr.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-diff2.cc b/tests/test-diff2.cc
index 85d5aa6..120ec27 100644
--- a/tests/test-diff2.cc
+++ b/tests/test-diff2.cc
@@ -1,25 +1,9 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
-
-// Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2013-2020 Red Hat, Inc.
 //
 // Author: Dodji Seketeli
-//
 
 /// @file
 ///
diff --git a/tests/test-dot.cc b/tests/test-dot.cc
index fab0c19..4e3920a 100644
--- a/tests/test-dot.cc
+++ b/tests/test-dot.cc
@@ -1,27 +1,7 @@
-// Copyright (C) 2013-2019 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License
-// and a copy of the GCC Runtime Library Exception along with this
-// program; see the files COPYING3 and COPYING.RUNTIME respectively.
-// If not, see <http://www.gnu.org/licenses/>.
-
+// SPDX-License-Identifier: GPL-3.0-with-GCC-exception
 // -*- mode: C++ -*-
+//
+// Copyright (C) 2013-2019 Red Hat, Inc.
 
 #include "abg-viz-dot.h"
 
diff --git a/tests/test-elf-helpers.cc b/tests/test-elf-helpers.cc
index 1b36ee2..ca5d7eb 100644
--- a/tests/test-elf-helpers.cc
+++ b/tests/test-elf-helpers.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/test-ini.cc b/tests/test-ini.cc
index 12b1fb6..441f0ee 100644
--- a/tests/test-ini.cc
+++ b/tests/test-ini.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-ir-walker.cc b/tests/test-ir-walker.cc
index 41b6adc..6ebaeb2 100644
--- a/tests/test-ir-walker.cc
+++ b/tests/test-ir-walker.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <string>
 #include <fstream>
diff --git a/tests/test-kmi-whitelist.cc b/tests/test-kmi-whitelist.cc
index bcc5ade..7d45f15 100644
--- a/tests/test-kmi-whitelist.cc
+++ b/tests/test-kmi-whitelist.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/test-lookup-syms.cc b/tests/test-lookup-syms.cc
index 077f33b..f2c1cb6 100644
--- a/tests/test-lookup-syms.cc
+++ b/tests/test-lookup-syms.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-read-dwarf.cc b/tests/test-read-dwarf.cc
index c93f176..93c7bb9 100644
--- a/tests/test-read-dwarf.cc
+++ b/tests/test-read-dwarf.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file read ELF binaries containing DWARF, save them in XML corpus
diff --git a/tests/test-read-write.cc b/tests/test-read-write.cc
index 7d24bee..d709aab 100644
--- a/tests/test-read-write.cc
+++ b/tests/test-read-write.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file read an XML corpus file (in the native Abigail XML format),
 /// save it back and diff the resulting XML file against the input
diff --git a/tests/test-svg.cc b/tests/test-svg.cc
index 4a9d44d..71ec75d 100644
--- a/tests/test-svg.cc
+++ b/tests/test-svg.cc
@@ -1,27 +1,7 @@
-// Copyright (C) 2013-2019 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License
-// and a copy of the GCC Runtime Library Exception along with this
-// program; see the files COPYING3 and COPYING.RUNTIME respectively.
-// If not, see <http://www.gnu.org/licenses/>.
-
+// SPDX-License-Identifier: GPL-3.0-with-GCC-exception
 // -*- mode: C++ -*-
+//
+// Copyright (C) 2013-2019 Red Hat, Inc.
 
 #include "abg-viz-svg.h"
 
diff --git a/tests/test-symtab.cc b/tests/test-symtab.cc
index 20e3071..97e6cad 100644
--- a/tests/test-symtab.cc
+++ b/tests/test-symtab.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/test-tools-utils.cc b/tests/test-tools-utils.cc
index 5597873..0f20a02 100644
--- a/tests/test-tools-utils.cc
+++ b/tests/test-tools-utils.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/tests/test-types-stability.cc b/tests/test-types-stability.cc
index 1c1a531..d0cf99c 100644
--- a/tests/test-types-stability.cc
+++ b/tests/test-types-stability.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-utils.cc b/tests/test-utils.cc
index 4daf7ce..efcdfb7 100644
--- a/tests/test-utils.cc
+++ b/tests/test-utils.cc
@@ -1,23 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 
 #include "test-utils.h"
 
diff --git a/tests/test-utils.h b/tests/test-utils.h
index ec9a520..ec33845 100644
--- a/tests/test-utils.h
+++ b/tests/test-utils.h
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #ifndef __TEST_UTILS_H__
 #define __TEST_UTILS_H__
diff --git a/tests/test-write-read-archive.cc b/tests/test-write-read-archive.cc
index f682105..539a963 100644
--- a/tests/test-write-read-archive.cc
+++ b/tests/test-write-read-archive.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <cstdlib>
 #include <iostream>
diff --git a/tools/abiar.cc b/tools/abiar.cc
index 22fe375..b73de2f 100644
--- a/tools/abiar.cc
+++ b/tools/abiar.cc
@@ -1,22 +1,7 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <sys/types.h>
 #include <sys/stat.h>// The two above is for 'stat'
diff --git a/tools/abicompat.cc b/tools/abicompat.cc
index a5c707d..d7147c6 100644
--- a/tools/abicompat.cc
+++ b/tools/abicompat.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2014-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abidiff.cc b/tools/abidiff.cc
index 6ac81ee..f5b4069 100644
--- a/tools/abidiff.cc
+++ b/tools/abidiff.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abidw.cc b/tools/abidw.cc
index 756a29e..95a0dab 100644
--- a/tools/abidw.cc
+++ b/tools/abidw.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abilint.cc b/tools/abilint.cc
index e9d6f93..fc397a7 100644
--- a/tools/abilint.cc
+++ b/tools/abilint.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc
index 445e240..ea79398 100644
--- a/tools/abipkgdiff.cc
+++ b/tools/abipkgdiff.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2015-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Sinny Kumari
 
 /// @file
diff --git a/tools/abisym.cc b/tools/abisym.cc
index 2da45b4..d6089a8 100644
--- a/tools/abisym.cc
+++ b/tools/abisym.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/binilint.cc b/tools/binilint.cc
index 4f0abaa..94d5595 100644
--- a/tools/binilint.cc
+++ b/tools/binilint.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/fedabipkgdiff b/tools/fedabipkgdiff
index 2191613..644cc1c 100755
--- a/tools/fedabipkgdiff
+++ b/tools/fedabipkgdiff
@@ -1,25 +1,10 @@
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-or-later
 # -*- coding: utf-8 -*-
 # -*- Mode: Python
 #
 # Copyright (C) 2013-2016 Red Hat, Inc.
 #
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any
-# later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; see the file COPYING-GPLV3.  If
-# not, see <http:#www.gnu.org/licenses/>.
-#
 # Author: Chenxiong Qi
 
 from __future__ import print_function
diff --git a/tools/kmidiff.cc b/tools/kmidiff.cc
index 2840eb0..7798cba 100644
--- a/tools/kmidiff.cc
+++ b/tools/kmidiff.cc
@@ -1,23 +1,8 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff mbox series

Patch

diff --git a/abigail.m4 b/abigail.m4
index 86c769b..2c7626d 100644
--- a/abigail.m4
+++ b/abigail.m4
@@ -1,28 +1,10 @@ 
+# SPDX-License-Identifier: GPL-3.0-or-later WITH GCC-exception-3.1
+#
 # Copyright (C) 2013-2020 Red Hat, Inc
-# 
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 3, or (at your option) any
-# later version.
-# 
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# Under Section 7 of GPL version 3, you are granted additional
-# permissions described in the GCC Runtime Library Exception, version
-# 3.1, as published by the Free Software Foundation.
-# 
-# You should have received a copy of the GNU General Public License
-# and a copy of the GCC Runtime Library Exception along with this
-# program; see the files COPYING3 and COPYING.RUNTIME respectively.
-# If not, see <http://www.gnu.org/licenses/>.
 #
-#// Author: Dodji Seketeli <dodji@redhat.com>
+# Author: Dodji Seketeli <dodji@redhat.com>
 
+#
 # ABIGAIL_INIT
 #
 # Handle the detection of the libabigail header and library files on
diff --git a/autoconf-archive/ax_check_python_modules.m4 b/autoconf-archive/ax_check_python_modules.m4
index 6538170..d5285db 100644
--- a/autoconf-archive/ax_check_python_modules.m4
+++ b/autoconf-archive/ax_check_python_modules.m4
@@ -1,26 +1,8 @@ 
+# SPDX-License-Identifier: FSFAP
 # -*- Autoconf -*-
 #
 # ax_check_python_modules.m4 - Macros to locate python modules.
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-#
 # Author: Dodji Seketeli <dodji@seketeli.org>
 #
 
diff --git a/autoconf-archive/ax_compare_version.m4 b/autoconf-archive/ax_compare_version.m4
index 74dc0fd..cddb15d 100644
--- a/autoconf-archive/ax_compare_version.m4
+++ b/autoconf-archive/ax_compare_version.m4
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: FSFAP
 # ===========================================================================
 #    http://www.gnu.org/software/autoconf-archive/ax_compare_version.html
 # ===========================================================================
diff --git a/autoconf-archive/ax_prog_python_version.m4 b/autoconf-archive/ax_prog_python_version.m4
index 628a3e4..626d8eb 100644
--- a/autoconf-archive/ax_prog_python_version.m4
+++ b/autoconf-archive/ax_prog_python_version.m4
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: FSFAP
 # ===========================================================================
 #  http://www.gnu.org/software/autoconf-archive/ax_prog_python_version.html
 # ===========================================================================
diff --git a/autoconf-archive/ax_valgrind_check.m4 b/autoconf-archive/ax_valgrind_check.m4
index d0e3c2d..be83490 100644
--- a/autoconf-archive/ax_valgrind_check.m4
+++ b/autoconf-archive/ax_valgrind_check.m4
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: FSFAP
 # ===========================================================================
 #     http://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html
 # ===========================================================================
diff --git a/gen-changelog.py b/gen-changelog.py
index 9b8e002..3515aa0 100644
--- a/gen-changelog.py
+++ b/gen-changelog.py
@@ -1,4 +1,6 @@ 
 #!/usr/bin/env python
+# SPDX-License-Identifier: LGPL-2.0-or-later
+#
 # -*- mode: python -*-
 #
 # This python program has been copied from
@@ -11,19 +13,6 @@ 
 # published by the Free Software Foundaion; either version 2, or (at
 # your option) any later version.
 #
-# Thus, this program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public License
-# as published by the Free Software Foundation; either version 2, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Lesser Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program; see the file COPYING-LGPLV2.  If
-# not, see <http://www.gnu.org/licenses/>.
 
 import sys
 import subprocess
diff --git a/include/abg-comp-filter.h b/include/abg-comp-filter.h
index 556bad4..e02b32a 100644
--- a/include/abg-comp-filter.h
+++ b/include/abg-comp-filter.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-comparison.h b/include/abg-comparison.h
index d107bf9..91a2316 100644
--- a/include/abg-comparison.h
+++ b/include/abg-comparison.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_COMPARISON_H__
diff --git a/include/abg-config.h b/include/abg-config.h
index 314fc34..e7fecdb 100644
--- a/include/abg-config.h
+++ b/include/abg-config.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-corpus.h b/include/abg-corpus.h
index 410a9c2..4c2d6d9 100644
--- a/include/abg-corpus.h
+++ b/include/abg-corpus.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-cxx-compat.h b/include/abg-cxx-compat.h
index 7141771..d692464 100644
--- a/include/abg-cxx-compat.h
+++ b/include/abg-cxx-compat.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-2.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2019-2020 Google, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV2.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-diff-utils.h b/include/abg-diff-utils.h
index b59ffa0..60937d1 100644
--- a/include/abg-diff-utils.h
+++ b/include/abg-diff-utils.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/include/abg-dwarf-reader.h b/include/abg-dwarf-reader.h
index d0329ae..628cc33 100644
--- a/include/abg-dwarf-reader.h
+++ b/include/abg-dwarf-reader.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-fwd.h b/include/abg-fwd.h
index bfd9f88..7968d73 100644
--- a/include/abg-fwd.h
+++ b/include/abg-fwd.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-hash.h b/include/abg-hash.h
index 732b145..c698a96 100644
--- a/include/abg-hash.h
+++ b/include/abg-hash.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-ini.h b/include/abg-ini.h
index df79198..60d328d 100644
--- a/include/abg-ini.h
+++ b/include/abg-ini.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-interned-str.h b/include/abg-interned-str.h
index 2bc8f43..6ba4058 100644
--- a/include/abg-interned-str.h
+++ b/include/abg-interned-str.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-ir.h b/include/abg-ir.h
index 5b13dc9..25e916e 100644
--- a/include/abg-ir.h
+++ b/include/abg-ir.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-libxml-utils.h b/include/abg-libxml-utils.h
index cf167b8..f127962 100644
--- a/include/abg-libxml-utils.h
+++ b/include/abg-libxml-utils.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-libzip-utils.h b/include/abg-libzip-utils.h
index a112279..5e52e06 100644
--- a/include/abg-libzip-utils.h
+++ b/include/abg-libzip-utils.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-reader.h b/include/abg-reader.h
index d86fcb1..39ff744 100644
--- a/include/abg-reader.h
+++ b/include/abg-reader.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-regex.h b/include/abg-regex.h
index 7ab9fc0..d9b5a28 100644
--- a/include/abg-regex.h
+++ b/include/abg-regex.h
@@ -1,22 +1,7 @@ 
-// -*- mode: C++ -*-
+// SPDX-License-Identifier: LGPL-3.0-or-later
+// -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/include/abg-reporter.h b/include/abg-reporter.h
index e0d9e66..a71ec40 100644
--- a/include/abg-reporter.h
+++ b/include/abg-reporter.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-sptr-utils.h b/include/abg-sptr-utils.h
index 2a12707..6adf54b 100644
--- a/include/abg-sptr-utils.h
+++ b/include/abg-sptr-utils.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/include/abg-suppression.h b/include/abg-suppression.h
index 6383b93..65698c1 100644
--- a/include/abg-suppression.h
+++ b/include/abg-suppression.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_SUPPRESSION_H__
diff --git a/include/abg-tools-utils.h b/include/abg-tools-utils.h
index c47e3f4..970b236 100644
--- a/include/abg-tools-utils.h
+++ b/include/abg-tools-utils.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 ///@file
 
diff --git a/include/abg-traverse.h b/include/abg-traverse.h
index a7170da..c4a69b8 100644
--- a/include/abg-traverse.h
+++ b/include/abg-traverse.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-viz-common.h b/include/abg-viz-common.h
index 948b1f4..5ab3718 100644
--- a/include/abg-viz-common.h
+++ b/include/abg-viz-common.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-viz-dot.h b/include/abg-viz-dot.h
index ac84bd9..ceae3b1 100644
--- a/include/abg-viz-dot.h
+++ b/include/abg-viz-dot.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-viz-svg.h b/include/abg-viz-svg.h
index 567f789..601683a 100644
--- a/include/abg-viz-svg.h
+++ b/include/abg-viz-svg.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/include/abg-workers.h b/include/abg-workers.h
index 65d3e83..2f3a238 100644
--- a/include/abg-workers.h
+++ b/include/abg-workers.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/include/abg-writer.h b/include/abg-writer.h
index d44b483..ddb1d2c 100644
--- a/include/abg-writer.h
+++ b/include/abg-writer.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/install-sh b/install-sh
index 377bb86..0a3cd07 100755
--- a/install-sh
+++ b/install-sh
@@ -1,4 +1,5 @@ 
 #!/bin/sh
+# SPDX-License-Identifier: MIT
 # install - install a program, script, or datafile
 
 scriptversion=2011-11-20.07; # UTC
@@ -9,23 +10,6 @@  scriptversion=2011-11-20.07; # UTC
 #
 # Copyright (C) 1994 X Consortium
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
diff --git a/ltmain.sh b/ltmain.sh
index 63ae69d..0208760 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,3 +1,4 @@ 
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 # libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
@@ -7,27 +8,6 @@ 
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
 # Usage: $progname [OPTION]... [MODE-ARG]...
 #
 # Provide generalized library-building support services.
diff --git a/src/abg-comp-filter.cc b/src/abg-comp-filter.cc
index 0b0fbe4..49c4feb 100644
--- a/src/abg-comp-filter.cc
+++ b/src/abg-comp-filter.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-comparison-priv.h b/src/abg-comparison-priv.h
index b82b5d0..9b9fc5d 100644
--- a/src/abg-comparison-priv.h
+++ b/src/abg-comparison-priv.h
@@ -1,24 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc
index b6f065f..a95f321 100644
--- a/src/abg-comparison.cc
+++ b/src/abg-comparison.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-config.cc b/src/abg-config.cc
index 34b7bf4..ddde9d2 100644
--- a/src/abg-config.cc
+++ b/src/abg-config.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the files COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-corpus-priv.h b/src/abg-corpus-priv.h
index ee8c823..d5bab11 100644
--- a/src/abg-corpus-priv.h
+++ b/src/abg-corpus-priv.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc
index 9e90b99..4436ede 100644
--- a/src/abg-corpus.cc
+++ b/src/abg-corpus.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-default-reporter.cc b/src/abg-default-reporter.cc
index 2948e15..5891d08 100644
--- a/src/abg-default-reporter.cc
+++ b/src/abg-default-reporter.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 
diff --git a/src/abg-diff-utils.cc b/src/abg-diff-utils.cc
index 6c521f6..27519c0 100644
--- a/src/abg-diff-utils.cc
+++ b/src/abg-diff-utils.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <cstring>
 
diff --git a/src/abg-dwarf-reader.cc b/src/abg-dwarf-reader.cc
index 54a5edd..15b1f91 100644
--- a/src/abg-dwarf-reader.cc
+++ b/src/abg-dwarf-reader.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-elf-helpers.cc b/src/abg-elf-helpers.cc
index ed768d2..24bb678 100644
--- a/src/abg-elf-helpers.cc
+++ b/src/abg-elf-helpers.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-elf-helpers.h b/src/abg-elf-helpers.h
index 647c927..b0fe0c2 100644
--- a/src/abg-elf-helpers.h
+++ b/src/abg-elf-helpers.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-hash.cc b/src/abg-hash.cc
index 5d2861f..184b556 100644
--- a/src/abg-hash.cc
+++ b/src/abg-hash.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-ini.cc b/src/abg-ini.cc
index 5dc438b..3603d95 100644
--- a/src/abg-ini.cc
+++ b/src/abg-ini.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-internal.h b/src/abg-internal.h
index fbe5316..b2e3a39 100644
--- a/src/abg-internal.h
+++ b/src/abg-internal.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_INTERNAL_H__
diff --git a/src/abg-ir-priv.h b/src/abg-ir-priv.h
index 63c63b1..62b1b72 100644
--- a/src/abg-ir-priv.h
+++ b/src/abg-ir-priv.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-ir.cc b/src/abg-ir.cc
index 757605f..882e924 100644
--- a/src/abg-ir.cc
+++ b/src/abg-ir.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 //Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-leaf-reporter.cc b/src/abg-leaf-reporter.cc
index 783ffbc..a198e30 100644
--- a/src/abg-leaf-reporter.cc
+++ b/src/abg-leaf-reporter.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 
diff --git a/src/abg-libxml-utils.cc b/src/abg-libxml-utils.cc
index 2c46aad..3178862 100644
--- a/src/abg-libxml-utils.cc
+++ b/src/abg-libxml-utils.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-libzip-utils.cc b/src/abg-libzip-utils.cc
index c0a2944..f96741d 100644
--- a/src/abg-libzip-utils.cc
+++ b/src/abg-libzip-utils.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-reader.cc b/src/abg-reader.cc
index e72a5de..89a51c3 100644
--- a/src/abg-reader.cc
+++ b/src/abg-reader.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-regex.cc b/src/abg-regex.cc
index 5bcd130..c124df8 100644
--- a/src/abg-regex.cc
+++ b/src/abg-regex.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/src/abg-reporter-priv.cc b/src/abg-reporter-priv.cc
index ef92560..95b3556 100644
--- a/src/abg-reporter-priv.cc
+++ b/src/abg-reporter-priv.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #include <libgen.h>
diff --git a/src/abg-reporter-priv.h b/src/abg-reporter-priv.h
index 84cb238..2b1cb3c 100644
--- a/src/abg-reporter-priv.h
+++ b/src/abg-reporter-priv.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 #ifndef __ABG_REPORTER_PRIV_H__
diff --git a/src/abg-suppression-priv.h b/src/abg-suppression-priv.h
index deb0826..d0c16a8 100644
--- a/src/abg-suppression-priv.h
+++ b/src/abg-suppression-priv.h
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-suppression.cc b/src/abg-suppression.cc
index ae7cc95..3ca22bd 100644
--- a/src/abg-suppression.cc
+++ b/src/abg-suppression.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-tools-utils.cc b/src/abg-tools-utils.cc
index dfbec87..b8f461c 100644
--- a/src/abg-tools-utils.cc
+++ b/src/abg-tools-utils.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 ///@file
 
diff --git a/src/abg-traverse.cc b/src/abg-traverse.cc
index 3fb87ea..db5a967 100644
--- a/src/abg-traverse.cc
+++ b/src/abg-traverse.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 
diff --git a/src/abg-viz-common.cc b/src/abg-viz-common.cc
index ab89413..3473c5b 100644
--- a/src/abg-viz-common.cc
+++ b/src/abg-viz-common.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <stdexcept>
 #include <fstream>
diff --git a/src/abg-viz-dot.cc b/src/abg-viz-dot.cc
index d637b6e..5fdeeea 100644
--- a/src/abg-viz-dot.cc
+++ b/src/abg-viz-dot.cc
@@ -1,23 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 
 #include <stdexcept>
 #include <fstream>
diff --git a/src/abg-viz-svg.cc b/src/abg-viz-svg.cc
index 07c78ae..f510af6 100644
--- a/src/abg-viz-svg.cc
+++ b/src/abg-viz-svg.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <stdexcept>
 #include <fstream>
diff --git a/src/abg-workers.cc b/src/abg-workers.cc
index 9035854..3ffd53d 100644
--- a/src/abg-workers.cc
+++ b/src/abg-workers.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/src/abg-writer.cc b/src/abg-writer.cc
index 77d91e8..35aa138 100644
--- a/src/abg-writer.cc
+++ b/src/abg-writer.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/tests/lib/catch.cc b/tests/lib/catch.cc
index aae1a62..0c56f12 100644
--- a/tests/lib/catch.cc
+++ b/tests/lib/catch.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/lib/catch.hpp b/tests/lib/catch.hpp
index fdb046f..a0a87f2 100644
--- a/tests/lib/catch.hpp
+++ b/tests/lib/catch.hpp
@@ -1,5 +1,5 @@ 
-/*
- *  Catch v1.12.2
+// SPDX-License-Identifier: BSL-1.0
+/*  Catch v1.12.2
  *  Generated: 2018-05-14 15:10:01.112442
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
index 47c8cc8..ea8efc1 100644
--- a/tests/mockfedabipkgdiff.in
+++ b/tests/mockfedabipkgdiff.in
@@ -1,23 +1,8 @@ 
 #!/usr/bin/env python
+# SPDX-License-Identifier: LGPL-3.0-or-later
 # -*- coding: utf-8 -*-
 # -*- Mode: Python
 #
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any
-# later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; see the file COPYING-GPLV3.  If
-# not, see <http:#www.gnu.org/licenses/>.
-#
 # Author: Dodji Seketeli
 #
 # Based on some preliminary work from Chenxiong Qi, posted to
diff --git a/tests/print-diff-tree.cc b/tests/print-diff-tree.cc
index 24ad95c..662c954 100644
--- a/tests/print-diff-tree.cc
+++ b/tests/print-diff-tree.cc
@@ -1,25 +1,9 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
-
-// Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2013-2020 Red Hat, Inc.
 //
 // Author: Dodji Seketeli
-//
 
 #include <cstring>
 #include <iostream>
diff --git a/tests/runtestfedabipkgdiff.py.in b/tests/runtestfedabipkgdiff.py.in
index 04429b6..ac2d624 100755
--- a/tests/runtestfedabipkgdiff.py.in
+++ b/tests/runtestfedabipkgdiff.py.in
@@ -1,23 +1,8 @@ 
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-or-later
 # -*- coding: utf-8 -*-
 # -*- Mode: Python
 #
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any
-# later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; see the file COPYING-GPLV3.  If
-# not, see <http:#www.gnu.org/licenses/>.
-#
 # Author: Chenxiong Qi
 
 '''Runs tests for the fedabipkgdiff program
diff --git a/tests/test-abicompat.cc b/tests/test-abicompat.cc
index 7b02781..7f33c4b 100644
--- a/tests/test-abicompat.cc
+++ b/tests/test-abicompat.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2014-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc
index 244de2a..553ba33 100644
--- a/tests/test-abidiff-exit.cc
+++ b/tests/test-abidiff-exit.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2016-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-abidiff.cc b/tests/test-abidiff.cc
index dcb1401..625c141 100644
--- a/tests/test-abidiff.cc
+++ b/tests/test-abidiff.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-alt-dwarf-file.cc b/tests/test-alt-dwarf-file.cc
index cd8769d..2d78f4c 100644
--- a/tests/test-alt-dwarf-file.cc
+++ b/tests/test-alt-dwarf-file.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-annotate.cc b/tests/test-annotate.cc
index ba715cc..c01e483 100644
--- a/tests/test-annotate.cc
+++ b/tests/test-annotate.cc
@@ -1,21 +1,6 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Ondrej Oprala
 
 /// @file
diff --git a/tests/test-core-diff.cc b/tests/test-core-diff.cc
index 531f493..298ebc8 100644
--- a/tests/test-core-diff.cc
+++ b/tests/test-core-diff.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
-
-// Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2013-2020 Red Hat, Inc.
 //
 // Author: Dodji Seketeli
 
diff --git a/tests/test-cxx-compat.cc b/tests/test-cxx-compat.cc
index 0a230a5..4dfb41f 100644
--- a/tests/test-cxx-compat.cc
+++ b/tests/test-cxx-compat.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
@@ -27,4 +12,3 @@ 
 #include "lib/catch.hpp"
 
 #include "abg-cxx-compat.h"
-
diff --git a/tests/test-diff-dwarf-abixml.cc b/tests/test-diff-dwarf-abixml.cc
index f169624..02046d8 100644
--- a/tests/test-diff-dwarf-abixml.cc
+++ b/tests/test-diff-dwarf-abixml.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file compare the ABI of an an elf binary and an abixml file.
diff --git a/tests/test-diff-dwarf.cc b/tests/test-diff-dwarf.cc
index 3b8a626..d65d63a 100644
--- a/tests/test-diff-dwarf.cc
+++ b/tests/test-diff-dwarf.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-diff-filter.cc b/tests/test-diff-filter.cc
index 3ddbdbc..2cb4841 100644
--- a/tests/test-diff-filter.cc
+++ b/tests/test-diff-filter.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-diff-pkg.cc b/tests/test-diff-pkg.cc
index 8e324da..21c4f89 100644
--- a/tests/test-diff-pkg.cc
+++ b/tests/test-diff-pkg.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Sinny Kumari
 
 /// @file
diff --git a/tests/test-diff-suppr.cc b/tests/test-diff-suppr.cc
index 93476c7..95f287c 100644
--- a/tests/test-diff-suppr.cc
+++ b/tests/test-diff-suppr.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-diff2.cc b/tests/test-diff2.cc
index 85d5aa6..120ec27 100644
--- a/tests/test-diff2.cc
+++ b/tests/test-diff2.cc
@@ -1,25 +1,9 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
-
-// Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
+// Copyright (C) 2013-2020 Red Hat, Inc.
 //
 // Author: Dodji Seketeli
-//
 
 /// @file
 ///
diff --git a/tests/test-dot.cc b/tests/test-dot.cc
index fab0c19..4e3920a 100644
--- a/tests/test-dot.cc
+++ b/tests/test-dot.cc
@@ -1,27 +1,7 @@ 
-// Copyright (C) 2013-2019 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License
-// and a copy of the GCC Runtime Library Exception along with this
-// program; see the files COPYING3 and COPYING.RUNTIME respectively.
-// If not, see <http://www.gnu.org/licenses/>.
-
+// SPDX-License-Identifier: GPL-3.0-with-GCC-exception
 // -*- mode: C++ -*-
+//
+// Copyright (C) 2013-2019 Red Hat, Inc.
 
 #include "abg-viz-dot.h"
 
diff --git a/tests/test-elf-helpers.cc b/tests/test-elf-helpers.cc
index 1b36ee2..ca5d7eb 100644
--- a/tests/test-elf-helpers.cc
+++ b/tests/test-elf-helpers.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/test-ini.cc b/tests/test-ini.cc
index 12b1fb6..441f0ee 100644
--- a/tests/test-ini.cc
+++ b/tests/test-ini.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-ir-walker.cc b/tests/test-ir-walker.cc
index 41b6adc..6ebaeb2 100644
--- a/tests/test-ir-walker.cc
+++ b/tests/test-ir-walker.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <string>
 #include <fstream>
diff --git a/tests/test-kmi-whitelist.cc b/tests/test-kmi-whitelist.cc
index bcc5ade..7d45f15 100644
--- a/tests/test-kmi-whitelist.cc
+++ b/tests/test-kmi-whitelist.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/test-lookup-syms.cc b/tests/test-lookup-syms.cc
index 077f33b..f2c1cb6 100644
--- a/tests/test-lookup-syms.cc
+++ b/tests/test-lookup-syms.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-read-dwarf.cc b/tests/test-read-dwarf.cc
index 8502f82..b10d8b8 100644
--- a/tests/test-read-dwarf.cc
+++ b/tests/test-read-dwarf.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file read ELF binaries containing DWARF, save them in XML corpus
diff --git a/tests/test-read-write.cc b/tests/test-read-write.cc
index 7d24bee..d709aab 100644
--- a/tests/test-read-write.cc
+++ b/tests/test-read-write.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file read an XML corpus file (in the native Abigail XML format),
 /// save it back and diff the resulting XML file against the input
diff --git a/tests/test-svg.cc b/tests/test-svg.cc
index 4a9d44d..71ec75d 100644
--- a/tests/test-svg.cc
+++ b/tests/test-svg.cc
@@ -1,27 +1,7 @@ 
-// Copyright (C) 2013-2019 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-
-// Under Section 7 of GPL version 3, you are granted additional
-// permissions described in the GCC Runtime Library Exception, version
-// 3.1, as published by the Free Software Foundation.
-
-// You should have received a copy of the GNU General Public License
-// and a copy of the GCC Runtime Library Exception along with this
-// program; see the files COPYING3 and COPYING.RUNTIME respectively.
-// If not, see <http://www.gnu.org/licenses/>.
-
+// SPDX-License-Identifier: GPL-3.0-with-GCC-exception
 // -*- mode: C++ -*-
+//
+// Copyright (C) 2013-2019 Red Hat, Inc.
 
 #include "abg-viz-svg.h"
 
diff --git a/tests/test-symtab.cc b/tests/test-symtab.cc
index 20e3071..97e6cad 100644
--- a/tests/test-symtab.cc
+++ b/tests/test-symtab.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2020 Google, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Matthias Maennich
 
 /// @file
diff --git a/tests/test-tools-utils.cc b/tests/test-tools-utils.cc
index d29bb8c..5d8d1f5 100644
--- a/tests/test-tools-utils.cc
+++ b/tests/test-tools-utils.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 /// @file
 ///
diff --git a/tests/test-types-stability.cc b/tests/test-types-stability.cc
index 1c1a531..d0cf99c 100644
--- a/tests/test-types-stability.cc
+++ b/tests/test-types-stability.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tests/test-utils.cc b/tests/test-utils.cc
index 4daf7ce..efcdfb7 100644
--- a/tests/test-utils.cc
+++ b/tests/test-utils.cc
@@ -1,23 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 
 #include "test-utils.h"
 
diff --git a/tests/test-utils.h b/tests/test-utils.h
index ec9a520..ec33845 100644
--- a/tests/test-utils.h
+++ b/tests/test-utils.h
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #ifndef __TEST_UTILS_H__
 #define __TEST_UTILS_H__
diff --git a/tests/test-write-read-archive.cc b/tests/test-write-read-archive.cc
index f682105..539a963 100644
--- a/tests/test-write-read-archive.cc
+++ b/tests/test-write-read-archive.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <cstdlib>
 #include <iostream>
diff --git a/tools/abiar.cc b/tools/abiar.cc
index 22fe375..b73de2f 100644
--- a/tools/abiar.cc
+++ b/tools/abiar.cc
@@ -1,22 +1,7 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
-//
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
 
 #include <sys/types.h>
 #include <sys/stat.h>// The two above is for 'stat'
diff --git a/tools/abicompat.cc b/tools/abicompat.cc
index a5c707d..d7147c6 100644
--- a/tools/abicompat.cc
+++ b/tools/abicompat.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2014-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abidiff.cc b/tools/abidiff.cc
index 162d5eb..c7d4b1f 100644
--- a/tools/abidiff.cc
+++ b/tools/abidiff.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abidw.cc b/tools/abidw.cc
index 2cd848d..93b4bc9 100644
--- a/tools/abidw.cc
+++ b/tools/abidw.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abilint.cc b/tools/abilint.cc
index e9d6f93..fc397a7 100644
--- a/tools/abilint.cc
+++ b/tools/abilint.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc
index 445e240..ea79398 100644
--- a/tools/abipkgdiff.cc
+++ b/tools/abipkgdiff.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2015-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Sinny Kumari
 
 /// @file
diff --git a/tools/abisym.cc b/tools/abisym.cc
index 2da45b4..d6089a8 100644
--- a/tools/abisym.cc
+++ b/tools/abisym.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/binilint.cc b/tools/binilint.cc
index 4f0abaa..94d5595 100644
--- a/tools/binilint.cc
+++ b/tools/binilint.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2013-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-
 // Author: Dodji Seketeli
 
 /// @file
diff --git a/tools/fedabipkgdiff b/tools/fedabipkgdiff
index 2191613..644cc1c 100755
--- a/tools/fedabipkgdiff
+++ b/tools/fedabipkgdiff
@@ -1,25 +1,10 @@ 
 #!/usr/bin/env python
+# SPDX-License-Identifier: GPL-3.0-or-later
 # -*- coding: utf-8 -*-
 # -*- Mode: Python
 #
 # Copyright (C) 2013-2016 Red Hat, Inc.
 #
-# This file is part of the GNU Application Binary Interface Generic
-# Analysis and Instrumentation Library (libabigail).  This library is
-# free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3, or (at your option) any
-# later version.
-#
-# This library is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with this program; see the file COPYING-GPLV3.  If
-# not, see <http:#www.gnu.org/licenses/>.
-#
 # Author: Chenxiong Qi
 
 from __future__ import print_function
diff --git a/tools/kmidiff.cc b/tools/kmidiff.cc
index 2840eb0..7798cba 100644
--- a/tools/kmidiff.cc
+++ b/tools/kmidiff.cc
@@ -1,23 +1,8 @@ 
+// SPDX-License-Identifier: LGPL-3.0-or-later
 // -*- Mode: C++ -*-
 //
 // Copyright (C) 2017-2020 Red Hat, Inc.
 //
-// This file is part of the GNU Application Binary Interface Generic
-// Analysis and Instrumentation Library (libabigail).  This library is
-// free software; you can redistribute it and/or modify it under the
-// terms of the GNU Lesser General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option) any
-// later version.
-
-// This library is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Lesser Public License for more details.
-
-// You should have received a copy of the GNU Lesser General Public
-// License along with this program; see the file COPYING-LGPLV3.  If
-// not, see <http://www.gnu.org/licenses/>.
-//
 // Author: Dodji Seketeli
 
 /// @file