diff --git a/cmsis/core_cmSecureAccess.h b/cmsis/core_cmSecureAccess.h
index 3511e80cb4..c50c61f5a8 100644
--- a/cmsis/core_cmSecureAccess.h
+++ b/cmsis/core_cmSecureAccess.h
@@ -42,7 +42,7 @@
 /* ###########################  Core Secure Access  ########################### */
 
 #ifdef FEATURE_UVISOR
-#include "uvisor-lib.h"
+#include "uvisor-lib/uvisor-lib.h"
 
 /* Secure uVisor implementation. */
 
diff --git a/features/FEATURE_UVISOR/includes/uvisor-lib/rtx/rtx_box_index.h b/features/FEATURE_UVISOR/includes/uvisor-lib/rtx/rtx_box_index.h
index ebdf45087a..7751e2353a 100644
--- a/features/FEATURE_UVISOR/includes/uvisor-lib/rtx/rtx_box_index.h
+++ b/features/FEATURE_UVISOR/includes/uvisor-lib/rtx/rtx_box_index.h
@@ -18,6 +18,7 @@
 #define __RTX_BOX_INDEX_H__
 
 #include "cmsis_os.h"
+#include "api/inc/vmpu_exports.h"
 
 #ifdef __cplusplus
 extern "C" {