diff --git a/framework b/framework
index 4a841219f..1e7b5d54d 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 4a841219ff9440f6a723e9e9612a33c44ad1e2f9
+Subproject commit 1e7b5d54d3823b65fd4755bcf60f9ca39cfcbca3
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index bfdfb7416..1290a35ed 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -3,7 +3,7 @@ option(INSTALL_TF_PSA_CRYPTO_HEADERS "Install TF PSA Crypto headers." ON)
 if(INSTALL_TF_PSA_CRYPTO_HEADERS)
     file(GLOB psa_headers "psa/*.h")
     file(GLOB tf-psa-crypto_headers "tf-psa-crypto/*.h")
-    file(GLOB mbedtls_crypto_headers "../drivers/builtin/include/mbedtls/*.h")
+    file(GLOB mbedtls_crypto_headers "../drivers/builtin/include/mbedtls/*.h" "mbedtls/*.h")
 
     install(FILES ${psa_headers}
         DESTINATION include/psa
diff --git a/drivers/builtin/include/mbedtls/asn1.h b/include/mbedtls/asn1.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/asn1.h
rename to include/mbedtls/asn1.h
diff --git a/drivers/builtin/include/mbedtls/asn1write.h b/include/mbedtls/asn1write.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/asn1write.h
rename to include/mbedtls/asn1write.h
diff --git a/drivers/builtin/include/mbedtls/base64.h b/include/mbedtls/base64.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/base64.h
rename to include/mbedtls/base64.h
diff --git a/drivers/builtin/include/mbedtls/constant_time.h b/include/mbedtls/constant_time.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/constant_time.h
rename to include/mbedtls/constant_time.h
diff --git a/drivers/builtin/include/mbedtls/lms.h b/include/mbedtls/lms.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/lms.h
rename to include/mbedtls/lms.h
diff --git a/drivers/builtin/include/mbedtls/memory_buffer_alloc.h b/include/mbedtls/memory_buffer_alloc.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/memory_buffer_alloc.h
rename to include/mbedtls/memory_buffer_alloc.h
diff --git a/drivers/builtin/include/mbedtls/nist_kw.h b/include/mbedtls/nist_kw.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/nist_kw.h
rename to include/mbedtls/nist_kw.h
diff --git a/drivers/builtin/include/mbedtls/pem.h b/include/mbedtls/pem.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/pem.h
rename to include/mbedtls/pem.h
diff --git a/drivers/builtin/include/mbedtls/pk.h b/include/mbedtls/pk.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/pk.h
rename to include/mbedtls/pk.h
diff --git a/drivers/builtin/include/mbedtls/platform.h b/include/mbedtls/platform.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/platform.h
rename to include/mbedtls/platform.h
diff --git a/drivers/builtin/include/mbedtls/platform_time.h b/include/mbedtls/platform_time.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/platform_time.h
rename to include/mbedtls/platform_time.h
diff --git a/drivers/builtin/include/mbedtls/platform_util.h b/include/mbedtls/platform_util.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/platform_util.h
rename to include/mbedtls/platform_util.h
diff --git a/drivers/builtin/include/mbedtls/psa_util.h b/include/mbedtls/psa_util.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/psa_util.h
rename to include/mbedtls/psa_util.h
diff --git a/drivers/builtin/include/mbedtls/threading.h b/include/mbedtls/threading.h
similarity index 100%
rename from drivers/builtin/include/mbedtls/threading.h
rename to include/mbedtls/threading.h