diff --git a/library/psa_crypto_storage.c b/library/psa_crypto_storage.c
index 687269b07..b4e4076e1 100644
--- a/library/psa_crypto_storage.c
+++ b/library/psa_crypto_storage.c
@@ -38,6 +38,7 @@
 #if defined(MBEDTLS_PLATFORM_C)
 #include "mbedtls/platform.h"
 #else
+#include <stdlib.h>
 #define mbedtls_calloc   calloc
 #define mbedtls_free     free
 #endif
diff --git a/library/psa_crypto_storage_file.c b/library/psa_crypto_storage_file.c
index 87420be98..d7c33624e 100644
--- a/library/psa_crypto_storage_file.c
+++ b/library/psa_crypto_storage_file.c
@@ -36,6 +36,7 @@
 #if defined(MBEDTLS_PLATFORM_C)
 #include "mbedtls/platform.h"
 #else
+#include <stdio.h>
 #define mbedtls_snprintf snprintf
 #endif
 
diff --git a/programs/psa/crypto_examples.c b/programs/psa/crypto_examples.c
index d7a667b7f..9947a70bc 100644
--- a/programs/psa/crypto_examples.c
+++ b/programs/psa/crypto_examples.c
@@ -5,7 +5,10 @@
 #include "mbedtls/platform.h"
 #else
 #include <stdio.h>
+#include <stdlib.h>
+#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
 #define mbedtls_printf printf
+#define mbedtls_exit exit
 #endif
 
 #define ASSERT( predicate )                                                   \
diff --git a/programs/psa/key_ladder_demo.c b/programs/psa/key_ladder_demo.c
index 0943bf53c..c9d76763e 100644
--- a/programs/psa/key_ladder_demo.c
+++ b/programs/psa/key_ladder_demo.c
@@ -66,6 +66,7 @@
 #define mbedtls_calloc       calloc
 #define mbedtls_free         free
 #define mbedtls_printf       printf
+#define mbedtls_exit         exit
 #endif
 #include <stdio.h>
 #include <string.h>