diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi.h b/sys/compat/linuxkpi/common/include/acpi/acpi.h
--- 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 @@
 	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
--- 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		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
--- 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
--- 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 @@
 	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
--- 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(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
--- 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 @@
 	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
--- 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
--- 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 @@
 	*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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 @@
 
 #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
--- 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 @@
 #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
--- 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 @@
 
 #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
--- 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 @@
 		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
--- 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 @@
 	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
--- 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
--- 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 @@
 	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
--- 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
--- 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
--- 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 @@
 	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
--- 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 @@
 #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
--- 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 @@
 	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
--- 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 @@
 	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
--- 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
--- 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
--- 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
--- 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 @@
 	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
--- 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 @@
 
 #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
--- 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
--- 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 @@
 	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
--- 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
--- 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_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
--- 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 @@
 	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
--- 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 @@
 	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
--- 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 @@
 	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
--- 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
--- 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 @@
 		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
--- a/sys/compat/linuxkpi/common/include/linux/devcoredump.h
+++ b/sys/compat/linuxkpi/common/include/linux/devcoredump.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_LINUX_DEVCOREDUMP_H
-#define	__LKPI_LINUX_DEVCOREDUMP_H
+#ifndef	_LINUXKPI_LINUX_DEVCOREDUMP_H
+#define	_LINUXKPI_LINUX_DEVCOREDUMP_H
 
 #include <linux/slab.h>
 #include <linux/scatterlist.h>
@@ -73,4 +73,4 @@
 	_lkpi_dev_coredumpsg_free(table);
 }
 
-#endif	/* __LKPI_LINUX_DEVCOREDUMP_H */
+#endif	/* _LINUXKPI_LINUX_DEVCOREDUMP_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/device.h b/sys/compat/linuxkpi/common/include/linux/device.h
--- a/sys/compat/linuxkpi/common/include/linux/device.h
+++ b/sys/compat/linuxkpi/common/include/linux/device.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_DEVICE_H_
-#define	_LINUX_DEVICE_H_
+#ifndef	_LINUXKPI_LINUX_DEVICE_H_
+#define	_LINUXKPI_LINUX_DEVICE_H_
 
 #include <linux/err.h>
 #include <linux/types.h>
@@ -653,4 +653,4 @@
 #define	devm_kcalloc(_dev, _sizen, _size, _gfp)			\
     devm_kmalloc((_dev), ((_sizen) * (_size)), (_gfp) | __GFP_ZERO)
 
-#endif	/* _LINUX_DEVICE_H_ */
+#endif	/* _LINUXKPI_LINUX_DEVICE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/dma-attrs.h b/sys/compat/linuxkpi/common/include/linux/dma-attrs.h
--- a/sys/compat/linuxkpi/common/include/linux/dma-attrs.h
+++ b/sys/compat/linuxkpi/common/include/linux/dma-attrs.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_DMA_ATTR_H_
-#define	_LINUX_DMA_ATTR_H_
+#ifndef	_LINUXKPI_LINUX_DMA_ATTR_H_
+#define	_LINUXKPI_LINUX_DMA_ATTR_H_
 
 #define	DMA_ATTR_WRITE_BARRIER		(1 << 0)
 #define	DMA_ATTR_WEAK_ORDERING		(1 << 1)
@@ -53,4 +53,4 @@
 	attrs->flags = 0;
 }
 
-#endif	/* _LINUX_DMA_ATTR_H_ */
+#endif	/* _LINUXKPI_LINUX_DMA_ATTR_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
--- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
+++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_DMA_MAPPING_H_
-#define _LINUX_DMA_MAPPING_H_
+#ifndef	_LINUXKPI_LINUX_DMA_MAPPING_H_
+#define _LINUXKPI_LINUX_DMA_MAPPING_H_
 
 #include <linux/types.h>
 #include <linux/device.h>
@@ -275,4 +275,4 @@
 extern int uma_align_cache;
 #define	dma_get_cache_alignment()	uma_align_cache
 
-#endif	/* _LINUX_DMA_MAPPING_H_ */
+#endif	/* _LINUXKPI_LINUX_DMA_MAPPING_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/dmapool.h b/sys/compat/linuxkpi/common/include/linux/dmapool.h
--- a/sys/compat/linuxkpi/common/include/linux/dmapool.h
+++ b/sys/compat/linuxkpi/common/include/linux/dmapool.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_DMAPOOL_H_
-#define	_LINUX_DMAPOOL_H_
+#ifndef _LINUXKPI_LINUX_DMAPOOL_H_
+#define	_LINUXKPI_LINUX_DMAPOOL_H_
 
 #include <linux/types.h>
 #include <linux/io.h>
@@ -102,4 +102,4 @@
 	linux_dma_pool_free(pool, vaddr, dma_addr);
 }
 
-#endif /* _LINUX_DMAPOOL_H_ */
+#endif /* _LINUXKPI_LINUX_DMAPOOL_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/dmi.h b/sys/compat/linuxkpi/common/include/linux/dmi.h
--- a/sys/compat/linuxkpi/common/include/linux/dmi.h
+++ b/sys/compat/linuxkpi/common/include/linux/dmi.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LINUX_DMI_H__
-#define	__LINUX_DMI_H__
+#ifndef __LINUXKPI_LINUX_DMI_H__
+#define	__LINUXKPI_LINUX_DMI_H__
 
 #include <sys/types.h>
 #include <linux/mod_devicetable.h>
@@ -44,4 +44,4 @@
 #define	dmi_first_match(sysid)	linux_dmi_first_match(sysid)
 #define	dmi_get_system_info(sysid)	linux_dmi_get_system_info(sysid)
 
-#endif	/* __LINUX_DMI_H__ */
+#endif	/* __LINUXKPI_LINUX_DMI_H__ */
diff --git a/sys/compat/linuxkpi/common/include/linux/efi.h b/sys/compat/linuxkpi/common/include/linux/efi.h
--- a/sys/compat/linuxkpi/common/include/linux/efi.h
+++ b/sys/compat/linuxkpi/common/include/linux/efi.h
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_EFI_H_
-#define	_LINUX_EFI_H_
+#ifndef _LINUXKPI_LINUX_EFI_H_
+#define	_LINUXKPI_LINUX_EFI_H_
 
 #include <sys/param.h>
 #include <sys/linker.h>
@@ -70,4 +70,4 @@
 	__efi_enabled(x);					\
 })
 
-#endif	/* _LINUX_EFI_H_ */
+#endif	/* _LINUXKPI_LINUX_EFI_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/err.h b/sys/compat/linuxkpi/common/include/linux/err.h
--- a/sys/compat/linuxkpi/common/include/linux/err.h
+++ b/sys/compat/linuxkpi/common/include/linux/err.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_ERR_H_
-#define	_LINUX_ERR_H_
+#ifndef	_LINUXKPI_LINUX_ERR_H_
+#define	_LINUXKPI_LINUX_ERR_H_
 
 #include <sys/types.h>
 
@@ -80,4 +80,4 @@
 
 #define PTR_RET(p) PTR_ERR_OR_ZERO(p)
 
-#endif	/* _LINUX_ERR_H_ */
+#endif	/* _LINUXKPI_LINUX_ERR_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/errno.h b/sys/compat/linuxkpi/common/include/linux/errno.h
--- a/sys/compat/linuxkpi/common/include/linux/errno.h
+++ b/sys/compat/linuxkpi/common/include/linux/errno.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_ERRNO_H_
-#define	_LINUX_ERRNO_H_
+#ifndef	_LINUXKPI_LINUX_ERRNO_H_
+#define	_LINUXKPI_LINUX_ERRNO_H_
 
 #include <sys/errno.h>
 
@@ -65,4 +65,4 @@
 #define	ERFKILL		530
 #define	EBADE		531
 
-#endif					/* _LINUX_ERRNO_H_ */
+#endif					/* _LINUXKPI_LINUX_ERRNO_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/etherdevice.h b/sys/compat/linuxkpi/common/include/linux/etherdevice.h
--- a/sys/compat/linuxkpi/common/include/linux/etherdevice.h
+++ b/sys/compat/linuxkpi/common/include/linux/etherdevice.h
@@ -24,8 +24,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_ETHERDEVICE
-#define	_LINUX_ETHERDEVICE
+#ifndef _LINUXKPI_LINUX_ETHERDEVICE_H_
+#define	_LINUXKPI_LINUX_ETHERDEVICE_H_
 
 #include <linux/types.h>
 
@@ -115,4 +115,4 @@
 	dst[0] |= 0x02;
 }
 
-#endif					/* _LINUX_ETHERDEVICE */
+#endif					/* _LINUXKPI_LINUX_ETHERDEVICE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/export.h b/sys/compat/linuxkpi/common/include/linux/export.h
--- a/sys/compat/linuxkpi/common/include/linux/export.h
+++ b/sys/compat/linuxkpi/common/include/linux/export.h
@@ -24,8 +24,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_EXPORT_H
-#define	_LINUX_EXPORT_H
+#ifndef	_LINUXKPI_LINUX_EXPORT_H
+#define	_LINUXKPI_LINUX_EXPORT_H
 
 #define	EXPORT_SYMBOL(name)
 #define	EXPORT_SYMBOL_GPL(name)
diff --git a/sys/compat/linuxkpi/common/include/linux/file.h b/sys/compat/linuxkpi/common/include/linux/file.h
--- a/sys/compat/linuxkpi/common/include/linux/file.h
+++ b/sys/compat/linuxkpi/common/include/linux/file.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_FILE_H_
-#define	_LINUX_FILE_H_
+#ifndef	_LINUXKPI_LINUX_FILE_H_
+#define	_LINUXKPI_LINUX_FILE_H_
 
 #include <sys/param.h>
 #include <sys/file.h>
@@ -187,4 +187,4 @@
 #define	file		linux_file
 #define	fget(...)	linux_fget(__VA_ARGS__)
 
-#endif	/* _LINUX_FILE_H_ */
+#endif	/* _LINUXKPI_LINUX_FILE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/fs.h b/sys/compat/linuxkpi/common/include/linux/fs.h
--- a/sys/compat/linuxkpi/common/include/linux/fs.h
+++ b/sys/compat/linuxkpi/common/include/linux/fs.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_FS_H_
-#define	_LINUX_FS_H_
+#ifndef	_LINUXKPI_LINUX_FS_H_
+#define	_LINUXKPI_LINUX_FS_H_
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
@@ -318,4 +318,4 @@
 	return (file->f_op->mmap(file, vma));
 }
 
-#endif /* _LINUX_FS_H_ */
+#endif /* _LINUXKPI_LINUX_FS_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/gcd.h b/sys/compat/linuxkpi/common/include/linux/gcd.h
--- a/sys/compat/linuxkpi/common/include/linux/gcd.h
+++ b/sys/compat/linuxkpi/common/include/linux/gcd.h
@@ -29,8 +29,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_GCD_H_
-#define _LINUX_GCD_H_
+#ifndef _LINUXKPI_LINUX_GCD_H_
+#define _LINUXKPI_LINUX_GCD_H_
 
 static inline unsigned long
 gcd(unsigned long a, unsigned long b)
diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h
--- a/sys/compat/linuxkpi/common/include/linux/gfp.h
+++ b/sys/compat/linuxkpi/common/include/linux/gfp.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_GFP_H_
-#define	_LINUX_GFP_H_
+#ifndef	_LINUXKPI_LINUX_GFP_H_
+#define	_LINUXKPI_LINUX_GFP_H_
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
@@ -184,4 +184,4 @@
 #define	SetPageReserved(page)	do { } while (0)	/* NOP */
 #define	ClearPageReserved(page)	do { } while (0)	/* NOP */
 
-#endif	/* _LINUX_GFP_H_ */
+#endif	/* _LINUXKPI_LINUX_GFP_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/hardirq.h b/sys/compat/linuxkpi/common/include/linux/hardirq.h
--- a/sys/compat/linuxkpi/common/include/linux/hardirq.h
+++ b/sys/compat/linuxkpi/common/include/linux/hardirq.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_HARDIRQ_H_
-#define	_LINUX_HARDIRQ_H_
+#ifndef _LINUXKPI_LINUX_HARDIRQ_H_
+#define	_LINUXKPI_LINUX_HARDIRQ_H_
 
 #include <linux/types.h>
 #include <linux/lockdep.h>
@@ -40,4 +40,4 @@
 
 #define	synchronize_irq(irq)	_intr_drain((irq))
 
-#endif	/* _LINUX_HARDIRQ_H_ */
+#endif	/* _LINUXKPI_LINUX_HARDIRQ_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/highmem.h b/sys/compat/linuxkpi/common/include/linux/highmem.h
--- a/sys/compat/linuxkpi/common/include/linux/highmem.h
+++ b/sys/compat/linuxkpi/common/include/linux/highmem.h
@@ -29,8 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _LINUX_HIGHMEM_H_
-#define _LINUX_HIGHMEM_H_
+#ifndef _LINUXKPI_LINUX_HIGHMEM_H_
+#define _LINUXKPI_LINUX_HIGHMEM_H_
 
 #include <sys/types.h>
 #include <sys/lock.h>
@@ -115,4 +115,4 @@
 		kunmap(virt_to_page(vaddr));
 }
 
-#endif	/* _LINUX_HIGHMEM_H_ */
+#endif	/* _LINUXKPI_LINUX_HIGHMEM_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/hrtimer.h b/sys/compat/linuxkpi/common/include/linux/hrtimer.h
--- a/sys/compat/linuxkpi/common/include/linux/hrtimer.h
+++ b/sys/compat/linuxkpi/common/include/linux/hrtimer.h
@@ -25,8 +25,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_HRTIMER_H_
-#define	_LINUX_HRTIMER_H_
+#ifndef _LINUXKPI_LINUX_HRTIMER_H_
+#define	_LINUXKPI_LINUX_HRTIMER_H_
 
 #include <sys/_callout.h>
 #include <sys/_mutex.h>
@@ -86,4 +86,4 @@
 void	linux_hrtimer_start_range_ns(struct hrtimer *, ktime_t, int64_t);
 void	linux_hrtimer_forward_now(struct hrtimer *, ktime_t);
 
-#endif /* _LINUX_HRTIMER_H_ */
+#endif /* _LINUXKPI_LINUX_HRTIMER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/idr.h b/sys/compat/linuxkpi/common/include/linux/idr.h
--- a/sys/compat/linuxkpi/common/include/linux/idr.h
+++ b/sys/compat/linuxkpi/common/include/linux/idr.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_IDR_H_
-#define	_LINUX_IDR_H_
+#ifndef	_LINUXKPI_LINUX_IDR_H_
+#define	_LINUXKPI_LINUX_IDR_H_
 
 #include <sys/param.h>
 #include <sys/lock.h>
@@ -152,4 +152,4 @@
 	return (idr_is_empty(&ida->idr));
 }
 
-#endif	/* _LINUX_IDR_H_ */
+#endif	/* _LINUXKPI_LINUX_IDR_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/if_arp.h b/sys/compat/linuxkpi/common/include/linux/if_arp.h
--- a/sys/compat/linuxkpi/common/include/linux/if_arp.h
+++ b/sys/compat/linuxkpi/common/include/linux/if_arp.h
@@ -28,10 +28,10 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_IF_ARP_H_
-#define	_LINUX_IF_ARP_H_
+#ifndef	_LINUXKPI_LINUX_IF_ARP_H_
+#define	_LINUXKPI_LINUX_IF_ARP_H_
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if_arp.h>
-#endif	/* _LINUX_IF_ARP_H_ */
+#endif	/* _LINUXKPI_LINUX_IF_ARP_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/if_ether.h b/sys/compat/linuxkpi/common/include/linux/if_ether.h
--- a/sys/compat/linuxkpi/common/include/linux/if_ether.h
+++ b/sys/compat/linuxkpi/common/include/linux/if_ether.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_IF_ETHER_H_
-#define	_LINUX_IF_ETHER_H_
+#ifndef	_LINUXKPI_LINUX_IF_ETHER_H_
+#define	_LINUXKPI_LINUX_IF_ETHER_H_
 
 #include <linux/types.h>
 
@@ -64,4 +64,4 @@
 	uint16_t	h_proto;
 } __packed;
 
-#endif	/* _LINUX_IF_ETHER_H_ */
+#endif	/* _LINUXKPI_LINUX_IF_ETHER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/if_vlan.h b/sys/compat/linuxkpi/common/include/linux/if_vlan.h
--- a/sys/compat/linuxkpi/common/include/linux/if_vlan.h
+++ b/sys/compat/linuxkpi/common/include/linux/if_vlan.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_IF_VLAN_H_
-#define	_LINUX_IF_VLAN_H_
+#ifndef	_LINUXKPI_LINUX_IF_VLAN_H_
+#define	_LINUXKPI_LINUX_IF_VLAN_H_
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -56,4 +56,4 @@
 	return (0);
 }
 
-#endif	/* _LINUX_IF_VLAN_H_ */
+#endif	/* _LINUXKPI_LINUX_IF_VLAN_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/in.h b/sys/compat/linuxkpi/common/include/linux/in.h
--- a/sys/compat/linuxkpi/common/include/linux/in.h
+++ b/sys/compat/linuxkpi/common/include/linux/in.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_IN_H_
-#define	_LINUX_IN_H_
+#ifndef	_LINUXKPI_LINUX_IN_H_
+#define	_LINUXKPI_LINUX_IN_H_
 
 #include "opt_inet.h"
 
@@ -44,4 +44,4 @@
 #define	ipv4_is_multicast(be)	IN_MULTICAST(ntohl(be))
 #define	ipv4_is_lbcast(be)	((be) == INADDR_BROADCAST)
 
-#endif	/* _LINUX_IN_H_ */
+#endif	/* _LINUXKPI_LINUX_IN_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/in6.h b/sys/compat/linuxkpi/common/include/linux/in6.h
--- a/sys/compat/linuxkpi/common/include/linux/in6.h
+++ b/sys/compat/linuxkpi/common/include/linux/in6.h
@@ -28,9 +28,9 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_IN6_H_
-#define	_LINUX_IN6_H_
+#ifndef	_LINUXKPI_LINUX_IN6_H_
+#define	_LINUXKPI_LINUX_IN6_H_
 
 #include "opt_inet6.h"
 
-#endif	/* _LINUX_IN6_H_ */
+#endif	/* _LINUXKPI_LINUX_IN6_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/inetdevice.h b/sys/compat/linuxkpi/common/include/linux/inetdevice.h
--- a/sys/compat/linuxkpi/common/include/linux/inetdevice.h
+++ b/sys/compat/linuxkpi/common/include/linux/inetdevice.h
@@ -1,6 +1,6 @@
-#ifndef	_LINUX_INETDEVICE_H_
-#define	_LINUX_INETDEVICE_H_
+#ifndef	_LINUXKPI_LINUX_INETDEVICE_H_
+#define	_LINUXKPI_LINUX_INETDEVICE_H_
 
 #include <linux/netdevice.h>
 
-#endif	/* _LINUX_INETDEVICE_H_ */
+#endif	/* _LINUXKPI_LINUX_INETDEVICE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/interrupt.h b/sys/compat/linuxkpi/common/include/linux/interrupt.h
--- a/sys/compat/linuxkpi/common/include/linux/interrupt.h
+++ b/sys/compat/linuxkpi/common/include/linux/interrupt.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_INTERRUPT_H_
-#define	_LINUX_INTERRUPT_H_
+#ifndef	_LINUXKPI_LINUX_INTERRUPT_H_
+#define	_LINUXKPI_LINUX_INTERRUPT_H_
 
 #include <linux/cpu.h>
 #include <linux/device.h>
@@ -153,4 +153,4 @@
 extern void tasklet_unlock(struct tasklet_struct *);
 extern void tasklet_unlock_wait(struct tasklet_struct *ts);
 
-#endif	/* _LINUX_INTERRUPT_H_ */
+#endif	/* _LINUXKPI_LINUX_INTERRUPT_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/interval_tree.h b/sys/compat/linuxkpi/common/include/linux/interval_tree.h
--- a/sys/compat/linuxkpi/common/include/linux/interval_tree.h
+++ b/sys/compat/linuxkpi/common/include/linux/interval_tree.h
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_INTERVAL_TREE_H
-#define _LINUX_INTERVAL_TREE_H
+#ifndef _LINUXKPI_LINUX_INTERVAL_TREE_H
+#define _LINUXKPI_LINUX_INTERVAL_TREE_H
 
 #include <linux/rbtree.h>
 
@@ -52,4 +52,4 @@
 void lkpi_interval_tree_remove(struct interval_tree_node *,
     struct rb_root_cached *);
 
-#endif	/* _LINUX_INTERVAL_TREE_H */
+#endif	/* _LINUXKPI_LINUX_INTERVAL_TREE_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/io-mapping.h b/sys/compat/linuxkpi/common/include/linux/io-mapping.h
--- a/sys/compat/linuxkpi/common/include/linux/io-mapping.h
+++ b/sys/compat/linuxkpi/common/include/linux/io-mapping.h
@@ -29,8 +29,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_IO_MAPPING_H_
-#define	_LINUX_IO_MAPPING_H_
+#ifndef _LINUXKPI_LINUX_IO_MAPPING_H_
+#define	_LINUXKPI_LINUX_IO_MAPPING_H_
 
 #include <sys/types.h>
 #include <machine/vm.h>
@@ -114,4 +114,4 @@
 {
 }
 
-#endif /* _LINUX_IO_MAPPING_H_ */
+#endif /* _LINUXKPI_LINUX_IO_MAPPING_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h
--- a/sys/compat/linuxkpi/common/include/linux/io.h
+++ b/sys/compat/linuxkpi/common/include/linux/io.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_IO_H_
-#define	_LINUX_IO_H_
+#ifndef	_LINUXKPI_LINUX_IO_H_
+#define	_LINUXKPI_LINUX_IO_H_
 
 #include <sys/endian.h>
 #include <sys/types.h>
@@ -490,4 +490,4 @@
 #define	arch_phys_wc_index(x)	\
 	(((x) < __MTRR_ID_BASE) ? -1 : ((x) - __MTRR_ID_BASE))
 
-#endif	/* _LINUX_IO_H_ */
+#endif	/* _LINUXKPI_LINUX_IO_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/ioctl.h b/sys/compat/linuxkpi/common/include/linux/ioctl.h
--- a/sys/compat/linuxkpi/common/include/linux/ioctl.h
+++ b/sys/compat/linuxkpi/common/include/linux/ioctl.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_IOCTL_H_
-#define	_LINUX_IOCTL_H_
+#ifndef	_LINUXKPI_LINUX_IOCTL_H_
+#define	_LINUXKPI_LINUX_IOCTL_H_
 
 #include <sys/ioccom.h>
 
