From d6ea063371bc6900c4b7807e4e09bfb0965e665c Mon Sep 17 00:00:00 2001
From: Joe Subbiani <joe.subbiani@arm.com>
Date: Wed, 18 Aug 2021 12:57:54 +0100
Subject: [PATCH] Move #include "common.h" where config.h used to be

After removing config.h, the inclusion of it in common.h would be too late
in the code. Therefore common.h has been moved to where config.h used to
be included.

Signed-off-by: Joe Subbiani <joe.subbiani@arm.com>
---
 library/psa_crypto_storage.c | 4 ++--
 library/psa_its_file.c       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/psa_crypto_storage.c b/library/psa_crypto_storage.c
index f5ed2693f0..b485c50c69 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 08503f276a..c4782cdba3 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>