diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile.module b/arch/arm64/kvm/hyp/nvhe/Makefile.module
index 749d1ee90d79..9875abd0dc24 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile.module
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile.module
@@ -5,9 +5,6 @@ $(obj)/hyp.lds: arch/arm64/kvm/hyp/nvhe/module.lds.S FORCE
 
 include $(srctree)/arch/arm64/kvm/hyp/nvhe/Makefile.nvhe
 
-# Deprecated; subject to removal.
-ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module/nvhe
-
 # LINT.IfChange(includes)
 ccflags-y += -I$(srctree)/arch/arm64/kvm/hyp/include/module
 # LINT.ThenChange(/BUILD.bazel:pkvm_includes)
diff --git a/drivers/misc/pkvm-smc/pkvm/events.h b/drivers/misc/pkvm-smc/pkvm/events.h
index 9db1f021dcd0..74bb6e356c1f 100644
--- a/drivers/misc/pkvm-smc/pkvm/events.h
+++ b/drivers/misc/pkvm-smc/pkvm/events.h
@@ -3,7 +3,7 @@
 #define __PKVM_SMC_FILTER_HYPEVENTS_H_
 
 #ifdef __KVM_NVHE_HYPERVISOR__
-#include <trace.h>
+#include <nvhe/trace.h>
 #endif
 
 HYP_EVENT(filtered_smc,
diff --git a/drivers/misc/pkvm-smc/pkvm/pkvm-smc.c b/drivers/misc/pkvm-smc/pkvm/pkvm-smc.c
index 5681aef227aa..c679aaf48f68 100644
--- a/drivers/misc/pkvm-smc/pkvm/pkvm-smc.c
+++ b/drivers/misc/pkvm-smc/pkvm/pkvm-smc.c
@@ -11,7 +11,7 @@
 
 #include "events.h"
 #define HYP_EVENT_FILE ../../../../drivers/misc/pkvm-smc/pkvm/events.h
-#include <define_events.h>
+#include <nvhe/define_events.h>
 
 const struct pkvm_module_ops *pkvm_ops;
 bool permissive;