@@ -37,4 +37,4 @@
 #define	_IOC_TYPE(cmd)	IOCGROUP(cmd)
 #define	_IOC_NR(cmd)	((cmd) & 0xff)
 
-#endif	/* _LINUX_IOCTL_H_ */
+#endif	/* _LINUXKPI_LINUX_IOCTL_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/iopoll.h b/sys/compat/linuxkpi/common/include/linux/iopoll.h
--- a/sys/compat/linuxkpi/common/include/linux/iopoll.h
+++ b/sys/compat/linuxkpi/common/include/linux/iopoll.h
@@ -27,8 +27,8 @@
  * $FreeBSD$
  */
 
-#ifndef	__LINUXKPI_LINUX_IOPOLL_H
-#define	__LINUXKPI_LINUX_IOPOLL_H
+#ifndef	_LINUXKPI_LINUX_IOPOLL_H
+#define	_LINUXKPI_LINUX_IOPOLL_H
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -91,4 +91,4 @@
 	(_cond) ? 0 : (-ETIMEDOUT);						\
 })
 
-#endif	/* __LINUXKPI_LINUX_IOPOLL_H */
+#endif	/* _LINUXKPI_LINUX_IOPOLL_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/ip.h b/sys/compat/linuxkpi/common/include/linux/ip.h
--- a/sys/compat/linuxkpi/common/include/linux/ip.h
+++ b/sys/compat/linuxkpi/common/include/linux/ip.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_LINUX_IP_H
-#define	__LKPI_LINUX_IP_H
+#ifndef	_LINUXKPI_LINUX_IP_H
+#define	_LINUXKPI_LINUX_IP_H
 
 #include <sys/types.h>
 
@@ -72,4 +72,4 @@
 	iph->check = in_cksum_hdr((const void *)iph);
 }
 
-#endif	/* __LKPI_LINUX_IP_H */
+#endif	/* _LINUXKPI_LINUX_IP_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/irq_work.h b/sys/compat/linuxkpi/common/include/linux/irq_work.h
--- a/sys/compat/linuxkpi/common/include/linux/irq_work.h
+++ b/sys/compat/linuxkpi/common/include/linux/irq_work.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LINUX_IRQ_WORK_H__
-#define	__LINUX_IRQ_WORK_H__
+#ifndef _LINUXKPI_LINUX_IRQ_WORK_H_
+#define	_LINUXKPI_LINUX_IRQ_WORK_H_
 
 #include <sys/param.h>
 #include <sys/taskqueue.h>
@@ -70,4 +70,4 @@
 	taskqueue_drain(linux_irq_work_tq, &irqw->irq_task);
 }
 
-#endif /* __LINUX_IRQ_WORK_H__ */
+#endif /* _LINUXKPI_LINUX_IRQ_WORK_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/irqreturn.h b/sys/compat/linuxkpi/common/include/linux/irqreturn.h
--- a/sys/compat/linuxkpi/common/include/linux/irqreturn.h
+++ b/sys/compat/linuxkpi/common/include/linux/irqreturn.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_IRQRETURN_H
-#define	_LINUX_IRQRETURN_H
+#ifndef _LINUXKPI_LINUX_IRQRETURN_H
+#define	_LINUXKPI_LINUX_IRQRETURN_H
 
 typedef enum irqreturn {
 	IRQ_NONE = 0,
@@ -37,4 +37,4 @@
 
 #define	IRQ_RETVAL(x) ((x) ? IRQ_HANDLED : IRQ_NONE)
 
-#endif /* _LINUX_IRQRETURN_H */
+#endif /* _LINUXKPI_LINUX_IRQRETURN_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/jhash.h b/sys/compat/linuxkpi/common/include/linux/jhash.h
--- a/sys/compat/linuxkpi/common/include/linux/jhash.h
+++ b/sys/compat/linuxkpi/common/include/linux/jhash.h
@@ -1,5 +1,5 @@
-#ifndef	_LINUX_JHASH_H_
-#define	_LINUX_JHASH_H_
+#ifndef	_LINUXKPI_LINUX_JHASH_H_
+#define	_LINUXKPI_LINUX_JHASH_H_
 
 #include <asm/types.h>
 
@@ -143,4 +143,4 @@
 	return jhash_3words(a, 0, 0, initval);
 }
 
-#endif	/* _LINUX_JHASH_H_ */
+#endif	/* _LINUXKPI_LINUX_JHASH_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/jiffies.h b/sys/compat/linuxkpi/common/include/linux/jiffies.h
--- a/sys/compat/linuxkpi/common/include/linux/jiffies.h
+++ b/sys/compat/linuxkpi/common/include/linux/jiffies.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_JIFFIES_H_
-#define	_LINUX_JIFFIES_H_
+#ifndef	_LINUXKPI_LINUX_JIFFIES_H_
+#define	_LINUXKPI_LINUX_JIFFIES_H_
 
 #include <linux/types.h>
 #include <linux/time.h>
@@ -164,4 +164,4 @@
 	return (delta);
 }
 
-#endif	/* _LINUX_JIFFIES_H_ */
+#endif	/* _LINUXKPI_LINUX_JIFFIES_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/jump_label.h b/sys/compat/linuxkpi/common/include/linux/jump_label.h
--- a/sys/compat/linuxkpi/common/include/linux/jump_label.h
+++ b/sys/compat/linuxkpi/common/include/linux/jump_label.h
@@ -24,8 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_JUMP_LABEL_H_
-#define _LINUX_JUMP_LABEL_H_
+#ifndef _LINUXKPI_LINUX_JUMP_LABEL_H_
+#define _LINUXKPI_LINUX_JUMP_LABEL_H_
 
 #include <linux/types.h>
 #include <linux/compiler.h>
@@ -45,4 +45,4 @@
 	return *flag;
 }
 
-#endif	/* _LINUX_JUMP_LABEL_H_ */
+#endif	/* _LINUXKPI_LINUX_JUMP_LABEL_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/kdev_t.h b/sys/compat/linuxkpi/common/include/linux/kdev_t.h
--- a/sys/compat/linuxkpi/common/include/linux/kdev_t.h
+++ b/sys/compat/linuxkpi/common/include/linux/kdev_t.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_KDEV_T_H_
-#define	_LINUX_KDEV_T_H_
+#ifndef	_LINUXKPI_LINUX_KDEV_T_H_
+#define	_LINUXKPI_LINUX_KDEV_T_H_
 
 #include <sys/types.h>
 
@@ -43,4 +43,4 @@
 	return ((MAJOR(dev) << 8) | MINOR(dev));
 }
 
-#endif	/* _LINUX_KDEV_T_H_ */
+#endif	/* _LINUXKPI_LINUX_KDEV_T_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h
--- a/sys/compat/linuxkpi/common/include/linux/kernel.h
+++ b/sys/compat/linuxkpi/common/include/linux/kernel.h
@@ -29,8 +29,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_KERNEL_H_
-#define	_LINUX_KERNEL_H_
+#ifndef	_LINUXKPI_LINUX_KERNEL_H_
+#define	_LINUXKPI_LINUX_KERNEL_H_
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
@@ -728,4 +728,4 @@
 #define	IS_REACHABLE(_x)	(IS_BUILTIN(_x) || \
 				    (IS_MODULE(_x) && IS_BUILTIN(MODULE)))
 
-#endif	/* _LINUX_KERNEL_H_ */
+#endif	/* _LINUXKPI_LINUX_KERNEL_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/kmod.h b/sys/compat/linuxkpi/common/include/linux/kmod.h
--- a/sys/compat/linuxkpi/common/include/linux/kmod.h
+++ b/sys/compat/linuxkpi/common/include/linux/kmod.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_KMOD_H_
-#define	_LINUX_KMOD_H_
+#ifndef	_LINUXKPI_LINUX_KMOD_H_
+#define	_LINUXKPI_LINUX_KMOD_H_
 
 #include <sys/types.h>
 #include <sys/syscallsubr.h>
@@ -48,4 +48,4 @@
 
 #define request_module_nowait request_module
 
-#endif /* _LINUX_KMOD_H_ */
+#endif /* _LINUXKPI_LINUX_KMOD_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/kobject.h b/sys/compat/linuxkpi/common/include/linux/kobject.h
--- a/sys/compat/linuxkpi/common/include/linux/kobject.h
+++ b/sys/compat/linuxkpi/common/include/linux/kobject.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_KOBJECT_H_
-#define	_LINUX_KOBJECT_H_
+#ifndef	_LINUXKPI_LINUX_KOBJECT_H_
+#define	_LINUXKPI_LINUX_KOBJECT_H_
 
 #include <machine/stdarg.h>
 
@@ -167,4 +167,4 @@
 	 */
 }
 
-#endif /* _LINUX_KOBJECT_H_ */
+#endif /* _LINUXKPI_LINUX_KOBJECT_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/kref.h b/sys/compat/linuxkpi/common/include/linux/kref.h
--- a/sys/compat/linuxkpi/common/include/linux/kref.h
+++ b/sys/compat/linuxkpi/common/include/linux/kref.h
@@ -29,8 +29,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_KREF_H_
-#define _LINUX_KREF_H_
+#ifndef _LINUXKPI_LINUX_KREF_H_
+#define _LINUXKPI_LINUX_KREF_H_
 
 #include <sys/types.h>
 #include <sys/refcount.h>
@@ -128,4 +128,4 @@
 	return 0;
 }
 
-#endif /* _LINUX_KREF_H_ */
+#endif /* _LINUXKPI_LINUX_KREF_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/kthread.h b/sys/compat/linuxkpi/common/include/linux/kthread.h
--- a/sys/compat/linuxkpi/common/include/linux/kthread.h
+++ b/sys/compat/linuxkpi/common/include/linux/kthread.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_KTHREAD_H_
-#define	_LINUX_KTHREAD_H_
+#ifndef	_LINUXKPI_LINUX_KTHREAD_H_
+#define	_LINUXKPI_LINUX_KTHREAD_H_
 
 #include <linux/sched.h>
 
@@ -70,4 +70,4 @@
 
 #define	in_atomic()			linux_in_atomic()
 
-#endif /* _LINUX_KTHREAD_H_ */
+#endif /* _LINUXKPI_LINUX_KTHREAD_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/ktime.h b/sys/compat/linuxkpi/common/include/linux/ktime.h
--- a/sys/compat/linuxkpi/common/include/linux/ktime.h
+++ b/sys/compat/linuxkpi/common/include/linux/ktime.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_KTIME_H
-#define	_LINUX_KTIME_H
+#ifndef _LINUXKPI_LINUX_KTIME_H
+#define	_LINUXKPI_LINUX_KTIME_H
 
 #include <linux/types.h>
 #include <linux/time.h>
@@ -263,4 +263,4 @@
 	return (ktime_to_ns(timespec_to_ktime(ts)));
 }
 
