git: 307f78f3ed90 - main - LinuxKPI: Constantly use _LINUXKPI_ prefix in include guards

From: Vladimir Kondratyev <wulf_at_FreeBSD.org>
Date: Mon, 10 Jan 2022 19:50:52 UTC
The branch main has been updated by wulf:

URL: https://cgit.FreeBSD.org/src/commit/?id=307f78f3ed90a4145eeb2c8cc79bc95b2666f57a

commit 307f78f3ed90a4145eeb2c8cc79bc95b2666f57a
Author:     Vladimir Kondratyev <wulf@FreeBSD.org>
AuthorDate: 2021-12-19 10:42:42 +0000
Commit:     Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2022-01-10 19:49:38 +0000

    LinuxKPI: Constantly use _LINUXKPI_ prefix in include guards
    
    MFC after:      1 week
    Reviewed by:    bz, emaste, hselasky, manu
    Differential Revision:  https://reviews.freebsd.org/D33562
---
 sys/compat/linuxkpi/common/include/acpi/acpi.h              | 6 +++---
 sys/compat/linuxkpi/common/include/acpi/acpi_bus.h          | 6 +++---
 sys/compat/linuxkpi/common/include/acpi/video.h             | 6 +++---
 sys/compat/linuxkpi/common/include/asm/atomic-long.h        | 6 +++---
 sys/compat/linuxkpi/common/include/asm/atomic.h             | 6 +++---
 sys/compat/linuxkpi/common/include/asm/atomic64.h           | 6 +++---
 sys/compat/linuxkpi/common/include/asm/barrier.h            | 6 +++---
 sys/compat/linuxkpi/common/include/asm/byteorder.h          | 6 +++---
 sys/compat/linuxkpi/common/include/asm/cpufeature.h         | 4 ++--
 sys/compat/linuxkpi/common/include/asm/fcntl.h              | 6 +++---
 sys/compat/linuxkpi/common/include/asm/fpu/api.h            | 6 +++---
 sys/compat/linuxkpi/common/include/asm/io.h                 | 6 +++---
 sys/compat/linuxkpi/common/include/asm/msr.h                | 6 +++---
 sys/compat/linuxkpi/common/include/asm/pgtable.h            | 6 +++---
 sys/compat/linuxkpi/common/include/asm/smp.h                | 6 +++---
 sys/compat/linuxkpi/common/include/asm/types.h              | 6 +++---
 sys/compat/linuxkpi/common/include/asm/uaccess.h            | 6 +++---
 sys/compat/linuxkpi/common/include/asm/unaligned.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/acpi.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/anon_inodes.h      | 6 +++---
 sys/compat/linuxkpi/common/include/linux/atomic.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/average.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/backlight.h        | 6 +++---
 sys/compat/linuxkpi/common/include/linux/bitfield.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/bitmap.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/bitops.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/bottom_half.h      | 6 +++---
 sys/compat/linuxkpi/common/include/linux/bsearch.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/cache.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/capability.h       | 6 +++---
 sys/compat/linuxkpi/common/include/linux/cdev.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/clocksource.h      | 6 +++---
 sys/compat/linuxkpi/common/include/linux/compat.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/compiler.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/completion.h       | 6 +++---
 sys/compat/linuxkpi/common/include/linux/cpu.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/crc32.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/dcache.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/debugfs.h          | 4 ++--
 sys/compat/linuxkpi/common/include/linux/delay.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/devcoredump.h      | 6 +++---
 sys/compat/linuxkpi/common/include/linux/device.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/dma-attrs.h        | 6 +++---
 sys/compat/linuxkpi/common/include/linux/dma-mapping.h      | 6 +++---
 sys/compat/linuxkpi/common/include/linux/dmapool.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/dmi.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/efi.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/err.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/errno.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/etherdevice.h      | 6 +++---
 sys/compat/linuxkpi/common/include/linux/export.h           | 4 ++--
 sys/compat/linuxkpi/common/include/linux/file.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/fs.h               | 6 +++---
 sys/compat/linuxkpi/common/include/linux/gcd.h              | 4 ++--
 sys/compat/linuxkpi/common/include/linux/gfp.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/hardirq.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/highmem.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/hrtimer.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/idr.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/if_arp.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/if_ether.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/if_vlan.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/in.h               | 6 +++---
 sys/compat/linuxkpi/common/include/linux/in6.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/inetdevice.h       | 6 +++---
 sys/compat/linuxkpi/common/include/linux/interrupt.h        | 6 +++---
 sys/compat/linuxkpi/common/include/linux/interval_tree.h    | 6 +++---
 sys/compat/linuxkpi/common/include/linux/io-mapping.h       | 6 +++---
 sys/compat/linuxkpi/common/include/linux/io.h               | 6 +++---
 sys/compat/linuxkpi/common/include/linux/ioctl.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/iopoll.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/ip.h               | 6 +++---
 sys/compat/linuxkpi/common/include/linux/irq_work.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/irqreturn.h        | 6 +++---
 sys/compat/linuxkpi/common/include/linux/jhash.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/jiffies.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/jump_label.h       | 6 +++---
 sys/compat/linuxkpi/common/include/linux/kdev_t.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/kernel.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/kmod.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/kobject.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/kref.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/kthread.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/ktime.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/list.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/llist.h            | 4 ++--
 sys/compat/linuxkpi/common/include/linux/lockdep.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/log2.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/math64.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/miscdevice.h       | 6 +++---
 sys/compat/linuxkpi/common/include/linux/mm.h               | 6 +++---
 sys/compat/linuxkpi/common/include/linux/mm_types.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/mod_devicetable.h  | 6 +++---
 sys/compat/linuxkpi/common/include/linux/module.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/moduleparam.h      | 6 +++---
 sys/compat/linuxkpi/common/include/linux/mutex.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/net.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/net_dim.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/netdev_features.h  | 6 +++---
 sys/compat/linuxkpi/common/include/linux/notifier.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/numa.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/overflow.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/page.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/pagemap.h          | 4 ++--
 sys/compat/linuxkpi/common/include/linux/pci.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/pfn.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/pfn_t.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/pid.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/poison.h           | 4 ++--
 sys/compat/linuxkpi/common/include/linux/poll.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/power_supply.h     | 4 ++--
 sys/compat/linuxkpi/common/include/linux/preempt.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/prefetch.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/printk.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/radix-tree.h       | 6 +++---
 sys/compat/linuxkpi/common/include/linux/random.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/ratelimit.h        | 4 ++--
 sys/compat/linuxkpi/common/include/linux/rbtree.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/rculist.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/rcupdate.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/refcount.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/rwlock.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/rwsem.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/scatterlist.h      | 6 +++---
 sys/compat/linuxkpi/common/include/linux/sched.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/semaphore.h        | 6 +++---
 sys/compat/linuxkpi/common/include/linux/seq_file.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/seqlock.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/shmem_fs.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/shrinker.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/sizes.h            | 4 ++--
 sys/compat/linuxkpi/common/include/linux/slab.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/smp.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/socket.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/spinlock.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/srcu.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/string.h           | 6 +++---
 sys/compat/linuxkpi/common/include/linux/stringify.h        | 6 +++---
 sys/compat/linuxkpi/common/include/linux/swap.h             | 4 ++--
 sys/compat/linuxkpi/common/include/linux/sysfs.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/tcp.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/time.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/timer.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/types.h            | 6 +++---
 sys/compat/linuxkpi/common/include/linux/uaccess.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/udp.h              | 6 +++---
 sys/compat/linuxkpi/common/include/linux/uuid.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/vmalloc.h          | 6 +++---
 sys/compat/linuxkpi/common/include/linux/wait.h             | 6 +++---
 sys/compat/linuxkpi/common/include/linux/wait_bit.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/workqueue.h        | 6 +++---
 sys/compat/linuxkpi/common/include/linux/ww_mutex.h         | 6 +++---
 sys/compat/linuxkpi/common/include/linux/xarray.h           | 6 +++---
 sys/compat/linuxkpi/common/include/net/addrconf.h           | 6 +++---
 sys/compat/linuxkpi/common/include/net/ieee80211_radiotap.h | 6 +++---
 sys/compat/linuxkpi/common/include/net/if_inet6.h           | 6 +++---
 sys/compat/linuxkpi/common/include/net/ip.h                 | 6 +++---
 sys/compat/linuxkpi/common/include/net/ipv6.h               | 6 +++---
 sys/compat/linuxkpi/common/include/net/netevent.h           | 6 +++---
 sys/compat/linuxkpi/common/include/net/tcp.h                | 6 +++---
 160 files changed, 469 insertions(+), 469 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi.h b/sys/compat/linuxkpi/common/include/acpi/acpi.h
