refactor: move `inc/hf/arch/plat/ffa` to `inc/hf/ffa`
Change-Id: I05c2cd1aa3753cd60021015c4582831eb03db3c9
Signed-off-by: Karl Meakin <karl.meakin@arm.com>
diff --git a/src/init.c b/src/init.c
index 8b73bed..957392d 100644
--- a/src/init.c
+++ b/src/init.c
@@ -11,9 +11,6 @@
#include <stdalign.h>
#include <stddef.h>
-#include "hf/arch/other_world.h"
-#include "hf/arch/plat/ffa.h"
-
#include "hf/api.h"
#include "hf/boot_flow.h"
#include "hf/boot_params.h"
@@ -21,6 +18,7 @@
#include "hf/cpu.h"
#include "hf/dlog.h"
#include "hf/fdt_handler.h"
+#include "hf/ffa.h"
#include "hf/load.h"
#include "hf/manifest.h"
#include "hf/mm.h"
@@ -31,9 +29,6 @@
#include "hf/plat/interrupts.h"
#include "hf/plat/iommu.h"
#include "hf/std.h"
-#include "hf/vm.h"
-
-#include "vmapi/hf/call.h"
alignas(MM_PPOOL_ENTRY_SIZE) char ptable_buf[MM_PPOOL_ENTRY_SIZE * HEAP_PAGES];