diff --git a/platform/critical.h b/platform/critical.h
deleted file mode 100644
index c790e830ed..0000000000
--- a/platform/critical.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2015-2016, ARM Limited, All Rights Reserved
- * SPDX-License-Identifier: Apache-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 MBED_OLD_CRITICAL_H
-#define MBED_OLD_CRITICAL_H
-
-#warning critical.h has been replaced by mbed_critical.h, please update to mbed_critical.h [since mbed-os-5.3]
-#include "platform/mbed_critical.h"
-
-#endif
diff --git a/platform/mbed_sleep.h b/platform/mbed_sleep.h
deleted file mode 100644
index 89b8b4ec3f..0000000000
--- a/platform/mbed_sleep.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2018, ARM Limited, All Rights Reserved
- * SPDX-License-Identifier: Apache-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 MBED_MBED_SLEEP_H
-#define MBED_MBED_SLEEP_H
-
-#warning mbed_sleep.h has been replaced by mbed_power_mgmt.h, please update to mbed_power_mgmt.h [since mbed-os-5.8]
-#include "platform/mbed_power_mgmt.h"
-
-#endif
diff --git a/platform/rtc_time.h b/platform/rtc_time.h
deleted file mode 100644
index a13f1bd82b..0000000000
--- a/platform/rtc_time.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2015-2016, ARM Limited, All Rights Reserved
- * SPDX-License-Identifier: Apache-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 MBED_OLD_RTC_TIME_H
-#define MBED_OLD_RTC_TIME_H
-
-#warning rtc_time.h has been replaced by mbed_rtc_time.h, please update to mbed_rtc_time.h [since mbed-os-5.3]
-#include "platform/mbed_rtc_time.h"
-
-#endif
diff --git a/platform/semihost_api.h b/platform/semihost_api.h
deleted file mode 100644
index 41811a3f9b..0000000000
--- a/platform/semihost_api.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2015-2016, ARM Limited, All Rights Reserved
- * SPDX-License-Identifier: Apache-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 MBED_OLD_SEMIHOST_API_H
-#define MBED_OLD_SEMIHOST_API_H
-
-#warning semihost_api.h has been replaced by mbed_semihost_api.h, please update to mbed_semihost_api.h [since mbed-os-5.3]
-#include "platform/mbed_semihost_api.h"
-
-#endif
diff --git a/platform/sleep.h b/platform/sleep.h
deleted file mode 100644
index f900bcf6e3..0000000000
--- a/platform/sleep.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2015-2016, ARM Limited, All Rights Reserved
- * SPDX-License-Identifier: Apache-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 MBED_OLD_SLEEP_H
-#define MBED_OLD_SLEEP_H
-
-#warning sleep.h has been replaced by mbed_power_mgmt.h, please update to mbed_power_mgmt.h [since mbed-os-5.8]
-#include "platform/mbed_power_mgmt.h"
-
-#endif
diff --git a/platform/toolchain.h b/platform/toolchain.h
deleted file mode 100644
index 6e3c2a8824..0000000000
--- a/platform/toolchain.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* 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.
- * 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 MBED_OLD_TOOLCHAIN_H
-#define MBED_OLD_TOOLCHAIN_H
-
-#warning toolchain.h has been replaced by mbed_toolchain.h, please update to mbed_toolchain.h [since mbed-os-5.3]
-#include "platform/mbed_toolchain.h"
-
-#endif
diff --git a/platform/wait_api.h b/platform/wait_api.h
deleted file mode 100644
index d725b5fa78..0000000000
--- a/platform/wait_api.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2015-2016, ARM Limited, All Rights Reserved
- * SPDX-License-Identifier: Apache-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 MBED_OLD_WAIT_API_H
-#define MBED_OLD_WAIT_API_H
-
-#warning wait_api.h has been replaced by mbed_wait_api.h, please update to mbed_wait_api.h [since mbed-os-5.3]
-#include "platform/mbed_wait_api.h"
-
-#endif