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/arch/aarch64/hypervisor/handler.c b/src/arch/aarch64/hypervisor/handler.c
index c4eaf07..d501eac 100644
--- a/src/arch/aarch64/hypervisor/handler.c
+++ b/src/arch/aarch64/hypervisor/handler.c
@@ -11,14 +11,8 @@
 #include "hf/arch/barriers.h"
 #include "hf/arch/gicv3.h"
 #include "hf/arch/host_timer.h"
-#include "hf/arch/init.h"
 #include "hf/arch/memcpy_trapped.h"
 #include "hf/arch/mmu.h"
-#include "hf/arch/plat/ffa.h"
-#include "hf/arch/plat/ffa/indirect_messaging.h"
-#include "hf/arch/plat/ffa/interrupts.h"
-#include "hf/arch/plat/ffa/notifications.h"
-#include "hf/arch/plat/ffa/vm.h"
 #include "hf/arch/plat/smc.h"
 #include "hf/arch/timer.h"
 #include "hf/arch/vmid_base.h"
@@ -28,15 +22,15 @@
 #include "hf/cpu.h"
 #include "hf/dlog.h"
 #include "hf/ffa.h"
+#include "hf/ffa/indirect_messaging.h"
+#include "hf/ffa/interrupts.h"
+#include "hf/ffa/notifications.h"
+#include "hf/ffa/vm.h"
 #include "hf/ffa_internal.h"
-#include "hf/hf_ipi.h"
 #include "hf/panic.h"
 #include "hf/plat/interrupts.h"
 #include "hf/timer_mgmt.h"
 #include "hf/vm.h"
-#include "hf/vm_ids.h"
-
-#include "vmapi/hf/call.h"
 
 #include "debug_el1.h"
 #include "el1_physical_timer.h"