diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h
index 1c07aad9624ecc4fac05ac2260775fe7f21e482c..49dbfdfa50f9f3a80113c264b7c8fe0439746dc0 100644
--- a/arch/x86/include/asm/gpio.h
+++ b/arch/x86/include/asm/gpio.h
@@ -13,8 +13,8 @@
  * (at your option) any later version.
  */
 
-#ifndef _ASM_I386_GPIO_H
-#define _ASM_I386_GPIO_H
+#ifndef _ASM_X86_GPIO_H
+#define _ASM_X86_GPIO_H
 
 #include <asm-generic/gpio.h>
 
diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index 78242c6ffa588f6dea9b71ae093946f93ea6417f..20e1fd588dbfbfefc30b567b35625098002f105c 100644
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -1,8 +1,8 @@
-#ifndef _ASM_IRQ_REMAPPING_H
-#define _ASM_IRQ_REMAPPING_H
+#ifndef _ASM_X86_IRQ_REMAPPING_H
+#define _ASM_X86_IRQ_REMAPPING_H
 
 extern int x2apic;
 
 #define IRTE_DEST(dest) ((x2apic) ? dest : dest << 8)
 
-#endif
+#endif	/* _ASM_X86_IRQ_REMAPPING_H */
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index 04c47dc5597cf9f002408ca2590210b0477fa74b..1d88f6957d3967cf456cfad166990eb2d8dda8e0 100644
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -10,8 +10,8 @@
  * See asm-generic/syscall.h for descriptions of what we must do here.
  */
 
-#ifndef _ASM_SYSCALL_H
-#define _ASM_SYSCALL_H	1
+#ifndef _ASM_X86_SYSCALL_H
+#define _ASM_X86_SYSCALL_H
 
 #include <linux/sched.h>
 #include <linux/err.h>
@@ -208,4 +208,4 @@ static inline void syscall_set_arguments(struct task_struct *task,
 
 #endif	/* CONFIG_X86_32 */
 
-#endif	/* _ASM_SYSCALL_H */
+#endif	/* _ASM_X86_SYSCALL_H */