libc: Update includes
Reflect the changes in the structure of libc.
NB: the include of stdarg.h in nvm_results_helpers.c is not in alphabetical
order because it needs to be included before stdio.h. Fixing this would require
further changes.
Change-Id: I07f62a3450802833408ff3e1f950fd3b643e5e33
Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
diff --git a/tftf/framework/main.c b/tftf/framework/main.c
index 7f987c0..67f565d 100644
--- a/tftf/framework/main.c
+++ b/tftf/framework/main.c
@@ -17,8 +17,8 @@
#include <power_management.h>
#include <psci.h>
#include <sgi.h>
+#include <stdint.h>
#include <string.h>
-#include <sys/types.h>
#include <tftf.h>
#include <tftf_lib.h>
#include <timer.h>
diff --git a/tftf/framework/nvm_results_helpers.c b/tftf/framework/nvm_results_helpers.c
index 34ef19f..78df642 100644
--- a/tftf/framework/nvm_results_helpers.c
+++ b/tftf/framework/nvm_results_helpers.c
@@ -4,14 +4,18 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
+/*
+ * The include of stdarg.h is not in alphabetical order because it needs to be
+ * included before stdio.h. Fixing this would require further changes.
+ */
#include <arch_helpers.h>
+#include <stdarg.h>
#include <assert.h>
#include <debug.h>
#include <nvm.h>
#include <platform.h>
#include <spinlock.h>
-#include <stdarg.h>
-#include <string.h>
+#include <stdio.h>
/*
* Temporary buffer to store 1 test output.
diff --git a/tftf/framework/timer/timer_framework.c b/tftf/framework/timer/timer_framework.c
index 38106cf..d856abe 100644
--- a/tftf/framework/timer/timer_framework.c
+++ b/tftf/framework/timer/timer_framework.c
@@ -17,7 +17,7 @@
#include <sgi.h>
#include <spinlock.h>
#include <stddef.h>
-#include <sys/types.h>
+#include <stdint.h>
#include <tftf.h>
#include <timer.h>
diff --git a/tftf/tests/runtime_services/standard_service/pmf/api_tests/runtime_instr/test_pmf_rt_instr.c b/tftf/tests/runtime_services/standard_service/pmf/api_tests/runtime_instr/test_pmf_rt_instr.c
index 3a3701e..3c1fdaf 100644
--- a/tftf/tests/runtime_services/standard_service/pmf/api_tests/runtime_instr/test_pmf_rt_instr.c
+++ b/tftf/tests/runtime_services/standard_service/pmf/api_tests/runtime_instr/test_pmf_rt_instr.c
@@ -13,7 +13,7 @@
#include <psci.h>
#include <smccc.h>
#include <string.h>
-#include <sys/errno.h>
+#include <errno.h>
#include <tftf_lib.h>
#include <timer.h>