diff --git a/src/arch/aarch64/BUILD.gn b/src/arch/aarch64/BUILD.gn
index d4214ab..e92f4c3 100644
--- a/src/arch/aarch64/BUILD.gn
+++ b/src/arch/aarch64/BUILD.gn
@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+config("config") {
+  include_dirs = [ "." ]
+}
+
 # Hypervisor specific code.
 source_set("aarch64") {
   sources = [
diff --git a/src/arch/aarch64/hftest/BUILD.gn b/src/arch/aarch64/hftest/BUILD.gn
index 952e2ae..6c3938a 100644
--- a/src/arch/aarch64/hftest/BUILD.gn
+++ b/src/arch/aarch64/hftest/BUILD.gn
@@ -31,6 +31,7 @@
 # Shutdown the system or exit emulation, start/stop CPUs.
 source_set("power_mgmt") {
   testonly = true
+  public_configs = [ "//src/arch/aarch64:config" ]
   sources = [
     "cpu_entry.S",
     "power_mgmt.c",
@@ -44,6 +45,7 @@
 # Exception handlers for interrupts and GICv3 el1 driver.
 source_set("interrupts_gicv3") {
   testonly = true
+  public_configs = [ "//src/arch/aarch64:config" ]
   sources = [
     "events.c",
     "exceptions.S",
@@ -54,6 +56,7 @@
 # Get/set CPU state.
 source_set("state") {
   testonly = true
+  public_configs = [ "//src/arch/aarch64:config" ]
   sources = [
     "state.c",
   ]
diff --git a/src/arch/aarch64/hftest/exceptions.S b/src/arch/aarch64/hftest/exceptions.S
index 34c770d..d44b758 100644
--- a/src/arch/aarch64/hftest/exceptions.S
+++ b/src/arch/aarch64/hftest/exceptions.S
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "../exception_macros.S"
+#include "exception_macros.S"
 
 .section .text.vector_table_el1, "ax"
 .global vector_table_el1
diff --git a/src/arch/aarch64/hftest/interrupts_gicv3.c b/src/arch/aarch64/hftest/interrupts_gicv3.c
index f156a98..4c036d4 100644
--- a/src/arch/aarch64/hftest/interrupts_gicv3.c
+++ b/src/arch/aarch64/hftest/interrupts_gicv3.c
@@ -23,7 +23,7 @@
 
 #include "hf/dlog.h"
 
-#include "../msr.h"
+#include "msr.h"
 
 extern uint8_t vector_table_el1;
 static void (*irq_callback)(void);
diff --git a/src/arch/aarch64/hftest/power_mgmt.c b/src/arch/aarch64/hftest/power_mgmt.c
index 6dc2baf..014c408 100644
--- a/src/arch/aarch64/hftest/power_mgmt.c
+++ b/src/arch/aarch64/hftest/power_mgmt.c
@@ -20,8 +20,8 @@
 
 #include "vmapi/hf/call.h"
 
-#include "../psci.h"
-#include "../smc.h"
+#include "psci.h"
+#include "smc.h"
 
 /**
  * Holds temporary state used to set up the environment on which CPUs will
diff --git a/src/arch/aarch64/hftest/state.c b/src/arch/aarch64/hftest/state.c
index 966dc2e..53471f2 100644
--- a/src/arch/aarch64/hftest/state.c
+++ b/src/arch/aarch64/hftest/state.c
@@ -16,7 +16,7 @@
 
 #include "hf/arch/vm/state.h"
 
-#include "../msr.h"
+#include "msr.h"
 
 void per_cpu_ptr_set(uintptr_t v)
 {
diff --git a/test/vmapi/gicv3/busy_secondary.c b/test/vmapi/gicv3/busy_secondary.c
index 62c6cc3..61da8e1 100644
--- a/test/vmapi/gicv3/busy_secondary.c
+++ b/test/vmapi/gicv3/busy_secondary.c
@@ -23,9 +23,9 @@
 
 #include "vmapi/hf/call.h"
 
-#include "../msr.h"
 #include "gicv3.h"
 #include "hftest.h"
+#include "msr.h"
 
 /**
  * Converts a number of nanoseconds to the equivalent number of timer ticks.