Move headers under the hf directory.
This helps distinguish local headers from the more official headers.
Change-Id: I535c1b44081b9d60ba63666cd1ad514aaaf2c68d
diff --git a/test/vm/hf_test.h b/test/vm/hf_test.h
index 2959ff5..4a1acc3 100644
--- a/test/vm/hf_test.h
+++ b/test/vm/hf_test.h
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include <stdint.h>
-#include "dlog.h"
+#include "hf/dlog.h"
/*
* Prefixed to log lines from tests for easy filtering in the console.
diff --git a/test/vm/primary_only/primary.c b/test/vm/primary_only/primary.c
index e9f70ee..03dc95c 100644
--- a/test/vm/primary_only/primary.c
+++ b/test/vm/primary_only/primary.c
@@ -1,8 +1,9 @@
#include <stdint.h>
-#include "../hf_test.h"
#include "vmapi/hf/call.h"
+#include "../hf_test.h"
+
uint8_t kstack[4096] __attribute__((aligned(4096)));
TEST(vm_get_count)
diff --git a/test/vm/primary_with_secondary/primary.c b/test/vm/primary_with_secondary/primary.c
index bcbb592..5502904 100644
--- a/test/vm/primary_with_secondary/primary.c
+++ b/test/vm/primary_with_secondary/primary.c
@@ -2,10 +2,12 @@
#include <stdalign.h>
#include <stdint.h>
-#include "../hf_test.h"
-#include "mm.h"
+#include "hf/mm.h"
+
#include "vmapi/hf/call.h"
+#include "../hf_test.h"
+
alignas(4096) uint8_t kstack[4096];
alignas(PAGE_SIZE) uint8_t send_page[PAGE_SIZE];
diff --git a/test/vm/primary_with_secondary/secondary.c b/test/vm/primary_with_secondary/secondary.c
index bf6a5c7..19f6901 100644
--- a/test/vm/primary_with_secondary/secondary.c
+++ b/test/vm/primary_with_secondary/secondary.c
@@ -1,8 +1,9 @@
#include <stdint.h>
-#include "../hf_test.h"
#include "vmapi/hf/call.h"
+#include "../hf_test.h"
+
uint8_t kstack[4096] __attribute__((aligned(4096)));
void kmain(void)