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/spm/cactus/cactus.h b/spm/cactus/cactus.h
index 2f12f5c..0b06eb2 100644
--- a/spm/cactus/cactus.h
+++ b/spm/cactus/cactus.h
@@ -7,7 +7,7 @@
#ifndef __CACTUS_H__
#define __CACTUS_H__
-#include <types.h>
+#include <stdint.h>
/* Linker symbols used to figure out the memory layout of Cactus. */
extern uintptr_t __TEXT_START__, __TEXT_END__;
diff --git a/spm/cactus/cactus_tests_memory_attributes.c b/spm/cactus/cactus_tests_memory_attributes.c
index 3b56d60..bed6f0b 100644
--- a/spm/cactus/cactus_tests_memory_attributes.c
+++ b/spm/cactus/cactus_tests_memory_attributes.c
@@ -12,7 +12,7 @@
#include <sp_helpers.h>
#include <sprt_svc.h>
#include <stdio.h>
-#include <types.h>
+#include <stdint.h>
#include <xlat_tables_defs.h>
#include "cactus.h"
diff --git a/spm/cactus/cactus_tests_misc.c b/spm/cactus/cactus_tests_misc.c
index 50b8e6a..39eb752 100644
--- a/spm/cactus/cactus_tests_misc.c
+++ b/spm/cactus/cactus_tests_misc.c
@@ -11,7 +11,7 @@
#include <spm_svc.h>
#include <sprt_client.h>
#include <sprt_svc.h>
-#include <types.h>
+#include <stdint.h>
#include "cactus.h"
#include "cactus_tests.h"
diff --git a/spm/cactus/cactus_tests_system_setup.c b/spm/cactus/cactus_tests_system_setup.c
index 685d82d..cead8e3 100644
--- a/spm/cactus/cactus_tests_system_setup.c
+++ b/spm/cactus/cactus_tests_system_setup.c
@@ -7,7 +7,7 @@
#include <arch_helpers.h>
#include <debug.h>
#include <sp_helpers.h>
-#include <types.h>
+#include <stdint.h>
#include "cactus.h"
diff --git a/spm/common/sp_helpers.h b/spm/common/sp_helpers.h
index 1bd4425..d06fec3 100644
--- a/spm/common/sp_helpers.h
+++ b/spm/common/sp_helpers.h
@@ -8,7 +8,6 @@
#define SP_HELPERS_H
#include <stdint.h>
-#include <sys/types.h>
typedef struct {
u_register_t fid;
diff --git a/spm/ivy/ivy.h b/spm/ivy/ivy.h
index b312540..c5cac2e 100644
--- a/spm/ivy/ivy.h
+++ b/spm/ivy/ivy.h
@@ -7,7 +7,7 @@
#ifndef IVY_H
#define IVY_H
-#include <types.h>
+#include <stdint.h>
/* Linker symbols used to figure out the memory layout of Ivy. */
extern uintptr_t __TEXT_START__, __TEXT_END__;