diff --git a/include/esb.h b/include/esb.h
index 02d6fa5fc10e..7b033d105be1 100644
--- a/include/esb.h
+++ b/include/esb.h
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include <errno.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <hal/nrf_radio.h>
 
 #include <zephyr/sys/util.h>
diff --git a/include/tfm/tfm_builtin_key_ids.h b/include/tfm/tfm_builtin_key_ids.h
index ce91be778eff..1653a348162c 100644
--- a/include/tfm/tfm_builtin_key_ids.h
+++ b/include/tfm/tfm_builtin_key_ids.h
@@ -7,7 +7,7 @@
 #ifndef __TFM_BUILTIN_KEY_IDS_H__
 #define __TFM_BUILTIN_KEY_IDS_H__
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #if defined(NRF_CRACENCORE) || defined(CONFIG_CRACEN_HW_PRESENT)
 
diff --git a/lib/fem_al/fem_al.c b/lib/fem_al/fem_al.c
index eecce4f635b3..719430348bea 100644
--- a/lib/fem_al/fem_al.c
+++ b/lib/fem_al/fem_al.c
@@ -12,7 +12,7 @@
 #ifdef DPPI_PRESENT
 #include <nrfx_dppi.h>
 #endif
-#include <nrf_erratas.h>
+#include <nrfx.h>
 
 #include <zephyr/sys/printk.h>
 
diff --git a/lib/flash_patch/flash_patch.c b/lib/flash_patch/flash_patch.c
index c6b97a402f9f..6756b89b6429 100644
--- a/lib/flash_patch/flash_patch.c
+++ b/lib/flash_patch/flash_patch.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/sys/reboot.h>
 #include <zephyr/init.h>
 
diff --git a/lib/fprotect/fprotect_bprot.c b/lib/fprotect/fprotect_bprot.c
index cf20be2c2b1b..dc65fbc177d6 100644
--- a/lib/fprotect/fprotect_bprot.c
+++ b/lib/fprotect/fprotect_bprot.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #if defined(NRF_BPROT)
 	#include <hal/nrf_bprot.h>
 	#define PROTECT nrf_bprot_nvm_blocks_protection_enable
diff --git a/lib/fprotect/fprotect_rram.c b/lib/fprotect/fprotect_rram.c
index dbc9ce4a7e2e..1c85c9825968 100644
--- a/lib/fprotect/fprotect_rram.c
+++ b/lib/fprotect/fprotect_rram.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 #include <soc.h>
-#include <nrf_erratas.h>
+#include <nrfx.h>
 #include <hal/nrf_rramc.h>
 
 #define RRAMC_REGION_FOR_FPROTECT_DEFAULT_VALUE 0x0000000f
diff --git a/lib/fprotect/fprotect_spu.c b/lib/fprotect/fprotect_spu.c
index d2aafd5b9c9c..7f8429648151 100644
--- a/lib/fprotect/fprotect_spu.c
+++ b/lib/fprotect/fprotect_spu.c
@@ -9,7 +9,7 @@
 #include <hal/nrf_spu.h>
 #include <errno.h>
 #include <soc.h>
-#include <nrf_erratas.h>
+#include <nrfx.h>
 
 
 #define SPU_BLOCK_SIZE CONFIG_FPROTECT_BLOCK_SIZE
diff --git a/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c b/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c
index 3eb74cf9da6b..41da5f0921ab 100644
--- a/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c
+++ b/lib/hw_unique_key/hw_unique_key_cc3xx_kmu.c
@@ -11,7 +11,6 @@
 #include <nrfx.h>
 #include <nrfx_nvmc.h>
 
-#include <mdk/nrf_erratas.h>
 #include <zephyr/logging/log.h>
 
 #define KMU_KEYSLOT_SIZE_WORDS 4
diff --git a/lib/nrf_modem_lib/nrf_modem_os.c b/lib/nrf_modem_lib/nrf_modem_os.c
index 7c76cc750f39..9db7796a6854 100644
--- a/lib/nrf_modem_lib/nrf_modem_os.c
+++ b/lib/nrf_modem_lib/nrf_modem_os.c
@@ -9,7 +9,7 @@
 #include <zephyr/kernel.h>
 #include <nrf_modem.h>
 #include <nrf_modem_os.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <nrf_errno.h>
 #include <errno.h>
 
