diff --git a/TESTS/events/queue/main.cpp b/TESTS/events/queue/main.cpp
index 3367622888..fe7966a366 100644
--- a/TESTS/events/queue/main.cpp
+++ b/TESTS/events/queue/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/events/timing/main.cpp b/TESTS/events/timing/main.cpp
index 5bf873d061..fb0b759b30 100644
--- a/TESTS/events/timing/main.cpp
+++ b/TESTS/events/timing/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/crash_reporting.py b/TESTS/host_tests/crash_reporting.py
index a505597389..45bf566c86 100644
--- a/TESTS/host_tests/crash_reporting.py
+++ b/TESTS/host_tests/crash_reporting.py
@@ -1,5 +1,6 @@
 """
 Copyright (c) 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/device_echo.py b/TESTS/host_tests/device_echo.py
index 03dadaadd9..0be5750ae5 100644
--- a/TESTS/host_tests/device_echo.py
+++ b/TESTS/host_tests/device_echo.py
@@ -1,6 +1,6 @@
 """
-mbed SDK
-Copyright (c) 2011-2016 ARM Limited
+Copyright (c) 2011-2020, Arm Limited and affiliates
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/rtc_calc_auto.py b/TESTS/host_tests/rtc_calc_auto.py
index 65904c912c..419c43d479 100644
--- a/TESTS/host_tests/rtc_calc_auto.py
+++ b/TESTS/host_tests/rtc_calc_auto.py
@@ -1,6 +1,6 @@
 """
-mbed SDK
-Copyright (c) 2011-2013 ARM Limited
+Copyright (c) 2011-2020, Arm Limited and affiliates
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/rtc_reset.py b/TESTS/host_tests/rtc_reset.py
index 3412975a8e..acdb4ccb85 100644
--- a/TESTS/host_tests/rtc_reset.py
+++ b/TESTS/host_tests/rtc_reset.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2017-2017 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/system_reset.py b/TESTS/host_tests/system_reset.py
index 4093804213..13d2309b3c 100644
--- a/TESTS/host_tests/system_reset.py
+++ b/TESTS/host_tests/system_reset.py
@@ -1,5 +1,6 @@
 """
 Copyright (c) 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/timing_drift_auto.py b/TESTS/host_tests/timing_drift_auto.py