-#endif /* _LINUX_KTIME_H */
+#endif /* _LINUXKPI_LINUX_KTIME_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h
--- a/sys/compat/linuxkpi/common/include/linux/list.h
+++ b/sys/compat/linuxkpi/common/include/linux/list.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_LIST_H_
-#define _LINUX_LIST_H_
+#ifndef _LINUXKPI_LINUX_LIST_H_
+#define _LINUXKPI_LINUX_LIST_H_
 
 #ifndef _STANDALONE
 /*
@@ -500,4 +500,4 @@
 extern void list_sort(void *priv, struct list_head *head, int (*cmp)(void *priv,
     struct list_head *a, struct list_head *b));
 
-#endif /* _LINUX_LIST_H_ */
+#endif /* _LINUXKPI_LINUX_LIST_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/llist.h b/sys/compat/linuxkpi/common/include/linux/llist.h
--- a/sys/compat/linuxkpi/common/include/linux/llist.h
+++ b/sys/compat/linuxkpi/common/include/linux/llist.h
@@ -1,7 +1,7 @@
 /* Public domain. */
 
-#ifndef _LINUX_LLIST_H
-#define _LINUX_LLIST_H
+#ifndef _LINUXKPI_LINUX_LLIST_H
+#define _LINUXKPI_LINUX_LLIST_H
 
 #include <sys/types.h>
 #include <machine/atomic.h>
diff --git a/sys/compat/linuxkpi/common/include/linux/lockdep.h b/sys/compat/linuxkpi/common/include/linux/lockdep.h
--- a/sys/compat/linuxkpi/common/include/linux/lockdep.h
+++ b/sys/compat/linuxkpi/common/include/linux/lockdep.h
@@ -29,8 +29,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_LOCKDEP_H_
-#define	_LINUX_LOCKDEP_H_
+#ifndef _LINUXKPI_LINUX_LOCKDEP_H_
+#define	_LINUXKPI_LINUX_LOCKDEP_H_
 
 #include <sys/types.h>
 #include <sys/lock.h>
@@ -99,4 +99,4 @@
 #define	lockdep_repin_lock(l,c) do { (void)(l); (void)(c); } while (0)
 #define	lockdep_unpin_lock(l,c) do { (void)(l); (void)(c); } while (0)
 
-#endif /* _LINUX_LOCKDEP_H_ */
+#endif /* _LINUXKPI_LINUX_LOCKDEP_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/log2.h b/sys/compat/linuxkpi/common/include/linux/log2.h
--- a/sys/compat/linuxkpi/common/include/linux/log2.h
+++ b/sys/compat/linuxkpi/common/include/linux/log2.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_LOG2_H_
-#define	_LINUX_LOG2_H_
+#ifndef	_LINUXKPI_LINUX_LOG2_H_
+#define	_LINUXKPI_LINUX_LOG2_H_
 
 #include <linux/types.h>
 
@@ -128,4 +128,4 @@
 
 #define	order_base_2(x) ilog2(roundup_pow_of_two(x))
 
-#endif	/* _LINUX_LOG2_H_ */
+#endif	/* _LINUXKPI_LINUX_LOG2_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/math64.h b/sys/compat/linuxkpi/common/include/linux/math64.h
--- a/sys/compat/linuxkpi/common/include/linux/math64.h
+++ b/sys/compat/linuxkpi/common/include/linux/math64.h
@@ -27,8 +27,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_MATH64_H
-#define	_LINUX_MATH64_H
+#ifndef _LINUXKPI_LINUX_MATH64_H
+#define	_LINUXKPI_LINUX_MATH64_H
 
 #include <sys/stdint.h>
 
@@ -100,4 +100,4 @@
 #define	DIV64_U64_ROUND_UP(...) \
 	div64_u64_round_up(__VA_ARGS__)
 
-#endif /* _LINUX_MATH64_H */
+#endif /* _LINUXKPI_LINUX_MATH64_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/miscdevice.h b/sys/compat/linuxkpi/common/include/linux/miscdevice.h
--- a/sys/compat/linuxkpi/common/include/linux/miscdevice.h
+++ b/sys/compat/linuxkpi/common/include/linux/miscdevice.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_MISCDEVICE_H_
-#define	_LINUX_MISCDEVICE_H_
+#ifndef	_LINUXKPI_LINUX_MISCDEVICE_H_
+#define	_LINUXKPI_LINUX_MISCDEVICE_H_
 
 #define	MISC_DYNAMIC_MINOR	-1
 
@@ -73,4 +73,4 @@
 	return (0);
 }
 
-#endif	/* _LINUX_MISCDEVICE_H_ */
+#endif	/* _LINUXKPI_LINUX_MISCDEVICE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h
--- a/sys/compat/linuxkpi/common/include/linux/mm.h
+++ b/sys/compat/linuxkpi/common/include/linux/mm.h
@@ -30,8 +30,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_MM_H_
-#define	_LINUX_MM_H_
+#ifndef	_LINUXKPI_LINUX_MM_H_
+#define	_LINUXKPI_LINUX_MM_H_
 
 #include <linux/spinlock.h>
 #include <linux/gfp.h>
@@ -296,4 +296,4 @@
 
 #define PAGE_ALIGNED(p)	__is_aligned(p, PAGE_SIZE)
 
-#endif					/* _LINUX_MM_H_ */
+#endif					/* _LINUXKPI_LINUX_MM_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/mm_types.h b/sys/compat/linuxkpi/common/include/linux/mm_types.h
--- a/sys/compat/linuxkpi/common/include/linux/mm_types.h
+++ b/sys/compat/linuxkpi/common/include/linux/mm_types.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_MM_TYPES_H_
-#define	_LINUX_MM_TYPES_H_
+#ifndef _LINUXKPI_LINUX_MM_TYPES_H_
+#define	_LINUXKPI_LINUX_MM_TYPES_H_
 
 #include <linux/types.h>
 #include <linux/page.h>
@@ -79,4 +79,4 @@
 extern struct mm_struct *linux_get_task_mm(struct task_struct *);
 #define	get_task_mm(task) linux_get_task_mm(task)
 
-#endif					/* _LINUX_MM_TYPES_H_ */
+#endif					/* _LINUXKPI_LINUX_MM_TYPES_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/mod_devicetable.h b/sys/compat/linuxkpi/common/include/linux/mod_devicetable.h
--- a/sys/compat/linuxkpi/common/include/linux/mod_devicetable.h
+++ b/sys/compat/linuxkpi/common/include/linux/mod_devicetable.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LINUX_MOD_DEVICETABLE_H__
-#define	__LINUX_MOD_DEVICETABLE_H__
+#ifndef __LINUXKPI_LINUX_MOD_DEVICETABLE_H__
+#define	__LINUXKPI_LINUX_MOD_DEVICETABLE_H__
 
 enum dmi_field {
 	DMI_NONE,
@@ -69,4 +69,4 @@
 #define DMI_MATCH(a, b) { .slot = a, .substr = b }
 #define DMI_EXACT_MATCH(a, b)   { .slot = a, .substr = b, }
 
-#endif	/* __LINUX_MOD_DEVICETABLE_H__ */
+#endif	/* __LINUXKPI_LINUX_MOD_DEVICETABLE_H__ */
diff --git a/sys/compat/linuxkpi/common/include/linux/module.h b/sys/compat/linuxkpi/common/include/linux/module.h
--- a/sys/compat/linuxkpi/common/include/linux/module.h
+++ b/sys/compat/linuxkpi/common/include/linux/module.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_MODULE_H_
-#define	_LINUX_MODULE_H_
+#ifndef	_LINUXKPI_LINUX_MODULE_H_
+#define	_LINUXKPI_LINUX_MODULE_H_
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
@@ -105,4 +105,4 @@
 
 #define	postcore_initcall(fn)	module_init(fn)
 
-#endif	/* _LINUX_MODULE_H_ */
+#endif	/* _LINUXKPI_LINUX_MODULE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/moduleparam.h b/sys/compat/linuxkpi/common/include/linux/moduleparam.h
--- a/sys/compat/linuxkpi/common/include/linux/moduleparam.h
+++ b/sys/compat/linuxkpi/common/include/linux/moduleparam.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_MODULEPARAM_H_
-#define	_LINUX_MODULEPARAM_H_
+#ifndef	_LINUXKPI_LINUX_MODULEPARAM_H_
+#define	_LINUXKPI_LINUX_MODULEPARAM_H_
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -136,4 +136,4 @@
 
 SYSCTL_DECL(_compat_linuxkpi);
 
-#endif					/* _LINUX_MODULEPARAM_H_ */
+#endif					/* _LINUXKPI_LINUX_MODULEPARAM_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/mutex.h b/sys/compat/linuxkpi/common/include/linux/mutex.h
--- a/sys/compat/linuxkpi/common/include/linux/mutex.h
+++ b/sys/compat/linuxkpi/common/include/linux/mutex.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_MUTEX_H_
-#define	_LINUX_MUTEX_H_
+#ifndef	_LINUXKPI_LINUX_MUTEX_H_
+#define	_LINUXKPI_LINUX_MUTEX_H_
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -173,4 +173,4 @@
 
 extern int linux_mutex_lock_interruptible(mutex_t *m);
 
-#endif					/* _LINUX_MUTEX_H_ */
+#endif					/* _LINUXKPI_LINUX_MUTEX_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/net.h b/sys/compat/linuxkpi/common/include/linux/net.h
--- a/sys/compat/linuxkpi/common/include/linux/net.h
+++ b/sys/compat/linuxkpi/common/include/linux/net.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_NET_H_
-#define	_LINUX_NET_H_
+#ifndef	_LINUXKPI_LINUX_NET_H_
+#define	_LINUXKPI_LINUX_NET_H_
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -86,4 +86,4 @@
 	return (linuxkpi_net_ratelimit());
 }
 
-#endif	/* _LINUX_NET_H_ */
+#endif	/* _LINUXKPI_LINUX_NET_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/net_dim.h b/sys/compat/linuxkpi/common/include/linux/net_dim.h
--- a/sys/compat/linuxkpi/common/include/linux/net_dim.h
+++ b/sys/compat/linuxkpi/common/include/linux/net_dim.h
@@ -37,8 +37,8 @@
 
 /* This file implements Dynamic Interrupt Moderation, DIM */
 
-#ifndef NET_DIM_H
-#define	NET_DIM_H
+#ifndef _LINUXKPI_LINUX_NET_DIM_H
+#define	_LINUXKPI_LINUX_NET_DIM_H
 
 #include <asm/types.h>
 
@@ -407,4 +407,4 @@
 	}
 }
 
-#endif					/* NET_DIM_H */
+#endif					/* _LINUXKPI_LINUX_NET_DIM_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/netdev_features.h b/sys/compat/linuxkpi/common/include/linux/netdev_features.h
--- a/sys/compat/linuxkpi/common/include/linux/netdev_features.h
+++ b/sys/compat/linuxkpi/common/include/linux/netdev_features.h
@@ -27,8 +27,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	__LKPI_LINUX_NETDEV_FEATURES_H_
-#define	__LKPI_LINUX_NETDEV_FEATURES_H_
+#ifndef	_LINUXKPI_LINUX_NETDEV_FEATURES_H_
+#define	_LINUXKPI_LINUX_NETDEV_FEATURES_H_
 
 #include <linux/types.h>
 #include <linux/bitops.h>
@@ -45,4 +45,4 @@
 
 #define NETIF_F_CSUM_MASK       (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM)
 
