diff --git a/arch/arm64/include/asm/kvm_hypevents.h b/arch/arm64/include/asm/kvm_hypevents.h
index 3489973c0828..cb93232138b9 100644
--- a/arch/arm64/include/asm/kvm_hypevents.h
+++ b/arch/arm64/include/asm/kvm_hypevents.h
@@ -4,7 +4,7 @@
 #define __ARM64_KVM_HYPEVENTS_H_
 
 #ifdef __KVM_NVHE_HYPERVISOR__
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 #endif
 
 /*
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index d61e44642f98..574657a8994f 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -7,4 +7,8 @@ incdir := $(src)/include
 subdir-asflags-y := -I$(incdir)
 subdir-ccflags-y := -I$(incdir)
 
+# ANDROID: Add -I for tracing
+subdir-asflags-y += -I$(incdir)/module
+subdir-ccflags-y += -I$(incdir)/module
+
 obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o
diff --git a/arch/arm64/kvm/hyp/include/nvhe/trace/define_events.h b/arch/arm64/kvm/hyp/include/module/nvhe/define_events.h
similarity index 100%
rename from arch/arm64/kvm/hyp/include/nvhe/trace/define_events.h
rename to arch/arm64/kvm/hyp/include/module/nvhe/define_events.h
diff --git a/arch/arm64/kvm/hyp/include/nvhe/trace/trace.h b/arch/arm64/kvm/hyp/include/module/nvhe/trace.h
similarity index 100%
rename from arch/arm64/kvm/hyp/include/nvhe/trace/trace.h
rename to arch/arm64/kvm/hyp/include/module/nvhe/trace.h
diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile.module b/arch/arm64/kvm/hyp/nvhe/Makefile.module
index 7b365ce3710c..af84ae2a5d86 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile.module
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile.module
@@ -5,4 +5,5 @@ $(obj)/hyp.lds: arch/arm64/kvm/hyp/nvhe/module.lds.S FORCE
 
 include $(srctree)/arch/arm64/kvm/hyp/nvhe/Makefile.nvhe
 
-ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/nvhe/trace/ -DMODULE
+ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module/nvhe
+ccflags-y += -DMODULE
diff --git a/arch/arm64/kvm/hyp/nvhe/events.c b/arch/arm64/kvm/hyp/nvhe/events.c
index 67ef05647362..d0c6793f5a4f 100644
--- a/arch/arm64/kvm/hyp/nvhe/events.c
+++ b/arch/arm64/kvm/hyp/nvhe/events.c
@@ -5,9 +5,9 @@
 
 #include <nvhe/mm.h>
 #include <nvhe/mem_protect.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 
-#include <nvhe/trace/define_events.h>
+#include <nvhe/define_events.h>
 
 extern struct hyp_event_id __hyp_event_ids_start[];
 extern struct hyp_event_id __hyp_event_ids_end[];
diff --git a/arch/arm64/kvm/hyp/nvhe/hyp-main.c b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
index 97a195e1085f..d4347a7cd3e2 100644
--- a/arch/arm64/kvm/hyp/nvhe/hyp-main.c
+++ b/arch/arm64/kvm/hyp/nvhe/hyp-main.c
@@ -26,7 +26,7 @@
 #include <nvhe/mm.h>
 #include <nvhe/pkvm.h>
 #include <nvhe/pviommu-host.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 #include <nvhe/trap_handler.h>
 
 #include <linux/irqchip/arm-gic-v3.h>
diff --git a/arch/arm64/kvm/hyp/nvhe/modules.c b/arch/arm64/kvm/hyp/nvhe/modules.c
index e78695ac68e5..67fbf6b2a8f0 100644
--- a/arch/arm64/kvm/hyp/nvhe/modules.c
+++ b/arch/arm64/kvm/hyp/nvhe/modules.c
@@ -14,7 +14,7 @@
 #include <nvhe/mm.h>
 #include <nvhe/serial.h>
 #include <nvhe/spinlock.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 #include <nvhe/trap_handler.h>
 
 static void *__pkvm_module_memcpy(void *to, const void *from, size_t count)
diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c
index b3c9d90dedeb..f4617892a684 100644
--- a/arch/arm64/kvm/hyp/nvhe/setup.c
+++ b/arch/arm64/kvm/hyp/nvhe/setup.c
@@ -19,7 +19,7 @@
 #include <nvhe/mm.h>
 #include <nvhe/pkvm.h>
 #include <nvhe/serial.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 #include <nvhe/trap_handler.h>
 
 unsigned long hyp_nr_cpus;
diff --git a/arch/arm64/kvm/hyp/nvhe/trace.c b/arch/arm64/kvm/hyp/nvhe/trace.c
index e77bda5fa6e0..3799dd91fd2c 100644
--- a/arch/arm64/kvm/hyp/nvhe/trace.c
+++ b/arch/arm64/kvm/hyp/nvhe/trace.c
@@ -8,7 +8,7 @@
 #include <nvhe/clock.h>
 #include <nvhe/mem_protect.h>
 #include <nvhe/mm.h>
-#include <nvhe/trace/trace.h>
+#include <nvhe/trace.h>
 
 #include <asm/percpu.h>
 #include <asm/kvm_mmu.h>