diff --git a/hypervisor/include/arch/x86/cpu.h b/hypervisor/include/arch/x86/cpu.h
index 96d900251..7054e753b 100644
--- a/hypervisor/include/arch/x86/cpu.h
+++ b/hypervisor/include/arch/x86/cpu.h
@@ -138,8 +138,6 @@
 
 #ifndef ASSEMBLER
 
-#define	BUS_LOCK	"lock ; "
-
 #define AP_MASK			(((1UL << get_pcpu_nums()) - 1UL) & ~(1UL << 0U))
 
 /**
diff --git a/hypervisor/include/lib/atomic.h b/hypervisor/include/lib/atomic.h
index 9f6aea521..4104f973c 100644
--- a/hypervisor/include/lib/atomic.h
+++ b/hypervisor/include/lib/atomic.h
@@ -29,7 +29,9 @@
 
 #ifndef ATOMIC_H
 #define ATOMIC_H
-#include <cpu.h>
+#include <types.h>
+
+#define	BUS_LOCK	"lock ; "
 
 #define build_atomic_load(name, size, type)		\
 static inline type name(const volatile type *ptr)	\
diff --git a/hypervisor/include/lib/bits.h b/hypervisor/include/lib/bits.h
index bbb7b0fae..3783f444a 100644
--- a/hypervisor/include/lib/bits.h
+++ b/hypervisor/include/lib/bits.h
@@ -29,7 +29,8 @@
 
 #ifndef BITS_H
 #define BITS_H
-#include <cpu.h>
+#include <atomic.h>
+
 /**
  *
  * INVALID_BIT_INDEX means when input paramter is zero,