-#endif	/* __LKPI_LINUX_NETDEV_FEATURES_H_ */
+#endif	/* _LINUXKPI_LINUX_NETDEV_FEATURES_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/notifier.h b/sys/compat/linuxkpi/common/include/linux/notifier.h
--- a/sys/compat/linuxkpi/common/include/linux/notifier.h
+++ b/sys/compat/linuxkpi/common/include/linux/notifier.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_NOTIFIER_H_
-#define	_LINUX_NOTIFIER_H_
+#ifndef	_LINUXKPI_LINUX_NOTIFIER_H_
+#define	_LINUXKPI_LINUX_NOTIFIER_H_
 
 #include <sys/types.h>
 #include <sys/eventhandler.h>
@@ -54,4 +54,4 @@
 	eventhandler_tag tags[LINUX_NOTIFY_TAGS];
 };
 
-#endif					/* _LINUX_NOTIFIER_H_ */
+#endif					/* _LINUXKPI_LINUX_NOTIFIER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/numa.h b/sys/compat/linuxkpi/common/include/linux/numa.h
--- a/sys/compat/linuxkpi/common/include/linux/numa.h
+++ b/sys/compat/linuxkpi/common/include/linux/numa.h
@@ -28,9 +28,9 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_NUMA_H_
-#define	_LINUX_NUMA_H_
+#ifndef _LINUXKPI_LINUX_NUMA_H_
+#define	_LINUXKPI_LINUX_NUMA_H_
 
 #define	NUMA_NO_NODE	-1
 
-#endif /* _LINUX_NUMA_H_ */
+#endif /* _LINUXKPI_LINUX_NUMA_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/overflow.h b/sys/compat/linuxkpi/common/include/linux/overflow.h
--- a/sys/compat/linuxkpi/common/include/linux/overflow.h
+++ b/sys/compat/linuxkpi/common/include/linux/overflow.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LINUX_OVERFLOW_H__
-#define	__LINUX_OVERFLOW_H__
+#ifndef __LINUXKPI_LINUX_OVERFLOW_H__
+#define	__LINUXKPI_LINUX_OVERFLOW_H__
 
 #include <sys/stdint.h>
 #include <sys/types.h>
@@ -50,4 +50,4 @@
 	return (retval);
 }
 
-#endif	/* __LINUX_OVERFLOW_H__ */
+#endif	/* __LINUXKPI_LINUX_OVERFLOW_H__ */
diff --git a/sys/compat/linuxkpi/common/include/linux/page.h b/sys/compat/linuxkpi/common/include/linux/page.h
--- a/sys/compat/linuxkpi/common/include/linux/page.h
+++ b/sys/compat/linuxkpi/common/include/linux/page.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_PAGE_H_
-#define _LINUX_PAGE_H_
+#ifndef	_LINUXKPI_LINUX_PAGE_H_
+#define _LINUXKPI_LINUX_PAGE_H_
 
 #include <linux/types.h>
 
@@ -128,4 +128,4 @@
 }
 #endif
 
-#endif	/* _LINUX_PAGE_H_ */
+#endif	/* _LINUXKPI_LINUX_PAGE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/pagemap.h b/sys/compat/linuxkpi/common/include/linux/pagemap.h
--- a/sys/compat/linuxkpi/common/include/linux/pagemap.h
+++ b/sys/compat/linuxkpi/common/include/linux/pagemap.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_PAGEMAP_H_
-#define _LINUX_PAGEMAP_H_
+#ifndef _LINUXKPI_LINUX_PAGEMAP_H_
+#define _LINUXKPI_LINUX_PAGEMAP_H_
 
 #include <linux/mm.h>
 
diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -32,8 +32,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_PCI_H_
-#define	_LINUX_PCI_H_
+#ifndef	_LINUXKPI_LINUX_PCI_H_
+#define	_LINUXKPI_LINUX_PCI_H_
 
 #define	CONFIG_PCI_MSI
 
@@ -1585,4 +1585,4 @@
 	pdev->want_iomap_res = true;
 }
 
-#endif	/* _LINUX_PCI_H_ */
+#endif	/* _LINUXKPI_LINUX_PCI_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/pfn.h b/sys/compat/linuxkpi/common/include/linux/pfn.h
--- a/sys/compat/linuxkpi/common/include/linux/pfn.h
+++ b/sys/compat/linuxkpi/common/include/linux/pfn.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_PFN_H_
-#define	_LINUX_PFN_H_
+#ifndef _LINUXKPI_LINUX_PFN_H_
+#define	_LINUXKPI_LINUX_PFN_H_
 
 #include <linux/types.h>
 
@@ -41,4 +41,4 @@
 #define	PFN_PHYS(x)	((phys_addr_t)(x) << PAGE_SHIFT)
 #define	PHYS_PFN(x)	((unsigned long)((x) >> PAGE_SHIFT))
 
-#endif					/* _LINUX_PFN_H_ */
+#endif					/* _LINUXKPI_LINUX_PFN_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/pfn_t.h b/sys/compat/linuxkpi/common/include/linux/pfn_t.h
--- a/sys/compat/linuxkpi/common/include/linux/pfn_t.h
+++ b/sys/compat/linuxkpi/common/include/linux/pfn_t.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_PFN_T_H_
-#define	_LINUX_PFN_T_H_
+#ifndef _LINUXKPI_LINUX_PFN_T_H_
+#define	_LINUXKPI_LINUX_PFN_T_H_
 
 #include <linux/mm.h>
 
@@ -53,4 +53,4 @@
 	return (__pfn_to_pfn_t (pfn, 0));
 }
 
-#endif					/* _LINUX_PFN_T_H_ */
+#endif					/* _LINUXKPI_LINUX_PFN_T_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/pid.h b/sys/compat/linuxkpi/common/include/linux/pid.h
--- a/sys/compat/linuxkpi/common/include/linux/pid.h
+++ b/sys/compat/linuxkpi/common/include/linux/pid.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef	_LINUX_PID_H_
-#define	_LINUX_PID_H_
+#ifndef	_LINUXKPI_LINUX_PID_H_
+#define	_LINUXKPI_LINUX_PID_H_
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -67,4 +67,4 @@
 extern struct task_struct *linux_pid_task(pid_t);
 extern struct task_struct *linux_get_pid_task(pid_t);
 
-#endif					/* _LINUX_PID_H_ */
+#endif					/* _LINUXKPI_LINUX_PID_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/poison.h b/sys/compat/linuxkpi/common/include/linux/poison.h
--- a/sys/compat/linuxkpi/common/include/linux/poison.h
+++ b/sys/compat/linuxkpi/common/include/linux/poison.h
@@ -1,7 +1,7 @@
 /* Public domain. */
 
-#ifndef _LINUX_POISON_H
-#define _LINUX_POISON_H
+#ifndef _LINUXKPI_LINUX_POISON_H
+#define _LINUXKPI_LINUX_POISON_H
 
 #define POISON_INUSE	0xdb
 #define POISON_FREE	0xdf
diff --git a/sys/compat/linuxkpi/common/include/linux/poll.h b/sys/compat/linuxkpi/common/include/linux/poll.h
--- a/sys/compat/linuxkpi/common/include/linux/poll.h
+++ b/sys/compat/linuxkpi/common/include/linux/poll.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_POLL_H_
-#define	_LINUX_POLL_H_
+#ifndef	_LINUXKPI_LINUX_POLL_H_
+#define	_LINUXKPI_LINUX_POLL_H_
 
 #include <sys/poll.h>
 #include <sys/fcntl.h>
@@ -45,4 +45,4 @@
 
 extern void linux_poll_wakeup(struct linux_file *);
 
-#endif	/* _LINUX_POLL_H_ */
+#endif	/* _LINUXKPI_LINUX_POLL_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/power_supply.h b/sys/compat/linuxkpi/common/include/linux/power_supply.h
--- a/sys/compat/linuxkpi/common/include/linux/power_supply.h
+++ b/sys/compat/linuxkpi/common/include/linux/power_supply.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_POWER_SUPPLY_H_
-#define _LINUX_POWER_SUPPLY_H_
+#ifndef _LINUXKPI_LINUX_POWER_SUPPLY_H_
+#define _LINUXKPI_LINUX_POWER_SUPPLY_H_
 
 #include <sys/types.h>
 #include <sys/power.h>
diff --git a/sys/compat/linuxkpi/common/include/linux/preempt.h b/sys/compat/linuxkpi/common/include/linux/preempt.h
--- a/sys/compat/linuxkpi/common/include/linux/preempt.h
+++ b/sys/compat/linuxkpi/common/include/linux/preempt.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_PREEMPT_H_
-#define	_LINUX_PREEMPT_H_
+#ifndef _LINUXKPI_LINUX_PREEMPT_H_
+#define	_LINUXKPI_LINUX_PREEMPT_H_
 
 #include <linux/hardirq.h>
 #include <linux/list.h>
@@ -40,4 +40,4 @@
 #define	preempt_disable()	critical_enter()
 #define	preempt_enable()	critical_exit()
 
-#endif					/* _LINUX_PREEMPT_H_ */
+#endif					/* _LINUXKPI_LINUX_PREEMPT_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/prefetch.h b/sys/compat/linuxkpi/common/include/linux/prefetch.h
--- a/sys/compat/linuxkpi/common/include/linux/prefetch.h
+++ b/sys/compat/linuxkpi/common/include/linux/prefetch.h
@@ -28,9 +28,9 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_PREFETCH_H_
-#define	_LINUX_PREFETCH_H_
+#ifndef _LINUXKPI_LINUX_PREFETCH_H_
+#define	_LINUXKPI_LINUX_PREFETCH_H_
 
 #define prefetchw(x) __builtin_prefetch(x,1)
 
-#endif /* _LINUX_PREFETCH_H_ */
+#endif /* _LINUXKPI_LINUX_PREFETCH_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/printk.h b/sys/compat/linuxkpi/common/include/linux/printk.h
--- a/sys/compat/linuxkpi/common/include/linux/printk.h
+++ b/sys/compat/linuxkpi/common/include/linux/printk.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_PRINTK_H_
-#define	_LINUX_PRINTK_H_
+#ifndef _LINUXKPI_LINUX_PRINTK_H_
+#define	_LINUXKPI_LINUX_PRINTK_H_
 
 #include <linux/kernel.h>
 
@@ -127,4 +127,4 @@
 #define	pr_info_ratelimited(fmt, ...) \
 	printk_ratelimited(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
 
-#endif					/* _LINUX_PRINTK_H_ */
+#endif					/* _LINUXKPI_LINUX_PRINTK_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/radix-tree.h b/sys/compat/linuxkpi/common/include/linux/radix-tree.h
--- a/sys/compat/linuxkpi/common/include/linux/radix-tree.h
+++ b/sys/compat/linuxkpi/common/include/linux/radix-tree.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_RADIX_TREE_H_
-#define	_LINUX_RADIX_TREE_H_
+#ifndef	_LINUXKPI_LINUX_RADIX_TREE_H_
+#define	_LINUXKPI_LINUX_RADIX_TREE_H_
 
 #include <linux/types.h>
 
@@ -82,4 +82,4 @@
 bool	radix_tree_iter_find(struct radix_tree_root *, struct radix_tree_iter *, void ***);
 void	radix_tree_iter_delete(struct radix_tree_root *, struct radix_tree_iter *, void **);
 
-#endif	/* _LINUX_RADIX_TREE_H_ */
+#endif	/* _LINUXKPI_LINUX_RADIX_TREE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/random.h b/sys/compat/linuxkpi/common/include/linux/random.h
--- a/sys/compat/linuxkpi/common/include/linux/random.h
+++ b/sys/compat/linuxkpi/common/include/linux/random.h
@@ -29,8 +29,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_RANDOM_H_
-#define	_LINUX_RANDOM_H_
+#ifndef _LINUXKPI_LINUX_RANDOM_H_
+#define	_LINUXKPI_LINUX_RANDOM_H_
 
 #include <linux/types.h>
 #include <sys/random.h>
@@ -78,4 +78,4 @@
 	return (arc4random_uniform(max));
 }
 
