diff --git a/arch/arm64/include/asm/mman.h b/arch/arm64/include/asm/mman.h
index e3e28f7daf62..446d13c17d54 100644
--- a/arch/arm64/include/asm/mman.h
+++ b/arch/arm64/include/asm/mman.h
@@ -4,6 +4,7 @@

 #include <linux/compiler.h>
 #include <linux/types.h>
+#include <asm/memory.h> /* MT_NORMAL_TAGGED */
 #include <uapi/asm/mman.h>

 static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot,
diff --git a/arch/arm64/include/asm/mmu.h b/arch/arm64/include/asm/mmu.h
index 0989b162a999..817080769b7d 100644
--- a/arch/arm64/include/asm/mmu.h
+++ b/arch/arm64/include/asm/mmu.h
@@ -6,7 +6,6 @@
 #define __ASM_MMU_H

 #include <asm/pgtable_types.h>
-#include <asm/page.h>
 #include <asm/cpufeature.h>
 #include <asm/cputype.h>

diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index 18cc82ade956..5cf2c131bbf1 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -5,7 +5,6 @@
 #ifndef __ASM_PGTABLE_HWDEF_H
 #define __ASM_PGTABLE_HWDEF_H

-#include <asm/memory.h>
 #include <asm/pgtable_types.h>

 /*
diff --git a/arch/arm64/include/asm/pgtable-prot.h b/arch/arm64/include/asm/pgtable-prot.h
index b55145791abb..1fa6bb3294b8 100644
--- a/arch/arm64/include/asm/pgtable-prot.h
+++ b/arch/arm64/include/asm/pgtable-prot.h
@@ -5,7 +5,6 @@
 #ifndef __ASM_PGTABLE_PROT_H
 #define __ASM_PGTABLE_PROT_H

-#include <asm/memory.h>
 #include <asm/pgtable-hwdef.h>

 #include <linux/const.h>
diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/fb.h
index daa337baf4c1..41ea6dfa00d2 100644
--- a/arch/x86/include/asm/fb.h
+++ b/arch/x86/include/asm/fb.h
@@ -2,6 +2,7 @@
 #ifndef _ASM_X86_FB_H
 #define _ASM_X86_FB_H

+#include <linux/mm_types.h>
 #include <asm/cpufeature.h>
 #include <linux/fb.h>
 #include <linux/fs.h>
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 096abc42b4cc..e8c79256beba 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -6,6 +6,7 @@
 #include <linux/types.h>
 #include <linux/math.h>
 #include <linux/bitmap.h>
+#include <linux/init.h>
 #include <asm/mpspec_def.h>
 #include <asm/x86_init.h>
 #include <asm/apicdef.h>
diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index 99d7907be894..075c35bc3733 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -24,6 +24,9 @@
 #include <linux/gpio/consumer.h>
 #include <linux/gpio_keys.h>
 #include <linux/property.h>
+#include <linux/bitops.h>
+#include <linux/math.h>
+#include <linux/string.h>

 #define DRV_NAME	"gpio-keys-polled"

diff --git a/drivers/media/test-drivers/vidtv/vidtv_channel.c b/drivers/media/test-drivers/vidtv/vidtv_channel.c
index 68645326a658..49f3ad70f039 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_channel.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_channel.c
@@ -25,6 +25,8 @@
 #include <linux/slab.h>
 #include <linux/types.h>

+#include <asm/byteorder.h>
+
 #include "vidtv_channel.h"
 #include "vidtv_common.h"
 #include "vidtv_encoder.h"
diff --git a/drivers/video/fbdev/core/fb_device.c b/drivers/video/fbdev/core/fb_device.c
index cdb5d908c9fa..46732b64c4a5 100644
--- a/drivers/video/fbdev/core/fb_device.c
+++ b/drivers/video/fbdev/core/fb_device.c
@@ -6,6 +6,7 @@
 #include <linux/major.h>
 #include <linux/slab.h>
 #include <linux/mm_api.h>
+#include <linux/pgtable_api.h>
 #include <linux/mman.h>
 #include <linux/module.h>
 #include <linux/uaccess.h>
diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c
index 629c16cd6b25..f66c2d26a55b 100644
--- a/drivers/xen/xen-pciback/xenbus.c
+++ b/drivers/xen/xen-pciback/xenbus.c
@@ -7,6 +7,7 @@

 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/string.h>
 #include <linux/workqueue_api.h>
 #include <linux/stat.h>
 #include <linux/slab.h>
diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 622658dfbf0a..e6657f594cfe 100644
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -2,8 +2,11 @@
 #ifndef _LINUX_IF_LINK_H
 #define _LINUX_IF_LINK_H

+#ifdef __KERNEL__
 #include <uapi/linux/if_link.h>
-
+#else
+#include <linux/if_link.h>
+#endif

 /* We don't want this structure exposed to user space */
 struct ifla_vf_stats {
diff --git a/include/linux/mm_api_kasan.h b/include/linux/mm_api_kasan.h
index d5a0a21ad046..08780dc4d7ea 100644
--- a/include/linux/mm_api_kasan.h
+++ b/include/linux/mm_api_kasan.h
@@ -18,7 +18,7 @@ static inline u8 page_kasan_tag(const struct page *page)
 {
 	u8 tag = 0xff;

-	if (kasan_enabled()) {
+	if (IS_ENABLED(CONFIG_KASAN)) {
 		tag = (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK;
 		tag ^= 0xff;
 	}
@@ -28,7 +28,7 @@ static inline u8 page_kasan_tag(const struct page *page)

 static inline void page_kasan_tag_set(struct page *page, u8 tag)
 {
-	if (kasan_enabled()) {
+	if (IS_ENABLED(CONFIG_KASAN)) {
 		tag ^= 0xff;
 		page->flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT);
 		page->flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT;
@@ -37,7 +37,7 @@ static inline void page_kasan_tag_set(struct page *page, u8 tag)

 static inline void page_kasan_tag_reset(struct page *page)
 {
-	if (kasan_enabled())
+	if (IS_ENABLED(CONFIG_KASAN))
 		page_kasan_tag_set(page, 0xff);
 }

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 5da9c1a83f67..62219ec07498 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -19,6 +19,7 @@
 #include <linux/page-flags-layout.h>
 #include <linux/page-flags-defs.h>

+#include <asm/page_types.h>
 #include <asm/mmu.h>

 #ifndef AT_VECTOR_SIZE_ARCH
diff --git a/include/linux/mmzone_api.h b/include/linux/mmzone_api.h
index 6ee6fae98e34..d35144a21c3c 100644
--- a/include/linux/mmzone_api.h
+++ b/include/linux/mmzone_api.h
@@ -27,6 +27,7 @@
 #include <linux/gfp_types.h>
 #include <linux/page-flags.h>
 #include <linux/local_lock.h>
+#include <linux/pfn.h>
 #include <asm/page.h>

 #ifdef CONFIG_HIGHMEM
diff --git a/include/uapi/asm-generic/bpf_perf_event.h b/include/uapi/asm-generic/bpf_perf_event.h
index 3be497cac87b..58e2a15b5682 100644
--- a/include/uapi/asm-generic/bpf_perf_event.h
+++ b/include/uapi/asm-generic/bpf_perf_event.h
@@ -1,7 +1,11 @@
 #ifndef _UAPI__ASM_GENERIC_BPF_PERF_EVENT_H__
 #define _UAPI__ASM_GENERIC_BPF_PERF_EVENT_H__

+#ifdef __KERNEL__
 #include <uapi/linux/ptrace.h>
+#else
+#include <linux/ptrace.h>
+#endif

 /* Export kernel pt_regs structure */
 typedef struct pt_regs bpf_user_pt_regs_t;
diff --git a/include/uapi/asm-generic/shmbuf.h b/include/uapi/asm-generic/shmbuf.h
index 36f9dd440cb3..401a18bb139c 100644
--- a/include/uapi/asm-generic/shmbuf.h
+++ b/include/uapi/asm-generic/shmbuf.h
@@ -4,7 +4,11 @@

 #include <asm/bitsperlong.h>

+#ifdef __KERNEL__
 #include <uapi/asm-generic/ipcbuf.h>
+#else
+#include <asm-generic/ipcbuf.h>
+#endif

 /*
  * The shmid64_ds structure for x86 architecture.
diff --git a/include/uapi/linux/netdevice.h b/include/uapi/linux/netdevice.h
index 3bfa541bea45..57d1dcc2c314 100644
--- a/include/uapi/linux/netdevice.h
+++ b/include/uapi/linux/netdevice.h
@@ -26,11 +26,17 @@
 #ifndef _UAPI_LINUX_NETDEVICE_H
 #define _UAPI_LINUX_NETDEVICE_H

+#ifdef __KERNEL__
 #include <uapi/linux/if.h>
 #include <uapi/linux/if_ether.h>
 #include <uapi/linux/if_packet.h>
 #include <uapi/linux/if_link.h>
-
+#else
+#include <linux/if.h>
+#include <linux/if_ether.h>
+#include <linux/if_packet.h>
+#include <linux/if_link.h>
+#endif

 #define MAX_ADDR_LEN	32		/* Largest hardware address length */

diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h
index 77d1b2b8a4cc..6d53841a6470 100644
--- a/include/uapi/linux/netlink.h
+++ b/include/uapi/linux/netlink.h
@@ -2,9 +2,15 @@
 #ifndef _UAPI__LINUX_NETLINK_H
 #define _UAPI__LINUX_NETLINK_H

+#ifdef __KERNEL__
 #include <uapi/linux/types.h>
 #include <uapi/linux/const.h>
 #include <uapi/linux/socket.h> /* for __kernel_sa_family_t */
+#else
+#include <linux/types.h>
+#include <linux/const.h>
+#include <linux/socket.h> /* for __kernel_sa_family_t */
+#endif

 #define NETLINK_ROUTE		0	/* Routing/device hook				*/
 #define NETLINK_UNUSED		1	/* Unused number				*/
diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 0ff333b05bf1..e2583d100192 100644
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -2,11 +2,19 @@
 #ifndef _UAPI__LINUX_RTNETLINK_H
 #define _UAPI__LINUX_RTNETLINK_H

+#ifdef __KERNEL__
 #include <uapi/linux/types.h>
 #include <uapi/linux/netlink.h>
 #include <uapi/linux/if_link.h>
 #include <uapi/linux/if_addr.h>
 #include <uapi/linux/neighbour.h>
+#else
+#include <linux/types.h>
+#include <linux/netlink.h>
+#include <linux/if_link.h>
+#include <linux/if_addr.h>
+#include <linux/neighbour.h>
+#endif

 /* rtnetlink families. Values up to 127 are reserved for real address
  * families, values above 128 may be used arbitrarily.
diff --git a/include/uapi/linux/socket.h b/include/uapi/linux/socket.h
index d52f3c6520a8..d271caddb022 100644
--- a/include/uapi/linux/socket.h
+++ b/include/uapi/linux/socket.h
@@ -2,7 +2,11 @@
 #ifndef _UAPI_LINUX_SOCKET_H
 #define _UAPI_LINUX_SOCKET_H

+#ifdef __KERNEL__
 #include <uapi/linux/socket_types.h>
+#else
+#include <linux/socket_types.h>
+#endif

 typedef unsigned short __kernel_sa_family_t;
 typedef __kernel_sa_family_t	sa_family_t;
diff --git a/include/uapi/linux/x25.h b/include/uapi/linux/x25.h
index adf7f0a28ad2..2ec7d1898b61 100644
--- a/include/uapi/linux/x25.h
+++ b/include/uapi/linux/x25.h
@@ -12,7 +12,11 @@
 #ifndef	X25_KERNEL_H
 #define	X25_KERNEL_H

+#ifdef __KERNEL__
 #include <uapi/linux/sockios.h>
+#else
+#include <linux/sockios.h>
+#endif
 #include <linux/types.h>
 #include <linux/socket.h>

diff --git a/init/main.c b/init/main.c
index 99d3a2ef49e8..78b258c8e697 100644
--- a/init/main.c
+++ b/init/main.c
@@ -970,7 +970,7 @@ void __init init_per_task_early(void)
 	spin_lock_init(&per_task(&init_task, alloc_lock));
 	raw_spin_lock_init(&per_task(&init_task, pi_lock));
 #ifdef CONFIG_KCSAN
-	per_task(&init_task, kcsan_ctx).scoped_addresses.next = LIST_POISON1;
+	per_task(&init_task, kcsan_ctx).scoped_accesses.next = LIST_POISON1;
 #endif
 	task_flags(&init_task) = PF_KTHREAD;
 }
diff --git a/kernel/kcsan/permissive.h b/kernel/kcsan/permissive.h
index 2c01fe4a59ee..eb0627db54a6 100644
--- a/kernel/kcsan/permissive.h
+++ b/kernel/kcsan/permissive.h
@@ -15,6 +15,7 @@
 #include <linux/bitops.h>
 #include <linux/sched.h>
 #include <linux/types.h>
+#include <linux/sched/task_flags.h>

 /*
  * Access ignore rules based on address.
@@ -28,7 +29,7 @@ static __always_inline bool kcsan_ignore_address(const volatile void *ptr)
 	 * Data-racy bitops on current->flags are too common, ignore completely
 	 * for now.
 	 */
-	return ptr == &current->flags;
+	return ptr == &task_flags(current);
 }

 /*
diff --git a/mm/memtest.c b/mm/memtest.c
index c13f13d3820e..6690a7a3dd3b 100644
--- a/mm/memtest.c
+++ b/mm/memtest.c
@@ -6,6 +6,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/memblock.h>
+#include <asm/page.h>

 static u64 patterns[] __initdata = {
 	/* The first entry has to be 0 to leave memtest with zeroed memory */