diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 86f7fd8e56..9bb63229dd 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -29,8 +29,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <drivers/i2c.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/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 f9da2433c0..dee66a5c69 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -29,8 +29,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <drivers/gpio.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "py/runtime.h"
 #include "py/gc.h"
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index c54762aa05..2b0911c591 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <drivers/spi.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/spi.h>
 
 #include "py/runtime.h"
 #include "py/gc.h"
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 95e33bb25b..47ca0945a5 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -29,8 +29,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <drivers/uart.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/uart.h>
 
 #include "py/runtime.h"
 #include "py/stream.h"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 4f735b671f..c638f38920 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -29,16 +29,16 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #ifdef CONFIG_NETWORKING
-#include <net/net_context.h>
+#include <zephyr/net/net_context.h>
 #endif
 
 #ifdef CONFIG_USB_DEVICE_STACK
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 #endif
 
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 
 #include "py/mperrno.h"
 #include "py/builtin.h"
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index f4b1c0849f..63bd336989 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <sys/reboot.h>
+#include <zephyr/sys/reboot.h>
 
 #include "py/obj.h"
 #include "py/runtime.h"
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 40d4aaac5b..2b6adf4773 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -31,14 +31,14 @@
 #include "py/stream.h"
 
 #include <stdio.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 // Zephyr's generated version header
 #include <version.h>
-#include <net/net_context.h>
-#include <net/net_pkt.h>
-#include <net/dns_resolve.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/dns_resolve.h>
 #ifdef CONFIG_NET_SOCKETS
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 #endif
 
 #define DEBUG_PRINT 0
diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modutime.c
index 16ac9af6ee..c1c2be1c07 100644
--- a/ports/zephyr/modutime.c
+++ b/ports/zephyr/modutime.c
@@ -28,7 +28,7 @@
 #include "py/mpconfig.h"
 #if MICROPY_PY_UTIME
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "py/runtime.h"
 #include "py/smallint.h"
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index 541dfe0b30..f87e2e33f3 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -29,10 +29,10 @@
 #if MICROPY_PY_ZEPHYR
 
 #include <stdio.h>
-#include <zephyr.h>
-#include <debug/thread_analyzer.h>
-#include <shell/shell.h>
-#include <shell/shell_uart.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/debug/thread_analyzer.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
 
 #include "modzephyr.h"
 #include "py/runtime.h"
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 6e8a5ca074..ba6717046f 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -28,8 +28,8 @@
 
 #include "py/runtime.h"
 
-#include <zephyr.h>
-#include <drivers/sensor.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/sensor.h>
 
 #if MICROPY_PY_ZSENSOR
 
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 44231e1fc8..26610ccced 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -28,8 +28,8 @@
 // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
 #include "autoconf.h"
 // Included here to get basic Zephyr environment (macros, etc.)
-#include <zephyr.h>
-#include <drivers/spi.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/spi.h>
 
 // Usually passed from Makefile
 #ifndef MICROPY_HEAP_SIZE
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index ffe68da246..6158593911 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,4 +1,4 @@
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include "shared/runtime/interrupt_char.h"
 
 void mp_hal_init(void);
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 218fb18646..5bbf1a9f68 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <zephyr.h>
-#include <drivers/uart.h>
-#include <drivers/console/uart_console.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/console/uart_console.h>
+#include <zephyr/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 7806eeeea3..b24e501c33 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <zephyr.h>
-#include <console/console.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/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 1313a51ae2..1d37f22093 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 <drivers/uart.h>
-#include <console/console.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/console/console.h>
 
 /*
  * Core UART functions to implement for a port
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 2761dcba80..1179c3fda8 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -32,11 +32,11 @@
 #endif
 
 #ifdef CONFIG_DISK_ACCESS
-#include <storage/disk_access.h>
+#include <zephyr/storage/disk_access.h>
 #endif
 
 #ifdef CONFIG_FLASH_MAP
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 #endif
 
 #ifdef CONFIG_DISK_ACCESS