-#endif /* _LINUX_RANDOM_H_ */
+#endif /* _LINUXKPI_LINUX_RANDOM_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/ratelimit.h b/sys/compat/linuxkpi/common/include/linux/ratelimit.h
--- a/sys/compat/linuxkpi/common/include/linux/ratelimit.h
+++ b/sys/compat/linuxkpi/common/include/linux/ratelimit.h
@@ -1,7 +1,7 @@
 /* Public domain. */
 
-#ifndef _LINUX_RATELIMIT_H
-#define _LINUX_RATELIMIT_H
+#ifndef _LINUXKPI_LINUX_RATELIMIT_H
+#define _LINUXKPI_LINUX_RATELIMIT_H
 
 struct ratelimit_state {
 };
diff --git a/sys/compat/linuxkpi/common/include/linux/rbtree.h b/sys/compat/linuxkpi/common/include/linux/rbtree.h
--- a/sys/compat/linuxkpi/common/include/linux/rbtree.h
+++ b/sys/compat/linuxkpi/common/include/linux/rbtree.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_RBTREE_H_
-#define	_LINUX_RBTREE_H_
+#ifndef	_LINUXKPI_LINUX_RBTREE_H_
+#define	_LINUXKPI_LINUX_RBTREE_H_
 
 #ifndef _STANDALONE
 #include <sys/stddef.h>
@@ -175,4 +175,4 @@
 #define RB_ROOT		(struct rb_root) { NULL }
 #define	RB_ROOT_CACHED	(struct rb_root_cached) { RB_ROOT, NULL }
 
-#endif	/* _LINUX_RBTREE_H_ */
+#endif	/* _LINUXKPI_LINUX_RBTREE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/rculist.h b/sys/compat/linuxkpi/common/include/linux/rculist.h
--- a/sys/compat/linuxkpi/common/include/linux/rculist.h
+++ b/sys/compat/linuxkpi/common/include/linux/rculist.h
@@ -27,8 +27,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_RCULIST_H_
-#define	_LINUX_RCULIST_H_
+#ifndef _LINUXKPI_LINUX_RCULIST_H_
+#define	_LINUXKPI_LINUX_RCULIST_H_
 
 #include <linux/list.h>
 #include <linux/rcupdate.h>
@@ -141,4 +141,4 @@
 	}
 }
 
-#endif					/* _LINUX_RCULIST_H_ */
+#endif					/* _LINUXKPI_LINUX_RCULIST_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/rcupdate.h b/sys/compat/linuxkpi/common/include/linux/rcupdate.h
--- a/sys/compat/linuxkpi/common/include/linux/rcupdate.h
+++ b/sys/compat/linuxkpi/common/include/linux/rcupdate.h
@@ -25,8 +25,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_RCUPDATE_H_
-#define	_LINUX_RCUPDATE_H_
+#ifndef	_LINUXKPI_LINUX_RCUPDATE_H_
+#define	_LINUXKPI_LINUX_RCUPDATE_H_
 
 #include <linux/compiler.h>
 #include <linux/types.h>
@@ -127,4 +127,4 @@
 #define	init_rcu_head_on_stack(...)
 #define	destroy_rcu_head_on_stack(...)
 
-#endif					/* _LINUX_RCUPDATE_H_ */
+#endif					/* _LINUXKPI_LINUX_RCUPDATE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/refcount.h b/sys/compat/linuxkpi/common/include/linux/refcount.h
--- a/sys/compat/linuxkpi/common/include/linux/refcount.h
+++ b/sys/compat/linuxkpi/common/include/linux/refcount.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_REFCOUNT_H
-#define _LINUX_REFCOUNT_H
+#ifndef _LINUXKPI_LINUX_REFCOUNT_H
+#define _LINUXKPI_LINUX_REFCOUNT_H
 
 #include <linux/atomic.h>
 
@@ -79,4 +79,4 @@
 	return (false);
 }
 
-#endif /* __LINUX_REFCOUNT_H__ */
+#endif /* __LINUXKPI_LINUX_REFCOUNT_H__ */
diff --git a/sys/compat/linuxkpi/common/include/linux/rwlock.h b/sys/compat/linuxkpi/common/include/linux/rwlock.h
--- a/sys/compat/linuxkpi/common/include/linux/rwlock.h
+++ b/sys/compat/linuxkpi/common/include/linux/rwlock.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_RWLOCK_H_
-#define	_LINUX_RWLOCK_H_
+#ifndef	_LINUXKPI_LINUX_RWLOCK_H_
+#define	_LINUXKPI_LINUX_RWLOCK_H_
 
 #include <sys/types.h>
 #include <sys/lock.h>
@@ -65,4 +65,4 @@
 	rw_init_flags(&lock->rw, "lnxrw", RW_NOWITNESS);
 }
 
-#endif	/* _LINUX_RWLOCK_H_ */
+#endif	/* _LINUXKPI_LINUX_RWLOCK_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/rwsem.h b/sys/compat/linuxkpi/common/include/linux/rwsem.h
--- a/sys/compat/linuxkpi/common/include/linux/rwsem.h
+++ b/sys/compat/linuxkpi/common/include/linux/rwsem.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_RWSEM_H_
-#define	_LINUX_RWSEM_H_
+#ifndef	_LINUXKPI_LINUX_RWSEM_H_
+#define	_LINUXKPI_LINUX_RWSEM_H_
 
 #include <sys/param.h>
 #include <sys/lock.h>
@@ -81,4 +81,4 @@
 
 extern int linux_down_write_killable(struct rw_semaphore *);
 
-#endif					/* _LINUX_RWSEM_H_ */
+#endif					/* _LINUXKPI_LINUX_RWSEM_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h
--- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h
+++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h
@@ -30,8 +30,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_SCATTERLIST_H_
-#define	_LINUX_SCATTERLIST_H_
+#ifndef	_LINUXKPI_LINUX_SCATTERLIST_H_
+#define	_LINUXKPI_LINUX_SCATTERLIST_H_
 
 #include <sys/types.h>
 #include <sys/sf_buf.h>
@@ -599,4 +599,4 @@
 	return (total);
 }
 
-#endif					/* _LINUX_SCATTERLIST_H_ */
+#endif					/* _LINUXKPI_LINUX_SCATTERLIST_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h
--- a/sys/compat/linuxkpi/common/include/linux/sched.h
+++ b/sys/compat/linuxkpi/common/include/linux/sched.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_SCHED_H_
-#define	_LINUX_SCHED_H_
+#ifndef	_LINUXKPI_LINUX_SCHED_H_
+#define	_LINUXKPI_LINUX_SCHED_H_
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -201,4 +201,4 @@
 	return (task->comm);
 }
 
-#endif	/* _LINUX_SCHED_H_ */
+#endif	/* _LINUXKPI_LINUX_SCHED_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/semaphore.h b/sys/compat/linuxkpi/common/include/linux/semaphore.h
--- a/sys/compat/linuxkpi/common/include/linux/semaphore.h
+++ b/sys/compat/linuxkpi/common/include/linux/semaphore.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_SEMAPHORE_H_
-#define _LINUX_SEMAPHORE_H_
+#ifndef _LINUXKPI_LINUX_SEMAPHORE_H_
+#define _LINUXKPI_LINUX_SEMAPHORE_H_
 
 #include <sys/param.h>
 #include <sys/lock.h>
@@ -67,4 +67,4 @@
 
 #define	sema_init(...)	linux_sema_init(__VA_ARGS__)
 
-#endif /* _LINUX_SEMAPHORE_H_ */
+#endif /* _LINUXKPI_LINUX_SEMAPHORE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/seq_file.h b/sys/compat/linuxkpi/common/include/linux/seq_file.h
--- a/sys/compat/linuxkpi/common/include/linux/seq_file.h
+++ b/sys/compat/linuxkpi/common/include/linux/seq_file.h
@@ -27,8 +27,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_SEQ_FILE_H_
-#define _LINUX_SEQ_FILE_H_
+#ifndef _LINUXKPI_LINUX_SEQ_FILE_H_
+#define _LINUXKPI_LINUX_SEQ_FILE_H_
 
 #include <linux/types.h>
 #include <linux/fs.h>
@@ -85,4 +85,4 @@
 
 #define	file			linux_file
 
-#endif	/* _LINUX_SEQ_FILE_H_ */
+#endif	/* _LINUXKPI_LINUX_SEQ_FILE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/seqlock.h b/sys/compat/linuxkpi/common/include/linux/seqlock.h
--- a/sys/compat/linuxkpi/common/include/linux/seqlock.h
+++ b/sys/compat/linuxkpi/common/include/linux/seqlock.h
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _LINUX_SEQLOCK_H__
-#define	_LINUX_SEQLOCK_H__
+#ifndef _LINUXKPI_LINUX_SEQLOCK_H__
+#define	_LINUXKPI_LINUX_SEQLOCK_H__
 
 #include <sys/param.h>
 #include <sys/lock.h>
@@ -134,4 +134,4 @@
 #define	read_seqretry(seqlock, gen)	\
 	read_seqcount_retry(&(seqlock)->seql_count, gen)
 
-#endif	/* _LINUX_SEQLOCK_H__ */
+#endif	/* _LINUXKPI_LINUX_SEQLOCK_H__ */
diff --git a/sys/compat/linuxkpi/common/include/linux/shmem_fs.h b/sys/compat/linuxkpi/common/include/linux/shmem_fs.h
--- a/sys/compat/linuxkpi/common/include/linux/shmem_fs.h
+++ b/sys/compat/linuxkpi/common/include/linux/shmem_fs.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_SHMEM_FS_H_
-#define	_LINUX_SHMEM_FS_H_
+#ifndef	_LINUXKPI_LINUX_SHMEM_FS_H_
+#define	_LINUXKPI_LINUX_SHMEM_FS_H_
 
 /* Shared memory support */
 unsigned long linux_invalidate_mapping_pages(vm_object_t, pgoff_t, pgoff_t);
@@ -52,4 +52,4 @@
 #define	shmem_truncate_range(...) \
   linux_shmem_truncate_range(__VA_ARGS__)
 
-#endif /* _LINUX_SHMEM_FS_H_ */
+#endif /* _LINUXKPI_LINUX_SHMEM_FS_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/shrinker.h b/sys/compat/linuxkpi/common/include/linux/shrinker.h
--- a/sys/compat/linuxkpi/common/include/linux/shrinker.h
+++ b/sys/compat/linuxkpi/common/include/linux/shrinker.h
@@ -25,8 +25,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LINUX_SHRINKER_H__
-#define	__LINUX_SHRINKER_H__
+#ifndef _LINUXKPI_LINUX_SHRINKER_H_
+#define	_LINUXKPI_LINUX_SHRINKER_H_
 
 #include <sys/queue.h>
 
@@ -53,4 +53,4 @@
 #define	register_shrinker(s)	linuxkpi_register_shrinker(s)
 #define	unregister_shrinker(s)	linuxkpi_unregister_shrinker(s)
 
