diff --git a/sys/altq/altq_cbq.h b/sys/altq/altq_cbq.h
index 3e4af0c3aa94..6aa33a919486 100644
--- a/sys/altq/altq_cbq.h
+++ b/sys/altq/altq_cbq.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: altq_cbq.h,v 1.2 2000/12/14 08:49:49 thorpej Exp $	*/
+/*	$NetBSD: altq_cbq.h,v 1.3 2001/06/05 05:12:18 thorpej Exp $	*/
 /*	$KAME: altq_cbq.h,v 1.5 2000/12/02 13:44:40 kjc Exp $	*/
 
 /*
@@ -190,7 +190,7 @@ struct cbq_getstats {
 #define	DISABLE		0x00
 #define	ENABLE		0x01
 
-#define	CBQ_WATCHDOG    	(HZ / 20)
+#define	CBQ_WATCHDOG    	(hz / 20)
 #define	CBQ_TIMEOUT		10
 #define	CBQ_LS_TIMEOUT		(20 * hz / 1000)
 
diff --git a/sys/arch/arm32/shark/scr.c b/sys/arch/arm32/shark/scr.c
index 27851b05d913..1c1d912603fe 100644
--- a/sys/arch/arm32/shark/scr.c
+++ b/sys/arch/arm32/shark/scr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scr.c,v 1.9 2001/05/02 10:32:14 scw Exp $	*/
+/*	$NetBSD: scr.c,v 1.10 2001/06/05 05:14:19 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -1382,7 +1382,7 @@ struct proc  *p;
                 while (1)
                 {
                     // check that we have not looped too many times 
-                    if(masterDoneRetries >= MAX_FIQ_TIME * HZ)  
+                    if(masterDoneRetries >= MAX_FIQ_TIME * hz)  
                     {
 //printf("MAX_FIQ_TIME reached \n");
                         // big problems, so reset bottom 
@@ -1530,7 +1530,7 @@ struct proc  *p;
                while (1)
                {
                      // check that we have not looped too many times 
-                     if(masterDoneRetries >= MAX_FIQ_TIME * HZ)  
+                     if(masterDoneRetries >= MAX_FIQ_TIME * hz)  
                      {
 //printf("MAX_FIQ_TIME reached \n");
                         // big problems, so reset bottom 
diff --git a/sys/arch/arm32/shark/sequoia.c b/sys/arch/arm32/shark/sequoia.c
index 4c00837dbb32..2a11c839f58d 100644
--- a/sys/arch/arm32/shark/sequoia.c
+++ b/sys/arch/arm32/shark/sequoia.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sequoia.c,v 1.5 2000/03/23 06:35:16 thorpej Exp $	*/
+/*	$NetBSD: sequoia.c,v 1.6 2001/06/05 05:14:51 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -116,8 +116,8 @@
 #define  LED_BILED_RED      3
 
     
-#define LED_TIMEOUT    HZ / 20                       /* 20 times a second */
-#define LED_NET_ACTIVE (1000000/HZ) * LED_TIMEOUT   /* delay in us for net activity */
+#define LED_TIMEOUT    hz / 20                       /* 20 times a second */
+#define LED_NET_ACTIVE (1000000/hz) * LED_TIMEOUT   /* delay in us for net activity */
       
     
     