index b6579f42774e..e996301e27f0 100644
--- a/sys/compat/linuxkpi/common/include/acpi/acpi.h
+++ b/sys/compat/linuxkpi/common/include/acpi/acpi.h
@@ -29,8 +29,8 @@
  * $FreeBSD$
  */
 
-#ifndef _ACPI_ACPI_H_
-#define _ACPI_ACPI_H_
+#ifndef _LINUXKPI_ACPI_ACPI_H_
+#define _LINUXKPI_ACPI_ACPI_H_
 
 /*
  * FreeBSD import of ACPICA has a typedef for BOOLEAN which conflicts with
@@ -97,4 +97,4 @@ acpi_get_table(ACPI_STRING Signature, UINT32 Instance,
 	return (AcpiGetTable(Signature, Instance, OutTable));
 }
 
-#endif /* _ACPI_ACPI_H_ */
+#endif /* _LINUXKPI_ACPI_ACPI_H_ */
diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h
index abee5223af60..c8a6385f26b2 100644
--- a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h
+++ b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef _ACPI_ACPI_BUS_H_
-#define _ACPI_ACPI_BUS_H_
+#ifndef _LINUXKPI_ACPI_ACPI_BUS_H_
+#define _LINUXKPI_ACPI_ACPI_BUS_H_
 
 typedef char acpi_device_class[20];
 
@@ -49,4 +49,4 @@ int		register_acpi_notifier(struct notifier_block *nb);
 int		unregister_acpi_notifier(struct notifier_block *nb);
 uint32_t	acpi_target_system_state(void);
 
-#endif /* !_ACPI_ACPI_BUS_H_ */
+#endif /* _LINUXKPI_ACPI_ACPI_BUS_H_ */
diff --git a/sys/compat/linuxkpi/common/include/acpi/video.h b/sys/compat/linuxkpi/common/include/acpi/video.h
index 5c42153356c0..63f876e78b57 100644
--- a/sys/compat/linuxkpi/common/include/acpi/video.h
+++ b/sys/compat/linuxkpi/common/include/acpi/video.h
@@ -28,11 +28,11 @@
  * $FreeBSD$
  */
 