-#endif	/* __LINUX_SHRINKER_H__ */
+#endif	/* _LINUXKPI_LINUX_SHRINKER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/sizes.h b/sys/compat/linuxkpi/common/include/linux/sizes.h
--- a/sys/compat/linuxkpi/common/include/linux/sizes.h
+++ b/sys/compat/linuxkpi/common/include/linux/sizes.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LINUX_SIZES_H__
-#define	__LINUX_SIZES_H__
+#ifndef _LINUXKPI_LINUX_SIZES_H_
+#define	_LINUXKPI_LINUX_SIZES_H_
 
 #define SZ_1K	(1024 * 1)
 #define SZ_4K	(1024 * 4)
diff --git a/sys/compat/linuxkpi/common/include/linux/slab.h b/sys/compat/linuxkpi/common/include/linux/slab.h
--- a/sys/compat/linuxkpi/common/include/linux/slab.h
+++ b/sys/compat/linuxkpi/common/include/linux/slab.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_SLAB_H_
-#define	_LINUX_SLAB_H_
+#ifndef	_LINUXKPI_LINUX_SLAB_H_
+#define	_LINUXKPI_LINUX_SLAB_H_
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -207,4 +207,4 @@
 extern void lkpi_kmem_cache_free(struct linux_kmem_cache *, void *);
 extern void linux_kmem_cache_destroy(struct linux_kmem_cache *);
 
-#endif					/* _LINUX_SLAB_H_ */
+#endif					/* _LINUXKPI_LINUX_SLAB_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/smp.h b/sys/compat/linuxkpi/common/include/linux/smp.h
--- a/sys/compat/linuxkpi/common/include/linux/smp.h
+++ b/sys/compat/linuxkpi/common/include/linux/smp.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_SMP_H_
-#define	_LINUX_SMP_H_
+#ifndef _LINUXKPI_LINUX_SMP_H_
+#define	_LINUXKPI_LINUX_SMP_H_
 
 #define	on_each_cpu(cb, data, wait) ({				\
 	CTASSERT(wait);						\
@@ -36,4 +36,4 @@
 
 extern int	linux_on_each_cpu(void (*)(void *), void *);
 
-#endif /* _LINUX_SMP_H_ */
+#endif /* _LINUXKPI_LINUX_SMP_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/socket.h b/sys/compat/linuxkpi/common/include/linux/socket.h
--- a/sys/compat/linuxkpi/common/include/linux/socket.h
+++ b/sys/compat/linuxkpi/common/include/linux/socket.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_SOCKET_H_
-#define	_LINUX_SOCKET_H_
+#ifndef	_LINUXKPI_LINUX_SOCKET_H_
+#define	_LINUXKPI_LINUX_SOCKET_H_
 
 #include <sys/socket.h>
 
@@ -66,4 +66,4 @@
 }
 #endif
 
-#endif	/* _LINUX_SOCKET_H_ */
+#endif	/* _LINUXKPI_LINUX_SOCKET_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/spinlock.h b/sys/compat/linuxkpi/common/include/linux/spinlock.h
--- a/sys/compat/linuxkpi/common/include/linux/spinlock.h
+++ b/sys/compat/linuxkpi/common/include/linux/spinlock.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_SPINLOCK_H_
-#define	_LINUX_SPINLOCK_H_
+#ifndef	_LINUXKPI_LINUX_SPINLOCK_H_
+#define	_LINUXKPI_LINUX_SPINLOCK_H_
 
 #include <asm/atomic.h>
 #include <sys/param.h>
@@ -185,4 +185,4 @@
 	return (0);
 }
 
-#endif					/* _LINUX_SPINLOCK_H_ */
+#endif					/* _LINUXKPI_LINUX_SPINLOCK_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/srcu.h b/sys/compat/linuxkpi/common/include/linux/srcu.h
--- a/sys/compat/linuxkpi/common/include/linux/srcu.h
+++ b/sys/compat/linuxkpi/common/include/linux/srcu.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef	_LINUX_SRCU_H_
-#define	_LINUX_SRCU_H_
+#ifndef	_LINUXKPI_LINUX_SRCU_H_
+#define	_LINUXKPI_LINUX_SRCU_H_
 
 #include <linux/compiler.h>
 
@@ -53,4 +53,4 @@
 	synchronize_srcu(srcu);			\
 } while (0)
 
-#endif					/* _LINUX_SRCU_H_ */
+#endif					/* _LINUXKPI_LINUX_SRCU_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h
--- a/sys/compat/linuxkpi/common/include/linux/string.h
+++ b/sys/compat/linuxkpi/common/include/linux/string.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_STRING_H_
-#define	_LINUX_STRING_H_
+#ifndef	_LINUXKPI_LINUX_STRING_H_
+#define	_LINUXKPI_LINUX_STRING_H_
 
 #include <sys/ctype.h>
 
@@ -196,4 +196,4 @@
 	return (-E2BIG);
 }
 
-#endif					/* _LINUX_STRING_H_ */
+#endif					/* _LINUXKPI_LINUX_STRING_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/stringify.h b/sys/compat/linuxkpi/common/include/linux/stringify.h
--- a/sys/compat/linuxkpi/common/include/linux/stringify.h
+++ b/sys/compat/linuxkpi/common/include/linux/stringify.h
@@ -26,12 +26,12 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_LINUX_STRINGIFY_H_
-#define	__LKPI_LINUX_STRINGIFY_H_
+#ifndef	_LINUXKPI_LINUX_STRINGIFY_H_
+#define	_LINUXKPI_LINUX_STRINGIFY_H_
 
 #include <sys/cdefs.h>
 
 #define	___stringify(...)		#__VA_ARGS__
 #define	__stringify(...)		___stringify(__VA_ARGS__)
 
-#endif	/* __LKPI_LINUX_STRINGIFY_H_ */
+#endif	/* _LINUXKPI_LINUX_STRINGIFY_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/swap.h b/sys/compat/linuxkpi/common/include/linux/swap.h
--- a/sys/compat/linuxkpi/common/include/linux/swap.h
+++ b/sys/compat/linuxkpi/common/include/linux/swap.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef	_LINUX_SWAP_H_
-#define	_LINUX_SWAP_H_
+#ifndef	_LINUXKPI_LINUX_SWAP_H_
+#define	_LINUXKPI_LINUX_SWAP_H_
 
 #include <vm/swap_pager.h>
 #include <vm/vm_pageout.h>
diff --git a/sys/compat/linuxkpi/common/include/linux/sysfs.h b/sys/compat/linuxkpi/common/include/linux/sysfs.h
--- a/sys/compat/linuxkpi/common/include/linux/sysfs.h
+++ b/sys/compat/linuxkpi/common/include/linux/sysfs.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_SYSFS_H_
-#define	_LINUX_SYSFS_H_
+#ifndef	_LINUXKPI_LINUX_SYSFS_H_
+#define	_LINUXKPI_LINUX_SYSFS_H_
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -297,4 +297,4 @@
 
 #define sysfs_attr_init(attr) do {} while(0)
 
-#endif	/* _LINUX_SYSFS_H_ */
+#endif	/* _LINUXKPI_LINUX_SYSFS_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/tcp.h b/sys/compat/linuxkpi/common/include/linux/tcp.h
--- a/sys/compat/linuxkpi/common/include/linux/tcp.h
+++ b/sys/compat/linuxkpi/common/include/linux/tcp.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_LINUX_TCP_H
-#define	__LKPI_LINUX_TCP_H
+#ifndef	_LINUXKPI_LINUX_TCP_H
+#define	_LINUXKPI_LINUX_TCP_H
 
 #include <sys/types.h>
 #include <linux/skbuff.h>
@@ -69,4 +69,4 @@
 	return (4 * th->doff);
 }
 
-#endif	/* __LKPI_LINUX_TCP_H */
+#endif	/* _LINUXKPI_LINUX_TCP_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/time.h b/sys/compat/linuxkpi/common/include/linux/time.h
--- a/sys/compat/linuxkpi/common/include/linux/time.h
+++ b/sys/compat/linuxkpi/common/include/linux/time.h
@@ -25,8 +25,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_TIME_H_
-#define	_LINUX_TIME_H_
+#ifndef _LINUXKPI_LINUX_TIME_H_
+#define	_LINUXKPI_LINUX_TIME_H_
 
 #define	NSEC_PER_USEC	1000L
 #define	NSEC_PER_MSEC	1000000L
@@ -132,4 +132,4 @@
 	return time_uptime;
 }
 
-#endif /* _LINUX_TIME_H_ */
+#endif /* _LINUXKPI_LINUX_TIME_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h
--- a/sys/compat/linuxkpi/common/include/linux/timer.h
+++ b/sys/compat/linuxkpi/common/include/linux/timer.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_TIMER_H_
-#define	_LINUX_TIMER_H_
+#ifndef _LINUXKPI_LINUX_TIMER_H_
+#define	_LINUXKPI_LINUX_TIMER_H_
 
 #include <linux/types.h>
 
@@ -91,4 +91,4 @@
 #define	round_jiffies_up(j)	round_jiffies(j)
 #define	round_jiffies_up_relative(j) round_jiffies_up(j)
 
-#endif					/* _LINUX_TIMER_H_ */
+#endif					/* _LINUXKPI_LINUX_TIMER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/types.h b/sys/compat/linuxkpi/common/include/linux/types.h
--- a/sys/compat/linuxkpi/common/include/linux/types.h
+++ b/sys/compat/linuxkpi/common/include/linux/types.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_TYPES_H_
-#define	_LINUX_TYPES_H_
+#ifndef	_LINUXKPI_LINUX_TYPES_H_
+#define	_LINUXKPI_LINUX_TYPES_H_
 
 #include <sys/cdefs.h>
 #include <sys/types.h>
@@ -87,4 +87,4 @@
 typedef void (*call_rcu_func_t)(struct rcu_head *head, rcu_callback_t func);
 typedef int linux_task_fn_t(void *data);
 
-#endif	/* _LINUX_TYPES_H_ */
+#endif	/* _LINUXKPI_LINUX_TYPES_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/uaccess.h b/sys/compat/linuxkpi/common/include/linux/uaccess.h
--- a/sys/compat/linuxkpi/common/include/linux/uaccess.h
+++ b/sys/compat/linuxkpi/common/include/linux/uaccess.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	_LINUX_UACCESS_H_
-#define	_LINUX_UACCESS_H_
+#ifndef	_LINUXKPI_LINUX_UACCESS_H_
+#define	_LINUXKPI_LINUX_UACCESS_H_
 
 #include <sys/param.h>
 #include <sys/lock.h>
@@ -89,4 +89,4 @@
 	return ((curthread->td_pflags & TDP_NOFAULTING) != 0);
 }
 
-#endif					/* _LINUX_UACCESS_H_ */
+#endif					/* _LINUXKPI_LINUX_UACCESS_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/udp.h b/sys/compat/linuxkpi/common/include/linux/udp.h
--- a/sys/compat/linuxkpi/common/include/linux/udp.h
+++ b/sys/compat/linuxkpi/common/include/linux/udp.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_LINUX_UDP_H
-#define	__LKPI_LINUX_UDP_H
+#ifndef	_LINUXKPI_LINUX_UDP_H
+#define	_LINUXKPI_LINUX_UDP_H
 
 #include <sys/types.h>
 #include <linux/skbuff.h>
@@ -51,4 +51,4 @@
 	return (struct udphdr *)skb_transport_header(skb);
 }
 
