diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
index 7534db1d5b4a..cf69081073b5 100644
--- a/arch/x86/kernel/acpi/wakeup_32.S
+++ b/arch/x86/kernel/acpi/wakeup_32.S
@@ -3,7 +3,6 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page_types.h>
-#include <asm/nospec-branch.h>
 
 # Copyright 2003, 2008 Pavel Machek <pavel@suse.cz
 
@@ -38,7 +37,6 @@ SYM_CODE_START(wakeup_pmode_return)
 
 	# jump to place where we left off
 	movl	saved_eip, %eax
-	ANNOTATE_RETPOLINE_SAFE
 	jmp	*%eax
 SYM_CODE_END(wakeup_pmode_return)
 
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 06f7142c8115..487ac57e2c81 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -27,7 +27,6 @@
 #include <asm/nospec-branch.h>
 #include <asm/bootparam.h>
 #include <asm/pgtable_32.h>
-#include <asm/nospec-branch.h>
 
 /* Physical address */
 #define pa(X) ((X) - __PAGE_OFFSET)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index e4536dd1a91d..6bea19d4a0ca 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -31,7 +31,6 @@
 #include <asm/realmode.h>
 #include <asm/x86_init.h>
 #include <asm/efi.h>
-#include <asm/nospec-branch.h>
 
 /*
  * Power off function, if any
diff --git a/arch/x86/kernel/relocate_kernel_32.S b/arch/x86/kernel/relocate_kernel_32.S
index d4d065b6f2f8..c7c4b1917336 100644
--- a/arch/x86/kernel/relocate_kernel_32.S
+++ b/arch/x86/kernel/relocate_kernel_32.S
@@ -9,7 +9,6 @@
 #include <asm/kexec.h>
 #include <asm/nospec-branch.h>
 #include <asm/processor-flags.h>
-#include <asm/nospec-branch.h>
 
 /*
  * Must be relocatable PIC code callable as a C function, in particular
diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
index 578e8b1e2522..3fad907a179f 100644
--- a/arch/x86/realmode/rm/trampoline_32.S
+++ b/arch/x86/realmode/rm/trampoline_32.S
@@ -23,7 +23,6 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page_types.h>
-#include <asm/nospec-branch.h>
 #include "realmode.h"
 
 	.text
@@ -60,7 +59,6 @@ SYM_CODE_END(trampoline_start)
 	.section ".text32","ax"
 	.code32
 SYM_CODE_START(startup_32)			# note: also used from wakeup_asm.S
-	ANNOTATE_RETPOLINE_SAFE
 	jmp	*%eax
 SYM_CODE_END(startup_32)