From 0b3a601263db0cc2fd25b0a083a7b6c864fab7f0 Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
Date: Thu, 26 Sep 2019 12:36:17 -0500
Subject: [PATCH] Adding missing SPDX tags

- remove copyright/license from github issue templates as those would show up for every new ticket created
- remove duplicate SPDX tags
---
 .clang-format                                             | 1 +
 .clang-tidy                                               | 1 +
 .editorconfig                                             | 1 +
 .gitattributes                                            | 1 +
 .github/ISSUE_TEMPLATE.md                                 | 5 -----
 .github/PULL_REQUEST_TEMPLATE.md                          | 6 ------
 .github/hpx-no-inspect                                    | 0
 .gitignore                                                | 1 +
 cmake/HPX_AddDefinitions.cmake                            | 2 +-
 cmake/templates/HPXConfig.cmake.in                        | 1 +
 cmake/templates/HPXMacros.cmake.in                        | 1 +
 cmake/templates/autodoc.doxy.in                           | 1 +
 cmake/templates/cmake_toolchains.rst.in                   | 1 +
 cmake/templates/cmake_variables.rst.in                    | 1 +
 cmake/templates/conf.py.in                                | 1 +
 cmake/templates/config_defines.hpp.in                     | 1 +
 cmake/templates/config_defines_strings.hpp.in             | 1 +
 cmake/templates/config_defines_strings_for_modules.hpp.in | 1 +
 cmake/templates/config_defines_strings_modules.hpp.in     | 1 +
 cmake/templates/config_version.hpp.in                     | 1 +
 cmake/templates/force_linking.cpp.in                      | 1 +
 cmake/templates/force_linking.hpp.in                      | 1 +
 cmake/templates/global_module_header.hpp.in               | 1 +
 cmake/templates/hpx_application.pc.in                     | 1 +
 cmake/templates/hpx_application_debug.pc.in               | 1 +
 cmake/templates/hpx_bazel_defs.bzl.in                     | 6 ++++++
 cmake/templates/hpx_bazel_defs_debug.bzl.in               | 6 ++++++
 cmake/templates/hpx_component.pc.in                       | 1 +
 cmake/templates/hpx_component_debug.pc.in                 | 1 +
 cmake/templates/hpxcxx.in                                 | 2 ++
 cmake/templates/hpxrun.py.in                              | 1 +
 cmake/templates/modules.cpp.in                            | 1 +
 cmake/templates/static_parcelports.hpp.in                 | 1 +
 src/custom_exception_info.cpp                             | 1 -
 src/hpx_init.cpp                                          | 1 -
 src/hpx_main.cpp                                          | 1 -
 src/hpx_main_argc_argv.cpp                                | 1 -
 src/hpx_main_variables_map.cpp                            | 1 -
 src/hpx_main_winsocket.cpp                                | 1 -
 src/hpx_user_main.cpp                                     | 1 -
 src/hpx_user_main_argc_argv.cpp                           | 1 -
 src/hpx_wrap.cpp                                          | 1 -
 src/main.cpp                                              | 1 -
 src/pre_main.cpp                                          | 1 -
 src/runtime.cpp                                           | 1 -
 src/runtime_handlers.cpp                                  | 1 -
 src/runtime_impl.cpp                                      | 1 -
 src/state.cpp                                             | 1 -
 src/version.cpp                                           | 2 --
 49 files changed, 41 insertions(+), 29 deletions(-)
 create mode 100644 .github/hpx-no-inspect

diff --git a/.clang-format b/.clang-format
index 1ac938e0afb3..478520246753 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,6 +1,7 @@
 # Copyright (c) 2016 Thomas Heller
 # Copyright (c) 2016-2018 Hartmut Kaiser
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/.clang-tidy b/.clang-tidy
index e823cc57e7ad..a41fa60a21e5 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,6 @@
 # Copyright (c) 2019 Thomas Heller
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/.editorconfig b/.editorconfig
index e0ba0c6cc9da..b083a83a9852 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,5 +1,6 @@
 ; Copyright (c) 2013 Hartmut Kaiser
 ;
