diff --git a/sys/i386/include/bootinfo.h b/sys/i386/include/bootinfo.h
--- a/sys/i386/include/bootinfo.h
+++ b/sys/i386/include/bootinfo.h
@@ -40,7 +40,7 @@
 /* Only change the version number if you break compatibility. */
 #define	BOOTINFO_VERSION	1
 
-#define	N_BIOS_GEOM		8
+#define	_WAS_N_BIOS_GEOM	8
 
 /*
  * A zero bootinfo field often means that there is no info available.
@@ -52,12 +52,12 @@
 	u_int32_t	bi_kernelname;		/* represents a char * */
 	u_int32_t	bi_nfs_diskless;	/* struct nfs_diskless * */
 				/* End of fields that are always present. */
-#define	bi_endcommon	bi_n_bios_used
-	u_int32_t	bi_n_bios_used;
-	u_int32_t	bi_bios_geom[N_BIOS_GEOM];
+#define	bi_endcommon	_was_bi_n_bios_used
+	u_int32_t	_was_bi_n_bios_used;
+	u_int32_t	_was_bi_bios_geom[_WAS_N_BIOS_GEOM];
 	u_int32_t	bi_size;
 	u_int8_t	bi_memsizes_valid;
-	u_int8_t	bi_bios_dev;		/* bootdev BIOS unit number */
+	u_int8_t	bi_bios_dev;	/* bootdev BIOS unit number (bootX -> loader only) */
 	u_int8_t	bi_pad[2];
 	u_int32_t	bi_basemem;
 	u_int32_t	bi_extmem;
@@ -67,13 +67,13 @@
 	u_int32_t	bi_kernend;		/* end of kernel space */
 	u_int32_t	bi_envp;		/* environment */
 	u_int32_t	bi_modulep;		/* preloaded modules */
-	uint32_t	bi_memdesc_version;	/* EFI memory desc version */
-	uint64_t	bi_memdesc_size;	/* sizeof EFI memory desc */
-	uint64_t	bi_memmap;		/* pa of EFI memory map */
-	uint64_t	bi_memmap_size;		/* size of EFI memory map */
-	uint64_t	bi_hcdp;		/* DIG64 HCDP table */
-	uint64_t	bi_fpswa;		/* FPSWA interface */
-	uint64_t	bi_systab;		/* pa of EFI system table */
+	uint32_t	_was_bi_memdesc_version;/* EFI memory desc version */
+	uint64_t	_was_bi_memdesc_size;	/* sizeof EFI memory desc */
+	uint64_t	_was_bi_memmap;		/* pa of EFI memory map */
+	uint64_t	_was_bi_memmap_size;	/* size of EFI memory map */
+	uint64_t	_was_bi_hcdp;		/* DIG64 HCDP table */
+	uint64_t	_was_bi_fpswa;		/* FPSWA interface */
+	uint64_t	_was_bi_systab;		/* pa of EFI system table */
 };
 
 #ifdef _KERNEL