diff --git a/src/arch/aarch64/inc/arch_api.h b/inc/vmapi/hf/hvc.h
similarity index 88%
rename from src/arch/aarch64/inc/arch_api.h
rename to inc/vmapi/hf/hvc.h
index 51a9880..377193e 100644
--- a/src/arch/aarch64/inc/arch_api.h
+++ b/inc/vmapi/hf/hvc.h
@@ -1,5 +1,5 @@
-#ifndef _ARCH_API_H
-#define _ARCH_API_H
+#ifndef _VMAPI_HF_HVC_H
+#define _VMAPI_HF_HVC_H
 
 /* Keep macro alignment */
 /* clang-format off */
@@ -22,4 +22,4 @@
 
 /* clang-format on */
 
-#endif /* _ARCH_API_H */
+#endif /* _VMAPI_HF_HVC_H */
diff --git a/src/api.c b/src/api.c
index fd8f06d..39c90ad 100644
--- a/src/api.c
+++ b/src/api.c
@@ -1,8 +1,8 @@
 #include "api.h"
 
-#include "arch_api.h"
 #include "std.h"
 #include "vm.h"
+#include "vmapi/hf/hvc.h"
 
 struct vm secondary_vm[MAX_VMS];
 uint32_t secondary_vm_count;
diff --git a/src/arch/aarch64/handler.c b/src/arch/aarch64/handler.c
index bcc67e6..06a8394 100644
--- a/src/arch/aarch64/handler.c
+++ b/src/arch/aarch64/handler.c
@@ -1,9 +1,9 @@
 #include "api.h"
-#include "arch_api.h"
 #include "cpu.h"
 #include "dlog.h"
 #include "psci.h"
 #include "vm.h"
+#include "vmapi/hf/hvc.h"
 
 #include "msr.h"