+; SPDX-License-Identifier: BSL-1.0
 ; Distributed under the Boost Software License, Version 1.0. (See accompanying
 ; file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/.gitattributes b/.gitattributes
index df7517af362e..4c324b844095 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
 # Copyright (c) 2012 Bryce Adelstein-Lelbach
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index fcdc5fc7de00..a1281a01e45e 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,3 @@
-<!-- Copyright (c) 2017 Hartmut Kaiser                                            -->
-<!--                                                                              -->
-<!-- SPDX-License-Identifier: BSL-1.0                                             -->
-<!-- Distributed under the Boost Software License, Version 1.0. (See accompanying -->
-<!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        -->
 ## Expected Behavior
 
 ... Please describe the behavior you would have expected.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 65ef41ff109d..0ae0d4acc098 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,3 @@
-<!-- Copyright (c) 2017 Hartmut Kaiser                                            -->
-<!--                                                                              -->
-<!-- SPDX-License-Identifier: BSL-1.0                                             -->
-<!-- Distributed under the Boost Software License, Version 1.0. (See accompanying -->
-<!-- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)        -->
-
 Fixes #
 
 ## Proposed Changes
diff --git a/.github/hpx-no-inspect b/.github/hpx-no-inspect
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/.gitignore b/.gitignore
index 3d26a338b75c..3395415c06eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Copyright (c) 2012 Bryce Adelstein-Lelbach
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/HPX_AddDefinitions.cmake b/cmake/HPX_AddDefinitions.cmake
index fb1c568b926f..00ba219ca4ab 100644
--- a/cmake/HPX_AddDefinitions.cmake
+++ b/cmake/HPX_AddDefinitions.cmake
@@ -106,7 +106,7 @@ function(write_config_defines_file)
     set(PREAMBLE
       "//  Copyright (c) 2019 STE||AR Group\n"
       "//\n"
-# SPDX-License-Identifier: BSL-1.0
+      "//  SPDX-License-Identifier: BSL-1.0\n"
       "//  Distributed under the Boost Software License, Version 1.0. (See accompanying\n"
       "//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)\n"
       "\n"
diff --git a/cmake/templates/HPXConfig.cmake.in b/cmake/templates/HPXConfig.cmake.in
index b0d8d8521324..5db2ed4a935f 100644
--- a/cmake/templates/HPXConfig.cmake.in
+++ b/cmake/templates/HPXConfig.cmake.in
@@ -1,6 +1,7 @@
 # Copyright (c) 2014 Thomas Heller
 # Copyright (c) 2015 Andreas Schaefer
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/HPXMacros.cmake.in b/cmake/templates/HPXMacros.cmake.in
index 01051e9f1550..4607145064e3 100644
--- a/cmake/templates/HPXMacros.cmake.in
+++ b/cmake/templates/HPXMacros.cmake.in
@@ -2,6 +2,7 @@
 # Copyright (c) 2015 Andreas Schaefer
 # Copyright (c) 2019 Patrick Diehl
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/autodoc.doxy.in b/cmake/templates/autodoc.doxy.in
index 1f5a0110f45e..b2c44f505395 100644
--- a/cmake/templates/autodoc.doxy.in
+++ b/cmake/templates/autodoc.doxy.in
@@ -1,5 +1,6 @@
 # Copyright (c) 2012 Bryce Adelstein-Lelbach
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/cmake_toolchains.rst.in b/cmake/templates/cmake_toolchains.rst.in
index 82053ea2c491..20dcc21f205b 100644
--- a/cmake/templates/cmake_toolchains.rst.in
+++ b/cmake/templates/cmake_toolchains.rst.in
@@ -2,6 +2,7 @@
    Copyright (C) 2018 Mikael Simberg
    Copyright (C) 2014 Thomas Heller
 
+   SPDX-License-Identifier: BSL-1.0
    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/cmake_variables.rst.in b/cmake/templates/cmake_variables.rst.in
index 64aa8e8b7f1f..e63f9824f2ee 100644
--- a/cmake/templates/cmake_variables.rst.in
+++ b/cmake/templates/cmake_variables.rst.in
@@ -2,6 +2,7 @@
    Copyright (C) 2018 Mikael Simberg
    Copyright (C) 2014 Thomas Heller
 
+   SPDX-License-Identifier: BSL-1.0
    Distributed under the Boost Software License, Version 1.0. (See accompanying
    file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/conf.py.in b/cmake/templates/conf.py.in
index be5763277adc..25c9697560c2 100644
--- a/cmake/templates/conf.py.in
+++ b/cmake/templates/conf.py.in
@@ -2,6 +2,7 @@
 #
 # Copyright (c) 2018 Mikael Simberg
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
diff --git a/cmake/templates/config_defines.hpp.in b/cmake/templates/config_defines.hpp.in
index 46f3744b1086..1016876023cb 100644
--- a/cmake/templates/config_defines.hpp.in
+++ b/cmake/templates/config_defines.hpp.in
@@ -1,5 +1,6 @@
 //  Copyright (c) 2012-2013 Thomas Heller
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/config_defines_strings.hpp.in b/cmake/templates/config_defines_strings.hpp.in
index 3293f11744b1..8d95b0e64e9e 100644
--- a/cmake/templates/config_defines_strings.hpp.in
+++ b/cmake/templates/config_defines_strings.hpp.in
@@ -1,5 +1,6 @@
 //  Copyright (c) 2017-2019 Hartmut Kaiser
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/config_defines_strings_for_modules.hpp.in b/cmake/templates/config_defines_strings_for_modules.hpp.in
index 92a79345c73e..5f181255cdad 100644
--- a/cmake/templates/config_defines_strings_for_modules.hpp.in
+++ b/cmake/templates/config_defines_strings_for_modules.hpp.in
@@ -1,5 +1,6 @@
 //  Copyright (c) 2017-2019 Hartmut Kaiser
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/config_defines_strings_modules.hpp.in b/cmake/templates/config_defines_strings_modules.hpp.in
index 3b9e93c389ae..1c0ceeb0376b 100644
--- a/cmake/templates/config_defines_strings_modules.hpp.in
+++ b/cmake/templates/config_defines_strings_modules.hpp.in
@@ -1,5 +1,6 @@
 //  Copyright (c) 2019 STE||AR Group
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/config_version.hpp.in b/cmake/templates/config_version.hpp.in
index e8cb5b53b785..8ab102fc97d9 100644
--- a/cmake/templates/config_version.hpp.in
+++ b/cmake/templates/config_version.hpp.in
@@ -2,6 +2,7 @@
 //  Copyright (c)      2011 Bryce Lelbach
 //  Copyright (c)      2013 Adrian Serio
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/force_linking.cpp.in b/cmake/templates/force_linking.cpp.in
index ca478cc3471c..153000fa7b83 100644
--- a/cmake/templates/force_linking.cpp.in
+++ b/cmake/templates/force_linking.cpp.in
@@ -1,5 +1,6 @@
 //  Copyright (c) 2019 STE||AR Group
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/force_linking.hpp.in b/cmake/templates/force_linking.hpp.in
index 3f61eb2bffc0..fe406bbb7f13 100644
--- a/cmake/templates/force_linking.hpp.in
+++ b/cmake/templates/force_linking.hpp.in
@@ -1,5 +1,6 @@
 //  Copyright (c) 2019 STE||AR Group
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/global_module_header.hpp.in b/cmake/templates/global_module_header.hpp.in
index b1e677c5d836..ce0e9be1059b 100644
--- a/cmake/templates/global_module_header.hpp.in
+++ b/cmake/templates/global_module_header.hpp.in
@@ -1,5 +1,6 @@
 //  Copyright (c) 2019 STE||AR Group
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/hpx_application.pc.in b/cmake/templates/hpx_application.pc.in
index 80e92f0dc2ee..1def56c26691 100644
--- a/cmake/templates/hpx_application.pc.in
+++ b/cmake/templates/hpx_application.pc.in
@@ -1,6 +1,7 @@
 # Copyright (c) 2014 Thomas Heller
 # Copyright (c) 2012 Bryce Adelstein-Lelbach
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/hpx_application_debug.pc.in b/cmake/templates/hpx_application_debug.pc.in
index bc18a0f77ce8..046b57b2977c 100644
--- a/cmake/templates/hpx_application_debug.pc.in
+++ b/cmake/templates/hpx_application_debug.pc.in
@@ -1,6 +1,7 @@
 # Copyright (c) 2014 Thomas Heller
 # Copyright (c) 2012 Bryce Adelstein-Lelbach
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/hpx_bazel_defs.bzl.in b/cmake/templates/hpx_bazel_defs.bzl.in
index 8d5775362100..b7406546a84e 100644
--- a/cmake/templates/hpx_bazel_defs.bzl.in
+++ b/cmake/templates/hpx_bazel_defs.bzl.in
@@ -1,3 +1,9 @@
+# Copyright (c) 2016 Lukas Troska
+#
+# SPDX-License-Identifier: BSL-1.0
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
 # Macros for building HPX code.
 def hpx_component_copts(component_name):
     """Shorthand for needed HPX component compile options
diff --git a/cmake/templates/hpx_bazel_defs_debug.bzl.in b/cmake/templates/hpx_bazel_defs_debug.bzl.in
index 75fe37724282..9d693066d8e9 100644
--- a/cmake/templates/hpx_bazel_defs_debug.bzl.in
+++ b/cmake/templates/hpx_bazel_defs_debug.bzl.in
@@ -1,3 +1,9 @@
+# Copyright (c) 2016 Lukas Troska
+#
+# SPDX-License-Identifier: BSL-1.0
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
 # Macros for building HPX code.
 def hpx_component_copts(component_name):
     """Shorthand for needed HPX component compile options
diff --git a/cmake/templates/hpx_component.pc.in b/cmake/templates/hpx_component.pc.in
index f54a9159da87..64e346724c81 100644
--- a/cmake/templates/hpx_component.pc.in
+++ b/cmake/templates/hpx_component.pc.in
@@ -1,6 +1,7 @@
 # Copyright (c) 2014 Thomas Heller
 # Copyright (c) 2012 Bryce Adelstein-Lelbach
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/hpx_component_debug.pc.in b/cmake/templates/hpx_component_debug.pc.in
index 889ee0bed9d3..55ba6e04bd38 100644
--- a/cmake/templates/hpx_component_debug.pc.in
+++ b/cmake/templates/hpx_component_debug.pc.in
@@ -1,6 +1,7 @@
 # Copyright (c) 2014 Thomas Heller
 # Copyright (c) 2012 Bryce Adelstein-Lelbach
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/hpxcxx.in b/cmake/templates/hpxcxx.in
index d11c9fef8488..2d5734a3339b 100755
--- a/cmake/templates/hpxcxx.in
+++ b/cmake/templates/hpxcxx.in
@@ -2,8 +2,10 @@
 #
 # Copyright (c) 2014 Steven R. Brandt
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
 import sys
 import os
 import re
diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in
index 9cacdb8bce9a..47b620db5f2e 100755
--- a/cmake/templates/hpxrun.py.in
+++ b/cmake/templates/hpxrun.py.in
@@ -2,6 +2,7 @@
 #
 # Copyright (c) 2014 Thomas Heller
 #
+# SPDX-License-Identifier: BSL-1.0
 # Distributed under the Boost Software License, Version 1.0. (See accompanying
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/modules.cpp.in b/cmake/templates/modules.cpp.in
index 4c70c701eaeb..d063ebb24cba 100644
--- a/cmake/templates/modules.cpp.in
+++ b/cmake/templates/modules.cpp.in
@@ -1,5 +1,6 @@
 //  Copyright (c) 2019 STE||AR Group
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/cmake/templates/static_parcelports.hpp.in b/cmake/templates/static_parcelports.hpp.in
index 1a058d48651e..4bd9555c6aee 100644
--- a/cmake/templates/static_parcelports.hpp.in
+++ b/cmake/templates/static_parcelports.hpp.in
@@ -1,5 +1,6 @@
 //  Copyright (c) 2012-2015 Thomas Heller
 //
+//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/custom_exception_info.cpp b/src/custom_exception_info.cpp
index 08a7a6dace7c..4e1e5724621e 100644
--- a/src/custom_exception_info.cpp
+++ b/src/custom_exception_info.cpp
@@ -2,7 +2,6 @@
 //  Copyright (c)      2011 Bryce Lelbach
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/hpx_init.cpp b/src/hpx_init.cpp
index f413df1b9adc..c0c160d1fd18 100644
--- a/src/hpx_init.cpp
+++ b/src/hpx_init.cpp
@@ -4,7 +4,6 @@
 //  Copyright (c)      2011 Bryce Lelbach
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/hpx_main.cpp b/src/hpx_main.cpp
index 17bf9421b1d7..a7b985128c9a 100644
--- a/src/hpx_main.cpp
+++ b/src/hpx_main.cpp
@@ -1,7 +1,6 @@
 //  Copyright (c) 2007-2012 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/hpx_main_argc_argv.cpp b/src/hpx_main_argc_argv.cpp
index 8dc218e8f2f3..7308109a4d30 100644
--- a/src/hpx_main_argc_argv.cpp
+++ b/src/hpx_main_argc_argv.cpp
@@ -1,7 +1,6 @@
 //  Copyright (c) 2007-2013 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/hpx_main_variables_map.cpp b/src/hpx_main_variables_map.cpp
index fc4ceef400e5..a74edc25b09e 100644
--- a/src/hpx_main_variables_map.cpp
+++ b/src/hpx_main_variables_map.cpp
@@ -1,7 +1,6 @@
 //  Copyright (c) 2007-2012 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/hpx_main_winsocket.cpp b/src/hpx_main_winsocket.cpp
index 1f500cc03a88..cc430975dd6c 100644
--- a/src/hpx_main_winsocket.cpp
+++ b/src/hpx_main_winsocket.cpp
@@ -1,7 +1,6 @@
 //  Copyright (c) 2016 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/hpx_user_main.cpp b/src/hpx_user_main.cpp
index 0f272b1160bf..44f56327c741 100644
--- a/src/hpx_user_main.cpp
+++ b/src/hpx_user_main.cpp
@@ -1,7 +1,6 @@
 //  Copyright (c) 2007-2013 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/hpx_user_main_argc_argv.cpp b/src/hpx_user_main_argc_argv.cpp
index da9c9d0ae9ec..4c3bcd2c7b27 100644
--- a/src/hpx_user_main_argc_argv.cpp
+++ b/src/hpx_user_main_argc_argv.cpp
@@ -1,7 +1,6 @@
 //  Copyright (c) 2007-2016 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/hpx_wrap.cpp b/src/hpx_wrap.cpp
index 508a2d88bff3..8232c9269128 100644
--- a/src/hpx_wrap.cpp
+++ b/src/hpx_wrap.cpp
@@ -1,7 +1,6 @@
 //  Copyright (c) 2018 Nikunj Gupta
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/main.cpp b/src/main.cpp
index b92b331b1e77..1c2b2ac88997 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,6 @@
 //  Copyright (c) 2007-2014 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/pre_main.cpp b/src/pre_main.cpp
index b0fdb5597bb2..11f6cbe57296 100644
--- a/src/pre_main.cpp
+++ b/src/pre_main.cpp
@@ -3,7 +3,6 @@
 //  Copyright (c) 2007-2013 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/runtime.cpp b/src/runtime.cpp
index 0528e8efb305..aae5b567efcb 100644
--- a/src/runtime.cpp
+++ b/src/runtime.cpp
@@ -2,7 +2,6 @@
 //  Copyright (c)      2011 Bryce Lelbach
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/runtime_handlers.cpp b/src/runtime_handlers.cpp
index ac025b69d453..18214a0ba2ca 100644
--- a/src/runtime_handlers.cpp
+++ b/src/runtime_handlers.cpp
@@ -4,7 +4,6 @@
 //  Copyright (c)      2011 Bryce Lelbach
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/runtime_impl.cpp b/src/runtime_impl.cpp
index ae8e439032de..116c77ddb5f0 100644
--- a/src/runtime_impl.cpp
+++ b/src/runtime_impl.cpp
@@ -2,7 +2,6 @@
 //  Copyright (c)      2011 Bryce Lelbach
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
diff --git a/src/state.cpp b/src/state.cpp
index f40d7b8f2691..fca46d1a14dd 100644
--- a/src/state.cpp
+++ b/src/state.cpp
@@ -2,7 +2,6 @@
 //  Copyright (c) 2011 Bryce Lelbach
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/version.cpp b/src/version.cpp
index afdd35f3fa08..6c789541a287 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -3,7 +3,6 @@
 //  Copyright (c) 2011-2017 Hartmut Kaiser
 //
 //  SPDX-License-Identifier: BSL-1.0
-//  SPDX-License-Identifier: BSL-1.0
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ////////////////////////////////////////////////////////////////////////////////
@@ -111,7 +110,6 @@ namespace hpx
             "of any scale).\n\n"
             "Copyright (c) 2007-2019, The STE||AR Group,\n"
             "http://stellar-group.org, email:hpx-users@stellar.cct.lsu.edu\n\n"
-//  SPDX-License-Identifier: BSL-1.0
 //  SPDX-License-Identifier: BSL-1.0
             "Distributed under the Boost Software License, "
             "Version 1.0. (See accompanying\n"