11 files changed, 20 insertions, 20 deletions
diff --git a/zephyr/projects/nissa/src/board_power.c b/zephyr/projects/nissa/src/board_power.c
index b81e28c0f4..b4906179ad 100644
--- a/zephyr/projects/nissa/src/board_power.c
+++ b/zephyr/projects/nissa/src/board_power.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <sys/atomic.h>
-#include <logging/log.h>
-#include <drivers/gpio.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/drivers/gpio.h>
 
 #include <ap_power/ap_power.h>
 #include <ap_power/ap_power_events.h>
diff --git a/zephyr/projects/nissa/src/common.c b/zephyr/projects/nissa/src/common.c
index cd6c4fb502..ac1c775fc1 100644
--- a/zephyr/projects/nissa/src/common.c
+++ b/zephyr/projects/nissa/src/common.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <ap_power/ap_power.h>
 
 #include "battery.h"
@@ -19,7 +19,7 @@
 
 #include "nissa_common.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(nissa, CONFIG_NISSA_LOG_LEVEL);
 
 #define PROCHOT_GPIO_ENUM \
diff --git a/zephyr/projects/nissa/src/craask/charger.c b/zephyr/projects/nissa/src/craask/charger.c
index 9479367d25..3fbbabec6b 100644
--- a/zephyr/projects/nissa/src/craask/charger.c
+++ b/zephyr/projects/nissa/src/craask/charger.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "battery.h"
 #include "charger.h"
diff --git a/zephyr/projects/nissa/src/craask/usbc.c b/zephyr/projects/nissa/src/craask/usbc.c
index b4dbad582f..b5763b70d8 100644
--- a/zephyr/projects/nissa/src/craask/usbc.c
+++ b/zephyr/projects/nissa/src/craask/usbc.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "charge_state_v2.h"
 #include "chipset.h"
diff --git a/zephyr/projects/nissa/src/nereid/charger.c b/zephyr/projects/nissa/src/nereid/charger.c
index 2835944d39..a494988951 100644
--- a/zephyr/projects/nissa/src/nereid/charger.c
+++ b/zephyr/projects/nissa/src/nereid/charger.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "battery.h"
 #include "charger.h"
diff --git a/zephyr/projects/nissa/src/nereid/usbc.c b/zephyr/projects/nissa/src/nereid/usbc.c
index fcf0ec56c8..3a28aa63fa 100644
--- a/zephyr/projects/nissa/src/nereid/usbc.c
+++ b/zephyr/projects/nissa/src/nereid/usbc.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "charge_state_v2.h"
 #include "chipset.h"
diff --git a/zephyr/projects/nissa/src/nivviks/charger.c b/zephyr/projects/nissa/src/nivviks/charger.c
index 8e97926aaa..5a8bbe0e7a 100644
--- a/zephyr/projects/nissa/src/nivviks/charger.c
+++ b/zephyr/projects/nissa/src/nivviks/charger.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "battery.h"
 #include "charger.h"
diff --git a/zephyr/projects/nissa/src/nivviks/fan.c b/zephyr/projects/nissa/src/nivviks/fan.c
index ce5935e924..b177c6eab1 100644
--- a/zephyr/projects/nissa/src/nivviks/fan.c
+++ b/zephyr/projects/nissa/src/nivviks/fan.c
@@ -3,9 +3,9 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>
 
 #include "cros_cbi.h"
 #include "fan.h"
diff --git a/zephyr/projects/nissa/src/nivviks/form_factor.c b/zephyr/projects/nissa/src/nivviks/form_factor.c
index 21fc0057d2..16132e4a6c 100644
--- a/zephyr/projects/nissa/src/nivviks/form_factor.c
+++ b/zephyr/projects/nissa/src/nivviks/form_factor.c
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include <devicetree.h>
-#include <logging/log.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/logging/log.h>
 
 #include "accelgyro.h"
 #include "cros_cbi.h"
diff --git a/zephyr/projects/nissa/src/nivviks/usbc.c b/zephyr/projects/nissa/src/nivviks/usbc.c
index fa9a4cfaa7..7184e86789 100644
--- a/zephyr/projects/nissa/src/nivviks/usbc.c
+++ b/zephyr/projects/nissa/src/nivviks/usbc.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "charge_state_v2.h"
 #include "chipset.h"
diff --git a/zephyr/projects/nissa/src/sub_board.c b/zephyr/projects/nissa/src/sub_board.c
index cb6894e38c..0081269195 100644
--- a/zephyr/projects/nissa/src/sub_board.c
+++ b/zephyr/projects/nissa/src/sub_board.c
@@ -6,10 +6,10 @@
 /* Nissa sub-board hardware configuration */
 
 #include <ap_power/ap_power.h>
-#include <drivers/gpio.h>
-#include <init.h>
-#include <kernel.h>
-#include <sys/printk.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/printk.h>
 
 #include "driver/tcpm/tcpci.h"
 #include "gpio/gpio_int.h"