diff --git a/scripts/mbedtls_dev/c_wrapper_generator.py b/scripts/mbedtls_dev/c_wrapper_generator.py
index de99ddb9ae..2bed44b2ce 100644
--- a/scripts/mbedtls_dev/c_wrapper_generator.py
+++ b/scripts/mbedtls_dev/c_wrapper_generator.py
@@ -79,7 +79,11 @@ extern "C" {{
 """
                       .format(guard=self.header_guard))
         out.write("""
-#include <mbedtls/build_info.h>
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
 """)
 
     def _write_epilogue(self, out: typing_util.Writable, header: bool) -> None:
diff --git a/tests/scripts/generate_psa_wrappers.py b/tests/scripts/generate_psa_wrappers.py
index 9bb6eb758b..f7a193adad 100755
--- a/tests/scripts/generate_psa_wrappers.py
+++ b/tests/scripts/generate_psa_wrappers.py
@@ -31,10 +31,18 @@ class PSAWrapperGenerator(c_wrapper_generator.Base):
 
     _SKIP_FUNCTIONS = frozenset([
         'mbedtls_psa_external_get_random', # not a library function
+        'psa_aead_abort', # not implemented yet
+        'psa_aead_decrypt_setup', # not implemented yet
+        'psa_aead_encrypt_setup', # not implemented yet
+        'psa_aead_finish', # not implemented yet
+        'psa_aead_generate_nonce', # not implemented yet
+        'psa_aead_set_lengths', # not implemented yet
+        'psa_aead_set_nonce', # not implemented yet
+        'psa_aead_update', # not implemented yet
+        'psa_aead_update_ad', # not implemented yet
+        'psa_aead_verify', # not implemented yet
         'psa_get_key_domain_parameters', # client-side function
         'psa_get_key_slot_number', # client-side function
-        'psa_key_derivation_verify_bytes', # not implemented yet
-        'psa_key_derivation_verify_key', # not implemented yet
         'psa_set_key_domain_parameters', # client-side function
     ])