diff --git a/esp_encrypted_img/test/test.c b/esp_encrypted_img/test/test.c
index 7ccb5c4..208ca10 100644
--- a/esp_encrypted_img/test/test.c
+++ b/esp_encrypted_img/test/test.c
@@ -7,7 +7,7 @@
 #include <freertos/FreeRTOS.h>
 
 #include "unity.h"
-#include "esp_system.h"
+#include "esp_random.h"
 #include "esp_encrypted_img.h"
 
 extern const uint8_t rsa_private_pem_start[] asm("_binary_test_rsa_private_key_pem_start");
diff --git a/libsodium/port/randombytes_esp32.c b/libsodium/port/randombytes_esp32.c
index 4d98538..b47dfba 100644
--- a/libsodium/port/randombytes_esp32.c
+++ b/libsodium/port/randombytes_esp32.c
@@ -3,8 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
+#include "sdkconfig.h"
+#include "esp_random.h"
 #include "randombytes_internal.h"
-#include "esp_system.h"
 
 static const char *randombytes_esp32xx_implementation_name(void)
 {