diff --git a/sys/boot/common/bootstrap.h b/sys/boot/common/bootstrap.h
index 31ac87a228ca..81f65c89547d 100644
--- a/sys/boot/common/bootstrap.h
+++ b/sys/boot/common/bootstrap.h
@@ -138,6 +138,10 @@ struct pnpinfo
     STAILQ_ENTRY(pnpinfo)	pi_link;
 };
 
+STAILQ_HEAD(pnpinfo_stql, pnpinfo);
+
+extern struct pnpinfo_stql pnp_devices;
+
 extern struct pnphandler	*pnphandlers[];		/* provided by MD code */
 
 void			pnp_addident(struct pnpinfo *pi, char *ident);
diff --git a/sys/boot/common/pnp.c b/sys/boot/common/pnp.c
index b859529a4d11..7b6e7adf305c 100644
--- a/sys/boot/common/pnp.c
+++ b/sys/boot/common/pnp.c
@@ -15,7 +15,7 @@
 #include <string.h>
 #include <bootstrap.h>
 
-STAILQ_HEAD(,pnpinfo)	pnp_devices;
+struct pnpinfo_stql	pnp_devices;
 static int		pnp_devices_initted = 0;
 
 static void		pnp_discard(void);