-#ifndef _ACPI_VIDEO_H_
-#define _ACPI_VIDEO_H_
+#ifndef _LINUXKPI_ACPI_VIDEO_H_
+#define _LINUXKPI_ACPI_VIDEO_H_
 
 #define	ACPI_VIDEO_CLASS	"video"
 
 #define	ACPI_VIDEO_NOTIFY_PROBE	0x81
 
-#endif	/* !_ACPI_VIDEO_H_ */
+#endif	/* _LINUXKPI_ACPI_VIDEO_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/atomic-long.h b/sys/compat/linuxkpi/common/include/asm/atomic-long.h
index c80c348f95f9..f8bd9edfccf9 100644
--- a/sys/compat/linuxkpi/common/include/asm/atomic-long.h
+++ b/sys/compat/linuxkpi/common/include/asm/atomic-long.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_ATOMIC_LONG_H_
-#define	_ATOMIC_LONG_H_
+#ifndef	_LINUXKPI_ASM_ATOMIC_LONG_H_
+#define	_LINUXKPI_ASM_ATOMIC_LONG_H_
 
 #include <linux/compiler.h>
 #include <sys/types.h>
@@ -130,4 +130,4 @@ atomic_long_dec_and_test(atomic_long_t *v)
 	return i == 0 ;
 }
 
-#endif	/* _ATOMIC_LONG_H_ */
+#endif	/* _LINUXKPI_ASM_ATOMIC_LONG_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/atomic.h b/sys/compat/linuxkpi/common/include/asm/atomic.h
index 5cdfbe674ef3..8c201ad6a101 100644
--- a/sys/compat/linuxkpi/common/include/asm/atomic.h
+++ b/sys/compat/linuxkpi/common/include/asm/atomic.h
@@ -29,8 +29,8 @@
  * $FreeBSD$
  */
 
-#ifndef _ASM_ATOMIC_H_
-#define	_ASM_ATOMIC_H_
+#ifndef _LINUXKPI_ASM_ATOMIC_H_
+#define	_LINUXKPI_ASM_ATOMIC_H_
 
 #include <linux/compiler.h>
 #include <sys/types.h>
@@ -317,4 +317,4 @@ LINUX_ATOMIC_FETCH_OP(and, &)
 LINUX_ATOMIC_FETCH_OP(andnot, &~)
 LINUX_ATOMIC_FETCH_OP(xor, ^)
 
-#endif					/* _ASM_ATOMIC_H_ */
+#endif					/* _LINUXKPI_ASM_ATOMIC_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/atomic64.h b/sys/compat/linuxkpi/common/include/asm/atomic64.h
index b8b87bb2c685..b53063620bb2 100644
--- a/sys/compat/linuxkpi/common/include/asm/atomic64.h
+++ b/sys/compat/linuxkpi/common/include/asm/atomic64.h
@@ -25,8 +25,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_ASM_ATOMIC64_H_
-#define	_ASM_ATOMIC64_H_
+#ifndef	_LINUXKPI_ASM_ATOMIC64_H_
+#define	_LINUXKPI_ASM_ATOMIC64_H_
 
 #include <linux/compiler.h>
 #include <sys/types.h>
@@ -145,4 +145,4 @@ atomic64_cmpxchg(atomic64_t *v, int64_t old, int64_t new)
 	return (ret);
 }
 
-#endif					/* _ASM_ATOMIC64_H_ */
+#endif					/* _LINUXKPI_ASM_ATOMIC64_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/barrier.h b/sys/compat/linuxkpi/common/include/asm/barrier.h
index 10aa24a7ae8b..12b4736e1939 100644
--- a/sys/compat/linuxkpi/common/include/asm/barrier.h
+++ b/sys/compat/linuxkpi/common/include/asm/barrier.h
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ASM_BARRIER_H_
-#define	_ASM_BARRIER_H_
+#ifndef _LINUXKPI_ASM_BARRIER_H_
+#define	_LINUXKPI_ASM_BARRIER_H_
 
 #include <sys/types.h>
 #include <machine/atomic.h>
@@ -55,4 +55,4 @@
 #define	smp_store_mb(x, v)	do { WRITE_ONCE(x, v); smp_mb(); } while (0)
 #endif
 
-#endif	/* _ASM_BARRIER_H_ */
+#endif	/* _LINUXKPI_ASM_BARRIER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/byteorder.h b/sys/compat/linuxkpi/common/include/asm/byteorder.h
index 05e39bb52149..19961303596e 100644
--- a/sys/compat/linuxkpi/common/include/asm/byteorder.h
+++ b/sys/compat/linuxkpi/common/include/asm/byteorder.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_ASM_BYTEORDER_H_
-#define	_ASM_BYTEORDER_H_
+#ifndef	_LINUXKPI_ASM_BYTEORDER_H_
+#define	_LINUXKPI_ASM_BYTEORDER_H_
 
 #include <sys/types.h>
 #include <sys/endian.h>
@@ -157,4 +157,4 @@ le16_add_cpu(uint16_t *var, uint16_t val)
 	*var = cpu_to_le16(le16_to_cpu(*var) + val);
 }
 
