diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 24e40a9b6a8c..d8487ee9c8ad 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i386,v 1.104 1998/01/22 00:44:06 thorpej Exp $
+#	$NetBSD: files.i386,v 1.105 1998/01/22 01:16:23 thorpej Exp $
 #
 # new style config file for i386 architecture
 #
@@ -23,6 +23,9 @@ defopt	USER_LDT
 # Speed hack; make NOPs dummies (might break on some machines)
 defopt	DUMMY_NOPS
 
+# X server support in console drivers
+defopt	XSERVER
+
 file	arch/i386/i386/autoconf.c
 file	arch/i386/i386/conf.c
 file	arch/i386/i386/db_disasm.c	ddb
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index 9c2114485ecc..887dedfa2bae 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccons.c,v 1.119 1998/01/18 14:45:10 drochner Exp $	*/
+/*	$NetBSD: pccons.c,v 1.120 1998/01/22 01:16:26 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.  All rights reserved.
@@ -43,6 +43,8 @@
  * code to work keyboard & display for PC-style console
  */
 
+#include "opt_xserver.h"
+
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
diff --git a/sys/arch/i386/isa/pcvt/pcvt_hdr.h b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
index 07192aae98a1..11d4c6e3b26f 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
@@ -92,6 +92,10 @@
 #include <sys/device.h>
 #endif
 
+#if PCVT_NETBSD > 130
+#include "opt_xserver.h"
+#endif
+
 #if PCVT_NETBSD > 9
 #if PCVT_NETBSD > 101
 #include <i386/isa/isa_machdep.h>