diff --git a/sys/arch/acorn32/include/vmparam.h b/sys/arch/acorn32/include/vmparam.h
index d9cf98b022ff..342d17c51521 100644
--- a/sys/arch/acorn32/include/vmparam.h
+++ b/sys/arch/acorn32/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.24 2012/02/17 16:57:57 skrll Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.25 2012/02/18 16:29:36 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -29,8 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_VMPARAM_H_
-#define	_ARM32_VMPARAM_H_
+#ifndef	_ACORN32_VMPARAM_H_
+#define	_ACORN32_VMPARAM_H_
 
 #if defined(_KERNEL) || defined(_KMEMUSER)
 
@@ -90,4 +90,4 @@
 
 #endif /* _KERNEL || _KMEMUSER */
 
-#endif	/* _ARM32_VMPARAM_H_ */
+#endif	/* _ACORN32_VMPARAM_H_ */
diff --git a/sys/arch/cats/include/vmparam.h b/sys/arch/cats/include/vmparam.h
index 0090e51c0528..33185c517feb 100644
--- a/sys/arch/cats/include/vmparam.h
+++ b/sys/arch/cats/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.27 2010/11/06 15:42:44 uebayasi Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.28 2012/02/18 16:29:37 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -29,10 +29,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_VMPARAM_H_
-#define	_ARM32_VMPARAM_H_
+#ifndef	_CATS_VMPARAM_H_
+#define	_CATS_VMPARAM_H_
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_KMEMUSER)
 
 #include <arm/arm32/vmparam.h>
 
@@ -86,6 +86,6 @@
 #define	VM_FREELIST_DEFAULT	0
 #define	VM_FREELIST_ISADMA	1
 
-#endif /* _KERNEL */
+#endif /* _KERNEL || _KMEMUSER */
 
-#endif	/* _ARM32_VMPARAM_H_ */
+#endif	/* _CATS_VMPARAM_H_ */
diff --git a/sys/arch/evbarm/include/vmparam.h b/sys/arch/evbarm/include/vmparam.h
index 95f8ae57f16b..519c3a286598 100644
--- a/sys/arch/evbarm/include/vmparam.h
+++ b/sys/arch/evbarm/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.27 2012/02/17 16:45:46 christos Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.28 2012/02/18 16:29:37 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -29,8 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_VMPARAM_H_
-#define	_ARM32_VMPARAM_H_
+#ifndef	_EVBARM_VMPARAM_H_
+#define	_EVBARM_VMPARAM_H_
 
 #if defined(_KERNEL) || defined(_KMEMUSER)
 
@@ -92,4 +92,4 @@
 
 #endif /* _KERNEL || _KMEMUSER */
 
-#endif	/* _ARM32_VMPARAM_H_ */
+#endif	/* _EVBARM_VMPARAM_H_ */
diff --git a/sys/arch/shark/include/vmparam.h b/sys/arch/shark/include/vmparam.h
index 7a9b32c6daab..6e592c11f312 100644
--- a/sys/arch/shark/include/vmparam.h
+++ b/sys/arch/shark/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.18 2012/02/17 16:01:41 christos Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.19 2012/02/18 16:29:37 christos Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -29,8 +29,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_VMPARAM_H_
-#define	_ARM32_VMPARAM_H_
+#ifndef	_SHARK_VMPARAM_H_
+#define	_SHARK_VMPARAM_H_
 
 #if defined(_KERNEL) || defined(_KMEMUSER)
 
@@ -90,4 +90,4 @@
 
 #endif /* _KERNEL */
 
-#endif	/* _ARM32_VMPARAM_H_ */
+#endif	/* _SHARK_VMPARAM_H_ */