diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 4d1197ec..63013f9c 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -7,7 +7,7 @@
 #include "api/ArduinoAPI.h"
 
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include <variants.h>
-#include <zephyrSerial.h>
\ No newline at end of file
+#include <zephyrSerial.h>
diff --git a/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h b/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h
index 9a9893ae..de31116e 100644
--- a/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h
+++ b/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h
@@ -7,7 +7,7 @@
 /* All the pins that are 100 + x are gpio1 pins and < 100 are in gpio0 */
 #pragma once
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
 
diff --git a/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h b/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
index 9a9893ae..de31116e 100644
--- a/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
+++ b/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
@@ -7,7 +7,7 @@
 /* All the pins that are 100 + x are gpio1 pins and < 100 are in gpio0 */
 #pragma once
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
 
diff --git a/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h b/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h
index 9a9893ae..de31116e 100644
--- a/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h
+++ b/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h
@@ -7,7 +7,7 @@
 /* All the pins that are 100 + x are gpio1 pins and < 100 are in gpio0 */
 #pragma once
 #include <zephyr/drivers/gpio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 #include <zephyr/device.h>
 
diff --git a/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h b/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h
index f5a4d78d..9324974a 100644
--- a/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h
+++ b/variants/nrf52840dk_nrf52840/nrf52840dk_nrf52840_pinmap.h
@@ -9,7 +9,7 @@
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/drivers/i2c.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #define LED_BUILTIN 22