diff --git a/samples/bluetooth/bap_unicast_client/src/stream_tx.c b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
index 06ea3a3c349..eba7273a0c6 100644
--- a/samples/bluetooth/bap_unicast_client/src/stream_tx.c
+++ b/samples/bluetooth/bap_unicast_client/src/stream_tx.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
index cbdb859eb8f..aad077a0aed 100644
--- a/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
+++ b/samples/bluetooth/cap_acceptor/src/cap_acceptor_unicast.c
@@ -7,7 +7,7 @@
  *  SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_acceptor/src/main.c b/samples/bluetooth/cap_acceptor/src/main.c
index 6ca5f59282e..df4600f09bb 100644
--- a/samples/bluetooth/cap_acceptor/src/main.c
+++ b/samples/bluetooth/cap_acceptor/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
index 39b7a68aef6..60509beb258 100644
--- a/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
+++ b/samples/bluetooth/cap_initiator/src/cap_initiator_unicast.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/samples/bluetooth/cap_initiator/src/main.c b/samples/bluetooth/cap_initiator/src/main.c
index 1b35ea7981f..8eab76938bc 100644
--- a/samples/bluetooth/cap_initiator/src/main.c
+++ b/samples/bluetooth/cap_initiator/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <stddef.h>
 
 #include <zephyr/bluetooth/bluetooth.h>
diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
index d7f3005d1f4..eab3bf18a14 100644
--- a/soc/nordic/nrf54l/soc.c
+++ b/soc/nordic/nrf54l/soc.c
@@ -13,7 +13,7 @@
  */
 
 #ifdef __NRF_TFM__
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #endif
 
 #include <zephyr/devicetree.h>