diff --git a/pico_hsm_sdk_import.cmake b/pico_hsm_sdk_import.cmake
index a2f9b3a..0a5006f 100644
--- a/pico_hsm_sdk_import.cmake
+++ b/pico_hsm_sdk_import.cmake
@@ -76,6 +76,9 @@ if (NOT TARGET pico_hsm_sdk)
             ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha1.c
             ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha256.c
             ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/sha512.c
+            ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/chachapoly.c
+            ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/chacha20.c
+            ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/poly1305.c
             )
 
     if (${HSM_DRIVER} STREQUAL "ccid")
@@ -100,9 +103,6 @@ if (NOT TARGET pico_hsm_sdk)
                 ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pk_wrap.c
                 ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pkwrite.c
                 ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/pkwrite.c
-                ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/chachapoly.c
-                ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/chacha20.c
-                ${CMAKE_CURRENT_LIST_DIR}/mbedtls/library/poly1305.c
                 )
         target_include_directories(pico_hsm_sdk INTERFACE
                 ${CMAKE_CURRENT_LIST_DIR}/src/usb/hid