diff --git a/subsys/bluetooth/audio/aics.c b/subsys/bluetooth/audio/aics.c
index ef967d9399..ec50b4d71a 100644
--- a/subsys/bluetooth/audio/aics.c
+++ b/subsys/bluetooth/audio/aics.c
@@ -5,17 +5,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/aics.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/aics.h>
 
 #include "aics_internal.h"
 
diff --git a/subsys/bluetooth/audio/aics_client.c b/subsys/bluetooth/audio/aics_client.c
index 80d48378b1..f2cfd20de9 100644
--- a/subsys/bluetooth/audio/aics_client.c
+++ b/subsys/bluetooth/audio/aics_client.c
@@ -7,19 +7,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <sys/check.h>
+#include <zephyr/sys/check.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/aics.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/aics.h>
 
 #include "aics_internal.h"
 
diff --git a/subsys/bluetooth/audio/aics_internal.h b/subsys/bluetooth/audio/aics_internal.h
index 24246a275e..6be703debf 100644
--- a/subsys/bluetooth/audio/aics_internal.h
+++ b/subsys/bluetooth/audio/aics_internal.h
@@ -12,7 +12,7 @@
 #ifndef ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_AICS_INTERNAL_
 #define ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_AICS_INTERNAL_
 #include <zephyr/types.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #if defined(CONFIG_BT_AICS)
 #define BT_AICS_MAX_DESC_SIZE CONFIG_BT_AICS_MAX_INPUT_DESCRIPTION_SIZE
diff --git a/subsys/bluetooth/audio/ascs.c b/subsys/bluetooth/audio/ascs.c
index 2ed0bae520..a37e465003 100644
--- a/subsys/bluetooth/audio/ascs.c
+++ b/subsys/bluetooth/audio/ascs.c
@@ -8,17 +8,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_ASCS)
 #define LOG_MODULE_NAME bt_ascs
diff --git a/subsys/bluetooth/audio/bass.c b/subsys/bluetooth/audio/bass.c
index e24cf9f313..9ccec691f2 100644
--- a/subsys/bluetooth/audio/bass.c
+++ b/subsys/bluetooth/audio/bass.c
@@ -7,17 +7,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/iso.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/buf.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_BASS)
 #define LOG_MODULE_NAME bt_bass
diff --git a/subsys/bluetooth/audio/bass_client.c b/subsys/bluetooth/audio/bass_client.c
index 995ce233b6..d1eeec5f53 100644
--- a/subsys/bluetooth/audio/bass_client.c
+++ b/subsys/bluetooth/audio/bass_client.c
@@ -6,18 +6,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/buf.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_BASS_CLIENT)
 #define LOG_MODULE_NAME bt_bass_client
diff --git a/subsys/bluetooth/audio/bass_internal.h b/subsys/bluetooth/audio/bass_internal.h
index 3e48bbed1e..0d48d1e3d7 100644
--- a/subsys/bluetooth/audio/bass_internal.h
+++ b/subsys/bluetooth/audio/bass_internal.h
@@ -10,8 +10,8 @@
  */
 
 #include <zephyr/types.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/audio/bass.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/audio/bass.h>
 
 #define BT_BASS_SCAN_STATE_NOT_SCANNING   0x00
 #define BT_BASS_SCAN_STATE_SCANNING       0x01
diff --git a/subsys/bluetooth/audio/broadcast_sink.c b/subsys/bluetooth/audio/broadcast_sink.c
index 987e0ec2b5..0809d58675 100644
--- a/subsys/bluetooth/audio/broadcast_sink.c
+++ b/subsys/bluetooth/audio/broadcast_sink.c
@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 #include "../host/conn_internal.h"
 #include "../host/iso_internal.h"
diff --git a/subsys/bluetooth/audio/broadcast_source.c b/subsys/bluetooth/audio/broadcast_source.c
index f1fab2c8da..0979a3bb8d 100644
--- a/subsys/bluetooth/audio/broadcast_source.c
+++ b/subsys/bluetooth/audio/broadcast_source.c
@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_AUDIO_DEBUG_BROADCAST_SOURCE)
 #define LOG_MODULE_NAME bt_audio_broadcast_source
diff --git a/subsys/bluetooth/audio/capabilities.c b/subsys/bluetooth/audio/capabilities.c
index 790a07fb24..eeb1348294 100644
--- a/subsys/bluetooth/audio/capabilities.c
+++ b/subsys/bluetooth/audio/capabilities.c
@@ -7,17 +7,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/audio.h>
-#include <bluetooth/audio/capabilities.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/capabilities.h>
 
 #include "pacs_internal.h"
 
diff --git a/subsys/bluetooth/audio/ccid_internal.h b/subsys/bluetooth/audio/ccid_internal.h
index 0a7093fce5..e68b7bdb8f 100644
--- a/subsys/bluetooth/audio/ccid_internal.h
+++ b/subsys/bluetooth/audio/ccid_internal.h
@@ -10,7 +10,7 @@
 #ifndef ZEPHYR_INCLUDE_BLUETOOTH_CCID_H_
 #define ZEPHYR_INCLUDE_BLUETOOTH_CCID_H_
 
-#include <device.h>
+#include <zephyr/device.h>
 #include <zephyr/types.h>
 
 /**
diff --git a/subsys/bluetooth/audio/codec.c b/subsys/bluetooth/audio/codec.c
index f34306b2d6..ed9bdfd68f 100644
--- a/subsys/bluetooth/audio/codec.c
+++ b/subsys/bluetooth/audio/codec.c
@@ -10,9 +10,9 @@
  *  Generic Audio.
  */
 
-#include <bluetooth/audio/audio.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_AUDIO)
 #define LOG_MODULE_NAME bt_audio
diff --git a/subsys/bluetooth/audio/csis.c b/subsys/bluetooth/audio/csis.c
index de5aa532e2..f4f2825a4e 100644
--- a/subsys/bluetooth/audio/csis.c
+++ b/subsys/bluetooth/audio/csis.c
@@ -7,19 +7,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <stdlib.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/buf.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 #include "csis_internal.h"
 #include "csis_crypto.h"
 #include "../host/conn_internal.h"
diff --git a/subsys/bluetooth/audio/csis_client.c b/subsys/bluetooth/audio/csis_client.c
index 3f6e5c3f5c..18d549f14c 100644
--- a/subsys/bluetooth/audio/csis_client.c
+++ b/subsys/bluetooth/audio/csis_client.c
@@ -18,19 +18,19 @@
  * 10) Unlock all members
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <device.h>
-#include <init.h>
-#include <sys/check.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/buf.h>
-#include <sys/byteorder.h>
-#include <bluetooth/audio/csis.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/audio/csis.h>
 #include "csis_crypto.h"
 #include "csis_internal.h"
 #include "../host/conn_internal.h"
diff --git a/subsys/bluetooth/audio/csis_crypto.c b/subsys/bluetooth/audio/csis_crypto.c
index 5686a3de71..1e2efbbf32 100644
--- a/subsys/bluetooth/audio/csis_crypto.c
+++ b/subsys/bluetooth/audio/csis_crypto.c
@@ -10,13 +10,13 @@
  * it easier to compare.
  */
 #include "csis_crypto.h"
-#include <bluetooth/crypto.h>
+#include <zephyr/bluetooth/crypto.h>
 #include <tinycrypt/constants.h>
 #include <tinycrypt/utils.h>
 #include <tinycrypt/aes.h>
 #include <tinycrypt/cmac_mode.h>
 #include <tinycrypt/ccm_mode.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_CSIS_CRYPTO)
 #define LOG_MODULE_NAME bt_csis_crypto
diff --git a/subsys/bluetooth/audio/csis_crypto.h b/subsys/bluetooth/audio/csis_crypto.h
index 6cfb95b5dc..fc8e8022c5 100644
--- a/subsys/bluetooth/audio/csis_crypto.h
+++ b/subsys/bluetooth/audio/csis_crypto.h
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <zephyr/types.h>
 
-#include <bluetooth/audio/csis.h>
+#include <zephyr/bluetooth/audio/csis.h>
 
 #define BT_CSIS_CRYPTO_KEY_SIZE   16
 #define BT_CSIS_CRYPTO_SALT_SIZE  16
diff --git a/subsys/bluetooth/audio/csis_internal.h b/subsys/bluetooth/audio/csis_internal.h
index a6d70edac9..ae561dc14a 100644
--- a/subsys/bluetooth/audio/csis_internal.h
+++ b/subsys/bluetooth/audio/csis_internal.h
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/audio/csis.h>
+#include <zephyr/bluetooth/audio/csis.h>
 
 
 #define BT_CSIS_SIRK_TYPE_ENCRYPTED             0x00
diff --git a/subsys/bluetooth/audio/has.c b/subsys/bluetooth/audio/has.c
index a4c1dfcd21..beec268485 100644
--- a/subsys/bluetooth/audio/has.c
+++ b/subsys/bluetooth/audio/has.c
@@ -5,16 +5,16 @@
  */
 
 #include <stdlib.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <device.h>
+#include <zephyr/device.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/audio.h>
-#include <bluetooth/audio/capabilities.h>
-#include <bluetooth/audio/has.h>
-#include <sys/check.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/capabilities.h>
+#include <zephyr/bluetooth/audio/has.h>
+#include <zephyr/sys/check.h>
 
 #include "has_internal.h"
 
diff --git a/subsys/bluetooth/audio/has_client.c b/subsys/bluetooth/audio/has_client.c
index b65a88c7f1..e314971e96 100644
--- a/subsys/bluetooth/audio/has_client.c
+++ b/subsys/bluetooth/audio/has_client.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/has.h>
-#include <sys/check.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/has.h>
+#include <zephyr/sys/check.h>
 
 #include "has_internal.h"
 
diff --git a/subsys/bluetooth/audio/mcc.c b/subsys/bluetooth/audio/mcc.c
index 38c063d836..8008eff69d 100644
--- a/subsys/bluetooth/audio/mcc.c
+++ b/subsys/bluetooth/audio/mcc.c
@@ -8,19 +8,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/mcc.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/mcc.h>
 
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/services/ots.h>
 #include "../services/ots/ots_client_internal.h"
 
 /* TODO: Temporarily copied here from media_proxy_internal.h - clean up */
diff --git a/subsys/bluetooth/audio/mcs.c b/subsys/bluetooth/audio/mcs.c
index 4f7d786f9f..edfccf9864 100644
--- a/subsys/bluetooth/audio/mcs.c
+++ b/subsys/bluetooth/audio/mcs.c
@@ -9,19 +9,19 @@
  */
 
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdbool.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <stdio.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/services/ots.h>
-#include <bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/services/ots.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
 
 #include "media_proxy_internal.h"
 
diff --git a/subsys/bluetooth/audio/mcs_internal.h b/subsys/bluetooth/audio/mcs_internal.h
index 1dfda65ab7..43c388a587 100644
--- a/subsys/bluetooth/audio/mcs_internal.h
+++ b/subsys/bluetooth/audio/mcs_internal.h
@@ -10,7 +10,7 @@
 
 #include <stdbool.h>
 #include <zephyr/types.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/bluetooth/audio/media_proxy.c b/subsys/bluetooth/audio/media_proxy.c
index 98ba8495a5..76e7e132fd 100644
--- a/subsys/bluetooth/audio/media_proxy.c
+++ b/subsys/bluetooth/audio/media_proxy.c
@@ -6,11 +6,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/check.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/services/ots.h>
-#include <bluetooth/audio/media_proxy.h>
-#include <bluetooth/audio/mcc.h>
+#include <zephyr/bluetooth/services/ots.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/audio/mcc.h>
 
 #include "media_proxy_internal.h"
 
diff --git a/subsys/bluetooth/audio/media_proxy_internal.h b/subsys/bluetooth/audio/media_proxy_internal.h
index 99b892520e..b55bb58522 100644
--- a/subsys/bluetooth/audio/media_proxy_internal.h
+++ b/subsys/bluetooth/audio/media_proxy_internal.h
@@ -9,7 +9,7 @@
 
 /** @brief Internal APIs for Bluetooth Media Control */
 
-#include <bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
 
 #define MPL_NO_TRACK_ID 0
 
diff --git a/subsys/bluetooth/audio/mics.c b/subsys/bluetooth/audio/mics.c
index 575c947834..61a26a9e35 100644
--- a/subsys/bluetooth/audio/mics.c
+++ b/subsys/bluetooth/audio/mics.c
@@ -6,18 +6,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/mics.h>
-#include <bluetooth/audio/aics.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/audio/aics.h>
 
 #include "mics_internal.h"
 
diff --git a/subsys/bluetooth/audio/mics_client.c b/subsys/bluetooth/audio/mics_client.c
index bc9681bdc2..fffefe9dfc 100644
--- a/subsys/bluetooth/audio/mics_client.c
+++ b/subsys/bluetooth/audio/mics_client.c
@@ -7,18 +7,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <sys/check.h>
+#include <zephyr/sys/check.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/mics.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/mics.h>
 
 #include "mics_internal.h"
 
diff --git a/subsys/bluetooth/audio/mics_internal.h b/subsys/bluetooth/audio/mics_internal.h
index 02080c5601..f9bc0d0ada 100644
--- a/subsys/bluetooth/audio/mics_internal.h
+++ b/subsys/bluetooth/audio/mics_internal.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_MICS_INTERNAL_
 #define ZEPHYR_INCLUDE_BLUETOOTH_AUDIO_MICS_INTERNAL_
 #include <zephyr/types.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #if defined(CONFIG_BT_MICS)
 struct bt_mics_server {
diff --git a/subsys/bluetooth/audio/mpl.c b/subsys/bluetooth/audio/mpl.c
index 8e59ef5598..3fae8fef38 100644
--- a/subsys/bluetooth/audio/mpl.c
+++ b/subsys/bluetooth/audio/mpl.c
@@ -6,10 +6,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/services/ots.h>
-#include <bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/services/ots.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
 
 #include "media_proxy_internal.h"
 #include "mpl_internal.h"
diff --git a/subsys/bluetooth/audio/pacs.c b/subsys/bluetooth/audio/pacs.c
index 2695130b3a..8dcd6da5b1 100644
--- a/subsys/bluetooth/audio/pacs.c
+++ b/subsys/bluetooth/audio/pacs.c
@@ -9,17 +9,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/audio.h>
-#include <bluetooth/audio/capabilities.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/capabilities.h>
 #include "../host/conn_internal.h"
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_PACS)
diff --git a/subsys/bluetooth/audio/pacs_internal.h b/subsys/bluetooth/audio/pacs_internal.h
index 6e5242a32e..9717283c71 100644
--- a/subsys/bluetooth/audio/pacs_internal.h
+++ b/subsys/bluetooth/audio/pacs_internal.h
@@ -7,7 +7,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 #define BT_AUDIO_LOCATION_MASK BIT_MASK(28)
 
diff --git a/subsys/bluetooth/audio/stream.c b/subsys/bluetooth/audio/stream.c
index 691ad1ffe6..12bef594b3 100644
--- a/subsys/bluetooth/audio/stream.c
+++ b/subsys/bluetooth/audio/stream.c
@@ -7,15 +7,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/iso.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 #include "../host/conn_internal.h"
 #include "../host/iso_internal.h"
diff --git a/subsys/bluetooth/audio/tbs.c b/subsys/bluetooth/audio/tbs.c
index 9ad4b7d96e..7afe12ecdc 100644
--- a/subsys/bluetooth/audio/tbs.c
+++ b/subsys/bluetooth/audio/tbs.c
@@ -6,16 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <stdlib.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #include "tbs_internal.h"
 #include "ccid_internal.h"
diff --git a/subsys/bluetooth/audio/tbs_client.c b/subsys/bluetooth/audio/tbs_client.c
index ee4b841dde..062a3222a9 100644
--- a/subsys/bluetooth/audio/tbs_client.c
+++ b/subsys/bluetooth/audio/tbs_client.c
@@ -6,17 +6,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/buf.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/tbs.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/tbs.h>
 
 #include "tbs_internal.h"
 
diff --git a/subsys/bluetooth/audio/tbs_internal.h b/subsys/bluetooth/audio/tbs_internal.h
index 03c99d935d..9f7aff4ae2 100644
--- a/subsys/bluetooth/audio/tbs_internal.h
+++ b/subsys/bluetooth/audio/tbs_internal.h
@@ -10,7 +10,7 @@
  */
 
 #include <zephyr/types.h>
-#include <bluetooth/audio/tbs.h>
+#include <zephyr/bluetooth/audio/tbs.h>
 
 #define BT_TBS_MAX_UCI_SIZE                        6
 #define BT_TBS_MIN_URI_LEN                         3 /* a:b */
diff --git a/subsys/bluetooth/audio/unicast_client.c b/subsys/bluetooth/audio/unicast_client.c
index 12570dd31d..1eed52df2d 100644
--- a/subsys/bluetooth/audio/unicast_client.c
+++ b/subsys/bluetooth/audio/unicast_client.c
@@ -9,13 +9,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 #include "../host/hci_core.h"
 #include "../host/conn_internal.h"
diff --git a/subsys/bluetooth/audio/unicast_server.c b/subsys/bluetooth/audio/unicast_server.c
index f9e791251d..6b63c8237c 100644
--- a/subsys/bluetooth/audio/unicast_server.c
+++ b/subsys/bluetooth/audio/unicast_server.c
@@ -6,9 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/check.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 #include "pacs_internal.h"
 
diff --git a/subsys/bluetooth/audio/unicast_server.h b/subsys/bluetooth/audio/unicast_server.h
index 09a8b6632d..2f90da4167 100644
--- a/subsys/bluetooth/audio/unicast_server.h
+++ b/subsys/bluetooth/audio/unicast_server.h
@@ -6,6 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/audio.h>
 
 extern const struct bt_audio_unicast_server_cb *unicast_server_cb;
diff --git a/subsys/bluetooth/audio/vcs.c b/subsys/bluetooth/audio/vcs.c
index 4a563ad8f7..ce87b08f9c 100644
--- a/subsys/bluetooth/audio/vcs.c
+++ b/subsys/bluetooth/audio/vcs.c
@@ -8,17 +8,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/vcs.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/vcs.h>
 
 #include "vcs_internal.h"
 
diff --git a/subsys/bluetooth/audio/vcs_client.c b/subsys/bluetooth/audio/vcs_client.c
index 0a3b311a76..55d58473cb 100644
--- a/subsys/bluetooth/audio/vcs_client.c
+++ b/subsys/bluetooth/audio/vcs_client.c
@@ -7,18 +7,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <sys/check.h>
+#include <zephyr/sys/check.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/vcs.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/vcs.h>
 
 #include "vcs_internal.h"
 
diff --git a/subsys/bluetooth/audio/vocs.c b/subsys/bluetooth/audio/vocs.c
index 1b0b6f9e09..2ad85462f4 100644
--- a/subsys/bluetooth/audio/vocs.c
+++ b/subsys/bluetooth/audio/vocs.c
@@ -5,17 +5,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/vocs.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/vocs.h>
 
 #include "vocs_internal.h"
 
diff --git a/subsys/bluetooth/audio/vocs_client.c b/subsys/bluetooth/audio/vocs_client.c
index 334878b46f..92c1831047 100644
--- a/subsys/bluetooth/audio/vocs_client.c
+++ b/subsys/bluetooth/audio/vocs_client.c
@@ -6,18 +6,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <device.h>
-#include <init.h>
-#include <sys/check.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/vocs.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/vocs.h>
 
 #include "vocs_internal.h"
 
diff --git a/subsys/bluetooth/common/dummy.c b/subsys/bluetooth/common/dummy.c
index 5c3ffc0014..10d8f397d5 100644
--- a/subsys/bluetooth/common/dummy.c
+++ b/subsys/bluetooth/common/dummy.c
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <bluetooth/bluetooth.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 /*
  * The unpacked structs below are used inside __packed structures that reflect
diff --git a/subsys/bluetooth/common/log.c b/subsys/bluetooth/common/log.c
index 9d1033b62f..075350b8db 100644
--- a/subsys/bluetooth/common/log.c
+++ b/subsys/bluetooth/common/log.c
@@ -14,11 +14,11 @@
 
 #include <stddef.h>
 #include <zephyr/types.h>
-#include <zephyr.h>
-#include <sys/util.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/hci.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/hci.h>
 
 const char *bt_hex_real(const void *buf, size_t len)
 {
diff --git a/subsys/bluetooth/common/log.h b/subsys/bluetooth/common/log.h
index 5acaf1d0c7..cbc2b572f7 100644
--- a/subsys/bluetooth/common/log.h
+++ b/subsys/bluetooth/common/log.h
@@ -11,15 +11,15 @@
 #ifndef __BT_LOG_H
 #define __BT_LOG_H
 
-#include <linker/sections.h>
+#include <zephyr/linker/sections.h>
 #include <offsets.h>
-#include <zephyr.h>
-#include <logging/log.h>
-#include <sys/__assert.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/hci.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/bluetooth/common/rpa.c b/subsys/bluetooth/common/rpa.c
index 30bcb59d11..b1c031ea0f 100644
--- a/subsys/bluetooth/common/rpa.c
+++ b/subsys/bluetooth/common/rpa.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <errno.h>
 #include <string.h>
@@ -19,7 +19,7 @@
 #define LOG_MODULE_NAME bt_rpa
 #include "common/log.h"
 
-#include <bluetooth/crypto.h>
+#include <zephyr/bluetooth/crypto.h>
 
 #if defined(CONFIG_BT_CTLR) && defined(CONFIG_BT_HOST_CRYPTO)
 #include "../controller/util/util.h"
diff --git a/subsys/bluetooth/common/rpa.h b/subsys/bluetooth/common/rpa.h
index b99e6eda5b..bc06276a00 100644
--- a/subsys/bluetooth/common/rpa.h
+++ b/subsys/bluetooth/common/rpa.h
@@ -9,8 +9,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 
 bool bt_rpa_irk_matches(const uint8_t irk[16], const bt_addr_t *addr);
 int bt_rpa_create(const uint8_t irk[16], bt_addr_t *rpa);
diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
index b419eb6e2c..935b827d32 100644
--- a/subsys/bluetooth/controller/hci/hci.c
+++ b/subsys/bluetooth/controller/hci/hci.c
@@ -11,16 +11,16 @@
 #include <version.h>
 #include <errno.h>
 
-#include <sys/util.h>
-#include <sys/byteorder.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/atomic.h>
 
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_vs.h>
-#include <bluetooth/buf.h>
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include "../host/hci_ecc.h"
 
diff --git a/subsys/bluetooth/controller/hci/hci_driver.c b/subsys/bluetooth/controller/hci/hci_driver.c
index e35fd83cc2..27b7e8930a 100644
--- a/subsys/bluetooth/controller/hci/hci_driver.c
+++ b/subsys/bluetooth/controller/hci/hci_driver.c
@@ -9,23 +9,23 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <init.h>
-#include <device.h>
-#include <drivers/clock_control.h>
-#include <sys/atomic.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/sys/atomic.h>
 
-#include <sys/util.h>
-#include <debug/stack.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #ifdef CONFIG_CLOCK_CONTROL_NRF
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 #endif
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
diff --git a/subsys/bluetooth/controller/hci/nordic/hci_vendor.c b/subsys/bluetooth/controller/hci/nordic/hci_vendor.c
index 8a25755b64..a6f6a185d6 100644
--- a/subsys/bluetooth/controller/hci/nordic/hci_vendor.c
+++ b/subsys/bluetooth/controller/hci/nordic/hci_vendor.c
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/addr.h>
-#include <bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/hci_vs.h>
 
 #include <soc.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/isoal.c b/subsys/bluetooth/controller/ll_sw/isoal.c
index a5333fd376..0ac6e4d314 100644
--- a/subsys/bluetooth/controller/ll_sw/isoal.c
+++ b/subsys/bluetooth/controller/ll_sw/isoal.c
@@ -6,12 +6,12 @@
 #include <string.h>
 #include <zephyr/types.h>
 #include <sys/types.h>
-#include <toolchain.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/sys/util.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include "util/memq.h"
 #include "pdu.h"
diff --git a/subsys/bluetooth/controller/ll_sw/isoal.h b/subsys/bluetooth/controller/ll_sw/isoal.h
index e25cb98783..b5c59a9bc3 100644
--- a/subsys/bluetooth/controller/ll_sw/isoal.h
+++ b/subsys/bluetooth/controller/ll_sw/isoal.h
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <zephyr/types.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /** Function return error codes */
 typedef uint8_t isoal_status_t;
diff --git a/subsys/bluetooth/controller/ll_sw/ll_addr.c b/subsys/bluetooth/controller/ll_sw/ll_addr.c
index 37a682dd8b..dc711daff3 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_addr.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_addr.c
@@ -7,10 +7,10 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/controller.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/controller.h>
 
 #include "util/util.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ll_feat.c b/subsys/bluetooth/controller/ll_sw/ll_feat.c
index 4d31b0f8c4..9a20143a26 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_feat.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_feat.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "util/util.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ll_settings.c b/subsys/bluetooth/controller/ll_sw/ll_settings.c
index f8347b451e..b01ea005fb 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_settings.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_settings.c
@@ -6,9 +6,9 @@
 
 #include <string.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include "ll_settings.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c b/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
index d5929d92c0..6361d04bb0 100644
--- a/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
+++ b/subsys/bluetooth/controller/ll_sw/ll_tx_pwr.c
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_vs.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/lll_common.c b/subsys/bluetooth/controller/ll_sw/lll_common.c
index 350549bdd7..407836850a 100644
--- a/subsys/bluetooth/controller/ll_sw/lll_common.c
+++ b/subsys/bluetooth/controller/ll_sw/lll_common.c
@@ -6,7 +6,7 @@
 
 #include <errno.h>
 #include <zephyr/types.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 #include "util/mem.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/cntr.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/cntr.c
index ab9aa04ede..bca6f2eb2a 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/cntr.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/cntr.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/dlist.h>
+#include <zephyr/sys/dlist.h>
 
 #include <hal/nrf_rtc.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c
index b094fa614f..ef7d873956 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ecb.c
@@ -7,7 +7,7 @@
 
 #include <string.h>
 
-#include <sys/dlist.h>
+#include <zephyr/sys/dlist.h>
 
 #include <hal/nrf_ecb.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
index 62787ea5b5..84b4d5b1ec 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio.c
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/dlist.h>
-#include <toolchain.h>
-#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/sys/dlist.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 #include <soc.h>
 
 #include <hal/nrf_rtc.h>
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c
index 3a2d6e48dd..07ec40df76 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_df.c
@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <errno.h>
 #include <soc.h>
-#include <devicetree.h>
-#include <sys/util_macro.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util_macro.h>
 #include <hal/nrf_radio.h>
 #include <hal/nrf_gpio.h>
 #include <hal/ccm.h>
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h
index 7d419c1b37..f38f88dc65 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h
@@ -12,8 +12,8 @@
  * properties to the generic macros required by the nRF5 radio HAL.
  */
 
-#include <devicetree.h>
-#include <dt-bindings/gpio/gpio.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/dt-bindings/gpio/gpio.h>
 
 #if DT_NODE_HAS_PROP(DT_NODELABEL(radio), fem)
 #define FEM_NODE             DT_PHANDLE(DT_NODELABEL(radio), fem)
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi_resources.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi_resources.h
index 9d7df94e04..c822f54900 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi_resources.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_ppi_resources.h
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include "radio_nrf5_fem.h"
 
 #if defined(CONFIG_BT_CTLR_TIFS_HW) || !defined(CONFIG_BT_CTLR_SW_SWITCH_SINGLE_TIMER)
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.c b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.c
index 3314d58718..1f925ecac3 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/ticker.c
@@ -6,8 +6,8 @@
  */
 
 #include <stdbool.h>
-#include <sys/dlist.h>
-#include <sys/util.h>
+#include <zephyr/sys/dlist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/cntr.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
index f7ec7b0b01..1b6e0373cc 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c
@@ -8,12 +8,12 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #include <soc.h>
-#include <device.h>
+#include <zephyr/device.h>
 
-#include <drivers/entropy.h>
+#include <zephyr/drivers/entropy.h>
 
 #include "hal/swi.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
index b8e905c983..71344225d4 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv.c
@@ -8,8 +8,8 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 #include <soc.h>
 
 #include "hal/cpu.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
index 79f477e42b..d25fd65d71 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_aux.c
@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <sys/byteorder.h>
-#include <bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
 #include <soc.h>
 
 #include "hal/cpu.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
index 3ab243fdc7..e727a4e529 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_iso.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 
 #include <soc.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_sync.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_sync.c
index d87410bf0d..c4db47ff25 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_adv_sync.c
@@ -8,7 +8,7 @@
 
 #include <soc.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central.c
index 0caf0d6248..285aa5567b 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_central.c
@@ -7,10 +7,10 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/ccm.h"
 #include "hal/radio.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c
index 5f4a2d9595..46ab74ef90 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c
@@ -5,10 +5,10 @@
  */
 
 #include <soc.h>
-#include <device.h>
+#include <zephyr/device.h>
 
-#include <drivers/clock_control.h>
-#include <drivers/clock_control/nrf_clock_control.h>
+#include <zephyr/drivers/clock_control.h>
+#include <zephyr/drivers/clock_control/nrf_clock_control.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
 #define LOG_MODULE_NAME bt_ctlr_lll_clock
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
index 89b9e87f4f..c0db5dceed 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn.c
@@ -8,10 +8,10 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <soc.h>
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn_iso.c
index fd06ef5a7b..f2b7263f83 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_conn_iso.c
@@ -6,9 +6,9 @@
 
 #include <stddef.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "util/memq.h"
 #include "util/mem.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_df.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_df.c
index d35a00801c..20e7d82b31 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_df.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_df.c
@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "util/util.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral.c
index a3aaef801e..56a56127e0 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral.c
@@ -6,10 +6,10 @@
 
 #include <stdint.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/ccm.h"
 #include "hal/radio.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
index 7af172dab7..04c784f5fa 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_peripheral_iso.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <soc.h>
 
 #include "hal/cpu.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_prof.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_prof.c
index fc5d56ee23..18dae66791 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_prof.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_prof.c
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <errno.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #include "hal/ccm.h"
 #include "hal/radio.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
index 2c266a4806..6c357e3dd9 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan.c
@@ -6,12 +6,12 @@
 
 #include <stdint.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #include <soc.h>
 
-#include <sys/byteorder.h>
-#include <bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
index 6ffd3d7a62..c62940b33d 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_scan_aux.c
@@ -6,10 +6,10 @@
 
 #include <stdint.h>
 
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "hal/ccm.h"
 #include "hal/radio.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
index 7a92a7b709..6a9ef656b1 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync.c
@@ -5,9 +5,9 @@
  */
 #include <stdint.h>
 
-#include <toolchain.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/ccm.h"
 #include "hal/radio.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
index 0f975d607b..c4f1fdfa37 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_sync_iso.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 
 #include <soc.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c
index dc2e5327b3..5d32a84854 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_test.c
@@ -7,7 +7,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #include <soc.h>
 
diff --git a/subsys/bluetooth/controller/ll_sw/nordic/ull/ull_iso_vendor.c b/subsys/bluetooth/controller/ll_sw/nordic/ull/ull_iso_vendor.c
index 61fcc06007..e3b24af1ef 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/ull/ull_iso_vendor.c
+++ b/subsys/bluetooth/controller/ll_sw/nordic/ull/ull_iso_vendor.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /* FIXME: Implement vendor specific data path configuration */
 static bool dummy;
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/cntr.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/cntr.c
index c2d8fc0e83..6877b57392 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/cntr.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/cntr.c
@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/dlist.h>
+#include <zephyr/sys/dlist.h>
 
 #include "hal/cntr.h"
 
 #define LOG_MODULE_NAME bt_ctlr_cntr
 #include "common/log.h"
 #include "hal/debug.h"
-#include <dt-bindings/interrupt-controller/openisa-intmux.h>
+#include <zephyr/dt-bindings/interrupt-controller/openisa-intmux.h>
 #include "ll_irqs.h"
 
 
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/debug.h b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/debug.h
index 299509dc10..8c3ade5475 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/debug.h
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/debug.h
@@ -29,7 +29,7 @@
  */
 #ifdef CONFIG_BT_CTLR_DEBUG_PINS
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 extern const struct device *vega_debug_portb;
 extern const struct device *vega_debug_portc;
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ecb.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ecb.c
index 1809ab002c..506214c68f 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ecb.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ecb.c
@@ -8,8 +8,8 @@
 
 #include <string.h>
 
-#include <sys/dlist.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/dlist.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/ecb.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ll_irqs.h b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ll_irqs.h
index faa0651e17..7664c41a4d 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ll_irqs.h
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ll_irqs.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 /* Needed for the DT_INST_* defines below */
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 
 #define LL_SWI4_IRQn EMVSIM0_IRQn
 #define LL_SWI5_IRQn MUA_IRQn
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c
index 3270a689e4..586ee252ac 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/radio/radio.c
@@ -7,12 +7,12 @@
  */
 
 #include <string.h>
-#include <sys/printk.h>
-#include <sys/dlist.h>
-#include <sys/byteorder.h>
-#include <bluetooth/addr.h>
-#include <toolchain.h>
-#include <irq.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/dlist.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/irq.h>
 #include <errno.h>
 
 #include "util/mem.h"
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.c b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.c
index 17de7ac7db..eeed24f6ed 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/hal/RV32M1/ticker.c
@@ -6,7 +6,7 @@
  */
 
 #include <stdbool.h>
-#include <sys/dlist.h>
+#include <zephyr/sys/dlist.h>
 
 #include "hal/cntr.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
index 727cd993f5..29832ddb7a 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll.c
@@ -9,12 +9,12 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #include <soc.h>
-#include <device.h>
+#include <zephyr/device.h>
 
-#include <drivers/entropy.h>
+#include <zephyr/drivers/entropy.h>
 
 #include "hal/swi.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c
index 1c0663380d..59ec4ad42c 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_adv.c
@@ -7,10 +7,10 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_central.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_central.c
index e9159d59a4..50086240c9 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_central.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_central.c
@@ -6,9 +6,9 @@
 
 #include <stdbool.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 #include "hal/radio.h"
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_clock.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_clock.c
index f0ea969800..a1e6f9c960 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_clock.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_clock.c
@@ -6,8 +6,8 @@
 
 #include <zephyr/types.h>
 #include <soc.h>
-#include <device.h>
-#include <drivers/clock_control.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/clock_control.h>
 
 #define LOG_MODULE_NAME bt_ctlr_llsw_openisa_lll_clock
 #include "common/log.h"
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c
index ab631a6f8a..10cfb5183b 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_conn.c
@@ -7,9 +7,9 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <soc.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_peripheral.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_peripheral.c
index c3d046600a..1ee25b6ba2 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_peripheral.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_peripheral.c
@@ -6,9 +6,9 @@
 
 #include <stdbool.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 #include "hal/radio.h"
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_prof.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_prof.c
index f06ef88139..67f21b773d 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_prof.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_prof.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
 
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c
index ced2e43a44..12866e61fe 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_scan.c
@@ -6,9 +6,9 @@
  */
 
 #include <zephyr/types.h>
-#include <toolchain.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/ccm.h"
 #include "hal/radio.h"
diff --git a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_test.c b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_test.c
index 6ddc6f1080..69d99cc282 100644
--- a/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_test.c
+++ b/subsys/bluetooth/controller/ll_sw/openisa/lll/lll_test.c
@@ -7,10 +7,10 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
 #include <soc.h>
-#include <drivers/clock_control.h>
+#include <zephyr/drivers/clock_control.h>
 
 #include "hal/cpu.h"
 #include "hal/cntr.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull.c b/subsys/bluetooth/controller/ll_sw/ull.c
index 95124b3135..448209b9d5 100644
--- a/subsys/bluetooth/controller/ll_sw/ull.c
+++ b/subsys/bluetooth/controller/ll_sw/ull.c
@@ -8,11 +8,11 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <device.h>
-#include <drivers/entropy.h>
-#include <bluetooth/hci.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv.c b/subsys/bluetooth/controller/ll_sw/ull_adv.c
index f061ab9774..5e39e08b7d 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv.c
@@ -7,10 +7,10 @@
 
 #include <string.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
index 88986a8aa3..4b3f0268ed 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_aux.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
index 42120e3a86..07a89d9c24 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_iso.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <sys/byteorder.h>
-#include <bluetooth/bluetooth.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c b/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
index edea6430f9..7b2e5c8b9f 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_adv_sync.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_central.c b/subsys/bluetooth/controller/ll_sw/ull_central.c
index 0cfc102c59..28b8960a2b 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_central.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_central.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "util/util.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_central_iso.c b/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
index c490dbaf4c..989a614163 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_central_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_DRIVER)
 #define LOG_MODULE_NAME bt_ctlr_ull_central_iso
diff --git a/subsys/bluetooth/controller/ll_sw/ull_chan.c b/subsys/bluetooth/controller/ll_sw/ull_chan.c
index 213f7237f5..9d46dc342d 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_chan.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_chan.c
@@ -8,8 +8,8 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <toolchain.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/sys/util.h>
 
 #include "util/util.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
index d6585ff974..69172251b9 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -5,11 +5,11 @@
  */
 
 #include <stddef.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/cpu.h"
 #include "hal/ecb.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c b/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
index 86b74ea158..d8e9c80aa1 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn_iso.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <bluetooth/bluetooth.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include "util/mem.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_df.c b/subsys/bluetooth/controller/ll_sw/ull_df.c
index 19d63c06f8..c80cc56d43 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_df.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_df.c
@@ -5,10 +5,10 @@
  */
 
 #include <stdint.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <sys/util.h>
-#include <bluetooth/hci.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_filter.c b/subsys/bluetooth/controller/ll_sw/ull_filter.c
index e5caa0bf41..496c805439 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_filter.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_filter.c
@@ -6,10 +6,10 @@
 
 #include <string.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_iso.c b/subsys/bluetooth/controller/ll_sw/ull_iso.c
index 75b975f2a6..557178d47b 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_iso.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
 
 #include "hal/cpu.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp.c b/subsys/bluetooth/controller/ll_sw/ull_llcp.c
index a328613105..56bb01bf80 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp.c
@@ -6,10 +6,10 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_chmu.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_chmu.c
index 10f22dad78..4dc5ad7b0c 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_chmu.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_chmu.c
@@ -6,10 +6,10 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_common.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_common.c
index 0beda78a1f..3fe8732632 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_common.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_common.c
@@ -6,10 +6,10 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_conn_upd.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_conn_upd.c
index aca96fb404..d5ca01b320 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_conn_upd.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_conn_upd.c
@@ -6,10 +6,10 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c
index 6224c7d922..ded5f4af24 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c
@@ -6,10 +6,10 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ecb.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_local.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_local.c
index 6998f97583..12a4f50913 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_local.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_local.c
@@ -6,10 +6,10 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c
index 3fb0958864..c1a5f53c18 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c
@@ -6,10 +6,10 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_phy.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_phy.c
index bbfca3829c..d0f7504220 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_phy.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_phy.c
@@ -6,10 +6,10 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c b/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c
index 651ba6a480..5a726916e0 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c
@@ -6,10 +6,10 @@
 
 #include <zephyr/types.h>
 
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
-#include <sys/slist.h>
-#include <sys/util.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/util.h>
 
 #include "hal/ccm.h"
 
diff --git a/subsys/bluetooth/controller/ll_sw/ull_peripheral.c b/subsys/bluetooth/controller/ll_sw/ull_peripheral.c
index bd85580d4d..9dbd1ee58c 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_peripheral.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_peripheral.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
-#include <sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "util/util.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c b/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
index 6570e9dce0..8d2eddbc8b 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_peripheral_iso.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <bluetooth/buf.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "util/memq.h"
 #include "util/mayfly.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan.c b/subsys/bluetooth/controller/ll_sw/ull_scan.c
index 8a85618c10..ef08a89a1b 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan.c
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "hal/cpu.h"
 #include "hal/ccm.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
index 537eb43c2d..86b5de1766 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_scan_aux.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
 #include "util/mem.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sched.c b/subsys/bluetooth/controller/ll_sw/ull_sched.c
index 24c039e862..cf33205029 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sched.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sched.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "hal/ccm.h"
 #include "hal/radio.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync.c b/subsys/bluetooth/controller/ll_sw/ull_sync.c
index 3a276a7cb5..f0d288b4be 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <sys/byteorder.h>
-#include <bluetooth/hci.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "util/util.h"
 #include "util/mem.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
index 9d5a01e391..ecc31b918c 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_sync_iso.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <bluetooth/bluetooth.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "util/util.h"
 #include "util/mem.h"
diff --git a/subsys/bluetooth/controller/ll_sw/ull_tx_queue.h b/subsys/bluetooth/controller/ll_sw/ull_tx_queue.h
index e6df1c7e07..33ae8783cd 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_tx_queue.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_tx_queue.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 
 struct ull_tx_q {
 	uint8_t pause_data; /* Data pause state of the tx queue */
diff --git a/subsys/bluetooth/controller/util/mayfly.c b/subsys/bluetooth/controller/util/mayfly.c
index ede9451b9e..e3523fcb11 100644
--- a/subsys/bluetooth/controller/util/mayfly.c
+++ b/subsys/bluetooth/controller/util/mayfly.c
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 #include <zephyr/types.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include "memq.h"
 #include "mayfly.h"
 
diff --git a/subsys/bluetooth/controller/util/util.c b/subsys/bluetooth/controller/util/util.c
index 7cae323b0c..330241e029 100644
--- a/subsys/bluetooth/controller/util/util.c
+++ b/subsys/bluetooth/controller/util/util.c
@@ -7,8 +7,8 @@
 #include <string.h>
 
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
-#include <drivers/entropy.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/entropy.h>
 
 #include "util.h"
 #include "util/memq.h"
diff --git a/subsys/bluetooth/host/a2dp.c b/subsys/bluetooth/host/a2dp.c
index 1353e72e4b..b4b516ec8d 100644
--- a/subsys/bluetooth/host/a2dp.c
+++ b/subsys/bluetooth/host/a2dp.c
@@ -8,18 +8,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <sys/printk.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/avdtp.h>
-#include <bluetooth/a2dp.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/avdtp.h>
+#include <zephyr/bluetooth/a2dp.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_A2DP)
 #define LOG_MODULE_NAME bt_a2dp
diff --git a/subsys/bluetooth/host/addr.c b/subsys/bluetooth/host/addr.c
index 1cecc228bd..1fb66d0607 100644
--- a/subsys/bluetooth/host/addr.c
+++ b/subsys/bluetooth/host/addr.c
@@ -9,10 +9,10 @@
 #include <string.h>
 #include <errno.h>
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/addr.h>
-#include <bluetooth/crypto.h>
+#include <zephyr/bluetooth/addr.h>
+#include <zephyr/bluetooth/crypto.h>
 
 static inline int create_random_addr(bt_addr_le_t *addr)
 {
diff --git a/subsys/bluetooth/host/adv.c b/subsys/bluetooth/host/adv.c
index e0fdd57436..9cc1d3fb2e 100644
--- a/subsys/bluetooth/host/adv.c
+++ b/subsys/bluetooth/host/adv.c
@@ -6,11 +6,11 @@
  */
 #include <sys/types.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/buf.h>
 
 #include "hci_core.h"
 #include "conn_internal.h"
diff --git a/subsys/bluetooth/host/aes_ccm.c b/subsys/bluetooth/host/aes_ccm.c
index 55730597e6..2797a30b9a 100644
--- a/subsys/bluetooth/host/aes_ccm.c
+++ b/subsys/bluetooth/host/aes_ccm.c
@@ -7,9 +7,9 @@
 
 #include <string.h>
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <bluetooth/crypto.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/bluetooth/crypto.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
 #define LOG_MODULE_NAME bt_aes_ccm
diff --git a/subsys/bluetooth/host/at.c b/subsys/bluetooth/host/at.c
index 9b622b18df..14d6f53904 100644
--- a/subsys/bluetooth/host/at.c
+++ b/subsys/bluetooth/host/at.c
@@ -13,7 +13,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdarg.h>
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #include "at.h"
 
diff --git a/subsys/bluetooth/host/att.c b/subsys/bluetooth/host/att.c
index 0752806441..dc407f46f4 100644
--- a/subsys/bluetooth/host/att.c
+++ b/subsys/bluetooth/host/att.c
@@ -6,20 +6,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/att.h>
-#include <bluetooth/gatt.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/att.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_ATT)
 #define LOG_MODULE_NAME bt_att
diff --git a/subsys/bluetooth/host/avdtp.c b/subsys/bluetooth/host/avdtp.c
index 2bde75b05b..39d6551ca3 100644
--- a/subsys/bluetooth/host/avdtp.c
+++ b/subsys/bluetooth/host/avdtp.c
@@ -5,18 +5,18 @@
  *
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/avdtp.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/avdtp.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_AVDTP)
 #define LOG_MODULE_NAME bt_avdtp
diff --git a/subsys/bluetooth/host/avdtp_internal.h b/subsys/bluetooth/host/avdtp_internal.h
index accab9769c..86db8fab45 100644
--- a/subsys/bluetooth/host/avdtp_internal.h
+++ b/subsys/bluetooth/host/avdtp_internal.h
@@ -6,7 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/avdtp.h>
+#include <zephyr/bluetooth/avdtp.h>
 
 /* @brief A2DP ROLE's */
 #define A2DP_SRC_ROLE 0x00
diff --git a/subsys/bluetooth/host/br.c b/subsys/bluetooth/host/br.c
index 4c072e4d1d..2f7315249c 100644
--- a/subsys/bluetooth/host/br.c
+++ b/subsys/bluetooth/host/br.c
@@ -5,12 +5,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/buf.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
 #define LOG_MODULE_NAME bt_br
diff --git a/subsys/bluetooth/host/buf.c b/subsys/bluetooth/host/buf.c
index 159a60065c..03c3e59182 100644
--- a/subsys/bluetooth/host/buf.c
+++ b/subsys/bluetooth/host/buf.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/buf.h>
-#include <bluetooth/l2cap.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/l2cap.h>
 
 #include "hci_core.h"
 #include "conn_internal.h"
diff --git a/subsys/bluetooth/host/conn.c b/subsys/bluetooth/host/conn.c
index 31141b1409..0807dbef86 100644
--- a/subsys/bluetooth/host/conn.c
+++ b/subsys/bluetooth/host/conn.c
@@ -6,24 +6,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
-#include <sys/util.h>
-#include <sys/slist.h>
-#include <debug/stack.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/sys/__assert.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/direction.h>
-#include <bluetooth/conn.h>
-#include <drivers/bluetooth/hci_driver.h>
-#include <bluetooth/att.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/direction.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/att.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_CONN)
 #define LOG_MODULE_NAME bt_conn
diff --git a/subsys/bluetooth/host/conn_internal.h b/subsys/bluetooth/host/conn_internal.h
index a79ff9dbf0..a95e041d2d 100644
--- a/subsys/bluetooth/host/conn_internal.h
+++ b/subsys/bluetooth/host/conn_internal.h
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/iso.h>
+#include <zephyr/bluetooth/iso.h>
 
 typedef enum __packed {
 	BT_CONN_DISCONNECTED,
diff --git a/subsys/bluetooth/host/crypto.c b/subsys/bluetooth/host/crypto.c
index aba458cc93..6d83939dee 100644
--- a/subsys/bluetooth/host/crypto.c
+++ b/subsys/bluetooth/host/crypto.c
@@ -8,13 +8,13 @@
 #include <string.h>
 #include <errno.h>
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/crypto.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/crypto.h>
 
 #include <tinycrypt/constants.h>
 #include <tinycrypt/hmac_prng.h>
diff --git a/subsys/bluetooth/host/direction.c b/subsys/bluetooth/host/direction.c
index 59601c3323..dad6b9b2a6 100644
--- a/subsys/bluetooth/host/direction.c
+++ b/subsys/bluetooth/host/direction.c
@@ -5,14 +5,14 @@
  */
 #include <stdint.h>
 #include <assert.h>
-#include <sys/check.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/check.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/direction.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/direction.h>
 
 #include "hci_core.h"
 #include "scan.h"
diff --git a/subsys/bluetooth/host/ecc.c b/subsys/bluetooth/host/ecc.c
index b259705460..ab88f7a6f2 100644
--- a/subsys/bluetooth/host/ecc.c
+++ b/subsys/bluetooth/host/ecc.c
@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/hci.h>
 
 #include "ecc.h"
 #include "hci_core.h"
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
index 59645d6967..d48212ee47 100644
--- a/subsys/bluetooth/host/gatt.c
+++ b/subsys/bluetooth/host/gatt.c
@@ -6,16 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
 #if defined(CONFIG_BT_GATT_CACHING)
 #include <tinycrypt/constants.h>
@@ -25,12 +25,12 @@
 #include <tinycrypt/ccm_mode.h>
 #endif /* CONFIG_BT_GATT_CACHING */
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_GATT)
 #define LOG_MODULE_NAME bt_gatt
diff --git a/subsys/bluetooth/host/hci_common.c b/subsys/bluetooth/host/hci_common.c
index 9cf75b623f..272d472896 100644
--- a/subsys/bluetooth/host/hci_common.c
+++ b/subsys/bluetooth/host/hci_common.c
@@ -5,8 +5,8 @@
  */
 
 #include <stdint.h>
-#include <sys/byteorder.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 struct net_buf *bt_hci_evt_create(uint8_t evt, uint8_t len)
 {
diff --git a/subsys/bluetooth/host/hci_core.c b/subsys/bluetooth/host/hci_core.c
index e0e23f35f6..71673dc766 100644
--- a/subsys/bluetooth/host/hci_core.c
+++ b/subsys/bluetooth/host/hci_core.c
@@ -7,26 +7,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
-#include <sys/slist.h>
-#include <sys/byteorder.h>
-#include <debug/stack.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/sys/__assert.h>
 #include <soc.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_vs.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
 #define LOG_MODULE_NAME bt_hci_core
diff --git a/subsys/bluetooth/host/hci_ecc.c b/subsys/bluetooth/host/hci_ecc.c
index 321bc0438a..979d57f356 100644
--- a/subsys/bluetooth/host/hci_ecc.c
+++ b/subsys/bluetooth/host/hci_ecc.c
@@ -9,19 +9,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/atomic.h>
-#include <debug/stack.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/sys/byteorder.h>
 #include <tinycrypt/constants.h>
 #include <tinycrypt/utils.h>
 #include <tinycrypt/ecc.h>
 #include <tinycrypt/ecc_dh.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/hci.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
 #define LOG_MODULE_NAME bt_hci_ecc
@@ -31,7 +31,7 @@
 #include "ecc.h"
 
 #ifdef CONFIG_BT_HCI_RAW
-#include <bluetooth/hci_raw.h>
+#include <zephyr/bluetooth/hci_raw.h>
 #include "hci_raw_internal.h"
 #else
 #include "hci_core.h"
diff --git a/subsys/bluetooth/host/hci_raw.c b/subsys/bluetooth/host/hci_raw.c
index 0b9dcb3568..8ef5b2a8df 100644
--- a/subsys/bluetooth/host/hci_raw.c
+++ b/subsys/bluetooth/host/hci_raw.c
@@ -7,14 +7,14 @@
  */
 
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <drivers/bluetooth/hci_driver.h>
-#include <bluetooth/buf.h>
-#include <bluetooth/hci_raw.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/iso.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/hci_raw.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/iso.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
 #define LOG_MODULE_NAME bt_hci_raw
diff --git a/subsys/bluetooth/host/hfp_hf.c b/subsys/bluetooth/host/hfp_hf.c
index b2c627a0e5..15350f2d67 100644
--- a/subsys/bluetooth/host/hfp_hf.c
+++ b/subsys/bluetooth/host/hfp_hf.c
@@ -5,21 +5,21 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <sys/printk.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/conn.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HFP_HF)
 #define LOG_MODULE_NAME bt_hfp_hf
 #include "common/log.h"
 
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/hfp_hf.h>
+#include <zephyr/bluetooth/rfcomm.h>
+#include <zephyr/bluetooth/hfp_hf.h>
 
 #include "hci_core.h"
 #include "conn_internal.h"
diff --git a/subsys/bluetooth/host/id.c b/subsys/bluetooth/host/id.c
index c6a234c1fd..e6c29a3375 100644
--- a/subsys/bluetooth/host/id.c
+++ b/subsys/bluetooth/host/id.c
@@ -5,12 +5,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci_vs.h>
-#include <bluetooth/buf.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #include "hci_core.h"
 #include "id.h"
diff --git a/subsys/bluetooth/host/iso.c b/subsys/bluetooth/host/iso.c
index 55446ec3c5..2024a56d85 100644
--- a/subsys/bluetooth/host/iso.c
+++ b/subsys/bluetooth/host/iso.c
@@ -7,14 +7,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/iso.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/iso.h>
 
 #include "host/hci_core.h"
 #include "host/conn_internal.h"
diff --git a/subsys/bluetooth/host/iso_internal.h b/subsys/bluetooth/host/iso_internal.h
index a6d4fd2400..6649262447 100644
--- a/subsys/bluetooth/host/iso_internal.h
+++ b/subsys/bluetooth/host/iso_internal.h
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/iso.h>
+#include <zephyr/bluetooth/iso.h>
 
 struct iso_data {
 	/** BT_BUF_ISO_IN */
diff --git a/subsys/bluetooth/host/keys.c b/subsys/bluetooth/host/keys.c
index 732b70fcc2..fd849d8272 100644
--- a/subsys/bluetooth/host/keys.c
+++ b/subsys/bluetooth/host/keys.c
@@ -6,19 +6,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/buf.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_KEYS)
 #define LOG_MODULE_NAME bt_keys
diff --git a/subsys/bluetooth/host/keys_br.c b/subsys/bluetooth/host/keys_br.c
index 4bb9f21162..ea5000d2a0 100644
--- a/subsys/bluetooth/host/keys_br.c
+++ b/subsys/bluetooth/host/keys_br.c
@@ -6,15 +6,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/hci.h>
-#include <settings/settings.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/settings/settings.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_KEYS)
 #define LOG_MODULE_NAME bt_keys_br
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
index 5f55c282cd..2362707da5 100644
--- a/subsys/bluetooth/host/l2cap.c
+++ b/subsys/bluetooth/host/l2cap.c
@@ -6,18 +6,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/l2cap.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_L2CAP)
 #define LOG_MODULE_NAME bt_l2cap
diff --git a/subsys/bluetooth/host/l2cap_br.c b/subsys/bluetooth/host/l2cap_br.c
index 7aad87b10c..a9e440bef7 100644
--- a/subsys/bluetooth/host/l2cap_br.c
+++ b/subsys/bluetooth/host/l2cap_br.c
@@ -6,17 +6,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_L2CAP)
 #define LOG_MODULE_NAME bt_l2cap_br
diff --git a/subsys/bluetooth/host/l2cap_internal.h b/subsys/bluetooth/host/l2cap_internal.h
index bf8642f845..9ce372dcd2 100644
--- a/subsys/bluetooth/host/l2cap_internal.h
+++ b/subsys/bluetooth/host/l2cap_internal.h
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/l2cap.h>
+#include <zephyr/bluetooth/l2cap.h>
 
 enum l2cap_conn_list_action {
 	BT_L2CAP_CHAN_LOOKUP,
diff --git a/subsys/bluetooth/host/monitor.c b/subsys/bluetooth/host/monitor.c
index 8541233b3b..cd80b459b6 100644
--- a/subsys/bluetooth/host/monitor.c
+++ b/subsys/bluetooth/host/monitor.c
@@ -11,19 +11,19 @@
 #include <zephyr/types.h>
 #include <stdbool.h>
 
-#include <zephyr.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/console/uart_pipe.h>
-#include <sys/byteorder.h>
-#include <drivers/uart.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/console/uart_pipe.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/uart.h>
 
-#include <logging/log_backend.h>
-#include <logging/log_output.h>
-#include <logging/log_ctrl.h>
-#include <logging/log.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
 
-#include <bluetooth/buf.h>
+#include <zephyr/bluetooth/buf.h>
 
 #include "monitor.h"
 
diff --git a/subsys/bluetooth/host/rfcomm.c b/subsys/bluetooth/host/rfcomm.c
index b99d52f56a..71b58483ef 100644
--- a/subsys/bluetooth/host/rfcomm.c
+++ b/subsys/bluetooth/host/rfcomm.c
@@ -6,25 +6,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <debug/stack.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/debug/stack.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <drivers/bluetooth/hci_driver.h>
-#include <bluetooth/l2cap.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
+#include <zephyr/bluetooth/l2cap.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_RFCOMM)
 #define LOG_MODULE_NAME bt_rfcomm
 #include "common/log.h"
 
-#include <bluetooth/rfcomm.h>
+#include <zephyr/bluetooth/rfcomm.h>
 
 #include "hci_core.h"
 #include "conn_internal.h"
diff --git a/subsys/bluetooth/host/rfcomm_internal.h b/subsys/bluetooth/host/rfcomm_internal.h
index 03c98189b2..3b94a9829f 100644
--- a/subsys/bluetooth/host/rfcomm_internal.h
+++ b/subsys/bluetooth/host/rfcomm_internal.h
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/rfcomm.h>
+#include <zephyr/bluetooth/rfcomm.h>
 
 typedef enum {
 	BT_RFCOMM_CFC_UNKNOWN,
diff --git a/subsys/bluetooth/host/scan.c b/subsys/bluetooth/host/scan.c
index 92c5a95331..a6f9777185 100644
--- a/subsys/bluetooth/host/scan.c
+++ b/subsys/bluetooth/host/scan.c
@@ -6,14 +6,14 @@
  */
 #include <sys/types.h>
 
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/iso.h>
-#include <bluetooth/buf.h>
-#include <bluetooth/direction.h>
-#include <bluetooth/addr.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/iso.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/direction.h>
+#include <zephyr/bluetooth/addr.h>
 
 #include "hci_core.h"
 #include "conn_internal.h"
diff --git a/subsys/bluetooth/host/sdp.c b/subsys/bluetooth/host/sdp.c
index d9675aec62..da7c920f61 100644
--- a/subsys/bluetooth/host/sdp.c
+++ b/subsys/bluetooth/host/sdp.c
@@ -10,11 +10,11 @@
 
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
 
-#include <bluetooth/buf.h>
-#include <bluetooth/sdp.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/sdp.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_SDP)
 #define LOG_MODULE_NAME bt_sdp
diff --git a/subsys/bluetooth/host/settings.c b/subsys/bluetooth/host/settings.c
index 223c13a1bc..39f39ac4ed 100644
--- a/subsys/bluetooth/host/settings.c
+++ b/subsys/bluetooth/host/settings.c
@@ -6,11 +6,11 @@
 
 #include <errno.h>
 
-#include <zephyr.h>
-#include <settings/settings.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_SETTINGS)
 #define LOG_MODULE_NAME bt_settings
diff --git a/subsys/bluetooth/host/smp.c b/subsys/bluetooth/host/smp.c
index 2981479d13..2d8fe2bac7 100644
--- a/subsys/bluetooth/host/smp.c
+++ b/subsys/bluetooth/host/smp.c
@@ -10,20 +10,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 #include <errno.h>
 #include <string.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
-#include <debug/stack.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/debug/stack.h>
 
-#include <net/buf.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/buf.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/buf.h>
 
 #include <tinycrypt/constants.h>
 #include <tinycrypt/aes.h>
diff --git a/subsys/bluetooth/host/smp_null.c b/subsys/bluetooth/host/smp_null.c
index 559eb82464..39ded45529 100644
--- a/subsys/bluetooth/host/smp_null.c
+++ b/subsys/bluetooth/host/smp_null.c
@@ -9,14 +9,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/buf.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
 #define LOG_MODULE_NAME bt_smp
diff --git a/subsys/bluetooth/host/ssp.c b/subsys/bluetooth/host/ssp.c
index 44b02e610a..6836d6709a 100644
--- a/subsys/bluetooth/host/ssp.c
+++ b/subsys/bluetooth/host/ssp.c
@@ -7,11 +7,11 @@
 
 #include <stdint.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/buf.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/addr.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/addr.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_HCI_CORE)
 #define LOG_MODULE_NAME bt_ssp
diff --git a/subsys/bluetooth/host/testing.c b/subsys/bluetooth/host/testing.c
index 3c0f52ef3f..bc957d1c59 100644
--- a/subsys/bluetooth/host/testing.c
+++ b/subsys/bluetooth/host/testing.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stddef.h>
 
-#include <bluetooth/testing.h>
+#include <zephyr/bluetooth/testing.h>
 
 #if defined(CONFIG_BT_MESH)
 #include "mesh/net.h"
diff --git a/subsys/bluetooth/host/uuid.c b/subsys/bluetooth/host/uuid.c
index 0e8ebe3bdc..56aaaad462 100644
--- a/subsys/bluetooth/host/uuid.c
+++ b/subsys/bluetooth/host/uuid.c
@@ -8,10 +8,10 @@
 
 #include <string.h>
 #include <errno.h>
-#include <sys/byteorder.h>
-#include <sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/printk.h>
 
-#include <bluetooth/uuid.h>
+#include <zephyr/bluetooth/uuid.h>
 
 #define UUID_16_BASE_OFFSET 12
 
diff --git a/subsys/bluetooth/mesh/access.c b/subsys/bluetooth/mesh/access.c
index 3f82764258..ed9bcfb29d 100644
--- a/subsys/bluetooth/mesh/access.c
+++ b/subsys/bluetooth/mesh/access.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ACCESS)
 #define LOG_MODULE_NAME bt_mesh_access
diff --git a/subsys/bluetooth/mesh/adv.c b/subsys/bluetooth/mesh/adv.c
index 8af794ea57..686f994a72 100644
--- a/subsys/bluetooth/mesh/adv.c
+++ b/subsys/bluetooth/mesh/adv.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <debug/stack.h>
-#include <sys/util.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/sys/util.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ADV)
 #define LOG_MODULE_NAME bt_mesh_adv
diff --git a/subsys/bluetooth/mesh/adv_ext.c b/subsys/bluetooth/mesh/adv_ext.c
index c50d604a73..f467941bf4 100644
--- a/subsys/bluetooth/mesh/adv_ext.c
+++ b/subsys/bluetooth/mesh/adv_ext.c
@@ -6,12 +6,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <debug/stack.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/debug/stack.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ADV)
 #define LOG_MODULE_NAME bt_mesh_adv_ext
diff --git a/subsys/bluetooth/mesh/adv_legacy.c b/subsys/bluetooth/mesh/adv_legacy.c
index 1eee6951d0..a1519d5ebb 100644
--- a/subsys/bluetooth/mesh/adv_legacy.c
+++ b/subsys/bluetooth/mesh/adv_legacy.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <debug/stack.h>
-#include <sys/util.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/sys/util.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ADV)
 #define LOG_MODULE_NAME bt_mesh_adv_legacy
diff --git a/subsys/bluetooth/mesh/app_keys.c b/subsys/bluetooth/mesh/app_keys.c
index 96ef2b6dbe..b9b022b5e4 100644
--- a/subsys/bluetooth/mesh/app_keys.c
+++ b/subsys/bluetooth/mesh/app_keys.c
@@ -7,8 +7,8 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <bluetooth/mesh.h>
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/conn.h>
 #include "mesh.h"
 #include "net.h"
 #include "app_keys.h"
diff --git a/subsys/bluetooth/mesh/app_keys.h b/subsys/bluetooth/mesh/app_keys.h
index f3fba0d459..d64958341f 100644
--- a/subsys/bluetooth/mesh/app_keys.h
+++ b/subsys/bluetooth/mesh/app_keys.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_SUBSYS_BLUETOOTH_MESH_APP_KEYS_H_
 #define ZEPHYR_SUBSYS_BLUETOOTH_MESH_APP_KEYS_H_
 
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/mesh.h>
 #include "subnet.h"
 
 /** @brief Reset the app keys module. */
diff --git a/subsys/bluetooth/mesh/beacon.c b/subsys/bluetooth/mesh/beacon.c
index 582ef6c4c5..5f0c6b6f3a 100644
--- a/subsys/bluetooth/mesh/beacon.c
+++ b/subsys/bluetooth/mesh/beacon.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_BEACON)
 #define LOG_MODULE_NAME bt_mesh_beacon
diff --git a/subsys/bluetooth/mesh/cdb.c b/subsys/bluetooth/mesh/cdb.c
index fe4e9a6be7..d39eda3da2 100644
--- a/subsys/bluetooth/mesh/cdb.c
+++ b/subsys/bluetooth/mesh/cdb.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_CDB)
 #define LOG_MODULE_NAME bt_mesh_cdb
diff --git a/subsys/bluetooth/mesh/cfg.c b/subsys/bluetooth/mesh/cfg.c
index 46380577e9..3844dc52cb 100644
--- a/subsys/bluetooth/mesh/cfg.c
+++ b/subsys/bluetooth/mesh/cfg.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/mesh.h>
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include "mesh.h"
 #include "net.h"
diff --git a/subsys/bluetooth/mesh/cfg_cli.c b/subsys/bluetooth/mesh/cfg_cli.c
index d6888d6a91..1746425b6a 100644
--- a/subsys/bluetooth/mesh/cfg_cli.c
+++ b/subsys/bluetooth/mesh/cfg_cli.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
-#include <sys/check.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL)
 #define LOG_MODULE_NAME bt_mesh_cfg_cli
diff --git a/subsys/bluetooth/mesh/cfg_srv.c b/subsys/bluetooth/mesh/cfg_srv.c
index 226458bcaa..896d647053 100644
--- a/subsys/bluetooth/mesh/cfg_srv.c
+++ b/subsys/bluetooth/mesh/cfg_srv.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL)
 #define LOG_MODULE_NAME bt_mesh_cfg_srv
diff --git a/subsys/bluetooth/mesh/crypto.c b/subsys/bluetooth/mesh/crypto.c
index 2c3e93d5c1..ece3347f1d 100644
--- a/subsys/bluetooth/mesh/crypto.c
+++ b/subsys/bluetooth/mesh/crypto.c
@@ -8,10 +8,10 @@
 #include <string.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
 #include <tinycrypt/constants.h>
 #include <tinycrypt/utils.h>
@@ -21,8 +21,8 @@
 #include <tinycrypt/ecc.h>
 #include <tinycrypt/ecc_dh.h>
 
-#include <bluetooth/mesh.h>
-#include <bluetooth/crypto.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/crypto.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_CRYPTO)
 #define LOG_MODULE_NAME bt_mesh_tc_crypto
diff --git a/subsys/bluetooth/mesh/foundation.h b/subsys/bluetooth/mesh/foundation.h
index df20b7fda5..7fb3ddf318 100644
--- a/subsys/bluetooth/mesh/foundation.h
+++ b/subsys/bluetooth/mesh/foundation.h
@@ -114,7 +114,7 @@ void bt_mesh_model_reset(void);
 
 void bt_mesh_attention(struct bt_mesh_model *model, uint8_t time);
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 static inline void key_idx_pack(struct net_buf_simple *buf,
 				uint16_t idx1, uint16_t idx2)
diff --git a/subsys/bluetooth/mesh/friend.c b/subsys/bluetooth/mesh/friend.c
index 9066c0e3d2..b460dd260c 100644
--- a/subsys/bluetooth/mesh/friend.c
+++ b/subsys/bluetooth/mesh/friend.c
@@ -5,12 +5,12 @@
  */
 
 #include <stdint.h>
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_FRIEND)
 #define LOG_MODULE_NAME bt_mesh_friend
diff --git a/subsys/bluetooth/mesh/gatt_cli.c b/subsys/bluetooth/mesh/gatt_cli.c
index 1bc06e930a..7d220eaabe 100644
--- a/subsys/bluetooth/mesh/gatt_cli.c
+++ b/subsys/bluetooth/mesh/gatt_cli.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROXY)
 #define LOG_MODULE_NAME bt_mesh_gatt_client
diff --git a/subsys/bluetooth/mesh/health_cli.c b/subsys/bluetooth/mesh/health_cli.c
index 6375abfaf0..0969ed3680 100644
--- a/subsys/bluetooth/mesh/health_cli.c
+++ b/subsys/bluetooth/mesh/health_cli.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <zephyr/types.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL)
 #define LOG_MODULE_NAME bt_mesh_health_cli
diff --git a/subsys/bluetooth/mesh/health_srv.c b/subsys/bluetooth/mesh/health_srv.c
index f0a64606f6..03b145277b 100644
--- a/subsys/bluetooth/mesh/health_srv.c
+++ b/subsys/bluetooth/mesh/health_srv.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_MODEL)
 #define LOG_MODULE_NAME bt_mesh_health_srv
diff --git a/subsys/bluetooth/mesh/heartbeat.c b/subsys/bluetooth/mesh/heartbeat.c
index a2474f9770..7b40a45bf1 100644
--- a/subsys/bluetooth/mesh/heartbeat.c
+++ b/subsys/bluetooth/mesh/heartbeat.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/mesh.h>
 #include "net.h"
 #include "rpl.h"
 #include "access.h"
diff --git a/subsys/bluetooth/mesh/lpn.c b/subsys/bluetooth/mesh/lpn.c
index 786924ca82..91e44b27ba 100644
--- a/subsys/bluetooth/mesh/lpn.c
+++ b/subsys/bluetooth/mesh/lpn.c
@@ -5,12 +5,12 @@
  */
 
 #include <stdint.h>
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_LOW_POWER)
 #define LOG_MODULE_NAME bt_mesh_lpn
diff --git a/subsys/bluetooth/mesh/main.c b/subsys/bluetooth/mesh/main.c
index af66054236..ad1a5525ef 100644
--- a/subsys/bluetooth/mesh/main.c
+++ b/subsys/bluetooth/mesh/main.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdbool.h>
 #include <errno.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG)
 #define LOG_MODULE_NAME bt_mesh_main
diff --git a/subsys/bluetooth/mesh/msg.c b/subsys/bluetooth/mesh/msg.c
index ca9722b4ca..30a01ca045 100644
--- a/subsys/bluetooth/mesh/msg.c
+++ b/subsys/bluetooth/mesh/msg.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_ACCESS)
 #define LOG_MODULE_NAME bt_mesh_msg
diff --git a/subsys/bluetooth/mesh/net.c b/subsys/bluetooth/mesh/net.c
index b6f488dc54..5e535c3b75 100644
--- a/subsys/bluetooth/mesh/net.c
+++ b/subsys/bluetooth/mesh/net.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_NET)
 #define LOG_MODULE_NAME bt_mesh_net
diff --git a/subsys/bluetooth/mesh/pb_adv.c b/subsys/bluetooth/mesh/pb_adv.c
index b7df81c1fa..32b72e82d3 100644
--- a/subsys/bluetooth/mesh/pb_adv.c
+++ b/subsys/bluetooth/mesh/pb_adv.c
@@ -6,9 +6,9 @@
  */
 #include <stdint.h>
 #include <string.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
-#include <net/buf.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
 #include "host/testing.h"
 #include "net.h"
 #include "adv.h"
diff --git a/subsys/bluetooth/mesh/pb_gatt.c b/subsys/bluetooth/mesh/pb_gatt.c
index 540ee3eca6..9022e1819a 100644
--- a/subsys/bluetooth/mesh/pb_gatt.c
+++ b/subsys/bluetooth/mesh/pb_gatt.c
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <bluetooth/mesh.h>
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/conn.h>
 #include "net.h"
 #include "proxy.h"
 #include "adv.h"
diff --git a/subsys/bluetooth/mesh/pb_gatt_cli.c b/subsys/bluetooth/mesh/pb_gatt_cli.c
index 9329560b94..0cbaebe33a 100644
--- a/subsys/bluetooth/mesh/pb_gatt_cli.c
+++ b/subsys/bluetooth/mesh/pb_gatt_cli.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROV)
 #define LOG_MODULE_NAME bt_mesh_pb_gatt_client
diff --git a/subsys/bluetooth/mesh/pb_gatt_srv.c b/subsys/bluetooth/mesh/pb_gatt_srv.c
index fd6d3bf42f..35ed2bc249 100644
--- a/subsys/bluetooth/mesh/pb_gatt_srv.c
+++ b/subsys/bluetooth/mesh/pb_gatt_srv.c
@@ -5,14 +5,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROV)
 #define LOG_MODULE_NAME bt_mesh_pb_gatt_srv
diff --git a/subsys/bluetooth/mesh/pb_gatt_srv.h b/subsys/bluetooth/mesh/pb_gatt_srv.h
index 57045fde64..371d41cc22 100644
--- a/subsys/bluetooth/mesh/pb_gatt_srv.h
+++ b/subsys/bluetooth/mesh/pb_gatt_srv.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_SUBSYS_BLUETOOTH_MESH_PB_GATT_SRV_H_
 #define ZEPHYR_SUBSYS_BLUETOOTH_MESH_PB_GATT_SRV_H_
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 int bt_mesh_pb_gatt_srv_enable(void);
 int bt_mesh_pb_gatt_srv_disable(void);
diff --git a/subsys/bluetooth/mesh/prov.c b/subsys/bluetooth/mesh/prov.c
index 0cbb360cbc..e028c84299 100644
--- a/subsys/bluetooth/mesh/prov.c
+++ b/subsys/bluetooth/mesh/prov.c
@@ -5,17 +5,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
-#include <bluetooth/uuid.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/uuid.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROV)
 #define LOG_MODULE_NAME bt_mesh_prov
diff --git a/subsys/bluetooth/mesh/prov_device.c b/subsys/bluetooth/mesh/prov_device.c
index 2eea393b28..fa5a9e2d25 100644
--- a/subsys/bluetooth/mesh/prov_device.c
+++ b/subsys/bluetooth/mesh/prov_device.c
@@ -5,17 +5,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
-#include <bluetooth/uuid.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/uuid.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROV_DEVICE)
 #define LOG_MODULE_NAME bt_mesh_prov_device
diff --git a/subsys/bluetooth/mesh/provisioner.c b/subsys/bluetooth/mesh/provisioner.c
index e1c947a690..ace74c4a5a 100644
--- a/subsys/bluetooth/mesh/provisioner.c
+++ b/subsys/bluetooth/mesh/provisioner.c
@@ -6,17 +6,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
-#include <bluetooth/uuid.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/uuid.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROVISIONER)
 #define LOG_MODULE_NAME bt_mesh_provisioner
diff --git a/subsys/bluetooth/mesh/proxy_cli.c b/subsys/bluetooth/mesh/proxy_cli.c
index 8a2f4eb16b..645e5ab2e1 100644
--- a/subsys/bluetooth/mesh/proxy_cli.c
+++ b/subsys/bluetooth/mesh/proxy_cli.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROXY)
 #define LOG_MODULE_NAME bt_mesh_proxy_client
diff --git a/subsys/bluetooth/mesh/proxy_msg.c b/subsys/bluetooth/mesh/proxy_msg.c
index dc17c51416..a32a515717 100644
--- a/subsys/bluetooth/mesh/proxy_msg.c
+++ b/subsys/bluetooth/mesh/proxy_msg.c
@@ -7,14 +7,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROXY)
 #define LOG_MODULE_NAME bt_mesh_proxy
diff --git a/subsys/bluetooth/mesh/proxy_msg.h b/subsys/bluetooth/mesh/proxy_msg.h
index 4cc120ba5a..c8ab5d7ce9 100644
--- a/subsys/bluetooth/mesh/proxy_msg.h
+++ b/subsys/bluetooth/mesh/proxy_msg.h
@@ -10,7 +10,7 @@
 #ifndef ZEPHYR_SUBSYS_BLUETOOTH_MESH_PROXY_MSG_H_
 #define ZEPHYR_SUBSYS_BLUETOOTH_MESH_PROXY_MSG_H_
 
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #define PDU_TYPE(data)     (data[0] & BIT_MASK(6))
 #define CFG_FILTER_SET     0x00
diff --git a/subsys/bluetooth/mesh/proxy_srv.c b/subsys/bluetooth/mesh/proxy_srv.c
index d079079fc7..dd4534638d 100644
--- a/subsys/bluetooth/mesh/proxy_srv.c
+++ b/subsys/bluetooth/mesh/proxy_srv.c
@@ -5,14 +5,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_PROXY)
 #define LOG_MODULE_NAME bt_mesh_gatt
diff --git a/subsys/bluetooth/mesh/rpl.c b/subsys/bluetooth/mesh/rpl.c
index e51ee73be8..f5573e7181 100644
--- a/subsys/bluetooth/mesh/rpl.c
+++ b/subsys/bluetooth/mesh/rpl.c
@@ -5,19 +5,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_RPL)
 #define LOG_MODULE_NAME bt_mesh_rpl
diff --git a/subsys/bluetooth/mesh/settings.c b/subsys/bluetooth/mesh/settings.c
index 7d2a5455e8..949390ecd2 100644
--- a/subsys/bluetooth/mesh/settings.c
+++ b/subsys/bluetooth/mesh/settings.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_SETTINGS)
 #define LOG_MODULE_NAME bt_mesh_settings
diff --git a/subsys/bluetooth/mesh/shell.c b/subsys/bluetooth/mesh/shell.c
index 0a07458a6b..38ea5b3df0 100644
--- a/subsys/bluetooth/mesh/shell.c
+++ b/subsys/bluetooth/mesh/shell.c
@@ -6,16 +6,16 @@
 
 #include <stdlib.h>
 #include <ctype.h>
-#include <zephyr.h>
-#include <sys/printk.h>
-#include <sys/util.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 
-#include <shell/shell.h>
-#include <settings/settings.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/mesh.h>
-#include <bluetooth/mesh/shell.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/mesh.h>
+#include <zephyr/bluetooth/mesh/shell.h>
 
 /* Private includes for raw Network & Transport layer access */
 #include "mesh.h"
diff --git a/subsys/bluetooth/mesh/subnet.c b/subsys/bluetooth/mesh/subnet.c
index 45e5434686..9a243179e9 100644
--- a/subsys/bluetooth/mesh/subnet.c
+++ b/subsys/bluetooth/mesh/subnet.c
@@ -5,19 +5,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_KEYS)
 #define LOG_MODULE_NAME bt_mesh_net_keys
diff --git a/subsys/bluetooth/mesh/subnet.h b/subsys/bluetooth/mesh/subnet.h
index e8d226c654..e86351181b 100644
--- a/subsys/bluetooth/mesh/subnet.h
+++ b/subsys/bluetooth/mesh/subnet.h
@@ -9,8 +9,8 @@
 
 #include <stdint.h>
 #include <sys/types.h>
-#include <net/buf.h>
-#include <zephyr.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/zephyr.h>
 
 #define BT_MESH_NET_FLAG_KR       BIT(0)
 #define BT_MESH_NET_FLAG_IVU      BIT(1)
diff --git a/subsys/bluetooth/mesh/test.c b/subsys/bluetooth/mesh/test.c
index e306488ba9..d8f302b5e2 100644
--- a/subsys/bluetooth/mesh/test.c
+++ b/subsys/bluetooth/mesh/test.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define LOG_MODULE_NAME bt_mesh_test
 #include "common/log.h"
diff --git a/subsys/bluetooth/mesh/transport.c b/subsys/bluetooth/mesh/transport.c
index 619d3498a2..a94794d193 100644
--- a/subsys/bluetooth/mesh/transport.c
+++ b/subsys/bluetooth/mesh/transport.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
-#include <sys/util.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/mesh.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/mesh.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_MESH_DEBUG_TRANS)
 #define LOG_MODULE_NAME bt_mesh_transport
diff --git a/subsys/bluetooth/services/bas.c b/subsys/bluetooth/services/bas.c
index 17a90320d3..e6af782f87 100644
--- a/subsys/bluetooth/services/bas.c
+++ b/subsys/bluetooth/services/bas.c
@@ -10,19 +10,19 @@
  */
 
 #include <errno.h>
-#include <init.h>
-#include <sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
 #include <stdbool.h>
 #include <zephyr/types.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/services/bas.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/services/bas.h>
 
 #define LOG_LEVEL CONFIG_BT_BAS_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bas);
 
 static uint8_t battery_level = 100U;
diff --git a/subsys/bluetooth/services/dis.c b/subsys/bluetooth/services/dis.c
index 9c76c1bd2f..98e6aae01e 100644
--- a/subsys/bluetooth/services/dis.c
+++ b/subsys/bluetooth/services/dis.c
@@ -14,16 +14,16 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_SERVICE)
 #define LOG_MODULE_NAME bt_dis
diff --git a/subsys/bluetooth/services/hrs.c b/subsys/bluetooth/services/hrs.c
index b79e02945a..49dc6aa424 100644
--- a/subsys/bluetooth/services/hrs.c
+++ b/subsys/bluetooth/services/hrs.c
@@ -12,17 +12,17 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <zephyr.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #define LOG_LEVEL CONFIG_BT_HRS_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(hrs);
 
 
diff --git a/subsys/bluetooth/services/ias.c b/subsys/bluetooth/services/ias.c
index 9a6f702be8..0f4405b2f9 100644
--- a/subsys/bluetooth/services/ias.c
+++ b/subsys/bluetooth/services/ias.c
@@ -9,14 +9,14 @@
  */
 
 #include <errno.h>
-#include <init.h>
+#include <zephyr/init.h>
 #include <stdint.h>
-#include <zephyr.h>
-#include <net/buf.h>
-#include <logging/log.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/services/ias.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/services/ias.h>
 
 #define LOG_LEVEL CONFIG_BT_IAS_LOG_LEVEL
 LOG_MODULE_REGISTER(ias);
diff --git a/subsys/bluetooth/services/ots/ots.c b/subsys/bluetooth/services/ots/ots.c
index 7f4902799c..f9c373d5ea 100644
--- a/subsys/bluetooth/services/ots/ots.c
+++ b/subsys/bluetooth/services/ots/ots.c
@@ -8,25 +8,25 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
-#include <sys/check.h>
+#include <zephyr/sys/check.h>
 
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/services/ots.h>
 #include "ots_internal.h"
 #include "ots_obj_manager_internal.h"
 #include "ots_dir_list_internal.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(bt_ots, CONFIG_BT_OTS_LOG_LEVEL);
 
diff --git a/subsys/bluetooth/services/ots/ots_client.c b/subsys/bluetooth/services/ots/ots_client.c
index 56a77072f6..a5ac52a912 100644
--- a/subsys/bluetooth/services/ots/ots_client.c
+++ b/subsys/bluetooth/services/ots/ots_client.c
@@ -6,19 +6,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
 
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/l2cap.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/l2cap.h>
 
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/services/ots.h>
 #include "ots_internal.h"
 #include "ots_client_internal.h"
 #include "ots_l2cap_internal.h"
diff --git a/subsys/bluetooth/services/ots/ots_dir_list.c b/subsys/bluetooth/services/ots/ots_dir_list.c
index 3453cc26d5..9c311ec056 100644
--- a/subsys/bluetooth/services/ots/ots_dir_list.c
+++ b/subsys/bluetooth/services/ots/ots_dir_list.c
@@ -8,15 +8,15 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/dlist.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/dlist.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/services/ots.h>
 #include "ots_internal.h"
 #include "ots_obj_manager_internal.h"
 #include "ots_dir_list_internal.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(bt_ots, CONFIG_BT_OTS_LOG_LEVEL);
 
diff --git a/subsys/bluetooth/services/ots/ots_dir_list_internal.h b/subsys/bluetooth/services/ots/ots_dir_list_internal.h
index b87a7f1775..1a9d24ad21 100644
--- a/subsys/bluetooth/services/ots/ots_dir_list_internal.h
+++ b/subsys/bluetooth/services/ots/ots_dir_list_internal.h
@@ -13,8 +13,8 @@ extern "C" {
 
 #include <sys/types.h>
 #include <zephyr/types.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/services/ots.h>
 
 /** Maximum size of the Directory Listing Object Record. Table 4.1 in the OTS spec. */
 #define DIR_LIST_OBJ_RECORD_MIN_SIZE       13
diff --git a/subsys/bluetooth/services/ots/ots_l2cap.c b/subsys/bluetooth/services/ots/ots_l2cap.c
index f3b944b61e..ae8c89c92d 100644
--- a/subsys/bluetooth/services/ots/ots_l2cap.c
+++ b/subsys/bluetooth/services/ots/ots_l2cap.c
@@ -8,16 +8,16 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
-#include <init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #include "ots_l2cap_internal.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 /* This l2cap is the only OTS-file in use for OTC.
  * If only OTC is used, the OTS log module must be registered here.
diff --git a/subsys/bluetooth/services/ots/ots_l2cap_internal.h b/subsys/bluetooth/services/ots/ots_l2cap_internal.h
index bf6a1cff49..4d879eb451 100644
--- a/subsys/bluetooth/services/ots/ots_l2cap_internal.h
+++ b/subsys/bluetooth/services/ots/ots_l2cap_internal.h
@@ -12,10 +12,10 @@ extern "C" {
 #endif
 
 #include <zephyr/types.h>
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 #include <sys/types.h>
 
-#include <bluetooth/l2cap.h>
+#include <zephyr/bluetooth/l2cap.h>
 
 struct bt_gatt_ots_l2cap_tx {
 	uint8_t *data;
diff --git a/subsys/bluetooth/services/ots/ots_oacp.c b/subsys/bluetooth/services/ots/ots_oacp.c
index d2f0af232a..6dd881b4df 100644
--- a/subsys/bluetooth/services/ots/ots_oacp.c
+++ b/subsys/bluetooth/services/ots/ots_oacp.c
@@ -8,17 +8,17 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/gatt.h>
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/services/ots.h>
 #include "ots_internal.h"
 #include "ots_dir_list_internal.h"
 #include "ots_obj_manager_internal.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(bt_ots, CONFIG_BT_OTS_LOG_LEVEL);
 
diff --git a/subsys/bluetooth/services/ots/ots_oacp_internal.h b/subsys/bluetooth/services/ots/ots_oacp_internal.h
index cc23932c41..e265a084e7 100644
--- a/subsys/bluetooth/services/ots/ots_oacp_internal.h
+++ b/subsys/bluetooth/services/ots/ots_oacp_internal.h
@@ -13,8 +13,8 @@ extern "C" {
 
 #include <sys/types.h>
 #include <zephyr/types.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/services/ots.h>
 
 /* Types of Object Action Control Point Procedures. */
 enum bt_gatt_ots_oacp_proc_type {
diff --git a/subsys/bluetooth/services/ots/ots_obj_manager.c b/subsys/bluetooth/services/ots/ots_obj_manager.c
index d119eb599a..abdb37ff49 100644
--- a/subsys/bluetooth/services/ots/ots_obj_manager.c
+++ b/subsys/bluetooth/services/ots/ots_obj_manager.c
@@ -8,13 +8,13 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/dlist.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/dlist.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/services/ots.h>
 #include "ots_internal.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(bt_ots, CONFIG_BT_OTS_LOG_LEVEL);
 
diff --git a/subsys/bluetooth/services/ots/ots_olcp.c b/subsys/bluetooth/services/ots/ots_olcp.c
index 57523245b0..762ce9efcd 100644
--- a/subsys/bluetooth/services/ots/ots_olcp.c
+++ b/subsys/bluetooth/services/ots/ots_olcp.c
@@ -8,17 +8,17 @@
 #include <stddef.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/gatt.h>
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/services/ots.h>
 #include "ots_internal.h"
 #include "ots_obj_manager_internal.h"
 #include "ots_dir_list_internal.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(bt_ots, CONFIG_BT_OTS_LOG_LEVEL);
 
diff --git a/subsys/bluetooth/services/ots/ots_olcp_internal.h b/subsys/bluetooth/services/ots/ots_olcp_internal.h
index 3be0e1f4b9..0d1458608a 100644
--- a/subsys/bluetooth/services/ots/ots_olcp_internal.h
+++ b/subsys/bluetooth/services/ots/ots_olcp_internal.h
@@ -13,7 +13,7 @@ extern "C" {
 
 #include <sys/types.h>
 #include <zephyr/types.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/gatt.h>
 
 /* The types of OLCP procedures. */
 enum bt_gatt_ots_olcp_proc_type {
diff --git a/subsys/bluetooth/services/tps.c b/subsys/bluetooth/services/tps.c
index acdedd8399..cbf56440bb 100644
--- a/subsys/bluetooth/services/tps.c
+++ b/subsys/bluetooth/services/tps.c
@@ -11,14 +11,14 @@
 #include <errno.h>
 #include <zephyr/types.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/hci.h>
 
 #define LOG_LEVEL CONFIG_BT_TPS_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tps);
 
 static ssize_t read_tx_power_level(struct bt_conn *conn,
diff --git a/subsys/bluetooth/shell/audio.c b/subsys/bluetooth/shell/audio.c
index 0b697903e9..bfa56245ad 100644
--- a/subsys/bluetooth/shell/audio.c
+++ b/subsys/bluetooth/shell/audio.c
@@ -13,15 +13,15 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <zephyr.h>
-#include <shell/shell.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/audio.h>
-#include <bluetooth/audio/capabilities.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/audio.h>
+#include <zephyr/bluetooth/audio/capabilities.h>
 
 #include "bt.h"
 
diff --git a/subsys/bluetooth/shell/bass.c b/subsys/bluetooth/shell/bass.c
index ec2e0a53d0..2ad6ec4f6b 100644
--- a/subsys/bluetooth/shell/bass.c
+++ b/subsys/bluetooth/shell/bass.c
@@ -9,13 +9,13 @@
 
 #include <zephyr/types.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/bass.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/bass.h>
 #include "bt.h"
 
 static void pa_synced(struct bt_bass_recv_state *recv_state,
diff --git a/subsys/bluetooth/shell/bass_client.c b/subsys/bluetooth/shell/bass_client.c
index d18607fcc9..c8da879b8e 100644
--- a/subsys/bluetooth/shell/bass_client.c
+++ b/subsys/bluetooth/shell/bass_client.c
@@ -9,14 +9,14 @@
 
 #include <zephyr/types.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/audio/bass.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/audio/bass.h>
 #include "bt.h"
 #include "../host/hci_core.h"
 
diff --git a/subsys/bluetooth/shell/bredr.c b/subsys/bluetooth/shell/bredr.c
index bc73752c6d..be3ccdca8c 100644
--- a/subsys/bluetooth/shell/bredr.c
+++ b/subsys/bluetooth/shell/bredr.c
@@ -15,19 +15,19 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/sdp.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/rfcomm.h>
+#include <zephyr/bluetooth/sdp.h>
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 #include "bt.h"
 
diff --git a/subsys/bluetooth/shell/bt.c b/subsys/bluetooth/shell/bt.c
index 52bebeac87..3c44488103 100644
--- a/subsys/bluetooth/shell/bt.c
+++ b/subsys/bluetooth/shell/bt.c
@@ -18,21 +18,21 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <zephyr.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/zephyr.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/sdp.h>
-#include <bluetooth/iso.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/rfcomm.h>
+#include <zephyr/bluetooth/sdp.h>
+#include <zephyr/bluetooth/iso.h>
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 #include "bt.h"
 #include "ll.h"
diff --git a/subsys/bluetooth/shell/csis.c b/subsys/bluetooth/shell/csis.c
index e21b731804..eb221ec724 100644
--- a/subsys/bluetooth/shell/csis.c
+++ b/subsys/bluetooth/shell/csis.c
@@ -10,13 +10,13 @@
 
 #include <zephyr/types.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/csis.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/csis.h>
 #include "bt.h"
 
 extern const struct shell *ctx_shell;
diff --git a/subsys/bluetooth/shell/csis_client.c b/subsys/bluetooth/shell/csis_client.c
index f7e87d0c4b..c006c0cf4e 100644
--- a/subsys/bluetooth/shell/csis_client.c
+++ b/subsys/bluetooth/shell/csis_client.c
@@ -9,18 +9,18 @@
  */
 
 #include <zephyr/types.h>
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/conn.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
 
 #include "bt.h"
 
-#include <bluetooth/audio/csis.h>
+#include <zephyr/bluetooth/audio/csis.h>
 
 static uint8_t members_found;
 static struct k_work_delayable discover_members_timer;
diff --git a/subsys/bluetooth/shell/gatt.c b/subsys/bluetooth/shell/gatt.c
index 427ee572f1..8bcde57f54 100644
--- a/subsys/bluetooth/shell/gatt.c
+++ b/subsys/bluetooth/shell/gatt.c
@@ -14,14 +14,14 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 #include "bt.h"
 
diff --git a/subsys/bluetooth/shell/has.c b/subsys/bluetooth/shell/has.c
index f80b4d647e..ea6b4dced3 100644
--- a/subsys/bluetooth/shell/has.c
+++ b/subsys/bluetooth/shell/has.c
@@ -7,11 +7,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/audio/has.h>
-#include <shell/shell.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/audio/has.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/subsys/bluetooth/shell/hci.c b/subsys/bluetooth/shell/hci.c
index 6aa813101a..c2cce4e076 100644
--- a/subsys/bluetooth/shell/hci.c
+++ b/subsys/bluetooth/shell/hci.c
@@ -6,14 +6,14 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <zephyr.h>
-#include <shell/shell.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/hci_vs.h>
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include "../host/hci_core.h"
 
diff --git a/subsys/bluetooth/shell/iso.c b/subsys/bluetooth/shell/iso.c
index defcd56dc6..e19b9a2754 100644
--- a/subsys/bluetooth/shell/iso.c
+++ b/subsys/bluetooth/shell/iso.c
@@ -12,15 +12,15 @@
 
 #include <stdlib.h>
 #include <ctype.h>
-#include <zephyr.h>
-#include <shell/shell.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/iso.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/iso.h>
 
 #include "bt.h"
 
diff --git a/subsys/bluetooth/shell/l2cap.c b/subsys/bluetooth/shell/l2cap.c
index 51484cd899..57ddbac14b 100644
--- a/subsys/bluetooth/shell/l2cap.c
+++ b/subsys/bluetooth/shell/l2cap.c
@@ -15,19 +15,19 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/sdp.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/rfcomm.h>
+#include <zephyr/bluetooth/sdp.h>
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 #include "bt.h"
 
diff --git a/subsys/bluetooth/shell/ll.c b/subsys/bluetooth/shell/ll.c
index 4777fcf126..a4123b2ca3 100644
--- a/subsys/bluetooth/shell/ll.c
+++ b/subsys/bluetooth/shell/ll.c
@@ -11,13 +11,13 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 #include "../controller/util/memq.h"
 #include "../controller/include/ll.h"
diff --git a/subsys/bluetooth/shell/mcc.c b/subsys/bluetooth/shell/mcc.c
index c536759a8c..0dc2a64d77 100644
--- a/subsys/bluetooth/shell/mcc.c
+++ b/subsys/bluetooth/shell/mcc.c
@@ -10,14 +10,14 @@
  */
 
 #include <stdlib.h>
-#include <bluetooth/audio/mcc.h>
-#include <shell/shell.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/audio/mcc.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include "bt.h"
 
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/services/ots.h>
 #include "../services/ots/ots_client_internal.h"
 #include "../audio/media_proxy_internal.h"
 
diff --git a/subsys/bluetooth/shell/media_controller.c b/subsys/bluetooth/shell/media_controller.c
index 9e582dcb04..7d0dcfe7ff 100644
--- a/subsys/bluetooth/shell/media_controller.c
+++ b/subsys/bluetooth/shell/media_controller.c
@@ -10,14 +10,14 @@
  */
 
 #include <stdlib.h>
-#include <shell/shell.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include "bt.h"
-#include <bluetooth/services/ots.h>
+#include <zephyr/bluetooth/services/ots.h>
 
-#include <bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
 #include "../audio/media_proxy_internal.h" /* For MPL_NO_TRACK_ID - TODO: Fix */
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_MCS)
diff --git a/subsys/bluetooth/shell/mics.c b/subsys/bluetooth/shell/mics.c
index fceb8168e0..c3d9efb6e7 100644
--- a/subsys/bluetooth/shell/mics.c
+++ b/subsys/bluetooth/shell/mics.c
@@ -8,9 +8,9 @@
  */
 
 #include <zephyr/types.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/audio/mics.h>
-#include <shell/shell.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/audio/mics.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/subsys/bluetooth/shell/mics_client.c b/subsys/bluetooth/shell/mics_client.c
index 7f42f62b8e..47a1164ba4 100644
--- a/subsys/bluetooth/shell/mics_client.c
+++ b/subsys/bluetooth/shell/mics_client.c
@@ -8,9 +8,9 @@
  */
 
 #include <zephyr/types.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/audio/mics.h>
-#include <shell/shell.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/audio/mics.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/subsys/bluetooth/shell/mpl.c b/subsys/bluetooth/shell/mpl.c
index 271c6f4419..54829529b7 100644
--- a/subsys/bluetooth/shell/mpl.c
+++ b/subsys/bluetooth/shell/mpl.c
@@ -10,13 +10,13 @@
  */
 
 #include <stdlib.h>
-#include <shell/shell.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
 
 #include "bt.h"
 
-#include <bluetooth/audio/media_proxy.h>
+#include <zephyr/bluetooth/audio/media_proxy.h>
 #include "../audio/mpl_internal.h"
 
 #define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_MPL)
diff --git a/subsys/bluetooth/shell/rfcomm.c b/subsys/bluetooth/shell/rfcomm.c
index 58eafd9746..05f3f79a6b 100644
--- a/subsys/bluetooth/shell/rfcomm.c
+++ b/subsys/bluetooth/shell/rfcomm.c
@@ -15,19 +15,19 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/zephyr.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
-#include <bluetooth/hci.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/rfcomm.h>
-#include <bluetooth/sdp.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/rfcomm.h>
+#include <zephyr/bluetooth/sdp.h>
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 #include "bt.h"
 
diff --git a/subsys/bluetooth/shell/tbs.c b/subsys/bluetooth/shell/tbs.c
index 6360306f78..e257079ba0 100644
--- a/subsys/bluetooth/shell/tbs.c
+++ b/subsys/bluetooth/shell/tbs.c
@@ -9,10 +9,10 @@
  */
 
 #include <stdlib.h>
-#include <zephyr.h>
-#include <shell/shell.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/shell/shell.h>
 
-#include <bluetooth/audio/tbs.h>
+#include <zephyr/bluetooth/audio/tbs.h>
 
 #include "bt.h"
 
diff --git a/subsys/bluetooth/shell/tbs_client.c b/subsys/bluetooth/shell/tbs_client.c
index cf04993583..66c0b85475 100644
--- a/subsys/bluetooth/shell/tbs_client.c
+++ b/subsys/bluetooth/shell/tbs_client.c
@@ -11,16 +11,16 @@
 
 #include <stdlib.h>
 #include <ctype.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <zephyr/types.h>
-#include <shell/shell.h>
-#include <sys/printk.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
-#include <bluetooth/conn.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/audio/tbs.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/audio/tbs.h>
 
 #include "bt.h"
 
diff --git a/subsys/bluetooth/shell/ticker.c b/subsys/bluetooth/shell/ticker.c
index 4c66771cb0..b076476479 100644
--- a/subsys/bluetooth/shell/ticker.c
+++ b/subsys/bluetooth/shell/ticker.c
@@ -9,12 +9,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/conn.h>
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 #include "../controller/util/memq.h"
 #include "../controller/util/mayfly.h"
diff --git a/subsys/bluetooth/shell/vcs.c b/subsys/bluetooth/shell/vcs.c
index cf90cf21ba..7dd0113f4c 100644
--- a/subsys/bluetooth/shell/vcs.c
+++ b/subsys/bluetooth/shell/vcs.c
@@ -8,9 +8,9 @@
  */
 
 #include <zephyr/types.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/audio/vcs.h>
-#include <shell/shell.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/audio/vcs.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/subsys/bluetooth/shell/vcs_client.c b/subsys/bluetooth/shell/vcs_client.c
index ebe6275b12..8097ff4d24 100644
--- a/subsys/bluetooth/shell/vcs_client.c
+++ b/subsys/bluetooth/shell/vcs_client.c
@@ -8,9 +8,9 @@
  */
 
 #include <zephyr/types.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/audio/vcs.h>
-#include <shell/shell.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/audio/vcs.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 
 #include "bt.h"
diff --git a/subsys/canbus/isotp/isotp.c b/subsys/canbus/isotp/isotp.c
index 0d64d1e4a9..690741f1cf 100644
--- a/subsys/canbus/isotp/isotp.c
+++ b/subsys/canbus/isotp/isotp.c
@@ -5,12 +5,12 @@
  */
 
 #include "isotp_internal.h"
-#include <net/buf.h>
-#include <kernel.h>
-#include <init.h>
-#include <sys/util.h>
-#include <logging/log.h>
-#include <timeout_q.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/timeout_q.h>
 
 LOG_MODULE_REGISTER(isotp, CONFIG_ISOTP_LOG_LEVEL);
 
diff --git a/subsys/canbus/isotp/isotp_internal.h b/subsys/canbus/isotp/isotp_internal.h
index df11464542..24db459a2e 100644
--- a/subsys/canbus/isotp/isotp_internal.h
+++ b/subsys/canbus/isotp/isotp_internal.h
@@ -8,8 +8,8 @@
 #define ZEPHYR_SUBSYS_NET_CAN_ISOTP_INTERNAL_H_
 
 
-#include <canbus/isotp.h>
-#include <sys/slist.h>
+#include <zephyr/canbus/isotp.h>
+#include <zephyr/sys/slist.h>
 
 /*
  * Abbreviations
diff --git a/subsys/console/getchar.c b/subsys/console/getchar.c
index 69b9433e4f..1a05e277b0 100644
--- a/subsys/console/getchar.c
+++ b/subsys/console/getchar.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
-#include <console/console.h>
-#include <console/tty.h>
-#include <drivers/uart.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/console/console.h>
+#include <zephyr/console/tty.h>
+#include <zephyr/drivers/uart.h>
 
 static struct tty_serial console_serial;
 
diff --git a/subsys/console/getline.c b/subsys/console/getline.c
index 84c1130e9e..8dbb8dc5f4 100644
--- a/subsys/console/getline.c
+++ b/subsys/console/getline.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <drivers/uart.h>
-#include <drivers/console/console.h>
-#include <drivers/console/uart_console.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/console/console.h>
+#include <zephyr/drivers/console/uart_console.h>
 
 /* While app processes one input line, Zephyr will have another line
  * buffer to accumulate more console input.
diff --git a/subsys/console/tty.c b/subsys/console/tty.c
index b33e1126cf..ddf6aa4849 100644
--- a/subsys/console/tty.c
+++ b/subsys/console/tty.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <drivers/uart.h>
-#include <sys/printk.h>
-#include <console/tty.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/console/tty.h>
 
 static int tty_irq_input_hook(struct tty_serial *tty, uint8_t c);
 static int tty_putchar(struct tty_serial *tty, uint8_t c);
diff --git a/subsys/cpp/cpp_dtors.c b/subsys/cpp/cpp_dtors.c
index 37d725cab8..80b81e00e4 100644
--- a/subsys/cpp/cpp_dtors.c
+++ b/subsys/cpp/cpp_dtors.c
@@ -10,7 +10,7 @@
  *
  */
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 __weak void *__dso_handle;
 
diff --git a/subsys/debug/coredump/coredump_backend_flash_partition.c b/subsys/debug/coredump/coredump_backend_flash_partition.c
index 857e82acd2..76e9f99673 100644
--- a/subsys/debug/coredump/coredump_backend_flash_partition.c
+++ b/subsys/debug/coredump/coredump_backend_flash_partition.c
@@ -5,17 +5,17 @@
  */
 
 #include <errno.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <toolchain.h>
-#include <storage/flash_map.h>
-#include <storage/stream_flash.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/storage/stream_flash.h>
+#include <zephyr/sys/util.h>
 
-#include <debug/coredump.h>
+#include <zephyr/debug/coredump.h>
 #include "coredump_internal.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(coredump, CONFIG_KERNEL_LOG_LEVEL);
 
 /**
@@ -508,7 +508,7 @@ struct coredump_backend_api coredump_backend_flash_partition = {
 
 
 #ifdef CONFIG_DEBUG_COREDUMP_SHELL
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 /* Length of buffer of printable size */
 #define PRINT_BUF_SZ		64
diff --git a/subsys/debug/coredump/coredump_backend_logging.c b/subsys/debug/coredump/coredump_backend_logging.c
index fe00fe4f45..0e37ade315 100644
--- a/subsys/debug/coredump/coredump_backend_logging.c
+++ b/subsys/debug/coredump/coredump_backend_logging.c
@@ -5,13 +5,13 @@
  */
 
 #include <errno.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <debug/coredump.h>
+#include <zephyr/debug/coredump.h>
 #include "coredump_internal.h"
 
-#include <logging/log.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
 LOG_MODULE_REGISTER(coredump, CONFIG_KERNEL_LOG_LEVEL);
 
 /* Length of buffer of printable size */
@@ -127,7 +127,7 @@ struct coredump_backend_api coredump_backend_logging = {
 
 
 #ifdef CONFIG_DEBUG_COREDUMP_SHELL
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 static int cmd_coredump_error_get(const struct shell *shell,
 				  size_t argc, char **argv)
diff --git a/subsys/debug/coredump/coredump_core.c b/subsys/debug/coredump/coredump_core.c
index b1a1937a0a..5d82cb4bf7 100644
--- a/subsys/debug/coredump/coredump_core.c
+++ b/subsys/debug/coredump/coredump_core.c
@@ -6,10 +6,10 @@
 
 #include <errno.h>
 #include <kernel_internal.h>
-#include <toolchain.h>
-#include <debug/coredump.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/debug/coredump.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
 #include "coredump_internal.h"
 
diff --git a/subsys/debug/coredump/coredump_internal.h b/subsys/debug/coredump/coredump_internal.h
index 5700d87e78..0d9fa3b886 100644
--- a/subsys/debug/coredump/coredump_internal.h
+++ b/subsys/debug/coredump/coredump_internal.h
@@ -7,7 +7,7 @@
 #ifndef DEBUG_COREDUMP_INTERNAL_H_
 #define DEBUG_COREDUMP_INTERNAL_H_
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /**
  * @cond INTERNAL_HIDDEN
diff --git a/subsys/debug/coredump/coredump_memory_regions.c b/subsys/debug/coredump/coredump_memory_regions.c
index 25278757f0..ce0ac309f4 100644
--- a/subsys/debug/coredump/coredump_memory_regions.c
+++ b/subsys/debug/coredump/coredump_memory_regions.c
@@ -6,11 +6,11 @@
 
 #include <errno.h>
 #include <kernel_internal.h>
-#include <toolchain.h>
-#include <debug/coredump.h>
-#include <linker/linker-defs.h>
-#include <sys/byteorder.h>
-#include <sys/util.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/debug/coredump.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
 
 #include "coredump_internal.h"
 
diff --git a/subsys/debug/gdbstub.c b/subsys/debug/gdbstub.c
index 1f77211295..a7fbd3f825 100644
--- a/subsys/debug/gdbstub.c
+++ b/subsys/debug/gdbstub.c
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/kernel.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gdbstub);
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #include <ctype.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 #include <sys/types.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <debug/gdbstub.h>
+#include <zephyr/debug/gdbstub.h>
 #include "gdbstub_backend.h"
 
 /* +1 is for the NULL character added during receive */
diff --git a/subsys/debug/gdbstub/gdbstub_backend_serial.c b/subsys/debug/gdbstub/gdbstub_backend_serial.c
index 91b36b1e96..10c97b7e1a 100644
--- a/subsys/debug/gdbstub/gdbstub_backend_serial.c
+++ b/subsys/debug/gdbstub/gdbstub_backend_serial.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <drivers/uart.h>
-#include <sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/__assert.h>
 
 static const struct device *uart_dev;
 
diff --git a/subsys/debug/thread_analyzer.c b/subsys/debug/thread_analyzer.c
index 6f0c125582..2642ddad52 100644
--- a/subsys/debug/thread_analyzer.c
+++ b/subsys/debug/thread_analyzer.c
@@ -8,12 +8,12 @@
  *  @brief Thread analyzer implementation
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
-#include <debug/thread_analyzer.h>
-#include <debug/stack.h>
-#include <kernel.h>
-#include <logging/log.h>
+#include <zephyr/debug/thread_analyzer.h>
+#include <zephyr/debug/stack.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <stdio.h>
 
 LOG_MODULE_REGISTER(thread_analyzer, CONFIG_THREAD_ANALYZER_LOG_LEVEL);
diff --git a/subsys/debug/thread_info.c b/subsys/debug/thread_info.c
index f2a4e34f94..21b5feb0c1 100644
--- a/subsys/debug/thread_info.c
+++ b/subsys/debug/thread_info.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #define THREAD_INFO_UNIMPLEMENTED	0xffffffff
 
diff --git a/subsys/demand_paging/backing_store/backing_store_qemu_x86_tiny.c b/subsys/demand_paging/backing_store/backing_store_qemu_x86_tiny.c
index bd75ef2de2..023adc06fa 100644
--- a/subsys/demand_paging/backing_store/backing_store_qemu_x86_tiny.c
+++ b/subsys/demand_paging/backing_store/backing_store_qemu_x86_tiny.c
@@ -18,8 +18,8 @@
 #include <mmu.h>
 #include <string.h>
 #include <kernel_arch_interface.h>
-#include <linker/linker-defs.h>
-#include <sys/util.h>
+#include <zephyr/linker/linker-defs.h>
+#include <zephyr/sys/util.h>
 
 void *location_to_flash(uintptr_t location)
 {
diff --git a/subsys/demand_paging/eviction/nru.c b/subsys/demand_paging/eviction/nru.c
index 05bc33c359..a29dbdbecb 100644
--- a/subsys/demand_paging/eviction/nru.c
+++ b/subsys/demand_paging/eviction/nru.c
@@ -5,10 +5,10 @@
  *
  * Not Recently Used (NRU) eviction algorithm for demand paging
  */
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <mmu.h>
 #include <kernel_arch_interface.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 /* The accessed and dirty states of each page frame are used to create
  * a hierarchy with a numerical value. When evicting a page, try to evict
diff --git a/subsys/dfu/boot/mcuboot.c b/subsys/dfu/boot/mcuboot.c
index 36d36b4a83..4f7e6b1877 100644
--- a/subsys/dfu/boot/mcuboot.c
+++ b/subsys/dfu/boot/mcuboot.c
@@ -8,16 +8,16 @@
 #include <stddef.h>
 #include <errno.h>
 #include <string.h>
-#include <drivers/flash.h>
-#include <storage/flash_map.h>
-#include <zephyr.h>
-#include <init.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
 
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "bootutil/bootutil_public.h"
-#include <dfu/mcuboot.h>
+#include <zephyr/dfu/mcuboot.h>
 
 #include "mcuboot_priv.h"
 
diff --git a/subsys/dfu/boot/mcuboot_priv.h b/subsys/dfu/boot/mcuboot_priv.h
index dd2eb094e2..1d5496363f 100644
--- a/subsys/dfu/boot/mcuboot_priv.h
+++ b/subsys/dfu/boot/mcuboot_priv.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_DFU_BOOT_MCUBOOT_H_
 #define ZEPHYR_DFU_BOOT_MCUBOOT_H_
 
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 
 /* FLASH_AREA_ID() values used below are auto-generated by DT */
 #ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE
diff --git a/subsys/dfu/boot/mcuboot_shell.c b/subsys/dfu/boot/mcuboot_shell.c
index 134fd30175..2afd70a505 100644
--- a/subsys/dfu/boot/mcuboot_shell.c
+++ b/subsys/dfu/boot/mcuboot_shell.c
@@ -5,9 +5,9 @@
  */
 
 #include "bootutil/bootutil_public.h"
-#include <dfu/mcuboot.h>
-#include <init.h>
-#include <shell/shell.h>
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/init.h>
+#include <zephyr/shell/shell.h>
 #include <stdlib.h>
 
 #include "mcuboot_priv.h"
diff --git a/subsys/dfu/img_util/flash_img.c b/subsys/dfu/img_util/flash_img.c
index fc42673c24..3143a05b0b 100644
--- a/subsys/dfu/img_util/flash_img.c
+++ b/subsys/dfu/img_util/flash_img.c
@@ -9,15 +9,15 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
-#include <dfu/flash_img.h>
-#include <storage/flash_map.h>
-#include <storage/stream_flash.h>
+#include <zephyr/dfu/flash_img.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/storage/stream_flash.h>
 
 #ifdef CONFIG_IMG_ERASE_PROGRESSIVELY
-#include <dfu/mcuboot.h>
+#include <zephyr/dfu/mcuboot.h>
 #endif
 
-#include <devicetree.h>
+#include <zephyr/devicetree.h>
 /* FLASH_AREA_ID() values used below are auto-generated by DT */
 #ifdef CONFIG_TRUSTED_EXECUTION_NONSECURE
 #define UPLOAD_FLASH_AREA_ID FLASH_AREA_ID(image_1_nonsecure)
diff --git a/subsys/disk/disk_access.c b/subsys/disk/disk_access.c
index 9e4ec3a8c8..f640e42b79 100644
--- a/subsys/disk/disk_access.c
+++ b/subsys/disk/disk_access.c
@@ -6,15 +6,15 @@
 
 #include <string.h>
 #include <zephyr/types.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
-#include <init.h>
-#include <storage/disk_access.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/init.h>
+#include <zephyr/storage/disk_access.h>
 #include <errno.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 #define LOG_LEVEL CONFIG_DISK_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(disk);
 
 /* list of mounted file systems */
diff --git a/subsys/emul/emul.c b/subsys/emul/emul.c
index c0e578b7f5..e50baa754e 100644
--- a/subsys/emul/emul.c
+++ b/subsys/emul/emul.c
@@ -6,11 +6,11 @@
  */
 
 #define LOG_LEVEL CONFIG_EMUL_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(emul);
 
-#include <device.h>
-#include <drivers/emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
 #include <string.h>
 
 const struct emul *emul_get_binding(const char *name)
diff --git a/subsys/emul/emul_bmi160.c b/subsys/emul/emul_bmi160.c
index a473a92cb0..2043d1310f 100644
--- a/subsys/emul/emul_bmi160.c
+++ b/subsys/emul/emul_bmi160.c
@@ -10,17 +10,17 @@
 #define DT_DRV_COMPAT bosch_bmi160
 
 #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bosch_bmi160);
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <bmi160.h>
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
-#include <drivers/spi.h>
-#include <drivers/spi_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/drivers/spi_emul.h>
 
 /** Run-time data used by the emulator */
 struct bmi160_emul_data {
diff --git a/subsys/emul/espi/emul_espi_host.c b/subsys/emul/espi/emul_espi_host.c
index 99a925a6b6..ebb300f6fc 100644
--- a/subsys/emul/espi/emul_espi_host.c
+++ b/subsys/emul/espi/emul_espi_host.c
@@ -10,13 +10,13 @@
 #define DT_DRV_COMPAT zephyr_espi_emul_espi_host
 
 #define LOG_LEVEL CONFIG_ESPI_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(espi_host);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/espi.h>
-#include <drivers/espi_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/espi.h>
+#include <zephyr/drivers/espi_emul.h>
 
 /** Data about the virtual wire */
 struct vw_data {
diff --git a/subsys/emul/i2c/emul_atmel_at24.c b/subsys/emul/i2c/emul_atmel_at24.c
index 539db753f5..1be1c58311 100644
--- a/subsys/emul/i2c/emul_atmel_at24.c
+++ b/subsys/emul/i2c/emul_atmel_at24.c
@@ -8,13 +8,13 @@
 #define DT_DRV_COMPAT atmel_at24
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(atmel_at24);
 
-#include <device.h>
-#include <drivers/emul.h>
-#include <drivers/i2c.h>
-#include <drivers/i2c_emul.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/emul.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/drivers/i2c_emul.h>
 
 /** Run-time data used by the emulator */
 struct at24_emul_data {
diff --git a/subsys/fb/cfb.c b/subsys/fb/cfb.c
index c8d768f640..96bc0fdcfa 100644
--- a/subsys/fb/cfb.c
+++ b/subsys/fb/cfb.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
-#include <display/cfb.h>
+#include <zephyr/display/cfb.h>
 
 #define LOG_LEVEL CONFIG_CFB_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(cfb);
 
 extern const struct cfb_font __font_entry_start[];
diff --git a/subsys/fb/cfb_fonts.c b/subsys/fb/cfb_fonts.c
index 6f22d7b947..7d308bdce6 100644
--- a/subsys/fb/cfb_fonts.c
+++ b/subsys/fb/cfb_fonts.c
@@ -8,8 +8,8 @@
  * Licensed under the Apache License, Version 2.0
  */
 
-#include <zephyr.h>
-#include <display/cfb.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/display/cfb.h>
 
 #define CFB_FONTS_FIRST_CHAR	32
 #define CFB_FONTS_LAST_CHAR	126
diff --git a/subsys/fb/cfb_shell.c b/subsys/fb/cfb_shell.c
index 54f12c3001..59bd5d02bd 100644
--- a/subsys/fb/cfb_shell.c
+++ b/subsys/fb/cfb_shell.c
@@ -12,8 +12,8 @@
  */
 
 #include <stdlib.h>
-#include <shell/shell.h>
-#include <display/cfb.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/display/cfb.h>
 
 #define HELP_NONE "[none]"
 #define HELP_INIT "call \"cfb init\" first"
diff --git a/subsys/fs/fat_fs.c b/subsys/fs/fat_fs.c
index fe190b83b5..41ab9b3bbb 100644
--- a/subsys/fs/fat_fs.c
+++ b/subsys/fs/fat_fs.c
@@ -6,13 +6,13 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <zephyr/types.h>
 #include <errno.h>
-#include <init.h>
-#include <fs/fs.h>
-#include <fs/fs_sys.h>
-#include <sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/fs_sys.h>
+#include <zephyr/sys/__assert.h>
 #include <ff.h>
 
 #define FATFS_MAX_FILE_NAME 12 /* Uses 8.3 SFN */
diff --git a/subsys/fs/fcb/fcb.c b/subsys/fs/fcb/fcb.c
index 782ff1be8b..153ecd0bdd 100644
--- a/subsys/fs/fcb/fcb.c
+++ b/subsys/fs/fcb/fcb.c
@@ -8,12 +8,12 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include <fs/fcb.h>
+#include <zephyr/fs/fcb.h>
 #include "fcb_priv.h"
 #include "string.h"
 #include <errno.h>
-#include <device.h>
-#include <drivers/flash.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/flash.h>
 
 uint8_t
 fcb_get_align(const struct fcb *fcb)
diff --git a/subsys/fs/fcb/fcb_append.c b/subsys/fs/fcb/fcb_append.c
index 92e0bd209c..a5d260dc92 100644
--- a/subsys/fs/fcb/fcb_append.c
+++ b/subsys/fs/fcb/fcb_append.c
@@ -8,7 +8,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include <fs/fcb.h>
+#include <zephyr/fs/fcb.h>
 #include "fcb_priv.h"
 
 static struct flash_sector *
diff --git a/subsys/fs/fcb/fcb_elem_info.c b/subsys/fs/fcb/fcb_elem_info.c
index 946b7dbf2c..11d8c9cdd0 100644
--- a/subsys/fs/fcb/fcb_elem_info.c
+++ b/subsys/fs/fcb/fcb_elem_info.c
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/crc.h>
+#include <zephyr/sys/crc.h>
 
-#include <fs/fcb.h>
+#include <zephyr/fs/fcb.h>
 #include "fcb_priv.h"
 
 /*
diff --git a/subsys/fs/fcb/fcb_getnext.c b/subsys/fs/fcb/fcb_getnext.c
index 4904011486..7136abc88d 100644
--- a/subsys/fs/fcb/fcb_getnext.c
+++ b/subsys/fs/fcb/fcb_getnext.c
@@ -7,7 +7,7 @@
 
 #include <stddef.h>
 
-#include <fs/fcb.h>
+#include <zephyr/fs/fcb.h>
 #include "fcb_priv.h"
 
 int
diff --git a/subsys/fs/fcb/fcb_rotate.c b/subsys/fs/fcb/fcb_rotate.c
index 636d135aa1..295436d0ba 100644
--- a/subsys/fs/fcb/fcb_rotate.c
+++ b/subsys/fs/fcb/fcb_rotate.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <fs/fcb.h>
+#include <zephyr/fs/fcb.h>
 #include "fcb_priv.h"
 
 int
diff --git a/subsys/fs/fcb/fcb_walk.c b/subsys/fs/fcb/fcb_walk.c
index 6b746019bb..3c7f0d68ce 100644
--- a/subsys/fs/fcb/fcb_walk.c
+++ b/subsys/fs/fcb/fcb_walk.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <fs/fcb.h>
+#include <zephyr/fs/fcb.h>
 #include "fcb_priv.h"
 
 /*
diff --git a/subsys/fs/fs.c b/subsys/fs/fs.c
index ae088657e8..8a35ba0c9d 100644
--- a/subsys/fs/fs.c
+++ b/subsys/fs/fs.c
@@ -10,14 +10,14 @@
 #include <string.h>
 #include <zephyr/types.h>
 #include <errno.h>
-#include <init.h>
-#include <fs/fs.h>
-#include <fs/fs_sys.h>
-#include <sys/check.h>
+#include <zephyr/init.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/fs_sys.h>
+#include <zephyr/sys/check.h>
 
 
 #define LOG_LEVEL CONFIG_FS_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs);
 
 /* list of mounted file systems */
diff --git a/subsys/fs/fs_impl.c b/subsys/fs/fs_impl.c
index f369442e8a..bb4eb1153d 100644
--- a/subsys/fs/fs_impl.c
+++ b/subsys/fs/fs_impl.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <fs/fs.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/fs/fs.h>
 #include "fs_impl.h"
 
 const char *fs_impl_strip_prefix(const char *path,
diff --git a/subsys/fs/fs_impl.h b/subsys/fs/fs_impl.h
index 1cc64c74cd..b16f3840db 100644
--- a/subsys/fs/fs_impl.h
+++ b/subsys/fs/fs_impl.h
@@ -9,7 +9,7 @@
 #ifndef ZEPHYR_SUBSYS_FS_FS_IMPL_H_
 #define ZEPHYR_SUBSYS_FS_FS_IMPL_H_
 
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/fs/fuse_fs_access.c b/subsys/fs/fuse_fs_access.c
index 2054b3394e..b0af4c97f8 100644
--- a/subsys/fs/fuse_fs_access.c
+++ b/subsys/fs/fuse_fs_access.c
@@ -18,8 +18,8 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <zephyr.h>
-#include <fs/fs.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/fs/fs.h>
 
 #include "cmdline.h"
 #include "soc.h"
diff --git a/subsys/fs/littlefs_fs.c b/subsys/fs/littlefs_fs.c
index 610ed7f76b..17c81cb62a 100644
--- a/subsys/fs/littlefs_fs.c
+++ b/subsys/fs/littlefs_fs.c
@@ -7,20 +7,20 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <init.h>
-#include <fs/fs.h>
-#include <fs/fs_sys.h>
+#include <zephyr/init.h>
+#include <zephyr/fs/fs.h>
+#include <zephyr/fs/fs_sys.h>
 
 #define LFS_LOG_REGISTER
 #include <lfs_util.h>
 
 #include <lfs.h>
-#include <fs/littlefs.h>
-#include <drivers/flash.h>
-#include <storage/flash_map.h>
-#include <storage/disk_access.h>
+#include <zephyr/fs/littlefs.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/storage/disk_access.h>
 
 #include "fs_impl.h"
 
diff --git a/subsys/fs/nvs/nvs.c b/subsys/fs/nvs/nvs.c
index 48e7f2fb6a..6c481fdc45 100644
--- a/subsys/fs/nvs/nvs.c
+++ b/subsys/fs/nvs/nvs.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <string.h>
 #include <errno.h>
 #include <inttypes.h>
-#include <fs/nvs.h>
-#include <sys/crc.h>
+#include <zephyr/fs/nvs.h>
+#include <zephyr/sys/crc.h>
 #include "nvs_priv.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_nvs, CONFIG_NVS_LOG_LEVEL);
 
 /* basic routines */
diff --git a/subsys/fs/shell.c b/subsys/fs/shell.c
index ba9b1117ad..66abad88d9 100644
--- a/subsys/fs/shell.c
+++ b/subsys/fs/shell.c
@@ -7,9 +7,9 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <shell/shell.h>
-#include <init.h>
-#include <fs/fs.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/init.h>
+#include <zephyr/fs/fs.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
@@ -29,8 +29,8 @@ static struct fs_mount_t fatfs_mnt = {
 #endif
 /* LITTLEFS */
 #ifdef CONFIG_FILE_SYSTEM_LITTLEFS
-#include <fs/littlefs.h>
-#include <storage/flash_map.h>
+#include <zephyr/fs/littlefs.h>
+#include <zephyr/storage/flash_map.h>
 
 FS_LITTLEFS_DECLARE_DEFAULT_CONFIG(lfs_data);
 static struct fs_mount_t littlefs_mnt = {
diff --git a/subsys/ipc/ipc_service/backends/ipc_icmsg.c b/subsys/ipc/ipc_service/backends/ipc_icmsg.c
index cf41d78083..646629537f 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icmsg.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <string.h>
-#include <drivers/mbox.h>
+#include <zephyr/drivers/mbox.h>
 
-#include <ipc/ipc_service_backend.h>
+#include <zephyr/ipc/ipc_service_backend.h>
 #include "ipc_icmsg.h"
 
 #define DT_DRV_COMPAT	zephyr_ipc_icmsg
diff --git a/subsys/ipc/ipc_service/backends/ipc_icmsg.h b/subsys/ipc/ipc_service/backends/ipc_icmsg.h
index d95b47d7ca..dba19eb00d 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icmsg.h
+++ b/subsys/ipc/ipc_service/backends/ipc_icmsg.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ipc/ipc_icmsg_buf.h>
+#include <zephyr/ipc/ipc_icmsg_buf.h>
 
 enum icmsg_state {
 	ICMSG_STATE_OFF,
diff --git a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
index b67e3b6ab8..267423f345 100644
--- a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
+++ b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
-#include <zephyr.h>
-#include <cache.h>
-#include <device.h>
-#include <sys/atomic.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/cache.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/atomic.h>
 
-#include <ipc/ipc_service_backend.h>
-#include <ipc/ipc_static_vrings.h>
-#include <ipc/ipc_rpmsg.h>
+#include <zephyr/ipc/ipc_service_backend.h>
+#include <zephyr/ipc/ipc_static_vrings.h>
+#include <zephyr/ipc/ipc_rpmsg.h>
 
-#include <drivers/mbox.h>
-#include <dt-bindings/ipc_service/static_vrings.h>
+#include <zephyr/drivers/mbox.h>
+#include <zephyr/dt-bindings/ipc_service/static_vrings.h>
 
 #include "ipc_rpmsg_static_vrings.h"
 
diff --git a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.h b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.h
index f5535476eb..523df02bc0 100644
--- a/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.h
+++ b/subsys/ipc/ipc_service/backends/ipc_rpmsg_static_vrings.h
@@ -7,7 +7,7 @@
 #include <openamp/virtio_ring.h>
 #include <openamp/rpmsg_virtio.h>
 
-#include <ipc/ipc_static_vrings.h>
+#include <zephyr/ipc/ipc_static_vrings.h>
 
 /*
  * Endpoint registration flow:
diff --git a/subsys/ipc/ipc_service/ipc_service.c b/subsys/ipc/ipc_service/ipc_service.c
index 200e2d7b2d..459f8ca347 100644
--- a/subsys/ipc/ipc_service/ipc_service.c
+++ b/subsys/ipc/ipc_service/ipc_service.c
@@ -5,12 +5,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ipc/ipc_service.h>
-#include <ipc/ipc_service_backend.h>
+#include <zephyr/ipc/ipc_service.h>
+#include <zephyr/ipc/ipc_service_backend.h>
 
-#include <logging/log.h>
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 
 LOG_MODULE_REGISTER(ipc_service, CONFIG_IPC_SERVICE_LOG_LEVEL);
 
diff --git a/subsys/ipc/ipc_service/lib/ipc_icmsg_buf.c b/subsys/ipc/ipc_service/lib/ipc_icmsg_buf.c
index 2803de851c..61b0b43745 100644
--- a/subsys/ipc/ipc_service/lib/ipc_icmsg_buf.c
+++ b/subsys/ipc/ipc_service/lib/ipc_icmsg_buf.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <errno.h>
-#include <cache.h>
-#include <ipc/ipc_icmsg_buf.h>
+#include <zephyr/cache.h>
+#include <zephyr/ipc/ipc_icmsg_buf.h>
 
 
 /* Helpers */
diff --git a/subsys/ipc/ipc_service/lib/ipc_rpmsg.c b/subsys/ipc/ipc_service/lib/ipc_rpmsg.c
index 06142066d4..b56d286339 100644
--- a/subsys/ipc/ipc_service/lib/ipc_rpmsg.c
+++ b/subsys/ipc/ipc_service/lib/ipc_rpmsg.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <ipc/ipc_rpmsg.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/ipc/ipc_rpmsg.h>
 
 static void rpmsg_service_unbind(struct rpmsg_endpoint *ep)
 {
diff --git a/subsys/ipc/ipc_service/lib/ipc_static_vrings.c b/subsys/ipc/ipc_service/lib/ipc_static_vrings.c
index 8ce57b5cc4..f313856539 100644
--- a/subsys/ipc/ipc_service/lib/ipc_static_vrings.c
+++ b/subsys/ipc/ipc_service/lib/ipc_static_vrings.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ipc/ipc_static_vrings.h>
-#include <cache.h>
+#include <zephyr/ipc/ipc_static_vrings.h>
+#include <zephyr/cache.h>
 
 #define SHM_DEVICE_NAME		"sram0.shm"
 
diff --git a/subsys/ipc/rpmsg_service/rpmsg_backend.c b/subsys/ipc/rpmsg_service/rpmsg_backend.c
index c608706e22..eeca9e2a4c 100644
--- a/subsys/ipc/rpmsg_service/rpmsg_backend.c
+++ b/subsys/ipc/rpmsg_service/rpmsg_backend.c
@@ -6,10 +6,10 @@
 
 #include "rpmsg_backend.h"
 
-#include <zephyr.h>
-#include <drivers/ipm.h>
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/ipm.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 
 #include <openamp/open_amp.h>
 #include <metal/device.h>
diff --git a/subsys/ipc/rpmsg_service/rpmsg_service.c b/subsys/ipc/rpmsg_service/rpmsg_service.c
index 3616a6fda7..9894071899 100644
--- a/subsys/ipc/rpmsg_service/rpmsg_service.c
+++ b/subsys/ipc/rpmsg_service/rpmsg_service.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <ipc/rpmsg_service.h>
+#include <zephyr/ipc/rpmsg_service.h>
 
 #include "rpmsg_backend.h"
 
-#include <zephyr.h>
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 
 #include <openamp/open_amp.h>
 
diff --git a/subsys/jwt/jwt.c b/subsys/jwt/jwt.c
index d5abd1c2f0..1174507379 100644
--- a/subsys/jwt/jwt.c
+++ b/subsys/jwt/jwt.c
@@ -8,14 +8,14 @@
 #include <zephyr/types.h>
 #include <errno.h>
 
-#include <data/jwt.h>
-#include <data/json.h>
+#include <zephyr/data/jwt.h>
+#include <zephyr/data/json.h>
 
 #ifdef CONFIG_JWT_SIGN_RSA
 #include <mbedtls/pk.h>
 #include <mbedtls/rsa.h>
 #include <mbedtls/sha256.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 #endif
 
 #ifdef CONFIG_JWT_SIGN_ECDSA
@@ -24,7 +24,7 @@
 #include <tinycrypt/ecc_dsa.h>
 #include <tinycrypt/constants.h>
 
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 #endif
 
 /*
diff --git a/subsys/logging/log_backend_adsp.c b/subsys/logging/log_backend_adsp.c
index 2285e1937e..4dc7a745d9 100644
--- a/subsys/logging/log_backend_adsp.c
+++ b/subsys/logging/log_backend_adsp.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log_backend.h>
-#include <logging/log_core.h>
-#include <logging/log_msg.h>
-#include <logging/log_output.h>
-#include <logging/log_backend_std.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_msg.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_backend_std.h>
 
 /*
  * A lock is needed as log_process() and log_panic() have no internal locks
diff --git a/subsys/logging/log_backend_cavs_hda.c b/subsys/logging/log_backend_cavs_hda.c
index 5d64d560bf..22ca4ea103 100644
--- a/subsys/logging/log_backend_cavs_hda.c
+++ b/subsys/logging/log_backend_cavs_hda.c
@@ -5,13 +5,13 @@
  */
 
 #include "arch/xtensa/cache.h"
-#include <logging/log_backend.h>
-#include <logging/log_core.h>
-#include <logging/log_msg.h>
-#include <logging/log_output.h>
-#include <logging/log_backend_std.h>
-#include <logging/log_backend_cavs_hda.h>
-#include <drivers/dma.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_msg.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_backend_std.h>
+#include <zephyr/logging/log_backend_cavs_hda.h>
+#include <zephyr/drivers/dma.h>
 #include <zephyr/kernel.h>
 
 static uint32_t log_format_current = CONFIG_LOG_BACKEND_CAVS_HDA_OUTPUT_DEFAULT;
diff --git a/subsys/logging/log_backend_fs.c b/subsys/logging/log_backend_fs.c
index 5347e4bc81..3c60a3b26b 100644
--- a/subsys/logging/log_backend_fs.c
+++ b/subsys/logging/log_backend_fs.c
@@ -6,11 +6,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <logging/log_backend.h>
-#include <logging/log_output_dict.h>
-#include <logging/log_backend_std.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_output_dict.h>
+#include <zephyr/logging/log_backend_std.h>
 #include <assert.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 #define MAX_PATH_LEN 256
 #define MAX_FLASH_WRITE_SIZE 256
diff --git a/subsys/logging/log_backend_native_posix.c b/subsys/logging/log_backend_native_posix.c
index 8a8695f6a0..c30b00258b 100644
--- a/subsys/logging/log_backend_native_posix.c
+++ b/subsys/logging/log_backend_native_posix.c
@@ -7,13 +7,13 @@
 
 #include <stdio.h>
 #include <stddef.h>
-#include <logging/log_backend.h>
-#include <logging/log_backend_std.h>
-#include <logging/log_core.h>
-#include <logging/log_msg.h>
-#include <logging/log_output.h>
-#include <irq.h>
-#include <arch/posix/posix_trace.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_backend_std.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_msg.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/irq.h>
+#include <zephyr/arch/posix/posix_trace.h>
 
 #define _STDOUT_BUF_SIZE 256
 static char stdout_buff[_STDOUT_BUF_SIZE];
diff --git a/subsys/logging/log_backend_net.c b/subsys/logging/log_backend_net.c
index 63237dfdfb..8f96e995ac 100644
--- a/subsys/logging/log_backend_net.c
+++ b/subsys/logging/log_backend_net.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(log_backend_net, CONFIG_LOG_DEFAULT_LEVEL);
 
-#include <logging/log_backend.h>
-#include <logging/log_core.h>
-#include <logging/log_output.h>
-#include <logging/log_msg.h>
-#include <net/net_pkt.h>
-#include <net/net_context.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_msg.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_context.h>
 
 /* Set this to 1 if you want to see what is being sent to server */
 #define DEBUG_PRINTING 0
diff --git a/subsys/logging/log_backend_rtt.c b/subsys/logging/log_backend_rtt.c
index 67c84ad064..44aa51fb89 100644
--- a/subsys/logging/log_backend_rtt.c
+++ b/subsys/logging/log_backend_rtt.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log_backend.h>
-#include <logging/log_core.h>
-#include <logging/log_msg.h>
-#include <logging/log_output.h>
-#include <logging/log_backend_std.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_msg.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_backend_std.h>
 #include <SEGGER_RTT.h>
 
 #ifndef CONFIG_LOG_BACKEND_RTT_BUFFER_SIZE
diff --git a/subsys/logging/log_backend_spinel.c b/subsys/logging/log_backend_spinel.c
index de95977c88..ee4aa8e5a2 100644
--- a/subsys/logging/log_backend_spinel.c
+++ b/subsys/logging/log_backend_spinel.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log_backend.h>
-#include <logging/log_backend_std.h>
-#include <logging/log_output.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_backend_std.h>
+#include <zephyr/logging/log_output.h>
 #include <openthread/platform/logging.h>
 #include <utils/uart.h>
 #include <platform-zephyr.h>
diff --git a/subsys/logging/log_backend_swo.c b/subsys/logging/log_backend_swo.c
index ef089d8f0c..472858adf4 100644
--- a/subsys/logging/log_backend_swo.c
+++ b/subsys/logging/log_backend_swo.c
@@ -22,11 +22,11 @@
  * additional, vendor specific configuration.
  */
 
-#include <logging/log_backend.h>
-#include <logging/log_core.h>
-#include <logging/log_msg.h>
-#include <logging/log_output.h>
-#include <logging/log_backend_std.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_msg.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_backend_std.h>
 #include <soc.h>
 
 /** The stimulus port from which SWO data is received and displayed */
diff --git a/subsys/logging/log_backend_uart.c b/subsys/logging/log_backend_uart.c
index 51c5af6ec4..ac3bc8bceb 100644
--- a/subsys/logging/log_backend_uart.c
+++ b/subsys/logging/log_backend_uart.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log_backend.h>
-#include <logging/log_core.h>
-#include <logging/log_msg.h>
-#include <logging/log_output.h>
-#include <logging/log_output_dict.h>
-#include <logging/log_backend_std.h>
-#include <logging/log.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <sys/__assert.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_msg.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_output_dict.h>
+#include <zephyr/logging/log_backend_std.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/__assert.h>
 LOG_MODULE_REGISTER(log_uart);
 
 /* Fixed size to avoid auto-added trailing '\0'.
diff --git a/subsys/logging/log_backend_xtensa_sim.c b/subsys/logging/log_backend_xtensa_sim.c
index 3e25911dde..16aa2c7ebe 100644
--- a/subsys/logging/log_backend_xtensa_sim.c
+++ b/subsys/logging/log_backend_xtensa_sim.c
@@ -8,11 +8,11 @@
 
 #include <stdio.h>
 #include <stddef.h>
-#include <logging/log_backend.h>
-#include <logging/log_core.h>
-#include <logging/log_msg.h>
-#include <logging/log_output.h>
-#include <logging/log_backend_std.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_core.h>
+#include <zephyr/logging/log_msg.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_backend_std.h>
 #include <xtensa/simcall.h>
 
 #define CHAR_BUF_SIZE (IS_ENABLED(CONFIG_LOG_MODE_IMMEDIATE) ? \
diff --git a/subsys/logging/log_cmds.c b/subsys/logging/log_cmds.c
index e47aa84e4a..c52e854a46 100644
--- a/subsys/logging/log_cmds.c
+++ b/subsys/logging/log_cmds.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
-#include <logging/log_ctrl.h>
-#include <logging/log.h>
-#include <logging/log_internal.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_internal.h>
 #include <string.h>
 
 typedef int (*log_backend_cmd_t)(const struct shell *shell,
diff --git a/subsys/logging/log_core.c b/subsys/logging/log_core.c
index a82d081075..9f03186af3 100644
--- a/subsys/logging/log_core.c
+++ b/subsys/logging/log_core.c
@@ -3,24 +3,24 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <logging/log_msg.h>
+#include <zephyr/logging/log_msg.h>
 #include "log_list.h"
-#include <logging/log.h>
-#include <logging/log_backend.h>
-#include <logging/log_ctrl.h>
-#include <logging/log_output.h>
-#include <logging/log_internal.h>
-#include <sys/mpsc_pbuf.h>
-#include <sys/printk.h>
-#include <sys_clock.h>
-#include <init.h>
-#include <sys/__assert.h>
-#include <sys/atomic.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_internal.h>
+#include <zephyr/sys/mpsc_pbuf.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/atomic.h>
 #include <ctype.h>
-#include <logging/log_frontend.h>
-#include <syscall_handler.h>
-#include <logging/log_output_dict.h>
-#include <linker/utils.h>
+#include <zephyr/logging/log_frontend.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/logging/log_output_dict.h>
+#include <zephyr/linker/utils.h>
 
 LOG_MODULE_REGISTER(log);
 
diff --git a/subsys/logging/log_frontend_dict_uart.c b/subsys/logging/log_frontend_dict_uart.c
index aabe33d290..e57e6a37ef 100644
--- a/subsys/logging/log_frontend_dict_uart.c
+++ b/subsys/logging/log_frontend_dict_uart.c
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <logging/log_frontend.h>
-#include <logging/log_internal.h>
-#include <logging/log_output_dict.h>
-#include <sys/mpsc_pbuf.h>
-#include <device.h>
-#include <drivers/uart.h>
+#include <zephyr/logging/log_frontend.h>
+#include <zephyr/logging/log_internal.h>
+#include <zephyr/logging/log_output_dict.h>
+#include <zephyr/sys/mpsc_pbuf.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
 
 static uint32_t dbuf[CONFIG_LOG_FRONTEND_DICT_UART_BUFFER_SIZE / sizeof(uint32_t)];
 
diff --git a/subsys/logging/log_list.h b/subsys/logging/log_list.h
index b2c7c38c5a..c267387bf4 100644
--- a/subsys/logging/log_list.h
+++ b/subsys/logging/log_list.h
@@ -6,7 +6,7 @@
 #ifndef LOG_LIST_H_
 #define LOG_LIST_H_
 
-#include <logging/log_msg.h>
+#include <zephyr/logging/log_msg.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/logging/log_mgmt.c b/subsys/logging/log_mgmt.c
index a0e6f2709b..796744c52f 100644
--- a/subsys/logging/log_mgmt.c
+++ b/subsys/logging/log_mgmt.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <logging/log_internal.h>
-#include <logging/log_ctrl.h>
-#include <syscall_handler.h>
+#include <zephyr/logging/log_internal.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/syscall_handler.h>
 
 /* Implementation of functions related to controlling logging sources and backends:
  * - getting/setting source details like name, filtering
diff --git a/subsys/logging/log_minimal.c b/subsys/logging/log_minimal.c
index 3ebde8a691..ebfa4ff5d7 100644
--- a/subsys/logging/log_minimal.c
+++ b/subsys/logging/log_minimal.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <ctype.h>
-#include <logging/log.h>
-#include <sys/printk.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/printk.h>
 
 #define HEXDUMP_BYTES_IN_LINE 8U
 
diff --git a/subsys/logging/log_msg.c b/subsys/logging/log_msg.c
index 7ebf4f7f69..85a3c42831 100644
--- a/subsys/logging/log_msg.c
+++ b/subsys/logging/log_msg.c
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <kernel.h>
-#include <logging/log.h>
-#include <logging/log_msg.h>
-#include <logging/log_ctrl.h>
-#include <logging/log_internal.h>
-#include <sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_msg.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log_internal.h>
+#include <zephyr/sys/__assert.h>
 #include <string.h>
 
 BUILD_ASSERT((sizeof(struct log_msg_ids) == sizeof(uint16_t)),
diff --git a/subsys/logging/log_msg2.c b/subsys/logging/log_msg2.c
index 0eed269a98..3719d16d7c 100644
--- a/subsys/logging/log_msg2.c
+++ b/subsys/logging/log_msg2.c
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <syscall_handler.h>
-#include <logging/log_internal.h>
-#include <logging/log_ctrl.h>
-#include <logging/log_frontend.h>
-#include <logging/log_backend.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/logging/log_internal.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log_frontend.h>
+#include <zephyr/logging/log_backend.h>
 
 /* Returns true if any backend is in use. */
 #define BACKENDS_IN_USE() \
diff --git a/subsys/logging/log_output.c b/subsys/logging/log_output.c
index ef23259414..66fa8e7bc2 100644
--- a/subsys/logging/log_output.c
+++ b/subsys/logging/log_output.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log_output.h>
-#include <logging/log_ctrl.h>
-#include <logging/log.h>
-#include <sys/__assert.h>
-#include <sys/cbprintf.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/cbprintf.h>
 #include <ctype.h>
 #include <time.h>
 #include <stdio.h>
diff --git a/subsys/logging/log_output_dict.c b/subsys/logging/log_output_dict.c
index 705e17af3d..6746dd79c4 100644
--- a/subsys/logging/log_output_dict.c
+++ b/subsys/logging/log_output_dict.c
@@ -5,12 +5,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
-#include <logging/log_ctrl.h>
-#include <logging/log_output.h>
-#include <logging/log_output_dict.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log_output.h>
+#include <zephyr/logging/log_output_dict.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>
 
 static void buffer_write(log_output_func_t outf, uint8_t *buf, size_t len,
 			 void *ctx)
diff --git a/subsys/logging/log_output_syst.c b/subsys/logging/log_output_syst.c
index ae1f3e8480..f425152f72 100644
--- a/subsys/logging/log_output_syst.c
+++ b/subsys/logging/log_output_syst.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <mipi_syst.h>
-#include <spinlock.h>
-#include <toolchain.h>
-#include <sys/__assert.h>
-#include <linker/utils.h>
-#include <logging/log.h>
-#include <logging/log_ctrl.h>
-#include <logging/log_output.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/linker/utils.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/logging/log_output.h>
 
 static struct mipi_syst_header log_syst_header;
 static struct mipi_syst_handle log_syst_handle;
diff --git a/subsys/logging/mipi_syst/platform.h b/subsys/logging/mipi_syst/platform.h
index 56d58ae643..a2859908cf 100644
--- a/subsys/logging/mipi_syst/platform.h
+++ b/subsys/logging/mipi_syst/platform.h
@@ -7,7 +7,7 @@
 #ifndef MIPI_SYST_PLATFORM_INCLUDED
 #define MIPI_SYST_PLATFORM_INCLUDED
 
-#include <logging/log_output.h>
+#include <zephyr/logging/log_output.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/lorawan/lorawan.c b/subsys/lorawan/lorawan.c
index 099106722c..2bebd67840 100644
--- a/subsys/lorawan/lorawan.c
+++ b/subsys/lorawan/lorawan.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <errno.h>
-#include <lorawan/lorawan.h>
+#include <zephyr/lorawan/lorawan.h>
 
 #include "lw_priv.h"
 
@@ -45,7 +45,7 @@ BUILD_ASSERT(!IS_ENABLED(CONFIG_LORAMAC_REGION_UNKNOWN),
 #define LORAWAN_ABP_VERSION 0x01000300
 
 #define LOG_LEVEL CONFIG_LORAWAN_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(lorawan);
 
 K_SEM_DEFINE(mlme_confirm_sem, 0, 1);
diff --git a/subsys/lorawan/lw_priv.c b/subsys/lorawan/lw_priv.c
index 4e8837b38d..063184804e 100644
--- a/subsys/lorawan/lw_priv.c
+++ b/subsys/lorawan/lw_priv.c
@@ -5,7 +5,7 @@
  */
 
 #include <errno.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "lw_priv.h"
 
diff --git a/subsys/lorawan/nvm/lorawan_nvm_settings.c b/subsys/lorawan/nvm/lorawan_nvm_settings.c
index 127bcad8ca..b764be8834 100644
--- a/subsys/lorawan/nvm/lorawan_nvm_settings.c
+++ b/subsys/lorawan/nvm/lorawan_nvm_settings.c
@@ -5,10 +5,10 @@
  */
 
 #include <LoRaMac.h>
-#include <kernel.h>
-#include <settings/settings.h>
+#include <zephyr/kernel.h>
+#include <zephyr/settings/settings.h>
 #include "lorawan_nvm.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(lorawan_nvm, CONFIG_LORAWAN_LOG_LEVEL);
 
diff --git a/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c b/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c
index b07b9d0a4e..c8979f9915 100644
--- a/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c
+++ b/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <drivers/ec_host_cmd_periph.h>
-#include <mgmt/ec_host_cmd.h>
-#include <devicetree.h>
+#include <zephyr/drivers/ec_host_cmd_periph.h>
+#include <zephyr/mgmt/ec_host_cmd.h>
+#include <zephyr/devicetree.h>
 #include <string.h>
 
 #if !DT_HAS_CHOSEN(zephyr_ec_host_interface)
diff --git a/subsys/mgmt/hawkbit/hawkbit.c b/subsys/mgmt/hawkbit/hawkbit.c
index f3728017b6..809c2aa373 100644
--- a/subsys/mgmt/hawkbit/hawkbit.c
+++ b/subsys/mgmt/hawkbit/hawkbit.c
@@ -8,25 +8,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_REGISTER(hawkbit, CONFIG_HAWKBIT_LOG_LEVEL);
 
 #include <stdio.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include <stdlib.h>
-#include <fs/nvs.h>
-#include <data/json.h>
-#include <net/net_ip.h>
-#include <net/socket.h>
-#include <net/net_mgmt.h>
-#include <sys/reboot.h>
-#include <drivers/flash.h>
-#include <net/http_client.h>
-#include <net/dns_resolve.h>
-#include <logging/log_ctrl.h>
-#include <storage/flash_map.h>
+#include <zephyr/fs/nvs.h>
+#include <zephyr/data/json.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/net/http_client.h>
+#include <zephyr/net/dns_resolve.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/storage/flash_map.h>
 
 #include "hawkbit_priv.h"
 #include "hawkbit_device.h"
@@ -35,7 +35,7 @@ LOG_MODULE_REGISTER(hawkbit, CONFIG_HAWKBIT_LOG_LEVEL);
 
 #if defined(CONFIG_NET_SOCKETS_SOCKOPT_TLS)
 #define CA_CERTIFICATE_TAG 1
-#include <net/tls_credentials.h>
+#include <zephyr/net/tls_credentials.h>
 #endif
 
 #define ADDRESS_ID 1
diff --git a/subsys/mgmt/hawkbit/hawkbit_device.h b/subsys/mgmt/hawkbit/hawkbit_device.h
index 0018d0584c..0cd1a23c70 100644
--- a/subsys/mgmt/hawkbit/hawkbit_device.h
+++ b/subsys/mgmt/hawkbit/hawkbit_device.h
@@ -7,8 +7,8 @@
 #ifndef __HAWKBIT_DEVICE_H__
 #define __HAWKBIT_DEVICE_H__
 
-#include <zephyr.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/hwinfo.h>
 
 #define DEVICE_ID_BIN_MAX_SIZE	16
 #define DEVICE_ID_HEX_MAX_SIZE	((DEVICE_ID_BIN_MAX_SIZE * 2) + 1)
diff --git a/subsys/mgmt/hawkbit/hawkbit_firmware.c b/subsys/mgmt/hawkbit/hawkbit_firmware.c
index fb51819233..30fb04a70c 100644
--- a/subsys/mgmt/hawkbit/hawkbit_firmware.c
+++ b/subsys/mgmt/hawkbit/hawkbit_firmware.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 
 #include "hawkbit_firmware.h"
 
diff --git a/subsys/mgmt/hawkbit/hawkbit_firmware.h b/subsys/mgmt/hawkbit/hawkbit_firmware.h
index eff1e35226..6678c0974c 100644
--- a/subsys/mgmt/hawkbit/hawkbit_firmware.h
+++ b/subsys/mgmt/hawkbit/hawkbit_firmware.h
@@ -7,9 +7,9 @@
 #ifndef __HAWKBIT_FIRMWARE_H__
 #define __HAWKBIT_FIRMWARE_H__
 
-#include <drivers/flash.h>
-#include <dfu/mcuboot.h>
-#include <dfu/flash_img.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/dfu/flash_img.h>
 
 bool hawkbit_get_firmware_version(char *version, int version_len);
 
diff --git a/subsys/mgmt/hawkbit/hawkbit_priv.h b/subsys/mgmt/hawkbit/hawkbit_priv.h
index 604080ba69..eb8c7c2fb2 100644
--- a/subsys/mgmt/hawkbit/hawkbit_priv.h
+++ b/subsys/mgmt/hawkbit/hawkbit_priv.h
@@ -13,7 +13,7 @@
 #ifndef __HAWKBIT_PRIV_H__
 #define __HAWKBIT_PRIV_H__
 
-#include <data/json.h>
+#include <zephyr/data/json.h>
 
 #define HAWKBIT_SLEEP_LENGTH 8
 
diff --git a/subsys/mgmt/hawkbit/shell.c b/subsys/mgmt/hawkbit/shell.c
index 2d4c7d509c..377d0cbe32 100644
--- a/subsys/mgmt/hawkbit/shell.c
+++ b/subsys/mgmt/hawkbit/shell.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
-#include <drivers/flash.h>
-#include <dfu/mcuboot.h>
-#include <dfu/flash_img.h>
-#include <sys/reboot.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/dfu/flash_img.h>
+#include <zephyr/sys/reboot.h>
 #include "mgmt/hawkbit.h"
 #include "hawkbit_firmware.h"
 #include "hawkbit_device.h"
diff --git a/subsys/mgmt/mcumgr/buf.c b/subsys/mgmt/mcumgr/buf.c
index 6d6fa635cc..e8175f8942 100644
--- a/subsys/mgmt/mcumgr/buf.c
+++ b/subsys/mgmt/mcumgr/buf.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include "net/buf.h"
 #include "mgmt/mcumgr/buf.h"
 #include <mgmt/mgmt.h>
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_crc32.h b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_crc32.h
index c640ed9c8a..6add63feee 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_crc32.h
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_crc32.h
@@ -7,7 +7,7 @@
 #ifndef H_HASH_CHECKSUM_CRC32_
 #define H_HASH_CHECKSUM_CRC32_
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_mgmt.h b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_mgmt.h
index bd831aec80..87cce4abb9 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_mgmt.h
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_mgmt.h
@@ -8,8 +8,8 @@
 #ifndef H_HASH_CHECKSUM_MGMT_
 #define H_HASH_CHECKSUM_MGMT_
 
-#include <zephyr.h>
-#include <fs/fs.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/fs/fs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_sha256.h b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_sha256.h
index 060cfc6f4a..eff3852567 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_sha256.h
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/include/fs_mgmt/hash_checksum_sha256.h
@@ -7,7 +7,7 @@
 #ifndef H_HASH_CHECKSUM_SHA256_
 #define H_HASH_CHECKSUM_SHA256_
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/fs_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/fs_mgmt.c
index 7885c8973b..09300dba67 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/fs_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/fs_mgmt.c
@@ -6,16 +6,16 @@
  */
 
 #include <assert.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <limits.h>
 #include <string.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <zcbor_common.h>
 #include <zcbor_decode.h>
 #include <zcbor_encode.h>
 #include "zcbor_bulk/zcbor_bulk_priv.h"
-#include <mgmt/mcumgr/buf.h>
-#include <fs/fs.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
+#include <zephyr/fs/fs.h>
 #include "mgmt/mgmt.h"
 #include "fs_mgmt/fs_mgmt.h"
 #include "fs_mgmt/fs_mgmt_impl.h"
@@ -50,7 +50,7 @@
 #endif
 
 #define LOG_LEVEL CONFIG_MCUMGR_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(fs_mgmt);
 
 #define HASH_CHECKSUM_TYPE_SIZE 8
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_crc32.c b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_crc32.c
index d07e23d22d..4eeba15e10 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_crc32.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_crc32.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
-#include <sys/crc.h>
-#include <fs/fs.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/fs/fs.h>
 #include <mgmt/mgmt.h>
 #include <fs_mgmt/fs_mgmt_config.h>
 #include <fs_mgmt/fs_mgmt_impl.h>
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_mgmt.c
index 24dc766ac3..b80aa1f8af 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_mgmt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 #include "mgmt/mgmt.h"
 #include "fs_mgmt/hash_checksum_mgmt.h"
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_sha256.c b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_sha256.c
index 67b3c1eb6a..a44b58efda 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_sha256.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/hash_checksum_sha256.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include <mgmt/mgmt.h>
 #include <fs_mgmt/fs_mgmt_config.h>
 #include <fs_mgmt/fs_mgmt_impl.h>
diff --git a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/zephyr_fs_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/zephyr_fs_mgmt.c
index f268820957..612ba3d6bf 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/zephyr_fs_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/fs_mgmt/src/zephyr_fs_mgmt.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 #include <errno.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include <mgmt/mgmt.h>
 #include <fs_mgmt/fs_mgmt_impl.h>
 
diff --git a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/img_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/img_mgmt.c
index 119906204c..ac8a7d98e4 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/img_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/img_mgmt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <limits.h>
 #include <assert.h>
 #include <string.h>
@@ -12,7 +12,7 @@
 #include <zcbor_common.h>
 #include <zcbor_decode.h>
 #include <zcbor_encode.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include "zcbor_bulk/zcbor_bulk_priv.h"
 #include "mgmt/mgmt.h"
 
diff --git a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/img_mgmt_state.c b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/img_mgmt_state.c
index bb2aca79d9..1bd44ab247 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/img_mgmt_state.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/img_mgmt_state.c
@@ -5,13 +5,13 @@
  */
 
 #include <assert.h>
-#include <sys/util_macro.h>
+#include <zephyr/sys/util_macro.h>
 
 #include <string.h>
 #include <zcbor_common.h>
 #include <zcbor_decode.h>
 #include <zcbor_encode.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include <mgmt/mgmt.h>
 #include "zcbor_bulk/zcbor_bulk_priv.h"
 #include "img_mgmt/img_mgmt.h"
diff --git a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt.c
index 17e3817b5c..4049cc45cb 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mcumgr_img_mgmt, CONFIG_MCUMGR_IMG_MGMT_LOG_LEVEL);
 
 #include <assert.h>
-#include <drivers/flash.h>
-#include <storage/flash_map.h>
-#include <zephyr.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/zephyr.h>
 #include <soc.h>
-#include <init.h>
-#include <dfu/mcuboot.h>
-#include <dfu/flash_img.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/init.h>
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/dfu/flash_img.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include <mgmt/mgmt.h>
 #include <img_mgmt/img_mgmt_impl.h>
 #include <img_mgmt/img_mgmt.h>
diff --git a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt_log.c b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt_log.c
index c4afd089a4..6482438038 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt_log.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/img_mgmt/src/zephyr_img_mgmt_log.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <img_mgmt/img_mgmt.h>
 /**
  * Log event types (all events are CBOR-encoded):
diff --git a/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/os_mgmt.c
index d66e4235a4..3fd2034d2c 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/os_mgmt.c
@@ -6,17 +6,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <assert.h>
 #include <string.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
-#include <debug/object_tracing.h>
-#include <kernel_structs.h>
+#include <zephyr/debug/object_tracing.h>
+#include <zephyr/kernel_structs.h>
 #include <zcbor_common.h>
 #include <zcbor_encode.h>
 #include <zcbor_decode.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 
 #include "mgmt/mgmt.h"
 #include "os_mgmt/os_mgmt.h"
diff --git a/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/zephyr_os_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/zephyr_os_mgmt.c
index a456ed9184..3d2d12d976 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/zephyr_os_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/os_mgmt/src/zephyr_os_mgmt.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/reboot.h>
-#include <debug/object_tracing.h>
-#include <kernel_structs.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/debug/object_tracing.h>
+#include <zephyr/kernel_structs.h>
 #include <os_mgmt/os_mgmt.h>
 #include <os_mgmt/os_mgmt_impl.h>
 
diff --git a/subsys/mgmt/mcumgr/lib/cmd/shell_mgmt/src/shell_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/shell_mgmt/src/shell_mgmt.c
index ee9477f4de..9a40dd6af5 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/shell_mgmt/src/shell_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/shell_mgmt/src/shell_mgmt.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <string.h>
 #include <stdio.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include "mgmt/mgmt.h"
 #include <zcbor_common.h>
 #include <zcbor_encode.h>
 #include <zcbor_decode.h>
 #include "shell_mgmt/shell_mgmt.h"
 #include "shell_mgmt/shell_mgmt_config.h"
-#include <shell/shell_dummy.h>
+#include <zephyr/shell/shell_dummy.h>
 
 static int
 shell_exec(const char *line)
diff --git a/subsys/mgmt/mcumgr/lib/cmd/stat_mgmt/src/stat_mgmt.c b/subsys/mgmt/mcumgr/lib/cmd/stat_mgmt/src/stat_mgmt.c
index ddea211e58..1736d24c14 100644
--- a/subsys/mgmt/mcumgr/lib/cmd/stat_mgmt/src/stat_mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/cmd/stat_mgmt/src/stat_mgmt.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 #include <string.h>
 #include <stdio.h>
 
-#include <stats/stats.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/stats/stats.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include <mgmt/mgmt.h>
 #include <stat_mgmt/stat_mgmt_config.h>
 #include <stat_mgmt/stat_mgmt.h>
diff --git a/subsys/mgmt/mcumgr/lib/mgmt/src/mgmt.c b/subsys/mgmt/mcumgr/lib/mgmt/src/mgmt.c
index acc472f751..9523fda5fb 100644
--- a/subsys/mgmt/mcumgr/lib/mgmt/src/mgmt.c
+++ b/subsys/mgmt/mcumgr/lib/mgmt/src/mgmt.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <string.h>
 
 #include <zcbor_common.h>
 #include <zcbor_encode.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include "mgmt/mgmt.h"
 
 static mgmt_on_evt_cb evt_cb;
diff --git a/subsys/mgmt/mcumgr/lib/smp/src/smp.c b/subsys/mgmt/mcumgr/lib/smp/src/smp.c
index 6cb058bbc3..668d5e15d3 100644
--- a/subsys/mgmt/mcumgr/lib/smp/src/smp.c
+++ b/subsys/mgmt/mcumgr/lib/smp/src/smp.c
@@ -9,8 +9,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include <net/buf.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include "mgmt/mgmt.h"
 #include <zcbor_common.h>
 #include <zcbor_encode.h>
diff --git a/subsys/mgmt/mcumgr/lib/util/include/zcbor_bulk/zcbor_bulk_priv.h b/subsys/mgmt/mcumgr/lib/util/include/zcbor_bulk/zcbor_bulk_priv.h
index 58665234fa..f0be84ae00 100644
--- a/subsys/mgmt/mcumgr/lib/util/include/zcbor_bulk/zcbor_bulk_priv.h
+++ b/subsys/mgmt/mcumgr/lib/util/include/zcbor_bulk/zcbor_bulk_priv.h
@@ -10,7 +10,7 @@
 extern "C" {
 #endif
 
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 /** @cond INTERNAL_HIDDEN */
 
diff --git a/subsys/mgmt/mcumgr/serial_util.c b/subsys/mgmt/mcumgr/serial_util.c
index c265df1dcc..7d49e660a1 100644
--- a/subsys/mgmt/mcumgr/serial_util.c
+++ b/subsys/mgmt/mcumgr/serial_util.c
@@ -5,16 +5,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include <string.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <sys/crc.h>
-#include <sys/byteorder.h>
-#include <net/buf.h>
-#include <sys/base64.h>
-#include <mgmt/mcumgr/buf.h>
-#include <mgmt/mcumgr/serial.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/sys/base64.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/serial.h>
 
 static void mcumgr_serial_free_rx_ctxt(struct mcumgr_serial_rx_ctxt *rx_ctxt)
 {
diff --git a/subsys/mgmt/mcumgr/smp.c b/subsys/mgmt/mcumgr/smp.c
index 61c6d2ff2c..7c4ceea10d 100644
--- a/subsys/mgmt/mcumgr/smp.c
+++ b/subsys/mgmt/mcumgr/smp.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <net/buf.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include "mgmt/mgmt.h"
 #include "smp/smp.h"
 #include "mgmt/mcumgr/smp.h"
 #include "smp_reassembly.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(mcumgr_smp, CONFIG_MCUMGR_SMP_LOG_LEVEL);
 
 /* To be able to unit test some callers some functions need to be
diff --git a/subsys/mgmt/mcumgr/smp_bt.c b/subsys/mgmt/mcumgr/smp_bt.c
index f711738dd5..951e60c998 100644
--- a/subsys/mgmt/mcumgr/smp_bt.c
+++ b/subsys/mgmt/mcumgr/smp_bt.c
@@ -10,19 +10,19 @@
 
 #include <errno.h>
 
-#include <zephyr.h>
-#include <init.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
-#include <mgmt/mcumgr/smp_bt.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/smp_bt.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 
-#include <mgmt/mcumgr/smp.h>
+#include <zephyr/mgmt/mcumgr/smp.h>
 #include "smp_reassembly.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(mcumgr_smp, CONFIG_MCUMGR_SMP_LOG_LEVEL);
 
 #define RESTORE_TIME	COND_CODE_1(CONFIG_MCUMGR_SMP_BT_CONN_PARAM_CONTROL, \
diff --git a/subsys/mgmt/mcumgr/smp_reassembly.c b/subsys/mgmt/mcumgr/smp_reassembly.c
index f5429f867d..d1372e9e5a 100644
--- a/subsys/mgmt/mcumgr/smp_reassembly.c
+++ b/subsys/mgmt/mcumgr/smp_reassembly.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <sys/byteorder.h>
-#include <net/buf.h>
-#include <mgmt/mcumgr/buf.h>
-#include <mgmt/mcumgr/smp.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/smp.h>
 #include <mgmt/mgmt.h>
 #include <smp/smp.h>
 
diff --git a/subsys/mgmt/mcumgr/smp_shell.c b/subsys/mgmt/mcumgr/smp_shell.c
index 1ea391f703..629342f9fa 100644
--- a/subsys/mgmt/mcumgr/smp_shell.c
+++ b/subsys/mgmt/mcumgr/smp_shell.c
@@ -9,10 +9,10 @@
  */
 
 #include <string.h>
-#include <zephyr.h>
-#include <init.h>
-#include <net/buf.h>
-#include <mgmt/mcumgr/buf.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
 #include "mgmt/mgmt.h"
 #include "mgmt/mcumgr/serial.h"
 #include "mgmt/mcumgr/smp.h"
@@ -22,7 +22,7 @@
 #include "shell/shell.h"
 #include "shell/shell_uart.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(smp_shell);
 
 static struct zephyr_smp_transport smp_shell_transport;
diff --git a/subsys/mgmt/mcumgr/smp_uart.c b/subsys/mgmt/mcumgr/smp_uart.c
index 5c2b3a60b8..63f3eebdfc 100644
--- a/subsys/mgmt/mcumgr/smp_uart.c
+++ b/subsys/mgmt/mcumgr/smp_uart.c
@@ -9,13 +9,13 @@
  */
 
 #include <string.h>
-#include <zephyr.h>
-#include <init.h>
-#include <net/buf.h>
-#include <mgmt/mcumgr/buf.h>
-#include <drivers/console/uart_mcumgr.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
+#include <zephyr/drivers/console/uart_mcumgr.h>
 #include "mgmt/mgmt.h"
-#include <mgmt/mcumgr/serial.h>
+#include <zephyr/mgmt/mcumgr/serial.h>
 #include "mgmt/mcumgr/smp.h"
 
 struct device;
diff --git a/subsys/mgmt/mcumgr/smp_udp.c b/subsys/mgmt/mcumgr/smp_udp.c
index 797d6e2a08..2559cc7f08 100644
--- a/subsys/mgmt/mcumgr/smp_udp.c
+++ b/subsys/mgmt/mcumgr/smp_udp.c
@@ -9,17 +9,17 @@
  * @brief UDP transport for the mcumgr SMP protocol.
  */
 
-#include <zephyr.h>
-#include <init.h>
-#include <net/socket.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
+#include <zephyr/net/socket.h>
 #include <errno.h>
 #include <mgmt/mgmt.h>
-#include <mgmt/mcumgr/smp_udp.h>
-#include <mgmt/mcumgr/buf.h>
-#include <mgmt/mcumgr/smp.h>
+#include <zephyr/mgmt/mcumgr/smp_udp.h>
+#include <zephyr/mgmt/mcumgr/buf.h>
+#include <zephyr/mgmt/mcumgr/smp.h>
 
 #define LOG_LEVEL CONFIG_MCUMGR_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(smp_udp);
 
 struct config {
diff --git a/subsys/mgmt/mcumgr/zephyr_grp/basic_mgmt.c b/subsys/mgmt/mcumgr/zephyr_grp/basic_mgmt.c
index 3027e7e881..f710cb0b53 100644
--- a/subsys/mgmt/mcumgr/zephyr_grp/basic_mgmt.c
+++ b/subsys/mgmt/mcumgr/zephyr_grp/basic_mgmt.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <logging/log.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/init.h>
 #include <mgmt/mgmt.h>
-#include <mgmt/mcumgr/zephyr_groups.h>
-#include <storage/flash_map.h>
+#include <zephyr/mgmt/mcumgr/zephyr_groups.h>
+#include <zephyr/storage/flash_map.h>
 
 LOG_MODULE_REGISTER(mcumgr_zephyr_grp);
 
diff --git a/subsys/mgmt/osdp/src/osdp.c b/subsys/mgmt/osdp/src/osdp.c
index d037e5d772..beef386cec 100644
--- a/subsys/mgmt/osdp/src/osdp.c
+++ b/subsys/mgmt/osdp/src/osdp.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <kernel.h>
-#include <init.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <sys/ring_buffer.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/logging/log.h>
 
 #include "osdp_common.h"
 
diff --git a/subsys/mgmt/osdp/src/osdp_common.c b/subsys/mgmt/osdp/src/osdp_common.c
index 38fd133afb..70fd194232 100644
--- a/subsys/mgmt/osdp/src/osdp_common.c
+++ b/subsys/mgmt/osdp/src/osdp_common.c
@@ -6,13 +6,13 @@
 
 #include <ctype.h>
 
-#include <device.h>
-#include <sys/crc.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/logging/log.h>
 
 #ifdef CONFIG_OSDP_SC_ENABLED
-#include <crypto/crypto.h>
-#include <random/rand32.h>
+#include <zephyr/crypto/crypto.h>
+#include <zephyr/random/rand32.h>
 #endif
 
 #include "osdp_common.h"
diff --git a/subsys/mgmt/osdp/src/osdp_common.h b/subsys/mgmt/osdp/src/osdp_common.h
index a44356308e..ad973f8733 100644
--- a/subsys/mgmt/osdp/src/osdp_common.h
+++ b/subsys/mgmt/osdp/src/osdp_common.h
@@ -7,8 +7,8 @@
 #ifndef _OSDP_COMMON_H_
 #define _OSDP_COMMON_H_
 
-#include <mgmt/osdp.h>
-#include <sys/__assert.h>
+#include <zephyr/mgmt/osdp.h>
+#include <zephyr/sys/__assert.h>
 
 #define OSDP_RESP_TOUT_MS              (200)
 
diff --git a/subsys/mgmt/osdp/src/osdp_cp.c b/subsys/mgmt/osdp/src/osdp_cp.c
index 8923361dd2..d60aebeaa8 100644
--- a/subsys/mgmt/osdp/src/osdp_cp.c
+++ b/subsys/mgmt/osdp/src/osdp_cp.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdlib.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(osdp, CONFIG_OSDP_LOG_LEVEL);
 
 #include "osdp_common.h"
diff --git a/subsys/mgmt/osdp/src/osdp_pd.c b/subsys/mgmt/osdp/src/osdp_pd.c
index 4dacf0c7b0..0736728c86 100644
--- a/subsys/mgmt/osdp/src/osdp_pd.c
+++ b/subsys/mgmt/osdp/src/osdp_pd.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(osdp, CONFIG_OSDP_LOG_LEVEL);
 
 #include <stdlib.h>
diff --git a/subsys/mgmt/osdp/src/osdp_phy.c b/subsys/mgmt/osdp/src/osdp_phy.c
index 25533b3e7c..ef3f50a761 100644
--- a/subsys/mgmt/osdp/src/osdp_phy.c
+++ b/subsys/mgmt/osdp/src/osdp_phy.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(osdp, CONFIG_OSDP_LOG_LEVEL);
 
 #include <string.h>
diff --git a/subsys/mgmt/osdp/src/osdp_sc.c b/subsys/mgmt/osdp/src/osdp_sc.c
index 6a9521c3d2..ac14d01393 100644
--- a/subsys/mgmt/osdp/src/osdp_sc.c
+++ b/subsys/mgmt/osdp/src/osdp_sc.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(osdp, CONFIG_OSDP_LOG_LEVEL);
 
 #include <string.h>
diff --git a/subsys/mgmt/updatehub/shell.c b/subsys/mgmt/updatehub/shell.c
index f621a0a294..bab01d300a 100644
--- a/subsys/mgmt/updatehub/shell.c
+++ b/subsys/mgmt/updatehub/shell.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
-#include <drivers/flash.h>
-#include <dfu/mcuboot.h>
-#include <dfu/flash_img.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/dfu/flash_img.h>
 #include "include/updatehub.h"
 #include "updatehub_firmware.h"
 #include "updatehub_device.h"
diff --git a/subsys/mgmt/updatehub/updatehub.c b/subsys/mgmt/updatehub/updatehub.c
index e0a9977aa5..9fe774926a 100644
--- a/subsys/mgmt/updatehub/updatehub.c
+++ b/subsys/mgmt/updatehub/updatehub.c
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(updatehub, CONFIG_UPDATEHUB_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <logging/log_ctrl.h>
-#include <net/socket.h>
-#include <net/net_mgmt.h>
-#include <net/net_ip.h>
-#include <net/udp.h>
-#include <net/coap.h>
-#include <net/dns_resolve.h>
-#include <drivers/flash.h>
-#include <sys/reboot.h>
+#include <zephyr/logging/log_ctrl.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/udp.h>
+#include <zephyr/net/coap.h>
+#include <zephyr/net/dns_resolve.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/sys/reboot.h>
 #include <tinycrypt/sha256.h>
-#include <data/json.h>
-#include <storage/flash_map.h>
+#include <zephyr/data/json.h>
+#include <zephyr/storage/flash_map.h>
 
 #include "include/updatehub.h"
 #include "updatehub_priv.h"
@@ -30,7 +30,7 @@ LOG_MODULE_REGISTER(updatehub, CONFIG_UPDATEHUB_LOG_LEVEL);
 
 #if defined(CONFIG_UPDATEHUB_DTLS)
 #define CA_CERTIFICATE_TAG 1
-#include <net/tls_credentials.h>
+#include <zephyr/net/tls_credentials.h>
 #endif
 
 #define NETWORK_TIMEOUT (2 * MSEC_PER_SEC)
diff --git a/subsys/mgmt/updatehub/updatehub_device.h b/subsys/mgmt/updatehub/updatehub_device.h
index d2728f296e..10ea830324 100644
--- a/subsys/mgmt/updatehub/updatehub_device.h
+++ b/subsys/mgmt/updatehub/updatehub_device.h
@@ -7,8 +7,8 @@
 #ifndef __UPDATEHUB_DEVICE_H__
 #define __UPDATEHUB_DEVICE_H__
 
-#include <zephyr.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/hwinfo.h>
 
 #define DEVICE_ID_BIN_MAX_SIZE	64
 #define DEVICE_ID_HEX_MAX_SIZE	((DEVICE_ID_BIN_MAX_SIZE * 2) + 1)
diff --git a/subsys/mgmt/updatehub/updatehub_firmware.c b/subsys/mgmt/updatehub/updatehub_firmware.c
index 553f516542..5276ad28d7 100644
--- a/subsys/mgmt/updatehub/updatehub_firmware.c
+++ b/subsys/mgmt/updatehub/updatehub_firmware.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 
 #include "updatehub_firmware.h"
 
diff --git a/subsys/mgmt/updatehub/updatehub_firmware.h b/subsys/mgmt/updatehub/updatehub_firmware.h
index 063747a2b7..169aa78f14 100644
--- a/subsys/mgmt/updatehub/updatehub_firmware.h
+++ b/subsys/mgmt/updatehub/updatehub_firmware.h
@@ -7,9 +7,9 @@
 #ifndef __UPDATEHUB_FIRMWARE_H__
 #define __UPDATEHUB_FIRMWARE_H__
 
-#include <drivers/flash.h>
-#include <dfu/mcuboot.h>
-#include <dfu/flash_img.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/dfu/flash_img.h>
 
 bool updatehub_get_firmware_version(char *version, int version_len);
 
diff --git a/subsys/mgmt/updatehub/updatehub_timer.c b/subsys/mgmt/updatehub/updatehub_timer.c
index 88adb7c568..5799a4be32 100644
--- a/subsys/mgmt/updatehub/updatehub_timer.c
+++ b/subsys/mgmt/updatehub/updatehub_timer.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(updatehub, CONFIG_UPDATEHUB_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include "updatehub_timer.h"
 
 static int blk_vars[UPDATEHUB_BLK_MAX_VARS];
diff --git a/subsys/modbus/modbus_client.c b/subsys/modbus/modbus_client.c
index 5d89cac97a..91a8bea9c8 100644
--- a/subsys/modbus/modbus_client.c
+++ b/subsys/modbus/modbus_client.c
@@ -20,10 +20,10 @@
  */
 
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <modbus_internal.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modbus_c, CONFIG_MODBUS_LOG_LEVEL);
 
 static int mbc_validate_response_fc(struct modbus_context *ctx,
diff --git a/subsys/modbus/modbus_core.c b/subsys/modbus/modbus_core.c
index 6ea494e10c..b35dfb0dbd 100644
--- a/subsys/modbus/modbus_core.c
+++ b/subsys/modbus/modbus_core.c
@@ -5,12 +5,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modbus, CONFIG_MODBUS_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <modbus_internal.h>
 
 #define DT_DRV_COMPAT zephyr_modbus_serial
diff --git a/subsys/modbus/modbus_internal.h b/subsys/modbus/modbus_internal.h
index a916d21f38..7b11288a33 100644
--- a/subsys/modbus/modbus_internal.h
+++ b/subsys/modbus/modbus_internal.h
@@ -23,9 +23,9 @@
 #ifndef ZEPHYR_INCLUDE_MODBUS_INTERNAL_H_
 #define ZEPHYR_INCLUDE_MODBUS_INTERNAL_H_
 
-#include <zephyr.h>
-#include <drivers/gpio.h>
-#include <modbus/modbus.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/modbus/modbus.h>
 
 #ifdef CONFIG_MODBUS_FP_EXTENSIONS
 #define MODBUS_FP_EXTENSIONS_ADDR		5000
diff --git a/subsys/modbus/modbus_raw.c b/subsys/modbus/modbus_raw.c
index 665e9187f2..4e60bf1073 100644
--- a/subsys/modbus/modbus_raw.c
+++ b/subsys/modbus/modbus_raw.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modbus_raw, CONFIG_MODBUS_LOG_LEVEL);
 
-#include <kernel.h>
-#include <sys/byteorder.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/byteorder.h>
 #include <modbus_internal.h>
 
 #define MODBUS_ADU_LENGTH_DEVIATION	2
diff --git a/subsys/modbus/modbus_serial.c b/subsys/modbus/modbus_serial.c
index 13ad3c84a1..c2445b78e1 100644
--- a/subsys/modbus/modbus_serial.c
+++ b/subsys/modbus/modbus_serial.c
@@ -20,13 +20,13 @@
  *      Version 2.0 available at www.apache.org/licenses/LICENSE-2.0.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modbus_serial, CONFIG_MODBUS_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/crc.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/crc.h>
 #include <modbus_internal.h>
 
 static void modbus_serial_tx_on(struct modbus_context *ctx)
diff --git a/subsys/modbus/modbus_server.c b/subsys/modbus/modbus_server.c
index a8f210560d..58a783864c 100644
--- a/subsys/modbus/modbus_server.c
+++ b/subsys/modbus/modbus_server.c
@@ -20,10 +20,10 @@
  */
 
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <modbus_internal.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(modbus_s, CONFIG_MODBUS_LOG_LEVEL);
 
 /*
diff --git a/subsys/net/buf.c b/subsys/net/buf.c
index e943faeb07..01e379da39 100644
--- a/subsys/net/buf.c
+++ b/subsys/net/buf.c
@@ -9,16 +9,16 @@
 #define LOG_MODULE_NAME net_buf
 #define LOG_LEVEL CONFIG_NET_BUF_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdio.h>
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #if defined(CONFIG_NET_BUF_LOG)
 #define NET_BUF_DBG(fmt, ...) LOG_DBG("(%p) " fmt, k_current_get(), \
diff --git a/subsys/net/hostname.c b/subsys/net/hostname.c
index 3ab615f75f..e7b171a8b5 100644
--- a/subsys/net/hostname.c
+++ b/subsys/net/hostname.c
@@ -8,13 +8,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_hostname, CONFIG_NET_HOSTNAME_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <net/hostname.h>
-#include <net/net_core.h>
+#include <zephyr/net/hostname.h>
+#include <zephyr/net/net_core.h>
 
 static char hostname[NET_HOSTNAME_MAX_LEN + 1];
 
diff --git a/subsys/net/ip/6lo.c b/subsys/net/ip/6lo.c
index 22d9816911..f57fc20441 100644
--- a/subsys/net/ip/6lo.c
+++ b/subsys/net/ip/6lo.c
@@ -9,14 +9,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_6lo, CONFIG_NET_6LO_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/net_if.h>
-#include <net/net_stats.h>
-#include <net/udp.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/udp.h>
 
 #include "net_private.h"
 #include "6lo.h"
diff --git a/subsys/net/ip/6lo.h b/subsys/net/ip/6lo.h
index d1959e36a6..f04788019b 100644
--- a/subsys/net/ip/6lo.h
+++ b/subsys/net/ip/6lo.h
@@ -13,10 +13,10 @@
 #ifndef __NET_6LO_H
 #define __NET_6LO_H
 
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 #include <zephyr/types.h>
 
-#include <net/net_pkt.h>
+#include <zephyr/net/net_pkt.h>
 #include "icmpv6.h"
 
 /**
diff --git a/subsys/net/ip/canbus_socket.c b/subsys/net/ip/canbus_socket.c
index 1e20ecc762..c69ad60580 100644
--- a/subsys/net/ip/canbus_socket.c
+++ b/subsys/net/ip/canbus_socket.c
@@ -8,13 +8,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sockets_can, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_pkt.h>
-#include <net/net_context.h>
-#include <net/socket_can.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/socket_can.h>
 
 #include "connection.h"
 
diff --git a/subsys/net/ip/connection.c b/subsys/net/ip/connection.c
index 6f8988ebb2..a83926edd0 100644
--- a/subsys/net/ip/connection.c
+++ b/subsys/net/ip/connection.c
@@ -8,17 +8,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_conn, CONFIG_NET_CONN_LOG_LEVEL);
 
 #include <errno.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/udp.h>
-#include <net/ethernet.h>
-#include <net/socket_can.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/udp.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/socket_can.h>
 
 #include "net_private.h"
 #include "icmpv6.h"
diff --git a/subsys/net/ip/connection.h b/subsys/net/ip/connection.h
index ffe9ab8dc0..b9382759b3 100644
--- a/subsys/net/ip/connection.h
+++ b/subsys/net/ip/connection.h
@@ -15,12 +15,12 @@
 
 #include <zephyr/types.h>
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <net/net_context.h>
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/net/ip/dhcpv4.c b/subsys/net/ip/dhcpv4.c
index f3f702819c..253ab7c607 100644
--- a/subsys/net/ip/dhcpv4.c
+++ b/subsys/net/ip/dhcpv4.c
@@ -10,22 +10,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_dhcpv4, CONFIG_NET_DHCPV4_LOG_LEVEL);
 
 #include <errno.h>
 #include <inttypes.h>
-#include <random/rand32.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_mgmt.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_mgmt.h>
 #include "net_private.h"
 
-#include <net/udp.h>
+#include <zephyr/net/udp.h>
 #include "udp_internal.h"
-#include <net/dhcpv4.h>
-#include <net/dns_resolve.h>
+#include <zephyr/net/dhcpv4.h>
+#include <zephyr/net/dns_resolve.h>
 
 #include "dhcpv4.h"
 #include "ipv4.h"
diff --git a/subsys/net/ip/icmpv4.c b/subsys/net/ip/icmpv4.c
index f15658d8e9..8f8fe23f06 100644
--- a/subsys/net/ip/icmpv4.c
+++ b/subsys/net/ip/icmpv4.c
@@ -8,14 +8,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_icmpv4, CONFIG_NET_ICMPV4_LOG_LEVEL);
 
 #include <errno.h>
-#include <sys/slist.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
 #include "net_private.h"
 #include "ipv4.h"
 #include "icmpv4.h"
diff --git a/subsys/net/ip/icmpv4.h b/subsys/net/ip/icmpv4.h
index 44e54e2ae8..adde2d369b 100644
--- a/subsys/net/ip/icmpv4.h
+++ b/subsys/net/ip/icmpv4.h
@@ -15,8 +15,8 @@
 
 #include <zephyr/types.h>
 
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
 
 #define NET_ICMPV4_DST_UNREACH  3	/* Destination unreachable */
 #define NET_ICMPV4_ECHO_REQUEST 8
diff --git a/subsys/net/ip/icmpv6.c b/subsys/net/ip/icmpv6.c
index 76f2ee22a3..bd1f4b3fdb 100644
--- a/subsys/net/ip/icmpv6.c
+++ b/subsys/net/ip/icmpv6.c
@@ -8,15 +8,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_icmpv6, CONFIG_NET_ICMPV6_LOG_LEVEL);
 
 #include <errno.h>
-#include <sys/slist.h>
-#include <sys/byteorder.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
 #include "net_private.h"
 #include "icmpv6.h"
 #include "ipv6.h"
diff --git a/subsys/net/ip/icmpv6.h b/subsys/net/ip/icmpv6.h
index 5f8252562b..48f9e349ae 100644
--- a/subsys/net/ip/icmpv6.h
+++ b/subsys/net/ip/icmpv6.h
@@ -13,11 +13,11 @@
 #ifndef __ICMPV6_H
 #define __ICMPV6_H
 
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 #include <zephyr/types.h>
 
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
 
 struct net_icmpv6_ns_hdr {
 	uint32_t reserved;
diff --git a/subsys/net/ip/igmp.c b/subsys/net/ip/igmp.c
index 8ddc43c88a..e7351128a7 100644
--- a/subsys/net/ip/igmp.c
+++ b/subsys/net/ip/igmp.c
@@ -8,16 +8,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_ipv4, CONFIG_NET_IPV4_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_stats.h>
-#include <net/net_context.h>
-#include <net/net_mgmt.h>
-#include <net/igmp.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/igmp.h>
 #include "net_private.h"
 #include "connection.h"
 #include "ipv4.h"
diff --git a/subsys/net/ip/ipv4.c b/subsys/net/ip/ipv4.c
index 59e04f3f9d..32dd639c25 100644
--- a/subsys/net/ip/ipv4.c
+++ b/subsys/net/ip/ipv4.c
@@ -8,15 +8,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ipv4, CONFIG_NET_IPV4_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_stats.h>
-#include <net/net_context.h>
-#include <net/virtual.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/virtual.h>
 #include "net_private.h"
 #include "connection.h"
 #include "net_stats.h"
diff --git a/subsys/net/ip/ipv4.h b/subsys/net/ip/ipv4.h
index 2b7cc4b82c..e53ffab4df 100644
--- a/subsys/net/ip/ipv4.h
+++ b/subsys/net/ip/ipv4.h
@@ -15,10 +15,10 @@
 
 #include <zephyr/types.h>
 
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_context.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_context.h>
 
 #define NET_IPV4_IHL_MASK 0x0F
 
diff --git a/subsys/net/ip/ipv4_autoconf.c b/subsys/net/ip/ipv4_autoconf.c
index b0e828d26c..8f3de91af2 100644
--- a/subsys/net/ip/ipv4_autoconf.c
+++ b/subsys/net/ip/ipv4_autoconf.c
@@ -9,16 +9,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ipv4_autoconf, CONFIG_NET_IPV4_AUTO_LOG_LEVEL);
 
 #include "net_private.h"
 #include <errno.h>
 #include "../l2/ethernet/arp.h"
-#include <net/net_pkt.h>
-#include <net/net_core.h>
-#include <net/net_if.h>
-#include <random/rand32.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/random/rand32.h>
 
 #include "ipv4_autoconf_internal.h"
 
diff --git a/subsys/net/ip/ipv4_autoconf_internal.h b/subsys/net/ip/ipv4_autoconf_internal.h
index 25e6feb11c..3e138fbd5f 100644
--- a/subsys/net/ip/ipv4_autoconf_internal.h
+++ b/subsys/net/ip/ipv4_autoconf_internal.h
@@ -13,9 +13,9 @@
 #ifndef __IPV4_AUTOCONF_INTERNAL_H
 #define __IPV4_AUTOCONF_INTERNAL_H
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <net/ipv4_autoconf.h>
+#include <zephyr/net/ipv4_autoconf.h>
 
 /* Initial random delay*/
 #define IPV4_AUTOCONF_PROBE_WAIT 1
diff --git a/subsys/net/ip/ipv6.c b/subsys/net/ip/ipv6.c
index 5fb43bc470..eb9a9eee8a 100644
--- a/subsys/net/ip/ipv6.c
+++ b/subsys/net/ip/ipv6.c
@@ -13,17 +13,17 @@
  */
 #define NET_DEBUG_NBR 0
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <errno.h>
 #include <stdlib.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_stats.h>
-#include <net/net_context.h>
-#include <net/net_mgmt.h>
-#include <net/virtual.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/virtual.h>
 #include "net_private.h"
 #include "connection.h"
 #include "icmpv6.h"
diff --git a/subsys/net/ip/ipv6.h b/subsys/net/ip/ipv6.h
index 9e53018671..9df5828a73 100644
--- a/subsys/net/ip/ipv6.h
+++ b/subsys/net/ip/ipv6.h
@@ -15,10 +15,10 @@
 
 #include <zephyr/types.h>
 
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_context.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_context.h>
 
 #include "icmpv6.h"
 #include "nbr.h"
diff --git a/subsys/net/ip/ipv6_fragment.c b/subsys/net/ip/ipv6_fragment.c
index 3819dcb27d..f2203d604c 100644
--- a/subsys/net/ip/ipv6_fragment.c
+++ b/subsys/net/ip/ipv6_fragment.c
@@ -8,16 +8,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_stats.h>
-#include <net/net_context.h>
-#include <net/net_mgmt.h>
-#include <random/rand32.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/random/rand32.h>
 #include "net_private.h"
 #include "connection.h"
 #include "icmpv6.h"
diff --git a/subsys/net/ip/ipv6_mld.c b/subsys/net/ip/ipv6_mld.c
index afeaaa08e6..365fa9c45d 100644
--- a/subsys/net/ip/ipv6_mld.c
+++ b/subsys/net/ip/ipv6_mld.c
@@ -8,15 +8,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_stats.h>
-#include <net/net_context.h>
-#include <net/net_mgmt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_mgmt.h>
 #include "net_private.h"
 #include "connection.h"
 #include "icmpv6.h"
diff --git a/subsys/net/ip/ipv6_nbr.c b/subsys/net/ip/ipv6_nbr.c
index 542237f3ae..3d4cf22b99 100644
--- a/subsys/net/ip/ipv6_nbr.c
+++ b/subsys/net/ip/ipv6_nbr.c
@@ -13,16 +13,16 @@
  */
 #define NET_DEBUG_NBR 0
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_ipv6, CONFIG_NET_IPV6_LOG_LEVEL);
 
 #include <errno.h>
 #include <stdlib.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_stats.h>
-#include <net/net_context.h>
-#include <net/net_mgmt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_mgmt.h>
 #include "net_private.h"
 #include "connection.h"
 #include "icmpv6.h"
diff --git a/subsys/net/ip/nbr.c b/subsys/net/ip/nbr.c
index 02fca8ea58..7f5dd42a4c 100644
--- a/subsys/net/ip/nbr.c
+++ b/subsys/net/ip/nbr.c
@@ -6,12 +6,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_nbr, CONFIG_NET_IPV6_NBR_CACHE_LOG_LEVEL);
 
 #include <errno.h>
 
-#include <net/net_core.h>
+#include <zephyr/net/net_core.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/ip/nbr.h b/subsys/net/ip/nbr.h
index 8c6f1a78d8..ee6246f07a 100644
--- a/subsys/net/ip/nbr.h
+++ b/subsys/net/ip/nbr.h
@@ -14,7 +14,7 @@
 #include <zephyr/types.h>
 #include <stdbool.h>
 
-#include <net/net_if.h>
+#include <zephyr/net/net_if.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c
index e2f39a112b..f889b395fc 100644
--- a/subsys/net/ip/net_context.c
+++ b/subsys/net/ip/net_context.c
@@ -11,22 +11,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ctx, CONFIG_NET_CONTEXT_LOG_LEVEL);
 
-#include <kernel.h>
-#include <random/rand32.h>
+#include <zephyr/kernel.h>
+#include <zephyr/random/rand32.h>
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 
-#include <net/net_pkt.h>
-#include <net/net_ip.h>
-#include <net/socket.h>
-#include <net/net_context.h>
-#include <net/net_offload.h>
-#include <net/ethernet.h>
-#include <net/socket_can.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_offload.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/socket_can.h>
 
 #include "connection.h"
 #include "net_private.h"
diff --git a/subsys/net/ip/net_core.c b/subsys/net/ip/net_core.c
index 62633fa236..725f593995 100644
--- a/subsys/net/ip/net_core.c
+++ b/subsys/net/ip/net_core.c
@@ -11,28 +11,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_core, CONFIG_NET_CORE_LOG_LEVEL);
 
-#include <init.h>
-#include <kernel.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <string.h>
 #include <errno.h>
 
-#include <net/net_if.h>
-#include <net/net_mgmt.h>
-#include <net/net_pkt.h>
-#include <net/net_core.h>
-#include <net/dns_resolve.h>
-#include <net/gptp.h>
-#include <net/websocket.h>
-#include <net/ethernet.h>
-#include <net/capture.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/gptp.h>
+#include <zephyr/net/websocket.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/capture.h>
 
 #if defined(CONFIG_NET_LLDP)
-#include <net/lldp.h>
+#include <zephyr/net/lldp.h>
 #endif
 
 #include "net_private.h"
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index b46fb39dd0..159ca32b69 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_if, CONFIG_NET_IF_LOG_LEVEL);
 
-#include <init.h>
-#include <kernel.h>
-#include <linker/sections.h>
-#include <random/rand32.h>
-#include <syscall_handler.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/linker/sections.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/syscall_handler.h>
 #include <stdlib.h>
 #include <string.h>
-#include <net/igmp.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_mgmt.h>
-#include <net/ethernet.h>
-#include <net/virtual.h>
+#include <zephyr/net/igmp.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/virtual.h>
 
 #include "net_private.h"
 #include "ipv6.h"
diff --git a/subsys/net/ip/net_mgmt.c b/subsys/net/ip/net_mgmt.c
index 025e4f38ce..9b0ad458cd 100644
--- a/subsys/net/ip/net_mgmt.c
+++ b/subsys/net/ip/net_mgmt.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mgmt, CONFIG_NET_MGMT_EVENT_LOG_LEVEL);
 
-#include <kernel.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 
-#include <sys/util.h>
-#include <sys/slist.h>
-#include <net/net_mgmt.h>
-#include <debug/stack.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/debug/stack.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/ip/net_pkt.c b/subsys/net/ip/net_pkt.c
index bd45ad540f..1471561e91 100644
--- a/subsys/net/ip/net_pkt.c
+++ b/subsys/net/ip/net_pkt.c
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_pkt, CONFIG_NET_PKT_LOG_LEVEL);
 
 /* This enables allocation debugging but does not print so much output
@@ -23,20 +23,20 @@ LOG_MODULE_REGISTER(net_pkt, CONFIG_NET_PKT_LOG_LEVEL);
 #define NET_LOG_LEVEL CONFIG_NET_PKT_LOG_LEVEL
 #endif
 
-#include <kernel.h>
-#include <toolchain.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
 #include <string.h>
 #include <zephyr/types.h>
 #include <sys/types.h>
 
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/buf.h>
-#include <net/net_pkt.h>
-#include <net/ethernet.h>
-#include <net/udp.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/udp.h>
 
 #include "net_private.h"
 #include "tcp_internal.h"
diff --git a/subsys/net/ip/net_private.h b/subsys/net/ip/net_private.h
index c434d81158..2e3c169bd0 100644
--- a/subsys/net/ip/net_private.h
+++ b/subsys/net/ip/net_private.h
@@ -11,13 +11,13 @@
  */
 
 #include <errno.h>
-#include <sys/printk.h>
-#include <net/net_context.h>
-#include <net/net_pkt.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_pkt.h>
 
 #ifdef CONFIG_NET_MGMT_EVENT_INFO
 
-#include <net/net_event.h>
+#include <zephyr/net/net_event.h>
 
 /* Maximum size of "struct net_event_ipv6_addr" or
  * "struct net_event_ipv6_nbr" or "struct net_event_ipv6_route".
@@ -26,7 +26,7 @@
 
 #ifdef CONFIG_NET_L2_WIFI_MGMT
 
-#include <net/wifi_mgmt.h>
+#include <zephyr/net/wifi_mgmt.h>
 #define NET_EVENT_INFO_MAX_SIZE sizeof(struct wifi_scan_result)
 
 #else
diff --git a/subsys/net/ip/net_shell.c b/subsys/net/ip/net_shell.c
index a7fe912237..5b97a500bb 100644
--- a/subsys/net/ip/net_shell.c
+++ b/subsys/net/ip/net_shell.c
@@ -10,23 +10,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <kernel_internal.h>
-#include <pm/device.h>
-#include <random/rand32.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/random/rand32.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <shell/shell.h>
-#include <shell/shell_uart.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
 
-#include <net/net_if.h>
-#include <net/dns_resolve.h>
-#include <net/ppp.h>
-#include <net/net_stats.h>
-#include <sys/printk.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/ppp.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/sys/printk.h>
 
 #include "route.h"
 #include "icmpv6.h"
@@ -35,7 +35,7 @@ LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG);
 
 #if defined(CONFIG_NET_TCP)
 #include "tcp_internal.h"
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 #endif
 
 #include "ipv6.h"
@@ -45,25 +45,25 @@ LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG);
 #endif
 
 #if defined(CONFIG_NET_L2_ETHERNET)
-#include <net/ethernet.h>
+#include <zephyr/net/ethernet.h>
 #endif
 
 #if defined(CONFIG_NET_L2_ETHERNET_MGMT)
-#include <net/ethernet_mgmt.h>
+#include <zephyr/net/ethernet_mgmt.h>
 #endif
 
 #if defined(CONFIG_NET_L2_VIRTUAL)
-#include <net/virtual.h>
+#include <zephyr/net/virtual.h>
 #endif
 
 #if defined(CONFIG_NET_L2_VIRTUAL_MGMT)
-#include <net/virtual_mgmt.h>
+#include <zephyr/net/virtual_mgmt.h>
 #endif
 
-#include <net/capture.h>
+#include <zephyr/net/capture.h>
 
 #if defined(CONFIG_NET_GPTP)
-#include <net/gptp.h>
+#include <zephyr/net/gptp.h>
 #include "ethernet/gptp/gptp_messages.h"
 #include "ethernet/gptp/gptp_md.h"
 #include "ethernet/gptp/gptp_state.h"
@@ -72,14 +72,14 @@ LOG_MODULE_REGISTER(net_shell, LOG_LEVEL_DBG);
 #endif
 
 #if defined(CONFIG_NET_L2_PPP)
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 #include "ppp/ppp_internal.h"
 #endif
 
 #include "net_shell.h"
 #include "net_stats.h"
 
-#include <sys/fdtable.h>
+#include <zephyr/sys/fdtable.h>
 #include "websocket/websocket_internal.h"
 
 #define PR(fmt, ...)						\
diff --git a/subsys/net/ip/net_stats.c b/subsys/net/ip/net_stats.c
index 273d7ef2e3..4fe68933a0 100644
--- a/subsys/net/ip/net_stats.c
+++ b/subsys/net/ip/net_stats.c
@@ -10,14 +10,14 @@
 #define NET_LOG_LEVEL CONFIG_NET_STATISTICS_LOG_LEVEL
 #endif
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_stats, NET_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <net/net_core.h>
+#include <zephyr/net/net_core.h>
 
 #include "net_stats.h"
 #include "net_private.h"
diff --git a/subsys/net/ip/net_stats.h b/subsys/net/ip/net_stats.h
index 067963ad8d..710b1d98e4 100644
--- a/subsys/net/ip/net_stats.h
+++ b/subsys/net/ip/net_stats.h
@@ -11,9 +11,9 @@
 
 #include <stdlib.h>
 
-#include <net/net_ip.h>
-#include <net/net_stats.h>
-#include <net/net_if.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_if.h>
 
 extern struct net_stats net_stats;
 
diff --git a/subsys/net/ip/net_tc.c b/subsys/net/ip/net_tc.c
index 612e3dc220..22e3b159be 100644
--- a/subsys/net/ip/net_tc.c
+++ b/subsys/net/ip/net_tc.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_tc, CONFIG_NET_TC_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <string.h>
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_stats.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_stats.h>
 
 #include "net_private.h"
 #include "net_stats.h"
diff --git a/subsys/net/ip/net_timeout.c b/subsys/net/ip/net_timeout.c
index 31bb6908cc..81fa6ad73c 100644
--- a/subsys/net/ip/net_timeout.c
+++ b/subsys/net/ip/net_timeout.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <net/net_timeout.h>
-#include <sys_clock.h>
+#include <zephyr/net/net_timeout.h>
+#include <zephyr/sys_clock.h>
 
 void net_timeout_set(struct net_timeout *timeout,
 		     uint32_t lifetime,
diff --git a/subsys/net/ip/packet_socket.c b/subsys/net/ip/packet_socket.c
index bc35923862..c445894d1e 100644
--- a/subsys/net/ip/packet_socket.c
+++ b/subsys/net/ip/packet_socket.c
@@ -8,14 +8,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sockets_raw, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_pkt.h>
-#include <net/net_context.h>
-#include <net/ethernet.h>
-#include <net/dsa.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/dsa.h>
 
 #include "connection.h"
 #include "packet_socket.h"
diff --git a/subsys/net/ip/promiscuous.c b/subsys/net/ip/promiscuous.c
index 5cbf9af436..0e69de250b 100644
--- a/subsys/net/ip/promiscuous.c
+++ b/subsys/net/ip/promiscuous.c
@@ -12,15 +12,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_promisc, CONFIG_NET_PROMISC_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
 
-#include <net/net_if.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
 
 static K_FIFO_DEFINE(promiscuous_queue);
 static atomic_t enabled = ATOMIC_INIT(0);
diff --git a/subsys/net/ip/route.c b/subsys/net/ip/route.c
index f74c0ac567..3284de2afb 100644
--- a/subsys/net/ip/route.c
+++ b/subsys/net/ip/route.c
@@ -9,19 +9,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_route, CONFIG_NET_ROUTE_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <limits.h>
 #include <zephyr/types.h>
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 
-#include <net/net_pkt.h>
-#include <net/net_core.h>
-#include <net/net_stats.h>
-#include <net/net_mgmt.h>
-#include <net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/net_ip.h>
 
 #include "net_private.h"
 #include "ipv6.h"
diff --git a/subsys/net/ip/route.h b/subsys/net/ip/route.h
index 52b46a094f..e54451234c 100644
--- a/subsys/net/ip/route.h
+++ b/subsys/net/ip/route.h
@@ -13,11 +13,11 @@
 #ifndef __ROUTE_H
 #define __ROUTE_H
 
-#include <kernel.h>
-#include <sys/slist.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/slist.h>
 
-#include <net/net_ip.h>
-#include <net/net_timeout.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_timeout.h>
 
 #include "nbr.h"
 
diff --git a/subsys/net/ip/tcp.c b/subsys/net/ip/tcp.c
index 99215f009a..d7640530d5 100644
--- a/subsys/net/ip/tcp.c
+++ b/subsys/net/ip/tcp.c
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_tcp, CONFIG_NET_TCP_LOG_LEVEL);
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <zephyr.h>
-#include <random/rand32.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/random/rand32.h>
 
 #if defined(CONFIG_NET_TCP_ISN_RFC6528)
 #include <mbedtls/md5.h>
 #endif
-#include <net/net_pkt.h>
-#include <net/net_context.h>
-#include <net/udp.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/udp.h>
 #include "ipv4.h"
 #include "ipv6.h"
 #include "connection.h"
diff --git a/subsys/net/ip/tcp_internal.h b/subsys/net/ip/tcp_internal.h
index 8c791a87e1..0d80b5b65e 100644
--- a/subsys/net/ip/tcp_internal.h
+++ b/subsys/net/ip/tcp_internal.h
@@ -14,12 +14,12 @@
 #define __TCP_INTERNAL_H
 
 #include <zephyr/types.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/net_context.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_context.h>
 
 #include "connection.h"
 
diff --git a/subsys/net/ip/tp.h b/subsys/net/ip/tp.h
index 3539ef4b54..736c7f9f40 100644
--- a/subsys/net/ip/tp.h
+++ b/subsys/net/ip/tp.h
@@ -12,8 +12,8 @@ extern "C" {
 #endif
 
 #include <sys/types.h>
-#include <data/json.h>
-#include <net/net_pkt.h>
+#include <zephyr/data/json.h>
+#include <zephyr/net/net_pkt.h>
 #include "connection.h"
 
 #if IS_ENABLED(CONFIG_NET_TEST_PROTOCOL)
diff --git a/subsys/net/ip/tp_priv.h b/subsys/net/ip/tp_priv.h
index 66617703f7..f5d754fee7 100644
--- a/subsys/net/ip/tp_priv.h
+++ b/subsys/net/ip/tp_priv.h
@@ -13,8 +13,8 @@ extern "C" {
 
 #include <sys/types.h>
 #include <string.h>
-#include <zephyr.h>
-#include <net/net_pkt.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/net/net_pkt.h>
 
 #define tp_dbg(fmt, args...) printk("%s: " fmt "\n", __func__, ## args)
 #define tp_err(fmt, args...) do {				\
diff --git a/subsys/net/ip/trickle.c b/subsys/net/ip/trickle.c
index 4226d2ece0..debe2d1618 100644
--- a/subsys/net/ip/trickle.c
+++ b/subsys/net/ip/trickle.c
@@ -10,15 +10,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_trickle, CONFIG_NET_TRICKLE_LOG_LEVEL);
 
 #include <errno.h>
-#include <sys/util.h>
-#include <random/rand32.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
 
-#include <net/net_core.h>
-#include <net/trickle.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/trickle.h>
 
 #define TICK_MAX ~0
 
diff --git a/subsys/net/ip/udp.c b/subsys/net/ip/udp.c
index 3ffd2c0f7d..972eadb5a0 100644
--- a/subsys/net/ip/udp.c
+++ b/subsys/net/ip/udp.c
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_udp, CONFIG_NET_UDP_LOG_LEVEL);
 
 #include "net_private.h"
diff --git a/subsys/net/ip/udp_internal.h b/subsys/net/ip/udp_internal.h
index deea28f4dd..94106d6001 100644
--- a/subsys/net/ip/udp_internal.h
+++ b/subsys/net/ip/udp_internal.h
@@ -16,10 +16,10 @@
 
 #include <zephyr/types.h>
 
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/net_context.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_context.h>
 
 #include "connection.h"
 
diff --git a/subsys/net/ip/utils.c b/subsys/net/ip/utils.c
index 37512ddcb4..3edba96c5a 100644
--- a/subsys/net/ip/utils.c
+++ b/subsys/net/ip/utils.c
@@ -9,21 +9,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_utils, CONFIG_NET_UTILS_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 #include <zephyr/types.h>
 #include <stdbool.h>
 #include <string.h>
 #include <errno.h>
 
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/net_core.h>
-#include <net/socket_can.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/socket_can.h>
 
 char *net_sprint_addr(sa_family_t af, const void *addr)
 {
diff --git a/subsys/net/l2/bluetooth/bluetooth.c b/subsys/net/l2/bluetooth/bluetooth.c
index 46a78a60bb..4c9f3f3ac6 100644
--- a/subsys/net/l2/bluetooth/bluetooth.c
+++ b/subsys/net/l2/bluetooth/bluetooth.c
@@ -4,31 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_bt, CONFIG_NET_L2_BT_LOG_LEVEL);
 
-#include <kernel.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <string.h>
 #include <errno.h>
 
-#include <device.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 
-#include <net/net_pkt.h>
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/capture.h>
-#include <net/bt.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/capture.h>
+#include <zephyr/net/bt.h>
 #include <6lo.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <bluetooth/conn.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/l2cap.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
+#include <zephyr/bluetooth/conn.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/l2cap.h>
 
 #include "net_private.h"
 #include "ipv6.h"
diff --git a/subsys/net/l2/bluetooth/bluetooth_shell.c b/subsys/net/l2/bluetooth/bluetooth_shell.c
index 3ff3ec5210..3871f92347 100644
--- a/subsys/net/l2/bluetooth/bluetooth_shell.c
+++ b/subsys/net/l2/bluetooth/bluetooth_shell.c
@@ -4,25 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_bt_shell, CONFIG_NET_L2_BT_LOG_LEVEL);
 
-#include <kernel.h>
-#include <toolchain.h>
-#include <linker/sections.h>
+#include <zephyr/kernel.h>
+#include <zephyr/toolchain.h>
+#include <zephyr/linker/sections.h>
 #include <string.h>
 #include <errno.h>
 
-#include <shell/shell.h>
-#include <sys/printk.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/printk.h>
 
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/bt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/bt.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/hci.h>
 
 static int shell_cmd_connect(const struct shell *shell,
 			     size_t argc, char *argv[])
diff --git a/subsys/net/l2/canbus/canbus_raw.c b/subsys/net/l2/canbus/canbus_raw.c
index e66834d9e3..4158e2fa9f 100644
--- a/subsys/net/l2/canbus/canbus_raw.c
+++ b/subsys/net/l2/canbus/canbus_raw.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_l2_canbus, LOG_LEVEL_NONE);
 
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
-#include <net/socket_can.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/socket_can.h>
 
 static inline enum net_verdict canbus_recv(struct net_if *iface,
 					   struct net_pkt *pkt)
diff --git a/subsys/net/l2/dummy/dummy.c b/subsys/net/l2/dummy/dummy.c
index 8db3f43f17..f1ce5800b9 100644
--- a/subsys/net/l2/dummy/dummy.c
+++ b/subsys/net/l2/dummy/dummy.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_l2_dummy, LOG_LEVEL_NONE);
 
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <net/dummy.h>
+#include <zephyr/net/dummy.h>
 
 static inline enum net_verdict dummy_recv(struct net_if *iface,
 					  struct net_pkt *pkt)
diff --git a/subsys/net/l2/ethernet/arp.c b/subsys/net/l2/ethernet/arp.c
index 0e9bd55c0d..9eb435400e 100644
--- a/subsys/net/l2/ethernet/arp.c
+++ b/subsys/net/l2/ethernet/arp.c
@@ -8,14 +8,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_arp, CONFIG_NET_ARP_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_stats.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_stats.h>
 
 #include "arp.h"
 #include "net_private.h"
diff --git a/subsys/net/l2/ethernet/arp.h b/subsys/net/l2/ethernet/arp.h
index c1c8393616..d0069a54b2 100644
--- a/subsys/net/l2/ethernet/arp.h
+++ b/subsys/net/l2/ethernet/arp.h
@@ -9,8 +9,8 @@
 
 #if defined(CONFIG_NET_ARP) && defined(CONFIG_NET_NATIVE)
 
-#include <sys/slist.h>
-#include <net/ethernet.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/net/ethernet.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/net/l2/ethernet/bridge.c b/subsys/net/l2/ethernet/bridge.c
index b467c85f1e..ec7c3f0d4d 100644
--- a/subsys/net/l2/ethernet/bridge.c
+++ b/subsys/net/l2/ethernet/bridge.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_eth_bridge, CONFIG_NET_ETHERNET_BRIDGE_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
-#include <net/ethernet_bridge.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/ethernet_bridge.h>
 
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 
 #include "bridge.h"
 
diff --git a/subsys/net/l2/ethernet/bridge_shell.c b/subsys/net/l2/ethernet/bridge_shell.c
index 7724973cff..b2ed720cef 100644
--- a/subsys/net/l2/ethernet/bridge_shell.c
+++ b/subsys/net/l2/ethernet/bridge_shell.c
@@ -5,11 +5,11 @@
  */
 
 #include <stdlib.h>
-#include <shell/shell.h>
-#include <net/net_if.h>
-#include <net/ethernet.h>
-#include <net/ethernet_bridge.h>
-#include <sys/slist.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/ethernet_bridge.h>
+#include <zephyr/sys/slist.h>
 
 static int get_idx(const struct shell *sh, char *index_str)
 {
diff --git a/subsys/net/l2/ethernet/dsa/dsa.c b/subsys/net/l2/ethernet/dsa/dsa.c
index 9ef907fa63..e293af4237 100644
--- a/subsys/net/l2/ethernet/dsa/dsa.c
+++ b/subsys/net/l2/ethernet/dsa/dsa.c
@@ -8,16 +8,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_dsa, CONFIG_NET_DSA_LOG_LEVEL);
 
 #include <errno.h>
 #include <stdlib.h>
 
-#include <net/net_core.h>
-#include <net/ethernet.h>
-#include <net/net_mgmt.h>
-#include <net/dsa.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/dsa.h>
 
 /*
  * Store, in the ethernet_context for master interface, the original
diff --git a/subsys/net/l2/ethernet/eth_stats.h b/subsys/net/l2/ethernet/eth_stats.h
index ec28a79ea4..352ebc0af3 100644
--- a/subsys/net/l2/ethernet/eth_stats.h
+++ b/subsys/net/l2/ethernet/eth_stats.h
@@ -9,9 +9,9 @@
 
 #if defined(CONFIG_NET_STATISTICS_ETHERNET)
 
-#include <net/net_ip.h>
-#include <net/net_stats.h>
-#include <net/net_if.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_if.h>
 
 static inline void eth_stats_update_bytes_rx(struct net_if *iface,
 					     uint32_t bytes)
diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
index a32b41eb88..3e38be2b6f 100644
--- a/subsys/net/l2/ethernet/ethernet.c
+++ b/subsys/net/l2/ethernet/ethernet.c
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ethernet, CONFIG_NET_L2_ETHERNET_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/net_mgmt.h>
-#include <net/ethernet.h>
-#include <net/ethernet_mgmt.h>
-#include <net/gptp.h>
-#include <random/rand32.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/ethernet_mgmt.h>
+#include <zephyr/net/gptp.h>
+#include <zephyr/random/rand32.h>
 
 #if defined(CONFIG_NET_LLDP)
-#include <net/lldp.h>
+#include <zephyr/net/lldp.h>
 #endif
 
-#include <syscall_handler.h>
+#include <zephyr/syscall_handler.h>
 
 #include "arp.h"
 #include "eth_stats.h"
diff --git a/subsys/net/l2/ethernet/ethernet_mgmt.c b/subsys/net/l2/ethernet/ethernet_mgmt.c
index 3e6aac0309..da070511f4 100644
--- a/subsys/net/l2/ethernet/ethernet_mgmt.c
+++ b/subsys/net/l2/ethernet/ethernet_mgmt.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ethernet_mgmt, CONFIG_NET_L2_ETHERNET_LOG_LEVEL);
 
 #include <errno.h>
 
-#include <net/net_core.h>
-#include <net/net_if.h>
-#include <net/ethernet_mgmt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ethernet_mgmt.h>
 
 static inline bool is_hw_caps_supported(const struct device *dev,
 					enum ethernet_hw_caps caps)
diff --git a/subsys/net/l2/ethernet/ethernet_stats.c b/subsys/net/l2/ethernet/ethernet_stats.c
index 39336f32d7..ccbbd53e2f 100644
--- a/subsys/net/l2/ethernet/ethernet_stats.c
+++ b/subsys/net/l2/ethernet/ethernet_stats.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ethernet_stats, CONFIG_NET_L2_ETHERNET_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/ethernet.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/ethernet.h>
 
 #include "net_stats.h"
 
diff --git a/subsys/net/l2/ethernet/gptp/gptp.c b/subsys/net/l2/ethernet/gptp/gptp.c
index f7263faeee..6829165159 100644
--- a/subsys/net/l2/ethernet/gptp/gptp.c
+++ b/subsys/net/l2/ethernet/gptp/gptp.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL);
 
-#include <net/net_pkt.h>
-#include <drivers/ptp_clock.h>
-#include <net/ethernet_mgmt.h>
-#include <random/rand32.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/drivers/ptp_clock.h>
+#include <zephyr/net/ethernet_mgmt.h>
+#include <zephyr/random/rand32.h>
 
-#include <net/gptp.h>
+#include <zephyr/net/gptp.h>
 
 #include "gptp_messages.h"
 #include "gptp_mi.h"
diff --git a/subsys/net/l2/ethernet/gptp/gptp_data_set.h b/subsys/net/l2/ethernet/gptp/gptp_data_set.h
index fd834c9105..7605dadc0e 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_data_set.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_data_set.h
@@ -16,7 +16,7 @@
 
 #if defined(CONFIG_NET_GPTP)
 
-#include <net/gptp.h>
+#include <zephyr/net/gptp.h>
 #include "gptp_state.h"
 
 #ifdef __cplusplus
diff --git a/subsys/net/l2/ethernet/gptp/gptp_md.c b/subsys/net/l2/ethernet/gptp/gptp_md.c
index eb467e176f..01b60a80d9 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_md.c
+++ b/subsys/net/l2/ethernet/gptp/gptp_md.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL);
 
 #include "gptp_messages.h"
diff --git a/subsys/net/l2/ethernet/gptp/gptp_md.h b/subsys/net/l2/ethernet/gptp/gptp_md.h
index e98000117f..8d26e8fc2a 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_md.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_md.h
@@ -14,7 +14,7 @@
 #ifndef __GPTP_MD_H
 #define __GPTP_MD_H
 
-#include <net/gptp.h>
+#include <zephyr/net/gptp.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/net/l2/ethernet/gptp/gptp_messages.c b/subsys/net/l2/ethernet/gptp/gptp_messages.c
index 1af9621c8f..8591203c77 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_messages.c
+++ b/subsys/net/l2/ethernet/gptp/gptp_messages.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL);
 
-#include <net/net_if.h>
+#include <zephyr/net/net_if.h>
 
 #include "gptp_messages.h"
 #include "gptp_data_set.h"
diff --git a/subsys/net/l2/ethernet/gptp/gptp_messages.h b/subsys/net/l2/ethernet/gptp/gptp_messages.h
index e78515cea4..35c5fea279 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_messages.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_messages.h
@@ -14,9 +14,9 @@
 #ifndef __GPTP_MESSAGES_H
 #define __GPTP_MESSAGES_H
 
-#include <net/net_pkt.h>
-#include <net/ethernet.h>
-#include <net/gptp.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/gptp.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/net/l2/ethernet/gptp/gptp_mi.c b/subsys/net/l2/ethernet/gptp/gptp_mi.c
index cb97d23133..87838a118f 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_mi.c
+++ b/subsys/net/l2/ethernet/gptp/gptp_mi.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL);
 
-#include <drivers/ptp_clock.h>
+#include <zephyr/drivers/ptp_clock.h>
 
 #include "gptp_messages.h"
 #include "gptp_data_set.h"
diff --git a/subsys/net/l2/ethernet/gptp/gptp_private.h b/subsys/net/l2/ethernet/gptp/gptp_private.h
index 88ceef4a99..54f56fc810 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_private.h
+++ b/subsys/net/l2/ethernet/gptp/gptp_private.h
@@ -14,7 +14,7 @@
 #ifndef __GPTP_PRIVATE_H
 #define __GPTP_PRIVATE_H
 
-#include <net/gptp.h>
+#include <zephyr/net/gptp.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/net/l2/ethernet/gptp/gptp_user_api.c b/subsys/net/l2/ethernet/gptp/gptp_user_api.c
index 754b21d38a..3431ceb2c0 100644
--- a/subsys/net/l2/ethernet/gptp/gptp_user_api.c
+++ b/subsys/net/l2/ethernet/gptp/gptp_user_api.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_gptp, CONFIG_NET_GPTP_LOG_LEVEL);
 
-#include <drivers/ptp_clock.h>
-#include <net/gptp.h>
+#include <zephyr/drivers/ptp_clock.h>
+#include <zephyr/net/gptp.h>
 
 #include "gptp_messages.h"
 #include "gptp_data_set.h"
diff --git a/subsys/net/l2/ethernet/lldp/lldp.c b/subsys/net/l2/ethernet/lldp/lldp.c
index 77a09834bf..db117b0558 100644
--- a/subsys/net/l2/ethernet/lldp/lldp.c
+++ b/subsys/net/l2/ethernet/lldp/lldp.c
@@ -8,16 +8,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_lldp, CONFIG_NET_LLDP_LOG_LEVEL);
 
 #include <errno.h>
 #include <stdlib.h>
 
-#include <net/net_core.h>
-#include <net/ethernet.h>
-#include <net/net_mgmt.h>
-#include <net/lldp.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/lldp.h>
 
 static struct net_mgmt_event_callback cb;
 
diff --git a/subsys/net/l2/ieee802154/ieee802154.c b/subsys/net/l2/ieee802154/ieee802154.c
index 58033b806a..da013e415c 100644
--- a/subsys/net/l2/ieee802154/ieee802154.c
+++ b/subsys/net/l2/ieee802154/ieee802154.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/capture.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/capture.h>
 
 #include "ipv6.h"
 
@@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(net_ieee802154, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 #include "ieee802154_fragment.h"
 #include <6lo.h>
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 #include "ieee802154_frame.h"
 #include "ieee802154_mgmt_priv.h"
diff --git a/subsys/net/l2/ieee802154/ieee802154_fragment.c b/subsys/net/l2/ieee802154/ieee802154_fragment.c
index bf53819acb..0e715d8fd0 100644
--- a/subsys/net/l2/ieee802154/ieee802154_fragment.c
+++ b/subsys/net/l2/ieee802154/ieee802154_fragment.c
@@ -8,16 +8,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_fragment,
 		    CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
-#include <net/net_stats.h>
-#include <net/udp.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/udp.h>
 
 #include "ieee802154_fragment.h"
 
diff --git a/subsys/net/l2/ieee802154/ieee802154_fragment.h b/subsys/net/l2/ieee802154/ieee802154_fragment.h
index ae882fa5b7..a63f4faa2b 100644
--- a/subsys/net/l2/ieee802154/ieee802154_fragment.h
+++ b/subsys/net/l2/ieee802154/ieee802154_fragment.h
@@ -13,10 +13,10 @@
 #ifndef __NET_IEEE802154_FRAGMENT_H__
 #define __NET_IEEE802154_FRAGMENT_H__
 
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 #include <zephyr/types.h>
 
-#include <net/net_pkt.h>
+#include <zephyr/net/net_pkt.h>
 
 #include "ieee802154_frame.h"
 
diff --git a/subsys/net/l2/ieee802154/ieee802154_frame.c b/subsys/net/l2/ieee802154/ieee802154_frame.c
index e13044bd81..b87ab32ccf 100644
--- a/subsys/net/l2/ieee802154/ieee802154_frame.c
+++ b/subsys/net/l2/ieee802154/ieee802154_frame.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_frame, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
 
 #include <ipv6.h>
 #include <nbr.h>
diff --git a/subsys/net/l2/ieee802154/ieee802154_frame.h b/subsys/net/l2/ieee802154/ieee802154_frame.h
index 02df8bdfd7..d1ad87a416 100644
--- a/subsys/net/l2/ieee802154/ieee802154_frame.h
+++ b/subsys/net/l2/ieee802154/ieee802154_frame.h
@@ -12,10 +12,10 @@
 #ifndef __IEEE802154_FRAME_H__
 #define __IEEE802154_FRAME_H__
 
-#include <kernel.h>
-#include <net/net_pkt.h>
-#include <net/ieee802154.h>
-#include <toolchain.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/ieee802154.h>
+#include <zephyr/toolchain.h>
 
 #define IEEE802154_MTU				127
 #define IEEE802154_MIN_LENGTH			3
diff --git a/subsys/net/l2/ieee802154/ieee802154_mgmt.c b/subsys/net/l2/ieee802154/ieee802154_mgmt.c
index 66a85388f8..9ea43244ca 100644
--- a/subsys/net/l2/ieee802154/ieee802154_mgmt.c
+++ b/subsys/net/l2/ieee802154/ieee802154_mgmt.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_mgmt, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <net/net_core.h>
+#include <zephyr/net/net_core.h>
 
 #include <errno.h>
 
-#include <net/net_if.h>
-#include <net/ieee802154_radio.h>
-#include <net/ieee802154_mgmt.h>
-#include <net/ieee802154.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_mgmt.h>
+#include <zephyr/net/ieee802154.h>
 
 #include "ieee802154_frame.h"
 #include "ieee802154_mgmt_priv.h"
diff --git a/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c b/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c
index a978fa1de5..36b28a4edc 100644
--- a/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c
+++ b/subsys/net/l2/ieee802154/ieee802154_radio_aloha.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_aloha, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
 
 #include <errno.h>
 
diff --git a/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c b/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c
index fecd9a21ee..befc0f6484 100644
--- a/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c
+++ b/subsys/net/l2/ieee802154/ieee802154_radio_csma_ca.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_csma, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
 
-#include <sys/util.h>
-#include <random/rand32.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/random/rand32.h>
 
 #include <stdlib.h>
 #include <errno.h>
diff --git a/subsys/net/l2/ieee802154/ieee802154_security.c b/subsys/net/l2/ieee802154/ieee802154_security.c
index 0142916ea1..9cd59d3959 100644
--- a/subsys/net/l2/ieee802154/ieee802154_security.c
+++ b/subsys/net/l2/ieee802154/ieee802154_security.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_security,
 		    CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <crypto/crypto.h>
-#include <net/net_core.h>
+#include <zephyr/crypto/crypto.h>
+#include <zephyr/net/net_core.h>
 
 #include "ieee802154_frame.h"
 #include "ieee802154_security.h"
diff --git a/subsys/net/l2/ieee802154/ieee802154_security.h b/subsys/net/l2/ieee802154/ieee802154_security.h
index 251c7a22a5..11bc72b87a 100644
--- a/subsys/net/l2/ieee802154/ieee802154_security.h
+++ b/subsys/net/l2/ieee802154/ieee802154_security.h
@@ -6,7 +6,7 @@
 
 #ifdef CONFIG_NET_L2_IEEE802154_SECURITY
 
-#include <net/ieee802154.h>
+#include <zephyr/net/ieee802154.h>
 
 int ieee802154_security_setup_session(struct ieee802154_security_ctx *sec_ctx,
 				      uint8_t level, uint8_t key_mode,
diff --git a/subsys/net/l2/ieee802154/ieee802154_shell.c b/subsys/net/l2/ieee802154/ieee802154_shell.c
index f3a4f512e1..f5076990d9 100644
--- a/subsys/net/l2/ieee802154/ieee802154_shell.c
+++ b/subsys/net/l2/ieee802154/ieee802154_shell.c
@@ -8,17 +8,17 @@
  * @brief IEEE 802.15.4 shell module
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ieee802154_shell, CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <shell/shell.h>
-#include <sys/printk.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/printk.h>
 
-#include <net/net_if.h>
-#include <net/ieee802154_mgmt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/ieee802154_mgmt.h>
 
 #include "ieee802154_frame.h"
 
diff --git a/subsys/net/l2/ieee802154/ieee802154_utils.h b/subsys/net/l2/ieee802154/ieee802154_utils.h
index b34c10bdfa..0e648aab56 100644
--- a/subsys/net/l2/ieee802154/ieee802154_utils.h
+++ b/subsys/net/l2/ieee802154/ieee802154_utils.h
@@ -12,7 +12,7 @@
 #ifndef __IEEE802154_UTILS_H__
 #define __IEEE802154_UTILS_H__
 
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 static inline
 enum ieee802154_hw_caps ieee802154_get_hw_capabilities(struct net_if *iface)
diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
index 582b25a841..f5dc86cadc 100644
--- a/subsys/net/l2/openthread/openthread.c
+++ b/subsys/net/l2/openthread/openthread.c
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_mgmt.h>
-#include <net/openthread.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/openthread.h>
 
 #include <net_private.h>
 
-#include <init.h>
-#include <sys/util.h>
-#include <sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/__assert.h>
 #include <version.h>
 
 #include <openthread/cli.h>
diff --git a/subsys/net/l2/openthread/openthread_utils.c b/subsys/net/l2/openthread/openthread_utils.c
index d91f8f1ece..08794e56db 100644
--- a/subsys/net/l2/openthread/openthread_utils.c
+++ b/subsys/net/l2/openthread/openthread_utils.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/openthread.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/openthread.h>
 
 #include <openthread/ip6.h>
 #include <openthread/thread.h>
diff --git a/subsys/net/l2/ppp/fsm.c b/subsys/net/l2/ppp/fsm.c
index 3a36e9fe44..d8cdfe2e1f 100644
--- a/subsys/net/l2/ppp/fsm.c
+++ b/subsys/net/l2/ppp/fsm.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
-#include <net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_if.h>
 
-#include <net/ppp.h>
-#include <random/rand32.h>
+#include <zephyr/net/ppp.h>
+#include <zephyr/random/rand32.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/l2/ppp/ipcp.c b/subsys/net/l2/ppp/ipcp.c
index 45dfcd056f..b790fd24c5 100644
--- a/subsys/net/l2/ppp/ipcp.c
+++ b/subsys/net/l2/ppp/ipcp.c
@@ -5,14 +5,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <net/ppp.h>
-#include <net/dns_resolve.h>
+#include <zephyr/net/ppp.h>
+#include <zephyr/net/dns_resolve.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/l2/ppp/ipv6cp.c b/subsys/net/l2/ppp/ipv6cp.c
index 74ebaad9bb..eeb61cad20 100644
--- a/subsys/net/l2/ppp/ipv6cp.c
+++ b/subsys/net/l2/ppp/ipv6cp.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 
 #include "net_private.h"
 #include "ipv6.h"
diff --git a/subsys/net/l2/ppp/lcp.c b/subsys/net/l2/ppp/lcp.c
index 6343f02491..18260b1eb2 100644
--- a/subsys/net/l2/ppp/lcp.c
+++ b/subsys/net/l2/ppp/lcp.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
-#include <net/net_mgmt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_mgmt.h>
 
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/l2/ppp/link.c b/subsys/net/l2/ppp/link.c
index 48f7b24711..e2eddc26ff 100644
--- a/subsys/net/l2/ppp/link.c
+++ b/subsys/net/l2/ppp/link.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/l2/ppp/misc.c b/subsys/net/l2/ppp/misc.c
index a399259c60..97c24b75e8 100644
--- a/subsys/net/l2/ppp/misc.c
+++ b/subsys/net/l2/ppp/misc.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/l2/ppp/network.c b/subsys/net/l2/ppp/network.c
index 790e85a611..bf63b7c4f9 100644
--- a/subsys/net/l2/ppp/network.c
+++ b/subsys/net/l2/ppp/network.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/l2/ppp/options.c b/subsys/net/l2/ppp/options.c
index 48be701a10..6fd8c15de6 100644
--- a/subsys/net/l2/ppp/options.c
+++ b/subsys/net/l2/ppp/options.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt.h>
 
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/l2/ppp/pap.c b/subsys/net/l2/ppp/pap.c
index a5b0e5b1f0..a3cd9d5fc7 100644
--- a/subsys/net/l2/ppp/pap.c
+++ b/subsys/net/l2/ppp/pap.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <net/net_pkt.h>
+#include <zephyr/net/net_pkt.h>
 
 #include "ppp_internal.h"
 
diff --git a/subsys/net/l2/ppp/ppp_internal.h b/subsys/net/l2/ppp/ppp_internal.h
index 8c682c638b..00ffb11125 100644
--- a/subsys/net/l2/ppp/ppp_internal.h
+++ b/subsys/net/l2/ppp/ppp_internal.h
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 
 /**
  * FSM flags that control how it operates.
diff --git a/subsys/net/l2/ppp/ppp_l2.c b/subsys/net/l2/ppp/ppp_l2.c
index ade281ed83..102f4a7463 100644
--- a/subsys/net/l2/ppp/ppp_l2.c
+++ b/subsys/net/l2/ppp/ppp_l2.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_l2_ppp, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
 #include <stdlib.h>
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
-#include <net/net_mgmt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_mgmt.h>
 
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/l2/ppp/ppp_mgmt.c b/subsys/net/l2/ppp/ppp_mgmt.c
index 515494d31d..77f17c2bad 100644
--- a/subsys/net/l2/ppp/ppp_mgmt.c
+++ b/subsys/net/l2/ppp/ppp_mgmt.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <net/ppp.h>
+#include <zephyr/net/ppp.h>
 
 void ppp_mgmt_raise_carrier_on_event(struct net_if *iface)
 {
diff --git a/subsys/net/l2/ppp/ppp_stats.c b/subsys/net/l2/ppp/ppp_stats.c
index 3f0dfaad65..9dafef154b 100644
--- a/subsys/net/l2/ppp/ppp_stats.c
+++ b/subsys/net/l2/ppp/ppp_stats.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_ppp_stats, CONFIG_NET_L2_PPP_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/ppp.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/ppp.h>
 
 #include "net_stats.h"
 
diff --git a/subsys/net/l2/ppp/ppp_stats.h b/subsys/net/l2/ppp/ppp_stats.h
index c80572bbe3..253ce1acc4 100644
--- a/subsys/net/l2/ppp/ppp_stats.h
+++ b/subsys/net/l2/ppp/ppp_stats.h
@@ -9,9 +9,9 @@
 
 #if defined(CONFIG_NET_STATISTICS_PPP)
 
-#include <net/net_ip.h>
-#include <net/net_stats.h>
-#include <net/net_if.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_stats.h>
+#include <zephyr/net/net_if.h>
 
 static inline void ppp_stats_update_bytes_rx(struct net_if *iface,
 					     uint32_t bytes)
diff --git a/subsys/net/l2/virtual/ipip/ipip.c b/subsys/net/l2/virtual/ipip/ipip.c
index d9b3497050..a5c565022b 100644
--- a/subsys/net/l2/virtual/ipip/ipip.c
+++ b/subsys/net/l2/virtual/ipip/ipip.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_virtual_ipip, CONFIG_NET_L2_IPIP_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/device.h>
 #include <errno.h>
 
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/virtual.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/virtual.h>
 
 #include "ipv4.h"
 #include "ipv6.h"
diff --git a/subsys/net/l2/virtual/virtual.c b/subsys/net/l2/virtual/virtual.c
index a093e50a64..bbd178db5d 100644
--- a/subsys/net/l2/virtual/virtual.c
+++ b/subsys/net/l2/virtual/virtual.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_virtual, CONFIG_NET_L2_VIRTUAL_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_l2.h>
-#include <net/net_if.h>
-#include <net/net_mgmt.h>
-#include <net/virtual.h>
-#include <net/virtual_mgmt.h>
-#include <random/rand32.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_l2.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/virtual.h>
+#include <zephyr/net/virtual_mgmt.h>
+#include <zephyr/random/rand32.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/l2/virtual/virtual_mgmt.c b/subsys/net/l2/virtual/virtual_mgmt.c
index 6fd6f3a08a..c8339a1fbf 100644
--- a/subsys/net/l2/virtual/virtual_mgmt.c
+++ b/subsys/net/l2/virtual/virtual_mgmt.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_virtual_mgmt, CONFIG_NET_L2_VIRTUAL_LOG_LEVEL);
 
 #include <errno.h>
 
-#include <net/net_core.h>
-#include <net/net_if.h>
-#include <net/virtual_mgmt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/virtual_mgmt.h>
 
 static int virtual_interface_set_config(uint32_t mgmt_request,
 					struct net_if *iface,
diff --git a/subsys/net/l2/wifi/wifi_mgmt.c b/subsys/net/l2/wifi/wifi_mgmt.c
index 500cc991eb..be358060b2 100644
--- a/subsys/net/l2/wifi/wifi_mgmt.c
+++ b/subsys/net/l2/wifi/wifi_mgmt.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_wifi_mgmt, CONFIG_NET_L2_WIFI_MGMT_LOG_LEVEL);
 
 #include <errno.h>
 
-#include <net/net_core.h>
-#include <net/net_if.h>
-#include <net/wifi_mgmt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/wifi_mgmt.h>
 
 static int wifi_connect(uint32_t mgmt_request, struct net_if *iface,
 			void *data, size_t len)
diff --git a/subsys/net/l2/wifi/wifi_shell.c b/subsys/net/l2/wifi/wifi_shell.c
index 5a8bb3e9cb..c380ef2f46 100644
--- a/subsys/net/l2/wifi/wifi_shell.c
+++ b/subsys/net/l2/wifi/wifi_shell.c
@@ -8,19 +8,19 @@
  * @brief WiFi shell module
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_wifi_shell, LOG_LEVEL_INF);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <shell/shell.h>
-#include <sys/printk.h>
-#include <init.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/init.h>
 
-#include <net/net_if.h>
-#include <net/wifi_mgmt.h>
-#include <net/net_event.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/wifi_mgmt.h>
+#include <zephyr/net/net_event.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/lib/capture/capture.c b/subsys/net/lib/capture/capture.c
index d351e9b206..8e37966e9b 100644
--- a/subsys/net/lib/capture/capture.c
+++ b/subsys/net/lib/capture/capture.c
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_capture, CONFIG_NET_CAPTURE_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdlib.h>
-#include <sys/slist.h>
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
-#include <net/net_pkt.h>
-#include <net/virtual.h>
-#include <net/virtual_mgmt.h>
-#include <net/capture.h>
-#include <net/ethernet.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/virtual.h>
+#include <zephyr/net/virtual_mgmt.h>
+#include <zephyr/net/capture.h>
+#include <zephyr/net/ethernet.h>
 
 #include "net_private.h"
 #include "ipv4.h"
diff --git a/subsys/net/lib/coap/coap.c b/subsys/net/lib/coap/coap.c
index f7347fa465..55f6431491 100644
--- a/subsys/net/lib/coap/coap.c
+++ b/subsys/net/lib/coap/coap.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_coap, CONFIG_COAP_LOG_LEVEL);
 
 #include <stdlib.h>
@@ -12,17 +12,17 @@ LOG_MODULE_REGISTER(net_coap, CONFIG_COAP_LOG_LEVEL);
 #include <string.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <random/rand32.h>
-#include <sys/atomic.h>
-#include <sys/util.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/util.h>
 
 #include <zephyr/types.h>
-#include <sys/byteorder.h>
-#include <sys/math_extras.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/math_extras.h>
 
-#include <net/net_ip.h>
-#include <net/net_core.h>
-#include <net/coap.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/coap.h>
 
 /* Values as per RFC 7252, section-3.1.
  *
diff --git a/subsys/net/lib/coap/coap_link_format.c b/subsys/net/lib/coap/coap_link_format.c
index 0ae58dc417..6068caf3c4 100644
--- a/subsys/net/lib/coap/coap_link_format.c
+++ b/subsys/net/lib/coap/coap_link_format.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 
 #include <stdlib.h>
@@ -14,12 +14,12 @@ LOG_MODULE_DECLARE(net_coap, CONFIG_COAP_LOG_LEVEL);
 #include <stdbool.h>
 #include <errno.h>
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
-#include <net/coap.h>
-#include <net/coap_link_format.h>
+#include <zephyr/net/coap.h>
+#include <zephyr/net/coap_link_format.h>
 
 static inline bool append_u8(struct coap_packet *cpkt, uint8_t data)
 {
diff --git a/subsys/net/lib/config/bt_settings.c b/subsys/net/lib/config/bt_settings.c
index 558630f4de..73fee0db1b 100644
--- a/subsys/net/lib/config/bt_settings.c
+++ b/subsys/net/lib/config/bt_settings.c
@@ -6,20 +6,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_config, CONFIG_NET_CONFIG_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
 
-#include <net/net_if.h>
-#include <net/net_core.h>
-#include <net/net_mgmt.h>
-#include <net/bt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/bt.h>
 
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/uuid.h>
-#include <bluetooth/gatt.h>
+#include <zephyr/bluetooth/bluetooth.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/bluetooth/gatt.h>
 
 #if defined(CONFIG_NET_CONFIG_BT_NODE)
 #define ADV_STR "on"
diff --git a/subsys/net/lib/config/ieee802154_settings.c b/subsys/net/lib/config/ieee802154_settings.c
index 57e9875dbd..342da9034e 100644
--- a/subsys/net/lib/config/ieee802154_settings.c
+++ b/subsys/net/lib/config/ieee802154_settings.c
@@ -6,16 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_config, CONFIG_NET_CONFIG_LOG_LEVEL);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
 
-#include <net/net_if.h>
-#include <net/net_core.h>
-#include <net/net_mgmt.h>
-#include <net/ieee802154_mgmt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/ieee802154_mgmt.h>
 
 int z_net_config_ieee802154_setup(void)
 {
diff --git a/subsys/net/lib/config/init.c b/subsys/net/lib/config/init.c
index b849323ef7..6a1520ba82 100644
--- a/subsys/net/lib/config/init.c
+++ b/subsys/net/lib/config/init.c
@@ -6,24 +6,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_config, CONFIG_NET_CONFIG_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
 
-#include <logging/log_backend.h>
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/net_if.h>
-#include <net/dhcpv4.h>
-#include <net/net_mgmt.h>
-#include <net/dns_resolve.h>
+#include <zephyr/logging/log_backend.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/dhcpv4.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/dns_resolve.h>
 
-#include <net/net_config.h>
+#include <zephyr/net/net_config.h>
 
 #include "ieee802154_settings.h"
 #include "bt_settings.h"
diff --git a/subsys/net/lib/config/init_clock_sntp.c b/subsys/net/lib/config/init_clock_sntp.c
index 4e5d2bcb45..a6509e1e12 100644
--- a/subsys/net/lib/config/init_clock_sntp.c
+++ b/subsys/net/lib/config/init_clock_sntp.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(net_config, CONFIG_NET_CONFIG_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/sntp.h>
-#include <posix/time.h>
+#include <zephyr/net/sntp.h>
+#include <zephyr/posix/time.h>
 
 int net_init_clock_via_sntp(void)
 {
diff --git a/subsys/net/lib/conn_mgr/conn_mgr.c b/subsys/net/lib/conn_mgr/conn_mgr.c
index 52d4f25630..610df7236f 100644
--- a/subsys/net/lib/conn_mgr/conn_mgr.c
+++ b/subsys/net/lib/conn_mgr/conn_mgr.c
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(conn_mgr, CONFIG_NET_CONNECTION_MANAGER_LOG_LEVEL);
 
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <errno.h>
-#include <net/net_core.h>
-#include <net/net_if.h>
-#include <net/net_mgmt.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_mgmt.h>
 
 #include <conn_mgr.h>
 
diff --git a/subsys/net/lib/conn_mgr/events_handler.c b/subsys/net/lib/conn_mgr/events_handler.c
index 0a22b0904d..551420df49 100644
--- a/subsys/net/lib/conn_mgr/events_handler.c
+++ b/subsys/net/lib/conn_mgr/events_handler.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(conn_mgr, CONFIG_NET_CONNECTION_MANAGER_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/net_if.h>
-#include <net/net_mgmt.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_mgmt.h>
 
 #include <conn_mgr.h>
 
diff --git a/subsys/net/lib/dns/dns_internal.h b/subsys/net/lib/dns/dns_internal.h
index 66bad4fd8b..bc4e479c40 100644
--- a/subsys/net/lib/dns/dns_internal.h
+++ b/subsys/net/lib/dns/dns_internal.h
@@ -5,8 +5,8 @@
  */
 
 #include <zephyr/types.h>
-#include <net/buf.h>
-#include <net/dns_resolve.h>
+#include <zephyr/net/buf.h>
+#include <zephyr/net/dns_resolve.h>
 
 #include "dns_pack.h"
 
diff --git a/subsys/net/lib/dns/dns_pack.c b/subsys/net/lib/dns/dns_pack.c
index b79d7370ee..a0218547ca 100644
--- a/subsys/net/lib/dns/dns_pack.c
+++ b/subsys/net/lib/dns/dns_pack.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
 #include "dns_pack.h"
 
diff --git a/subsys/net/lib/dns/dns_pack.h b/subsys/net/lib/dns/dns_pack.h
index 4981b66edf..fabac597c7 100644
--- a/subsys/net/lib/dns/dns_pack.h
+++ b/subsys/net/lib/dns/dns_pack.h
@@ -7,8 +7,8 @@
 #ifndef _DNS_PACK_H_
 #define _DNS_PACK_H_
 
-#include <net/net_ip.h>
-#include <net/buf.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/buf.h>
 
 #include <zephyr/types.h>
 #include <stddef.h>
diff --git a/subsys/net/lib/dns/dns_sd.c b/subsys/net/lib/dns/dns_sd.c
index 57ff9fb8e6..45c2006c25 100644
--- a/subsys/net/lib/dns/dns_sd.c
+++ b/subsys/net/lib/dns/dns_sd.c
@@ -12,16 +12,16 @@
 #include <string.h>
 #include <strings.h>
 
-#include <net/net_context.h>
-#include <net/net_core.h>
-#include <net/dns_sd.h>
-#include <sys/util.h>
-#include <zephyr.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/dns_sd.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/zephyr.h>
 
 #include "dns_pack.h"
 #include "dns_sd.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_dns_sd, CONFIG_DNS_SD_LOG_LEVEL);
 
 const char dns_sd_empty_txt[1];
diff --git a/subsys/net/lib/dns/dns_sd.h b/subsys/net/lib/dns/dns_sd.h
index 1a10935062..60ee6992b9 100644
--- a/subsys/net/lib/dns/dns_sd.h
+++ b/subsys/net/lib/dns/dns_sd.h
@@ -11,8 +11,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <net/dns_sd.h>
-#include <net/net_ip.h>
+#include <zephyr/net/dns_sd.h>
+#include <zephyr/net/net_ip.h>
 
 #include "dns_pack.h"
 
diff --git a/subsys/net/lib/dns/llmnr_responder.c b/subsys/net/lib/dns/llmnr_responder.c
index 816afe42a7..56ca83563f 100644
--- a/subsys/net/lib/dns/llmnr_responder.c
+++ b/subsys/net/lib/dns/llmnr_responder.c
@@ -10,21 +10,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_llmnr_responder, CONFIG_LLMNR_RESPONDER_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
 #include <stdlib.h>
 
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/dns_resolve.h>
-#include <net/udp.h>
-#include <net/igmp.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/udp.h>
+#include <zephyr/net/igmp.h>
 
 #include "dns_pack.h"
 #include "ipv6.h"
diff --git a/subsys/net/lib/dns/mdns_responder.c b/subsys/net/lib/dns/mdns_responder.c
index 90955d9b40..12d7dc04aa 100644
--- a/subsys/net/lib/dns/mdns_responder.c
+++ b/subsys/net/lib/dns/mdns_responder.c
@@ -11,21 +11,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mdns_responder, CONFIG_MDNS_RESPONDER_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/init.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
 #include <stdlib.h>
 
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/dns_resolve.h>
-#include <net/igmp.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/dns_resolve.h>
+#include <zephyr/net/igmp.h>
 
 #include "dns_sd.h"
 #include "dns_pack.h"
diff --git a/subsys/net/lib/dns/resolve.c b/subsys/net/lib/dns/resolve.c
index 25c2ea05ef..ea36e68718 100644
--- a/subsys/net/lib/dns/resolve.c
+++ b/subsys/net/lib/dns/resolve.c
@@ -10,20 +10,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_dns_resolve, CONFIG_DNS_RESOLVER_LOG_LEVEL);
 
 #include <zephyr/types.h>
-#include <random/rand32.h>
+#include <zephyr/random/rand32.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
 
-#include <sys/crc.h>
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <net/net_mgmt.h>
-#include <net/dns_resolve.h>
+#include <zephyr/sys/crc.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/net_mgmt.h>
+#include <zephyr/net/dns_resolve.h>
 #include "dns_pack.h"
 #include "dns_internal.h"
 
diff --git a/subsys/net/lib/http/http_client.c b/subsys/net/lib/http/http_client.c
index f84b8a7679..91c269bf08 100644
--- a/subsys/net/lib/http/http_client.c
+++ b/subsys/net/lib/http/http_client.c
@@ -10,19 +10,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_http, CONFIG_NET_HTTP_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include <net/net_ip.h>
-#include <net/socket.h>
-#include <net/http_client.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/http_client.h>
 
 #include "net_private.h"
 
diff --git a/subsys/net/lib/http/http_parser.c b/subsys/net/lib/http/http_parser.c
index 23fcb9f6a5..8626b101cd 100644
--- a/subsys/net/lib/http/http_parser.c
+++ b/subsys/net/lib/http/http_parser.c
@@ -23,14 +23,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#include <net/http_parser.h>
-#include <sys/__assert.h>
+#include <zephyr/net/http_parser.h>
+#include <zephyr/sys/__assert.h>
 #include <stddef.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#include <toolchain.h>
+#include <zephyr/toolchain.h>
 
 #ifndef ULLONG_MAX
 # define ULLONG_MAX ((uint64_t) -1) /* 2^64-1 */
diff --git a/subsys/net/lib/http/http_parser_url.c b/subsys/net/lib/http/http_parser_url.c
index 75da775a85..84a41540eb 100644
--- a/subsys/net/lib/http/http_parser_url.c
+++ b/subsys/net/lib/http/http_parser_url.c
@@ -23,14 +23,14 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
  */
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include <stddef.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
-#include <net/http_parser_url.h>
-#include <toolchain.h>
+#include <zephyr/net/http_parser_url.h>
+#include <zephyr/toolchain.h>
 
 #ifndef BIT_AT
 # define BIT_AT(a, i)                                                \
diff --git a/subsys/net/lib/lwm2m/ipso_accelerometer.c b/subsys/net/lib/lwm2m/ipso_accelerometer.c
index e7326300a6..9ce0d94b36 100644
--- a/subsys/net/lib/lwm2m/ipso_accelerometer.c
+++ b/subsys/net/lib/lwm2m/ipso_accelerometer.c
@@ -12,11 +12,11 @@
 #define LOG_MODULE_NAME net_ipso_accel
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_buzzer.c b/subsys/net/lib/lwm2m/ipso_buzzer.c
index 4be0430ea2..c30e8a9a19 100644
--- a/subsys/net/lib/lwm2m/ipso_buzzer.c
+++ b/subsys/net/lib/lwm2m/ipso_buzzer.c
@@ -12,11 +12,11 @@
 #define LOG_MODULE_NAME net_ipso_buzzer
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_current_sensor.c b/subsys/net/lib/lwm2m/ipso_current_sensor.c
index 7be7f44f56..ef7039b9ca 100644
--- a/subsys/net/lib/lwm2m/ipso_current_sensor.c
+++ b/subsys/net/lib/lwm2m/ipso_current_sensor.c
@@ -12,11 +12,11 @@
 #define LOG_MODULE_NAME net_ipso_current_sensor
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_filling_sensor.c b/subsys/net/lib/lwm2m/ipso_filling_sensor.c
index 365bf4425e..a1272c0d13 100644
--- a/subsys/net/lib/lwm2m/ipso_filling_sensor.c
+++ b/subsys/net/lib/lwm2m/ipso_filling_sensor.c
@@ -12,11 +12,11 @@
 #define LOG_MODULE_NAME net_ipso_filling_sensor
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_filling_sensor.h b/subsys/net/lib/lwm2m/ipso_filling_sensor.h
index 3ffcc39b7a..f814aaedff 100644
--- a/subsys/net/lib/lwm2m/ipso_filling_sensor.h
+++ b/subsys/net/lib/lwm2m/ipso_filling_sensor.h
@@ -9,7 +9,7 @@
 #ifndef __IPSO_FILLING_SENSOR__
 #define __IPSO_FILLING_SENSOR__
 
-#include <net/lwm2m.h>
+#include <zephyr/net/lwm2m.h>
 
 /* Resource IDs for filling sensor */
 /* clang-format off */
diff --git a/subsys/net/lib/lwm2m/ipso_generic_sensor.c b/subsys/net/lib/lwm2m/ipso_generic_sensor.c
index f5dd98fa82..7585e408e3 100644
--- a/subsys/net/lib/lwm2m/ipso_generic_sensor.c
+++ b/subsys/net/lib/lwm2m/ipso_generic_sensor.c
@@ -14,11 +14,11 @@
 #define LOG_MODULE_NAME net_ipso_generic_sensor
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_humidity_sensor.c b/subsys/net/lib/lwm2m/ipso_humidity_sensor.c
index 5023bf7dcb..7ae2880f33 100644
--- a/subsys/net/lib/lwm2m/ipso_humidity_sensor.c
+++ b/subsys/net/lib/lwm2m/ipso_humidity_sensor.c
@@ -9,11 +9,11 @@
 #define LOG_MODULE_NAME net_ipso_humidity_sensor
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_light_control.c b/subsys/net/lib/lwm2m/ipso_light_control.c
index 48d5992fa1..ae94530127 100644
--- a/subsys/net/lib/lwm2m/ipso_light_control.c
+++ b/subsys/net/lib/lwm2m/ipso_light_control.c
@@ -14,11 +14,11 @@
 #define LOG_MODULE_NAME net_ipso_light_control
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_onoff_switch.c b/subsys/net/lib/lwm2m/ipso_onoff_switch.c
index 1e23ef60cd..cfa9ae86b4 100644
--- a/subsys/net/lib/lwm2m/ipso_onoff_switch.c
+++ b/subsys/net/lib/lwm2m/ipso_onoff_switch.c
@@ -12,11 +12,11 @@
 #define LOG_MODULE_NAME net_ipso_onoff_switch
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_pressure_sensor.c b/subsys/net/lib/lwm2m/ipso_pressure_sensor.c
index de7a7769bd..9a626b455f 100644
--- a/subsys/net/lib/lwm2m/ipso_pressure_sensor.c
+++ b/subsys/net/lib/lwm2m/ipso_pressure_sensor.c
@@ -9,11 +9,11 @@
 #define LOG_MODULE_NAME net_ipso_pressure_sensor
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_push_button.c b/subsys/net/lib/lwm2m/ipso_push_button.c
index b6f10e45d0..242aee0f93 100644
--- a/subsys/net/lib/lwm2m/ipso_push_button.c
+++ b/subsys/net/lib/lwm2m/ipso_push_button.c
@@ -12,11 +12,11 @@
 #define LOG_MODULE_NAME net_ipso_button
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_temp_sensor.c b/subsys/net/lib/lwm2m/ipso_temp_sensor.c
index 7fff54af1b..b6ff7b019a 100644
--- a/subsys/net/lib/lwm2m/ipso_temp_sensor.c
+++ b/subsys/net/lib/lwm2m/ipso_temp_sensor.c
@@ -14,11 +14,11 @@
 #define LOG_MODULE_NAME net_ipso_temp_sensor
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/ipso_timer.c b/subsys/net/lib/lwm2m/ipso_timer.c
index c2482c13e9..6a5332680f 100644
--- a/subsys/net/lib/lwm2m/ipso_timer.c
+++ b/subsys/net/lib/lwm2m/ipso_timer.c
@@ -12,11 +12,11 @@
 #define LOG_MODULE_NAME net_ipso_timer
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_engine.c b/subsys/net/lib/lwm2m/lwm2m_engine.c
index 48f59c1fab..35f5f03b97 100644
--- a/subsys/net/lib/lwm2m/lwm2m_engine.c
+++ b/subsys/net/lib/lwm2m/lwm2m_engine.c
@@ -15,7 +15,7 @@
 #define LOG_MODULE_NAME net_lwm2m_engine
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <fcntl.h>
@@ -26,17 +26,17 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
-#include <init.h>
-#include <sys/printk.h>
-#include <net/net_ip.h>
-#include <net/http_parser_url.h>
-#include <net/socket.h>
-#include <net/lwm2m.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/http_parser_url.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/lwm2m.h>
 #if defined(CONFIG_LWM2M_DTLS_SUPPORT)
-#include <net/tls_credentials.h>
+#include <zephyr/net/tls_credentials.h>
 #endif
 #if defined(CONFIG_DNS_RESOLVER)
-#include <net/dns_resolve.h>
+#include <zephyr/net/dns_resolve.h>
 #endif
 
 #include "lwm2m_object.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c b/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c
index 2d9b984bb6..10e499fb57 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_connmon.c
@@ -7,13 +7,13 @@
 #define LOG_MODULE_NAME net_lwm2m_obj_conn_mon
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <string.h>
-#include <init.h>
-#include <net/net_if.h>
-#include <net/net_ip.h>
+#include <zephyr/init.h>
+#include <zephyr/net/net_if.h>
+#include <zephyr/net/net_ip.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_device.c b/subsys/net/lib/lwm2m/lwm2m_obj_device.c
index 101818fe35..6b46b04f73 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_device.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_device.c
@@ -13,12 +13,12 @@
 #define LOG_MODULE_NAME net_lwm2m_obj_device
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <string.h>
 #include <stdio.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c
index f42ae36921..dce8a8ff85 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_firmware.c
@@ -8,12 +8,12 @@
 #define LOG_MODULE_NAME net_lwm2m_obj_firmware
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <string.h>
 #include <stdio.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c b/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c
index ee685bfb3a..6edf8ad75d 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_firmware_pull.c
@@ -8,7 +8,7 @@
 #define LOG_MODULE_NAME net_lwm2m_obj_firmware_pull
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <string.h>
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_gateway.c b/subsys/net/lib/lwm2m/lwm2m_obj_gateway.c
index 91bed3d062..1a7569fa6f 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_gateway.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_gateway.c
@@ -15,11 +15,11 @@
 #define LOG_MODULE_NAME net_lwm2m_gateway
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <string.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_location.c b/subsys/net/lib/lwm2m/lwm2m_obj_location.c
index 62b1323c2d..9ab5dacaaf 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_location.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_location.c
@@ -7,11 +7,11 @@
 #define LOG_MODULE_NAME net_lwm2m_obj_location
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_portfolio.c b/subsys/net/lib/lwm2m/lwm2m_obj_portfolio.c
index 1ff62f18d9..111c468f6c 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_portfolio.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_portfolio.c
@@ -7,11 +7,11 @@
 #define LOG_MODULE_NAME net_lwm2m_obj_portfolio
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_security.c b/subsys/net/lib/lwm2m/lwm2m_obj_security.c
index e1f3cf9386..5410c61ae9 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_security.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_security.c
@@ -8,11 +8,11 @@
 #define LOG_MODULE_NAME net_lwm2m_obj_security
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_server.c b/subsys/net/lib/lwm2m/lwm2m_obj_server.c
index b565d56faa..ee534da752 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_server.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_server.c
@@ -8,11 +8,11 @@
 #define LOG_MODULE_NAME net_lwm2m_obj_server
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c b/subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c
index b587fea618..55d084e882 100644
--- a/subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c
+++ b/subsys/net/lib/lwm2m/lwm2m_obj_swmgmt.c
@@ -9,14 +9,14 @@
 #define LOG_MODULE_NAME net_lwm2m_obj_swmgmt
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <string.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include <stdint.h>
-#include <net/lwm2m.h>
+#include <zephyr/net/lwm2m.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_object.h b/subsys/net/lib/lwm2m/lwm2m_object.h
index df625a2aa9..b7a2dc8d3b 100644
--- a/subsys/net/lib/lwm2m/lwm2m_object.h
+++ b/subsys/net/lib/lwm2m/lwm2m_object.h
@@ -47,15 +47,15 @@
 /* stdint conversions */
 #include <zephyr/types.h>
 #include <stddef.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
-#include <net/net_ip.h>
-#include <sys/printk.h>
-#include <sys/util.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/sys/util.h>
 #include <sys/types.h>
 
-#include <net/coap.h>
-#include <net/lwm2m.h>
+#include <zephyr/net/coap.h>
+#include <zephyr/net/lwm2m.h>
 
 #include "buf_util.h"
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_pull_context.c b/subsys/net/lib/lwm2m/lwm2m_pull_context.c
index 1f4602786a..a4d8a06c84 100644
--- a/subsys/net/lib/lwm2m/lwm2m_pull_context.c
+++ b/subsys/net/lib/lwm2m/lwm2m_pull_context.c
@@ -8,15 +8,15 @@
 #define LOG_MODULE_NAME net_lwm2m_pull_context
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <ctype.h>
 #include <stdio.h>
 #include <string.h>
 
-#include <net/http_parser.h>
-#include <net/socket.h>
+#include <zephyr/net/http_parser.h>
+#include <zephyr/net/socket.h>
 
 #include "lwm2m_pull_context.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_pull_context.h b/subsys/net/lib/lwm2m/lwm2m_pull_context.h
index 09c378f309..02cf2b6a57 100644
--- a/subsys/net/lib/lwm2m/lwm2m_pull_context.h
+++ b/subsys/net/lib/lwm2m/lwm2m_pull_context.h
@@ -6,8 +6,8 @@
  */
 
 #include <stdio.h>
-#include <net/lwm2m.h>
-#include <sys_clock.h>
+#include <zephyr/net/lwm2m.h>
+#include <zephyr/sys_clock.h>
 
 #define LWM2M_PACKAGE_URI_LEN CONFIG_LWM2M_SWMGMT_PACKAGE_URI_LEN
 
diff --git a/subsys/net/lib/lwm2m/lwm2m_rd_client.c b/subsys/net/lib/lwm2m/lwm2m_rd_client.c
index ab8c2048cc..195c333177 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rd_client.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rd_client.c
@@ -45,7 +45,7 @@
 #define LOG_MODULE_NAME net_lwm2m_rd_client
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <zephyr/types.h>
@@ -53,8 +53,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <init.h>
-#include <sys/printk.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/printk.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_cbor.c b/subsys/net/lib/lwm2m/lwm2m_rw_cbor.c
index 7cdc4028ef..e08baaaa63 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_cbor.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_cbor.c
@@ -7,8 +7,8 @@
 #define LOG_MODULE_NAME net_lwm2m_cbor
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
-#include <sys/util.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -19,7 +19,7 @@
 #include <zcbor_decode.h>
 #include <zcbor_encode.h>
 
-#include <net/lwm2m.h>
+#include <zephyr/net/lwm2m.h>
 #include "lwm2m_object.h"
 #include "lwm2m_rw_cbor.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_json.c b/subsys/net/lib/lwm2m/lwm2m_rw_json.c
index 77325a9ef0..4e69145172 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_json.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_json.c
@@ -60,7 +60,7 @@
 #define LOG_MODULE_NAME net_lwm2m_json
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdio.h>
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_link_format.c b/subsys/net/lib/lwm2m/lwm2m_rw_link_format.c
index f4e420dc12..3dd9d09e73 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_link_format.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_link_format.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdint.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 #include "lwm2m_engine.h"
 #include "lwm2m_rw_link_format.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c b/subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c
index 99065c6cf6..4283e13c8d 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_oma_tlv.c
@@ -60,12 +60,12 @@
 #define LOG_MODULE_NAME net_lwm2m_oma_tlv
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <string.h>
 #include <stdint.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 #include "lwm2m_rw_oma_tlv.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c b/subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c
index af98e97f86..ace2b5d677 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_plain_text.c
@@ -59,7 +59,7 @@
 #define LOG_MODULE_NAME net_lwm2m_plain_text
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdarg.h>
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c b/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
index 4fd06f8050..070cd54bd1 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_senml_cbor.c
@@ -7,7 +7,7 @@
 #define LOG_MODULE_NAME net_lwm2m_senml_cbor
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdio.h>
@@ -16,8 +16,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <stdlib.h>
 #include <inttypes.h>
 #include <ctype.h>
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 
 #include <zcbor_common.h>
 #include <zcbor_decode.h>
diff --git a/subsys/net/lib/lwm2m/lwm2m_rw_senml_json.c b/subsys/net/lib/lwm2m/lwm2m_rw_senml_json.c
index 11bda7ac5f..c146e5e0ec 100644
--- a/subsys/net/lib/lwm2m/lwm2m_rw_senml_json.c
+++ b/subsys/net/lib/lwm2m/lwm2m_rw_senml_json.c
@@ -7,7 +7,7 @@
 #define LOG_MODULE_NAME net_lwm2m_senml_json
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdio.h>
@@ -15,8 +15,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <stdint.h>
 #include <inttypes.h>
 #include <ctype.h>
-#include <sys/base64.h>
-#include <sys/slist.h>
+#include <zephyr/sys/base64.h>
+#include <zephyr/sys/slist.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_rw_senml_json.h"
diff --git a/subsys/net/lib/lwm2m/lwm2m_shell.c b/subsys/net/lib/lwm2m/lwm2m_shell.c
index 28bfdb467d..234c1ecede 100644
--- a/subsys/net/lib/lwm2m/lwm2m_shell.c
+++ b/subsys/net/lib/lwm2m/lwm2m_shell.c
@@ -6,15 +6,15 @@
 #define LOG_MODULE_NAME net_lwm2m_shell
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stddef.h>
 #include <stdlib.h>
 
-#include <kernel.h>
-#include <net/lwm2m.h>
-#include <shell/shell.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/lwm2m.h>
+#include <zephyr/shell/shell.h>
 
 #define LWM2M_HELP_CMD "LwM2M commands"
 #define LWM2M_HELP_SEND "LwM2M SEND operation\nsend [OPTION]... [PATH]...\n" \
diff --git a/subsys/net/lib/lwm2m/lwm2m_util.c b/subsys/net/lib/lwm2m/lwm2m_util.c
index bea6c34a01..5dc5ab0f69 100644
--- a/subsys/net/lib/lwm2m/lwm2m_util.c
+++ b/subsys/net/lib/lwm2m/lwm2m_util.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/subsys/net/lib/lwm2m/lwm2m_util.h b/subsys/net/lib/lwm2m/lwm2m_util.h
index 63a0e5a372..3fda7a47e3 100644
--- a/subsys/net/lib/lwm2m/lwm2m_util.h
+++ b/subsys/net/lib/lwm2m/lwm2m_util.h
@@ -7,7 +7,7 @@
 #ifndef LWM2M_UTIL_H_
 #define LWM2M_UTIL_H_
 
-#include <net/lwm2m.h>
+#include <zephyr/net/lwm2m.h>
 
 /* convert float to binary format */
 int lwm2m_float_to_b32(double *in, uint8_t *b32, size_t len);
diff --git a/subsys/net/lib/lwm2m/ucifi_battery.c b/subsys/net/lib/lwm2m/ucifi_battery.c
index fd2a225ce3..68fba5f2bd 100644
--- a/subsys/net/lib/lwm2m/ucifi_battery.c
+++ b/subsys/net/lib/lwm2m/ucifi_battery.c
@@ -14,11 +14,11 @@
 #define LOG_MODULE_NAME net_ucifi_battery
 #define LOG_LEVEL CONFIG_LWM2M_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include <stdint.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #include "lwm2m_object.h"
 #include "lwm2m_engine.h"
diff --git a/subsys/net/lib/mqtt/mqtt.c b/subsys/net/lib/mqtt/mqtt.c
index b7d684372e..1b8d31280b 100644
--- a/subsys/net/lib/mqtt/mqtt.c
+++ b/subsys/net/lib/mqtt/mqtt.c
@@ -9,10 +9,10 @@
  * @brief MQTT Client API Implementation.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mqtt, CONFIG_MQTT_LOG_LEVEL);
 
-#include <net/mqtt.h>
+#include <zephyr/net/mqtt.h>
 
 #include "mqtt_transport.h"
 #include "mqtt_internal.h"
diff --git a/subsys/net/lib/mqtt/mqtt_decoder.c b/subsys/net/lib/mqtt/mqtt_decoder.c
index a8e1e39108..9fdbfae762 100644
--- a/subsys/net/lib/mqtt/mqtt_decoder.c
+++ b/subsys/net/lib/mqtt/mqtt_decoder.c
@@ -10,7 +10,7 @@
  *        broker.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mqtt_dec, CONFIG_MQTT_LOG_LEVEL);
 
 #include "mqtt_internal.h"
diff --git a/subsys/net/lib/mqtt/mqtt_encoder.c b/subsys/net/lib/mqtt/mqtt_encoder.c
index 33b8ffb02b..b9c397d244 100644
--- a/subsys/net/lib/mqtt/mqtt_encoder.c
+++ b/subsys/net/lib/mqtt/mqtt_encoder.c
@@ -9,7 +9,7 @@
  * @brief Encoding functions needed to create packet to be sent to the broker.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mqtt_enc, CONFIG_MQTT_LOG_LEVEL);
 
 #include "mqtt_internal.h"
diff --git a/subsys/net/lib/mqtt/mqtt_internal.h b/subsys/net/lib/mqtt/mqtt_internal.h
index 5306150d6d..cb7a5f920f 100644
--- a/subsys/net/lib/mqtt/mqtt_internal.h
+++ b/subsys/net/lib/mqtt/mqtt_internal.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <net/mqtt.h>
+#include <zephyr/net/mqtt.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/net/lib/mqtt/mqtt_os.h b/subsys/net/lib/mqtt/mqtt_os.h
index 05777775e9..8c709cc0d6 100644
--- a/subsys/net/lib/mqtt/mqtt_os.h
+++ b/subsys/net/lib/mqtt/mqtt_os.h
@@ -19,10 +19,10 @@
 #define MQTT_OS_H_
 
 #include <stddef.h>
-#include <kernel.h>
-#include <sys/mutex.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/mutex.h>
 
-#include <net/net_core.h>
+#include <zephyr/net/net_core.h>
 
 #include "mqtt_internal.h"
 
diff --git a/subsys/net/lib/mqtt/mqtt_rx.c b/subsys/net/lib/mqtt/mqtt_rx.c
index 8afa5671de..27fa2410d2 100644
--- a/subsys/net/lib/mqtt/mqtt_rx.c
+++ b/subsys/net/lib/mqtt/mqtt_rx.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mqtt_rx, CONFIG_MQTT_LOG_LEVEL);
 
 #include "mqtt_internal.h"
diff --git a/subsys/net/lib/mqtt/mqtt_transport.h b/subsys/net/lib/mqtt/mqtt_transport.h
index 37069e6406..3342ef0194 100644
--- a/subsys/net/lib/mqtt/mqtt_transport.h
+++ b/subsys/net/lib/mqtt/mqtt_transport.h
@@ -12,7 +12,7 @@
 #ifndef MQTT_TRANSPORT_H_
 #define MQTT_TRANSPORT_H_
 
-#include <net/mqtt.h>
+#include <zephyr/net/mqtt.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c
index ca75423f54..ffb8bcdb68 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tcp.c
@@ -9,12 +9,12 @@
  * @brief Internal functions to handle transport over TCP socket.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mqtt_sock_tcp, CONFIG_MQTT_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/socket.h>
-#include <net/mqtt.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/mqtt.h>
 
 #include "mqtt_os.h"
 
diff --git a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
index a8428ba4dc..59b11a5b7e 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_socket_tls.c
@@ -9,12 +9,12 @@
  * @brief Internal functions to handle transport over TLS socket.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mqtt_sock_tls, CONFIG_MQTT_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/socket.h>
-#include <net/mqtt.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/mqtt.h>
 
 #include "mqtt_os.h"
 
diff --git a/subsys/net/lib/mqtt/mqtt_transport_websocket.c b/subsys/net/lib/mqtt/mqtt_transport_websocket.c
index 2f577a8caf..ed33da0aa8 100644
--- a/subsys/net/lib/mqtt/mqtt_transport_websocket.c
+++ b/subsys/net/lib/mqtt/mqtt_transport_websocket.c
@@ -10,13 +10,13 @@
  * @brief Internal functions to handle transport over Websocket.
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_mqtt_websocket, CONFIG_MQTT_LOG_LEVEL);
 
 #include <errno.h>
-#include <net/socket.h>
-#include <net/mqtt.h>
-#include <net/websocket.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/mqtt.h>
+#include <zephyr/net/websocket.h>
 
 #include "mqtt_os.h"
 #include "mqtt_transport.h"
diff --git a/subsys/net/lib/openthread/platform/alarm.c b/subsys/net/lib/openthread/platform/alarm.c
index 8de07f9007..1ad998684c 100644
--- a/subsys/net/lib/openthread/platform/alarm.c
+++ b/subsys/net/lib/openthread/platform/alarm.c
@@ -7,10 +7,10 @@
 #define LOG_MODULE_NAME net_openthread_alarm
 #define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <inttypes.h>
 
diff --git a/subsys/net/lib/openthread/platform/diag.c b/subsys/net/lib/openthread/platform/diag.c
index 3971c5213a..025942861e 100644
--- a/subsys/net/lib/openthread/platform/diag.c
+++ b/subsys/net/lib/openthread/platform/diag.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <openthread/platform/diag.h>
 
 #include "platform-zephyr.h"
diff --git a/subsys/net/lib/openthread/platform/entropy.c b/subsys/net/lib/openthread/platform/entropy.c
index 2915e92307..58d23ed438 100644
--- a/subsys/net/lib/openthread/platform/entropy.c
+++ b/subsys/net/lib/openthread/platform/entropy.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
-#include <drivers/entropy.h>
-#include <logging/log.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/logging/log.h>
 
 #include <openthread/platform/entropy.h>
 
diff --git a/subsys/net/lib/openthread/platform/logging.c b/subsys/net/lib/openthread/platform/logging.c
index 7569b3b7f8..b5090fcce5 100644
--- a/subsys/net/lib/openthread/platform/logging.c
+++ b/subsys/net/lib/openthread/platform/logging.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdarg.h>
 #include <stdio.h>
 
@@ -13,7 +13,7 @@
 
 #define LOG_MODULE_NAME net_openthread
 #define LOG_LEVEL LOG_LEVEL_DBG
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #include "platform-zephyr.h"
diff --git a/subsys/net/lib/openthread/platform/memory.c b/subsys/net/lib/openthread/platform/memory.c
index ef3a72efb1..acfc72d0cd 100644
--- a/subsys/net/lib/openthread/platform/memory.c
+++ b/subsys/net/lib/openthread/platform/memory.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include <openthread/platform/memory.h>
 
diff --git a/subsys/net/lib/openthread/platform/misc.c b/subsys/net/lib/openthread/platform/misc.c
index 8a74859933..7f57dddb9e 100644
--- a/subsys/net/lib/openthread/platform/misc.c
+++ b/subsys/net/lib/openthread/platform/misc.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/reboot.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/reboot.h>
 #include <openthread/instance.h>
 #include <openthread/platform/misc.h>
 
diff --git a/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h b/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h
index 8c4ce7fcf9..7f289f2265 100644
--- a/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h
+++ b/subsys/net/lib/openthread/platform/openthread-core-zephyr-config.h
@@ -13,8 +13,8 @@
 #ifndef OPENTHREAD_CORE_ZEPHYR_CONFIG_H_
 #define OPENTHREAD_CORE_ZEPHYR_CONFIG_H_
 
-#include <devicetree.h>
-#include <toolchain.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/toolchain.h>
 
 /**
  * @def OPENTHREAD_CONFIG_PLATFORM_ASSERT_MANAGEMENT
diff --git a/subsys/net/lib/openthread/platform/platform-zephyr.h b/subsys/net/lib/openthread/platform/platform-zephyr.h
index 063a628fe2..0b424a1cc5 100644
--- a/subsys/net/lib/openthread/platform/platform-zephyr.h
+++ b/subsys/net/lib/openthread/platform/platform-zephyr.h
@@ -16,7 +16,7 @@
 #include <stdint.h>
 
 #include <openthread/instance.h>
-#include <net/net_pkt.h>
+#include <zephyr/net/net_pkt.h>
 
 /**
  * This function initializes the alarm service used by OpenThread.
diff --git a/subsys/net/lib/openthread/platform/platform.c b/subsys/net/lib/openthread/platform/platform.c
index 4a2d295f41..854cdf5c9b 100644
--- a/subsys/net/lib/openthread/platform/platform.c
+++ b/subsys/net/lib/openthread/platform/platform.c
@@ -10,7 +10,7 @@
  *   This file includes the platform-specific initializers.
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <openthread/instance.h>
 #include <openthread/tasklet.h>
 
diff --git a/subsys/net/lib/openthread/platform/radio.c b/subsys/net/lib/openthread/platform/radio.c
index 556ae74b26..bdc792bb2a 100644
--- a/subsys/net/lib/openthread/platform/radio.c
+++ b/subsys/net/lib/openthread/platform/radio.c
@@ -13,7 +13,7 @@
 
 #define LOG_MODULE_NAME net_otPlat_radio
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 
 #include <stdbool.h>
@@ -21,11 +21,11 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 #include <stdint.h>
 #include <string.h>
 
-#include <kernel.h>
-#include <device.h>
-#include <net/ieee802154_radio.h>
-#include <net/net_pkt.h>
-#include <sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/net/ieee802154_radio.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/sys/__assert.h>
 
 #include <openthread/ip6.h>
 #include <openthread-system.h>
diff --git a/subsys/net/lib/openthread/platform/settings.c b/subsys/net/lib/openthread/platform/settings.c
index 6a63b56abb..eaf4f06b59 100644
--- a/subsys/net/lib/openthread/platform/settings.c
+++ b/subsys/net/lib/openthread/platform/settings.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <logging/log.h>
-#include <settings/settings.h>
-#include <random/rand32.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/random/rand32.h>
 
 #include <openthread/platform/settings.h>
 
diff --git a/subsys/net/lib/openthread/platform/shell.c b/subsys/net/lib/openthread/platform/shell.c
index e72fd34a6e..ae61ef6085 100644
--- a/subsys/net/lib/openthread/platform/shell.c
+++ b/subsys/net/lib/openthread/platform/shell.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
-#include <net/openthread.h>
-#include <sys/printk.h>
-#include <shell/shell.h>
-#include <shell/shell_uart.h>
+#include <zephyr/net/openthread.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
 
 #include <openthread/cli.h>
 #include <openthread/instance.h>
diff --git a/subsys/net/lib/openthread/platform/spi.c b/subsys/net/lib/openthread/platform/spi.c
index 4bb8b99633..954a01d1a3 100644
--- a/subsys/net/lib/openthread/platform/spi.c
+++ b/subsys/net/lib/openthread/platform/spi.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <openthread/platform/spi-slave.h>
diff --git a/subsys/net/lib/openthread/platform/uart.c b/subsys/net/lib/openthread/platform/uart.c
index 7f1cfb0eda..dc278c9c3c 100644
--- a/subsys/net/lib/openthread/platform/uart.c
+++ b/subsys/net/lib/openthread/platform/uart.c
@@ -7,19 +7,19 @@
 #define LOG_LEVEL CONFIG_OPENTHREAD_LOG_LEVEL
 #define LOG_MODULE_NAME net_otPlat_uart
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <drivers/uart.h>
+#include <zephyr/drivers/uart.h>
 
-#include <sys/ring_buffer.h>
-#include <sys/atomic.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/atomic.h>
 
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 
 #include <openthread/ncp.h>
 #include <openthread-system.h>
diff --git a/subsys/net/lib/sntp/sntp.c b/subsys/net/lib/sntp/sntp.c
index fe707a7c15..1a1aec3e3f 100644
--- a/subsys/net/lib/sntp/sntp.c
+++ b/subsys/net/lib/sntp/sntp.c
@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sntp, CONFIG_SNTP_LOG_LEVEL);
 
-#include <net/sntp.h>
+#include <zephyr/net/sntp.h>
 #include "sntp_pkt.h"
 
 #define SNTP_LI_MAX 3
diff --git a/subsys/net/lib/sntp/sntp_simple.c b/subsys/net/lib/sntp/sntp_simple.c
index 5aa321eb06..1c68af871e 100644
--- a/subsys/net/lib/sntp/sntp_simple.c
+++ b/subsys/net/lib/sntp/sntp_simple.c
@@ -5,8 +5,8 @@
  */
 #include <errno.h>
 
-#include <net/sntp.h>
-#include <net/socketutils.h>
+#include <zephyr/net/sntp.h>
+#include <zephyr/net/socketutils.h>
 
 int sntp_simple(const char *server, uint32_t timeout, struct sntp_time *time)
 {
diff --git a/subsys/net/lib/sockets/getaddrinfo.c b/subsys/net/lib/sockets/getaddrinfo.c
index 00754aa7db..0755412729 100644
--- a/subsys/net/lib/sockets/getaddrinfo.c
+++ b/subsys/net/lib/sockets/getaddrinfo.c
@@ -11,14 +11,14 @@
 #include <ctype.h>
 
 /* Zephyr headers */
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock_addr, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <kernel.h>
-#include <net/net_ip.h>
-#include <net/socket.h>
-#include <net/socket_offload.h>
-#include <syscall_handler.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/socket_offload.h>
+#include <zephyr/syscall_handler.h>
 
 #if defined(CONFIG_DNS_RESOLVER) || \
 	defined(CONFIG_NET_IPV6) || defined(CONFIG_NET_IPV4)
diff --git a/subsys/net/lib/sockets/getnameinfo.c b/subsys/net/lib/sockets/getnameinfo.c
index c4b9612187..0c96b1e4e5 100644
--- a/subsys/net/lib/sockets/getnameinfo.c
+++ b/subsys/net/lib/sockets/getnameinfo.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 
 int zsock_getnameinfo(const struct sockaddr *addr, socklen_t addrlen,
 		      char *host, socklen_t hostlen,
diff --git a/subsys/net/lib/sockets/socket_dispatcher.c b/subsys/net/lib/sockets/socket_dispatcher.c
index b75e940543..df30defd8d 100644
--- a/subsys/net/lib/sockets/socket_dispatcher.c
+++ b/subsys/net/lib/sockets/socket_dispatcher.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
-#include <net/socket.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net/socket.h>
 
 #include "sockets_internal.h"
 
diff --git a/subsys/net/lib/sockets/socket_offload.c b/subsys/net/lib/sockets/socket_offload.c
index 843f8c0f92..2363e0f18d 100644
--- a/subsys/net/lib/sockets/socket_offload.c
+++ b/subsys/net/lib/sockets/socket_offload.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_socket_offload, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <net/socket_offload.h>
-#include <net/socket.h>
+#include <zephyr/net/socket_offload.h>
+#include <zephyr/net/socket.h>
 
 #include "sockets_internal.h"
 
diff --git a/subsys/net/lib/sockets/socketpair.c b/subsys/net/lib/sockets/socketpair.c
index fad1e93914..4b0b557e2a 100644
--- a/subsys/net/lib/sockets/socketpair.c
+++ b/subsys/net/lib/sockets/socketpair.c
@@ -7,14 +7,14 @@
 #include <fcntl.h>
 
 /* Zephyr headers */
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_spair, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <kernel.h>
-#include <net/socket.h>
-#include <syscall_handler.h>
-#include <sys/__assert.h>
-#include <sys/fdtable.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/fdtable.h>
 
 #include "sockets_internal.h"
 
diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
index 17bbaafa34..cc3939cde6 100644
--- a/subsys/net/lib/sockets/sockets.c
+++ b/subsys/net/lib/sockets/sockets.c
@@ -9,17 +9,17 @@
 #include <fcntl.h>
 
 /* Zephyr headers */
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <kernel.h>
-#include <net/net_context.h>
-#include <net/net_pkt.h>
-#include <net/socket.h>
-#include <net/socket_types.h>
-#include <syscall_handler.h>
-#include <sys/fdtable.h>
-#include <sys/math_extras.h>
+#include <zephyr/kernel.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/socket_types.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/sys/fdtable.h>
+#include <zephyr/sys/math_extras.h>
 
 #if defined(CONFIG_SOCKS)
 #include "socks.h"
diff --git a/subsys/net/lib/sockets/sockets_can.c b/subsys/net/lib/sockets/sockets_can.c
index 07145680ac..844d2e09f8 100644
--- a/subsys/net/lib/sockets/sockets_can.c
+++ b/subsys/net/lib/sockets/sockets_can.c
@@ -8,18 +8,18 @@
 #include <stdbool.h>
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock_can, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <kernel.h>
-#include <drivers/entropy.h>
-#include <sys/util.h>
-#include <net/net_context.h>
-#include <net/net_pkt.h>
-#include <net/socket.h>
-#include <syscall_handler.h>
-#include <sys/fdtable.h>
-#include <net/socket_can.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/sys/fdtable.h>
+#include <zephyr/net/socket_can.h>
 
 #include "sockets_internal.h"
 
diff --git a/subsys/net/lib/sockets/sockets_internal.h b/subsys/net/lib/sockets/sockets_internal.h
index 2842d6ca46..19e3a836d3 100644
--- a/subsys/net/lib/sockets/sockets_internal.h
+++ b/subsys/net/lib/sockets/sockets_internal.h
@@ -7,7 +7,7 @@
 #ifndef _SOCKETS_INTERNAL_H_
 #define _SOCKETS_INTERNAL_H_
 
-#include <sys/fdtable.h>
+#include <zephyr/sys/fdtable.h>
 
 #define SOCK_EOF 1
 #define SOCK_NONBLOCK 2
diff --git a/subsys/net/lib/sockets/sockets_misc.c b/subsys/net/lib/sockets/sockets_misc.c
index a8f98eff4d..9729fca19f 100644
--- a/subsys/net/lib/sockets/sockets_misc.c
+++ b/subsys/net/lib/sockets/sockets_misc.c
@@ -5,8 +5,8 @@
  */
 
 #include <errno.h>
-#include <net/socket.h>
-#include <syscall_handler.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/syscall_handler.h>
 
 int z_impl_zsock_gethostname(char *buf, size_t len)
 {
diff --git a/subsys/net/lib/sockets/sockets_net_mgmt.c b/subsys/net/lib/sockets/sockets_net_mgmt.c
index 989d380688..ab3adbf57c 100644
--- a/subsys/net/lib/sockets/sockets_net_mgmt.c
+++ b/subsys/net/lib/sockets/sockets_net_mgmt.c
@@ -7,16 +7,16 @@
 #include <stdbool.h>
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock_mgmt, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <kernel.h>
-#include <sys/util.h>
-#include <net/socket.h>
-#include <syscall_handler.h>
-#include <sys/fdtable.h>
-#include <net/socket_net_mgmt.h>
-#include <net/ethernet_mgmt.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/sys/fdtable.h>
+#include <zephyr/net/socket_net_mgmt.h>
+#include <zephyr/net/ethernet_mgmt.h>
 
 #include "sockets_internal.h"
 #include "net_private.h"
diff --git a/subsys/net/lib/sockets/sockets_packet.c b/subsys/net/lib/sockets/sockets_packet.c
index ec33866250..14a47c6a25 100644
--- a/subsys/net/lib/sockets/sockets_packet.c
+++ b/subsys/net/lib/sockets/sockets_packet.c
@@ -8,18 +8,18 @@
 #include <stdbool.h>
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock_packet, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <kernel.h>
-#include <drivers/entropy.h>
-#include <sys/util.h>
-#include <net/net_context.h>
-#include <net/net_pkt.h>
-#include <net/socket.h>
-#include <net/ethernet.h>
-#include <syscall_handler.h>
-#include <sys/fdtable.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/sys/fdtable.h>
 
 #include "../../ip/net_stats.h"
 
diff --git a/subsys/net/lib/sockets/sockets_select.c b/subsys/net/lib/sockets/sockets_select.c
index 17fa211bbd..c6d110bad0 100644
--- a/subsys/net/lib/sockets/sockets_select.c
+++ b/subsys/net/lib/sockets/sockets_select.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <syscall_handler.h>
-#include <sys/math_extras.h>
-#include <net/socket.h>
+#include <zephyr/kernel.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/sys/math_extras.h>
+#include <zephyr/net/socket.h>
 #include "sockets_internal.h"
 
 /* Get size, in elements, of an array within a struct. */
diff --git a/subsys/net/lib/sockets/sockets_tls.c b/subsys/net/lib/sockets/sockets_tls.c
index 323988d51c..240021de5a 100644
--- a/subsys/net/lib/sockets/sockets_tls.c
+++ b/subsys/net/lib/sockets/sockets_tls.c
@@ -8,15 +8,15 @@
 #include <stdbool.h>
 #include <fcntl.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_sock_tls, CONFIG_NET_SOCKETS_LOG_LEVEL);
 
-#include <init.h>
-#include <sys/util.h>
-#include <net/socket.h>
-#include <random/rand32.h>
-#include <syscall_handler.h>
-#include <sys/fdtable.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/syscall_handler.h>
+#include <zephyr/sys/fdtable.h>
 
 /* TODO: Remove all direct access to private fields.
  * According with Mbed TLS migration guide:
diff --git a/subsys/net/lib/socks/socks.c b/subsys/net/lib/socks/socks.c
index 97df431d1a..73463c8ee2 100644
--- a/subsys/net/lib/socks/socks.c
+++ b/subsys/net/lib/socks/socks.c
@@ -6,12 +6,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_socks, CONFIG_SOCKS_LOG_LEVEL);
 
-#include <zephyr.h>
-#include <net/socket.h>
-#include <net/net_pkt.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/net_pkt.h>
 
 #include "socks.h"
 #include "socks_internal.h"
diff --git a/subsys/net/lib/socks/socks.h b/subsys/net/lib/socks/socks.h
index 61041c2ff4..65f9322633 100644
--- a/subsys/net/lib/socks/socks.h
+++ b/subsys/net/lib/socks/socks.h
@@ -9,7 +9,7 @@
 #ifndef ZEPHYR_INCLUDE_NET_SOCKS_H_
 #define ZEPHYR_INCLUDE_NET_SOCKS_H_
 
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 
 /**@brief Connects to destination through a SOCKS5 proxy server.
  *
diff --git a/subsys/net/lib/tftp/tftp_client.c b/subsys/net/lib/tftp/tftp_client.c
index 1c28fcf152..33025f0785 100644
--- a/subsys/net/lib/tftp/tftp_client.c
+++ b/subsys/net/lib/tftp/tftp_client.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(tftp_client, CONFIG_TFTP_LOG_LEVEL);
 
 #include <stddef.h>
-#include <net/tftp.h>
+#include <zephyr/net/tftp.h>
 #include "tftp_client.h"
 
 #define ADDRLEN(sock) \
diff --git a/subsys/net/lib/tftp/tftp_client.h b/subsys/net/lib/tftp/tftp_client.h
index abc9c30b3a..dcda9ce0da 100644
--- a/subsys/net/lib/tftp/tftp_client.h
+++ b/subsys/net/lib/tftp/tftp_client.h
@@ -5,9 +5,9 @@
  */
 
 /* Generic header files required by the TFTPC Module. */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <errno.h>
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 
 /* Defines for creating static arrays for TFTP communication. */
 #define TFTP_HEADER_SIZE         4
diff --git a/subsys/net/lib/tls_credentials/tls_credentials.c b/subsys/net/lib/tls_credentials/tls_credentials.c
index aa47cdc675..89be0a9e0f 100644
--- a/subsys/net/lib/tls_credentials/tls_credentials.c
+++ b/subsys/net/lib/tls_credentials/tls_credentials.c
@@ -5,8 +5,8 @@
  */
 #include <string.h>
 
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 
 #include "tls_internal.h"
 
diff --git a/subsys/net/lib/tls_credentials/tls_internal.h b/subsys/net/lib/tls_credentials/tls_internal.h
index 5ecc1d3025..b825b6890d 100644
--- a/subsys/net/lib/tls_credentials/tls_internal.h
+++ b/subsys/net/lib/tls_credentials/tls_internal.h
@@ -11,7 +11,7 @@
 #ifndef __TLS_INTERNAL_H
 #define __TLS_INTERNAL_H
 
-#include <net/tls_credentials.h>
+#include <zephyr/net/tls_credentials.h>
 
 /* Internal structure representing TLS credential. */
 struct tls_credential {
diff --git a/subsys/net/lib/utils/addr_utils.c b/subsys/net/lib/utils/addr_utils.c
index 68209f281e..f6b7dc38b2 100644
--- a/subsys/net/lib/utils/addr_utils.c
+++ b/subsys/net/lib/utils/addr_utils.c
@@ -6,7 +6,7 @@
 
 #ifdef CONFIG_NET_SOCKETS
 
-#include <net/socketutils.h>
+#include <zephyr/net/socketutils.h>
 
 const char *net_addr_str_find_port(const char *addr_str)
 {
diff --git a/subsys/net/lib/websocket/websocket.c b/subsys/net/lib/websocket/websocket.c
index d241b491bc..fd1ce18a5f 100644
--- a/subsys/net/lib/websocket/websocket.c
+++ b/subsys/net/lib/websocket/websocket.c
@@ -10,25 +10,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(net_websocket, CONFIG_NET_WEBSOCKET_LOG_LEVEL);
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <strings.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include <sys/fdtable.h>
-#include <net/net_core.h>
-#include <net/net_ip.h>
-#include <net/socket.h>
-#include <net/http_client.h>
-#include <net/websocket.h>
+#include <zephyr/sys/fdtable.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/socket.h>
+#include <zephyr/net/http_client.h>
+#include <zephyr/net/websocket.h>
 
-#include <random/rand32.h>
-#include <sys/byteorder.h>
-#include <sys/base64.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/base64.h>
 #include <mbedtls/sha1.h>
 
 #include "net_private.h"
diff --git a/subsys/net/lib/websocket/websocket_internal.h b/subsys/net/lib/websocket/websocket_internal.h
index 2cb36b6693..adcc32bc92 100644
--- a/subsys/net/lib/websocket/websocket_internal.h
+++ b/subsys/net/lib/websocket/websocket_internal.h
@@ -10,7 +10,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <toolchain/common.h>
+#include <zephyr/toolchain/common.h>
 
 #define WS_SHA1_OUTPUT_LEN 20
 
diff --git a/subsys/net/pkt_filter/base.c b/subsys/net/pkt_filter/base.c
index c15effba85..e33091e7af 100644
--- a/subsys/net/pkt_filter/base.c
+++ b/subsys/net/pkt_filter/base.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(npf_base, CONFIG_NET_PKT_FILTER_LOG_LEVEL);
 
-#include <net/net_core.h>
-#include <net/net_pkt_filter.h>
-#include <spinlock.h>
+#include <zephyr/net/net_core.h>
+#include <zephyr/net/net_pkt_filter.h>
+#include <zephyr/spinlock.h>
 
 /*
  * Our actual rule lists for supported test points
diff --git a/subsys/net/pkt_filter/ethernet.c b/subsys/net/pkt_filter/ethernet.c
index 1b9cd8bd0f..9dddd89988 100644
--- a/subsys/net/pkt_filter/ethernet.c
+++ b/subsys/net/pkt_filter/ethernet.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(npf_ethernet, CONFIG_NET_PKT_FILTER_LOG_LEVEL);
 
-#include <net/ethernet.h>
-#include <net/net_pkt_filter.h>
+#include <zephyr/net/ethernet.h>
+#include <zephyr/net/net_pkt_filter.h>
 
 static bool addr_mask_compare(struct net_eth_addr *addr1,
 			      struct net_eth_addr *addr2,
diff --git a/subsys/pm/device.c b/subsys/pm/device.c
index f2d4fd744e..443c7f8637 100644
--- a/subsys/pm/device.c
+++ b/subsys/pm/device.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pm_device, CONFIG_PM_DEVICE_LOG_LEVEL);
 
 const char *pm_device_state_str(enum pm_device_state state)
diff --git a/subsys/pm/device_runtime.c b/subsys/pm/device_runtime.c
index f52533f729..6e451c8a50 100644
--- a/subsys/pm/device_runtime.c
+++ b/subsys/pm/device_runtime.c
@@ -5,11 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <pm/device.h>
-#include <pm/device_runtime.h>
-#include <sys/__assert.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+#include <zephyr/sys/__assert.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(pm_device, CONFIG_PM_DEVICE_LOG_LEVEL);
 
 #ifdef CONFIG_PM_DEVICE_POWER_DOMAIN
diff --git a/subsys/pm/pm.c b/subsys/pm/pm.c
index 8b8ebce08a..91e28b6c0b 100644
--- a/subsys/pm/pm.c
+++ b/subsys/pm/pm.c
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <device.h>
-#include <zephyr.h>
-#include <kernel.h>
-#include <timeout_q.h>
-#include <init.h>
+#include <zephyr/device.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
+#include <zephyr/timeout_q.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <pm/device.h>
-#include <pm/device_runtime.h>
-#include <pm/pm.h>
-#include <pm/state.h>
-#include <pm/policy.h>
-#include <tracing/tracing.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/pm/device_runtime.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/pm/state.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/tracing/tracing.h>
 
 #include "pm_stats.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(pm, CONFIG_PM_LOG_LEVEL);
 
 static ATOMIC_DEFINE(z_post_ops_required, CONFIG_MP_NUM_CPUS);
diff --git a/subsys/pm/pm_stats.c b/subsys/pm/pm_stats.c
index f364d5e836..9118e3d5bf 100644
--- a/subsys/pm/pm_stats.c
+++ b/subsys/pm/pm_stats.c
@@ -7,10 +7,10 @@
 
 #include "pm_stats.h"
 
-#include <init.h>
-#include <kernel_structs.h>
-#include <stats/stats.h>
-#include <sys/printk.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/stats/stats.h>
+#include <zephyr/sys/printk.h>
 
 STATS_SECT_START(pm_stats)
 STATS_SECT_ENTRY32(state_count)
diff --git a/subsys/pm/pm_stats.h b/subsys/pm/pm_stats.h
index 6ad888b32b..d495bb05e0 100644
--- a/subsys/pm/pm_stats.h
+++ b/subsys/pm/pm_stats.h
@@ -8,7 +8,7 @@
 #ifndef ZEPHYR_SUBSYS_PM_PM_STATS_H_
 #define ZEPHYR_SUBSYS_PM_PM_STATS_H_
 
-#include <pm/state.h>
+#include <zephyr/pm/state.h>
 
 #ifdef CONFIG_PM_STATS
 void pm_stats_start(void);
diff --git a/subsys/pm/policy.c b/subsys/pm/policy.c
index 045ae52840..b00ac011df 100644
--- a/subsys/pm/policy.c
+++ b/subsys/pm/policy.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <pm/pm.h>
-#include <pm/policy.h>
-#include <spinlock.h>
-#include <sys_clock.h>
-#include <sys/__assert.h>
-#include <sys/time_units.h>
-#include <sys/atomic.h>
-#include <toolchain.h>
+#include <zephyr/kernel.h>
+#include <zephyr/pm/pm.h>
+#include <zephyr/pm/policy.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys_clock.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/time_units.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/toolchain.h>
 
 #define DT_SUB_LOCK_INIT(node_id)				\
 	{ .state = PM_STATE_DT_INIT(node_id),			\
diff --git a/subsys/pm/state.c b/subsys/pm/state.c
index a1a48e1b62..a059a139cd 100644
--- a/subsys/pm/state.c
+++ b/subsys/pm/state.c
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <pm/state.h>
-#include <toolchain.h>
+#include <zephyr/pm/state.h>
+#include <zephyr/toolchain.h>
 
 BUILD_ASSERT(DT_NODE_EXISTS(DT_PATH(cpus)),
 	     "cpus node not defined in Devicetree");
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_kernel.c b/subsys/portability/cmsis_rtos_v1/cmsis_kernel.c
index a61136ac29..61f231ff65 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_kernel.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_kernel.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
 #include <cmsis_os.h>
 #include <kernel_internal.h>
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_mailq.c b/subsys/portability/cmsis_rtos_v1/cmsis_mailq.c
index 6b328e6a43..c998174962 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_mailq.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_mailq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 #include <string.h>
 
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_mempool.c b/subsys/portability/cmsis_rtos_v1/cmsis_mempool.c
index 02e461c437..7967317a47 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_mempool.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_mempool.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 #include <string.h>
 
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_msgq.c b/subsys/portability/cmsis_rtos_v1/cmsis_msgq.c
index 161a41e04a..89df077e1d 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_msgq.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_msgq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 /**
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_mutex.c b/subsys/portability/cmsis_rtos_v1/cmsis_mutex.c
index 6de3c65870..0f574ac4c3 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_mutex.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_mutex.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 #include <string.h>
 
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_semaphore.c b/subsys/portability/cmsis_rtos_v1/cmsis_semaphore.c
index 34ae06b8a8..88dfb04831 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_semaphore.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_semaphore.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 #include <string.h>
 
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_signal.c b/subsys/portability/cmsis_rtos_v1/cmsis_signal.c
index 6532671ff1..c109488d46 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_signal.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_signal.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 #define NSEC_PER_MSEC		(NSEC_PER_USEC * USEC_PER_MSEC)
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_thread.c b/subsys/portability/cmsis_rtos_v1/cmsis_thread.c
index cea5004626..72570f840b 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_thread.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_thread.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <sys/atomic.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/atomic.h>
 #include <cmsis_os.h>
 
 #define TOTAL_CMSIS_THREAD_PRIORITIES (osPriorityRealtime - osPriorityIdle + 1)
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_timer.c b/subsys/portability/cmsis_rtos_v1/cmsis_timer.c
index f8b7e45ca2..09722ffb8f 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_timer.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_timer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 #include <string.h>
 
diff --git a/subsys/portability/cmsis_rtos_v1/cmsis_wait.c b/subsys/portability/cmsis_rtos_v1/cmsis_wait.c
index 4d1f197e46..023907902e 100644
--- a/subsys/portability/cmsis_rtos_v1/cmsis_wait.c
+++ b/subsys/portability/cmsis_rtos_v1/cmsis_wait.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os.h>
 
 /**
diff --git a/subsys/portability/cmsis_rtos_v2/event_flags.c b/subsys/portability/cmsis_rtos_v2/event_flags.c
index f9cb30b5cf..c02aefc0a5 100644
--- a/subsys/portability/cmsis_rtos_v2/event_flags.c
+++ b/subsys/portability/cmsis_rtos_v2/event_flags.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include "wrapper.h"
 
diff --git a/subsys/portability/cmsis_rtos_v2/kernel.c b/subsys/portability/cmsis_rtos_v2/kernel.c
index 2dbd034641..519be96023 100644
--- a/subsys/portability/cmsis_rtos_v2/kernel.c
+++ b/subsys/portability/cmsis_rtos_v2/kernel.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
 extern uint32_t sys_clock_tick_get_32(void);
diff --git a/subsys/portability/cmsis_rtos_v2/mempool.c b/subsys/portability/cmsis_rtos_v2/mempool.c
index d20cb73c4d..7865c890b1 100644
--- a/subsys/portability/cmsis_rtos_v2/mempool.c
+++ b/subsys/portability/cmsis_rtos_v2/mempool.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include "wrapper.h"
 
diff --git a/subsys/portability/cmsis_rtos_v2/msgq.c b/subsys/portability/cmsis_rtos_v2/msgq.c
index 377a3d9387..1c508ff8c6 100644
--- a/subsys/portability/cmsis_rtos_v2/msgq.c
+++ b/subsys/portability/cmsis_rtos_v2/msgq.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include "wrapper.h"
 
diff --git a/subsys/portability/cmsis_rtos_v2/mutex.c b/subsys/portability/cmsis_rtos_v2/mutex.c
index 78f31f54ab..d7cc3d4f45 100644
--- a/subsys/portability/cmsis_rtos_v2/mutex.c
+++ b/subsys/portability/cmsis_rtos_v2/mutex.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include "wrapper.h"
 
diff --git a/subsys/portability/cmsis_rtos_v2/semaphore.c b/subsys/portability/cmsis_rtos_v2/semaphore.c
index fc04c20bda..a4271f0527 100644
--- a/subsys/portability/cmsis_rtos_v2/semaphore.c
+++ b/subsys/portability/cmsis_rtos_v2/semaphore.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include "wrapper.h"
 
diff --git a/subsys/portability/cmsis_rtos_v2/thread.c b/subsys/portability/cmsis_rtos_v2/thread.c
index 438ca393fa..22bd693612 100644
--- a/subsys/portability/cmsis_rtos_v2/thread.c
+++ b/subsys/portability/cmsis_rtos_v2/thread.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <ksched.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/atomic.h>
-#include <debug/stack.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/debug/stack.h>
 #include "wrapper.h"
 
 static const osThreadAttr_t init_thread_attrs = {
diff --git a/subsys/portability/cmsis_rtos_v2/thread_flags.c b/subsys/portability/cmsis_rtos_v2/thread_flags.c
index cf7cb02fff..fd6d935cbf 100644
--- a/subsys/portability/cmsis_rtos_v2/thread_flags.c
+++ b/subsys/portability/cmsis_rtos_v2/thread_flags.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include "wrapper.h"
 
 #define DONT_CARE               (0)
diff --git a/subsys/portability/cmsis_rtos_v2/timer.c b/subsys/portability/cmsis_rtos_v2/timer.c
index b74943f5c9..472a4196fb 100644
--- a/subsys/portability/cmsis_rtos_v2/timer.c
+++ b/subsys/portability/cmsis_rtos_v2/timer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include "wrapper.h"
 
diff --git a/subsys/portability/cmsis_rtos_v2/wrapper.h b/subsys/portability/cmsis_rtos_v2/wrapper.h
index 47355702a8..32e72fdc23 100644
--- a/subsys/portability/cmsis_rtos_v2/wrapper.h
+++ b/subsys/portability/cmsis_rtos_v2/wrapper.h
@@ -7,7 +7,7 @@
 #ifndef __WRAPPER_H__
 #define __WRAPPER_H__
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmsis_os2.h>
 
 #define TRUE    1
diff --git a/subsys/random/rand32_ctr_drbg.c b/subsys/random/rand32_ctr_drbg.c
index d78f3c841c..7d4b858a06 100644
--- a/subsys/random/rand32_ctr_drbg.c
+++ b/subsys/random/rand32_ctr_drbg.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <device.h>
-#include <drivers/entropy.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 
 #if defined(CONFIG_MBEDTLS)
diff --git a/subsys/random/rand32_entropy_device.c b/subsys/random/rand32_entropy_device.c
index 505b130e3d..397a821693 100644
--- a/subsys/random/rand32_entropy_device.c
+++ b/subsys/random/rand32_entropy_device.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/atomic.h>
-#include <kernel.h>
-#include <drivers/entropy.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/entropy.h>
 #include <string.h>
 
 static const struct device *entropy_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_entropy));
diff --git a/subsys/random/rand32_handlers.c b/subsys/random/rand32_handlers.c
index 96c99ca478..d1e8cd8c15 100644
--- a/subsys/random/rand32_handlers.c
+++ b/subsys/random/rand32_handlers.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <random/rand32.h>
-#include <syscall_handler.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/syscall_handler.h>
 
 
 static inline uint32_t z_vrfy_sys_rand32_get(void)
diff --git a/subsys/random/rand32_timer.c b/subsys/random/rand32_timer.c
index 47b9cb8def..d680b39d61 100644
--- a/subsys/random/rand32_timer.c
+++ b/subsys/random/rand32_timer.c
@@ -14,10 +14,10 @@
  * provide a random number generator.
  */
 
-#include <random/rand32.h>
-#include <drivers/timer/system_timer.h>
-#include <kernel.h>
-#include <sys/atomic.h>
+#include <zephyr/random/rand32.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/atomic.h>
 #include <string.h>
 
 #if defined(__GNUC__)
diff --git a/subsys/random/rand32_xoshiro128.c b/subsys/random/rand32_xoshiro128.c
index edf5bf3221..23c82b1b3e 100644
--- a/subsys/random/rand32_xoshiro128.c
+++ b/subsys/random/rand32_xoshiro128.c
@@ -26,10 +26,10 @@
  * The state must be seeded so that it is not everywhere zero.
  */
 
-#include <init.h>
-#include <device.h>
-#include <drivers/entropy.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 
 static const struct device *entropy_driver;
diff --git a/subsys/settings/include/settings/settings_fcb.h b/subsys/settings/include/settings/settings_fcb.h
index dbb5a54fb1..42b3e9f914 100644
--- a/subsys/settings/include/settings/settings_fcb.h
+++ b/subsys/settings/include/settings/settings_fcb.h
@@ -8,7 +8,7 @@
 #ifndef __SETTINGS_FCB_H_
 #define __SETTINGS_FCB_H_
 
-#include <fs/fcb.h>
+#include <zephyr/fs/fcb.h>
 #include "settings/settings.h"
 
 #ifdef __cplusplus
diff --git a/subsys/settings/include/settings/settings_nvs.h b/subsys/settings/include/settings/settings_nvs.h
index 9545a28684..0ebd758623 100644
--- a/subsys/settings/include/settings/settings_nvs.h
+++ b/subsys/settings/include/settings/settings_nvs.h
@@ -8,7 +8,7 @@
 #ifndef __SETTINGS_NVS_H_
 #define __SETTINGS_NVS_H_
 
-#include <fs/nvs.h>
+#include <zephyr/fs/nvs.h>
 #include "settings/settings.h"
 
 #ifdef __cplusplus
diff --git a/subsys/settings/src/settings.c b/subsys/settings/src/settings.c
index 73f447ee86..cdb0c797ec 100644
--- a/subsys/settings/src/settings.c
+++ b/subsys/settings/src/settings.c
@@ -9,13 +9,13 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include "settings/settings.h"
 #include "settings_priv.h"
 #include <zephyr/types.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(settings, CONFIG_SETTINGS_LOG_LEVEL);
 
 #if defined(CONFIG_SETTINGS_DYNAMIC_HANDLERS)
diff --git a/subsys/settings/src/settings_fcb.c b/subsys/settings/src/settings_fcb.c
index 150b9e9416..d80328c94f 100644
--- a/subsys/settings/src/settings_fcb.c
+++ b/subsys/settings/src/settings_fcb.c
@@ -7,14 +7,14 @@
 
 #include <errno.h>
 #include <stdbool.h>
-#include <fs/fcb.h>
+#include <zephyr/fs/fcb.h>
 #include <string.h>
 
 #include "settings/settings.h"
 #include "settings/settings_fcb.h"
 #include "settings_priv.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
 
 #if DT_HAS_CHOSEN(zephyr_settings_partition)
diff --git a/subsys/settings/src/settings_file.c b/subsys/settings/src/settings_file.c
index 8478608c9a..2377e59388 100644
--- a/subsys/settings/src/settings_file.c
+++ b/subsys/settings/src/settings_file.c
@@ -7,15 +7,15 @@
 
 #include <string.h>
 #include <stdbool.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <fs/fs.h>
+#include <zephyr/fs/fs.h>
 
 #include "settings/settings.h"
 #include "settings/settings_file.h"
 #include "settings_priv.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
 
diff --git a/subsys/settings/src/settings_init.c b/subsys/settings/src/settings_init.c
index e683a3968e..d1e3a9baca 100644
--- a/subsys/settings/src/settings_init.c
+++ b/subsys/settings/src/settings_init.c
@@ -13,7 +13,7 @@
 
 #include "settings/settings.h"
 #include "settings/settings_file.h"
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 
 bool settings_subsys_initialized;
diff --git a/subsys/settings/src/settings_line.c b/subsys/settings/src/settings_line.c
index ab12645832..0fa3b9a386 100644
--- a/subsys/settings/src/settings_line.c
+++ b/subsys/settings/src/settings_line.c
@@ -11,7 +11,7 @@
 #include "settings/settings.h"
 #include "settings_priv.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
 
 struct settings_io_cb_s {
diff --git a/subsys/settings/src/settings_nvs.c b/subsys/settings/src/settings_nvs.c
index 24e7a9e79e..3fca6a91d4 100644
--- a/subsys/settings/src/settings_nvs.c
+++ b/subsys/settings/src/settings_nvs.c
@@ -11,9 +11,9 @@
 #include "settings/settings.h"
 #include "settings/settings_nvs.h"
 #include "settings_priv.h"
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
 
 #if DT_HAS_CHOSEN(zephyr_settings_partition)
diff --git a/subsys/settings/src/settings_priv.h b/subsys/settings/src/settings_priv.h
index 8e7cf830d9..6cb55ccefa 100644
--- a/subsys/settings/src/settings_priv.h
+++ b/subsys/settings/src/settings_priv.h
@@ -9,9 +9,9 @@
 #define __SETTINGS_PRIV_H_
 
 #include <sys/types.h>
-#include <sys/slist.h>
+#include <zephyr/sys/slist.h>
 #include <errno.h>
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/settings/src/settings_runtime.c b/subsys/settings/src/settings_runtime.c
index 36eb36b83c..5691cc59b5 100644
--- a/subsys/settings/src/settings_runtime.c
+++ b/subsys/settings/src/settings_runtime.c
@@ -5,9 +5,9 @@
 
 #include <errno.h>
 #include <string.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 #include "settings_priv.h"
 
 struct read_cb_arg {
diff --git a/subsys/settings/src/settings_shell.c b/subsys/settings/src/settings_shell.c
index 9af4d6597e..409f514189 100644
--- a/subsys/settings/src/settings_shell.c
+++ b/subsys/settings/src/settings_shell.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <settings/settings.h>
-#include <shell/shell.h>
-#include <sys/util.h>
-#include <toolchain.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/toolchain.h>
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/subsys/settings/src/settings_store.c b/subsys/settings/src/settings_store.c
index 56ee7b42c8..ff5b8ff5b5 100644
--- a/subsys/settings/src/settings_store.c
+++ b/subsys/settings/src/settings_store.c
@@ -12,12 +12,12 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <errno.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #include "settings/settings.h"
 #include "settings_priv.h"
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL);
 
 sys_slist_t settings_load_srcs;
diff --git a/subsys/shell/backends/shell_dummy.c b/subsys/shell/backends/shell_dummy.c
index 0142a15962..dfc30a6b81 100644
--- a/subsys/shell/backends/shell_dummy.c
+++ b/subsys/shell/backends/shell_dummy.c
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell_dummy.h>
-#include <init.h>
+#include <zephyr/shell/shell_dummy.h>
+#include <zephyr/init.h>
 
 SHELL_DUMMY_DEFINE(shell_transport_dummy);
 SHELL_DEFINE(shell_dummy, CONFIG_SHELL_PROMPT_DUMMY, &shell_transport_dummy, 1,
diff --git a/subsys/shell/backends/shell_mqtt.c b/subsys/shell/backends/shell_mqtt.c
index 3fa5a0d682..1179f090de 100644
--- a/subsys/shell/backends/shell_mqtt.c
+++ b/subsys/shell/backends/shell_mqtt.c
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <shell/shell_mqtt.h>
-#include <init.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/shell/shell_mqtt.h>
+#include <zephyr/init.h>
+#include <zephyr/logging/log.h>
 #include <string.h>
 #include <stdio.h>
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 
 SHELL_MQTT_DEFINE(shell_transport_mqtt);
 SHELL_DEFINE(shell_mqtt, "", &shell_transport_mqtt,
diff --git a/subsys/shell/backends/shell_rtt.c b/subsys/shell/backends/shell_rtt.c
index 7283d4a60b..ad7cf80fd3 100644
--- a/subsys/shell/backends/shell_rtt.c
+++ b/subsys/shell/backends/shell_rtt.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell_rtt.h>
-#include <init.h>
+#include <zephyr/shell/shell_rtt.h>
+#include <zephyr/init.h>
 #include <SEGGER_RTT.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 BUILD_ASSERT(!(IS_ENABLED(CONFIG_LOG_BACKEND_RTT) &&
 	       COND_CODE_0(CONFIG_LOG_BACKEND_RTT_BUFFER, (1), (0))),
diff --git a/subsys/shell/backends/shell_telnet.c b/subsys/shell/backends/shell_telnet.c
index 13266565ab..1d161f9fe9 100644
--- a/subsys/shell/backends/shell_telnet.c
+++ b/subsys/shell/backends/shell_telnet.c
@@ -5,13 +5,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 
-#include <logging/log.h>
-#include <net/net_context.h>
-#include <net/net_ip.h>
-#include <net/net_pkt.h>
-#include <shell/shell_telnet.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_ip.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/shell/shell_telnet.h>
 
 #include "shell_telnet_protocol.h"
 
diff --git a/subsys/shell/backends/shell_uart.c b/subsys/shell/backends/shell_uart.c
index 18f26db763..b30e163dc3 100644
--- a/subsys/shell/backends/shell_uart.c
+++ b/subsys/shell/backends/shell_uart.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell_uart.h>
-#include <drivers/uart.h>
-#include <init.h>
-#include <logging/log.h>
-#include <net/buf.h>
+#include <zephyr/shell/shell_uart.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/init.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/net/buf.h>
 
 #define LOG_MODULE_NAME shell_uart
 LOG_MODULE_REGISTER(shell_uart);
diff --git a/subsys/shell/modules/date_service.c b/subsys/shell/modules/date_service.c
index 05ba84d61a..94c93f48bd 100644
--- a/subsys/shell/modules/date_service.c
+++ b/subsys/shell/modules/date_service.c
@@ -5,11 +5,11 @@
  */
 
 #include <stdlib.h>
-#include <shell/shell.h>
-#include <init.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <posix/time.h>
-#include <sys/timeutil.h>
+#include <zephyr/posix/time.h>
+#include <zephyr/sys/timeutil.h>
 
 #define HELP_NONE      "[none]"
 #define HELP_DATE_SET  "[Y-m-d] <H:M:S>"
diff --git a/subsys/shell/modules/device_service.c b/subsys/shell/modules/device_service.c
index c4c5c7567d..feaf79e7e3 100644
--- a/subsys/shell/modules/device_service.c
+++ b/subsys/shell/modules/device_service.c
@@ -5,13 +5,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
-#include <init.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/init.h>
 #include <string.h>
 #include <stdio.h>
-#include <device.h>
-#include <pm/device.h>
-#include <sys/arch_interface.h>
+#include <zephyr/device.h>
+#include <zephyr/pm/device.h>
+#include <zephyr/sys/arch_interface.h>
 
 extern const struct device __device_PRE_KERNEL_1_start[];
 extern const struct device __device_PRE_KERNEL_2_start[];
diff --git a/subsys/shell/modules/devmem_service.c b/subsys/shell/modules/devmem_service.c
index 56f3a694f4..40f4bb003a 100644
--- a/subsys/shell/modules/devmem_service.c
+++ b/subsys/shell/modules/devmem_service.c
@@ -6,9 +6,9 @@
  */
 
 #include <stdlib.h>
-#include <device.h>
-#include <shell/shell.h>
-#include <sys/byteorder.h>
+#include <zephyr/device.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/byteorder.h>
 
 static inline bool is_ascii(uint8_t data)
 {
diff --git a/subsys/shell/modules/kernel_service.c b/subsys/shell/modules/kernel_service.c
index f14c600242..e34cbe4d72 100644
--- a/subsys/shell/modules/kernel_service.c
+++ b/subsys/shell/modules/kernel_service.c
@@ -5,15 +5,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/printk.h>
-#include <shell/shell.h>
-#include <init.h>
-#include <sys/reboot.h>
-#include <debug/stack.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/debug/stack.h>
 #include <string.h>
-#include <device.h>
-#include <drivers/timer/system_timer.h>
-#include <kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/timer/system_timer.h>
+#include <zephyr/kernel.h>
 #include <kernel_internal.h>
 
 static int cmd_kernel_version(const struct shell *shell,
diff --git a/subsys/shell/shell.c b/subsys/shell/shell.c
index c113c83b42..d12f0c98f5 100644
--- a/subsys/shell/shell.c
+++ b/subsys/shell/shell.c
@@ -6,10 +6,10 @@
 
 #include <ctype.h>
 #include <stdlib.h>
-#include <sys/atomic.h>
-#include <shell/shell.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/shell/shell.h>
 #if defined(CONFIG_SHELL_BACKEND_DUMMY)
-#include <shell/shell_dummy.h>
+#include <zephyr/shell/shell_dummy.h>
 #endif
 #include "shell_ops.h"
 #include "shell_help.h"
diff --git a/subsys/shell/shell_cmds.c b/subsys/shell/shell_cmds.c
index 4d3ab55e24..33dd4fe87e 100644
--- a/subsys/shell/shell_cmds.c
+++ b/subsys/shell/shell_cmds.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include "shell_utils.h"
 #include "shell_help.h"
 #include "shell_ops.h"
diff --git a/subsys/shell/shell_fprintf.c b/subsys/shell/shell_fprintf.c
index 4fdd088739..1de8fe67ad 100644
--- a/subsys/shell/shell_fprintf.c
+++ b/subsys/shell/shell_fprintf.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell_fprintf.h>
-#include <shell/shell.h>
-#include <sys/cbprintf.h>
+#include <zephyr/shell/shell_fprintf.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/cbprintf.h>
 
 static int out_func(int c, void *ctx)
 {
diff --git a/subsys/shell/shell_help.h b/subsys/shell/shell_help.h
index 8f11d605de..00c85b8d57 100644
--- a/subsys/shell/shell_help.h
+++ b/subsys/shell/shell_help.h
@@ -7,7 +7,7 @@
 #ifndef SHELL_HELP_H__
 #define SHELL_HELP_H__
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/shell/shell_history.c b/subsys/shell/shell_history.c
index 0a98fa50c7..9e747e9c50 100644
--- a/subsys/shell/shell_history.c
+++ b/subsys/shell/shell_history.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell_history.h>
+#include <zephyr/shell/shell_history.h>
 #include <string.h>
 
 /*
diff --git a/subsys/shell/shell_log_backend.c b/subsys/shell/shell_log_backend.c
index b2e4ceee27..37d39c0115 100644
--- a/subsys/shell/shell_log_backend.c
+++ b/subsys/shell/shell_log_backend.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell_log_backend.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell_log_backend.h>
+#include <zephyr/shell/shell.h>
 #include "shell_ops.h"
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log_ctrl.h>
 
 static bool process_msg2_from_buffer(const struct shell *shell);
 
diff --git a/subsys/shell/shell_ops.h b/subsys/shell/shell_ops.h
index ca5d5b341c..cad4ffdc6a 100644
--- a/subsys/shell/shell_ops.h
+++ b/subsys/shell/shell_ops.h
@@ -7,7 +7,7 @@
 #define SHELL_OPS_H__
 
 #include <stdbool.h>
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #include "shell_vt100.h"
 #include "shell_utils.h"
 
diff --git a/subsys/shell/shell_utils.c b/subsys/shell/shell_utils.c
index fd0b6b8b7d..2ac9eb9448 100644
--- a/subsys/shell/shell_utils.c
+++ b/subsys/shell/shell_utils.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ctype.h>
-#include <device.h>
+#include <zephyr/device.h>
 #include <stdlib.h>
 #include "shell_utils.h"
 #include "shell_wildcard.h"
diff --git a/subsys/shell/shell_utils.h b/subsys/shell/shell_utils.h
index 866ff87086..a51aa87e19 100644
--- a/subsys/shell/shell_utils.h
+++ b/subsys/shell/shell_utils.h
@@ -6,8 +6,8 @@
 #ifndef SHELL_UTILS_H__
 #define SHELL_UTILS_H__
 
-#include <zephyr.h>
-#include <shell/shell.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/shell/shell.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/shell/shell_wildcard.h b/subsys/shell/shell_wildcard.h
index bc9c18a212..5be7f9dd7f 100644
--- a/subsys/shell/shell_wildcard.h
+++ b/subsys/shell/shell_wildcard.h
@@ -7,7 +7,7 @@
 #ifndef SHELL_SHELL_WILDCARDS_H__
 #define SHELL_SHELL_WILDCARDS_H__
 
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 
 enum shell_wildcard_status {
 	SHELL_WILDCARD_CMD_ADDED,
diff --git a/subsys/stats/stats.c b/subsys/stats/stats.c
index 5d23e9b316..a20c33a1be 100644
--- a/subsys/stats/stats.c
+++ b/subsys/stats/stats.c
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <zephyr/types.h>
-#include <stats/stats.h>
+#include <zephyr/stats/stats.h>
 
 #define STATS_GEN_NAME_MAX_LEN  (sizeof("s255"))
 
diff --git a/subsys/stats/stats_shell.c b/subsys/stats/stats_shell.c
index 72f7d3bd7c..0b9297380c 100644
--- a/subsys/stats/stats_shell.c
+++ b/subsys/stats/stats_shell.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
-#include <stats/stats.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/stats/stats.h>
 
 static int stats_cb(struct stats_hdr *hdr, void *arg, const char *name, uint16_t off)
 {
diff --git a/subsys/storage/flash_map/flash_map.c b/subsys/storage/flash_map/flash_map.c
index ac761088f7..d36f8d5db3 100644
--- a/subsys/storage/flash_map/flash_map.c
+++ b/subsys/storage/flash_map/flash_map.c
@@ -10,12 +10,12 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include <device.h>
-#include <storage/flash_map.h>
+#include <zephyr/device.h>
+#include <zephyr/storage/flash_map.h>
 #include "flash_map_priv.h"
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 void flash_area_foreach(flash_area_cb_t user_cb, void *user_data)
 {
diff --git a/subsys/storage/flash_map/flash_map_default.c b/subsys/storage/flash_map/flash_map_default.c
index 5df5486065..65b0a1f35c 100644
--- a/subsys/storage/flash_map/flash_map_default.c
+++ b/subsys/storage/flash_map/flash_map_default.c
@@ -7,8 +7,8 @@
 
 #define DT_DRV_COMPAT fixed_partitions
 
-#include <zephyr.h>
-#include <storage/flash_map.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/storage/flash_map.h>
 
 #define FLASH_AREA_FOO(part)						\
 	{.fa_id = DT_FIXED_PARTITION_ID(part),				\
diff --git a/subsys/storage/flash_map/flash_map_integrity.c b/subsys/storage/flash_map/flash_map_integrity.c
index 191633afa8..7630a21d88 100644
--- a/subsys/storage/flash_map/flash_map_integrity.c
+++ b/subsys/storage/flash_map/flash_map_integrity.c
@@ -10,12 +10,12 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include <device.h>
-#include <storage/flash_map.h>
+#include <zephyr/device.h>
+#include <zephyr/storage/flash_map.h>
 #include "flash_map_priv.h"
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 #if defined(CONFIG_FLASH_AREA_CHECK_INTEGRITY)
 #define SHA256_DIGEST_SIZE 32
diff --git a/subsys/storage/flash_map/flash_map_layout.c b/subsys/storage/flash_map/flash_map_layout.c
index a622427a2e..d3dbdbf8a1 100644
--- a/subsys/storage/flash_map/flash_map_layout.c
+++ b/subsys/storage/flash_map/flash_map_layout.c
@@ -10,11 +10,11 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include <device.h>
-#include <storage/flash_map.h>
-#include <drivers/flash.h>
+#include <zephyr/device.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/drivers/flash.h>
 #include <soc.h>
-#include <init.h>
+#include <zephyr/init.h>
 
 struct layout_data {
 	uint32_t area_idx;
diff --git a/subsys/storage/flash_map/flash_map_priv.h b/subsys/storage/flash_map/flash_map_priv.h
index 48de310f0a..ab8e378bcd 100644
--- a/subsys/storage/flash_map/flash_map_priv.h
+++ b/subsys/storage/flash_map/flash_map_priv.h
@@ -13,7 +13,7 @@
 #include <zephyr/types.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include <device.h>
+#include <zephyr/device.h>
 
 extern const struct flash_area *flash_map;
 extern const int flash_map_entries;
diff --git a/subsys/storage/flash_map/flash_map_shell.c b/subsys/storage/flash_map/flash_map_shell.c
index 5ab428ae45..cf4fe05ec7 100644
--- a/subsys/storage/flash_map/flash_map_shell.c
+++ b/subsys/storage/flash_map/flash_map_shell.c
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <shell/shell.h>
-#include <init.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/init.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <storage/flash_map.h>
-#include <logging/log.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/logging/log.h>
 
 #define LOG_LEVEL CONFIG_LOG_DEFAULT_LEVEL
 
diff --git a/subsys/storage/stream/stream_flash.c b/subsys/storage/stream/stream_flash.c
index bee7a5beed..886bb31d59 100644
--- a/subsys/storage/stream/stream_flash.c
+++ b/subsys/storage/stream/stream_flash.c
@@ -7,17 +7,17 @@
 
 #define LOG_MODULE_NAME STREAM_FLASH
 #define LOG_LEVEL CONFIG_STREAM_FLASH_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_STREAM_FLASH_LOG_LEVEL);
 
 #include <zephyr/types.h>
 #include <string.h>
-#include <drivers/flash.h>
+#include <zephyr/drivers/flash.h>
 
-#include <storage/stream_flash.h>
+#include <zephyr/storage/stream_flash.h>
 
 #ifdef CONFIG_STREAM_FLASH_PROGRESS
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
 static int settings_direct_loader(const char *key, size_t len,
 				  settings_read_cb read_cb, void *cb_arg,
diff --git a/subsys/task_wdt/task_wdt.c b/subsys/task_wdt/task_wdt.c
index 6693a6287b..712cd1b260 100644
--- a/subsys/task_wdt/task_wdt.c
+++ b/subsys/task_wdt/task_wdt.c
@@ -6,13 +6,13 @@
 
 #include "task_wdt/task_wdt.h"
 
-#include <drivers/watchdog.h>
-#include <sys/reboot.h>
-#include <device.h>
+#include <zephyr/drivers/watchdog.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/device.h>
 #include <errno.h>
 
 #define LOG_LEVEL CONFIG_WDT_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(task_wdt);
 
 /*
diff --git a/subsys/testsuite/busy_sim/busy_sim.c b/subsys/testsuite/busy_sim/busy_sim.c
index 2ad75850bf..c596fac37f 100644
--- a/subsys/testsuite/busy_sim/busy_sim.c
+++ b/subsys/testsuite/busy_sim/busy_sim.c
@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <drivers/entropy.h>
-#include <drivers/counter.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/entropy.h>
+#include <zephyr/drivers/counter.h>
+#include <zephyr/drivers/gpio.h>
 #include "busy_sim.h"
-#include <sys/ring_buffer.h>
-#include <random/rand32.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/random/rand32.h>
 
 #define BUFFER_SIZE 32
 
diff --git a/subsys/testsuite/coverage/coverage.c b/subsys/testsuite/coverage/coverage.c
index ae26c90040..95f31ce12b 100644
--- a/subsys/testsuite/coverage/coverage.c
+++ b/subsys/testsuite/coverage/coverage.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <errno.h>
diff --git a/subsys/testsuite/include/interrupt_util.h b/subsys/testsuite/include/interrupt_util.h
index 76944c087e..c7b3d5fccc 100644
--- a/subsys/testsuite/include/interrupt_util.h
+++ b/subsys/testsuite/include/interrupt_util.h
@@ -10,7 +10,7 @@
 #define MS_TO_US(ms)  (ms * USEC_PER_MSEC)
 
 #if defined(CONFIG_CPU_CORTEX_M)
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 
 static inline uint32_t get_available_nvic_line(uint32_t initial_offset)
 {
@@ -71,8 +71,8 @@ static inline void trigger_irq(int irq)
 }
 
 #elif defined(CONFIG_GIC)
-#include <drivers/interrupt_controller/gic.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <zephyr/drivers/interrupt_controller/gic.h>
+#include <zephyr/dt-bindings/interrupt-controller/arm-gic.h>
 
 static inline void trigger_irq(int irq)
 {
@@ -103,10 +103,10 @@ static inline void trigger_irq(int irq)
 #elif defined(CONFIG_X86)
 
 #ifdef CONFIG_X2APIC
-#include <drivers/interrupt_controller/loapic.h>
+#include <zephyr/drivers/interrupt_controller/loapic.h>
 #define VECTOR_MASK 0xFF
 #else
-#include <sys/arch_interface.h>
+#include <zephyr/sys/arch_interface.h>
 #define LOAPIC_ICR_IPI_TEST  0x00004000U
 #endif
 
diff --git a/subsys/testsuite/include/tc_util.h b/subsys/testsuite/include/tc_util.h
index 56896dc4d9..5461d789a5 100644
--- a/subsys/testsuite/include/tc_util.h
+++ b/subsys/testsuite/include/tc_util.h
@@ -9,13 +9,13 @@
 #ifndef ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
 #define ZEPHYR_TESTSUITE_INCLUDE_TC_UTIL_H_
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <string.h>
 #ifdef CONFIG_SHELL
-#include <shell/shell.h>
+#include <zephyr/shell/shell.h>
 #endif
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 
 #if defined CONFIG_ZTEST_TC_UTIL_USER_OVERRIDE
 #include <tc_util_user_override.h>
@@ -174,7 +174,7 @@ static inline void test_time_ms(void)
 #endif
 
 #if defined(CONFIG_ARCH_POSIX)
-#include <logging/log_ctrl.h>
+#include <zephyr/logging/log_ctrl.h>
 #define TC_END_POST(result) do { \
 	LOG_PANIC(); \
 	posix_exit(result); \
diff --git a/subsys/testsuite/include/test_asm_inline_gcc.h b/subsys/testsuite/include/test_asm_inline_gcc.h
index 153beafb6b..2c458ae8b6 100644
--- a/subsys/testsuite/include/test_asm_inline_gcc.h
+++ b/subsys/testsuite/include/test_asm_inline_gcc.h
@@ -24,20 +24,20 @@ static inline void timestamp_serialize(void)
 	: "%eax", "%ebx", "%ecx", "%edx");
 }
 #elif defined(CONFIG_CPU_CORTEX_M)
-#include <arch/arm/aarch32/cortex_m/cmsis.h>
+#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 static inline void timestamp_serialize(void)
 {
 	/* isb is available in all Cortex-M  */
 	__ISB();
 }
 #elif defined(CONFIG_CPU_AARCH32_CORTEX_R) || defined(CONFIG_CPU_AARCH32_CORTEX_A)
-#include <arch/arm/aarch32/cortex_a_r/cpu.h>
+#include <zephyr/arch/arm/aarch32/cortex_a_r/cpu.h>
 static inline void timestamp_serialize(void)
 {
 	__ISB();
 }
 #elif defined(CONFIG_CPU_CORTEX_A) || defined(CONFIG_CPU_AARCH64_CORTEX_R)
-#include <arch/arm64/cpu.h>
+#include <zephyr/arch/arm64/cpu.h>
 static inline void timestamp_serialize(void)
 {
 	__ISB();
diff --git a/subsys/testsuite/include/timestamp.h b/subsys/testsuite/include/timestamp.h
index 96d432c8a3..f38a635279 100644
--- a/subsys/testsuite/include/timestamp.h
+++ b/subsys/testsuite/include/timestamp.h
@@ -13,7 +13,7 @@
 
 #ifndef _TIMESTAMP_H_
 #define _TIMESTAMP_H_
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <limits.h>
 #if defined(__GNUC__)
diff --git a/subsys/testsuite/ztest/include/zephyr/arch/cpu.h b/subsys/testsuite/ztest/include/zephyr/arch/cpu.h
index 1e39a9b970..db794cbda7 100644
--- a/subsys/testsuite/ztest/include/zephyr/arch/cpu.h
+++ b/subsys/testsuite/ztest/include/zephyr/arch/cpu.h
@@ -51,7 +51,7 @@ static inline bool arch_irq_unlocked(unsigned int key)
 }
 #endif /* __cplusplus */
 
-#include <sys/arch_interface.h>
+#include <zephyr/sys/arch_interface.h>
 
 
 #endif /* ZEPHYR_SUBSYS_TESTSUITE_ZTEST_INCLUDE_ARCH_CPU_H */
diff --git a/subsys/testsuite/ztest/include/ztest.h b/subsys/testsuite/ztest/include/ztest.h
index 6aa4306948..fd6ffa2f66 100644
--- a/subsys/testsuite/ztest/include/ztest.h
+++ b/subsys/testsuite/ztest/include/ztest.h
@@ -53,10 +53,10 @@ typedef struct esf z_arch_esf_t;
 #endif
 #endif /* KERNEL */
 
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #define PRINT printk
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <ztest_assert.h>
 #include <ztest_mock.h>
diff --git a/subsys/testsuite/ztest/include/ztest_error_hook.h b/subsys/testsuite/ztest/include/ztest_error_hook.h
index 3c0b984f09..532824b33f 100644
--- a/subsys/testsuite/ztest/include/ztest_error_hook.h
+++ b/subsys/testsuite/ztest/include/ztest_error_hook.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_INCLUDE_ZTEST_FATAL_HOOK_H_
 #define ZEPHYR_INCLUDE_ZTEST_FATAL_HOOK_H_
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 
 #if defined(CONFIG_ZTEST_FATAL_HOOK)
diff --git a/subsys/testsuite/ztest/include/ztest_test_deprecated.h b/subsys/testsuite/ztest/include/ztest_test_deprecated.h
index 14a9ec17a6..1f6e70eb8d 100644
--- a/subsys/testsuite/ztest/include/ztest_test_deprecated.h
+++ b/subsys/testsuite/ztest/include/ztest_test_deprecated.h
@@ -13,8 +13,8 @@
 #ifndef ZEPHYR_TESTSUITE_ZTEST_TEST_H_
 #define ZEPHYR_TESTSUITE_ZTEST_TEST_H_
 
-#include <app_memory/app_memdomain.h>
-#include <init.h>
+#include <zephyr/app_memory/app_memdomain.h>
+#include <zephyr/init.h>
 #include <stdbool.h>
 
 #ifdef __cplusplus
diff --git a/subsys/testsuite/ztest/include/ztest_test_new.h b/subsys/testsuite/ztest/include/ztest_test_new.h
index c000f75a9f..c4c5aed8fe 100644
--- a/subsys/testsuite/ztest/include/ztest_test_new.h
+++ b/subsys/testsuite/ztest/include/ztest_test_new.h
@@ -13,8 +13,8 @@
 #ifndef ZEPHYR_TESTSUITE_ZTEST_TEST_H_
 #define ZEPHYR_TESTSUITE_ZTEST_TEST_H_
 
-#include <app_memory/app_memdomain.h>
-#include <init.h>
+#include <zephyr/app_memory/app_memdomain.h>
+#include <zephyr/init.h>
 #include <stdbool.h>
 
 #ifdef __cplusplus
diff --git a/subsys/testsuite/ztest/include/ztress.h b/subsys/testsuite/ztest/include/ztress.h
index 2e15e8265e..7e2a1aec8a 100644
--- a/subsys/testsuite/ztest/include/ztress.h
+++ b/subsys/testsuite/ztest/include/ztress.h
@@ -6,8 +6,8 @@
 #ifndef TESTSUITE_ZTEST_INCLUDE_ZTRESS_H__
 #define TESTSUITE_ZTEST_INCLUDE_ZTRESS_H__
 
-#include <sys/util.h>
-#include <kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
 
 /** @internal Internal ID's to distinguish context type. */
 #define ZTRESS_ID_THREAD 0
diff --git a/subsys/testsuite/ztest/src/ztest.c b/subsys/testsuite/ztest/src/ztest.c
index 58c440b5fe..ee26aaf879 100644
--- a/subsys/testsuite/ztest/src/ztest.c
+++ b/subsys/testsuite/ztest/src/ztest.c
@@ -6,12 +6,12 @@
 
 #include <ztest.h>
 #include <stdio.h>
-#include <app_memory/app_memdomain.h>
+#include <zephyr/app_memory/app_memdomain.h>
 #ifdef CONFIG_USERSPACE
-#include <sys/libc-hooks.h>
+#include <zephyr/sys/libc-hooks.h>
 #endif
-#include <sys/reboot.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/logging/log_ctrl.h>
 
 #ifdef KERNEL
 static struct k_thread ztest_thread;
diff --git a/subsys/testsuite/ztest/src/ztest_error_hook.c b/subsys/testsuite/ztest/src/ztest_error_hook.c
index 0c3a9733f4..2fd448646e 100644
--- a/subsys/testsuite/ztest/src/ztest_error_hook.c
+++ b/subsys/testsuite/ztest/src/ztest_error_hook.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <ztest.h>
 
 
diff --git a/subsys/testsuite/ztest/src/ztest_new.c b/subsys/testsuite/ztest/src/ztest_new.c
index ecc0715816..0b074fdce3 100644
--- a/subsys/testsuite/ztest/src/ztest_new.c
+++ b/subsys/testsuite/ztest/src/ztest_new.c
@@ -6,12 +6,12 @@
 
 #include <ztest.h>
 #include <stdio.h>
-#include <app_memory/app_memdomain.h>
+#include <zephyr/app_memory/app_memdomain.h>
 #ifdef CONFIG_USERSPACE
-#include <sys/libc-hooks.h>
+#include <zephyr/sys/libc-hooks.h>
 #endif
-#include <sys/reboot.h>
-#include <logging/log_ctrl.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/logging/log_ctrl.h>
 
 #ifdef KERNEL
 static struct k_thread ztest_thread;
diff --git a/subsys/testsuite/ztest/src/ztress.c b/subsys/testsuite/ztest/src/ztress.c
index f74764f077..4389c9b5b9 100644
--- a/subsys/testsuite/ztest/src/ztress.c
+++ b/subsys/testsuite/ztest/src/ztress.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <ztress.h>
-#include <sys/printk.h>
-#include <random/rand32.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/random/rand32.h>
 #include <string.h>
 
 
diff --git a/subsys/timing/timing.c b/subsys/timing/timing.c
index 03336a27a3..ded7d06b4f 100644
--- a/subsys/timing/timing.c
+++ b/subsys/timing/timing.c
@@ -5,9 +5,9 @@
  */
 
 #include <stdbool.h>
-#include <kernel.h>
-#include <sys/atomic.h>
-#include <timing/timing.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/timing/timing.h>
 
 static bool has_inited;
 static atomic_val_t started_ref;
diff --git a/subsys/tracing/ctf/ctf_top.c b/subsys/tracing/ctf/ctf_top.c
index c40949f6a0..e27ae1496f 100644
--- a/subsys/tracing/ctf/ctf_top.c
+++ b/subsys/tracing/ctf/ctf_top.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <kernel_structs.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel_structs.h>
 #include <kernel_internal.h>
 #include <ctf_top.h>
 
diff --git a/subsys/tracing/ctf/ctf_top.h b/subsys/tracing/ctf/ctf_top.h
index f1ef454753..61078b2591 100644
--- a/subsys/tracing/ctf/ctf_top.h
+++ b/subsys/tracing/ctf/ctf_top.h
@@ -10,7 +10,7 @@
 #include <stddef.h>
 #include <string.h>
 #include <ctf_map.h>
-#include <tracing/tracing_format.h>
+#include <zephyr/tracing/tracing_format.h>
 
 /* Limit strings to 20 bytes to optimize bandwidth */
 #define CTF_MAX_STRING_LEN 20
diff --git a/subsys/tracing/ctf/tracing_ctf.h b/subsys/tracing/ctf/tracing_ctf.h
index 34043bdb2b..0dd229990d 100644
--- a/subsys/tracing/ctf/tracing_ctf.h
+++ b/subsys/tracing/ctf/tracing_ctf.h
@@ -7,9 +7,9 @@
 #ifndef _TRACE_CTF_H
 #define _TRACE_CTF_H
 
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/init.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/tracing/include/tracing_backend.h b/subsys/tracing/include/tracing_backend.h
index 635c1dbc04..be2b8bc609 100644
--- a/subsys/tracing/include/tracing_backend.h
+++ b/subsys/tracing/include/tracing_backend.h
@@ -8,7 +8,7 @@
 #define _TRACE_BACKEND_H
 
 #include <string.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/tracing/include/tracing_core.h b/subsys/tracing/include/tracing_core.h
index 031721ad5a..84eab0eb8e 100644
--- a/subsys/tracing/include/tracing_core.h
+++ b/subsys/tracing/include/tracing_core.h
@@ -7,7 +7,7 @@
 #ifndef _TRACE_CORE_H
 #define _TRACE_CORE_H
 
-#include <irq.h>
+#include <zephyr/irq.h>
 #include <zephyr/types.h>
 
 #ifdef __cplusplus
diff --git a/subsys/tracing/include/tracing_format_common.h b/subsys/tracing/include/tracing_format_common.h
index 0166c7e504..debb71c3a8 100644
--- a/subsys/tracing/include/tracing_format_common.h
+++ b/subsys/tracing/include/tracing_format_common.h
@@ -8,8 +8,8 @@
 #define _TRACE_FORMAT_COMMON_H
 
 #include <stdarg.h>
-#include <sys/printk.h>
-#include <tracing/tracing_format.h>
+#include <zephyr/sys/printk.h>
+#include <zephyr/tracing/tracing_format.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/tracing/sysview/sysview.c b/subsys/tracing/sysview/sysview.c
index 7c1bf84f5f..2fd661751c 100644
--- a/subsys/tracing/sysview/sysview.c
+++ b/subsys/tracing/sysview/sysview.c
@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <zephyr.h>
-#include <kernel_structs.h>
-#include <init.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/init.h>
 #include <ksched.h>
 
 #include <SEGGER_SYSVIEW.h>
diff --git a/subsys/tracing/sysview/sysview_config.c b/subsys/tracing/sysview/sysview_config.c
index 2b5d3b959c..b430c78d2e 100644
--- a/subsys/tracing/sysview/sysview_config.c
+++ b/subsys/tracing/sysview/sysview_config.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <SEGGER_SYSVIEW.h>
 #include <ksched.h>
 
diff --git a/subsys/tracing/sysview/tracing_sysview.h b/subsys/tracing/sysview/tracing_sysview.h
index ac50c4dcd9..7dd03eb118 100644
--- a/subsys/tracing/sysview/tracing_sysview.h
+++ b/subsys/tracing/sysview/tracing_sysview.h
@@ -6,8 +6,8 @@
 #ifndef ZEPHYR_TRACE_SYSVIEW_H
 #define ZEPHYR_TRACE_SYSVIEW_H
 #include <string.h>
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <tracing_sysview_ids.h>
 
 #include <SEGGER_SYSVIEW.h>
diff --git a/subsys/tracing/test/tracing_string_format_test.c b/subsys/tracing/test/tracing_string_format_test.c
index 5dd9fef9b1..348d2e422b 100644
--- a/subsys/tracing/test/tracing_string_format_test.c
+++ b/subsys/tracing/test/tracing_string_format_test.c
@@ -6,10 +6,10 @@
 
 #define DISABLE_SYSCALL_TRACING
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include <tracing_test.h>
 #include <tracing_test_syscall.h>
-#include <tracing/tracing_format.h>
+#include <zephyr/tracing/tracing_format.h>
 
 void sys_trace_k_thread_switched_out(void)
 {
diff --git a/subsys/tracing/test/tracing_test.h b/subsys/tracing/test/tracing_test.h
index 2bba22e41d..cdc6e5472d 100644
--- a/subsys/tracing/test/tracing_test.h
+++ b/subsys/tracing/test/tracing_test.h
@@ -5,8 +5,8 @@
  */
 #ifndef ZEPHYR_TRACE_TEST_H
 #define ZEPHYR_TRACE_TEST_H
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 
 #define sys_port_trace_k_thread_foreach_enter() sys_trace_k_thread_foreach_enter(user_cb, user_data)
 #define sys_port_trace_k_thread_foreach_exit() sys_trace_k_thread_foreach_exit(user_cb, user_data)
diff --git a/subsys/tracing/tracing_backend_posix.c b/subsys/tracing/tracing_backend_posix.c
index f18d6c9805..28f9ec8928 100644
--- a/subsys/tracing/tracing_backend_posix.c
+++ b/subsys/tracing/tracing_backend_posix.c
@@ -6,9 +6,9 @@
 
 #include <soc.h>
 #include <stdio.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <cmdline.h>
-#include <sys/__assert.h>
+#include <zephyr/sys/__assert.h>
 #include <tracing_backend.h>
 
 static void *out_stream;
diff --git a/subsys/tracing/tracing_backend_ram.c b/subsys/tracing/tracing_backend_ram.c
index 149402e174..2f8219784e 100644
--- a/subsys/tracing/tracing_backend_ram.c
+++ b/subsys/tracing/tracing_backend_ram.c
@@ -5,7 +5,7 @@
  */
 
 #include <ctype.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <string.h>
 #include <tracing_core.h>
 #include <tracing_buffer.h>
diff --git a/subsys/tracing/tracing_backend_uart.c b/subsys/tracing/tracing_backend_uart.c
index 725204cc98..a45b102fc0 100644
--- a/subsys/tracing/tracing_backend_uart.c
+++ b/subsys/tracing/tracing_backend_uart.c
@@ -11,10 +11,10 @@
 
 #include <errno.h>
 #include <ctype.h>
-#include <kernel.h>
-#include <device.h>
-#include <drivers/uart.h>
-#include <sys/__assert.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/sys/__assert.h>
 #include <tracing_core.h>
 #include <tracing_buffer.h>
 #include <tracing_backend.h>
diff --git a/subsys/tracing/tracing_backend_usb.c b/subsys/tracing/tracing_backend_usb.c
index 7bcbb66f06..95ec1cb5cb 100644
--- a/subsys/tracing/tracing_backend_usb.c
+++ b/subsys/tracing/tracing_backend_usb.c
@@ -9,11 +9,11 @@
  */
 #define DISABLE_SYSCALL_TRACING
 
-#include <sys/util.h>
-#include <sys/atomic.h>
-#include <sys/__assert.h>
-#include <sys/byteorder.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/usb_device.h>
 #include <tracing_core.h>
 #include <tracing_buffer.h>
 #include <tracing_backend.h>
diff --git a/subsys/tracing/tracing_buffer.c b/subsys/tracing/tracing_buffer.c
index 1af37469ce..e3eeea8aeb 100644
--- a/subsys/tracing/tracing_buffer.c
+++ b/subsys/tracing/tracing_buffer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <sys/ring_buffer.h>
+#include <zephyr/sys/ring_buffer.h>
 
 static struct ring_buf tracing_ring_buf;
 static uint8_t tracing_buffer[CONFIG_TRACING_BUFFER_SIZE + 1];
diff --git a/subsys/tracing/tracing_core.c b/subsys/tracing/tracing_core.c
index d7c8866813..62112ab714 100644
--- a/subsys/tracing/tracing_core.c
+++ b/subsys/tracing/tracing_core.c
@@ -9,11 +9,11 @@
  */
 #define DISABLE_SYSCALL_TRACING
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <kernel.h>
-#include <sys/util.h>
-#include <sys/atomic.h>
+#include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/atomic.h>
 #include <tracing_core.h>
 #include <tracing_buffer.h>
 #include <tracing_backend.h>
diff --git a/subsys/tracing/tracing_format_common.c b/subsys/tracing/tracing_format_common.c
index ba04b8d49c..28769ec842 100644
--- a/subsys/tracing/tracing_format_common.c
+++ b/subsys/tracing/tracing_format_common.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <sys/cbprintf.h>
+#include <zephyr/sys/cbprintf.h>
 #include <tracing_buffer.h>
 #include <tracing_format_common.h>
 
diff --git a/subsys/tracing/tracing_none.c b/subsys/tracing/tracing_none.c
index a69be595a2..83b1fde0ec 100644
--- a/subsys/tracing/tracing_none.c
+++ b/subsys/tracing/tracing_none.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <string.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 void sys_trace_isr_enter(void) {}
 
diff --git a/subsys/tracing/tracing_tracking.c b/subsys/tracing/tracing_tracking.c
index 8fcd2f29b9..be901813c8 100644
--- a/subsys/tracing/tracing_tracking.c
+++ b/subsys/tracing/tracing_tracking.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <spinlock.h>
-#include <sys/slist.h>
-#include <tracing/tracking.h>
+#include <zephyr/init.h>
+#include <zephyr/spinlock.h>
+#include <zephyr/sys/slist.h>
+#include <zephyr/tracing/tracking.h>
 
 struct k_timer *_track_list_k_timer;
 struct k_spinlock _track_list_k_timer_lock;
diff --git a/subsys/tracing/user/tracing_user.c b/subsys/tracing/user/tracing_user.c
index 9435c479df..660299b3cb 100644
--- a/subsys/tracing/user/tracing_user.c
+++ b/subsys/tracing/user/tracing_user.c
@@ -6,7 +6,7 @@
 
 #include <tracing_user.h>
 #include <kernel_internal.h>
-#include <kernel_structs.h>
+#include <zephyr/kernel_structs.h>
 #include <ksched.h>
 
 static int nested_interrupts[CONFIG_MP_NUM_CPUS];
diff --git a/subsys/tracing/user/tracing_user.h b/subsys/tracing/user/tracing_user.h
index cab4afad19..a098c39e18 100644
--- a/subsys/tracing/user/tracing_user.h
+++ b/subsys/tracing/user/tracing_user.h
@@ -6,9 +6,9 @@
 
 #ifndef _TRACE_USER_H
 #define _TRACE_USER_H
-#include <kernel.h>
-#include <kernel_structs.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/kernel_structs.h>
+#include <zephyr/init.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/subsys/usb/device/bos.c b/subsys/usb/device/bos.c
index 4d451e355d..6167800dd1 100644
--- a/subsys/usb/device/bos.c
+++ b/subsys/usb/device/bos.c
@@ -5,14 +5,14 @@
  */
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_bos);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 
-#include <usb/bos.h>
+#include <zephyr/usb/bos.h>
 
 extern const uint8_t __usb_bos_desc_start[];
 extern const uint8_t __usb_bos_desc_end[];
diff --git a/subsys/usb/device/class/audio/audio.c b/subsys/usb/device/class/audio/audio.c
index b4d06771b1..499589a8d4 100644
--- a/subsys/usb/device/class/audio/audio.c
+++ b/subsys/usb/device/class/audio/audio.c
@@ -11,17 +11,17 @@
  * Driver for USB Audio device class driver
  */
 
-#include <kernel.h>
-#include <usb/usb_device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/usb/usb_device.h>
 #include <usb_descriptor.h>
-#include <usb/class/usb_audio.h>
+#include <zephyr/usb/class/usb_audio.h>
 #include "usb_audio_internal.h"
 
-#include <sys/byteorder.h>
-#include <sys/util.h>
-#include <net/buf.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/net/buf.h>
 
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_audio, CONFIG_USB_AUDIO_LOG_LEVEL);
 
 /* Device data structure */
diff --git a/subsys/usb/device/class/bluetooth.c b/subsys/usb/device/class/bluetooth.c
index a04cb323c5..dc37ab236c 100644
--- a/subsys/usb/device/class/bluetooth.c
+++ b/subsys/usb/device/class/bluetooth.c
@@ -6,23 +6,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <sys/byteorder.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 #include <usb_descriptor.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
-#include <bluetooth/buf.h>
-#include <bluetooth/hci_raw.h>
-#include <bluetooth/l2cap.h>
-#include <bluetooth/hci_vs.h>
-#include <drivers/bluetooth/hci_driver.h>
-#include <sys/atomic.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/hci_raw.h>
+#include <zephyr/bluetooth/l2cap.h>
+#include <zephyr/bluetooth/hci_vs.h>
+#include <zephyr/drivers/bluetooth/hci_driver.h>
+#include <zephyr/sys/atomic.h>
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_bluetooth);
 
 #define USB_RF_SUBCLASS			0x01
diff --git a/subsys/usb/device/class/bt_h4.c b/subsys/usb/device/class/bt_h4.c
index c4df66e293..c956fc3685 100644
--- a/subsys/usb/device/class/bt_h4.c
+++ b/subsys/usb/device/class/bt_h4.c
@@ -6,20 +6,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
-#include <sys/byteorder.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
 
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 #include <usb_descriptor.h>
 
-#include <net/buf.h>
+#include <zephyr/net/buf.h>
 
-#include <bluetooth/buf.h>
-#include <bluetooth/hci_raw.h>
-#include <bluetooth/l2cap.h>
+#include <zephyr/bluetooth/buf.h>
+#include <zephyr/bluetooth/hci_raw.h>
+#include <zephyr/bluetooth/l2cap.h>
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_bt_h4);
 
 static K_FIFO_DEFINE(rx_queue);
diff --git a/subsys/usb/device/class/cdc_acm.c b/subsys/usb/device/class/cdc_acm.c
index 9adc89a9c4..0667eae58a 100644
--- a/subsys/usb/device/class/cdc_acm.c
+++ b/subsys/usb/device/class/cdc_acm.c
@@ -37,15 +37,15 @@
  * Driver for USB CDC ACM device class driver
  */
 
-#include <kernel.h>
-#include <init.h>
-#include <drivers/uart/cdc_acm.h>
-#include <drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/uart/cdc_acm.h>
+#include <zephyr/drivers/uart.h>
 #include <string.h>
-#include <sys/ring_buffer.h>
-#include <sys/byteorder.h>
-#include <usb/class/usb_cdc.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/ring_buffer.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/class/usb_cdc.h>
+#include <zephyr/usb/usb_device.h>
 #include <usb_descriptor.h>
 #include <usb_work_q.h>
 
@@ -56,7 +56,7 @@
 /* definitions */
 
 #define LOG_LEVEL CONFIG_USB_CDC_ACM_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_cdc_acm);
 
 /* 115200bps, no parity, 1 stop bit, 8bit char */
diff --git a/subsys/usb/device/class/dfu/usb_dfu.c b/subsys/usb/device/class/dfu/usb_dfu.c
index 06fab01e83..ab42294d38 100644
--- a/subsys/usb/device/class/dfu/usb_dfu.c
+++ b/subsys/usb/device/class/dfu/usb_dfu.c
@@ -38,23 +38,23 @@
  *
  */
 
-#include <init.h>
-#include <kernel.h>
+#include <zephyr/init.h>
+#include <zephyr/kernel.h>
 #include <stdio.h>
 #include <errno.h>
-#include <drivers/flash.h>
-#include <storage/flash_map.h>
-#include <dfu/mcuboot.h>
-#include <dfu/flash_img.h>
-#include <sys/byteorder.h>
-#include <sys/reboot.h>
-#include <usb/usb_device.h>
-#include <usb/class/usb_dfu.h>
+#include <zephyr/drivers/flash.h>
+#include <zephyr/storage/flash_map.h>
+#include <zephyr/dfu/mcuboot.h>
+#include <zephyr/dfu/flash_img.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_dfu.h>
 #include <usb_descriptor.h>
 #include <usb_work_q.h>
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_dfu);
 
 #define USB_DFU_MAX_XFER_SIZE		CONFIG_USB_REQUEST_BUFFER_SIZE
diff --git a/subsys/usb/device/class/hid/core.c b/subsys/usb/device/class/hid/core.c
index 0cae2c7e6f..47914a7a49 100644
--- a/subsys/usb/device/class/hid/core.c
+++ b/subsys/usb/device/class/hid/core.c
@@ -8,10 +8,10 @@
  */
 
 #define LOG_LEVEL CONFIG_USB_HID_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_hid);
 
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 #include <usb_device.h>
 
 #include <usb_descriptor.h>
diff --git a/subsys/usb/device/class/loopback.c b/subsys/usb/device/class/loopback.c
index 348d54430b..06af902e56 100644
--- a/subsys/usb/device/class/loopback.c
+++ b/subsys/usb/device/class/loopback.c
@@ -6,14 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 
-#include <sys/byteorder.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/usb_device.h>
 #include <usb_descriptor.h>
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_loopback);
 
 #define LOOPBACK_OUT_EP_ADDR		0x01
diff --git a/subsys/usb/device/class/msc.c b/subsys/usb/device/class/msc.c
index 47246f6292..76a218902f 100644
--- a/subsys/usb/device/class/msc.c
+++ b/subsys/usb/device/class/msc.c
@@ -33,18 +33,18 @@
  * Driver for USB Mass Storage device class driver
  */
 
-#include <init.h>
+#include <zephyr/init.h>
 #include <errno.h>
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <storage/disk_access.h>
-#include <usb/class/usb_msc.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/storage/disk_access.h>
+#include <zephyr/usb/class/usb_msc.h>
+#include <zephyr/usb/usb_device.h>
 #include <usb_descriptor.h>
 
 #define LOG_LEVEL CONFIG_USB_MASS_STORAGE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_msc);
 
 /* max USB packet size */
diff --git a/subsys/usb/device/class/netusb/function_ecm.c b/subsys/usb/device/class/netusb/function_ecm.c
index e4cb638c6b..9da3a53ceb 100644
--- a/subsys/usb/device/class/netusb/function_ecm.c
+++ b/subsys/usb/device/class/netusb/function_ecm.c
@@ -5,18 +5,18 @@
  */
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_NETWORK_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_ecm);
 
 /* Enable verbose debug printing extra hexdumps */
 #define VERBOSE_DEBUG	0
 
-#include <net/net_pkt.h>
-#include <net/ethernet.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/ethernet.h>
 #include <net_private.h>
 
-#include <usb/usb_device.h>
-#include <usb/class/usb_cdc.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_cdc.h>
 #include <usb_descriptor.h>
 
 #include "netusb.h"
diff --git a/subsys/usb/device/class/netusb/function_eem.c b/subsys/usb/device/class/netusb/function_eem.c
index 97d5ed074a..e240d97101 100644
--- a/subsys/usb/device/class/netusb/function_eem.c
+++ b/subsys/usb/device/class/netusb/function_eem.c
@@ -5,15 +5,15 @@
  */
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_NETWORK_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_eem);
 
-#include <net/net_pkt.h>
-#include <net/ethernet.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/ethernet.h>
 #include <net_private.h>
 
-#include <usb/usb_device.h>
-#include <usb/class/usb_cdc.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_cdc.h>
 
 #include "netusb.h"
 
diff --git a/subsys/usb/device/class/netusb/function_rndis.c b/subsys/usb/device/class/netusb/function_rndis.c
index 3506ae24ff..4a043bec1b 100644
--- a/subsys/usb/device/class/netusb/function_rndis.c
+++ b/subsys/usb/device/class/netusb/function_rndis.c
@@ -5,19 +5,19 @@
  */
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_NETWORK_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_rndis);
 
 /* Enable verbose debug printing extra hexdumps */
 #define VERBOSE_DEBUG		0
 
-#include <init.h>
+#include <zephyr/init.h>
 
-#include <net/ethernet.h>
+#include <zephyr/net/ethernet.h>
 #include <net_private.h>
 
-#include <usb/usb_device.h>
-#include <usb/class/usb_cdc.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_cdc.h>
 #include <os_desc.h>
 
 #include "netusb.h"
diff --git a/subsys/usb/device/class/netusb/netusb.c b/subsys/usb/device/class/netusb/netusb.c
index 49ffac8547..3cda09e72d 100644
--- a/subsys/usb/device/class/netusb/netusb.c
+++ b/subsys/usb/device/class/netusb/netusb.c
@@ -7,12 +7,12 @@
  */
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_NETWORK_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_net);
 
-#include <init.h>
+#include <zephyr/init.h>
 
-#include <net/ethernet.h>
+#include <zephyr/net/ethernet.h>
 #include <net_private.h>
 
 #include <usb_device.h>
diff --git a/subsys/usb/device/os_desc.c b/subsys/usb/device/os_desc.c
index d9da425f3a..2b1ad7ed80 100644
--- a/subsys/usb/device/os_desc.c
+++ b/subsys/usb/device/os_desc.c
@@ -5,12 +5,12 @@
  */
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_os_desc);
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 #include <os_desc.h>
 
 static struct usb_os_descriptor *os_desc;
diff --git a/subsys/usb/device/usb_descriptor.c b/subsys/usb/device/usb_descriptor.c
index 57ca8ce87f..e57bea3428 100644
--- a/subsys/usb/device/usb_descriptor.c
+++ b/subsys/usb/device/usb_descriptor.c
@@ -8,14 +8,14 @@
  */
 
 #include <string.h>
-#include <sys/byteorder.h>
-#include <sys/__assert.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/usb/usb_device.h>
 #include "usb_descriptor.h"
-#include <drivers/hwinfo.h>
+#include <zephyr/drivers/hwinfo.h>
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_descriptor);
 
 /*
diff --git a/subsys/usb/device/usb_device.c b/subsys/usb/device/usb_device.c
index 7005e0db67..d62c38c4f4 100644
--- a/subsys/usb/device/usb_device.c
+++ b/subsys/usb/device/usb_device.c
@@ -59,20 +59,20 @@
 
 #include <errno.h>
 #include <stddef.h>
-#include <sys/util.h>
-#include <sys/__assert.h>
-#include <init.h>
-#include <drivers/gpio.h>
-#include <sys/byteorder.h>
-#include <usb/usb_device.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/usb/usb_device.h>
 #include <usb_descriptor.h>
-#include <usb/class/usb_audio.h>
+#include <zephyr/usb/class/usb_audio.h>
 
 #define LOG_LEVEL CONFIG_USB_DEVICE_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(usb_device);
 
-#include <usb/bos.h>
+#include <zephyr/usb/bos.h>
 #include <os_desc.h>
 #include "usb_transfer.h"
 
diff --git a/subsys/usb/device/usb_transfer.c b/subsys/usb/device/usb_transfer.c
index fc79c038ad..1e385d20c9 100644
--- a/subsys/usb/device/usb_transfer.c
+++ b/subsys/usb/device/usb_transfer.c
@@ -5,9 +5,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr.h>
-#include <usb/usb_device.h>
-#include <logging/log.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/logging/log.h>
 
 #include "usb_transfer.h"
 #include "usb_work_q.h"
diff --git a/subsys/usb/device/usb_work_q.c b/subsys/usb/device/usb_work_q.c
index 7ff7d063d4..81234e80aa 100644
--- a/subsys/usb/device/usb_work_q.c
+++ b/subsys/usb/device/usb_work_q.c
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <kernel.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/init.h>
 #include <usb_work_q.h>
 
 K_KERNEL_STACK_DEFINE(z_usb_work_q_stack, CONFIG_USB_WORKQUEUE_STACK_SIZE);
diff --git a/subsys/usb/device/usb_work_q.h b/subsys/usb/device/usb_work_q.h
index 94e00804b9..56c665c86e 100644
--- a/subsys/usb/device/usb_work_q.h
+++ b/subsys/usb/device/usb_work_q.h
@@ -7,7 +7,7 @@
 #ifndef ZEPHYR_USB_WORK_Q_H_
 #define ZEPHYR_USB_WORK_Q_H_
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {