diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index 9a6876e9e8df..93e1449c731c 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -15,8 +15,6 @@
  * XXX large parts of the driver and its interface are misplaced.
  */
 extern int	clkintr_pending;
-extern int	pscnt;
-extern int	psdiv;
 extern int	statclock_disable;
 extern u_int	timer_freq;
 extern int	timer0_max_count;
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c
index 32752672b7fe..64d22086d67a 100644
--- a/sys/amd64/isa/clock.c
+++ b/sys/amd64/isa/clock.c
@@ -97,8 +97,8 @@ __FBSDID("$FreeBSD$");
 #define	TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
 
 int	clkintr_pending;
-int	pscnt = 1;
-int	psdiv = 1;
+static int	pscnt = 1;
+static int	psdiv = 1;
 int	statclock_disable;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   1193182
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 9bdd421bf186..74fc023db7f3 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -15,8 +15,6 @@
  * XXX large parts of the driver and its interface are misplaced.
  */
 extern int	clkintr_pending;
-extern int	pscnt;
-extern int	psdiv;
 extern int	statclock_disable;
 extern u_int	timer_freq;
 extern int	timer0_max_count;
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index f31c7ea2eeaa..c710308b8b5a 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -100,8 +100,8 @@ __FBSDID("$FreeBSD$");
 #define	TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
 
 int	clkintr_pending;
-int	pscnt = 1;
-int	psdiv = 1;
+static int	pscnt = 1;
+static int	psdiv = 1;
 int	statclock_disable;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   1193182
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index f31c7ea2eeaa..c710308b8b5a 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -100,8 +100,8 @@ __FBSDID("$FreeBSD$");
 #define	TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
 
 int	clkintr_pending;
-int	pscnt = 1;
-int	psdiv = 1;
+static int	pscnt = 1;
+static int	psdiv = 1;
 int	statclock_disable;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   1193182
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 037ef402ca79..fdc3cc35bc75 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -96,8 +96,6 @@ __FBSDID("$FreeBSD$");
 #define	TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
 
 int	clkintr_pending;
-int	pscnt = 1;
-int	psdiv = 1;
 int	statclock_disable;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   2457600
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index 037ef402ca79..fdc3cc35bc75 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -96,8 +96,6 @@ __FBSDID("$FreeBSD$");
 #define	TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
 
 int	clkintr_pending;
-int	pscnt = 1;
-int	psdiv = 1;
 int	statclock_disable;
 #ifndef TIMER_FREQ
 #define TIMER_FREQ   2457600