diff --git a/hypervisor/include/arch/x86/guest/vcpu.h b/hypervisor/include/arch/x86/guest/vcpu.h
index 4926aba695..5e4d6d2dac 100644
--- a/hypervisor/include/arch/x86/guest/vcpu.h
+++ b/hypervisor/include/arch/x86/guest/vcpu.h
@@ -100,7 +100,7 @@ struct cpu_gp_regs {
 	uint64_t r15;
 };
 
-struct segment {
+struct segment_sel {
 	uint16_t selector;
 	uint64_t base;
 	uint32_t limit;
@@ -155,16 +155,16 @@ struct run_context {
 	uint64_t vmx_cr4;
 
 	/* segment registers */
-	struct segment cs;
-	struct segment ss;
-	struct segment ds;
-	struct segment es;
-	struct segment fs;
-	struct segment gs;
-	struct segment tr;
-	struct segment idtr;
-	struct segment ldtr;
-	struct segment gdtr;
+	struct segment_sel cs;
+	struct segment_sel ss;
+	struct segment_sel ds;
+	struct segment_sel es;
+	struct segment_sel fs;
+	struct segment_sel gs;
+	struct segment_sel tr;
+	struct segment_sel idtr;
+	struct segment_sel ldtr;
+	struct segment_sel gdtr;
 
 	/* The 512 bytes area to save the FPU/MMX/SSE states for the guest */
 	uint64_t
diff --git a/hypervisor/include/arch/x86/lapic.h b/hypervisor/include/arch/x86/lapic.h
index 90a5a05aa9..b88841ff45 100644
--- a/hypervisor/include/arch/x86/lapic.h
+++ b/hypervisor/include/arch/x86/lapic.h
@@ -112,7 +112,7 @@ enum intr_cpu_startup_shorthand {
 	INTR_CPU_STARTUP_UNKNOWN,
 };
 
-union lapic_id {
+union lapic_id_reg {
 	uint32_t value;
 	struct {
 		uint8_t xapic_id;