From 53d73c77a5d093badf339543dc6faeca23b80e0d Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Wed, 19 Apr 1995 19:10:35 +0000
Subject: [PATCH] Garbage collect #includes.

---
 sys/arch/i386/isa/pccons.c        | 6 ++----
 sys/arch/i386/isa/pcvt/pcvt_drv.c | 7 +------
 sys/arch/i386/isa/pcvt/pcvt_ext.c | 7 +------
 sys/arch/i386/isa/pcvt/pcvt_kbd.c | 7 +------
 sys/arch/i386/isa/pcvt/pcvt_out.c | 7 +------
 sys/arch/i386/isa/pcvt/pcvt_sup.c | 7 +------
 sys/arch/i386/isa/pcvt/pcvt_vtf.c | 7 +------
 sys/dev/ic/com.c                  | 4 +---
 sys/dev/isa/com.c                 | 4 +---
 9 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index e231d4a2955f..9473d54ce0e5 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,7 +1,7 @@
-/*	$NetBSD: pccons.c,v 1.82 1995/04/19 18:10:47 mycroft Exp $	*/
+/*	$NetBSD: pccons.c,v 1.83 1995/04/19 19:10:35 mycroft Exp $	*/
 
 /*-
- * Copyright (c) 1993, 1994 Charles Hannum.
+ * Copyright (c) 1993, 1994, 1995 Charles Hannum.  All rights reserved.
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
@@ -43,8 +43,6 @@
  * code to work keyboard & display for PC-style console
  */
 
-#include "pc.h"
-
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/ioctl.h>
diff --git a/sys/arch/i386/isa/pcvt/pcvt_drv.c b/sys/arch/i386/isa/pcvt/pcvt_drv.c
index 2bd6ae7bd47c..feab21f1275c 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_drv.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcvt_drv.c,v 1.14 1995/04/19 18:33:27 mycroft Exp $	*/
+/*	$NetBSD: pcvt_drv.c,v 1.15 1995/04/19 19:12:13 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1992,1993,1994 Hellmuth Michaelis, Brian Dunford-Shore,
@@ -77,9 +77,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #define EXTERN			/* allocate mem */
 
 #include "pcvt_hdr.h"		/* global include */
@@ -1153,6 +1150,4 @@ void cons_highlight (void) {}
 void cons_normal (void) {}
 #endif
 
-#endif	/* NVT > 0 */
-
 /*-------------------------- E O F -------------------------------------*/
diff --git a/sys/arch/i386/isa/pcvt/pcvt_ext.c b/sys/arch/i386/isa/pcvt/pcvt_ext.c
index ddbdfd761599..b04bf285bbe6 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_ext.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcvt_ext.c,v 1.6 1994/10/30 21:44:34 cgd Exp $	*/
+/*	$NetBSD: pcvt_ext.c,v 1.7 1995/04/19 19:12:15 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Hellmuth Michaelis and Joerg Wunsch
@@ -60,9 +60,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #include "pcvt_hdr.h"		/* global include */
 
 static int  s3testwritable( void );
@@ -2570,7 +2567,5 @@ usl_vt_ioctl(Dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
 }
 #endif /* PCVT_USL_VT_COMPAT */
 
-#endif	/* NVT > 0 */
-
 /* ------------------------- E O F ------------------------------------------*/
 
diff --git a/sys/arch/i386/isa/pcvt/pcvt_kbd.c b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
index f3ebe8bbf0d0..dbbb0b8f5a32 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcvt_kbd.c,v 1.5 1994/10/30 21:44:39 cgd Exp $	*/
+/*	$NetBSD: pcvt_kbd.c,v 1.6 1995/04/19 19:12:18 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1992,1993,1994 Hellmuth Michaelis, Brian Dunford-Shore,
@@ -75,9 +75,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #include "pcvt_hdr.h"		/* global include */
 
 static void fkey1(void), fkey2(void),  fkey3(void),  fkey4(void);
