diff --git a/sys/arch/arm32/include/vidc.h b/sys/arch/arm32/include/vidc.h
index 09a10f91d64b..b72fcf3399d2 100644
--- a/sys/arch/arm32/include/vidc.h
+++ b/sys/arch/arm32/include/vidc.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc.h,v 1.13 2001/07/09 21:46:19 reinoud Exp $	*/
+/*	$NetBSD: vidc.h,v 1.14 2001/07/10 20:10:50 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -55,10 +55,6 @@
 #ifndef	_ARM32_VIDC_H_
 #define	_ARM32_VIDC_H_
 
-#if defined(_KERNEL_OPT)
-#include "opt_cputypes.h"
-#endif
-
 /* VIDC20 Base addresses */
 
 #define VIDC_HW_BASE 0x03400000
diff --git a/sys/arch/arm32/iomd/iomd_irq.S b/sys/arch/arm32/iomd/iomd_irq.S
index 59ed80bb2b67..10520e8aeddf 100644
--- a/sys/arch/arm32/iomd/iomd_irq.S
+++ b/sys/arch/arm32/iomd/iomd_irq.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: iomd_irq.S,v 1.24 2001/07/09 21:46:20 reinoud Exp $	*/
+/*	$NetBSD: iomd_irq.S,v 1.25 2001/07/10 20:10:49 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -39,7 +39,6 @@
  * Created      : 27/09/94
  */
 
-#include "opt_cputypes.h"
 #include "opt_irqstats.h"
 
 #include "assym.h"
diff --git a/sys/arch/arm32/iomd/iomd_irqhandler.c b/sys/arch/arm32/iomd/iomd_irqhandler.c
index f051617994f9..a7ac421b6918 100644
--- a/sys/arch/arm32/iomd/iomd_irqhandler.c
+++ b/sys/arch/arm32/iomd/iomd_irqhandler.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iomd_irqhandler.c,v 1.28 2001/07/10 00:04:31 bjh21 Exp $	*/
+/*	$NetBSD: iomd_irqhandler.c,v 1.29 2001/07/10 20:10:49 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -39,7 +39,6 @@
  *	from: irqhandler.c,v 1.14 1997/04/02 21:52:19 christos Exp $
  */
 
-#include "opt_cputypes.h"
 #include "opt_irqstats.h"
 
 #include <sys/param.h>
diff --git a/sys/arch/arm32/podulebus/podulebus.c b/sys/arch/arm32/podulebus/podulebus.c
index 699e314ba686..0c8cc3f49d1e 100644
--- a/sys/arch/arm32/podulebus/podulebus.c
+++ b/sys/arch/arm32/podulebus/podulebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.47 2001/07/09 21:46:20 reinoud Exp $ */
+/* $NetBSD: podulebus.c,v 1.48 2001/07/10 20:10:49 bjh21 Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -41,8 +41,6 @@
  * Created      : 07/11/94
  */
 
-#include "opt_cputypes.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/arch/arm32/vidc/vidcaudio.c b/sys/arch/arm32/vidc/vidcaudio.c
index b58dd53a49b6..cc6c10fefec9 100644
--- a/sys/arch/arm32/vidc/vidcaudio.c
+++ b/sys/arch/arm32/vidc/vidcaudio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidcaudio.c,v 1.37 2001/07/09 21:46:21 reinoud Exp $	*/
+/*	$NetBSD: vidcaudio.c,v 1.38 2001/07/10 20:10:48 bjh21 Exp $	*/
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson
@@ -36,8 +36,6 @@
  * /dev/audio (partial) compatibility.
  */
 
-#include "opt_cputypes.h"
-
 #include <sys/param.h>	/* proc.h */
 #include <sys/conf.h>   /* autoconfig functions */
 #include <sys/device.h> /* device calls */