nrfconnect · masz-nordic · Oct 3, 2025 · Oct 3, 2025
diff --git a/boards/native/nrf_bsim/soc/soc_secure.h b/boards/native/nrf_bsim/soc/soc_secure.h
@@ -12,7 +12,7 @@
 
 
 #include <stdint.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <hal/nrf_ficr.h>
 
 static inline void soc_secure_read_deviceid(uint32_t deviceid[2])

diff --git a/drivers/clock_control/clock_control_nrf.c b/drivers/clock_control/clock_control_nrf.c
@@ -14,7 +14,6 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/irq.h>
-#include <nrf_erratas.h>
 
 LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
 

diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
@@ -22,7 +22,6 @@ LOG_MODULE_REGISTER(qspi_nor, CONFIG_FLASH_LOG_LEVEL);
 #include "spi_nor.h"
 #include "jesd216.h"
 #include "flash_priv.h"
-#include <nrf_erratas.h>
 #include <nrfx_qspi.h>
 #include <hal/nrf_clock.h>
 #include <hal/nrf_gpio.h>

diff --git a/drivers/flash/soc_flash_nrf.c b/drivers/flash/soc_flash_nrf.c
@@ -15,7 +15,6 @@
 #include <zephyr/drivers/flash.h>
 #include <string.h>
 #include <nrfx_nvmc.h>
-#include <nrf_erratas.h>
 
 #include "soc_flash_nrf.h"
 

diff --git a/drivers/mspi/mspi_dw_vendor_specific.h b/drivers/mspi/mspi_dw_vendor_specific.h
@@ -12,7 +12,7 @@
 
 #if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_exmif)
 
