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/inc/hf/assert.h b/inc/hf/assert.h
index d7d7770..8e05659 100644
--- a/inc/hf/assert.h
+++ b/inc/hf/assert.h
@@ -10,6 +10,7 @@
 
 #if !defined(__cplusplus)
 
+#include <stdbool.h>
 #include <stdint.h>
 
 #include "hf/dlog.h"
diff --git a/inc/hf/dlog.h b/inc/hf/dlog.h
index 992bad0..fe02cf5 100644
--- a/inc/hf/dlog.h
+++ b/inc/hf/dlog.h
@@ -11,8 +11,6 @@
 #include <stdarg.h>
 #include <stddef.h>
 
-#include "hf/ffa.h"
-
 #define DLOG_BUFFER_SIZE 8192
 
 enum log_level {
diff --git a/inc/hf/arch/plat/ffa.h b/inc/hf/ffa.h
similarity index 93%
rename from inc/hf/arch/plat/ffa.h
rename to inc/hf/ffa.h
index fc18c90..d94c7cf 100644
--- a/inc/hf/arch/plat/ffa.h
+++ b/inc/hf/ffa.h
@@ -8,11 +8,8 @@
 
 #pragma once
 
-#include "hf/addr.h"
-#include "hf/ffa.h"
-#include "hf/manifest.h"
+#include "hf/mpool.h"
 #include "hf/vcpu.h"
-#include "hf/vm.h"
 
 void plat_ffa_log_init(void);
 void plat_ffa_set_tee_enabled(bool tee_enabled);
diff --git a/inc/hf/arch/plat/ffa/cpu_cycles.h b/inc/hf/ffa/cpu_cycles.h
similarity index 100%
rename from inc/hf/arch/plat/ffa/cpu_cycles.h
rename to inc/hf/ffa/cpu_cycles.h
diff --git a/inc/hf/arch/plat/ffa/direct_messaging.h b/inc/hf/ffa/direct_messaging.h
similarity index 100%
rename from inc/hf/arch/plat/ffa/direct_messaging.h
rename to inc/hf/ffa/direct_messaging.h
diff --git a/inc/hf/arch/plat/ffa/ffa_memory.h b/inc/hf/ffa/ffa_memory.h
similarity index 100%
rename from inc/hf/arch/plat/ffa/ffa_memory.h
rename to inc/hf/ffa/ffa_memory.h
diff --git a/inc/hf/arch/plat/ffa/indirect_messaging.h b/inc/hf/ffa/indirect_messaging.h
similarity index 100%
rename from inc/hf/arch/plat/ffa/indirect_messaging.h
rename to inc/hf/ffa/indirect_messaging.h
diff --git a/inc/hf/arch/plat/ffa/interrupts.h b/inc/hf/ffa/interrupts.h
similarity index 100%
rename from inc/hf/arch/plat/ffa/interrupts.h
rename to inc/hf/ffa/interrupts.h
diff --git a/inc/hf/arch/plat/ffa/notifications.h b/inc/hf/ffa/notifications.h
similarity index 100%
rename from inc/hf/arch/plat/ffa/notifications.h
rename to inc/hf/ffa/notifications.h
diff --git a/inc/hf/arch/plat/ffa/power_management.h b/inc/hf/ffa/power_management.h
similarity index 100%
rename from inc/hf/arch/plat/ffa/power_management.h
rename to inc/hf/ffa/power_management.h
diff --git a/inc/hf/arch/plat/ffa/setup_and_discovery.h b/inc/hf/ffa/setup_and_discovery.h
similarity index 100%
rename from inc/hf/arch/plat/ffa/setup_and_discovery.h
rename to inc/hf/ffa/setup_and_discovery.h
diff --git a/inc/hf/arch/plat/ffa/vm.h b/inc/hf/ffa/vm.h
similarity index 100%
rename from inc/hf/arch/plat/ffa/vm.h
rename to inc/hf/ffa/vm.h
diff --git a/inc/hf/manifest.h b/inc/hf/manifest.h
index 40fa307e..eac1e1b 100644
--- a/inc/hf/manifest.h
+++ b/inc/hf/manifest.h
@@ -14,6 +14,7 @@
 #include "hf/ffa.h"
 #include "hf/ffa_partition_manifest.h"
 #include "hf/memiter.h"
+#include "hf/static_assert.h"
 #include "hf/string.h"
 #include "hf/vm.h"