diff --git a/boot/boot_serial/src/boot_serial.c b/boot/boot_serial/src/boot_serial.c
index 02a8da30..409ae968 100644
--- a/boot/boot_serial/src/boot_serial.c
+++ b/boot/boot_serial/src/boot_serial.c
@@ -30,7 +30,7 @@
 #include <power/reboot.h>
 #include <sys/byteorder.h>
 #include <sys/__assert.h>
-#include <flash.h>
+#include <drivers/flash.h>
 #include <sys/crc.h>
 #include <sys/base64.h>
 #include <cbor.h>
diff --git a/boot/zephyr/flash_map_extended.c b/boot/zephyr/flash_map_extended.c
index c50a1e9c..b2de8849 100644
--- a/boot/zephyr/flash_map_extended.c
+++ b/boot/zephyr/flash_map_extended.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr.h>
-#include <flash.h>
+#include <drivers/flash.h>
 
 #include "target.h"
 
diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index c141c435..b9ecf51f 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -16,9 +16,9 @@
 
 #include <assert.h>
 #include <zephyr.h>
-#include <gpio.h>
+#include <drivers/gpio.h>
 #include <sys/__assert.h>
-#include <flash.h>
+#include <drivers/flash.h>
 #include <drivers/timer/system_timer.h>
 #include <usb/usb_device.h>
 #include <soc.h>
diff --git a/boot/zephyr/serial_adapter.c b/boot/zephyr/serial_adapter.c
index 92815a6f..5031091a 100644
--- a/boot/zephyr/serial_adapter.c
+++ b/boot/zephyr/serial_adapter.c
@@ -15,7 +15,7 @@
  */
 
 #include <stdio.h>
-#include <uart.h>
+#include <drivers/uart.h>
 #include <assert.h>
 #include <string.h>
 #include <zephyr.h>