diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c
index 0559e886ba45..fae9752dc057 100644
--- a/sys/arch/amd64/isa/clock.c
+++ b/sys/arch/amd64/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.15 2006/09/03 20:34:13 perry Exp $	*/
+/*	$NetBSD: clock.c,v 1.16 2006/09/04 00:56:08 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -121,7 +121,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.15 2006/09/03 20:34:13 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.16 2006/09/04 00:56:08 perry Exp $");
 
 /* #define CLOCKDEBUG */
 /* #define CLOCK_PARANOIA */
@@ -180,18 +180,18 @@ int clock_debug = 0;
 #define DPRINTF(arg)
 #endif
 
-int		gettick(void);
+static int	gettick(void);
 void		sysbeep(int, int);
 static void     tickle_tc(void);
 
-int		clockintr(void *, struct intrframe);
-void		rtcinit(void);
-int		rtcget(mc_todregs *);
-void		rtcput(mc_todregs *);
+static int	clockintr(void *, struct intrframe);
+static void	rtcinit(void);
+static int	rtcget(mc_todregs *);
+static void	rtcput(mc_todregs *);
 
-static int cmoscheck(void);
+static int	cmoscheck(void);
 
-static int clock_expandyear(int);
+static int	clock_expandyear(int);
 
 static inline int gettick_broken_latch(void);
 
@@ -394,7 +394,7 @@ tickle_tc(void)
 
 }
 
-int
+static int
 clockintr(void *arg, struct intrframe frame)
 {
 	tickle_tc();
@@ -444,7 +444,7 @@ i8254_get_timecount(struct timecounter *tc)
 	return (count);
 }
 
-int
+static int
 gettick(void)
 {
 	u_long ef;
@@ -592,7 +592,7 @@ i8254_initclocks(void)
 	    (int (*)(void *))clockintr, 0);
 }
 
-void
+static void
 rtcinit(void)
 {
 	static int first_rtcopen_ever = 1;
@@ -606,7 +606,7 @@ rtcinit(void)
 	mc146818_write(NULL, MC_REGB, MC_REGB_24HR);	/* XXX softc */
 }
 
-int
+static int
 rtcget(mc_todregs *regs)
 {
 
@@ -617,7 +617,7 @@ rtcget(mc_todregs *regs)
 	return (0);
 }	
 
-void
+static void
 rtcput(mc_todregs *regs)
 {
 
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index cddc8ab78f91..c3d070f7421f 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: clock.c,v 1.98 2006/09/03 20:49:21 perry Exp $	*/
+/*	$NetBSD: clock.c,v 1.99 2006/09/04 00:56:09 perry Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -121,7 +121,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.98 2006/09/03 20:49:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.99 2006/09/04 00:56:09 perry Exp $");
 
 /* #define CLOCKDEBUG */
 /* #define CLOCK_PARANOIA */
@@ -180,7 +180,7 @@ int clock_debug = 0;
 #define DPRINTF(arg)
 #endif
 
-int		gettick(void);
+static int	gettick(void);
 void		sysbeep(int, int);
 static void     tickle_tc(void);
 
@@ -189,9 +189,9 @@ static void	rtcinit(void);
 static int	rtcget(mc_todregs *);
 static void	rtcput(mc_todregs *);
 
-static int cmoscheck(void);
+static int	cmoscheck(void);
 
-static int clock_expandyear(int);
+static int	clock_expandyear(int);
 
 static inline int gettick_broken_latch(void);
 
@@ -396,7 +396,7 @@ tickle_tc(void)
 
 }
 
-int
+static int
 clockintr(void *arg, struct intrframe frame)
 {
 	tickle_tc();
@@ -446,7 +446,7 @@ i8254_get_timecount(struct timecounter *tc)
 	return (count);
 }
 
-int
+static int
 gettick(void)
 {
 	u_long ef;
@@ -594,7 +594,7 @@ i8254_initclocks(void)
 	    (int (*)(void *))clockintr, 0);
 }
 
-void
+static void
 rtcinit(void)
 {
 	static int first_rtcopen_ever = 1;
@@ -608,7 +608,7 @@ rtcinit(void)
 	mc146818_write(NULL, MC_REGB, MC_REGB_24HR);	/* XXX softc */
 }
 
-int
+static int
 rtcget(mc_todregs *regs)
 {
 
@@ -619,7 +619,7 @@ rtcget(mc_todregs *regs)
 	return (0);
 }	
 
-void
+static void
 rtcput(mc_todregs *regs)
 {