-#endif	/* _ASM_BYTEORDER_H_ */
+#endif	/* _LINUXKPI_ASM_BYTEORDER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/cpufeature.h b/sys/compat/linuxkpi/common/include/asm/cpufeature.h
index 049088648aa3..84ab86af33dd 100644
--- a/sys/compat/linuxkpi/common/include/asm/cpufeature.h
+++ b/sys/compat/linuxkpi/common/include/asm/cpufeature.h
@@ -1,7 +1,7 @@
 /* Public domain. */
 
-#ifndef _ASM_CPUFEATURE_H
-#define _ASM_CPUFEATURE_H
+#ifndef _LINUXKPI_ASM_CPUFEATURE_H
+#define _LINUXKPI_ASM_CPUFEATURE_H
 
 #if defined(__amd64__) || defined(__i386__)
 
diff --git a/sys/compat/linuxkpi/common/include/asm/fcntl.h b/sys/compat/linuxkpi/common/include/asm/fcntl.h
index f24624e6eeed..2d0285e977e0 100644
--- a/sys/compat/linuxkpi/common/include/asm/fcntl.h
+++ b/sys/compat/linuxkpi/common/include/asm/fcntl.h
@@ -28,9 +28,9 @@
  *
  * $FreeBSD$
  */
-#ifndef _ASM_FCNTL_H_
-#define	_ASM_FCNTL_H_
+#ifndef _LINUXKPI_ASM_FCNTL_H_
+#define	_LINUXKPI_ASM_FCNTL_H_
 
 #include <sys/fcntl.h>
 
-#endif	/* _ASM_FCNTL_H_ */
+#endif	/* _LINUXKPI_ASM_FCNTL_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/fpu/api.h b/sys/compat/linuxkpi/common/include/asm/fpu/api.h
index 9c63b2e972bf..133754abdc4b 100644
--- a/sys/compat/linuxkpi/common/include/asm/fpu/api.h
+++ b/sys/compat/linuxkpi/common/include/asm/fpu/api.h
@@ -25,8 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_FPU_API_H_
-#define	_FPU_API_H_
+#ifndef	_LINUXKPI_ASM_FPU_API_H_
+#define	_LINUXKPI_ASM_FPU_API_H_
 
 #define	kernel_fpu_begin() \
    lkpi_kernel_fpu_begin()
@@ -37,4 +37,4 @@
 extern void lkpi_kernel_fpu_begin(void);
 extern void lkpi_kernel_fpu_end(void);
 
-#endif /* _FPU_API_H_ */
+#endif /* _LINUXKPI_ASM_FPU_API_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/io.h b/sys/compat/linuxkpi/common/include/asm/io.h
index 24d350f4743e..49eca70a38eb 100644
--- a/sys/compat/linuxkpi/common/include/asm/io.h
+++ b/sys/compat/linuxkpi/common/include/asm/io.h
@@ -28,9 +28,9 @@
  *
  * $FreeBSD$
  */
-#ifndef _ASM_IO_H_
-#define _ASM_IO_H_
+#ifndef _LINUXKPI_ASM_IO_H_
+#define _LINUXKPI_ASM_IO_H_
 
 #include <linux/io.h>
 
-#endif	/* _ASM_IO_H_ */
+#endif	/* _LINUXKPI_ASM_IO_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/msr.h b/sys/compat/linuxkpi/common/include/asm/msr.h
index 1697c20767a5..9d23e6b1bbc7 100644
--- a/sys/compat/linuxkpi/common/include/asm/msr.h
+++ b/sys/compat/linuxkpi/common/include/asm/msr.h
@@ -26,12 +26,12 @@
  * $FreeBSD$
  */
 
-#ifndef _ASM_MSR_H_
-#define	_ASM_MSR_H_
+#ifndef _LINUXKPI_ASM_MSR_H_
+#define	_LINUXKPI_ASM_MSR_H_
 
 #include <machine/cpufunc.h>
 
 #define	rdmsrl(msr, val)	((val) = rdmsr(msr))
 #define	rdmsrl_safe(msr, val)	rdmsr_safe(msr, val)
 
-#endif /* _ASM_MSR_H_ */
+#endif /* _LINUXKPI_ASM_MSR_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/pgtable.h b/sys/compat/linuxkpi/common/include/asm/pgtable.h
index 4831c144888d..9e66fab8eae4 100644
--- a/sys/compat/linuxkpi/common/include/asm/pgtable.h
+++ b/sys/compat/linuxkpi/common/include/asm/pgtable.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _ASM_PGTABLE_H_
-#define	_ASM_PGTABLE_H_
+#ifndef _LINUXKPI_ASM_PGTABLE_H_
+#define	_LINUXKPI_ASM_PGTABLE_H_
 
 #include <linux/page.h>
 
@@ -42,4 +42,4 @@ typedef struct page *pgtable_t;
 
 #define	pgprot_decrypted(prot)	(prot)
 
-#endif	/* _ASM_PGTABLE_H_ */
+#endif	/* _LINUXKPI_ASM_PGTABLE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/smp.h b/sys/compat/linuxkpi/common/include/asm/smp.h
index dd25b02115a8..c349edb16bf4 100644
--- a/sys/compat/linuxkpi/common/include/asm/smp.h
+++ b/sys/compat/linuxkpi/common/include/asm/smp.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _ASM_SMP_H_
-#define	_ASM_SMP_H_
+#ifndef _LINUXKPI_ASM_SMP_H_
+#define	_LINUXKPI_ASM_SMP_H_
 
 #if defined(__i386__) || defined(__amd64__)
 
