diff --git a/hypervisor/include/arch/x86/guest/guest.h b/hypervisor/include/arch/x86/guest/guest.h
index 4a2fa8ed3..3d2b24c6a 100644
--- a/hypervisor/include/arch/x86/guest/guest.h
+++ b/hypervisor/include/arch/x86/guest/guest.h
@@ -23,9 +23,9 @@
 #include <mmu.h>
 
 #define foreach_vcpu(idx, vm, vcpu)				\
-	for ((idx) = 0U, vcpu = &(vm->hw.vcpu_array[(idx)]);	\
-		(idx) < vm->hw.created_vcpus;			\
-		(idx)++, vcpu = &(vm->hw.vcpu_array[(idx)])) \
+	for ((idx) = 0U, (vcpu) = &((vm)->hw.vcpu_array[(idx)]);	\
+		(idx) < (vm)->hw.created_vcpus;			\
+		(idx)++, (vcpu) = &((vm)->hw.vcpu_array[(idx)])) \
 		if (vcpu->state != VCPU_OFFLINE)
 
 /*
@@ -72,14 +72,6 @@
 
 void prepare_vm0_memmap(struct acrn_vm *vm);
 
-/* Definition for a mem map lookup */
-struct vm_lu_mem_map {
-	struct list_head list;                 /* EPT mem map lookup list*/
-	void *hpa;	/* Host physical start address of the map*/
-	void *gpa;	/* Guest physical start address of the map */
-	uint64_t size;	/* Size of map */
-};
-
 /* Use # of paging level to identify paging mode */
 enum vm_paging_mode {
 	PAGING_MODE_0_LEVEL = 0U,	/* Flat */