Move headers under the hf directory.
This helps distinguish local headers from the more official headers.
Change-Id: I535c1b44081b9d60ba63666cd1ad514aaaf2c68d
diff --git a/inc/addr.h b/inc/hf/addr.h
similarity index 98%
rename from inc/addr.h
rename to inc/hf/addr.h
index 15d32b5..1d4ec39 100644
--- a/inc/addr.h
+++ b/inc/hf/addr.h
@@ -4,7 +4,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "arch_addr.h"
+#include "hf/arch/addr.h"
/* An opaque type for a physical address. */
typedef struct {
diff --git a/inc/alloc.h b/inc/hf/alloc.h
similarity index 100%
rename from inc/alloc.h
rename to inc/hf/alloc.h
diff --git a/inc/api.h b/inc/hf/api.h
similarity index 94%
rename from inc/api.h
rename to inc/hf/api.h
index 1db9ca8..0009ac8 100644
--- a/inc/api.h
+++ b/inc/hf/api.h
@@ -1,8 +1,8 @@
#ifndef _API_H
#define _API_H
-#include "cpu.h"
-#include "vm.h"
+#include "hf/cpu.h"
+#include "hf/vm.h"
/* TODO: Can we hide these? */
extern struct vm secondary_vm[MAX_VMS];
diff --git a/inc/arch.h b/inc/hf/arch.h
similarity index 80%
rename from inc/arch.h
rename to inc/hf/arch.h
index 195d149..fcdead1 100644
--- a/inc/arch.h
+++ b/inc/hf/arch.h
@@ -1,7 +1,7 @@
#ifndef _ARCH_H
#define _ARCH_H
-#include "cpu.h"
+#include "hf/cpu.h"
void arch_putchar(char c);
diff --git a/inc/boot_params.h b/inc/hf/boot_params.h
similarity index 95%
rename from inc/boot_params.h
rename to inc/hf/boot_params.h
index 1b4fe06..4841654 100644
--- a/inc/boot_params.h
+++ b/inc/hf/boot_params.h
@@ -3,7 +3,7 @@
#include <stdbool.h>
-#include "mm.h"
+#include "hf/mm.h"
struct boot_params {
paddr_t mem_begin;
diff --git a/inc/cpio.h b/inc/hf/cpio.h
similarity index 89%
rename from inc/cpio.h
rename to inc/hf/cpio.h
index ad6f4b7..de33ba6 100644
--- a/inc/cpio.h
+++ b/inc/hf/cpio.h
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include <stddef.h>
-#include "memiter.h"
+#include "hf/memiter.h"
bool cpio_next(struct memiter *iter, const char **name, const void **contents,
size_t *size);
diff --git a/inc/cpu.h b/inc/hf/cpu.h
similarity index 94%
rename from inc/cpu.h
rename to inc/hf/cpu.h
index e949db7..a779679 100644
--- a/inc/cpu.h
+++ b/inc/hf/cpu.h
@@ -5,9 +5,10 @@
#include <stddef.h>
#include <stdint.h>
-#include "addr.h"
-#include "arch_cpu.h"
-#include "spinlock.h"
+#include "hf/arch/cpu.h"
+
+#include "hf/addr.h"
+#include "hf/spinlock.h"
enum vcpu_state {
vcpu_state_off,
diff --git a/inc/decl_offsets.h b/inc/hf/decl_offsets.h
similarity index 100%
rename from inc/decl_offsets.h
rename to inc/hf/decl_offsets.h
diff --git a/inc/dlog.h b/inc/hf/dlog.h
similarity index 100%
rename from inc/dlog.h
rename to inc/hf/dlog.h
diff --git a/inc/fdt.h b/inc/hf/fdt.h
similarity index 100%
rename from inc/fdt.h
rename to inc/hf/fdt.h
diff --git a/inc/fdt_handler.h b/inc/hf/fdt_handler.h
similarity index 75%
rename from inc/fdt_handler.h
rename to inc/hf/fdt_handler.h
index e85b8f5..4d3fa8f 100644
--- a/inc/fdt_handler.h
+++ b/inc/hf/fdt_handler.h
@@ -1,9 +1,9 @@
#ifndef _FDT_HANDLER_H
#define _FDT_HANDLER_H
-#include "boot_params.h"
-#include "fdt.h"
-#include "mm.h"
+#include "hf/boot_params.h"
+#include "hf/fdt.h"
+#include "hf/mm.h"
bool fdt_get_boot_params(paddr_t fdt_addr, struct boot_params *p);
bool fdt_patch(paddr_t fdt_addr, struct boot_params_update *p);
diff --git a/inc/load.h b/inc/hf/load.h
similarity index 81%
rename from inc/load.h
rename to inc/hf/load.h
index 6d19ae6..ba67f38 100644
--- a/inc/load.h
+++ b/inc/hf/load.h
@@ -4,9 +4,9 @@
#include <stddef.h>
#include <stdint.h>
-#include "cpio.h"
-#include "memiter.h"
-#include "mm.h"
+#include "hf/cpio.h"
+#include "hf/memiter.h"
+#include "hf/mm.h"
bool load_primary(const struct memiter *cpio, size_t kernel_arg,
struct memiter *initrd);
diff --git a/inc/memiter.h b/inc/hf/memiter.h
similarity index 100%
rename from inc/memiter.h
rename to inc/hf/memiter.h
diff --git a/inc/mm.h b/inc/hf/mm.h
similarity index 97%
rename from inc/mm.h
rename to inc/hf/mm.h
index 6c539df..b62133c 100644
--- a/inc/mm.h
+++ b/inc/hf/mm.h
@@ -4,8 +4,9 @@
#include <stdbool.h>
#include <stdint.h>
-#include "addr.h"
-#include "arch_mm.h"
+#include "hf/arch/mm.h"
+
+#include "hf/addr.h"
struct mm_ptable {
paddr_t table;
diff --git a/inc/spinlock.h b/inc/hf/spinlock.h
similarity index 100%
rename from inc/spinlock.h
rename to inc/hf/spinlock.h
diff --git a/inc/std.h b/inc/hf/std.h
similarity index 100%
rename from inc/std.h
rename to inc/hf/std.h
diff --git a/inc/vm.h b/inc/hf/vm.h
similarity index 93%
rename from inc/vm.h
rename to inc/hf/vm.h
index cd9dd32..ce88adc 100644
--- a/inc/vm.h
+++ b/inc/hf/vm.h
@@ -1,8 +1,8 @@
#ifndef _VM_H
#define _VM_H
-#include "cpu.h"
-#include "mm.h"
+#include "hf/cpu.h"
+#include "hf/mm.h"
enum rpc_state {
rpc_state_idle,