Move headers under the hf directory.
This helps distinguish local headers from the more official headers.
Change-Id: I535c1b44081b9d60ba63666cd1ad514aaaf2c68d
diff --git a/src/arch/aarch64/handler.c b/src/arch/aarch64/handler.c
index 7088216..d79ac4c 100644
--- a/src/arch/aarch64/handler.c
+++ b/src/arch/aarch64/handler.c
@@ -1,11 +1,12 @@
-#include "api.h"
-#include "cpu.h"
-#include "dlog.h"
-#include "psci.h"
-#include "vm.h"
+#include "hf/api.h"
+#include "hf/cpu.h"
+#include "hf/dlog.h"
+#include "hf/vm.h"
+
#include "vmapi/hf/call.h"
#include "msr.h"
+#include "psci.h"
struct hvc_handler_return {
long user_ret;
diff --git a/src/arch/aarch64/inc/arch_addr.h b/src/arch/aarch64/inc/hf/arch/addr.h
similarity index 100%
rename from src/arch/aarch64/inc/arch_addr.h
rename to src/arch/aarch64/inc/hf/arch/addr.h
diff --git a/src/arch/aarch64/inc/arch_barriers.h b/src/arch/aarch64/inc/hf/arch/barriers.h
similarity index 100%
rename from src/arch/aarch64/inc/arch_barriers.h
rename to src/arch/aarch64/inc/hf/arch/barriers.h
diff --git a/src/arch/aarch64/inc/arch_cpu.h b/src/arch/aarch64/inc/hf/arch/cpu.h
similarity index 98%
rename from src/arch/aarch64/inc/arch_cpu.h
rename to src/arch/aarch64/inc/hf/arch/cpu.h
index 9aa96ef..1efc8b3 100644
--- a/src/arch/aarch64/inc/arch_cpu.h
+++ b/src/arch/aarch64/inc/hf/arch/cpu.h
@@ -6,7 +6,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "addr.h"
+#include "hf/addr.h"
struct arch_regs {
/* General purpose registers. */
diff --git a/src/arch/aarch64/inc/arch_mm.h b/src/arch/aarch64/inc/hf/arch/mm.h
similarity index 98%
rename from src/arch/aarch64/inc/arch_mm.h
rename to src/arch/aarch64/inc/hf/arch/mm.h
index e904dab..4a23074 100644
--- a/src/arch/aarch64/inc/arch_mm.h
+++ b/src/arch/aarch64/inc/hf/arch/mm.h
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include <stddef.h>
-#include "addr.h"
+#include "hf/addr.h"
/* A page table entry. */
typedef uint64_t pte_t;
diff --git a/src/arch/aarch64/inc/vm/shutdown.h b/src/arch/aarch64/inc/hf/arch/vm/shutdown.h
similarity index 100%
rename from src/arch/aarch64/inc/vm/shutdown.h
rename to src/arch/aarch64/inc/hf/arch/vm/shutdown.h
diff --git a/src/arch/aarch64/inc/io.h b/src/arch/aarch64/io.h
similarity index 93%
rename from src/arch/aarch64/inc/io.h
rename to src/arch/aarch64/io.h
index 45b2924..18a9dec 100644
--- a/src/arch/aarch64/inc/io.h
+++ b/src/arch/aarch64/io.h
@@ -4,7 +4,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "arch_barriers.h"
+#include "hf/arch/barriers.h"
static inline uint32_t io_read(size_t addr)
{
diff --git a/src/arch/aarch64/mm.c b/src/arch/aarch64/mm.c
index 7729491..29bad76 100644
--- a/src/arch/aarch64/mm.c
+++ b/src/arch/aarch64/mm.c
@@ -1,6 +1,9 @@
-#include "mm.h"
-#include "arch_cpu.h"
-#include "dlog.h"
+#include "hf/mm.h"
+
+#include "hf/arch/cpu.h"
+
+#include "hf/dlog.h"
+
#include "msr.h"
/* Keep macro alignment */
diff --git a/src/arch/aarch64/offsets.c b/src/arch/aarch64/offsets.c
index 8e7e9df..4c005df 100644
--- a/src/arch/aarch64/offsets.c
+++ b/src/arch/aarch64/offsets.c
@@ -2,8 +2,8 @@
#include "offsets.h"
#endif /* GEN_OFFSETS */
-#include "cpu.h"
-#include "decl_offsets.h"
+#include "hf/cpu.h"
+#include "hf/decl_offsets.h"
DECL(CPU_CURRENT, struct cpu, current);
DECL(CPU_STACK_BOTTOM, struct cpu, stack_bottom);
diff --git a/src/arch/aarch64/params.c b/src/arch/aarch64/params.c
index 00d181a..d4d709c 100644
--- a/src/arch/aarch64/params.c
+++ b/src/arch/aarch64/params.c
@@ -1,5 +1,5 @@
-#include "boot_params.h"
-#include "fdt_handler.h"
+#include "hf/boot_params.h"
+#include "hf/fdt_handler.h"
/* This is set by entry.S. */
uintpaddr_t fdt_addr;
diff --git a/src/arch/aarch64/pl011.c b/src/arch/aarch64/pl011.c
index cf2f465..de86f9d 100644
--- a/src/arch/aarch64/pl011.c
+++ b/src/arch/aarch64/pl011.c
@@ -1,4 +1,5 @@
-#include "dlog.h"
+#include "hf/dlog.h"
+
#include "io.h"
/* UART Data Register. */
diff --git a/src/arch/aarch64/inc/psci.h b/src/arch/aarch64/psci.h
similarity index 100%
rename from src/arch/aarch64/inc/psci.h
rename to src/arch/aarch64/psci.h
diff --git a/src/arch/aarch64/vm/shutdown.c b/src/arch/aarch64/vm/shutdown.c
index 8175cdf..6299880 100644
--- a/src/arch/aarch64/vm/shutdown.c
+++ b/src/arch/aarch64/vm/shutdown.c
@@ -1,8 +1,9 @@
-#include "vm/shutdown.h"
+#include "hf/arch/vm/shutdown.h"
-#include "psci.h"
#include "vmapi/hf/call.h"
+#include "../psci.h"
+
/*
* Shutdown the system or exit emulation.
*/