diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index e5eafa27cdfe..9f378322e5dd 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.88 1996/05/03 14:57:21 phk Exp $
+ *	$Id: fd.c,v 1.89 1996/05/03 20:15:11 phk Exp $
  *
  */
 
@@ -310,7 +310,7 @@ static int fdformat(dev_t, struct fd_formb *, struct proc *);
 #define	IOTIMEDOUT	11
 
 #ifdef	DEBUG
-char *fdstates[] =
+static char const * const fdstates[] =
 {
 "DEVIDLE",
 "FINDWORK",
@@ -327,7 +327,7 @@ char *fdstates[] =
 };
 
 /* CAUTION: fd_debug causes huge amounts of logging output */
-int	fd_debug = 0;
+static int volatile fd_debug = 0;
 #define TRACE0(arg) if(fd_debug) printf(arg)
 #define TRACE1(arg1, arg2) if(fd_debug) printf(arg1, arg2)
 #else /* DEBUG */
@@ -563,7 +563,10 @@ fdattach(struct isa_device *dev)
 	fdcu_t	fdcu = dev->id_unit;
 	fdc_p	fdc = fdc_data + fdcu;
 	fd_p	fd;
-	int	fdsu, st0, st3, i, unithasfd;
+	int	fdsu, st0, st3, i;
+#if NFT > 0
+	int	unithasfd;
+#endif
 	struct isa_device *fdup;
 	int ic_type = 0;
 #ifdef DEVFS
diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c
index e5eafa27cdfe..9f378322e5dd 100644
--- a/sys/i386/isa/fd.c
+++ b/sys/i386/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.88 1996/05/03 14:57:21 phk Exp $
+ *	$Id: fd.c,v 1.89 1996/05/03 20:15:11 phk Exp $
  *
  */
 
@@ -310,7 +310,7 @@ static int fdformat(dev_t, struct fd_formb *, struct proc *);
 #define	IOTIMEDOUT	11
 
 #ifdef	DEBUG
-char *fdstates[] =
+static char const * const fdstates[] =
 {
 "DEVIDLE",
 "FINDWORK",
@@ -327,7 +327,7 @@ char *fdstates[] =
 };
 
 /* CAUTION: fd_debug causes huge amounts of logging output */
-int	fd_debug = 0;
+static int volatile fd_debug = 0;
 #define TRACE0(arg) if(fd_debug) printf(arg)
 #define TRACE1(arg1, arg2) if(fd_debug) printf(arg1, arg2)
 #else /* DEBUG */
@@ -563,7 +563,10 @@ fdattach(struct isa_device *dev)
 	fdcu_t	fdcu = dev->id_unit;
 	fdc_p	fdc = fdc_data + fdcu;
 	fd_p	fd;
-	int	fdsu, st0, st3, i, unithasfd;
+	int	fdsu, st0, st3, i;
+#if NFT > 0
+	int	unithasfd;
+#endif
 	struct isa_device *fdup;
 	int ic_type = 0;
 #ifdef DEVFS
diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c
index d11c49bdcb38..b2e0cdcdf11c 100644
--- a/sys/i386/isa/lpt.c
+++ b/sys/i386/isa/lpt.c
@@ -46,7 +46,7 @@
  * SUCH DAMAGE.
  *
  *	from: unknown origin, 386BSD 0.1
- *	$Id: lpt.c,v 1.52 1996/03/29 11:54:56 bde Exp $
+ *	$Id: lpt.c,v 1.53 1996/04/04 12:28:36 joerg Exp $
  */
 
 /*
@@ -195,7 +195,7 @@
 #define lprintf (void)
 #else
 #define lprintf		if (lptflag) printf
-int lptflag = 1;
+static int volatile lptflag = 1;
 #endif
 
 #define	LPTUNIT(s)	((s)&0x03)
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index e5eafa27cdfe..9f378322e5dd 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.88 1996/05/03 14:57:21 phk Exp $
+ *	$Id: fd.c,v 1.89 1996/05/03 20:15:11 phk Exp $
  *
  */
 
@@ -310,7 +310,7 @@ static int fdformat(dev_t, struct fd_formb *, struct proc *);
 #define	IOTIMEDOUT	11
 
 #ifdef	DEBUG
-char *fdstates[] =
+static char const * const fdstates[] =
 {
 "DEVIDLE",
 "FINDWORK",
@@ -327,7 +327,7 @@ char *fdstates[] =
 };
 
 /* CAUTION: fd_debug causes huge amounts of logging output */
-int	fd_debug = 0;
+static int volatile fd_debug = 0;
 #define TRACE0(arg) if(fd_debug) printf(arg)
 #define TRACE1(arg1, arg2) if(fd_debug) printf(arg1, arg2)
 #else /* DEBUG */
@@ -563,7 +563,10 @@ fdattach(struct isa_device *dev)
 	fdcu_t	fdcu = dev->id_unit;
 	fdc_p	fdc = fdc_data + fdcu;
 	fd_p	fd;
-	int	fdsu, st0, st3, i, unithasfd;
+	int	fdsu, st0, st3, i;
+#if NFT > 0
+	int	unithasfd;
+#endif
 	struct isa_device *fdup;
 	int ic_type = 0;
 #ifdef DEVFS
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index ebebbf5c6b4c..7b8fccdd7d2b 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.53 1996/03/09 06:43:19 dyson Exp $
+ * $Id: vfs_subr.c,v 1.54 1996/05/31 00:20:31 peter Exp $
  */
 
 /*
@@ -94,7 +94,7 @@ int vttoif_tab[9] = {
 }
 
 TAILQ_HEAD(freelst, vnode) vnode_free_list;	/* vnode free list */
-u_long freevnodes	= 0;
+static u_long freevnodes = 0;
 
 struct mntlist mountlist;	/* mounted filesystem list */
 
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index ebebbf5c6b4c..7b8fccdd7d2b 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.53 1996/03/09 06:43:19 dyson Exp $
+ * $Id: vfs_subr.c,v 1.54 1996/05/31 00:20:31 peter Exp $
  */
 
 /*
@@ -94,7 +94,7 @@ int vttoif_tab[9] = {
 }
 
 TAILQ_HEAD(freelst, vnode) vnode_free_list;	/* vnode free list */
-u_long freevnodes	= 0;
+static u_long freevnodes = 0;
 
 struct mntlist mountlist;	/* mounted filesystem list */