From 94ab2ccef750848fe0f58bcfb90f74570818d48e Mon Sep 17 00:00:00 2001
From: Pol Henarejos <pol.henarejos@cttc.es>
Date: Sun, 8 Mar 2026 22:05:30 +0100
Subject: [PATCH] Mark submodules as system includes.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
---
 pico_keys_sdk_import.cmake | 19 ++++++++++++-------
 src/rng/random.h           |  3 +++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pico_keys_sdk_import.cmake b/pico_keys_sdk_import.cmake
index bb233d8..595dd3f 100644
--- a/pico_keys_sdk_import.cmake
+++ b/pico_keys_sdk_import.cmake
@@ -329,6 +329,10 @@ if(ENABLE_PQC)
         ${CMAKE_CURRENT_LIST_DIR}/mlkem/mlkem
         ${CMAKE_CURRENT_LIST_DIR}/config/mlkem
     )
+    list(APPEND SYSTEM_INCLUDES
+        ${CMAKE_CURRENT_LIST_DIR}/mlkem/mlkem
+        ${CMAKE_CURRENT_LIST_DIR}/config/mlkem
+    )
     add_compile_definitions(
         MLK_CONFIG_NAMESPACE_PREFIX=mlkem
         MLK_CONFIG_MULTILEVEL_BUILD=1
@@ -383,9 +387,13 @@ list(APPEND INCLUDES
     ${CMAKE_CURRENT_LIST_DIR}/src/fs
     ${CMAKE_CURRENT_LIST_DIR}/src/rng
     ${CMAKE_CURRENT_LIST_DIR}/src/led
-    ${CMAKE_CURRENT_LIST_DIR}/mbedtls/include
     ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library
 )
+set(SYSTEM_INCLUDES
+    ${SYSTEM_INCLUDES}
+    ${CMAKE_CURRENT_LIST_DIR}/mbedtls/include
+    ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src
+)
 
 if(USB_ITF_HID)
     list(APPEND MBEDTLS_SOURCES
@@ -404,10 +412,6 @@ set(CBOR_SOURCES
     ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src/cborparser_dup_string.c
 )
 
-list(APPEND INCLUDES
-    ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src
-)
-
 set(LIBRARIES)
 if(NOT SKIP_MBEDTLS_FOR_OPENSSL_EMULATION)
     list(APPEND LIBRARIES mbedtls)
@@ -419,11 +423,11 @@ endif()
 if(NOT ESP_PLATFORM)
     if(NOT SKIP_MBEDTLS_FOR_OPENSSL_EMULATION)
         add_library(mbedtls STATIC ${MBEDTLS_SOURCES})
-        target_include_directories(mbedtls PUBLIC ${CMAKE_CURRENT_LIST_DIR}/mbedtls/include)
+        target_include_directories(mbedtls SYSTEM PUBLIC ${CMAKE_CURRENT_LIST_DIR}/mbedtls/include)
     endif()
     if(USB_ITF_HID)
         add_library(tinycbor STATIC ${CBOR_SOURCES})
-        target_include_directories(tinycbor PUBLIC ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src)
+        target_include_directories(tinycbor SYSTEM PUBLIC ${CMAKE_CURRENT_LIST_DIR}/tinycbor/src)
         list(APPEND LIBRARIES tinycbor)
     endif()
 endif()
@@ -636,5 +640,6 @@ if(NOT TARGET pico_keys_sdk)
     endif()
     target_sources(pico_keys_sdk INTERFACE ${PICO_KEYS_SOURCES})
     target_include_directories(pico_keys_sdk INTERFACE ${INCLUDES})
+    target_include_directories(pico_keys_sdk SYSTEM INTERFACE ${SYSTEM_INCLUDES})
     target_link_libraries(pico_keys_sdk INTERFACE ${LIBRARIES})
 endif()
diff --git a/src/rng/random.h b/src/rng/random.h
index 13fd0a0..955f203 100644
--- a/src/rng/random.h
+++ b/src/rng/random.h
@@ -30,5 +30,8 @@ void random_bytes_free(const uint8_t *p);
 
 /* iterator returning a byta at a time */
 extern int random_gen(void *arg, unsigned char *output, size_t output_len);
+#ifdef ENABLE_PQC
+extern void randombytes(uint8_t *buf, size_t n);
+#endif
 
 #endif