@@ -45,4 +45,4 @@ int	linux_wbinvd_on_all_cpus(void);
 #define	put_cpu()			\
 	critical_exit()
 
-#endif /* _ASM_SMP_H_ */
+#endif /* _LINUXKPI_ASM_SMP_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/types.h b/sys/compat/linuxkpi/common/include/asm/types.h
index daa5d83616a2..e7d3de60e987 100644
--- a/sys/compat/linuxkpi/common/include/asm/types.h
+++ b/sys/compat/linuxkpi/common/include/asm/types.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_ASM_TYPES_H_
-#define	_ASM_TYPES_H_
+#ifndef	_LINUXKPI_ASM_TYPES_H_
+#define	_LINUXKPI_ASM_TYPES_H_
 
 #if defined(_KERNEL) || defined(_STANDALONE)
 
@@ -61,4 +61,4 @@ typedef unsigned short umode_t;
 
 #endif	/* _KERNEL || _STANDALONE */
 
-#endif	/* _ASM_TYPES_H_ */
+#endif	/* _LINUXKPI_ASM_TYPES_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/uaccess.h b/sys/compat/linuxkpi/common/include/asm/uaccess.h
index 102373634ba3..6994b48d071e 100644
--- a/sys/compat/linuxkpi/common/include/asm/uaccess.h
+++ b/sys/compat/linuxkpi/common/include/asm/uaccess.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _ASM_UACCESS_H_
-#define _ASM_UACCESS_H_
+#ifndef _LINUXKPI_ASM_UACCESS_H_
+#define _LINUXKPI_ASM_UACCESS_H_
 
 #include <linux/uaccess.h>
 
@@ -65,4 +65,4 @@ copy_from_user(void *to, const void *from, unsigned long n)
 		goto err; \
 } while (0)
 
-#endif	/* _ASM_UACCESS_H_ */
+#endif	/* _LINUXKPI_ASM_UACCESS_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/unaligned.h b/sys/compat/linuxkpi/common/include/asm/unaligned.h
index 7597f00f7596..9a788c965653 100644
--- a/sys/compat/linuxkpi/common/include/asm/unaligned.h
+++ b/sys/compat/linuxkpi/common/include/asm/unaligned.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	_ASM_UNALIGNED_H
-#define	_ASM_UNALIGNED_H
+#ifndef	_LINUXKPI_ASM_UNALIGNED_H
+#define	_LINUXKPI_ASM_UNALIGNED_H
 
 #include <linux/types.h>
 #include <asm/byteorder.h>
@@ -75,4 +75,4 @@ get_unaligned_be32(const void *p)
 	return (be32_to_cpup((const __be32 *)p));
 }
 
-#endif	/* _ASM_UNALIGNED_H */
+#endif	/* _LINUXKPI_ASM_UNALIGNED_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/acpi.h b/sys/compat/linuxkpi/common/include/linux/acpi.h
index b1e65b9afad9..1a9d25e7a7ff 100644
--- a/sys/compat/linuxkpi/common/include/linux/acpi.h
+++ b/sys/compat/linuxkpi/common/include/linux/acpi.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_ACPI_H_
-#define _LINUX_ACPI_H_
+#ifndef _LINUXKPI_LINUX_ACPI_H_
+#define _LINUXKPI_LINUX_ACPI_H_
 
 #include <linux/device.h>
 #include <linux/uuid.h>
@@ -44,4 +44,4 @@
 
 #endif
 
-#endif /* _LINUX_ACPI_H_ */
+#endif /* _LINUXKPI_LINUX_ACPI_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/anon_inodes.h b/sys/compat/linuxkpi/common/include/linux/anon_inodes.h
index 8fa61cd4b45f..cab5cbd4d67e 100644
--- a/sys/compat/linuxkpi/common/include/linux/anon_inodes.h
+++ b/sys/compat/linuxkpi/common/include/linux/anon_inodes.h
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _LINUX_ANON_INODES_H_
-#define _LINUX_ANON_INODES_H_
+#ifndef _LINUXKPI_LINUX_ANON_INODES_H_
+#define _LINUXKPI_LINUX_ANON_INODES_H_
 
 #include <linux/fs.h>
 #include <linux/file.h>
@@ -45,4 +45,4 @@ anon_inode_getfile(const char *name __unused,
 	return (file);
 }
 
-#endif	/* _LINUX_ANON_INODES_H_ */
+#endif	/* _LINUXKPI_LINUX_ANON_INODES_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/atomic.h b/sys/compat/linuxkpi/common/include/linux/atomic.h
index 969af384e3ba..e491283ae6e5 100644
--- a/sys/compat/linuxkpi/common/include/linux/atomic.h
+++ b/sys/compat/linuxkpi/common/include/linux/atomic.h
@@ -26,12 +26,12 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_ATOMIC_H_
-#define	_LINUX_ATOMIC_H_
+#ifndef _LINUXKPI_LINUX_ATOMIC_H_
+#define	_LINUXKPI_LINUX_ATOMIC_H_
 
 #include <asm/atomic.h>
 #include <asm/atomic64.h>
 #include <asm/atomic-long.h>
 #include <asm/barrier.h>
 
