diff --git a/library/psa_crypto_storage.c b/library/psa_crypto_storage.c
index f5ed2693f..b485c50c6 100644
--- a/library/psa_crypto_storage.c
+++ b/library/psa_crypto_storage.c
@@ -18,6 +18,8 @@
  *  limitations under the License.
  */
 
+#include "common.h"
+
 #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
 
 #include <stdlib.h>
@@ -42,8 +44,6 @@
 #define mbedtls_free     free
 #endif
 
-#include "common.h"
-
 /****************************************************************/
 /* Key storage */
 /****************************************************************/
diff --git a/library/psa_its_file.c b/library/psa_its_file.c
index 08503f276..c4782cdba 100644
--- a/library/psa_its_file.c
+++ b/library/psa_its_file.c
@@ -18,6 +18,8 @@
  *  limitations under the License.
  */
 
+#include "common.h"
+
 #if defined(MBEDTLS_PSA_ITS_FILE_C)
 
 #if defined(MBEDTLS_PLATFORM_C)
@@ -32,8 +34,6 @@
 
 #include "psa_crypto_its.h"
 
-#include "common.h"
-
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>