diff --git a/lib/at_cmd_custom/at_cmd_custom.c b/lib/at_cmd_custom/at_cmd_custom.c
index 56ca6baf67d7..2468dd1caa7e 100644
--- a/lib/at_cmd_custom/at_cmd_custom.c
+++ b/lib/at_cmd_custom/at_cmd_custom.c
@@ -9,7 +9,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/kernel.h>
 #include <zephyr/device.h>
 #include <zephyr/init.h>
diff --git a/lib/at_monitor/at_monitor.c b/lib/at_monitor/at_monitor.c
index e9f82e2aa687..fe16ecfe8337 100644
--- a/lib/at_monitor/at_monitor.c
+++ b/lib/at_monitor/at_monitor.c
@@ -10,7 +10,7 @@
 #include <zephyr/device.h>
 #include <nrf_modem_at.h>
 #include <modem/at_monitor.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(at_monitor, CONFIG_AT_MONITOR_LOG_LEVEL);
diff --git a/lib/nrf_modem_lib/nrf_modem_lib.c b/lib/nrf_modem_lib/nrf_modem_lib.c
index e4aaac40ab6d..db3f0d735044 100644
--- a/lib/nrf_modem_lib/nrf_modem_lib.c
+++ b/lib/nrf_modem_lib/nrf_modem_lib.c
@@ -11,7 +11,7 @@
 #include <zephyr/device.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <modem/nrf_modem_lib.h>
 #include <modem/nrf_modem_lib_trace.h>
 #include <pm_config.h>
diff --git a/subsys/bluetooth/mesh/sensor_types.c b/subsys/bluetooth/mesh/sensor_types.c
index b04b140f362a..8272a4bde932 100644
--- a/subsys/bluetooth/mesh/sensor_types.c
+++ b/subsys/bluetooth/mesh/sensor_types.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include "sensor.h"
 #include <zephyr/sys/byteorder.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <bluetooth/mesh/properties.h>
 #include <bluetooth/mesh/sensor_types.h>
 
diff --git a/subsys/net/lib/download_client/src/download_client.c b/subsys/net/lib/download_client/src/download_client.c
index 8bb83ad16c3d..e17eeb480ada 100644
--- a/subsys/net/lib/download_client/src/download_client.c
+++ b/subsys/net/lib/download_client/src/download_client.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #if defined(CONFIG_POSIX_API)
 #include <zephyr/posix/unistd.h>
 #include <zephyr/posix/netdb.h>
diff --git a/subsys/net/lib/icalendar_parser/src/icalendar_parser.c b/subsys/net/lib/icalendar_parser/src/icalendar_parser.c
index 472ac31a7f47..dc1faab40102 100644
--- a/subsys/net/lib/icalendar_parser/src/icalendar_parser.c
+++ b/subsys/net/lib/icalendar_parser/src/icalendar_parser.c
@@ -8,7 +8,7 @@
 #include <strings.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <net/icalendar_parser.h>
 #include <zephyr/logging/log.h>
 
diff --git a/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c b/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c
index 153b66bcb777..36892c4f575e 100644
--- a/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c
+++ b/tests/lib/nrf_modem_lib/nrf_modem_lib_trace/src/main.c
@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include <unity.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/fff.h>
 #include <syscalls/random.h>