-#endif /* _LINUX_ATOMIC_H_ */
+#endif /* _LINUXKPI_LINUX_ATOMIC_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/average.h b/sys/compat/linuxkpi/common/include/linux/average.h
index 4291bf2d85be..61b2010d6509 100644
--- a/sys/compat/linuxkpi/common/include/linux/average.h
+++ b/sys/compat/linuxkpi/common/include/linux/average.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LKPI_LINUX_AVERAGE_H
-#define __LKPI_LINUX_AVERAGE_H
+#ifndef _LINUXKPI_LINUX_AVERAGE_H
+#define _LINUXKPI_LINUX_AVERAGE_H
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,4 +89,4 @@
 		return (ewma->zt >> (_p));					\
 	}									\
 
-#endif /* __LKPI_LINUX_AVERAGE_H */
+#endif /* _LINUXKPI_LINUX_AVERAGE_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/backlight.h b/sys/compat/linuxkpi/common/include/linux/backlight.h
index b3a07c4cdcaa..38b3786e738d 100644
--- a/sys/compat/linuxkpi/common/include/linux/backlight.h
+++ b/sys/compat/linuxkpi/common/include/linux/backlight.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_BACKLIGHT_H_
-#define _LINUX_BACKLIGHT_H_
+#ifndef _LINUXKPI_LINUX_BACKLIGHT_H_
+#define _LINUXKPI_LINUX_BACKLIGHT_H_
 
 #include <linux/notifier.h>
 
@@ -109,4 +109,4 @@ backlight_disable(struct backlight_device *bd)
 	return (backlight_update_status(bd));
 }
 
-#endif	/* _LINUX_BACKLIGHT_H_ */
+#endif	/* _LINUXKPI_LINUX_BACKLIGHT_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/bitfield.h b/sys/compat/linuxkpi/common/include/linux/bitfield.h
index 14278a557809..c22757d54290 100644
--- a/sys/compat/linuxkpi/common/include/linux/bitfield.h
+++ b/sys/compat/linuxkpi/common/include/linux/bitfield.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	_LINUX_BITFIELD_H
-#define	_LINUX_BITFIELD_H
+#ifndef	_LINUXKPI_LINUX_BITFIELD_H
+#define	_LINUXKPI_LINUX_BITFIELD_H
 
 #include <linux/types.h>
 #include <asm/byteorder.h>
@@ -133,4 +133,4 @@ _uX_replace_bits(8)
 #define	FIELD_GET(_mask, _value)					\
 	((typeof(_mask))(((_value) & (_mask)) >> __bf_shf(_mask)))
 
-#endif	/* _LINUX_BITFIELD_H */
+#endif	/* _LINUXKPI_LINUX_BITFIELD_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/bitmap.h b/sys/compat/linuxkpi/common/include/linux/bitmap.h
index 4de94333c99f..1ae6078966a4 100644
--- a/sys/compat/linuxkpi/common/include/linux/bitmap.h
+++ b/sys/compat/linuxkpi/common/include/linux/bitmap.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_BITMAP_H_
-#define	_LINUX_BITMAP_H_
+#ifndef _LINUXKPI_LINUX_BITMAP_H_
+#define	_LINUXKPI_LINUX_BITMAP_H_
 
 #include <linux/bitops.h>
 #include <linux/slab.h>
@@ -351,4 +351,4 @@ bitmap_free(const unsigned long *bitmap)
 	kfree(bitmap);
 }
 
-#endif					/* _LINUX_BITMAP_H_ */
+#endif					/* _LINUXKPI_LINUX_BITMAP_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/bitops.h b/sys/compat/linuxkpi/common/include/linux/bitops.h
index 0d7ab376e02d..262e6b9b110f 100644
--- a/sys/compat/linuxkpi/common/include/linux/bitops.h
+++ b/sys/compat/linuxkpi/common/include/linux/bitops.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_BITOPS_H_
-#define	_LINUX_BITOPS_H_
+#ifndef	_LINUXKPI_LINUX_BITOPS_H_
+#define	_LINUXKPI_LINUX_BITOPS_H_
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -420,4 +420,4 @@ sign_extend32(uint32_t value, int index)
 	return ((int32_t)(value << shift) >> shift);
 }
 
-#endif	/* _LINUX_BITOPS_H_ */
+#endif	/* _LINUXKPI_LINUX_BITOPS_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/bottom_half.h b/sys/compat/linuxkpi/common/include/linux/bottom_half.h
index 9f8dc02f2798..1b139c481283 100644
--- a/sys/compat/linuxkpi/common/include/linux/bottom_half.h
+++ b/sys/compat/linuxkpi/common/include/linux/bottom_half.h
@@ -25,10 +25,10 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_BOTTOM_HALF_H_
-#define	_LINUX_BOTTOM_HALF_H_
+#ifndef _LINUXKPI_LINUX_BOTTOM_HALF_H_
+#define	_LINUXKPI_LINUX_BOTTOM_HALF_H_
 
 extern void local_bh_enable(void);
 extern void local_bh_disable(void);
 
-#endif					/* _LINUX_BOTTOM_HALF_H_ */
+#endif					/* _LINUXKPI_LINUX_BOTTOM_HALF_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/bsearch.h b/sys/compat/linuxkpi/common/include/linux/bsearch.h
index b8cf7b19b467..8cc329aa855c 100644
--- a/sys/compat/linuxkpi/common/include/linux/bsearch.h
+++ b/sys/compat/linuxkpi/common/include/linux/bsearch.h
@@ -30,9 +30,9 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_LINUX_BSEARCH_H
-#define	__LKPI_LINUX_BSEARCH_H
+#ifndef	_LINUXKPI_LINUX_BSEARCH_H
+#define	_LINUXKPI_LINUX_BSEARCH_H
 
 #include <sys/libkern.h>
 