-#include <nrf.h>
+#include <nrfx.h>
 
 static inline void vendor_specific_init(const struct device *dev)
 {

diff --git a/drivers/usb/common/nrf_usbd_common/nrf_usbd_common_errata.h b/drivers/usb/common/nrf_usbd_common/nrf_usbd_common_errata.h
@@ -12,7 +12,6 @@
 #define NRF_USBD_COMMON_ERRATA_H__
 
 #include <nrfx.h>
-#include <nrf_erratas.h>
 
 #ifndef NRF_USBD_COMMON_ERRATA_ENABLE
 /**

diff --git a/drivers/usb/udc/udc_dwc2_vendor_quirks.h b/drivers/usb/udc/udc_dwc2_vendor_quirks.h
@@ -316,7 +316,7 @@ DT_INST_FOREACH_STATUS_OKAY(QUIRK_NRF_USBHS_DEFINE)
 
 #define USBHS_DT_WRAPPER_REG_ADDR(n) UINT_TO_POINTER(DT_INST_REG_ADDR_BY_NAME(n, wrapper))
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/clock_control/nrf_clock_control.h>

diff --git a/modules/hal_nordic/nrfx/CMakeLists.txt b/modules/hal_nordic/nrfx/CMakeLists.txt
@@ -23,19 +23,13 @@ set(SOC_DIR ${BSP_DIR}/${CONFIG_SOC_NORDIC_BSP_NAME})
 set(MDK_DIR ${SOC_DIR}/mdk)
 
 if(NOT CONFIG_SOC_NORDIC_BSP_NAME STREQUAL "stable")
-  zephyr_compile_definitions(NRFX_BSP_NRF_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf.h")
-  zephyr_compile_definitions(NRFX_BSP_ERRATAS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/mdk/nrf_erratas.h")
-  zephyr_compile_definitions(NRFX_BSP_SOC_IRQS_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_irqs.h")
-  zephyr_compile_definitions(NRFX_BSP_NRFX_EXT_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/nrfx_ext.h")
-  zephyr_compile_definitions(NRFX_BSP_NRFX_COREDEP_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/soc/nrfx_coredep_defs.h")
+  zephyr_compile_definitions(NRFX_BSP_NRF_PATH="${CONFIG_SOC_NORDIC_BSP_NAME}/bsp.h")
 endif()
 
 zephyr_include_directories(${NRFX_DIR})
 zephyr_include_directories(${INC_DIR})
 zephyr_include_directories(${BSP_DIR})
-zephyr_include_directories(${SOC_DIR})
 zephyr_include_directories(${SOC_DIR}/templates)
-zephyr_include_directories(${MDK_DIR})
 zephyr_include_directories(.)
 
 include(${SOC_DIR}/zephyr/nrfx.cmake OPTIONAL)

diff --git a/modules/nrf_wifi/bus/qspi_if.c b/modules/nrf_wifi/bus/qspi_if.c
@@ -18,7 +18,6 @@
 #include <zephyr/drivers/wifi/nrf_wifi/bus/qspi_if.h>
 
 #include <soc.h>
-#include <nrf_erratas.h>
 #include <nrfx_qspi.h>
 #include <hal/nrf_clock.h>
 #include <hal/nrf_gpio.h>

diff --git a/modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h b/modules/trusted-firmware-m/nordic/include/tfm_read_ranges.h
@@ -9,7 +9,7 @@
 
 #include <tfm_ioctl_core_api.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #ifdef NRF_FICR_S_BASE
 

diff --git a/soc/nordic/common/soc_secure.c b/soc/nordic/common/soc_secure.c
@@ -7,8 +7,6 @@
 #include <soc_secure.h>
 #include <errno.h>
 
-#include "nrf.h"
-
 #include "tfm_platform_api.h"
 #include "tfm_ioctl_api.h"
 

diff --git a/soc/nordic/common/soc_secure.h b/soc/nordic/common/soc_secure.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <stdint.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <hal/nrf_gpio.h>
 #include <hal/nrf_ficr.h>
 

diff --git a/soc/nordic/ironside/include/nrf_ironside/cpuconf.h b/soc/nordic/ironside/include/nrf_ironside/cpuconf.h
@@ -9,7 +9,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <zephyr/toolchain/common.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <nrf_ironside/call.h>
 
 /**

diff --git a/soc/nordic/nrf53/soc.c b/soc/nordic/nrf53/soc.c
@@ -18,7 +18,7 @@
 #include <zephyr/dt-bindings/regulator/nrf5x.h>
 #include <soc/nrfx_coredep.h>
 #include <zephyr/logging/log.h>
-#include <nrf_erratas.h>
+#include <nrfx.h>
 #include <hal/nrf_power.h>
 #include <hal/nrf_ipc.h>
 #include <helpers/nrfx_gppi.h>

diff --git a/soc/nordic/nrf54l/soc.c b/soc/nordic/nrf54l/soc.c
@@ -21,14 +21,12 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/cache.h>
 #include <soc/nrfx_coredep.h>
-#include <system_nrf54l.h>
 #include <soc.h>
 LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);
 
 #if (defined(NRF_APPLICATION) && !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE)) || \
 	!defined(__ZEPHYR__)
 
-#include <nrf_erratas.h>
 #include <hal/nrf_oscillators.h>
 #include <hal/nrf_power.h>
 #include <hal/nrf_regulators.h>

diff --git a/soc/nordic/validate_binding_headers.c b/soc/nordic/validate_binding_headers.c
@@ -14,7 +14,7 @@
 #include <zephyr/sys/util_macro.h>
 #include <zephyr/toolchain.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 
 /**
  * Domain IDs. See:

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52810.h
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <nrf_erratas.h>
+#include <nrfx.h>
 
 /* Use the NRF_RTC instance for coarse radio event scheduling */
 #define NRF_RTC NRF_RTC0

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52832.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <nrf_erratas.h>
+#include <nrfx.h>
 
 /* Use the NRF_RTC instance for coarse radio event scheduling */
 #define NRF_RTC NRF_RTC0

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf52840.h
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <nrf_erratas.h>
+#include <nrfx.h>
 
 /* Use the NRF_RTC instance for coarse radio event scheduling */
 #define NRF_RTC NRF_RTC0