diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c
index 26355cc3ba73..379b9d2163f7 100644
--- a/sys/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/i386/isa/pcvt/pcvt_drv.c
@@ -54,9 +54,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #define MAIN
 #include <i386/isa/pcvt/pcvt_hdr.h>
 #undef MAIN
@@ -833,6 +830,4 @@ vgapelinit(void)
 		      NVGAPEL * sizeof(struct rgb));
 }
 
-#endif	/* NVT > 0 */
-
 /*-------------------------- E O F -------------------------------------*/
diff --git a/sys/i386/isa/pcvt/pcvt_ext.c b/sys/i386/isa/pcvt/pcvt_ext.c
index fcf212dce9f4..50ded4e79cbf 100644
--- a/sys/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/i386/isa/pcvt/pcvt_ext.c
@@ -48,9 +48,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #include <i386/isa/pcvt/pcvt_hdr.h>	/* global include */
 
 #define ISSIGVALID(sig) ((sig) > 0 && (sig) < NSIG)
@@ -2715,7 +2712,4 @@ usl_vt_ioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
 }
 #endif /* XSERVER */
 
-#endif	/* NVT > 0 */
-
 /* ------------------------- E O F ------------------------------------------*/
-
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index 0ef701d637a1..f74285f20bd6 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -51,11 +51,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
 #include "opt_ddb.h"
 
-#if NVT > 0
-
 #include <i386/isa/pcvt/pcvt_hdr.h>	/* global include */
 
 #define LEDSTATE_UPDATE_PENDING	(1 << 3)
@@ -2529,8 +2526,5 @@ scrollback_restore_screen(void)
 	if (scrollback_savedscreen)
 		bcopy(scrollback_savedscreen, vsp->Crtat, scrnsv_size);
 }
- 
-
-#endif	/* NVT > 0 */
 
 /* ------------------------------- EOF -------------------------------------*/
diff --git a/sys/i386/isa/pcvt/pcvt_out.c b/sys/i386/isa/pcvt/pcvt_out.c
index 40907122d79d..c2dc4920cdaa 100644
--- a/sys/i386/isa/pcvt/pcvt_out.c
+++ b/sys/i386/isa/pcvt/pcvt_out.c
@@ -48,9 +48,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #define PCVT_INCLUDE_VT_SELATTR	/* get inline function from pcvt_hdr.h */
 
 #include <i386/isa/pcvt/pcvt_hdr.h>	/* global include */
@@ -2220,7 +2217,4 @@ hp_entry(int ch, struct video_state *svsp)
 	}
 }
 
-#endif	/* NVT > 0 */
-
 /* ------------------------- E O F ------------------------------------------*/
-
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index ec916ea468a2..7fde46278bd1 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -50,9 +50,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #include <i386/isa/pcvt/pcvt_hdr.h>	/* global include */
 
 #include <sys/resource.h>
@@ -2060,6 +2057,4 @@ mda2egaorvga(void)
 	outb(GDC_DATA, 0x0a);
 }
 
-#endif	/* NVT > 0 */
-
 /* ------------------------- E O F ------------------------------------------*/
diff --git a/sys/i386/isa/pcvt/pcvt_vtf.c b/sys/i386/isa/pcvt/pcvt_vtf.c
index c81736ecb8a7..44c7ef7d3596 100644
--- a/sys/i386/isa/pcvt/pcvt_vtf.c
+++ b/sys/i386/isa/pcvt/pcvt_vtf.c
@@ -48,9 +48,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #define PCVT_INCLUDE_VT_SELATTR	/* get inline function from pcvt_hdr.h */
 
 #include <i386/isa/pcvt/pcvt_hdr.h>	/* global include */
@@ -2155,7 +2152,4 @@ selective_erase(struct video_state *svsp, u_short *pcrtat, int length)
 	}
 }
 
-#endif	/* NVT > 0 */
-
 /* ------------------------- E O F ------------------------------------------*/
-