-#endif	/* __LKPI_LINUX_UDP_H */
+#endif	/* _LINUXKPI_LINUX_UDP_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/uuid.h b/sys/compat/linuxkpi/common/include/linux/uuid.h
--- a/sys/compat/linuxkpi/common/include/linux/uuid.h
+++ b/sys/compat/linuxkpi/common/include/linux/uuid.h
@@ -30,11 +30,11 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_LINUX_UUID_H
-#define	__LKPI_LINUX_UUID_H
+#ifndef	_LINUXKPI_LINUX_UUID_H
+#define	_LINUXKPI_LINUX_UUID_H
 
 typedef struct {
 	char	x[16];
 } guid_t;
 
-#endif	/* __LKPI_LINUX_UUID_H */
+#endif	/* _LINUXKPI_LINUX_UUID_H */
diff --git a/sys/compat/linuxkpi/common/include/linux/vmalloc.h b/sys/compat/linuxkpi/common/include/linux/vmalloc.h
--- a/sys/compat/linuxkpi/common/include/linux/vmalloc.h
+++ b/sys/compat/linuxkpi/common/include/linux/vmalloc.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_VMALLOC_H_
-#define	_LINUX_VMALLOC_H_
+#ifndef _LINUXKPI_LINUX_VMALLOC_H_
+#define	_LINUXKPI_LINUX_VMALLOC_H_
 
 #include <linux/page.h>
 
@@ -40,4 +40,4 @@
     int prot);
 void vunmap(void *addr);
 
-#endif	/* _LINUX_VMALLOC_H_ */
+#endif	/* _LINUXKPI_LINUX_VMALLOC_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/wait.h b/sys/compat/linuxkpi/common/include/linux/wait.h
--- a/sys/compat/linuxkpi/common/include/linux/wait.h
+++ b/sys/compat/linuxkpi/common/include/linux/wait.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef _LINUX_WAIT_H_
-#define	_LINUX_WAIT_H_
+#ifndef _LINUXKPI_LINUX_WAIT_H_
+#define	_LINUXKPI_LINUX_WAIT_H_
 
 #include <linux/compiler.h>
 #include <linux/list.h>
@@ -310,4 +310,4 @@
 #define	wake_up_process(task)		linux_wake_up_state(task, TASK_NORMAL)
 #define	wake_up_state(task, state)	linux_wake_up_state(task, state)
 
-#endif /* _LINUX_WAIT_H_ */
+#endif /* _LINUXKPI_LINUX_WAIT_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/wait_bit.h b/sys/compat/linuxkpi/common/include/linux/wait_bit.h
--- a/sys/compat/linuxkpi/common/include/linux/wait_bit.h
+++ b/sys/compat/linuxkpi/common/include/linux/wait_bit.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef __LINUX_WAITBIT_H__
-#define	__LINUX_WAITBIT_H__
+#ifndef __LINUXKPI_LINUX_WAITBIT_H__
+#define	__LINUXKPI_LINUX_WAITBIT_H__
 
 #include <linux/wait.h>
 #include <linux/bitops.h>
@@ -64,4 +64,4 @@
 	wake_up(&linux_var_waitq);
 }
 
-#endif	/* __LINUX_WAITBIT_H__ */
+#endif	/* __LINUXKPI_LINUX_WAITBIT_H__ */
diff --git a/sys/compat/linuxkpi/common/include/linux/workqueue.h b/sys/compat/linuxkpi/common/include/linux/workqueue.h
--- a/sys/compat/linuxkpi/common/include/linux/workqueue.h
+++ b/sys/compat/linuxkpi/common/include/linux/workqueue.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_WORKQUEUE_H_
-#define	_LINUX_WORKQUEUE_H_
+#ifndef	_LINUXKPI_LINUX_WORKQUEUE_H_
+#define	_LINUXKPI_LINUX_WORKQUEUE_H_
 
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -256,4 +256,4 @@
 extern bool linux_queue_rcu_work(struct workqueue_struct *wq, struct rcu_work *rwork);
 extern bool linux_flush_rcu_work(struct rcu_work *rwork);
 
-#endif					/* _LINUX_WORKQUEUE_H_ */
+#endif					/* _LINUXKPI_LINUX_WORKQUEUE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/ww_mutex.h b/sys/compat/linuxkpi/common/include/linux/ww_mutex.h
--- a/sys/compat/linuxkpi/common/include/linux/ww_mutex.h
+++ b/sys/compat/linuxkpi/common/include/linux/ww_mutex.h
@@ -25,8 +25,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_WW_MUTEX_H_
-#define	_LINUX_WW_MUTEX_H_
+#ifndef	_LINUXKPI_LINUX_WW_MUTEX_H_
+#define	_LINUXKPI_LINUX_WW_MUTEX_H_
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -141,4 +141,4 @@
 {
 }
 
-#endif					/* _LINUX_WW_MUTEX_H_ */
+#endif					/* _LINUXKPI_LINUX_WW_MUTEX_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/xarray.h b/sys/compat/linuxkpi/common/include/linux/xarray.h
--- a/sys/compat/linuxkpi/common/include/linux/xarray.h
+++ b/sys/compat/linuxkpi/common/include/linux/xarray.h
@@ -25,8 +25,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_XARRAY_H_
-#define	_LINUX_XARRAY_H_
+#ifndef	_LINUXKPI_LINUX_XARRAY_H_
+#define	_LINUXKPI_LINUX_XARRAY_H_
 
 #include <linux/gfp.h>
 #include <linux/radix-tree.h>
@@ -122,4 +122,4 @@
 
 	return (v >> 1);
 }
-#endif		/* _LINUX_XARRAY_H_ */
+#endif		/* _LINUXKPI_LINUX_XARRAY_H_ */
diff --git a/sys/compat/linuxkpi/common/include/net/addrconf.h b/sys/compat/linuxkpi/common/include/net/addrconf.h
--- a/sys/compat/linuxkpi/common/include/net/addrconf.h
+++ b/sys/compat/linuxkpi/common/include/net/addrconf.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_NET_ADDRCONF_H
-#define	__LKPI_NET_ADDRCONF_H
+#ifndef	_LINUXKPI_NET_ADDRCONF_H
+#define	_LINUXKPI_NET_ADDRCONF_H
 
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -48,4 +48,4 @@
 	sol->s6_addr8[12] = 0xff;
 }
 
-#endif	/* __LKPI_NET_ADDRCONF_H */
+#endif	/* _LINUXKPI_NET_ADDRCONF_H */
diff --git a/sys/compat/linuxkpi/common/include/net/ieee80211_radiotap.h b/sys/compat/linuxkpi/common/include/net/ieee80211_radiotap.h
--- a/sys/compat/linuxkpi/common/include/net/ieee80211_radiotap.h
+++ b/sys/compat/linuxkpi/common/include/net/ieee80211_radiotap.h
@@ -28,8 +28,8 @@
  * $FreeBSD$
  */
 
-#ifndef	__LKPI_NET_IEEE80211_RADIOTAP_H
-#define	__LKPI_NET_IEEE80211_RADIOTAP_H
+#ifndef	_LINUXKPI_NET_IEEE80211_RADIOTAP_H
+#define	_LINUXKPI_NET_IEEE80211_RADIOTAP_H
 
 /* Any possibly duplicate content is only maintained in one place now. */
 #include <net80211/ieee80211_radiotap.h>
@@ -50,4 +50,4 @@
 	u8		data[0];
 };
 
-#endif	/* __LKPI_NET_IEEE80211_RADIOTAP_H */
+#endif	/* _LINUXKPI_NET_IEEE80211_RADIOTAP_H */
diff --git a/sys/compat/linuxkpi/common/include/net/if_inet6.h b/sys/compat/linuxkpi/common/include/net/if_inet6.h
--- a/sys/compat/linuxkpi/common/include/net/if_inet6.h
+++ b/sys/compat/linuxkpi/common/include/net/if_inet6.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _NET_IF_INET6_H_
-#define	_NET_IF_INET6_H_
+#ifndef _LINUXKPI_NET_IF_INET6_H_
+#define	_LINUXKPI_NET_IF_INET6_H_
 
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -54,4 +54,4 @@
 	memcpy(buf + 2, &addr->s6_addr32[3], sizeof(__u32));
 }
 
-#endif	/* _NET_IF_INET6_H_ */
+#endif	/* _LINUXKPI_NET_IF_INET6_H_ */
diff --git a/sys/compat/linuxkpi/common/include/net/ip.h b/sys/compat/linuxkpi/common/include/net/ip.h
--- a/sys/compat/linuxkpi/common/include/net/ip.h
+++ b/sys/compat/linuxkpi/common/include/net/ip.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_NET_IP_H_
-#define	_LINUX_NET_IP_H_
+#ifndef _LINUXKPI_NET_IP_H_
+#define	_LINUXKPI_NET_IP_H_
 
 #include "opt_inet.h"
 
@@ -100,4 +100,4 @@
 	buf[19] = addr & 0xff;
 }
 
-#endif	/* _LINUX_NET_IP_H_ */
+#endif	/* _LINUXKPI_NET_IP_H_ */
diff --git a/sys/compat/linuxkpi/common/include/net/ipv6.h b/sys/compat/linuxkpi/common/include/net/ipv6.h
--- a/sys/compat/linuxkpi/common/include/net/ipv6.h
+++ b/sys/compat/linuxkpi/common/include/net/ipv6.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_NET_IPV6_H_
-#define	_LINUX_NET_IPV6_H_
+#ifndef _LINUXKPI_NET_IPV6_H_
+#define	_LINUXKPI_NET_IPV6_H_
 
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -116,4 +116,4 @@
 	return memcmp(a1, a2, sizeof(struct in6_addr));
 }
 
-#endif	/* _LINUX_NET_IPV6_H_ */
+#endif	/* _LINUXKPI_NET_IPV6_H_ */
diff --git a/sys/compat/linuxkpi/common/include/net/netevent.h b/sys/compat/linuxkpi/common/include/net/netevent.h
--- a/sys/compat/linuxkpi/common/include/net/netevent.h
+++ b/sys/compat/linuxkpi/common/include/net/netevent.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_LINUX_NET_NETEVENT_H_
-#define	_LINUX_NET_NETEVENT_H_
+#ifndef	_LINUXKPI_NET_NETEVENT_H_
+#define	_LINUXKPI_NET_NETEVENT_H_
 
 #include <sys/types.h>
 #include <sys/eventhandler.h>
@@ -72,4 +72,4 @@
 	return (0);
 }
 
-#endif /* _LINUX_NET_NETEVENT_H_ */
+#endif /* _LINUXKPI_NET_NETEVENT_H_ */
diff --git a/sys/compat/linuxkpi/common/include/net/tcp.h b/sys/compat/linuxkpi/common/include/net/tcp.h
--- a/sys/compat/linuxkpi/common/include/net/tcp.h
+++ b/sys/compat/linuxkpi/common/include/net/tcp.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _LINUX_NET_TCP_H_
-#define	_LINUX_NET_TCP_H_
+#ifndef _LINUXKPI_NET_TCP_H_
+#define	_LINUXKPI_NET_TCP_H_
 
 #include <linux/list.h>
 #include <linux/slab.h>
@@ -37,4 +37,4 @@
 
 #include <net/ip.h>
 
-#endif	/* _LINUX_NET_TCP_H_ */
+#endif	/* _LINUXKPI_NET_TCP_H_ */