diff --git a/hypervisor/include/arch/x86/irq.h b/hypervisor/include/arch/x86/irq.h
index bf74e1dc7..bce1a0cdc 100644
--- a/hypervisor/include/arch/x86/irq.h
+++ b/hypervisor/include/arch/x86/irq.h
@@ -96,20 +96,6 @@ struct x86_irq_data {
 
 struct intr_excp_ctx;
 
-struct acrn_vm;
-
-typedef void (*smp_call_func_t)(void *data);
-struct smp_call_info_data {
-	smp_call_func_t func;
-	void *data;
-};
-
-void smp_call_function(uint64_t mask, smp_call_func_t func, void *data);
-bool is_notification_nmi(const struct acrn_vm *vm);
-
-void setup_notification(void);
-void setup_pi_notification(void);
-
 /**
  * @brief Allocate a vectror and bind it to irq
  *
diff --git a/hypervisor/include/arch/x86/notify.h b/hypervisor/include/arch/x86/notify.h
new file mode 100644
index 000000000..0aede50e1
--- /dev/null
+++ b/hypervisor/include/arch/x86/notify.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2020 Intel Corporation. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef NOTIFY_H
+#define NOTIFY_H
+
+typedef void (*smp_call_func_t)(void *data);
+struct smp_call_info_data {
+	smp_call_func_t func;
+	void *data;
+};
+
+struct acrn_vm;
+void smp_call_function(uint64_t mask, smp_call_func_t func, void *data);
+bool is_notification_nmi(const struct acrn_vm *vm);
+
+void setup_notification(void);
+void setup_pi_notification(void);
+
+#endif
diff --git a/hypervisor/include/arch/x86/per_cpu.h b/hypervisor/include/arch/x86/per_cpu.h
index 3abf117ab..1a138bacf 100644
--- a/hypervisor/include/arch/x86/per_cpu.h
+++ b/hypervisor/include/arch/x86/per_cpu.h
@@ -10,6 +10,7 @@
 #include <types.h>
 #include <sbuf.h>
 #include <irq.h>
+#include <notify.h>
 #include <page.h>
 #include <timer.h>
 #include <profiling.h>