diff --git a/rtos/ConditionVariable.h b/rtos/ConditionVariable.h
index 8030fab447..9f433f5a69 100644
--- a/rtos/ConditionVariable.h
+++ b/rtos/ConditionVariable.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/EventFlags.h b/rtos/EventFlags.h
index bd1ec56e3b..2e8a81f63b 100644
--- a/rtos/EventFlags.h
+++ b/rtos/EventFlags.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/Kernel.h b/rtos/Kernel.h
index e96cc197f4..e6e7a61e28 100644
--- a/rtos/Kernel.h
+++ b/rtos/Kernel.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/Mail.h b/rtos/Mail.h
index 3e41841b30..a4a584abf4 100644
--- a/rtos/Mail.h
+++ b/rtos/Mail.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/MemoryPool.h b/rtos/MemoryPool.h
index 5f900002bf..3c4d856d6b 100644
--- a/rtos/MemoryPool.h
+++ b/rtos/MemoryPool.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/Mutex.h b/rtos/Mutex.h
index 7fa65fc075..74ae3c8506 100644
--- a/rtos/Mutex.h
+++ b/rtos/Mutex.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/Queue.h b/rtos/Queue.h
index 7bf367887b..e5f172ad26 100644
--- a/rtos/Queue.h
+++ b/rtos/Queue.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/RtosTimer.h b/rtos/RtosTimer.h
index 430b6d3d0f..e4c6dd9f3a 100644
--- a/rtos/RtosTimer.h
+++ b/rtos/RtosTimer.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/Semaphore.h b/rtos/Semaphore.h
index 4d042af5fe..f5fbc69fcb 100644
--- a/rtos/Semaphore.h
+++ b/rtos/Semaphore.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/ThisThread.h b/rtos/ThisThread.h
index ad1db5c1fa..bda5fe4d20 100644
--- a/rtos/ThisThread.h
+++ b/rtos/ThisThread.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/Thread.h b/rtos/Thread.h
index c58dcfb782..10aa6176f6 100644
--- a/rtos/Thread.h
+++ b/rtos/Thread.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/rtos.h b/rtos/rtos.h
index 2f6c8135c9..9a850ab303 100644
--- a/rtos/rtos.h
+++ b/rtos/rtos.h
@@ -1,7 +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
diff --git a/rtos/source/ConditionVariable.cpp b/rtos/source/ConditionVariable.cpp
index 9ea5da1567..36cf9b0bbc 100644
--- a/rtos/source/ConditionVariable.cpp
+++ b/rtos/source/ConditionVariable.cpp
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/EventFlags.cpp b/rtos/source/EventFlags.cpp
index 5e325018e9..ea3b5cc1db 100644
--- a/rtos/source/EventFlags.cpp
+++ b/rtos/source/EventFlags.cpp
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/Kernel.cpp b/rtos/source/Kernel.cpp
index 5a46184698..3102016e69 100644
--- a/rtos/source/Kernel.cpp
+++ b/rtos/source/Kernel.cpp
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/Mutex.cpp b/rtos/source/Mutex.cpp
index 12e163a6d5..4b2e0451f3 100644
--- a/rtos/source/Mutex.cpp
+++ b/rtos/source/Mutex.cpp
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/RtosTimer.cpp b/rtos/source/RtosTimer.cpp
index e18aeae5d0..4fd90210e3 100644
--- a/rtos/source/RtosTimer.cpp
+++ b/rtos/source/RtosTimer.cpp
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/Semaphore.cpp b/rtos/source/Semaphore.cpp
index c42e729d5b..65016137cc 100644
--- a/rtos/source/Semaphore.cpp
+++ b/rtos/source/Semaphore.cpp
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/TARGET_CORTEX/mbed_rtx_conf.h b/rtos/source/TARGET_CORTEX/mbed_rtx_conf.h
index caf16bb38d..6a9de3724d 100644
--- a/rtos/source/TARGET_CORTEX/mbed_rtx_conf.h
+++ b/rtos/source/TARGET_CORTEX/mbed_rtx_conf.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp b/rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp
index 811196575c..e89155854a 100644
--- a/rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp
+++ b/rtos/source/TARGET_CORTEX/mbed_rtx_idle.cpp
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/TARGET_CORTEX/mbed_rtx_storage.h b/rtos/source/TARGET_CORTEX/mbed_rtx_storage.h
index eaa142d8bd..8f4374eb72 100644
--- a/rtos/source/TARGET_CORTEX/mbed_rtx_storage.h
+++ b/rtos/source/TARGET_CORTEX/mbed_rtx_storage.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/ThisThread.cpp b/rtos/source/ThisThread.cpp
index 35b91112bf..d4d754cf93 100644
--- a/rtos/source/ThisThread.cpp
+++ b/rtos/source/ThisThread.cpp
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/Thread.cpp b/rtos/source/Thread.cpp
index ac2571d93f..cfd1b20b45 100644
--- a/rtos/source/Thread.cpp
+++ b/rtos/source/Thread.cpp
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/rtos_handlers.h b/rtos/source/rtos_handlers.h
index 5415e3315d..c87b6b7af0 100644
--- a/rtos/source/rtos_handlers.h
+++ b/rtos/source/rtos_handlers.h
@@ -1,6 +1,5 @@
 /* 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
diff --git a/rtos/source/rtos_idle.h b/rtos/source/rtos_idle.h
index 1148cf58a4..254353f2cb 100644
--- a/rtos/source/rtos_idle.h
+++ b/rtos/source/rtos_idle.h
@@ -1,6 +1,5 @@
 /* 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