diff --git a/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c b/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c
index 79bf80cdf6b8..69e07fbce967 100644
--- a/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c
+++ b/modules/nrfxlib/nrf_802154/sl/platform/nrf_802154_hp_timer.c
@@ -19,7 +19,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "nrf.h"
+#include "nrfx.h"
 #include "hal/nrf_timer.h"
 
 #include "nrf_802154_sl_periphs.h"
diff --git a/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h b/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h
index 72211f035232..0994854ec2ee 100644
--- a/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h
+++ b/modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h
@@ -15,7 +15,7 @@
 
 #include <nrf-pinctrl.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #define UART_PIN_INIT(node_id, prop, idx) DT_PROP_BY_IDX(node_id, prop, idx),
 
diff --git a/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h b/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h
index e0111102f28c..465ffddc4340 100644
--- a/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h
+++ b/modules/trusted-firmware-m/tfm_boards/services/include/tfm_platform_user_memory_ranges.h
@@ -11,7 +11,7 @@
 
 #include <tfm_ioctl_core_api.h>
 
-#include "nrf.h"
+#include "nrfx.h"
 
 /*
  * On platforms like nrf53 we provide a service for reading out
diff --git a/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c b/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c
index 86de76a1bc16..5122f9d6a2da 100644
--- a/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c
+++ b/modules/trusted-firmware-m/tfm_boards/src/log_memory_protection.c
@@ -7,8 +7,7 @@
 #include <cmsis.h>
 #include <tfm_spm_log.h>
 #include <mpu_armv8m_drv.h>
-#include <nrf.h>
-#include <nrf_peripherals.h>
+#include <nrfx.h>
 #include <array.h>
 #include <nrfx_nvmc.h>
 
diff --git a/samples/bluetooth/direct_test_mode/src/dtm.c b/samples/bluetooth/direct_test_mode/src/dtm.c
index ba5d728e48a2..79ce90ce6bc8 100644
--- a/samples/bluetooth/direct_test_mode/src/dtm.c
+++ b/samples/bluetooth/direct_test_mode/src/dtm.c
@@ -37,7 +37,6 @@
 #include <helpers/nrfx_gppi.h>
 #include <nrfx_timer.h>
 
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/bluetooth/direct_test_mode/src/dtm_hw.c b/samples/bluetooth/direct_test_mode/src/dtm_hw.c
index 85dec3b5c324..ecabe4bb20da 100644
--- a/samples/bluetooth/direct_test_mode/src/dtm_hw.c
+++ b/samples/bluetooth/direct_test_mode/src/dtm_hw.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include "nrf.h"
+#include "nrfx.h"
 
 #include "dtm_hw.h"
 #include "dtm_hw_config.h"
diff --git a/samples/crypto/psa_tls/src/main.c b/samples/crypto/psa_tls/src/main.c
index e9b4f64595f0..882db46708de 100644
--- a/samples/crypto/psa_tls/src/main.c
+++ b/samples/crypto/psa_tls/src/main.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
index 7e8632895301..f3e4ede373de 100644
--- a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
+++ b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_client_non_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
index 8397231cea95..6867710ee50b 100644
--- a/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
+++ b/samples/crypto/psa_tls/src/non-secure/psa_tls_credentials_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_server_non_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_dtls_functions_client.c b/samples/crypto/psa_tls/src/psa_dtls_functions_client.c
index 6a4c40d4c77b..167777717d4b 100644
--- a/samples/crypto/psa_tls/src/psa_dtls_functions_client.c
+++ b/samples/crypto/psa_tls/src/psa_dtls_functions_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_dtls_client);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_dtls_functions_server.c b/samples/crypto/psa_tls/src/psa_dtls_functions_server.c
index 59fe44f4fb3d..58e938f6ea25 100644
--- a/samples/crypto/psa_tls/src/psa_dtls_functions_server.c
+++ b/samples/crypto/psa_tls/src/psa_dtls_functions_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_dtls_server);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_common.c b/samples/crypto/psa_tls/src/psa_tls_common.c
index 5beeaec059e9..bffd2da414f4 100644
--- a/samples/crypto/psa_tls/src/psa_tls_common.c
+++ b/samples/crypto/psa_tls/src/psa_tls_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_functions_client.c b/samples/crypto/psa_tls/src/psa_tls_functions_client.c
index bf003656d52f..ee8b8031c3db 100644
--- a/samples/crypto/psa_tls/src/psa_tls_functions_client.c
+++ b/samples/crypto/psa_tls/src/psa_tls_functions_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_client);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/psa_tls_functions_server.c b/samples/crypto/psa_tls/src/psa_tls_functions_server.c
index e0a556f1e5c3..3ea0030cd467 100644
--- a/samples/crypto/psa_tls/src/psa_tls_functions_server.c
+++ b/samples/crypto/psa_tls/src/psa_tls_functions_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_server);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <errno.h>
 #include <zephyr/kernel.h>
 #include <zephyr/net/socket.h>
diff --git a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
index 3f4a1b9a03c6..d7c7255130a0 100644
--- a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
+++ b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_client.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_client_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
index 24a14b9ca901..f1b77f4da9dd 100644
--- a/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
+++ b/samples/crypto/psa_tls/src/secure/psa_tls_credentials_server.c
@@ -7,7 +7,7 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(psa_tls_credentials_server_secure);
 
-#include <nrf.h>
+#include <nrfx.h>
 #include <zephyr/kernel.h>
 #include <zephyr/linker/sections.h>
 #include <zephyr/net/tls_credentials.h>
diff --git a/samples/esb/esb_monitor/src/main.c b/samples/esb/esb_monitor/src/main.c
index c2b1c841a1f2..ddd2c314cc87 100644
--- a/samples/esb/esb_monitor/src/main.c
+++ b/samples/esb/esb_monitor/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
@@ -18,7 +18,6 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/esb/esb_prx/src/main.c b/samples/esb/esb_prx/src/main.c
index 7e74e9ecb580..89d9cc361ec0 100644
--- a/samples/esb/esb_prx/src/main.c
+++ b/samples/esb/esb_prx/src/main.c
@@ -10,7 +10,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <zephyr/kernel.h>
 #include <zephyr/types.h>
@@ -18,7 +18,6 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/esb/esb_ptx/src/main.c b/samples/esb/esb_ptx/src/main.c
index b5ad74c363a4..fcb51ae3817e 100644
--- a/samples/esb/esb_ptx/src/main.c
+++ b/samples/esb/esb_ptx/src/main.c
@@ -8,7 +8,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <zephyr/device.h>
 #include <zephyr/devicetree.h>
@@ -18,7 +18,6 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/nrf5340/empty_app_core/README.rst b/samples/nrf5340/empty_app_core/README.rst
index a1fd28b87ff2..f38ee44743f0 100644
--- a/samples/nrf5340/empty_app_core/README.rst
+++ b/samples/nrf5340/empty_app_core/README.rst
@@ -55,7 +55,6 @@ Dependencies
 
 This sample has the following `nrfx`_ dependencies:
 
-* ``nrfx/nrf.h``
 * ``nrfx/nrfx.h``
 
 In addition, it uses the following Zephyr libraries:
diff --git a/samples/nrf5340/empty_app_core/src/main.c b/samples/nrf5340/empty_app_core/src/main.c
index 764f7bdfe69e..bdd6260ddf47 100644
--- a/samples/nrf5340/empty_app_core/src/main.c
+++ b/samples/nrf5340/empty_app_core/src/main.c
@@ -7,7 +7,6 @@
 #include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/init.h>
-#include <nrf.h>
 #include <nrfx.h>
 
 #define LFXO_NODE DT_NODELABEL(lfxo)
diff --git a/samples/peripheral/radio_test/src/main.c b/samples/peripheral/radio_test/src/main.c
index 7261c4f0b9f7..fe7ceb604581 100644
--- a/samples/peripheral/radio_test/src/main.c
+++ b/samples/peripheral/radio_test/src/main.c
@@ -13,7 +13,7 @@
 #if defined(CONFIG_CLOCK_CONTROL_NRF2)
 #include <hal/nrf_lrcconf.h>
 #endif
-#include <nrf_erratas.h>
+#include <nrfx.h>
 #if NRF54L_ERRATA_20_PRESENT
 #include <hal/nrf_power.h>
 #endif /* NRF54L_ERRATA_20_PRESENT */
