diff --git a/drivers/ethernet/eth_e1000.c b/drivers/ethernet/eth_e1000.c
index 8c929eaceb3..92a23235169 100644
--- a/drivers/ethernet/eth_e1000.c
+++ b/drivers/ethernet/eth_e1000.c
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include "eth_e1000_priv.h"
 
 #if defined(CONFIG_ETH_E1000_PTP_CLOCK)
-#include <ptp_clock.h>
+#include <drivers/ptp_clock.h>
 
 #define PTP_INST_NODEID(n) DT_CHILD(DT_DRV_INST(n), ptp)
 #endif
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h
deleted file mode 100644
index 57db24e4d44..00000000000
--- a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2017 Linaro Limited.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <arch/arm/aarch32/mpu/arm_mpu.h> instead."
-#endif
-
-#include <arch/arm/aarch32/mpu/arm_mpu.h>
-
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_ */
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h
deleted file mode 100644
index c9a466dfaad..00000000000
--- a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2018 Linaro Limited.
- * Copyright (c) 2018 Nordic Semiconductor ASA.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_V7M_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_V7M_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <arch/arm/aarch32/mpu/arm_mpu_v7m.h> instead."
-#endif
-
-#include <arch/arm/aarch32/mpu/arm_mpu_v7m.h>
-
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_V7M_H_ */
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h
deleted file mode 100644
index fa1b3cd588d..00000000000
--- a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2018 Linaro Limited.
- * Copyright (c) 2018 Nordic Semiconductor ASA.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_V8M_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_V8M_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <arch/arm/aarch32/mpu/arm_mpu_v8m.h> instead."
-#endif
-
-#include <arch/arm/aarch32/mpu/arm_mpu_v8m.h>
-
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_V8M_H_ */
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h b/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h
deleted file mode 100644
index f17032fb87d..00000000000
--- a/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2017 Linaro Limited.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <arch/arm/aarch32/mpu/nxp_mpu.h> instead."
-#endif
-
-#include <arch/arm/aarch32/mpu/nxp_mpu.h>
-
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_ */
diff --git a/include/disk/disk_access.h b/include/disk/disk_access.h
deleted file mode 100644
index eefedcbdc86..00000000000
--- a/include/disk/disk_access.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2016 Intel Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/*
- * The header was moved to include/storage/disk_access.h
- * This header is deprecated and there for compatibility.
- */
-
-#ifndef ZEPHYR_INCLUDE_DISK_DISK_ACCESS_H_
-#define ZEPHYR_INCLUDE_DISK_DISK_ACCESS_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <storage/disk_access.h> instead."
-#endif
-
-#include <storage/disk_access.h>
-
-#endif /* ZEPHYR_INCLUDE_DISK_DISK_ACCESS_H_ */
diff --git a/include/ec_host_cmd.h b/include/ec_host_cmd.h
deleted file mode 100644
index 51c4607bebd..00000000000
--- a/include/ec_host_cmd.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2020 Google LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_EC_HOST_CMD_H_
-#define ZEPHYR_INCLUDE_EC_HOST_CMD_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <mgmt/ec_host_cmd.h> instead."
-#endif
-
-#include <mgmt/ec_host_cmd.h>
-
-#endif /* ZEPHYR_INCLUDE_EC_HOST_CMD_H_ */
diff --git a/include/emul.h b/include/emul.h
deleted file mode 100644
index 971e61cfd40..00000000000
--- a/include/emul.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2020 Nordic Semiconductor ASA
- * Copyright 2020 Google LLC
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_EMUL_H_
-#define ZEPHYR_INCLUDE_EMUL_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <drivers/emul.h> instead."
-#endif
-
-#include <drivers/emul.h>
-
-#endif /* ZEPHYR_INCLUDE_EMUL_H_ */
diff --git a/include/ptp_clock.h b/include/ptp_clock.h
deleted file mode 100644
index 495b8a1a147..00000000000
--- a/include/ptp_clock.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2018 Intel Corporation.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef ZEPHYR_INCLUDE_PTP_CLOCK_H_
-#define ZEPHYR_INCLUDE_PTP_CLOCK_H_
-
-#ifndef CONFIG_COMPAT_INCLUDES
-#warning "This header file has moved, include <drivers/ptp_clock.h> instead."
-#endif
-
-#include <drivers/ptp_clock.h>
-
-#endif /* ZEPHYR_INCLUDE_PTP_CLOCK_H_ */
diff --git a/samples/net/sockets/txtime/src/main.c b/samples/net/sockets/txtime/src/main.c
index 516698b42fc..da1766ef6f5 100644
--- a/samples/net/sockets/txtime/src/main.c
+++ b/samples/net/sockets/txtime/src/main.c
@@ -11,7 +11,7 @@ LOG_MODULE_REGISTER(net_txtime_sample, LOG_LEVEL_DBG);
 #include <errno.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include <ptp_clock.h>
+#include <drivers/ptp_clock.h>
 #include <shell/shell.h>
 
 #include <net/net_mgmt.h>