diff --git a/sys/arch/dnard/dnard/scr.c b/sys/arch/dnard/dnard/scr.c
index eb6e965a7d5b..b658f8170ecd 100644
--- a/sys/arch/dnard/dnard/scr.c
+++ b/sys/arch/dnard/dnard/scr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: scr.c,v 1.1 2001/05/09 15:58:07 matt Exp $	*/
+/*	$NetBSD: scr.c,v 1.2 2001/06/05 05:18:00 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -1341,7 +1341,7 @@ struct proc  *p;
                 while (1)
                 {
                     // check that we have not looped too many times 
-                    if(masterDoneRetries >= MAX_FIQ_TIME * HZ)  
+                    if(masterDoneRetries >= MAX_FIQ_TIME * hz)  
                     {
 //printf("MAX_FIQ_TIME reached \n");
                         // big problems, so reset bottom 
@@ -1489,7 +1489,7 @@ struct proc  *p;
                while (1)
                {
                      // check that we have not looped too many times 
-                     if(masterDoneRetries >= MAX_FIQ_TIME * HZ)  
+                     if(masterDoneRetries >= MAX_FIQ_TIME * hz)  
                      {
 //printf("MAX_FIQ_TIME reached \n");
                         // big problems, so reset bottom 
diff --git a/sys/arch/dnard/dnard/sequoia.c b/sys/arch/dnard/dnard/sequoia.c
index d0ca8839dd76..3566f904423f 100644
--- a/sys/arch/dnard/dnard/sequoia.c
+++ b/sys/arch/dnard/dnard/sequoia.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sequoia.c,v 1.1 2001/05/09 15:58:08 matt Exp $	*/
+/*	$NetBSD: sequoia.c,v 1.2 2001/06/05 05:18:00 thorpej Exp $	*/
 
 /*
  * Copyright 1997
@@ -116,8 +116,8 @@
 #define  LED_BILED_RED      3
 
     
-#define LED_TIMEOUT    HZ / 20                       /* 20 times a second */
-#define LED_NET_ACTIVE (1000000/HZ) * LED_TIMEOUT   /* delay in us for net activity */
+#define LED_TIMEOUT    hz / 20                       /* 20 times a second */
+#define LED_NET_ACTIVE (1000000/hz) * LED_TIMEOUT   /* delay in us for net activity */
       
     
     
diff --git a/sys/arch/mac68k/dev/akbd.c b/sys/arch/mac68k/dev/akbd.c
index 4da9881af124..141e0f8eb92a 100644
--- a/sys/arch/mac68k/dev/akbd.c
+++ b/sys/arch/mac68k/dev/akbd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: akbd.c,v 1.11 2000/09/22 04:56:54 scottr Exp $	*/
+/*	$NetBSD: akbd.c,v 1.12 2001/06/05 05:18:36 thorpej Exp $	*/
 
 /*
  * Copyright (C) 1998	Colin Wood
@@ -40,6 +40,7 @@
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 
 #include "aed.h"
 #include "wskbd.h"
@@ -495,7 +496,7 @@ akbd_ioctl(v, cmd, data, flag, p)
 	case WSKBDIO_BELL:
 	case WSKBDIO_COMPLEXBELL:
 #define d ((struct wskbd_bell_data *)data)
-		mac68k_ring_bell(d->pitch, d->period * HZ / 1000, 100);
+		mac68k_ring_bell(d->pitch, d->period * hz / 1000, 100);
 		/* comes in as msec, goes out as ticks; volume ignored */
 #undef d
 		return (0);
diff --git a/sys/arch/mac68k/mac68k/clockreg.h b/sys/arch/mac68k/mac68k/clockreg.h
index ffbdb736bc96..ecf166651173 100644
--- a/sys/arch/mac68k/mac68k/clockreg.h
+++ b/sys/arch/mac68k/mac68k/clockreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: clockreg.h,v 1.5 1996/04/01 05:16:52 scottr Exp $	*/
+/*	$NetBSD: clockreg.h,v 1.6 2001/06/05 05:19:16 thorpej Exp $	*/
 
 /*-
  * Copyright (C) 1993	Allen K. Briggs, Chris P. Caputo,
@@ -54,7 +54,7 @@
  * into integer overflow problems.  Also note:  do *not* define HZ to be
  * less than 12; overflow will occur, yielding invalid results.
  */
-#define CLK_INTERVAL	((int)((((100000000L / HZ) * 100) / 12766)))
+#define CLK_INTERVAL	((int)((((100000000L / hz) * 100) / 12766)))
 
 #define CLK_INTH	((CLK_INTERVAL >> 8) & 0xff)	/* high byte */
 #define CLK_INTL	(CLK_INTERVAL & 0xff)		/* low byte */