diff --git a/samples/peripheral/radio_test/src/radio_test.c b/samples/peripheral/radio_test/src/radio_test.c
index 3f19ab7dac51..f933ef9a1a48 100644
--- a/samples/peripheral/radio_test/src/radio_test.c
+++ b/samples/peripheral/radio_test/src/radio_test.c
@@ -28,7 +28,6 @@
 #include "fem_al/fem_al.h"
 #endif /* CONFIG_FEM */
 
-#include <nrf_erratas.h>
 #if NRF54H_ERRATA_216_PRESENT
 #include <zephyr/drivers/mbox.h>
 #endif /* NRF54H_ERRATA_216_PRESENT */
diff --git a/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c b/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c
index 281ca2dc12f0..9846c5540d6d 100644
--- a/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c
+++ b/subsys/bootloader/bl_crypto/bl_crypto_cc310_common.c
@@ -8,7 +8,7 @@
 #include <zephyr/types.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/toolchain.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <nrf_cc310_bl_init.h>
 #include <pm_config.h>
 
diff --git a/subsys/bootloader/bl_storage/bl_storage.c b/subsys/bootloader/bl_storage/bl_storage.c
index 4596fa400a06..db26b2816198 100644
--- a/subsys/bootloader/bl_storage/bl_storage.c
+++ b/subsys/bootloader/bl_storage/bl_storage.c
@@ -8,7 +8,7 @@
 #include <zephyr/autoconf.h>
 #include <string.h>
 #include <errno.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <assert.h>
 #if !defined(CONFIG_BUILD_WITH_TFM)
 #include <zephyr/kernel.h>