-#endif	/* __LKPI_LINUX_BSEARCH_H */
+#endif	/* _LINUXKPI_LINUX_BSEARCH_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/cache.h b/sys/compat/linuxkpi/common/include/linux/cache.h
index 4d1d400152ff..6479d5d04d3a 100644
--- a/sys/compat/linuxkpi/common/include/linux/cache.h
+++ b/sys/compat/linuxkpi/common/include/linux/cache.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_CACHE_H_
-#define _LINUX_CACHE_H_
+#ifndef	_LINUXKPI_LINUX_CACHE_H_
+#define _LINUXKPI_LINUX_CACHE_H_
 
 #include <sys/param.h>
 
@@ -38,4 +38,4 @@
 
 #define	SMP_CACHE_BYTES		L1_CACHE_BYTES
 
-#endif	/* _LINUX_CACHE_H_ */
+#endif	/* _LINUXKPI_LINUX_CACHE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/capability.h b/sys/compat/linuxkpi/common/include/linux/capability.h
index ce656255549b..547ee586ad8e 100644
--- a/sys/compat/linuxkpi/common/include/linux/capability.h
+++ b/sys/compat/linuxkpi/common/include/linux/capability.h
@@ -32,8 +32,8 @@
  * Simple capable() priv_check helper
  */
 
-#ifndef _LINUX_CAPABILITY_H
-#define	_LINUX_CAPABILITY_H
+#ifndef _LINUXKPI_LINUX_CAPABILITY_H
+#define	_LINUXKPI_LINUX_CAPABILITY_H
 
 #include <sys/types.h>
 #include <sys/proc.h>
@@ -48,4 +48,4 @@ capable(const int tryme)
 	return (priv_check(curthread, tryme) == 0);
 }
 
-#endif /* _LINUX_CAPABILITY_H */
+#endif /* _LINUXKPI_LINUX_CAPABILITY_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/cdev.h b/sys/compat/linuxkpi/common/include/linux/cdev.h
index 39a65472e921..fb7a3cf0b447 100644
--- a/sys/compat/linuxkpi/common/include/linux/cdev.h
+++ b/sys/compat/linuxkpi/common/include/linux/cdev.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_CDEV_H_
-#define	_LINUX_CDEV_H_
+#ifndef	_LINUXKPI_LINUX_CDEV_H_
+#define	_LINUXKPI_LINUX_CDEV_H_
 
 #include <linux/kobject.h>
 #include <linux/sysfs.h>
@@ -154,4 +154,4 @@ void linux_cdev_device_del(struct linux_cdev *, struct device *);
 
 #define	cdev	linux_cdev
 
-#endif	/* _LINUX_CDEV_H_ */
+#endif	/* _LINUXKPI_LINUX_CDEV_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/clocksource.h b/sys/compat/linuxkpi/common/include/linux/clocksource.h
index f775aa6bb329..8027ed76ec0f 100644
--- a/sys/compat/linuxkpi/common/include/linux/clocksource.h
+++ b/sys/compat/linuxkpi/common/include/linux/clocksource.h
@@ -28,11 +28,11 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_CLOCKSOURCE_H
-#define	_LINUX_CLOCKSOURCE_H
+#ifndef _LINUXKPI_LINUX_CLOCKSOURCE_H
+#define	_LINUXKPI_LINUX_CLOCKSOURCE_H
 
 #include <asm/types.h>
 
 #define	CLOCKSOURCE_MASK(x) ((u64)(-1ULL >> ((-(x)) & 63)))
 
-#endif					/* _LINUX_CLOCKSOURCE_H */
+#endif					/* _LINUXKPI_LINUX_CLOCKSOURCE_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/compat.h b/sys/compat/linuxkpi/common/include/linux/compat.h
index 84b7b47a36dc..5e4dd1daf67d 100644
--- a/sys/compat/linuxkpi/common/include/linux/compat.h
+++ b/sys/compat/linuxkpi/common/include/linux/compat.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_COMPAT_H_
-#define	_LINUX_COMPAT_H_
+#ifndef	_LINUXKPI_LINUX_COMPAT_H_
+#define	_LINUXKPI_LINUX_COMPAT_H_
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -58,4 +58,4 @@ linux_set_current_flags(struct thread *td, int flags)
 	return (0);
 }
 
-#endif	/* _LINUX_COMPAT_H_ */
+#endif	/* _LINUXKPI_LINUX_COMPAT_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h
index c4c189c2505f..1f2edecbaee7 100644
--- a/sys/compat/linuxkpi/common/include/linux/compiler.h
+++ b/sys/compat/linuxkpi/common/include/linux/compiler.h
@@ -29,8 +29,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_COMPILER_H_
-#define	_LINUX_COMPILER_H_
+#ifndef	_LINUXKPI_LINUX_COMPILER_H_
+#define	_LINUXKPI_LINUX_COMPILER_H_
 
 #include <sys/cdefs.h>
 
@@ -111,4 +111,4 @@
 #define	__same_type(a, b)	__builtin_types_compatible_p(typeof(a), typeof(b))
 #define	__must_be_array(a)	__same_type(a, &(a)[0])
 