index 7bf9c1df9c..65ac90a160 100644
--- a/TESTS/host_tests/timing_drift_auto.py
+++ b/TESTS/host_tests/timing_drift_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/host_tests/trng_reset.py b/TESTS/host_tests/trng_reset.py
index 3ed59f40ca..7e8878e22c 100644
--- a/TESTS/host_tests/trng_reset.py
+++ b/TESTS/host_tests/trng_reset.py
@@ -1,10 +1,12 @@
 """
-Copyright (c) 2018 ARM Limited
+Copyright (c) 2018-2020, Arm Limited and affiliates
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/TESTS/host_tests/usb_device_hid.py b/TESTS/host_tests/usb_device_hid.py
index 415718f630..3b166bf9c5 100644
--- a/TESTS/host_tests/usb_device_hid.py
+++ b/TESTS/host_tests/usb_device_hid.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2019 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/TESTS/lorawan/loraradio/main.cpp b/TESTS/lorawan/loraradio/main.cpp
index 5c7ba2f83a..a581d0fe0e 100644
--- a/TESTS/lorawan/loraradio/main.cpp
+++ b/TESTS/lorawan/loraradio/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/crc/main.cpp b/TESTS/mbed_drivers/crc/main.cpp
index 7245ade955..22d0380e6e 100644
--- a/TESTS/mbed_drivers/crc/main.cpp
+++ b/TESTS/mbed_drivers/crc/main.cpp
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/dev_null/main.cpp b/TESTS/mbed_drivers/dev_null/main.cpp
index 880979282e..34671faf67 100644
--- a/TESTS/mbed_drivers/dev_null/main.cpp
+++ b/TESTS/mbed_drivers/dev_null/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2013-2014 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/flashiap/main.cpp b/TESTS/mbed_drivers/flashiap/main.cpp
index 2684dc7b74..e2c596c4ac 100644
--- a/TESTS/mbed_drivers/flashiap/main.cpp
+++ b/TESTS/mbed_drivers/flashiap/main.cpp
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/lp_ticker/main.cpp b/TESTS/mbed_drivers/lp_ticker/main.cpp
index cf10dbac7a..e426e1cf9f 100644
--- a/TESTS/mbed_drivers/lp_ticker/main.cpp
+++ b/TESTS/mbed_drivers/lp_ticker/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2013-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/lp_timeout/main.cpp b/TESTS/mbed_drivers/lp_timeout/main.cpp
index ab80d2e8b6..3d69ba22ed 100644
--- a/TESTS/mbed_drivers/lp_timeout/main.cpp
+++ b/TESTS/mbed_drivers/lp_timeout/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/sleep_lock/main.cpp b/TESTS/mbed_drivers/sleep_lock/main.cpp
index 8bf77fa716..79dac9c758 100644
--- a/TESTS/mbed_drivers/sleep_lock/main.cpp
+++ b/TESTS/mbed_drivers/sleep_lock/main.cpp
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/ticker/main.cpp b/TESTS/mbed_drivers/ticker/main.cpp
index 02ec415feb..90922a97c7 100644
--- a/TESTS/mbed_drivers/ticker/main.cpp
+++ b/TESTS/mbed_drivers/ticker/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2013-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/timeout/main.cpp b/TESTS/mbed_drivers/timeout/main.cpp
index 3f3706e5a0..9ea301626d 100644
--- a/TESTS/mbed_drivers/timeout/main.cpp
+++ b/TESTS/mbed_drivers/timeout/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/timeout/timeout_tests.h b/TESTS/mbed_drivers/timeout/timeout_tests.h
index 534901c1fb..8ff5c6589a 100644
--- a/TESTS/mbed_drivers/timeout/timeout_tests.h
+++ b/TESTS/mbed_drivers/timeout/timeout_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_drivers/timerevent/main.cpp b/TESTS/mbed_drivers/timerevent/main.cpp
index f23dfb1a5d..56142a051c 100644
--- a/TESTS/mbed_drivers/timerevent/main.cpp
+++ b/TESTS/mbed_drivers/timerevent/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_functional/callback/main.cpp b/TESTS/mbed_functional/callback/main.cpp
index b67a93b0a1..ee971817a4 100644
--- a/TESTS/mbed_functional/callback/main.cpp
+++ b/TESTS/mbed_functional/callback/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_functional/callback_big/main.cpp b/TESTS/mbed_functional/callback_big/main.cpp
index 1e96882723..2241cfda4b 100644
--- a/TESTS/mbed_functional/callback_big/main.cpp
+++ b/TESTS/mbed_functional/callback_big/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_functional/callback_small/main.cpp b/TESTS/mbed_functional/callback_small/main.cpp
index 6878a48288..2740358472 100644
--- a/TESTS/mbed_functional/callback_small/main.cpp
+++ b/TESTS/mbed_functional/callback_small/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/common_tickers/main.cpp b/TESTS/mbed_hal/common_tickers/main.cpp
index 7e94981e60..14656273c8 100644
--- a/TESTS/mbed_hal/common_tickers/main.cpp
+++ b/TESTS/mbed_hal/common_tickers/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/common_tickers/ticker_api_tests.h b/TESTS/mbed_hal/common_tickers/ticker_api_tests.h
index 84b064de45..d7e0a84976 100644
--- a/TESTS/mbed_hal/common_tickers/ticker_api_tests.h
+++ b/TESTS/mbed_hal/common_tickers/ticker_api_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/common_tickers_freq/ticker_api_test_freq.h b/TESTS/mbed_hal/common_tickers_freq/ticker_api_test_freq.h
index 06221a7926..839004409f 100644
--- a/TESTS/mbed_hal/common_tickers_freq/ticker_api_test_freq.h
+++ b/TESTS/mbed_hal/common_tickers_freq/ticker_api_test_freq.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/crc/crc_api_tests.h b/TESTS/mbed_hal/crc/crc_api_tests.h
index c35ac0ae76..cedd4e1558 100644
--- a/TESTS/mbed_hal/crc/crc_api_tests.h
+++ b/TESTS/mbed_hal/crc/crc_api_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/crc/main.cpp b/TESTS/mbed_hal/crc/main.cpp
index 2bd3b5a3b5..58ac7d23f2 100644
--- a/TESTS/mbed_hal/crc/main.cpp
+++ b/TESTS/mbed_hal/crc/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/critical_section/critical_section_test.h b/TESTS/mbed_hal/critical_section/critical_section_test.h
index ea056f9dea..d3b882a898 100644
--- a/TESTS/mbed_hal/critical_section/critical_section_test.h
+++ b/TESTS/mbed_hal/critical_section/critical_section_test.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/critical_section/main.cpp b/TESTS/mbed_hal/critical_section/main.cpp
index 22f543fb38..eb70768d86 100644
--- a/TESTS/mbed_hal/critical_section/main.cpp
+++ b/TESTS/mbed_hal/critical_section/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/flash/functional_tests/main.cpp b/TESTS/mbed_hal/flash/functional_tests/main.cpp
index 0ec95b5e54..34063d4a61 100644
--- a/TESTS/mbed_hal/flash/functional_tests/main.cpp
+++ b/TESTS/mbed_hal/flash/functional_tests/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/lp_ticker/lp_ticker_api_tests.h b/TESTS/mbed_hal/lp_ticker/lp_ticker_api_tests.h
index 34942d2810..0fbb3a5338 100644
--- a/TESTS/mbed_hal/lp_ticker/lp_ticker_api_tests.h
+++ b/TESTS/mbed_hal/lp_ticker/lp_ticker_api_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/lp_ticker/main.cpp b/TESTS/mbed_hal/lp_ticker/main.cpp
index ffe6456797..ba536b87ba 100644
--- a/TESTS/mbed_hal/lp_ticker/main.cpp
+++ b/TESTS/mbed_hal/lp_ticker/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/minimum_requirements/main.cpp b/TESTS/mbed_hal/minimum_requirements/main.cpp
index ac8bdb0e6d..3e58adf902 100644
--- a/TESTS/mbed_hal/minimum_requirements/main.cpp
+++ b/TESTS/mbed_hal/minimum_requirements/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/mpu/main.cpp b/TESTS/mbed_hal/mpu/main.cpp
index a479d5c48a..fe79ccbaea 100644
--- a/TESTS/mbed_hal/mpu/main.cpp
+++ b/TESTS/mbed_hal/mpu/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/mpu/mpu_test.h b/TESTS/mbed_hal/mpu/mpu_test.h
index 1230fc8b05..0a916ca48f 100644
--- a/TESTS/mbed_hal/mpu/mpu_test.h
+++ b/TESTS/mbed_hal/mpu/mpu_test.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/pinmap/main.cpp b/TESTS/mbed_hal/pinmap/main.cpp
index 79c600c3b7..553f00bcf0 100644
--- a/TESTS/mbed_hal/pinmap/main.cpp
+++ b/TESTS/mbed_hal/pinmap/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/MX25L51245G_config.h b/TESTS/mbed_hal/qspi/flash_configs/MX25L51245G_config.h
index 8a71a9f37a..6f50ed824c 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/MX25L51245G_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/MX25L51245G_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/MX25LM51245G_config.h b/TESTS/mbed_hal/qspi/flash_configs/MX25LM51245G_config.h
index 6002fa7e8d..6957b8f5ed 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/MX25LM51245G_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/MX25LM51245G_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/MX25RXX35F_config.h b/TESTS/mbed_hal/qspi/flash_configs/MX25RXX35F_config.h
index 141dff403a..0119c4f708 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/MX25RXX35F_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/MX25RXX35F_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/N25Q128A_config.h b/TESTS/mbed_hal/qspi/flash_configs/N25Q128A_config.h
index 30590b7c93..30c3bc29f9 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/N25Q128A_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/N25Q128A_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/NORDIC/EP_AGORA/flash_config.h b/TESTS/mbed_hal/qspi/flash_configs/NORDIC/EP_AGORA/flash_config.h
index 93c2636a4c..8fba66edd4 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/NORDIC/EP_AGORA/flash_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/NORDIC/EP_AGORA/flash_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/NORDIC/NRF52840_DK/flash_config.h b/TESTS/mbed_hal/qspi/flash_configs/NORDIC/NRF52840_DK/flash_config.h
index d47d1a47e3..bda5464353 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/NORDIC/NRF52840_DK/flash_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/NORDIC/NRF52840_DK/flash_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/NXP/K82F/flash_config.h b/TESTS/mbed_hal/qspi/flash_configs/NXP/K82F/flash_config.h
index d31af6b399..f0e25fd87b 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/NXP/K82F/flash_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/NXP/K82F/flash_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/NXP/KL82Z/flash_config.h b/TESTS/mbed_hal/qspi/flash_configs/NXP/KL82Z/flash_config.h
index 9cbe04fabe..81d71dae48 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/NXP/KL82Z/flash_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/NXP/KL82Z/flash_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/NXP/LPC546XX/flash_config.h b/TESTS/mbed_hal/qspi/flash_configs/NXP/LPC546XX/flash_config.h
index 33d400a6fc..d0e35410fb 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/NXP/LPC546XX/flash_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/NXP/LPC546XX/flash_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/SiliconLabs/EFM32GG11_STK3701/flash_config.h b/TESTS/mbed_hal/qspi/flash_configs/SiliconLabs/EFM32GG11_STK3701/flash_config.h
index 4380696904..5ff3ddec5f 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/SiliconLabs/EFM32GG11_STK3701/flash_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/SiliconLabs/EFM32GG11_STK3701/flash_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/W25Q32JV_config.h b/TESTS/mbed_hal/qspi/flash_configs/W25Q32JV_config.h
index 619d08bcb4..3ab306b2d1 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/W25Q32JV_config.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/W25Q32JV_config.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/flash_configs/flash_configs.h b/TESTS/mbed_hal/qspi/flash_configs/flash_configs.h
index e09883687c..4cfaa75ecf 100644
--- a/TESTS/mbed_hal/qspi/flash_configs/flash_configs.h
+++ b/TESTS/mbed_hal/qspi/flash_configs/flash_configs.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/main.cpp b/TESTS/mbed_hal/qspi/main.cpp
index 721d32e2ab..4259f6171b 100644
--- a/TESTS/mbed_hal/qspi/main.cpp
+++ b/TESTS/mbed_hal/qspi/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/qspi_test.h b/TESTS/mbed_hal/qspi/qspi_test.h
index 0b3244e965..61c3dc7257 100644
--- a/TESTS/mbed_hal/qspi/qspi_test.h
+++ b/TESTS/mbed_hal/qspi/qspi_test.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/qspi_test_utils.cpp b/TESTS/mbed_hal/qspi/qspi_test_utils.cpp
index 4fb49f409d..4c69f92f3b 100644
--- a/TESTS/mbed_hal/qspi/qspi_test_utils.cpp
+++ b/TESTS/mbed_hal/qspi/qspi_test_utils.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/qspi/qspi_test_utils.h b/TESTS/mbed_hal/qspi/qspi_test_utils.h
index 08f16f42c9..1e2efc9df9 100644
--- a/TESTS/mbed_hal/qspi/qspi_test_utils.h
+++ b/TESTS/mbed_hal/qspi/qspi_test_utils.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/rtc/main.cpp b/TESTS/mbed_hal/rtc/main.cpp
index 328a051f69..0fb0911dc9 100644
--- a/TESTS/mbed_hal/rtc/main.cpp
+++ b/TESTS/mbed_hal/rtc/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/rtc/rtc_test.h b/TESTS/mbed_hal/rtc/rtc_test.h
index b0b529a460..eb75995d5c 100644
--- a/TESTS/mbed_hal/rtc/rtc_test.h
+++ b/TESTS/mbed_hal/rtc/rtc_test.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/rtc_reset/main.cpp b/TESTS/mbed_hal/rtc_reset/main.cpp
index 8d44df14da..ca01b1b5ef 100644
--- a/TESTS/mbed_hal/rtc_reset/main.cpp
+++ b/TESTS/mbed_hal/rtc_reset/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/rtc_reset/rtc_reset_test.h b/TESTS/mbed_hal/rtc_reset/rtc_reset_test.h
index 4f14e98b87..66dfc53ccd 100644
--- a/TESTS/mbed_hal/rtc_reset/rtc_reset_test.h
+++ b/TESTS/mbed_hal/rtc_reset/rtc_reset_test.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/rtc_time/main.cpp b/TESTS/mbed_hal/rtc_time/main.cpp
index caf6ba817b..2510418618 100644
--- a/TESTS/mbed_hal/rtc_time/main.cpp
+++ b/TESTS/mbed_hal/rtc_time/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/sleep/main.cpp b/TESTS/mbed_hal/sleep/main.cpp
index c8f2b34d6d..c4880f3864 100644
--- a/TESTS/mbed_hal/sleep/main.cpp
+++ b/TESTS/mbed_hal/sleep/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/sleep/sleep_api_tests.h b/TESTS/mbed_hal/sleep/sleep_api_tests.h
index 6a48a98db5..2e056af9b6 100644
--- a/TESTS/mbed_hal/sleep/sleep_api_tests.h
+++ b/TESTS/mbed_hal/sleep/sleep_api_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/sleep/sleep_test_utils.h b/TESTS/mbed_hal/sleep/sleep_test_utils.h
index 8ed08fc7dd..e9e3de72ba 100644
--- a/TESTS/mbed_hal/sleep/sleep_test_utils.h
+++ b/TESTS/mbed_hal/sleep/sleep_test_utils.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/sleep_manager/main.cpp b/TESTS/mbed_hal/sleep_manager/main.cpp
index b3ed644fa4..b73b970773 100644
--- a/TESTS/mbed_hal/sleep_manager/main.cpp
+++ b/TESTS/mbed_hal/sleep_manager/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/sleep_manager/sleep_manager_api_tests.h b/TESTS/mbed_hal/sleep_manager/sleep_manager_api_tests.h
index 6dce0efadd..dc353d0291 100644
--- a/TESTS/mbed_hal/sleep_manager/sleep_manager_api_tests.h
+++ b/TESTS/mbed_hal/sleep_manager/sleep_manager_api_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/sleep_manager_racecondition/main.cpp b/TESTS/mbed_hal/sleep_manager_racecondition/main.cpp
index 2cce93cf57..034b41cbe4 100644
--- a/TESTS/mbed_hal/sleep_manager_racecondition/main.cpp
+++ b/TESTS/mbed_hal/sleep_manager_racecondition/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/sleep_manager_racecondition/sleep_manager_api_racecondition_tests.h b/TESTS/mbed_hal/sleep_manager_racecondition/sleep_manager_api_racecondition_tests.h
index 343b374e99..5af8c6ade0 100644
--- a/TESTS/mbed_hal/sleep_manager_racecondition/sleep_manager_api_racecondition_tests.h
+++ b/TESTS/mbed_hal/sleep_manager_racecondition/sleep_manager_api_racecondition_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/ticker/main.cpp b/TESTS/mbed_hal/ticker/main.cpp
index 754728cc27..a8db5007ff 100644
--- a/TESTS/mbed_hal/ticker/main.cpp
+++ b/TESTS/mbed_hal/ticker/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/trng/pithy/pithy.c b/TESTS/mbed_hal/trng/pithy/pithy.c
index a17091d85a..d0581d8440 100644
--- a/TESTS/mbed_hal/trng/pithy/pithy.c
+++ b/TESTS/mbed_hal/trng/pithy/pithy.c
@@ -3,6 +3,7 @@
 //  http://github.com/johnezang/pithy
 //  Licensed under the terms of the BSD License, as specified below.
 //
+// SPDX-License-Identifier: BSD-3-Clause
 
 /*
  Copyright (c) 2011, John Engelhart
diff --git a/TESTS/mbed_hal/trng/pithy/pithy.h b/TESTS/mbed_hal/trng/pithy/pithy.h
index 57fff97088..056ae1aebb 100644
--- a/TESTS/mbed_hal/trng/pithy/pithy.h
+++ b/TESTS/mbed_hal/trng/pithy/pithy.h
@@ -3,6 +3,7 @@
 //  http://github.com/johnezang/pithy
 //  Licensed under the terms of the BSD License, as specified below.
 //
+// SPDX-License-Identifier: BSD-3-Clause
 
 /*
  Copyright (c) 2011, John Engelhart
diff --git a/TESTS/mbed_hal/us_ticker/main.cpp b/TESTS/mbed_hal/us_ticker/main.cpp
index a9507cc605..976b38f5ed 100644
--- a/TESTS/mbed_hal/us_ticker/main.cpp
+++ b/TESTS/mbed_hal/us_ticker/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_hal/us_ticker/us_ticker_api_tests.h b/TESTS/mbed_hal/us_ticker/us_ticker_api_tests.h
index 9bb899559d..4cfe203f7c 100644
--- a/TESTS/mbed_hal/us_ticker/us_ticker_api_tests.h
+++ b/TESTS/mbed_hal/us_ticker/us_ticker_api_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/CircularBuffer/main.cpp b/TESTS/mbed_platform/CircularBuffer/main.cpp
index 418194fc37..74c4816f68 100644
--- a/TESTS/mbed_platform/CircularBuffer/main.cpp
+++ b/TESTS/mbed_platform/CircularBuffer/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/FileHandle/TestFile.h b/TESTS/mbed_platform/FileHandle/TestFile.h
index cca56c5bcf..c99d8cc2fa 100644
--- a/TESTS/mbed_platform/FileHandle/TestFile.h
+++ b/TESTS/mbed_platform/FileHandle/TestFile.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/FileHandle/main.cpp b/TESTS/mbed_platform/FileHandle/main.cpp
index ff38bb21b6..4efd8f4a55 100644
--- a/TESTS/mbed_platform/FileHandle/main.cpp
+++ b/TESTS/mbed_platform/FileHandle/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/SharedPtr/main.cpp b/TESTS/mbed_platform/SharedPtr/main.cpp
index 35d40e48b1..f1321ee4a1 100644
--- a/TESTS/mbed_platform/SharedPtr/main.cpp
+++ b/TESTS/mbed_platform/SharedPtr/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/SingletonPtr/main.cpp b/TESTS/mbed_platform/SingletonPtr/main.cpp
index 80813ebc9a..9a59bda2bd 100644
--- a/TESTS/mbed_platform/SingletonPtr/main.cpp
+++ b/TESTS/mbed_platform/SingletonPtr/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/Stream/main.cpp b/TESTS/mbed_platform/Stream/main.cpp
index 288be0aff0..7aa4b51121 100644
--- a/TESTS/mbed_platform/Stream/main.cpp
+++ b/TESTS/mbed_platform/Stream/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/Transaction/main.cpp b/TESTS/mbed_platform/Transaction/main.cpp
index 46eb5768be..77346f5f67 100644
--- a/TESTS/mbed_platform/Transaction/main.cpp
+++ b/TESTS/mbed_platform/Transaction/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/atomic/main.cpp b/TESTS/mbed_platform/atomic/main.cpp
index 10c19ce0d3..ed223738ee 100644
--- a/TESTS/mbed_platform/atomic/main.cpp
+++ b/TESTS/mbed_platform/atomic/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/crash_reporting/main.cpp b/TESTS/mbed_platform/crash_reporting/main.cpp
index 3f3260b5f2..6e5d052bc4 100644
--- a/TESTS/mbed_platform/crash_reporting/main.cpp
+++ b/TESTS/mbed_platform/crash_reporting/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/critical_section/main.cpp b/TESTS/mbed_platform/critical_section/main.cpp
index 3a30f915e3..0fec9d113d 100644
--- a/TESTS/mbed_platform/critical_section/main.cpp
+++ b/TESTS/mbed_platform/critical_section/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/error_handling/main.cpp b/TESTS/mbed_platform/error_handling/main.cpp
index aecbad8e02..cb97eb0c72 100644
--- a/TESTS/mbed_platform/error_handling/main.cpp
+++ b/TESTS/mbed_platform/error_handling/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/minimal-printf/compliance/main.cpp b/TESTS/mbed_platform/minimal-printf/compliance/main.cpp
index a9beda9fec..c8322309c6 100644
--- a/TESTS/mbed_platform/minimal-printf/compliance/main.cpp
+++ b/TESTS/mbed_platform/minimal-printf/compliance/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.c b/TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.c
index cd3f15d138..ac393712cb 100644
--- a/TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.c
+++ b/TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.c
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.h b/TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.h
index 4f44de7534..7e9a8c70af 100644
--- a/TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.h
+++ b/TESTS/mbed_platform/minimal-printf/compliance/mbed_printf.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/stats_cpu/main.cpp b/TESTS/mbed_platform/stats_cpu/main.cpp
index 1a3818293d..85c2a4af4b 100644
--- a/TESTS/mbed_platform/stats_cpu/main.cpp
+++ b/TESTS/mbed_platform/stats_cpu/main.cpp
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/stats_sys/main.cpp b/TESTS/mbed_platform/stats_sys/main.cpp
index d0f58cc9c7..2ed7424e28 100644
--- a/TESTS/mbed_platform/stats_sys/main.cpp
+++ b/TESTS/mbed_platform/stats_sys/main.cpp
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/stats_thread/main.cpp b/TESTS/mbed_platform/stats_thread/main.cpp
index 648e45bf1f..f1e386a9e2 100644
--- a/TESTS/mbed_platform/stats_thread/main.cpp
+++ b/TESTS/mbed_platform/stats_thread/main.cpp
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbed_platform/system_reset/main.cpp b/TESTS/mbed_platform/system_reset/main.cpp
index e611ebf0eb..f1f00e71b4 100644
--- a/TESTS/mbed_platform/system_reset/main.cpp
+++ b/TESTS/mbed_platform/system_reset/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-mbed/attributes/main.cpp b/TESTS/mbedmicro-mbed/attributes/main.cpp
index bb84b9dba6..bab0b817c6 100644
--- a/TESTS/mbedmicro-mbed/attributes/main.cpp
+++ b/TESTS/mbedmicro-mbed/attributes/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-mbed/static_assert/main.cpp b/TESTS/mbedmicro-mbed/static_assert/main.cpp
index dd963e0c25..87cd6dc1fa 100644
--- a/TESTS/mbedmicro-mbed/static_assert/main.cpp
+++ b/TESTS/mbedmicro-mbed/static_assert/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/MemoryPool/main.cpp b/TESTS/mbedmicro-rtos-mbed/MemoryPool/main.cpp
index 708373f78b..5c828277ce 100644
--- a/TESTS/mbedmicro-rtos-mbed/MemoryPool/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/MemoryPool/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/condition_variable/main.cpp b/TESTS/mbedmicro-rtos-mbed/condition_variable/main.cpp
index 800267af3c..4372f46240 100644
--- a/TESTS/mbedmicro-rtos-mbed/condition_variable/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/condition_variable/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp b/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp
index cd018d1b88..f595159338 100644
--- a/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/kernel_tick_count/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/mail/main.cpp b/TESTS/mbedmicro-rtos-mbed/mail/main.cpp
index b772a2641b..5bf0bf3d6d 100644
--- a/TESTS/mbedmicro-rtos-mbed/mail/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/mail/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp b/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp
index ea5aa12e20..bc8678fb91 100644
--- a/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/malloc/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/mutex/main.cpp b/TESTS/mbedmicro-rtos-mbed/mutex/main.cpp
index e48f99304a..f90dd0bdd6 100644
--- a/TESTS/mbedmicro-rtos-mbed/mutex/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/mutex/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/queue/main.cpp b/TESTS/mbedmicro-rtos-mbed/queue/main.cpp
index 74aeeec6b8..8de9fc78fb 100644
--- a/TESTS/mbedmicro-rtos-mbed/queue/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/queue/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -350,4 +351,4 @@ int main()
 }
 
 #endif // !DEVICE_USTICKER
-#endif // defined(MBED_RTOS_SINGLE_THREAD) || !defined(MBED_CONF_RTOS_PRESENT)
\ No newline at end of file
+#endif // defined(MBED_RTOS_SINGLE_THREAD) || !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/TESTS/mbedmicro-rtos-mbed/rtostimer/main.cpp b/TESTS/mbedmicro-rtos-mbed/rtostimer/main.cpp
index d1c0d35b5f..822d396e39 100644
--- a/TESTS/mbedmicro-rtos-mbed/rtostimer/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/rtostimer/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/semaphore/main.cpp b/TESTS/mbedmicro-rtos-mbed/semaphore/main.cpp
index 8d5646ef22..ff06ca179c 100644
--- a/TESTS/mbedmicro-rtos-mbed/semaphore/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/semaphore/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/signals/main.cpp b/TESTS/mbedmicro-rtos-mbed/signals/main.cpp
index 94127560a2..1418bd2c8f 100644
--- a/TESTS/mbedmicro-rtos-mbed/signals/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/signals/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp b/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
index 9cd168b0a4..69d3def634 100644
--- a/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/systimer/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TESTS/mbedmicro-rtos-mbed/threads/main.cpp b/TESTS/mbedmicro-rtos-mbed/threads/main.cpp
index 30f0855a32..cc87b30b42 100644
--- a/TESTS/mbedmicro-rtos-mbed/threads/main.cpp
+++ b/TESTS/mbedmicro-rtos-mbed/threads/main.cpp
@@ -1,6 +1,7 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
  *
+ * SPDX-License-Identifier: Apache-2.0
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/TESTS/mbedtls/selftest/main.cpp b/TESTS/mbedtls/selftest/main.cpp
index 0398dd0cb0..207681ca74 100644
--- a/TESTS/mbedtls/selftest/main.cpp
+++ b/TESTS/mbedtls/selftest/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/TEST_APPS/__init__.py b/TEST_APPS/__init__.py
index e69de29bb2..11867b5685 100644
--- a/TEST_APPS/__init__.py
+++ b/TEST_APPS/__init__.py
@@ -0,0 +1,16 @@
+"""
+Copyright (c) 2020 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
diff --git a/TEST_APPS/icetea_plugins/__init__.py b/TEST_APPS/icetea_plugins/__init__.py
index e69de29bb2..b09b705cde 100644
--- a/TEST_APPS/icetea_plugins/__init__.py
+++ b/TEST_APPS/icetea_plugins/__init__.py
@@ -0,0 +1,16 @@
+"""
+Copyright (c) 2020 Arm Limited
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
diff --git a/TEST_APPS/icetea_plugins/ip_test_parsers.py b/TEST_APPS/icetea_plugins/ip_test_parsers.py
index 79794be0a8..7f215be8d7 100644
--- a/TEST_APPS/icetea_plugins/ip_test_parsers.py
+++ b/TEST_APPS/icetea_plugins/ip_test_parsers.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TEST_APPS/icetea_plugins/nfc_test_parsers.py b/TEST_APPS/icetea_plugins/nfc_test_parsers.py
index 982f75f6f3..633ced1542 100644
--- a/TEST_APPS/icetea_plugins/nfc_test_parsers.py
+++ b/TEST_APPS/icetea_plugins/nfc_test_parsers.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TEST_APPS/icetea_plugins/plugins_to_load.py b/TEST_APPS/icetea_plugins/plugins_to_load.py
index 3cd4358450..bc8b9be74a 100644
--- a/TEST_APPS/icetea_plugins/plugins_to_load.py
+++ b/TEST_APPS/icetea_plugins/plugins_to_load.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TEST_APPS/testcases/__init__.py b/TEST_APPS/testcases/__init__.py
index e69de29bb2..b09b705cde 100644
--- a/TEST_APPS/testcases/__init__.py
+++ b/TEST_APPS/testcases/__init__.py
@@ -0,0 +1,16 @@
+"""
+Copyright (c) 2020 Arm Limited
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
diff --git a/TEST_APPS/testcases/example/__init__.py b/TEST_APPS/testcases/example/__init__.py
index e69de29bb2..b09b705cde 100644
--- a/TEST_APPS/testcases/example/__init__.py
+++ b/TEST_APPS/testcases/example/__init__.py
@@ -0,0 +1,16 @@
+"""
+Copyright (c) 2020 Arm Limited
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
diff --git a/TEST_APPS/testcases/example/test_cmdline.py b/TEST_APPS/testcases/example/test_cmdline.py
index 52a22e9202..6988f0b0ca 100644
--- a/TEST_APPS/testcases/example/test_cmdline.py
+++ b/TEST_APPS/testcases/example/test_cmdline.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TEST_APPS/testcases/nanostack_mac_tester/__init__.py b/TEST_APPS/testcases/nanostack_mac_tester/__init__.py
index 4265cc3e6c..7473ca9ad4 100644
--- a/TEST_APPS/testcases/nanostack_mac_tester/__init__.py
+++ b/TEST_APPS/testcases/nanostack_mac_tester/__init__.py
@@ -1 +1,17 @@
 #!/usr/bin/env python
+"""
+Copyright (c) 2020 Arm Limited
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
diff --git a/TEST_APPS/testcases/netsocket/SOCKET_BIND_PORT.py b/TEST_APPS/testcases/netsocket/SOCKET_BIND_PORT.py
index a0d300d7b6..d7d9d199d9 100644
--- a/TEST_APPS/testcases/netsocket/SOCKET_BIND_PORT.py
+++ b/TEST_APPS/testcases/netsocket/SOCKET_BIND_PORT.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TEST_APPS/testcases/netsocket/TCPSERVER_ACCEPT.py b/TEST_APPS/testcases/netsocket/TCPSERVER_ACCEPT.py
index d5d2124251..e8080bd591 100644
--- a/TEST_APPS/testcases/netsocket/TCPSERVER_ACCEPT.py
+++ b/TEST_APPS/testcases/netsocket/TCPSERVER_ACCEPT.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TEST_APPS/testcases/netsocket/TCPSOCKET_ACCEPT.py b/TEST_APPS/testcases/netsocket/TCPSOCKET_ACCEPT.py
index 49cee2ff1e..e002b35ee2 100644
--- a/TEST_APPS/testcases/netsocket/TCPSOCKET_ACCEPT.py
+++ b/TEST_APPS/testcases/netsocket/TCPSOCKET_ACCEPT.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TEST_APPS/testcases/netsocket/TCPSOCKET_ECHOTEST_BURST_SHORT.py b/TEST_APPS/testcases/netsocket/TCPSOCKET_ECHOTEST_BURST_SHORT.py
index 521db0e516..1acb656e7a 100644
--- a/TEST_APPS/testcases/netsocket/TCPSOCKET_ECHOTEST_BURST_SHORT.py
+++ b/TEST_APPS/testcases/netsocket/TCPSOCKET_ECHOTEST_BURST_SHORT.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TEST_APPS/testcases/netsocket/__init__.py b/TEST_APPS/testcases/netsocket/__init__.py
index e69de29bb2..b09b705cde 100644
--- a/TEST_APPS/testcases/netsocket/__init__.py
+++ b/TEST_APPS/testcases/netsocket/__init__.py
@@ -0,0 +1,16 @@
+"""
+Copyright (c) 2020 Arm Limited
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
diff --git a/TEST_APPS/testcases/netsocket/interface.py b/TEST_APPS/testcases/netsocket/interface.py
index db81636ec3..1bf6670994 100644
--- a/TEST_APPS/testcases/netsocket/interface.py
+++ b/TEST_APPS/testcases/netsocket/interface.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/TEST_APPS/testcases/nfc/__init__.py b/TEST_APPS/testcases/nfc/__init__.py
index e69de29bb2..b09b705cde 100644
--- a/TEST_APPS/testcases/nfc/__init__.py
+++ b/TEST_APPS/testcases/nfc/__init__.py
@@ -0,0 +1,16 @@
+"""
+Copyright (c) 2020 Arm Limited
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
diff --git a/UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h b/UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h
index 35a88ad771..4f9ce6b96c 100644
--- a/UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h
+++ b/UNITTESTS/features/netsocket/TLSSocket/tls_test_config.h
@@ -1,5 +1,18 @@
 /*
- * tls_test_config.h
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #ifndef UNITTESTS_FEATURES_NETSOCKET_TLSSOCKET_TLS_TEST_CONFIG_H_
diff --git a/UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h b/UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h
index 35a88ad771..4f9ce6b96c 100644
--- a/UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h
+++ b/UNITTESTS/features/netsocket/TLSSocketWrapper/tls_test_config.h
@@ -1,5 +1,18 @@
 /*
- * tls_test_config.h
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 #ifndef UNITTESTS_FEATURES_NETSOCKET_TLSSOCKET_TLS_TEST_CONFIG_H_
diff --git a/UNITTESTS/stubs/CellularInterface_stub.cpp b/UNITTESTS/stubs/CellularInterface_stub.cpp
index aea3e9671d..27a49868ee 100644
--- a/UNITTESTS/stubs/CellularInterface_stub.cpp
+++ b/UNITTESTS/stubs/CellularInterface_stub.cpp
@@ -1,5 +1,6 @@
 /* Socket
  * Copyright (c) 2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/UNITTESTS/stubs/MeshInterface_stub.cpp b/UNITTESTS/stubs/MeshInterface_stub.cpp
index 039ba866f1..dd504e54f8 100644
--- a/UNITTESTS/stubs/MeshInterface_stub.cpp
+++ b/UNITTESTS/stubs/MeshInterface_stub.cpp
@@ -1,5 +1,6 @@
 /* Socket
  * Copyright (c) 2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/UNITTESTS/stubs/SocketStats_Stub.cpp b/UNITTESTS/stubs/SocketStats_Stub.cpp
index b22ac5286e..c3fcd2340b 100644
--- a/UNITTESTS/stubs/SocketStats_Stub.cpp
+++ b/UNITTESTS/stubs/SocketStats_Stub.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/UNITTESTS/stubs/mbed_error.c b/UNITTESTS/stubs/mbed_error.c
index eb0f0b68d9..ec39fc5833 100644
--- a/UNITTESTS/stubs/mbed_error.c
+++ b/UNITTESTS/stubs/mbed_error.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 int mbed_error(int error_status, const char *error_msg, unsigned int error_value, const char *filename, int line_number)
 {
diff --git a/UNITTESTS/stubs/pwmout_api_stub.c b/UNITTESTS/stubs/pwmout_api_stub.c
index 0c2e3219bc..cf9cce8f99 100644
--- a/UNITTESTS/stubs/pwmout_api_stub.c
+++ b/UNITTESTS/stubs/pwmout_api_stub.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/UNITTESTS/stubs/watchdog_api_stub.c b/UNITTESTS/stubs/watchdog_api_stub.c
index 666144a3e8..78e0802316 100644
--- a/UNITTESTS/stubs/watchdog_api_stub.c
+++ b/UNITTESTS/stubs/watchdog_api_stub.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018-2019 Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/UNITTESTS/target_h/platform/mbed_wait_api.h b/UNITTESTS/target_h/platform/mbed_wait_api.h
index e6b21b44e1..c3ba10698c 100644
--- a/UNITTESTS/target_h/platform/mbed_wait_api.h
+++ b/UNITTESTS/target_h/platform/mbed_wait_api.h
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/UNITTESTS/target_h/rtos/Thread.h b/UNITTESTS/target_h/rtos/Thread.h
index c0e3ba9d74..49a7805781 100644
--- a/UNITTESTS/target_h/rtos/Thread.h
+++ b/UNITTESTS/target_h/rtos/Thread.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/UNITTESTS/template/test_template.cpp b/UNITTESTS/template/test_template.cpp
index a4aa66123b..f046b40eb6 100644
--- a/UNITTESTS/template/test_template.cpp
+++ b/UNITTESTS/template/test_template.cpp
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include "gtest/gtest.h"
 #include "dirname/template.h"
 
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.c b/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.c
index 90633a0205..7d658ef633 100644
--- a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.c
+++ b/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.c
@@ -1,6 +1,7 @@
 /*!
 * Copyright (c) 2015, Freescale Semiconductor, Inc.
 * All rights reserved.
+* SPDX-License-Identifier: BSD-3-Clause
 *
 * \file MCR20Drv.c
 *
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.h b/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.h
index c2d013eb52..bcbe6dcd53 100644
--- a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.h
+++ b/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Drv.h
@@ -1,6 +1,7 @@
 /*!
 * Copyright (c) 2015, Freescale Semiconductor, Inc.
 * All rights reserved.
+* SPDX-License-Identifier: BSD-3-Clause
 *
 * \file MCR20Drv.h
 *
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Overwrites.h b/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Overwrites.h
index 3b2c063f3f..af1f99f7dc 100644
--- a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Overwrites.h
+++ b/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Overwrites.h
@@ -1,6 +1,7 @@
 /*!
 * Copyright (c) 2015, Freescale Semiconductor, Inc.
 * All rights reserved.
+* SPDX-License-Identifier: BSD-3-Clause
 *
 * \file MCR20Overwrites.h
 * Description: Overwrites header file for MCR20 Register values
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Reg.h b/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Reg.h
index 96410c9a9c..a42b31bcc0 100644
--- a/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Reg.h
+++ b/components/802.15.4_RF/mcr20a-rf-driver/source/MCR20Reg.h
@@ -1,6 +1,7 @@
 /*!
 * Copyright (c) 2015, Freescale Semiconductor, Inc.
 * All rights reserved.
+* SPDX-License-Identifier: BSD-3-Clause
 *
 * \file MCR20reg.h
 * MCR20 Registers
diff --git a/components/802.15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h b/components/802.15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h
index 9f1a1f71be..5b2f12b7eb 100644
--- a/components/802.15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h
+++ b/components/802.15.4_RF/mcr20a-rf-driver/source/XcvrSpi.h
@@ -1,6 +1,7 @@
 /*!
 * Copyright (c) 2015, Freescale Semiconductor, Inc.
 * All rights reserved.
+* SPDX-License-Identifier: BSD-3-Clause
 *
 * \file XcvrSpi.h
 *
diff --git a/components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c b/components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c
index 893da7cbe7..2bdbffd0f0 100644
--- a/components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_attestation/test_a001/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c
index ce0cca197e..2ab834305b 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s001/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c
index e22458371e..46729ac99e 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s002/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 #include "lifecycle.h"
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s003/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s003/main.c
index a25994c3c4..fc7328cfc8 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s003/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s003/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 #include "lifecycle.h"
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c
index d3ac176d2c..20a623ee69 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s004/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 #if !defined(MBED_CONF_RTOS_PRESENT)
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c
index b1ff1589a0..b15f5313e6 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s005/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c
index 9b4b485b4e..1a24de70b0 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s006/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c
index c903e268db..a63001e55c 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s007/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c
index a24935119c..b17f6cf8b9 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s008/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c
index b5575cdb3f..74a6ddb022 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s009/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
diff --git a/components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c b/components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c
index d71e401396..c9f0728859 100644
--- a/components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c
+++ b/components/TARGET_PSA/TESTS/compliance_its/test_s010/main.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "val_interfaces.h"
 #include "pal_mbed_os_intf.h"
 
diff --git a/components/TARGET_PSA/services/attestation/qcbor/inc/qcbor.h b/components/TARGET_PSA/services/attestation/qcbor/inc/qcbor.h
index 3011cc6fa1..f050988845 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/inc/qcbor.h
+++ b/components/TARGET_PSA/services/attestation/qcbor/inc/qcbor.h
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018-2019, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/attestation/qcbor/src/UsefulBuf.c b/components/TARGET_PSA/services/attestation/qcbor/src/UsefulBuf.c
index 5a7d37befd..d02708b82e 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/src/UsefulBuf.c
+++ b/components/TARGET_PSA/services/attestation/qcbor/src/UsefulBuf.c
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018-2019, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/attestation/qcbor/src/qcbor_decode.c b/components/TARGET_PSA/services/attestation/qcbor/src/qcbor_decode.c
index 22860382de..2cfb130141 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/src/qcbor_decode.c
+++ b/components/TARGET_PSA/services/attestation/qcbor/src/qcbor_decode.c
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018-2019, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/attestation/qcbor/src/qcbor_encode.c b/components/TARGET_PSA/services/attestation/qcbor/src/qcbor_encode.c
index 460dd8520d..d18d811c8c 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/src/qcbor_encode.c
+++ b/components/TARGET_PSA/services/attestation/qcbor/src/qcbor_encode.c
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018-2019, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/attestation/qcbor/test/UsefulBuf_Tests.c b/components/TARGET_PSA/services/attestation/qcbor/test/UsefulBuf_Tests.c
index aa7e638e36..c0568b45d7 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/test/UsefulBuf_Tests.c
+++ b/components/TARGET_PSA/services/attestation/qcbor/test/UsefulBuf_Tests.c
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018-2019, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/attestation/qcbor/test/UsefulBuf_Tests.h b/components/TARGET_PSA/services/attestation/qcbor/test/UsefulBuf_Tests.h
index 976de621d6..d85b951f4f 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/test/UsefulBuf_Tests.h
+++ b/components/TARGET_PSA/services/attestation/qcbor/test/UsefulBuf_Tests.h
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/attestation/qcbor/test/half_to_double_from_rfc7049.c b/components/TARGET_PSA/services/attestation/qcbor/test/half_to_double_from_rfc7049.c
index 6380e519a9..4d8fb674ea 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/test/half_to_double_from_rfc7049.c
+++ b/components/TARGET_PSA/services/attestation/qcbor/test/half_to_double_from_rfc7049.c
@@ -1,4 +1,5 @@
 /*
+ SPDX-License-Identifier: BSD-2-Clause
 
  Copyright (c) 2013 IETF Trust and the persons identified as the
  document authors.  All rights reserved.
diff --git a/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_decode_tests.c b/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_decode_tests.c
index 38005c03f3..9ffc3a09ff 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_decode_tests.c
+++ b/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_decode_tests.c
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018-2019, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_decode_tests.h b/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_decode_tests.h
index 2b09c55d56..cbd352eb51 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_decode_tests.h
+++ b/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_decode_tests.h
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018-2019, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_encode_tests.c b/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_encode_tests.c
index 2a22cf1bd9..ca46460c28 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_encode_tests.c
+++ b/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_encode_tests.c
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018-2019, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_encode_tests.h b/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_encode_tests.h
index 33703d831a..49362c643c 100644
--- a/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_encode_tests.h
+++ b/components/TARGET_PSA/services/attestation/qcbor/test/qcbor_encode_tests.h
@@ -2,6 +2,7 @@
  Copyright (c) 2016-2018, The Linux Foundation.
  Copyright (c) 2018-2019, Laurence Lundblade.
  All rights reserved.
+ SPDX-License-Identifier: BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/crypto_struct.h b/components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/crypto_struct.h
index 7e39d48880..9ffa1f7a37 100644
--- a/components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/crypto_struct.h
+++ b/components/TARGET_PSA/services/crypto/COMPONENT_PSA_SRV_IPC/crypto_struct.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #ifdef PSA_CRYPTO_SECURE
 #include "crypto_struct_spe.h"
 #else
diff --git a/components/TARGET_PSA/services/crypto/COMPONENT_SPE/crypto_spe.h b/components/TARGET_PSA/services/crypto/COMPONENT_SPE/crypto_spe.h
index be55586abd..46efdf8cd0 100644
--- a/components/TARGET_PSA/services/crypto/COMPONENT_SPE/crypto_spe.h
+++ b/components/TARGET_PSA/services/crypto/COMPONENT_SPE/crypto_spe.h
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 /**
  * \file psa/crypto_spe.h
  * \brief Platform Security Architecture cryptography module
diff --git a/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c b/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c
index 581f343b72..11516a1086 100644
--- a/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c
+++ b/components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 // ---------------------------------- Includes ---------------------------------
 #include <stdint.h>
 #include <string.h>
diff --git a/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
index df859bc7f4..8ab0737482 100644
--- a/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
+++ b/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h b/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h
index 9c685397ab..4ab034850d 100644
--- a/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h
+++ b/components/storage/blockdevice/COMPONENT_DATAFLASH/DataFlashBlockDevice.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h
index 80a872f97f..ec5673392a 100644
--- a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h
+++ b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_debug.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c
index 8c2c22fb9d..cb4a61bd9d 100644
--- a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c
+++ b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.c
@@ -2,6 +2,7 @@
  *
  * mbed Microcontroller Library
  * Copyright (c) 2006-2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h
index b54342c556..fb22870ccb 100644
--- a/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h
+++ b/components/storage/blockdevice/COMPONENT_FLASHIAP/COMMON/fslittle_test.h
@@ -2,6 +2,7 @@
  *
  * mbed Microcontroller Library
  * Copyright (c) 2006-2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
index 86c8a0bfe7..68b416ebd9 100644
--- a/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
+++ b/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h b/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
index 98cd805612..ae9e4cca0b 100644
--- a/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
+++ b/components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
index aafc048e6f..11cf6e0433 100644
--- a/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
+++ b/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.cpp
@@ -1,5 +1,6 @@
 /* Simple access class for I2C EEPROM chips like Microchip 24LC
  * Copyright (c) 2015 Robin Hourahane
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h b/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
index 2cf767e8e6..54fc2ad196 100644
--- a/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
+++ b/components/storage/blockdevice/COMPONENT_I2CEE/I2CEEBlockDevice.h
@@ -1,5 +1,6 @@
 /* Simple access class for I2C EEPROM chips like Microchip 24LC
  * Copyright (c) 2015 Robin Hourahane
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp b/components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp
index dd167d1c5d..ac9772c407 100644
--- a/components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp
+++ b/components/storage/blockdevice/COMPONENT_I2CEE/TESTS/block_device/i2cee/main.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2020 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 #include "mbed.h"
 #include "greentea-client/test_env.h"
 #include "unity.h"
diff --git a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
index d82ceaabc0..74e57f9a9d 100644
--- a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
+++ b/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h b/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h
index 13d0f52b5a..d2afbe9e7e 100644
--- a/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h
+++ b/components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_RSPIF/SPIFReducedBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_RSPIF/SPIFReducedBlockDevice.cpp
index 721965dc30..a30f83bdcb 100644
--- a/components/storage/blockdevice/COMPONENT_RSPIF/SPIFReducedBlockDevice.cpp
+++ b/components/storage/blockdevice/COMPONENT_RSPIF/SPIFReducedBlockDevice.cpp
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_RSPIF/SPIFReducedBlockDevice.h b/components/storage/blockdevice/COMPONENT_RSPIF/SPIFReducedBlockDevice.h
index e7434e4c67..e2222a2f7b 100644
--- a/components/storage/blockdevice/COMPONENT_RSPIF/SPIFReducedBlockDevice.h
+++ b/components/storage/blockdevice/COMPONENT_RSPIF/SPIFReducedBlockDevice.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
index 35ac80b5e9..a99335c1f8 100644
--- a/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
+++ b/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2013 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h b/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h
index e55286afa4..16efc52a4f 100644
--- a/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h
+++ b/components/storage/blockdevice/COMPONENT_SD/SDBlockDevice.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2013 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h
index 9d8cedc100..9d6cd9824c 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
index 4a52c3703a..01bdc3908e 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
@@ -2,6 +2,7 @@
  *
  * mbed Microcontroller Library
  * Copyright (c) 2006-2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
index 421c6a2105..4c5441e524 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
@@ -2,6 +2,7 @@
  *
  * mbed Microcontroller Library
  * Copyright (c) 2006-2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp
index 22a0807ab9..3c2c585828 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/dirs/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp
index cf8af3a5be..c660e2d1cd 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/files/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp
index f0bcea0e0d..0cde00f58c 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/fopen/fopen.cpp
@@ -1,6 +1,7 @@
 /*
  * mbed Microcontroller Library
  * Copyright (c) 2006-2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp
index 10b1e94c35..6d77647108 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/parallel/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp
index 999e4a58c8..e2f88b44b5 100644
--- a/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp
+++ b/components/storage/blockdevice/COMPONENT_SD/TESTS/filesystem/seek/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2016 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp b/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
index 18373e1941..68a87d9923 100644
--- a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
+++ b/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h b/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h
index 081c79b535..3d3baf37b3 100644
--- a/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h
+++ b/components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/wifi/esp8266-driver/ESP8266/ESP8266.cpp b/components/wifi/esp8266-driver/ESP8266/ESP8266.cpp
index 07c50c0ed2..fa2676c1b8 100644
--- a/components/wifi/esp8266-driver/ESP8266/ESP8266.cpp
+++ b/components/wifi/esp8266-driver/ESP8266/ESP8266.cpp
@@ -1,5 +1,6 @@
 /* ESP8266 Example
  * Copyright (c) 2015 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/wifi/esp8266-driver/ESP8266/ESP8266.h b/components/wifi/esp8266-driver/ESP8266/ESP8266.h
index 5123e83938..b2601f7dd8 100644
--- a/components/wifi/esp8266-driver/ESP8266/ESP8266.h
+++ b/components/wifi/esp8266-driver/ESP8266/ESP8266.h
@@ -1,5 +1,6 @@
 /* ESP8266Interface Example
  * Copyright (c) 2015 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/wifi/esp8266-driver/ESP8266Interface.cpp b/components/wifi/esp8266-driver/ESP8266Interface.cpp
index b9be381f93..257ce74319 100644
--- a/components/wifi/esp8266-driver/ESP8266Interface.cpp
+++ b/components/wifi/esp8266-driver/ESP8266Interface.cpp
@@ -1,5 +1,6 @@
 /* ESP8266 implementation of NetworkInterfaceAPI
  * Copyright (c) 2015 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/components/wifi/esp8266-driver/ESP8266Interface.h b/components/wifi/esp8266-driver/ESP8266Interface.h
index 764081da05..8ab42f3967 100644
--- a/components/wifi/esp8266-driver/ESP8266Interface.h
+++ b/components/wifi/esp8266-driver/ESP8266Interface.h
@@ -1,5 +1,6 @@
 /* ESP8266 implementation of NetworkInterfaceAPI
  * Copyright (c) 2015 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/drivers/FlashIAP.h b/drivers/FlashIAP.h
index 8797a34f1c..43196e7648 100644
--- a/drivers/FlashIAP.h
+++ b/drivers/FlashIAP.h
@@ -1,6 +1,8 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
  *
+ * SPDX-License-Identifier: MIT
+ *
  * 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
diff --git a/drivers/source/FlashIAP.cpp b/drivers/source/FlashIAP.cpp
index 899e1dbe14..163a345689 100644
--- a/drivers/source/FlashIAP.cpp
+++ b/drivers/source/FlashIAP.cpp
@@ -1,6 +1,8 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2019 ARM Limited
  *
+ * SPDX-License-Identifier: MIT
+ *
  * 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
diff --git a/hal/mpu/mbed_mpu_v7m.c b/hal/mpu/mbed_mpu_v7m.c
index 7b7a7c7259..d80406340e 100644
--- a/hal/mpu/mbed_mpu_v7m.c
+++ b/hal/mpu/mbed_mpu_v7m.c
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/hal/mpu/mbed_mpu_v8m.c b/hal/mpu/mbed_mpu_v8m.c
index 4b992f543d..ccdbd592ac 100644
--- a/hal/mpu/mbed_mpu_v8m.c
+++ b/hal/mpu/mbed_mpu_v8m.c
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/hal/mpu_api.h b/hal/mpu_api.h
index 5ce034779e..95ee8fc9ca 100644
--- a/hal/mpu_api.h
+++ b/hal/mpu_api.h
@@ -3,6 +3,7 @@
 /** @{*/
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/ScopedRamExecutionLock.h b/platform/ScopedRamExecutionLock.h
index abbf106cfe..0f7cadd738 100644
--- a/platform/ScopedRamExecutionLock.h
+++ b/platform/ScopedRamExecutionLock.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/ScopedRomWriteLock.h b/platform/ScopedRomWriteLock.h
index ad1b52e26c..5ebdd12e3a 100644
--- a/platform/ScopedRomWriteLock.h
+++ b/platform/ScopedRomWriteLock.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/mbed_mpu_mgmt.h b/platform/mbed_mpu_mgmt.h
index 34f289165f..01f9e78cf1 100644
--- a/platform/mbed_mpu_mgmt.h
+++ b/platform/mbed_mpu_mgmt.h
@@ -1,5 +1,6 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2019 ARM Limited
+/*
+ * Copyright (c) 2018-2020, Arm Limited and affiliates.
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef MBED_MPU_MGMT_H
 #define MBED_MPU_MGMT_H
 
diff --git a/platform/source/TARGET_CORTEX_M/mbed_fault_handler.c b/platform/source/TARGET_CORTEX_M/mbed_fault_handler.c
index 293742fd89..ce860fc9b0 100644
--- a/platform/source/TARGET_CORTEX_M/mbed_fault_handler.c
+++ b/platform/source/TARGET_CORTEX_M/mbed_fault_handler.c
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/source/TARGET_CORTEX_M/mbed_fault_handler.h b/platform/source/TARGET_CORTEX_M/mbed_fault_handler.h
index 655bce06a8..2df44266a9 100644
--- a/platform/source/TARGET_CORTEX_M/mbed_fault_handler.h
+++ b/platform/source/TARGET_CORTEX_M/mbed_fault_handler.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2018 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/source/mbed_crash_data_offsets.h b/platform/source/mbed_crash_data_offsets.h
index c29f5cd3d8..41c9c59acc 100644
--- a/platform/source/mbed_crash_data_offsets.h
+++ b/platform/source/mbed_crash_data_offsets.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/source/mbed_mpu_mgmt.c b/platform/source/mbed_mpu_mgmt.c
index ebdfb2d5fa..0e050d86ae 100644
--- a/platform/source/mbed_mpu_mgmt.c
+++ b/platform/source/mbed_mpu_mgmt.c
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2018-2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/source/minimal-printf/mbed_printf_armlink_overrides.c b/platform/source/minimal-printf/mbed_printf_armlink_overrides.c
index ca7201db40..02a7ce8cd0 100644
--- a/platform/source/minimal-printf/mbed_printf_armlink_overrides.c
+++ b/platform/source/minimal-printf/mbed_printf_armlink_overrides.c
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2019 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -387,4 +388,4 @@ int $Sub$$_printf_x(const char *format, ...)
 
 #endif
 
-#endif // MBED_MINIMAL_PRINTF
\ No newline at end of file
+#endif // MBED_MINIMAL_PRINTF
diff --git a/platform/source/minimal-printf/mbed_printf_implementation.c b/platform/source/minimal-printf/mbed_printf_implementation.c
index ebe665e595..428ef3bbd4 100644
--- a/platform/source/minimal-printf/mbed_printf_implementation.c
+++ b/platform/source/minimal-printf/mbed_printf_implementation.c
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/source/minimal-printf/mbed_printf_implementation.h b/platform/source/minimal-printf/mbed_printf_implementation.h
index 2017b1db7a..411893c97d 100644
--- a/platform/source/minimal-printf/mbed_printf_implementation.h
+++ b/platform/source/minimal-printf/mbed_printf_implementation.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/platform/source/minimal-printf/mbed_printf_wrapper.c b/platform/source/minimal-printf/mbed_printf_wrapper.c
index f50cf52c03..04a4c399f5 100644
--- a/platform/source/minimal-printf/mbed_printf_wrapper.c
+++ b/platform/source/minimal-printf/mbed_printf_wrapper.c
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/rtos/ConditionVariable.h b/rtos/ConditionVariable.h
index f76b16dfcd..9f433f5a69 100644
--- a/rtos/ConditionVariable.h
+++ b/rtos/ConditionVariable.h
@@ -1,5 +1,6 @@
 /* Mbed Microcontroller Library
  * Copyright (c) 2017-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/EventFlags.h b/rtos/EventFlags.h
index 6ab38272c9..2e8a81f63b 100644
--- a/rtos/EventFlags.h
+++ b/rtos/EventFlags.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/Kernel.h b/rtos/Kernel.h
index 57a86f7eb1..e6e7a61e28 100644
--- a/rtos/Kernel.h
+++ b/rtos/Kernel.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/Mail.h b/rtos/Mail.h
index 494aa59560..a4a584abf4 100644
--- a/rtos/Mail.h
+++ b/rtos/Mail.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/MemoryPool.h b/rtos/MemoryPool.h
index 0f29b7c694..3c4d856d6b 100644
--- a/rtos/MemoryPool.h
+++ b/rtos/MemoryPool.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/Mutex.h b/rtos/Mutex.h
index 5a8761c6c2..74ae3c8506 100644
--- a/rtos/Mutex.h
+++ b/rtos/Mutex.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/Queue.h b/rtos/Queue.h
index 4f98b1c388..e5f172ad26 100644
--- a/rtos/Queue.h
+++ b/rtos/Queue.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/RtosTimer.h b/rtos/RtosTimer.h
index 9b11a4183b..e4c6dd9f3a 100644
--- a/rtos/RtosTimer.h
+++ b/rtos/RtosTimer.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/Semaphore.h b/rtos/Semaphore.h
index 11246e5986..f5fbc69fcb 100644
--- a/rtos/Semaphore.h
+++ b/rtos/Semaphore.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/ThisThread.h b/rtos/ThisThread.h
index abda8026d7..bda5fe4d20 100644
--- a/rtos/ThisThread.h
+++ b/rtos/ThisThread.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/Thread.h b/rtos/Thread.h
index a76705f0ad..10aa6176f6 100644
--- a/rtos/Thread.h
+++ b/rtos/Thread.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/rtos.h b/rtos/rtos.h
index 7987712a98..9a850ab303 100644
--- a/rtos/rtos.h
+++ b/rtos/rtos.h
@@ -1,6 +1,7 @@
 
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2012 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/ConditionVariable.cpp b/rtos/source/ConditionVariable.cpp
index 87810464ea..36cf9b0bbc 100644
--- a/rtos/source/ConditionVariable.cpp
+++ b/rtos/source/ConditionVariable.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017-2017 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/EventFlags.cpp b/rtos/source/EventFlags.cpp
index 7543fb647f..ea3b5cc1db 100644
--- a/rtos/source/EventFlags.cpp
+++ b/rtos/source/EventFlags.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2017 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/Kernel.cpp b/rtos/source/Kernel.cpp
index c62a4b93aa..3102016e69 100644
--- a/rtos/source/Kernel.cpp
+++ b/rtos/source/Kernel.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2017 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/Mutex.cpp b/rtos/source/Mutex.cpp
index 57e69f7c9e..4b2e0451f3 100644
--- a/rtos/source/Mutex.cpp
+++ b/rtos/source/Mutex.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2012 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/RtosTimer.cpp b/rtos/source/RtosTimer.cpp
index 4779f320ce..4fd90210e3 100644
--- a/rtos/source/RtosTimer.cpp
+++ b/rtos/source/RtosTimer.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2012 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/Semaphore.cpp b/rtos/source/Semaphore.cpp
index bcedd99bdc..65016137cc 100644
--- a/rtos/source/Semaphore.cpp
+++ b/rtos/source/Semaphore.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2012 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/TARGET_CORTEX/mbed_rtx_conf.h b/rtos/source/TARGET_CORTEX/mbed_rtx_conf.h
index e7c6892580..6a9de3724d 100644
--- a/rtos/source/TARGET_CORTEX/mbed_rtx_conf.h
+++ b/rtos/source/TARGET_CORTEX/mbed_rtx_conf.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2012 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp b/rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp
index e8bfb7128e..e89155854a 100644
--- a/rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp
+++ b/rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2019 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/TARGET_CORTEX/mbed_rtx_storage.h b/rtos/source/TARGET_CORTEX/mbed_rtx_storage.h
index 3fd01bcc50..8f4374eb72 100644
--- a/rtos/source/TARGET_CORTEX/mbed_rtx_storage.h
+++ b/rtos/source/TARGET_CORTEX/mbed_rtx_storage.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2017 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/ThisThread.cpp b/rtos/source/ThisThread.cpp
index e02b4bbf0f..d4d754cf93 100644
--- a/rtos/source/ThisThread.cpp
+++ b/rtos/source/ThisThread.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2012 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/Thread.cpp b/rtos/source/Thread.cpp
index f7a374d540..cfd1b20b45 100644
--- a/rtos/source/Thread.cpp
+++ b/rtos/source/Thread.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2012 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/rtos_handlers.h b/rtos/source/rtos_handlers.h
index 15e1b7a372..c87b6b7af0 100644
--- a/rtos/source/rtos_handlers.h
+++ b/rtos/source/rtos_handlers.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2012 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/rtos/source/rtos_idle.h b/rtos/source/rtos_idle.h
index b0c2984b81..254353f2cb 100644
--- a/rtos/source/rtos_idle.h
+++ b/rtos/source/rtos_idle.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
  * Copyright (c) 2006-2012 ARM Limited
+ * SPDX-License-Identifier: MIT
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/tools/__init__.py b/tools/__init__.py
index 1fa84316bf..019367e7f5 100644
--- a/tools/__init__.py
+++ b/tools/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/build_api.py b/tools/build_api.py
index cfa15de402..ed7fa0fba8 100755
--- a/tools/build_api.py
+++ b/tools/build_api.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2016 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/build_release.py b/tools/build_release.py
index 83e7d90f99..b01c7e1656 100644
--- a/tools/build_release.py
+++ b/tools/build_release.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/detect_targets.py b/tools/detect_targets.py
index 0add06b4a6..734d95d15b 100644
--- a/tools/detect_targets.py
+++ b/tools/detect_targets.py
@@ -2,6 +2,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/atmelstudio/__init__.py b/tools/export/atmelstudio/__init__.py
index c18f798e37..374dcebacc 100644
--- a/tools/export/atmelstudio/__init__.py
+++ b/tools/export/atmelstudio/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2016 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/cdt/__init__.py b/tools/export/cdt/__init__.py
index c0571740e5..d9f83f99e9 100644
--- a/tools/export/cdt/__init__.py
+++ b/tools/export/cdt/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2016-2019 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/cmake/__init__.py b/tools/export/cmake/__init__.py
index 67216544e1..979f486109 100644
--- a/tools/export/cmake/__init__.py
+++ b/tools/export/cmake/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2016 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/coide/__init__.py b/tools/export/coide/__init__.py
index 41a55f5bc9..dbb2e5399b 100644
--- a/tools/export/coide/__init__.py
+++ b/tools/export/coide/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2014-2016 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/e2studio/__init__.py b/tools/export/e2studio/__init__.py
index 3a3776335f..b8e9cf3893 100644
--- a/tools/export/e2studio/__init__.py
+++ b/tools/export/e2studio/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2016 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/embitz/__init__.py b/tools/export/embitz/__init__.py
index 7588da6e74..a0d076e93d 100644
--- a/tools/export/embitz/__init__.py
+++ b/tools/export/embitz/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2014-2016 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/kds/__init__.py b/tools/export/kds/__init__.py
index 80ee5c3d8b..399f39a1ef 100644
--- a/tools/export/kds/__init__.py
+++ b/tools/export/kds/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2016 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/makefile/__init__.py b/tools/export/makefile/__init__.py
index ec43a77b38..19cf24e8db 100644
--- a/tools/export/makefile/__init__.py
+++ b/tools/export/makefile/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2019 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/qtcreator/__init__.py b/tools/export/qtcreator/__init__.py
index 7ec9107de8..ef5e25a421 100644
--- a/tools/export/qtcreator/__init__.py
+++ b/tools/export/qtcreator/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2014-2017 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/simplicity/__init__.py b/tools/export/simplicity/__init__.py
index d130ace3bf..b81ceee961 100644
--- a/tools/export/simplicity/__init__.py
+++ b/tools/export/simplicity/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2014-2016 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/export/zip/__init__.py b/tools/export/zip/__init__.py
index f2d9a19c0a..bdf9fd3e12 100644
--- a/tools/export/zip/__init__.py
+++ b/tools/export/zip/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/__init__.py b/tools/host_tests/__init__.py
index a0ec4d50bd..491f1317ad 100644
--- a/tools/host_tests/__init__.py
+++ b/tools/host_tests/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/default_auto.py b/tools/host_tests/default_auto.py
index cc233c5a66..13cc066d25 100644
--- a/tools/host_tests/default_auto.py
+++ b/tools/host_tests/default_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/detect_auto.py b/tools/host_tests/detect_auto.py
index c397f3b4a0..3da1bb7087 100644
--- a/tools/host_tests/detect_auto.py
+++ b/tools/host_tests/detect_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/dev_null_auto.py b/tools/host_tests/dev_null_auto.py
index c7e0238c7a..c7aa340698 100644
--- a/tools/host_tests/dev_null_auto.py
+++ b/tools/host_tests/dev_null_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/echo.py b/tools/host_tests/echo.py
index 1aa18b6bb8..032c6835fd 100644
--- a/tools/host_tests/echo.py
+++ b/tools/host_tests/echo.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/echo_flow_control.py b/tools/host_tests/echo_flow_control.py
index a3a5db59c7..f370d3b6b2 100644
--- a/tools/host_tests/echo_flow_control.py
+++ b/tools/host_tests/echo_flow_control.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/example/BroadcastReceive.py b/tools/host_tests/example/BroadcastReceive.py
index 2e846ca19e..eafb7bc20b 100644
--- a/tools/host_tests/example/BroadcastReceive.py
+++ b/tools/host_tests/example/BroadcastReceive.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/example/BroadcastSend.py b/tools/host_tests/example/BroadcastSend.py
index 0a5f8c3201..14b453298a 100644
--- a/tools/host_tests/example/BroadcastSend.py
+++ b/tools/host_tests/example/BroadcastSend.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/example/MulticastReceive.py b/tools/host_tests/example/MulticastReceive.py
index 9001f40b7d..9087d8d7ce 100644
--- a/tools/host_tests/example/MulticastReceive.py
+++ b/tools/host_tests/example/MulticastReceive.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/example/MulticastSend.py b/tools/host_tests/example/MulticastSend.py
index 8efd4534ae..b004783b3d 100644
--- a/tools/host_tests/example/MulticastSend.py
+++ b/tools/host_tests/example/MulticastSend.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/example/TCPEchoClient.py b/tools/host_tests/example/TCPEchoClient.py
index dfa9bfdae7..b3c8322737 100644
--- a/tools/host_tests/example/TCPEchoClient.py
+++ b/tools/host_tests/example/TCPEchoClient.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/example/TCPEchoServer.py b/tools/host_tests/example/TCPEchoServer.py
index 1324edbe64..8168c2323a 100644
--- a/tools/host_tests/example/TCPEchoServer.py
+++ b/tools/host_tests/example/TCPEchoServer.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/example/UDPEchoClient.py b/tools/host_tests/example/UDPEchoClient.py
index 6a6cf8c902..e699f9cb24 100644
--- a/tools/host_tests/example/UDPEchoClient.py
+++ b/tools/host_tests/example/UDPEchoClient.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/example/UDPEchoServer.py b/tools/host_tests/example/UDPEchoServer.py
index 38503489ee..8bc297d72d 100644
--- a/tools/host_tests/example/UDPEchoServer.py
+++ b/tools/host_tests/example/UDPEchoServer.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/example/__init__.py b/tools/host_tests/example/__init__.py
index 10e7e1d1de..019367e7f5 100644
--- a/tools/host_tests/example/__init__.py
+++ b/tools/host_tests/example/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,4 +14,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-"""
\ No newline at end of file
+"""
diff --git a/tools/host_tests/hello_auto.py b/tools/host_tests/hello_auto.py
index efc8b5ae8e..046f1b8d7b 100644
--- a/tools/host_tests/hello_auto.py
+++ b/tools/host_tests/hello_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_registry.py b/tools/host_tests/host_registry.py
index 72ebb161f0..0ad0420b71 100644
--- a/tools/host_tests/host_registry.py
+++ b/tools/host_tests/host_registry.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -33,4 +34,4 @@ class HostRegistry(object):
 
     def is_host_test(self, ht_name):
         return ht_name in self.HOST_TESTS
-        
\ No newline at end of file
+        
diff --git a/tools/host_tests/host_test.py b/tools/host_tests/host_test.py
index 436cb2e304..a487e9bc03 100644
--- a/tools/host_tests/host_test.py
+++ b/tools/host_tests/host_test.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/__init__.py b/tools/host_tests/host_tests_plugins/__init__.py
index aaea92083c..7ee7963b43 100644
--- a/tools/host_tests/host_tests_plugins/__init__.py
+++ b/tools/host_tests/host_tests_plugins/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/host_test_plugins.py b/tools/host_tests/host_tests_plugins/host_test_plugins.py
index b18b2c1f10..a27a9cd1b4 100644
--- a/tools/host_tests/host_tests_plugins/host_test_plugins.py
+++ b/tools/host_tests/host_tests_plugins/host_test_plugins.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/host_test_registry.py b/tools/host_tests/host_tests_plugins/host_test_registry.py
index 75bce7a81a..0cc20f489f 100644
--- a/tools/host_tests/host_tests_plugins/host_test_registry.py
+++ b/tools/host_tests/host_tests_plugins/host_test_registry.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/module_copy_firefox.py b/tools/host_tests/host_tests_plugins/module_copy_firefox.py
index 360835e498..ba2e21dff7 100644
--- a/tools/host_tests/host_tests_plugins/module_copy_firefox.py
+++ b/tools/host_tests/host_tests_plugins/module_copy_firefox.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/module_copy_mbed.py b/tools/host_tests/host_tests_plugins/module_copy_mbed.py
index d32cbcddc9..3721a997a3 100644
--- a/tools/host_tests/host_tests_plugins/module_copy_mbed.py
+++ b/tools/host_tests/host_tests_plugins/module_copy_mbed.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/module_copy_mps2.py b/tools/host_tests/host_tests_plugins/module_copy_mps2.py
index 0cc4260066..44cbef8d26 100644
--- a/tools/host_tests/host_tests_plugins/module_copy_mps2.py
+++ b/tools/host_tests/host_tests_plugins/module_copy_mps2.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/module_copy_shell.py b/tools/host_tests/host_tests_plugins/module_copy_shell.py
index 9e8cada6f7..f18076a95d 100644
--- a/tools/host_tests/host_tests_plugins/module_copy_shell.py
+++ b/tools/host_tests/host_tests_plugins/module_copy_shell.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/module_copy_silabs.py b/tools/host_tests/host_tests_plugins/module_copy_silabs.py
index 4ad6e57e5d..4a66821bdf 100644
--- a/tools/host_tests/host_tests_plugins/module_copy_silabs.py
+++ b/tools/host_tests/host_tests_plugins/module_copy_silabs.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/module_copy_smart.py b/tools/host_tests/host_tests_plugins/module_copy_smart.py
index 486382bada..76b71f1235 100644
--- a/tools/host_tests/host_tests_plugins/module_copy_smart.py
+++ b/tools/host_tests/host_tests_plugins/module_copy_smart.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/module_reset_mbed.py b/tools/host_tests/host_tests_plugins/module_reset_mbed.py
index ddf6005237..b70bca93b4 100644
--- a/tools/host_tests/host_tests_plugins/module_reset_mbed.py
+++ b/tools/host_tests/host_tests_plugins/module_reset_mbed.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/module_reset_mps2.py b/tools/host_tests/host_tests_plugins/module_reset_mps2.py
index afe2b59c47..7775d0c1a1 100644
--- a/tools/host_tests/host_tests_plugins/module_reset_mps2.py
+++ b/tools/host_tests/host_tests_plugins/module_reset_mps2.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/host_tests_plugins/module_reset_silabs.py b/tools/host_tests/host_tests_plugins/module_reset_silabs.py
index 5b1c039d03..a24222973d 100644
--- a/tools/host_tests/host_tests_plugins/module_reset_silabs.py
+++ b/tools/host_tests/host_tests_plugins/module_reset_silabs.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/net_test.py b/tools/host_tests/net_test.py
index a44b29a0a1..325b7ef956 100644
--- a/tools/host_tests/net_test.py
+++ b/tools/host_tests/net_test.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/rpc.py b/tools/host_tests/rpc.py
index 3ff543fe5a..baaf453e5c 100644
--- a/tools/host_tests/rpc.py
+++ b/tools/host_tests/rpc.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/rtc_auto.py b/tools/host_tests/rtc_auto.py
index 67528031f7..3f9ded4bae 100644
--- a/tools/host_tests/rtc_auto.py
+++ b/tools/host_tests/rtc_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/serial_complete_auto.py b/tools/host_tests/serial_complete_auto.py
index baeac6dc8f..9c6b3297f4 100644
--- a/tools/host_tests/serial_complete_auto.py
+++ b/tools/host_tests/serial_complete_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/serial_nc_rx_auto.py b/tools/host_tests/serial_nc_rx_auto.py
index 83aa76967f..2976ea7a3a 100644
--- a/tools/host_tests/serial_nc_rx_auto.py
+++ b/tools/host_tests/serial_nc_rx_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/serial_nc_tx_auto.py b/tools/host_tests/serial_nc_tx_auto.py
index 75490bfd07..29a9a6b795 100644
--- a/tools/host_tests/serial_nc_tx_auto.py
+++ b/tools/host_tests/serial_nc_tx_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/stdio_auto.py b/tools/host_tests/stdio_auto.py
index b6a35b8822..fd0560f661 100644
--- a/tools/host_tests/stdio_auto.py
+++ b/tools/host_tests/stdio_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/tcpecho_client.py b/tools/host_tests/tcpecho_client.py
index 5f21679a56..dd94076701 100644
--- a/tools/host_tests/tcpecho_client.py
+++ b/tools/host_tests/tcpecho_client.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/tcpecho_client_auto.py b/tools/host_tests/tcpecho_client_auto.py
index de83c9a4d5..072970b438 100644
--- a/tools/host_tests/tcpecho_client_auto.py
+++ b/tools/host_tests/tcpecho_client_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/tcpecho_server.py b/tools/host_tests/tcpecho_server.py
index a7bcb572b0..65516bfb61 100644
--- a/tools/host_tests/tcpecho_server.py
+++ b/tools/host_tests/tcpecho_server.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/tcpecho_server_auto.py b/tools/host_tests/tcpecho_server_auto.py
index b100f12670..035e1cc4a7 100644
--- a/tools/host_tests/tcpecho_server_auto.py
+++ b/tools/host_tests/tcpecho_server_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/tcpecho_server_loop.py b/tools/host_tests/tcpecho_server_loop.py
index 7317e302b3..a388b33eb2 100644
--- a/tools/host_tests/tcpecho_server_loop.py
+++ b/tools/host_tests/tcpecho_server_loop.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/udp_link_layer_auto.py b/tools/host_tests/udp_link_layer_auto.py
index 635d59a246..52b58cc4bc 100644
--- a/tools/host_tests/udp_link_layer_auto.py
+++ b/tools/host_tests/udp_link_layer_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/udpecho_client.py b/tools/host_tests/udpecho_client.py
index c6c8214ef6..6e4fa72971 100644
--- a/tools/host_tests/udpecho_client.py
+++ b/tools/host_tests/udpecho_client.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/udpecho_client_auto.py b/tools/host_tests/udpecho_client_auto.py
index 046f143d66..3eeb37a2a6 100644
--- a/tools/host_tests/udpecho_client_auto.py
+++ b/tools/host_tests/udpecho_client_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/udpecho_server.py b/tools/host_tests/udpecho_server.py
index 96c2db7fb8..eb00de1345 100644
--- a/tools/host_tests/udpecho_server.py
+++ b/tools/host_tests/udpecho_server.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/udpecho_server_auto.py b/tools/host_tests/udpecho_server_auto.py
index 07babd1ae6..10bbc88dde 100644
--- a/tools/host_tests/udpecho_server_auto.py
+++ b/tools/host_tests/udpecho_server_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/wait_us_auto.py b/tools/host_tests/wait_us_auto.py
index 5773e238a4..c3f3794ff2 100644
--- a/tools/host_tests/wait_us_auto.py
+++ b/tools/host_tests/wait_us_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/host_tests/wfi_auto.py b/tools/host_tests/wfi_auto.py
index 56a2d4a748..7defd8cf99 100644
--- a/tools/host_tests/wfi_auto.py
+++ b/tools/host_tests/wfi_auto.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/libraries.py b/tools/libraries.py
index e5fd724a1d..a84524c28d 100644
--- a/tools/libraries.py
+++ b/tools/libraries.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/options.py b/tools/options.py
index 9c8d84d788..2f2434d3aa 100644
--- a/tools/options.py
+++ b/tools/options.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/paths.py b/tools/paths.py
index 0425b13230..1171521a77 100644
--- a/tools/paths.py
+++ b/tools/paths.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/run_icetea.py b/tools/run_icetea.py
index 0af90d7b26..589a97b9db 100644
--- a/tools/run_icetea.py
+++ b/tools/run_icetea.py
@@ -1,6 +1,8 @@
 #! /usr/bin/env python2
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/tools/test/run_icetea/TEST_DIR/__init__.py b/tools/test/run_icetea/TEST_DIR/__init__.py
index ecb93799a7..b22f836964 100644
--- a/tools/test/run_icetea/TEST_DIR/__init__.py
+++ b/tools/test/run_icetea/TEST_DIR/__init__.py
@@ -1,5 +1,7 @@
 """
 Copyright 2017 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
@@ -11,4 +13,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-"""
\ No newline at end of file
+"""
diff --git a/tools/test/run_icetea/TEST_DIR/test_pass.py b/tools/test/run_icetea/TEST_DIR/test_pass.py
index f834ea99c4..7b54ce1217 100644
--- a/tools/test/run_icetea/TEST_DIR/test_pass.py
+++ b/tools/test/run_icetea/TEST_DIR/test_pass.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/tools/test/run_icetea/TEST_DIR/test_print.py b/tools/test/run_icetea/TEST_DIR/test_print.py
index b5158b4e7b..72e172cdab 100644
--- a/tools/test/run_icetea/TEST_DIR/test_print.py
+++ b/tools/test/run_icetea/TEST_DIR/test_print.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/tools/test/run_icetea/TEST_DIR_HW/__init__.py b/tools/test/run_icetea/TEST_DIR_HW/__init__.py
index e69de29bb2..b09b705cde 100644
--- a/tools/test/run_icetea/TEST_DIR_HW/__init__.py
+++ b/tools/test/run_icetea/TEST_DIR_HW/__init__.py
@@ -0,0 +1,16 @@
+"""
+Copyright (c) 2020 Arm Limited
+SPDX-License-Identifier: Apache-2.0
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
diff --git a/tools/test/run_icetea/TEST_DIR_HW/test_K64F.py b/tools/test/run_icetea/TEST_DIR_HW/test_K64F.py
index f25ddf8d56..4ed6123197 100644
--- a/tools/test/run_icetea/TEST_DIR_HW/test_K64F.py
+++ b/tools/test/run_icetea/TEST_DIR_HW/test_K64F.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/tools/test/run_icetea/TEST_DIR_HW/test_predefined_platforms.py b/tools/test/run_icetea/TEST_DIR_HW/test_predefined_platforms.py
index 8e5145b25c..baacf1e952 100644
--- a/tools/test/run_icetea/TEST_DIR_HW/test_predefined_platforms.py
+++ b/tools/test/run_icetea/TEST_DIR_HW/test_predefined_platforms.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/tools/test/run_icetea/run_icetea_test.py b/tools/test/run_icetea/run_icetea_test.py
index 393a3d0262..37303ea345 100644
--- a/tools/test/run_icetea/run_icetea_test.py
+++ b/tools/test/run_icetea/run_icetea_test.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/tools/test/run_icetea/run_icetea_unit_test.py b/tools/test/run_icetea/run_icetea_unit_test.py
index 7ff1fea02e..5d22ce6a2b 100644
--- a/tools/test/run_icetea/run_icetea_unit_test.py
+++ b/tools/test/run_icetea/run_icetea_unit_test.py
@@ -1,5 +1,7 @@
 """
 Copyright 2018 ARM Limited
+SPDX-License-Identifier: Apache-2.0
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
diff --git a/tools/test/toolchains/api_test.py b/tools/test/toolchains/api_test.py
index fb7a4607b2..fde4a1180f 100644
--- a/tools/test/toolchains/api_test.py
+++ b/tools/test/toolchains/api_test.py
@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017-2019 ARM Limited. All rights reserved.
+Copyright (c) 2017-2019 ARM Limited
 
 SPDX-License-Identifier: Apache-2.0
 
@@ -7,13 +7,13 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations
+limitations under the License.
 """
 
 import sys
diff --git a/tools/tests.py b/tools/tests.py
index bbb3ac7149..7ef426bc21 100644
--- a/tools/tests.py
+++ b/tools/tests.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py
index b2a63dbedd..7354c856fc 100755
--- a/tools/toolchains/__init__.py
+++ b/tools/toolchains/__init__.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/toolchains/arm.py b/tools/toolchains/arm.py
index 0afd81535c..c640a10537 100644
--- a/tools/toolchains/arm.py
+++ b/tools/toolchains/arm.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2019 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/toolchains/gcc.py b/tools/toolchains/gcc.py
index 5a40fbf859..fb220961f3 100644
--- a/tools/toolchains/gcc.py
+++ b/tools/toolchains/gcc.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/toolchains/iar.py b/tools/toolchains/iar.py
index 4d597a7c36..6e192bff68 100644
--- a/tools/toolchains/iar.py
+++ b/tools/toolchains/iar.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/toolchains/mbed_toolchain.py b/tools/toolchains/mbed_toolchain.py
index e8ec6ca5b8..ea6353f537 100755
--- a/tools/toolchains/mbed_toolchain.py
+++ b/tools/toolchains/mbed_toolchain.py
@@ -2,6 +2,7 @@
 mbed SDK
 SPDX-License-Identifier: Apache-2.0
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/tools/utils.py b/tools/utils.py
index 2c983b113f..d2aae7ff73 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -1,6 +1,7 @@
 """
 mbed SDK
 Copyright (c) 2011-2013 ARM Limited
+SPDX-License-Identifier: Apache-2.0
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.