diff --git a/sys/arch/arm32/mainbus/pioc.c b/sys/arch/arm32/mainbus/pioc.c
index eb663f7b145d..df7e519b8c93 100644
--- a/sys/arch/arm32/mainbus/pioc.c
+++ b/sys/arch/arm32/mainbus/pioc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pioc.c,v 1.4 1998/09/22 00:33:51 mark Exp $	*/     
+/*	$NetBSD: pioc.c,v 1.5 2001/02/24 20:08:53 reinoud Exp $	*/     
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -46,7 +46,7 @@
 #include <sys/device.h>
 
 #include <machine/bus.h>
-#include <arm32/mainbus/mainbus.h>
+#include <arm/mainbus/mainbus.h>
 #include <arm32/mainbus/piocreg.h>
 #include <arm32/mainbus/piocvar.h>
 
diff --git a/sys/arch/arm32/vidc/beep.c b/sys/arch/arm32/vidc/beep.c
index 924aad66eaba..fd7d182e12b7 100644
--- a/sys/arch/arm32/vidc/beep.c
+++ b/sys/arch/arm32/vidc/beep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: beep.c,v 1.19 2000/06/29 08:53:03 mrg Exp $	*/
+/*	$NetBSD: beep.c,v 1.20 2001/02/24 20:09:50 reinoud Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe
@@ -60,7 +60,7 @@
 #include <machine/vidc.h>
 #include <machine/pmap.h>
 #include <machine/beep.h>
-#include <arm32/mainbus/mainbus.h>
+#include <arm/mainbus/mainbus.h>
 #include <arm32/vidc/waveform.h>
 #include <arm32/iomd/iomdreg.h>
 #ifdef RC7500
diff --git a/sys/arch/arm32/vidc/vidc20.c b/sys/arch/arm32/vidc/vidc20.c
index 4b87c40f5fae..9355f4ceab9b 100644
--- a/sys/arch/arm32/vidc/vidc20.c
+++ b/sys/arch/arm32/vidc/vidc20.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc20.c,v 1.3 1998/01/18 03:48:37 mark Exp $	*/
+/*	$NetBSD: vidc20.c,v 1.4 2001/02/24 20:08:54 reinoud Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe
@@ -50,7 +50,7 @@
 #include <machine/bus.h>
 #include <machine/vidc.h>
 #include <machine/io.h>
-#include <arm32/mainbus/mainbus.h>
+#include <arm/mainbus/mainbus.h>
 
 #include "locators.h"
 
diff --git a/sys/arch/arm32/vidc/vidcaudio.c b/sys/arch/arm32/vidc/vidcaudio.c
index 5d465ab1ad8d..0703530cb0d5 100644
--- a/sys/arch/arm32/vidc/vidcaudio.c
+++ b/sys/arch/arm32/vidc/vidcaudio.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidcaudio.c,v 1.33 2000/06/29 08:53:03 mrg Exp $	*/
+/*	$NetBSD: vidcaudio.c,v 1.34 2001/02/24 20:08:54 reinoud Exp $	*/
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson
@@ -55,7 +55,7 @@
 #include <machine/katelib.h>
 
 #include <arm32/iomd/iomdreg.h>
-#include <arm32/mainbus/mainbus.h>
+#include <arm/mainbus/mainbus.h>
 #include <arm32/vidc/waveform.h>
 #include "vidcaudio.h"