diff --git a/hypervisor/arch/x86/guest/vlapic.c b/hypervisor/arch/x86/guest/vlapic.c
index 6cc16174a..7a0e51b21 100644
--- a/hypervisor/arch/x86/guest/vlapic.c
+++ b/hypervisor/arch/x86/guest/vlapic.c
@@ -1137,7 +1137,8 @@ vlapic_icrlo_write_handler(struct acrn_vlapic *vlapic)
 		break;
 	}
 
-	while ((vcpu_id = ffs64(dmask)) != INVALID_BIT_INDEX) {
+	for (vcpu_id = ffs64(dmask); vcpu_id != INVALID_BIT_INDEX;
+		vcpu_id = ffs64(dmask)) {
 		bitmap_clear_lock(vcpu_id, &dmask);
 		target_vcpu = vcpu_from_vid(vlapic->vm, vcpu_id);
 		if (target_vcpu == NULL) {
diff --git a/hypervisor/include/arch/x86/cpu.h b/hypervisor/include/arch/x86/cpu.h
index db928ce34..63ba8b7ed 100644
--- a/hypervisor/include/arch/x86/cpu.h
+++ b/hypervisor/include/arch/x86/cpu.h
@@ -152,6 +152,8 @@
 
 #ifndef ASSEMBLER
 
+#define	BUS_LOCK	"lock ; "
+
 /**
  *
  * Identifiers for architecturally defined registers.
diff --git a/hypervisor/include/lib/atomic.h b/hypervisor/include/lib/atomic.h
index 264917c41..608586351 100644
--- a/hypervisor/include/lib/atomic.h
+++ b/hypervisor/include/lib/atomic.h
@@ -29,8 +29,7 @@
 
 #ifndef ATOMIC_H
 #define ATOMIC_H
-
-#define	BUS_LOCK	"lock ; "
+#include <cpu.h>
 
 #define build_atomic_load(name, size, type, ptr)	\
 static inline type name(const volatile type *ptr)	\
diff --git a/hypervisor/include/lib/bits.h b/hypervisor/include/lib/bits.h
index 04a5057aa..ea0e8a1b7 100644
--- a/hypervisor/include/lib/bits.h
+++ b/hypervisor/include/lib/bits.h
@@ -29,8 +29,7 @@
 
 #ifndef BITS_H
 #define BITS_H
-
-#define	BUS_LOCK	"lock ; "
+#include <cpu.h>
 /**
  *
  * INVALID_BIT_INDEX means when input paramter is zero,
diff --git a/hypervisor/include/public/acrn_hv_defs.h b/hypervisor/include/public/acrn_hv_defs.h
index cfeb8341e..700ce9257 100644
--- a/hypervisor/include/public/acrn_hv_defs.h
+++ b/hypervisor/include/public/acrn_hv_defs.h
@@ -55,9 +55,6 @@
 #define HC_VM_GPA2HPA               BASE_HC_ID(HC_ID, HC_ID_MEM_BASE + 0x01UL)
 #define HC_VM_SET_MEMORY_REGIONS    BASE_HC_ID(HC_ID, HC_ID_MEM_BASE + 0x02UL)
 #define HC_VM_WRITE_PROTECT_PAGE    BASE_HC_ID(HC_ID, HC_ID_MEM_BASE + 0x03UL)
-#define HC_VM_SET_MEMORY_REGION     BASE_HC_ID(HC_ID, HC_ID_MEM_BASE + 0x00UL)
-#define HC_VM_GPA2HPA               BASE_HC_ID(HC_ID, HC_ID_MEM_BASE + 0x01UL)
-#define HC_VM_SET_MEMORY_REGIONS    BASE_HC_ID(HC_ID, HC_ID_MEM_BASE + 0x02UL)
 
 /* PCI assignment*/
 #define HC_ID_PCI_BASE              0x50UL
diff --git a/hypervisor/lib/string.c b/hypervisor/lib/string.c
index 13e7e4ec5..626a9820d 100644
--- a/hypervisor/lib/string.c
+++ b/hypervisor/lib/string.c
@@ -210,7 +210,8 @@ char *strcpy_s(char *d_arg, size_t dmax, const char *s_arg)
 	while (dest_avail > 0U) {
 		if (overlap_guard == 0U) {
 			pr_err("%s: overlap happened.", __func__);
-			*(--d) = '\0';
+			d--;
+			*d = '\0';
 			return NULL;
 		}
 
@@ -293,7 +294,8 @@ char *strncpy_s(char *d_arg, size_t dmax, const char *s_arg, size_t slen_arg)
 	while (dest_avail > 0U) {
 		if (overlap_guard == 0U) {
 			pr_err("%s: overlap happened.", __func__);
-			*(--d) = '\0';
+			d--;
+			*d = '\0';
 			return NULL;
 		}