diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 0a9e9cfab..087cf4bea 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include <zephyr.h>
-#include <i2c.h>
+#include <drivers/i2c.h>
 
 #include "py/runtime.h"
 #include "py/gc.h"
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index c4ea328a2..d15c556ec 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include <zephyr.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 
 #include "py/runtime.h"
 #include "py/gc.h"
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index c89529aa9..dd797740a 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <misc/reboot.h>
+#include <power/reboot.h>
 
 #include "py/obj.h"
 #include "py/runtime.h"
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index 3d686605d..781eb2203 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 #include <zephyr.h>
-#include <misc/stack.h>
+#include <debug/stack.h>
 
 #include "py/runtime.h"
 
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 2630899b0..570017b63 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -29,7 +29,7 @@
 #include "py/runtime.h"
 
 #include <zephyr.h>
-#include <sensor.h>
+#include <drivers/sensor.h>
 
 #if MICROPY_PY_ZSENSOR
 
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 52b3394d0..40dc1c320 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -15,9 +15,9 @@
  */
 
 #include <zephyr.h>
-#include <uart.h>
+#include <drivers/uart.h>
 #include <drivers/console/uart_console.h>
-#include <misc/printk.h>
+#include <sys/printk.h>
 #include "zephyr_getchar.h"
 
 extern int mp_interrupt_char;
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index 591eec76b..2e0993451 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 #include <zephyr.h>
-#include <console.h>
+#include <console/console.h>
 #include "zephyr_getchar.h"
 
 int real_main(void);
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index 325e43743..1c9265037 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -27,8 +27,8 @@
 #include "py/mpconfig.h"
 #include "src/zephyr_getchar.h"
 // Zephyr headers
-#include <uart.h>
-#include <console.h>
+#include <drivers/uart.h>
+#include <console/console.h>
 
 /*
  * Core UART functions to implement for a port