diff --git a/sys/dev/wscons/wsdisplay_vcons.c b/sys/dev/wscons/wsdisplay_vcons.c
index 5cf9e7e..de4f889 100644
--- a/sys/dev/wscons/wsdisplay_vcons.c
+++ b/sys/dev/wscons/wsdisplay_vcons.c
@@ -51,9 +51,11 @@ __KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.28 2013/05/28 11:04:04 macalla
 
 #include <dev/wscons/wsdisplay_vconsvar.h>
 
+#ifdef _KERNEL_OPT
 #include "opt_wsemul.h"
 #include "opt_wsdisplay_compat.h"
 #include "opt_vcons.h"
+#endif
 
 static void vcons_dummy_init_screen(void *, struct vcons_screen *, int, 
 	    long *);
diff --git a/sys/dev/wscons/wsdisplay_vconsvar.h b/sys/dev/wscons/wsdisplay_vconsvar.h
index 663f6de..3fdc9f6 100644
--- a/sys/dev/wscons/wsdisplay_vconsvar.h
+++ b/sys/dev/wscons/wsdisplay_vconsvar.h
@@ -29,8 +29,10 @@
 #ifndef _WSDISPLAY_VCONS_H_
 #define _WSDISPLAY_VCONS_H_
 
+#ifdef _KERNEL_OPT
 #include "opt_wsdisplay_compat.h"
 #include "opt_vcons.h"
+#endif
 
 struct vcons_data;
 
diff --git a/sys/dev/wsfb/genfb.c b/sys/dev/wsfb/genfb.c
index fc14f3a..ac66608 100644
--- a/sys/dev/wsfb/genfb.c
+++ b/sys/dev/wsfb/genfb.c
@@ -55,8 +55,10 @@ __KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50 2013/01/10 22:06:59 jmcneill Exp $");
 		AB_VERBOSE | AB_DEBUG) )
 #endif
 
+#ifdef _KERNEL_OPT
 #include "opt_genfb.h"
 #include "opt_wsfb.h"
+#endif
 
 #ifdef GENFB_DEBUG
 #define GPRINTF panic
@@ -317,7 +347,8 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
 	}
 #else
 	genfb_init_palette(sc);
-	vcons_replay_msgbuf(&sc->sc_console_screen);
+	if (console)
+		vcons_replay_msgbuf(&sc->sc_console_screen);
 #endif
 
 	if (genfb_softc == NULL)
@@ -333,7 +364,8 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
 		SCREEN_DISABLE_DRAWING(&sc->sc_console_screen);
 #endif
 
-	config_found(sc->sc_dev, &aa, wsemuldisplaydevprint);
+	config_found_ia(sc->sc_dev, "wsemuldisplaydev", &aa,
+	    wsemuldisplaydevprint);
 
 	return 0;
 }
diff --git a/sys/dev/wsfb/genfbvar.h b/sys/dev/wsfb/genfbvar.h
index 2062584..f08850d 100644
--- a/sys/dev/wsfb/genfbvar.h
+++ b/sys/dev/wsfb/genfbvar.h
@@ -32,7 +32,9 @@ __KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.21 2011/07/13 22:47:29 macallan Exp $
 #ifndef GENFBVAR_H
 #define GENFBVAR_H
 
+#ifdef _KERNEL_OPT
 #include "opt_splash.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -46,7 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.21 2011/07/13 22:47:29 macallan Exp $
 #include <dev/rasops/rasops.h>
 
 #include <dev/wscons/wsdisplay_vconsvar.h>
+#ifdef _KERNEL_OPT
 #include "opt_genfb.h"
+#endif
 
 #ifdef SPLASHSCREEN
 #define GENFB_DISABLE_TEXT