@@ -3013,6 +3010,4 @@ cfkey12(void)
 
 #endif	/* PCVT_VT220KEYB */
 
-#endif	/* NVT > 0 */
-
 /* ------------------------------- EOF -------------------------------------*/
diff --git a/sys/arch/i386/isa/pcvt/pcvt_out.c b/sys/arch/i386/isa/pcvt/pcvt_out.c
index cd84f53e6eee..62994fe0162f 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_out.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_out.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcvt_out.c,v 1.3 1994/10/27 04:18:56 cgd Exp $	*/
+/*	$NetBSD: pcvt_out.c,v 1.4 1995/04/19 19:12:22 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1992,1993,1994 Hellmuth Michaelis, Brian Dunford-Shore
@@ -69,9 +69,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #include "pcvt_hdr.h"		/* global include */
 #include "pcvt_vtf.h"		/* inline function */
 
@@ -2072,7 +2069,5 @@ hp_entry(U_char ch, struct video_state *svsp)
 	}
 }
 
-#endif	/* NVT > 0 */
-
 /* ------------------------- E O F ------------------------------------------*/
 
diff --git a/sys/arch/i386/isa/pcvt/pcvt_sup.c b/sys/arch/i386/isa/pcvt/pcvt_sup.c
index e4a316a12494..fdb49ce12802 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_sup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcvt_sup.c,v 1.8 1995/04/19 18:33:39 mycroft Exp $	*/
+/*	$NetBSD: pcvt_sup.c,v 1.9 1995/04/19 19:12:24 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1992,1993,1994 Hellmuth Michaelis, Brian Dunford-Shore,
@@ -93,9 +93,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #include "pcvt_hdr.h"		/* global include */
 
 static void vid_cursor ( struct cursorshape *data );
@@ -2136,6 +2133,4 @@ sw_cursor(int onoff)
 	}
 }
 
-#endif	/* NVT > 0 */
-
 /* ------------------------- E O F ------------------------------------------*/
diff --git a/sys/arch/i386/isa/pcvt/pcvt_vtf.c b/sys/arch/i386/isa/pcvt/pcvt_vtf.c
index 573f61e181ce..84855bf9e4ec 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_vtf.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_vtf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcvt_vtf.c,v 1.5 1994/10/27 04:19:02 cgd Exp $	*/
+/*	$NetBSD: pcvt_vtf.c,v 1.6 1995/04/19 19:12:26 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1992,1993,1994 Hellmuth Michaelis, Brian Dunford-Shore
@@ -50,9 +50,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "vt.h"
-#if NVT > 0
-
 #include "pcvt_hdr.h"		/* global include */
 #include "pcvt_tbl.h"		/* character set conversion tables */
 #include "pcvt_vtf.h"		/* inline function */
@@ -2073,7 +2070,5 @@ selective_erase(struct video_state *svsp, u_short *pcrtat, int length)
 	}
 }
 
-#endif	/* NVT > 0 */
-
 /* ------------------------- E O F ------------------------------------------*/
 
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index e7821d58431e..666c71fb7a8a 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.50 1995/04/19 18:59:27 mycroft Exp $	*/
+/*	$NetBSD: com.c,v 1.51 1995/04/19 19:12:53 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.  All rights reserved.
@@ -40,8 +40,6 @@
  * COM driver, based on HP dca driver
  * uses National Semiconductor NS16450/NS16550AF UART
  */
-#include "com.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
diff --git a/sys/dev/isa/com.c b/sys/dev/isa/com.c
index e7821d58431e..666c71fb7a8a 100644
--- a/sys/dev/isa/com.c
+++ b/sys/dev/isa/com.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com.c,v 1.50 1995/04/19 18:59:27 mycroft Exp $	*/
+/*	$NetBSD: com.c,v 1.51 1995/04/19 19:12:53 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles Hannum.  All rights reserved.
@@ -40,8 +40,6 @@
  * COM driver, based on HP dca driver
  * uses National Semiconductor NS16450/NS16550AF UART
  */
-#include "com.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>