diff --git a/sys/amd64/include/clock.h b/sys/amd64/include/clock.h
index d9a19937d7b0..a923ddac0e31 100644
--- a/sys/amd64/include/clock.h
+++ b/sys/amd64/include/clock.h
@@ -3,14 +3,12 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.16 1996/08/02 21:16:13 bde Exp $
+ *	$Id: clock.h,v 1.17 1996/10/09 19:47:26 bde Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
 #define	_MACHINE_CLOCK_H_
 
-#include "opt_cpu.h"
-
 #if defined(I586_CPU) || defined(I686_CPU)
 
 /*
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index d9a19937d7b0..a923ddac0e31 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -3,14 +3,12 @@
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
  *
- *	$Id: clock.h,v 1.16 1996/08/02 21:16:13 bde Exp $
+ *	$Id: clock.h,v 1.17 1996/10/09 19:47:26 bde Exp $
  */
 
 #ifndef _MACHINE_CLOCK_H_
 #define	_MACHINE_CLOCK_H_
 
-#include "opt_cpu.h"
-
 #if defined(I586_CPU) || defined(I686_CPU)
 
 /*
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index e8f9066835ab..d94d53ea6237 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.25 1996/06/23 17:40:42 bde Exp $
+ * $Id: kern_clock.c,v 1.26 1996/07/30 16:59:22 bde Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -56,6 +56,8 @@
  *                                                                            *
  *****************************************************************************/
 
+#include "opt_cpu.h"		/* XXX */
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/dkstat.h>
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index e8f9066835ab..d94d53ea6237 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.25 1996/06/23 17:40:42 bde Exp $
+ * $Id: kern_clock.c,v 1.26 1996/07/30 16:59:22 bde Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -56,6 +56,8 @@
  *                                                                            *
  *****************************************************************************/
 
+#include "opt_cpu.h"		/* XXX */
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/dkstat.h>
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index e8f9066835ab..d94d53ea6237 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_clock.c	8.5 (Berkeley) 1/21/94
- * $Id: kern_clock.c,v 1.25 1996/06/23 17:40:42 bde Exp $
+ * $Id: kern_clock.c,v 1.26 1996/07/30 16:59:22 bde Exp $
  */
 
 /* Portions of this software are covered by the following: */
@@ -56,6 +56,8 @@
  *                                                                            *
  *****************************************************************************/
 
+#include "opt_cpu.h"		/* XXX */
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/dkstat.h>