diff --git a/TESTS/host_tests/reset_reason.py b/TESTS/host_tests/reset_reason.py
index 2cfe131cb7..9ba0c3815d 100644
--- a/TESTS/host_tests/reset_reason.py
+++ b/TESTS/host_tests/reset_reason.py
@@ -1,6 +1,6 @@
 """
-mbed SDK
-Copyright (c) 2017 ARM Limited
+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/watchdog_reset.py b/TESTS/host_tests/watchdog_reset.py
index c8f3216821..605e03d03d 100644
--- a/TESTS/host_tests/watchdog_reset.py
+++ b/TESTS/host_tests/watchdog_reset.py
@@ -1,6 +1,6 @@
 """
-mbed SDK
-Copyright (c) 2017 ARM Limited
+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/reset_reason/ResetReason_tests.h b/TESTS/mbed_drivers/reset_reason/ResetReason_tests.h
index 80671d8526..a500b252c7 100644
--- a/TESTS/mbed_drivers/reset_reason/ResetReason_tests.h
+++ b/TESTS/mbed_drivers/reset_reason/ResetReason_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_drivers/reset_reason/main.cpp b/TESTS/mbed_drivers/reset_reason/main.cpp
index 5ca38feec1..2f32b75d7c 100644
--- a/TESTS/mbed_drivers/reset_reason/main.cpp
+++ b/TESTS/mbed_drivers/reset_reason/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_drivers/watchdog/Watchdog_tests.h b/TESTS/mbed_drivers/watchdog/Watchdog_tests.h
index cf2d6da30a..6d76c56724 100644
--- a/TESTS/mbed_drivers/watchdog/Watchdog_tests.h
+++ b/TESTS/mbed_drivers/watchdog/Watchdog_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_drivers/watchdog/main.cpp b/TESTS/mbed_drivers/watchdog/main.cpp
index a54ac66974..dd8ee4bdc9 100644
--- a/TESTS/mbed_drivers/watchdog/main.cpp
+++ b/TESTS/mbed_drivers/watchdog/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_drivers/watchdog_reset/Watchdog_reset_tests.h b/TESTS/mbed_drivers/watchdog_reset/Watchdog_reset_tests.h
index e4add3a50a..3597621a58 100644
--- a/TESTS/mbed_drivers/watchdog_reset/Watchdog_reset_tests.h
+++ b/TESTS/mbed_drivers/watchdog_reset/Watchdog_reset_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_drivers/watchdog_reset/main.cpp b/TESTS/mbed_drivers/watchdog_reset/main.cpp
index 45d8e941c8..983e068711 100644
--- a/TESTS/mbed_drivers/watchdog_reset/main.cpp
+++ b/TESTS/mbed_drivers/watchdog_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/mbed_hal/reset_reason/main.cpp b/TESTS/mbed_hal/reset_reason/main.cpp
index c2759a387f..891e0398ca 100644
--- a/TESTS/mbed_hal/reset_reason/main.cpp
+++ b/TESTS/mbed_hal/reset_reason/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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/reset_reason/reset_reason_api_tests.h b/TESTS/mbed_hal/reset_reason/reset_reason_api_tests.h
index c9f9efc064..b515f97f10 100644
--- a/TESTS/mbed_hal/reset_reason/reset_reason_api_tests.h
+++ b/TESTS/mbed_hal/reset_reason/reset_reason_api_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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/watchdog/main.cpp b/TESTS/mbed_hal/watchdog/main.cpp
index 611da95280..24a262ff2f 100644
--- a/TESTS/mbed_hal/watchdog/main.cpp
+++ b/TESTS/mbed_hal/watchdog/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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/watchdog/watchdog_api_tests.h b/TESTS/mbed_hal/watchdog/watchdog_api_tests.h
index 82dfd5795d..dad785e944 100644
--- a/TESTS/mbed_hal/watchdog/watchdog_api_tests.h
+++ b/TESTS/mbed_hal/watchdog/watchdog_api_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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/watchdog_reset/main.cpp b/TESTS/mbed_hal/watchdog_reset/main.cpp
index c4e179e65c..1cc772c4f2 100644
--- a/TESTS/mbed_hal/watchdog_reset/main.cpp
+++ b/TESTS/mbed_hal/watchdog_reset/main.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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/watchdog_reset/watchdog_reset_tests.h b/TESTS/mbed_hal/watchdog_reset/watchdog_reset_tests.h
index a90e0b95a2..7dd2d1a018 100644
--- a/TESTS/mbed_hal/watchdog_reset/watchdog_reset_tests.h
+++ b/TESTS/mbed_hal/watchdog_reset/watchdog_reset_tests.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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/watchdog_timing/main.cpp b/TESTS/mbed_hal/watchdog_timing/main.cpp
index a20312423c..513d39d031 100644
--- a/TESTS/mbed_hal/watchdog_timing/main.cpp
+++ b/TESTS/mbed_hal/watchdog_timing/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/watchdog_timing/watchdog_timing_tests.h b/TESTS/mbed_hal/watchdog_timing/watchdog_timing_tests.h
index 7ea8bdf475..72f5bb6892 100644
--- a/TESTS/mbed_hal/watchdog_timing/watchdog_timing_tests.h
+++ b/TESTS/mbed_hal/watchdog_timing/watchdog_timing_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/drivers/ResetReason.cpp b/drivers/ResetReason.cpp
index 7070cef490..9614fb8262 100644
--- a/drivers/ResetReason.cpp
+++ b/drivers/ResetReason.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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/drivers/ResetReason.h b/drivers/ResetReason.h
index 54f4ff102d..fa8736a268 100644
--- a/drivers/ResetReason.h
+++ b/drivers/ResetReason.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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/drivers/Watchdog.cpp b/drivers/Watchdog.cpp
index 36a6dd2e18..0d655b0a21 100644
--- a/drivers/Watchdog.cpp
+++ b/drivers/Watchdog.cpp
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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/drivers/Watchdog.h b/drivers/Watchdog.h
index 66cefcaed7..f09503372f 100644
--- a/drivers/Watchdog.h
+++ b/drivers/Watchdog.h
@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * 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.