-#endif	/* _LINUX_COMPILER_H_ */
+#endif	/* _LINUXKPI_LINUX_COMPILER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/completion.h b/sys/compat/linuxkpi/common/include/linux/completion.h
index 09d499309e5a..2f58bd5c03e6 100644
--- a/sys/compat/linuxkpi/common/include/linux/completion.h
+++ b/sys/compat/linuxkpi/common/include/linux/completion.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_COMPLETION_H_
-#define	_LINUX_COMPLETION_H_
+#ifndef	_LINUXKPI_LINUX_COMPLETION_H_
+#define	_LINUXKPI_LINUX_COMPLETION_H_
 
 #include <linux/errno.h>
 
@@ -66,4 +66,4 @@ extern int linux_wait_for_timeout_common(struct completion *, int, int);
 extern int linux_try_wait_for_completion(struct completion *);
 extern int linux_completion_done(struct completion *);
 
-#endif					/* _LINUX_COMPLETION_H_ */
+#endif					/* _LINUXKPI_LINUX_COMPLETION_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/cpu.h b/sys/compat/linuxkpi/common/include/linux/cpu.h
index 5be8f3d5a0d5..53fa9db424c2 100644
--- a/sys/compat/linuxkpi/common/include/linux/cpu.h
+++ b/sys/compat/linuxkpi/common/include/linux/cpu.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_LINUX_CPU_H
-#define	__LKPI_LINUX_CPU_H
+#ifndef	_LINUXKPI_LINUX_CPU_H
+#define	_LINUXKPI_LINUX_CPU_H
 
 #include <sys/types.h>
 #include <sys/systm.h>
@@ -73,4 +73,4 @@ cpumask_set_cpu(int cpu, cpumask_t *mask)
 	CPU_SET(cpu, mask);
 }
 
-#endif	/* __LKPI_LINUX_CPU_H */
+#endif	/* _LINUXKPI_LINUX_CPU_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/crc32.h b/sys/compat/linuxkpi/common/include/linux/crc32.h
index 6d43eb7b1859..a93be642fb1a 100644
--- a/sys/compat/linuxkpi/common/include/linux/crc32.h
+++ b/sys/compat/linuxkpi/common/include/linux/crc32.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LKPI_LINUX_CRC32_H
-#define __LKPI_LINUX_CRC32_H
+#ifndef _LINUXKPI_LINUX_CRC32_H
+#define _LINUXKPI_LINUX_CRC32_H
 
 #include <sys/gsb_crc32.h>
 
@@ -42,4 +42,4 @@ crc32_le(uint32_t crc, const void *data, size_t len)
 	return (crc32_raw(data, len, crc));
 }
 
-#endif /* __LKPI_LINUX_CRC32_H */
+#endif /* _LINUXKPI_LINUX_CRC32_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/dcache.h b/sys/compat/linuxkpi/common/include/linux/dcache.h
index 1bafa3dbd1fe..9f9943a18dc6 100644
--- a/sys/compat/linuxkpi/common/include/linux/dcache.h
+++ b/sys/compat/linuxkpi/common/include/linux/dcache.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LINUX_DCACHE_H
-#define	__LINUX_DCACHE_H
+#ifndef _LINUXKPI_LINUX_DCACHE_H
+#define	_LINUXKPI_LINUX_DCACHE_H
 
 struct vnode;
 struct pfs_node;
@@ -43,4 +43,4 @@ d_inode(const struct dentry *dentry)
 	return (dentry->d_inode);
 }
 
-#endif /* __LINUX_DCACHE_H */
+#endif /* _LINUXKPI_LINUX_DCACHE_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/debugfs.h b/sys/compat/linuxkpi/common/include/linux/debugfs.h
index 406016d7e2c8..6a3273cbbf3c 100644
--- a/sys/compat/linuxkpi/common/include/linux/debugfs.h
+++ b/sys/compat/linuxkpi/common/include/linux/debugfs.h
@@ -27,8 +27,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_DEBUGFS_H_
-#define _LINUX_DEBUGFS_H_
+#ifndef _LINUXKPI_LINUX_DEBUGFS_H_
+#define _LINUXKPI_LINUX_DEBUGFS_H_
 
 #include <linux/fs.h>
 #include <linux/seq_file.h>
diff --git a/sys/compat/linuxkpi/common/include/linux/delay.h b/sys/compat/linuxkpi/common/include/linux/delay.h
index c13a1797adf9..ea0a8253b09f 100644
--- a/sys/compat/linuxkpi/common/include/linux/delay.h
+++ b/sys/compat/linuxkpi/common/include/linux/delay.h
@@ -29,8 +29,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_DELAY_H_
-#define	_LINUX_DELAY_H_
+#ifndef _LINUXKPI_LINUX_DELAY_H_
+#define	_LINUXKPI_LINUX_DELAY_H_
 
 #include <linux/jiffies.h>
 #include <sys/systm.h>
@@ -86,4 +86,4 @@ fsleep(unsigned long us)
 		usleep_range(us, us);
 }
 
-#endif	/* _LINUX_DELAY_H_ */
+#endif	/* _LINUXKPI_LINUX_DELAY_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/devcoredump.h b/sys/compat/linuxkpi/common/include/linux/devcoredump.h
index 4616fbb5a2ea..eecf5380bfc3 100644
--- a/sys/compat/linuxkpi/common/include/linux/devcoredump.h
*** 2432 LINES SKIPPED ***