diff --git a/components/esp_common/include/esp_attr.h b/components/esp_common/include/esp_attr.h
index b3c9b10807..2ce549b6fe 100644
--- a/components/esp_common/include/esp_attr.h
+++ b/components/esp_common/include/esp_attr.h
@@ -58,7 +58,7 @@ extern "C" {
 #define DMA_ATTR WORD_ALIGNED_ATTR DRAM_ATTR
 
 // Forces the data to be tightly packed with minimum required padding and no extra bytes are added for alignment
-#define PACKED_ATTR __attribute__((packed));
+#define PACKED_ATTR __attribute__((packed))
 
 // Forces a function to be inlined
 #define FORCE_INLINE_ATTR static inline __attribute__((always_inline))
diff --git a/components/hal/esp32p4/include/hal/huk_hal.h b/components/hal/esp32p4/include/hal/huk_hal.h
index 861d610fe2..796f2b8f94 100644
--- a/components/hal/esp32p4/include/hal/huk_hal.h
+++ b/components/hal/esp32p4/include/hal/huk_hal.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "soc/soc_caps.h"
+
 #if SOC_KEY_MANAGER_SUPPORTED
 #include "hal/huk_types.h"
 #include <stdint.h>
diff --git a/components/hal/esp32p4/include/hal/huk_ll.h b/components/hal/esp32p4/include/hal/huk_ll.h
index 404dbafab5..ce87ac8984 100644
--- a/components/hal/esp32p4/include/hal/huk_ll.h
+++ b/components/hal/esp32p4/include/hal/huk_ll.h
@@ -10,6 +10,9 @@
  ******************************************************************************/
 
 #pragma once
+
+#include "soc/soc_caps.h"
+
 #if SOC_KEY_MANAGER_SUPPORTED
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/components/hal/esp32p4/include/hal/key_mgr_hal.h b/components/hal/esp32p4/include/hal/key_mgr_hal.h
index 7ef3f14274..27e4a76e39 100644
--- a/components/hal/esp32p4/include/hal/key_mgr_hal.h
+++ b/components/hal/esp32p4/include/hal/key_mgr_hal.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "soc/soc_caps.h"
+
 #if SOC_KEY_MANAGER_SUPPORTED
 #include "hal/key_mgr_types.h"
 
diff --git a/components/hal/esp32p4/include/hal/key_mgr_ll.h b/components/hal/esp32p4/include/hal/key_mgr_ll.h
index 72395578e4..17ae6263d1 100644
--- a/components/hal/esp32p4/include/hal/key_mgr_ll.h
+++ b/components/hal/esp32p4/include/hal/key_mgr_ll.h
@@ -10,6 +10,9 @@
  ******************************************************************************/
 
 #pragma once
+
+#include "soc/soc_caps.h"
+
 #if SOC_KEY_MANAGER_SUPPORTED
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/components/hal/key_mgr_hal.c b/components/hal/key_mgr_hal.c
index 9b6c3ae3d2..0db46c805b 100644
--- a/components/hal/key_mgr_hal.c
+++ b/components/hal/key_mgr_hal.c
@@ -59,7 +59,7 @@ void key_mgr_hal_write_assist_info(const uint8_t *assist_info_buf, const size_t
     key_mgr_ll_write_assist_info(assist_info_buf, data_len);
 }
 
-void key_mgr_hal_assist_assist_info(uint8_t *assist_info_buf)
+void key_mgr_hal_read_assist_info(uint8_t *assist_info_buf)
 {
     key_mgr_ll_read_assist_info(assist_info_buf);
 }