diff --git a/subsys/esb/esb.c b/subsys/esb/esb.c
index be8ec038c935..8f93721501ea 100644
--- a/subsys/esb/esb.c
+++ b/subsys/esb/esb.c
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 #include <errno.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <esb.h>
 #include <stddef.h>
 #include <string.h>
-#include <nrf_erratas.h>
 
 #include <hal/nrf_radio.h>
 #include <hal/nrf_timer.h>
diff --git a/subsys/nfc/lib/platform.c b/subsys/nfc/lib/platform.c
index 4ca00fb83b47..c6c86d20a3ff 100644
--- a/subsys/nfc/lib/platform.c
+++ b/subsys/nfc/lib/platform.c
@@ -18,8 +18,6 @@
 #include <zephyr/sys/__assert.h>
 #include <zephyr/sys/onoff.h>
 
-#include <nrf_erratas.h>
-
 #include <nrfx_nfct.h>
 #include <nrfx_timer.h>
 #include <hal/nrf_ficr.h>
diff --git a/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h b/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h
index 8096193eb88c..0a0c8a374676 100644
--- a/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h
+++ b/subsys/nrf_security/src/drivers/cracen/common/include/security/cracen.h
@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <nrf.h>
+#include <nrfx.h>
 
 #include <hal/nrf_cracen.h>
 
diff --git a/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c b/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c
index a6fc0028b126..d3633722c4b0 100644
--- a/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c
+++ b/subsys/nrf_security/src/drivers/cracen/cracenpsa/src/lib_kmu.c
@@ -10,7 +10,7 @@
 
 #include <zephyr/kernel.h>
 
-#include <nrf.h>
+#include <nrfx.h>
 
 #if defined(CONFIG_SOC_SERIES_NRF54LX)
 #include <nrfx_rramc.h>
diff --git a/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h b/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h
index d736cf2c6af1..036832f8dcd9 100644
--- a/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h
+++ b/subsys/nrf_security/src/drivers/cracen/sxsymcrypt/src/hw.h
@@ -8,7 +8,7 @@
 #define HW_HEADER_FILE
 
 #include <cracen/membarriers.h>
-#include <nrf.h>
+#include <nrfx.h>
 #include <stdint.h>
 #include <stddef.h>
 #include <sxsymcrypt/internal.h>
diff --git a/west.yml b/west.yml
index bef1f072851c..54a00003009a 100644
--- a/west.yml
+++ b/west.yml
@@ -66,7 +66,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: c475e9f2c9eedd5aef47e2e0a36eb02d05e87a7f
+      revision: pull/3355/head
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -280,7 +280,7 @@ manifest:
       path: nrfx
       groups:
         - nrfx
-      revision: 98167a75a6ed8eb530c4e2977118619b51fd75b0
+      revision: pull/977/head
 
   # West-related configuration for the nrf repository.
   self: