Normalize sentinel. Use _MACHINE_*_H_ and _<ARCH>_*_H_ properly and consitently.

Discussed and okay drahn@. Okay deraadt@.

436 files changed, 1694 insertions, 1707 deletions

diff --git a/sys/arch/alpha/include/_types.h b/sys/arch/alpha/include/_types.h
index 471b7c96f1a..47a9f374a9a 100644
--- a/sys/arch/alpha/include/_types.h
+++ b/sys/arch/alpha/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.11 2009/11/04 19:14:09 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.12 2011/03/23 16:54:33 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,8 +32,8 @@
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
-#ifndef _ALPHA__TYPES_H_
-#define _ALPHA__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
 typedef struct label_t {
@@ -123,4 +123,4 @@ typedef	void *			__wctype_t;
 /* Feature test macros */
 #define __HAVE_TIMECOUNTER
 
-#endif	/* _ALPHA__TYPES_H_ */
+#endif	/* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/alpha/include/alpha_cpu.h b/sys/arch/alpha/include/alpha_cpu.h
index 2d33fcf9636..2ea5009662d 100644
--- a/sys/arch/alpha/include/alpha_cpu.h
+++ b/sys/arch/alpha/include/alpha_cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: alpha_cpu.h,v 1.9 2009/01/17 18:30:08 miod Exp $ */
+/* $OpenBSD: alpha_cpu.h,v 1.10 2011/03/23 16:54:33 pirofti Exp $ */
 /* $NetBSD: alpha_cpu.h,v 1.43 2001/12/18 04:18:22 thorpej Exp $ */
 
 /*
@@ -28,8 +28,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef __ALPHA_ALPHA_CPU_H__
-#define	__ALPHA_ALPHA_CPU_H__
+#ifndef _MACHINE_ALPHA_CPU_H_
+#define	_MACHINE_ALPHA_CPU_H_
 
 /*
  * Alpha CPU + OSF/1 PALcode definitions for use by the kernel.
@@ -541,4 +541,4 @@ alpha_pal_wrval(unsigned long val)
 
 #endif /* _KERNEL */
 
-#endif /* __ALPHA_ALPHA_CPU_H__ */
+#endif /* _MACHINE_ALPHA_CPU_H_ */
diff --git a/sys/arch/alpha/include/aout_machdep.h b/sys/arch/alpha/include/aout_machdep.h
index 5552f464561..8168f06100c 100644
--- a/sys/arch/alpha/include/aout_machdep.h
+++ b/sys/arch/alpha/include/aout_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aout_machdep.h,v 1.2 1997/11/10 15:53:09 niklas Exp $	*/
+/*	$OpenBSD: aout_machdep.h,v 1.3 2011/03/23 16:54:33 pirofti Exp $	*/
 /*	$NetBSD: aout_machdep.h,v 1.1 1995/02/13 23:07:37 cgd Exp $	*/
 
 /*
@@ -28,12 +28,12 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_EXEC_H_
-#define	_ALPHA_EXEC_H_
+#ifndef _MACHINE_AOUT_MACHDEP_H_
+#define	_MACHINE_AOUT_MACHDEP_H_
 
 #define cpu_exec_aout_makecmds(p, epp)	ENOEXEC
 
 /* Size of a page in an object file. */
 #define	__LDPGSZ	8192
 
-#endif /* !_ALPHA_EXEC_H_ */
+#endif /* !_MACHINE_AOUT_MACHDEP_H_ */
diff --git a/sys/arch/alpha/include/atomic.h b/sys/arch/alpha/include/atomic.h
index 9289e6b58a0..2d1725bcfb9 100644
--- a/sys/arch/alpha/include/atomic.h
+++ b/sys/arch/alpha/include/atomic.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atomic.h,v 1.8 2009/04/25 19:14:58 miod Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.9 2011/03/23 16:54:33 pirofti Exp $	*/
 /* $NetBSD: atomic.h,v 1.7 2001/12/17 23:34:57 thorpej Exp $ */
 
 /*-
@@ -35,8 +35,8 @@
  * Misc. `atomic' operations.
  */
 
-#ifndef _ALPHA_ATOMIC_H_
-#define	_ALPHA_ATOMIC_H_
+#ifndef _MACHINE_ATOMIC_H_
+#define	_MACHINE_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -225,4 +225,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* _ALPHA_ATOMIC_H_ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h
index 6157ac433f9..60d9ee7f264 100644
--- a/sys/arch/alpha/include/bus.h
+++ b/sys/arch/alpha/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.28 2009/12/25 20:52:32 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.29 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.10 1996/12/02 22:19:32 cgd Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_BUS_H_
-#define	_ALPHA_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define	_MACHINE_BUS_H_
 
 /*
  * Addresses (in bus space).
@@ -678,4 +678,4 @@ paddr_t	_bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, off_t off, int prot, int flags);
 #endif /* _ALPHA_BUS_DMA_PRIVATE */
 
-#endif /* _ALPHA_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/alpha/include/bwx.h b/sys/arch/alpha/include/bwx.h
index 35864f34507..755713e255f 100644
--- a/sys/arch/alpha/include/bwx.h
+++ b/sys/arch/alpha/include/bwx.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwx.h,v 1.5 2008/06/26 05:42:08 ray Exp $ */
+/* $OpenBSD: bwx.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $ */
 /* $NetBSD: bwx.h,v 1.3 2000/06/08 02:55:37 thorpej Exp $ */
 
 /*-
@@ -31,8 +31,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ALPHA_BWX_H_
-#define	_ALPHA_BWX_H_
+#ifndef _MACHINE_BWX_H_
+#define	_MACHINE_BWX_H_
 
 /*
  * Alpha Byte/Word Extension instructions.
@@ -133,4 +133,4 @@ alpha_sextw(u_int16_t a0)
 	return (v0);
 }
 
-#endif /* _ALPHA_BWX_H_ */
+#endif /* _MACHINE_BWX_H_ */
diff --git a/sys/arch/alpha/include/cpu.h b/sys/arch/alpha/include/cpu.h
index 44f24f800e9..d7580eb9894 100644
--- a/sys/arch/alpha/include/cpu.h
+++ b/sys/arch/alpha/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.42 2010/11/28 21:00:04 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.43 2011/03/23 16:54:34 pirofti Exp $ */
 /* $NetBSD: cpu.h,v 1.45 2000/08/21 02:03:12 thorpej Exp $ */
 
 /*-
@@ -69,8 +69,8 @@
  *	@(#)cpu.h	8.4 (Berkeley) 1/5/94
  */
 
-#ifndef _ALPHA_CPU_H_
-#define _ALPHA_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 #ifndef NO_IEEE
 typedef union alpha_s_float {
@@ -414,4 +414,4 @@ void alpha_enable_fp(struct proc *, int);
 #endif
 
 #endif /* _KERNEL */
-#endif /* _ALPHA_CPU_H_ */
+#endif /* _MACHINE_CPU_H_ */
diff --git a/sys/arch/alpha/include/cpuconf.h b/sys/arch/alpha/include/cpuconf.h
index cd3e9f5103a..27d898c7bc7 100644
--- a/sys/arch/alpha/include/cpuconf.h
+++ b/sys/arch/alpha/include/cpuconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpuconf.h,v 1.5 2006/06/15 20:08:29 brad Exp $	*/
+/*	$OpenBSD: cpuconf.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: cpuconf.h,v 1.12 2000/06/08 03:10:06 thorpej Exp $	*/
 
 /*
@@ -35,8 +35,8 @@
  * Copyright (c) 1997
  */
 
-#ifndef	_ALPHA_CPUCONF_H_
-#define	_ALPHA_CPUCONF_H_
+#ifndef	_MACHINE_CPUCONF_H_
+#define	_MACHINE_CPUCONF_H_
 
 /*
  * Platform Specific Information and Function Hooks.
@@ -103,4 +103,4 @@ extern const struct cpuinit *platform_lookup(int);
 extern void platform_not_configured(void);
 extern void platform_not_supported(void);
 #endif /* _KERNEL */
-#endif /* ! _ALPHA_CPUCONF_H_ */
+#endif /* ! _MACHINE_CPUCONF_H_ */
diff --git a/sys/arch/alpha/include/db_machdep.h b/sys/arch/alpha/include/db_machdep.h
index 1d2c3e575f0..87942a1e499 100644
--- a/sys/arch/alpha/include/db_machdep.h
+++ b/sys/arch/alpha/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.20 2010/11/27 19:57:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.21 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -24,8 +24,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_ALPHA_DB_MACHDEP_H_
-#define	_ALPHA_DB_MACHDEP_H_
+#ifndef	_MACHINE_DB_MACHDEP_H_
+#define	_MACHINE_DB_MACHDEP_H_
 
 /* XXX - Need to include vm.h for boolean_t */
 #include <uvm/uvm_extern.h>
@@ -99,4 +99,4 @@ db_addr_t next_instr_address(db_addr_t, int);
 #define inst_call db_inst_call
 #endif
 
-#endif	/* _ALPHA_DB_MACHDEP_H_ */
+#endif	/* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/alpha/include/exec.h b/sys/arch/alpha/include/exec.h
index 91b09414a0f..50a8417410f 100644
--- a/sys/arch/alpha/include/exec.h
+++ b/sys/arch/alpha/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.10 2010/06/30 20:38:49 tedu Exp $	*/
+/*	$OpenBSD: exec.h,v 1.11 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: exec.h,v 1.1 1995/02/13 23:07:37 cgd Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_EXEC_H_
-#define	_ALPHA_EXEC_H_
+#ifndef _MACHINE_EXEC_H_
+#define	_MACHINE_EXEC_H_
 
 #define cpu_exec_aout_makecmds(p, epp)	ENOEXEC
 
@@ -49,4 +49,4 @@
 
 #define _KERN_DO_ELF64
 
-#endif /* !_ALPHA_EXEC_H_ */
+#endif /* !_MACHINE_EXEC_H_ */
diff --git a/sys/arch/alpha/include/float.h b/sys/arch/alpha/include/float.h
index 7033150e8b5..ebff790e170 100644
--- a/sys/arch/alpha/include/float.h
+++ b/sys/arch/alpha/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.7 2008/07/21 20:50:54 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.4 1995/06/20 20:45:22 jtc Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ALPHA_FLOAT_H_
-#define _ALPHA_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -73,4 +73,4 @@ __END_DECLS
 #define LDBL_MAX	DBL_MAX
 #define LDBL_MAX_10_EXP	DBL_MAX_10_EXP
 
-#endif	/* _ALPHA_FLOAT_H_ */
+#endif	/* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/alpha/include/fpu.h b/sys/arch/alpha/include/fpu.h
index 1aa71c1e765..f2183775da1 100644
--- a/sys/arch/alpha/include/fpu.h
+++ b/sys/arch/alpha/include/fpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpu.h,v 1.1 2002/04/28 20:55:14 pvalchev Exp $	*/
+/*	$OpenBSD: fpu.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: fpu.h,v 1.4 2001/04/26 03:10:46 ross Exp $	*/
 
 /*-
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ALPHA_FPU_H_
-#define _ALPHA_FPU_H_
+#ifndef _MACHINE_FPU_H_
+#define _MACHINE_FPU_H_
 
 #define	_FP_C_DEF(n) (1UL << (n))
 
diff --git a/sys/arch/alpha/include/frame.h b/sys/arch/alpha/include/frame.h
index a05fc112370..6d175157fc6 100644
--- a/sys/arch/alpha/include/frame.h
+++ b/sys/arch/alpha/include/frame.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frame.h,v 1.3 1996/10/30 22:39:06 niklas Exp $	*/
+/*	$OpenBSD: frame.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: frame.h,v 1.3 1996/07/11 05:31:32 cgd Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_FRAME_H_
-#define	_ALPHA_FRAME_H_
+#ifndef _MACHINE_FRAME_H_
+#define	_MACHINE_FRAME_H_
 
 #include <machine/alpha_cpu.h>
 
@@ -92,4 +92,4 @@ struct trapframe {
 	unsigned long	tf_regs[FRAME_SIZE];	/* See above */
 };
 
-#endif /* _ALPHA_FRAME_H_ */
+#endif /* _MACHINE_FRAME_H_ */
diff --git a/sys/arch/alpha/include/ieeefp.h b/sys/arch/alpha/include/ieeefp.h
index a1c87d29f51..d03c01fb9f6 100644
--- a/sys/arch/alpha/include/ieeefp.h
+++ b/sys/arch/alpha/include/ieeefp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieeefp.h,v 1.5 2007/12/29 16:57:19 miod Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: ieeefp.h,v 1.1 1995/04/29 01:09:17 cgd Exp $	*/
 
 /* 
@@ -6,8 +6,8 @@
  * Public domain.
  */
 
-#ifndef _ALPHA_IEEEFP_H_
-#define _ALPHA_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
 
 typedef int fp_except;
 
@@ -50,4 +50,4 @@ typedef enum {
     FP_RP = 3			/* round toward positive infinity */
 } fp_rnd;
 
-#endif /* _ALPHA_IEEEFP_H_ */
+#endif /* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h
index b65f63f05ac..29eae0d7006 100644
--- a/sys/arch/alpha/include/intr.h
+++ b/sys/arch/alpha/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.37 2010/12/21 14:56:23 claudio Exp $ */
+/* $OpenBSD: intr.h,v 1.38 2011/03/23 16:54:34 pirofti Exp $ */
 /* $NetBSD: intr.h,v 1.26 2000/06/03 20:47:41 thorpej Exp $ */
 
 /*-
@@ -58,8 +58,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_INTR_H_
-#define _ALPHA_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 #include <sys/evcount.h>
 #include <sys/lock.h>
@@ -299,4 +299,4 @@ void	scb_free(u_long);
 #define	SCB_ALLOC_FAILED	((u_long) -1)
 
 #endif /* _KERNEL */
-#endif /* ! _ALPHA_INTR_H_ */
+#endif /* ! _MACHINE_INTR_H_ */
diff --git a/sys/arch/alpha/include/ioctl_fd.h b/sys/arch/alpha/include/ioctl_fd.h
index 73f5023a522..81799d55f04 100644
--- a/sys/arch/alpha/include/ioctl_fd.h
+++ b/sys/arch/alpha/include/ioctl_fd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioctl_fd.h,v 1.2 2003/11/08 19:17:28 jmc Exp $	*/
+/*	$OpenBSD: ioctl_fd.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	from: ioctl_fd.h,v 1.4 1995/06/29 03:49:32 jtk Exp 	*/
 
 /*
@@ -30,8 +30,8 @@
  * From: Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp
  */
 
-#ifndef _ALPHA_IOCTL_FD_H_
-#define _ALPHA_IOCTL_FD_H_
+#ifndef _MACHINE_IOCTL_FD_H_
+#define _MACHINE_IOCTL_FD_H_
 
 #define FD_FORMAT_VERSION 110	/* used to validate before formatting */
 #define FD_MAX_NSEC 36		/* highest known number of spt - allow for */
@@ -126,4 +126,4 @@ struct fd_type {
 #endif /* FDC_500KBPS */
 
 
-#endif /* !_ALPHA_IOCTL_FD_H__ */
+#endif /* !_MACHINE_IOCTL_FD_H__ */
diff --git a/sys/arch/alpha/include/kcore.h b/sys/arch/alpha/include/kcore.h
index be8d2244084..37b823fe0f7 100644
--- a/sys/arch/alpha/include/kcore.h
+++ b/sys/arch/alpha/include/kcore.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kcore.h,v 1.3 2000/11/08 21:27:20 ericj Exp $ */
+/* $OpenBSD: kcore.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */
 /* $NetBSD: kcore.h,v 1.3 1998/02/14 00:17:57 cgd Exp $ */
 
 /*
@@ -28,8 +28,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_KCORE_H_
-#define _ALPHA_KCORE_H_
+#ifndef _MACHINE_KCORE_H_
+#define _MACHINE_KCORE_H_
 
 typedef struct cpu_kcore_hdr {
 	u_int64_t	lev1map_pa;		/* PA of Lev1map */
@@ -40,4 +40,4 @@ typedef struct cpu_kcore_hdr {
 #endif
 } cpu_kcore_hdr_t;
 
-#endif /* _ALPHA_KCORE_H_ */
+#endif /* _MACHINE_KCORE_H_ */
diff --git a/sys/arch/alpha/include/lock.h b/sys/arch/alpha/include/lock.h
index 7b4e7f66303..709ecd7c6cd 100644
--- a/sys/arch/alpha/include/lock.h
+++ b/sys/arch/alpha/include/lock.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock.h,v 1.2 2008/06/26 05:42:08 ray Exp $	*/
+/* $OpenBSD: lock.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /* $NetBSD: lock.h,v 1.16 2001/12/17 23:34:57 thorpej Exp $ */
 
 /*-
@@ -35,8 +35,8 @@
  * Machine-dependent spin lock operations.
  */
 
-#ifndef _ALPHA_LOCK_H_
-#define	_ALPHA_LOCK_H_
+#ifndef _MACHINE_LOCK_H_
+#define	_MACHINE_LOCK_H_
 
 typedef	__volatile int		__cpu_simple_lock_t;
 
@@ -151,4 +151,4 @@ do {									\
 } while (0)
 #endif /* MULTIPROCESSOR */
 
-#endif /* _ALPHA_LOCK_H_ */
+#endif /* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/alpha/include/mutex.h b/sys/arch/alpha/include/mutex.h
index e7678d169c1..90f216a2c12 100644
--- a/sys/arch/alpha/include/mutex.h
+++ b/sys/arch/alpha/include/mutex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mutex.h,v 1.2 2007/05/10 18:08:13 art Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef _ALPHA_MUTEX_H_
-#define _ALPHA_MUTEX_H_
+#ifndef _MACHINE_MUTEX_H_
+#define _MACHINE_MUTEX_H_
 
 /*
  * Simple non-mp implementation.
@@ -58,4 +58,4 @@ void mtx_init(struct mutex *, int);
 
 #define MUTEX_OLDIPL(mtx)	(mtx)->mtx_oldipl
 
-#endif	/* _ALPHA_MUTEX_H_ */
+#endif	/* _MACHINE_MUTEX_H_ */
diff --git a/sys/arch/alpha/include/pcb.h b/sys/arch/alpha/include/pcb.h
index 684812f899b..47de4e5ae8e 100644
--- a/sys/arch/alpha/include/pcb.h
+++ b/sys/arch/alpha/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.8 2005/10/30 20:55:50 miod Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: pcb.h,v 1.5 1996/11/13 22:21:00 cgd Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_PCB_H_
-#define _ALPHA_PCB_H_
+#ifndef _MACHINE_PCB_H_
+#define _MACHINE_PCB_H_
 
 #include <machine/frame.h>
 #include <machine/reg.h>
@@ -71,4 +71,4 @@ struct md_coredump {
 void savectx(struct pcb *);
 #endif
 
-#endif /* _ALPHA_PCB_H_ */
+#endif /* _MACHINE_PCB_H_ */
diff --git a/sys/arch/alpha/include/pte.h b/sys/arch/alpha/include/pte.h
index 4a3aacaeacb..32179c7fdf1 100644
--- a/sys/arch/alpha/include/pte.h
+++ b/sys/arch/alpha/include/pte.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pte.h,v 1.9 2008/06/26 05:42:08 ray Exp $ */
+/* $OpenBSD: pte.h,v 1.10 2011/03/23 16:54:34 pirofti Exp $ */
 /* $NetBSD: pte.h,v 1.26 1999/04/09 00:38:11 thorpej Exp $ */
 
 /*-
@@ -58,8 +58,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_PTE_H_
-#define	_ALPHA_PTE_H_
+#ifndef _MACHINE_PTE_H_
+#define	_MACHINE_PTE_H_
 
 /*
  * Alpha page table entry.
@@ -140,4 +140,4 @@ typedef	alpha_pt_entry_t	pt_entry_t;
 extern	pt_entry_t *kernel_lev1map;	/* kernel level 1 page table */
 #endif /* _KERNEL */
 
-#endif /* ! _ALPHA_PTE_H_ */
+#endif /* ! _MACHINE_PTE_H_ */
diff --git a/sys/arch/alpha/include/ptrace.h b/sys/arch/alpha/include/ptrace.h
index 81040c1cbf1..7ca5e63a309 100644
--- a/sys/arch/alpha/include/ptrace.h
+++ b/sys/arch/alpha/include/ptrace.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ptrace.h,v 1.4 2002/03/12 11:58:14 art Exp $	*/
+/*	$OpenBSD: ptrace.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: ptrace.h,v 1.1 1995/02/13 23:07:51 cgd Exp $	*/
 
 /*
@@ -31,8 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MACHINE_PTRACE_H__
-#define __MACHINE_PTRACE_H__
+#ifndef _MACHINE_PTRACE_H_
+#define _MACHINE_PTRACE_H_
 
 /*
  * Alpha-dependent ptrace definitions.
diff --git a/sys/arch/alpha/include/reg.h b/sys/arch/alpha/include/reg.h
index 23d0902cca4..e5812471d4a 100644
--- a/sys/arch/alpha/include/reg.h
+++ b/sys/arch/alpha/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.5 2002/03/14 01:26:27 millert Exp $	*/
+/*	$OpenBSD: reg.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: reg.h,v 1.2 1995/03/28 18:14:07 jtc Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_REG_H_
-#define	_ALPHA_REG_H_
+#ifndef _MACHINE_REG_H_
+#define	_MACHINE_REG_H_
 
 /*
  * XXX where did this info come from?
@@ -98,4 +98,4 @@ void	frametoreg(struct trapframe *, struct reg *);
 void	regtoframe(struct reg *, struct trapframe *);
 #endif
 
-#endif /* _ALPHA_REG_H_ */
+#endif /* _MACHINE_REG_H_ */
diff --git a/sys/arch/alpha/include/reloc.h b/sys/arch/alpha/include/reloc.h
index 694e84ac65f..5133abb46ce 100644
--- a/sys/arch/alpha/include/reloc.h
+++ b/sys/arch/alpha/include/reloc.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: reloc.h,v 1.2 2001/07/04 08:41:18 niklas Exp $	*/
+/*	$OpenBSD: reloc.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
-#ifndef	_MACH_RELOC_H_
-#define	_MACH_RELOC_H_
+#ifndef	_MACHINE_RELOC_H_
+#define	_MACHINE_RELOC_H_
 
 #define RELOC_NONE            0       /* No reloc */
 #define RELOC_REFLONG         1       /* Direct 32 bit */
@@ -34,4 +34,4 @@
 
 #define R_TYPE(X)	__CONCAT(RELOC_,X)
 
-#endif	/* _MACH_RELOC_H_ */
+#endif	/* _MACHINE_RELOC_H_ */
diff --git a/sys/arch/alpha/include/signal.h b/sys/arch/alpha/include/signal.h
index e433a488152..1f446e22e1b 100644
--- a/sys/arch/alpha/include/signal.h
+++ b/sys/arch/alpha/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.6 2006/12/11 20:53:23 deraadt Exp $	*/
+/*	$OpenBSD: signal.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: signal.h,v 1.2 1995/02/16 03:08:08 cgd Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef _ALPHA_SIGNAL_H_
-#define	_ALPHA_SIGNAL_H_
+#ifndef _MACHINE_SIGNAL_H_
+#define	_MACHINE_SIGNAL_H_
 
 #include <sys/cdefs.h>
 
@@ -61,4 +61,4 @@ struct  sigcontext {
 	long	sc_xxx[8];		/* XXX */
 };
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif /* !_ALPHA_SIGNAL_H_*/
+#endif /* !_MACHINE_SIGNAL_H_*/
diff --git a/sys/arch/alpha/include/stdarg.h b/sys/arch/alpha/include/stdarg.h
index 1cb7f986c45..218a0d09aec 100644
--- a/sys/arch/alpha/include/stdarg.h
+++ b/sys/arch/alpha/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.12 2010/12/30 05:01:36 tedu Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.13 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.4 1996/10/09 21:13:05 cgd Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _ALPHA_STDARG_H_
-#define	_ALPHA_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define	_MACHINE_STDARG_H_
 
 #include <sys/cdefs.h>
 #include <machine/_types.h>
@@ -62,4 +62,4 @@ typedef __va_list	va_list;
 
 #define	va_end(ap)	
 
-#endif /* !_ALPHA_STDARG_H_ */
+#endif /* !_MACHINE_STDARG_H_ */
diff --git a/sys/arch/alpha/include/sysarch.h b/sys/arch/alpha/include/sysarch.h
index 9cd3e3608cb..c997e76734d 100644
--- a/sys/arch/alpha/include/sysarch.h
+++ b/sys/arch/alpha/include/sysarch.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysarch.h,v 1.5 2008/06/26 05:42:08 ray Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: sysarch.h,v 1.8 2001/04/26 03:10:46 ross Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ALPHA_SYSARCH_H_
-#define _ALPHA_SYSARCH_H_
+#ifndef _MACHINE_SYSARCH_H_
+#define _MACHINE_SYSARCH_H_
 
 #include <machine/ieeefp.h>
 
@@ -58,4 +58,4 @@ struct alpha_fp_c_args {
 int	sysarch(int, void *);
 #endif /* _KERNEL */
 
-#endif /* !_ALPHA_SYSARCH_H_ */
+#endif /* !_MACHINE_SYSARCH_H_ */
diff --git a/sys/arch/alpha/include/varargs.h b/sys/arch/alpha/include/varargs.h
index 9d8a5d775ed..404c3397137 100644
--- a/sys/arch/alpha/include/varargs.h
+++ b/sys/arch/alpha/include/varargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:43 millert Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: varargs.h,v 1.5 1996/10/09 21:13:05 cgd Exp $	*/
 
 /*-
@@ -37,8 +37,8 @@
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  */
 
-#ifndef _ALPHA_VARARGS_H_
-#define	_ALPHA_VARARGS_H_
+#ifndef _MACHINE_VARARGS_H_
+#define	_MACHINE_VARARGS_H_
 
 #include <machine/stdarg.h>
 
@@ -55,4 +55,4 @@
 #define	va_start(ap) \
 	((ap) = *(va_list *)__builtin_saveregs(), (ap).pad = 0)
 
-#endif /* !_ALPHA_VARARGS_H_ */
+#endif /* !_MACHINE_VARARGS_H_ */
diff --git a/sys/arch/alpha/include/vmparam.h b/sys/arch/alpha/include/vmparam.h
index 51d25a67632..ebbccb979be 100644
--- a/sys/arch/alpha/include/vmparam.h
+++ b/sys/arch/alpha/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.19 2010/12/15 05:30:18 tedu Exp $ */
+/* $OpenBSD: vmparam.h,v 1.20 2011/03/23 16:54:34 pirofti Exp $ */
 /* $NetBSD: vmparam.h,v 1.18 2000/05/22 17:13:54 thorpej Exp $ */
 
 /*
@@ -39,8 +39,8 @@
  *	@(#)vmparam.h	8.2 (Berkeley) 4/22/94
  */
 
-#ifndef	_ALPHA_VMPARAM_H_
-#define	_ALPHA_VMPARAM_H_
+#ifndef	_MACHINE_VMPARAM_H_
+#define	_MACHINE_VMPARAM_H_
 
 /*
  * Machine dependent constants for Alpha.
@@ -136,4 +136,4 @@ struct pmap_physseg {
 	struct pv_head *pvhead;		/* pv list of this seg */
 };
 
-#endif	/* ! _ALPHA_VMPARAM_H_ */
+#endif	/* ! _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/amd64/include/_types.h b/sys/arch/amd64/include/_types.h
index 9d4eed417e9..9258a4133fc 100644
--- a/sys/arch/amd64/include/_types.h
+++ b/sys/arch/amd64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.6 2009/11/04 19:14:09 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,8 +32,8 @@
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
-#ifndef _AMD64__TYPES_H_
-#define _AMD64__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
 typedef struct label_t {
@@ -119,4 +119,4 @@ typedef	void *			__wctype_t;
 /* Feature test macros */
 #define __HAVE_TIMECOUNTER
 
-#endif	/* _AMD64__TYPES_H_ */
+#endif	/* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/amd64/include/apicvar.h b/sys/arch/amd64/include/apicvar.h
index 16f65a595c8..0478ed5f421 100644
--- a/sys/arch/amd64/include/apicvar.h
+++ b/sys/arch/amd64/include/apicvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apicvar.h,v 1.2 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: apicvar.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /* 	$NetBSD: apicvar.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _X86_APICVAR_H_
-#define _X86_APICVAR_H_
+#ifndef _MACHINE_APICVAR_H_
+#define _MACHINE_APICVAR_H_
 
 struct apic_attach_args {
 	const char *aaa_name;
@@ -48,4 +48,4 @@ struct apic_attach_args {
 
 void apic_format_redir(char *, char *, int, u_int32_t, u_int32_t);
 
-#endif /* !_X86_APICVAR_H_ */
+#endif /* !_MACHINE_APICVAR_H_ */
diff --git a/sys/arch/amd64/include/apmvar.h b/sys/arch/amd64/include/apmvar.h
index b8a27a2ab83..1a3925ec0b9 100644
--- a/sys/arch/amd64/include/apmvar.h
+++ b/sys/arch/amd64/include/apmvar.h
@@ -1,5 +1,5 @@
 /* XXX - DSR */
-/*	$OpenBSD: apmvar.h,v 1.2 2009/02/26 17:19:47 oga Exp $	*/
+/*	$OpenBSD: apmvar.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  *  Copyright (c) 1995 John T. Kohl
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-#ifndef _I386_APMVAR_H_
-#define _I386_APMVAR_H_
+#ifndef _MACHINE_APMVAR_H_
+#define _MACHINE_APMVAR_H_
 
 #include <sys/ioccom.h>
 
@@ -299,4 +299,4 @@ int apm_set_powstate(u_int devid, u_int powstate);
 int apm_kqfilter(dev_t dev, struct knote *kn);
 #endif /* _KERNEL */
 
-#endif /* _I386_APMVAR_H_ */
+#endif /* _MACHINE_APMVAR_H_ */
diff --git a/sys/arch/amd64/include/asm.h b/sys/arch/amd64/include/asm.h
index 59c5b66c7db..d9b41e9ac10 100644
--- a/sys/arch/amd64/include/asm.h
+++ b/sys/arch/amd64/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.2 2005/12/13 00:18:19 jsg Exp $	*/
+/*	$OpenBSD: asm.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: asm.h,v 1.2 2003/05/02 18:05:47 yamt Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)asm.h	5.5 (Berkeley) 5/7/91
  */
 
-#ifndef _AMD64_ASM_H_
-#define _AMD64_ASM_H_
+#ifndef _MACHINE_ASM_H_
+#define _MACHINE_ASM_H_
 
 #ifdef PIC
 #define PIC_PLT(x)	x@PLT
@@ -115,4 +115,4 @@
 	.stabs __STRING(sym),1,0,0,0
 #endif /* __STDC__ */
 
-#endif /* !_AMD64_ASM_H_ */
+#endif /* !_MACHINE_ASM_H_ */
diff --git a/sys/arch/amd64/include/atomic.h b/sys/arch/amd64/include/atomic.h
index 4578f9a0478..effbb04c4db 100644
--- a/sys/arch/amd64/include/atomic.h
+++ b/sys/arch/amd64/include/atomic.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atomic.h,v 1.7 2010/12/27 20:22:23 guenther Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: atomic.h,v 1.1 2003/04/26 18:39:37 fvdl Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AMD64_ATOMIC_H
-#define _AMD64_ATOMIC_H
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 /*
  * Perform atomic operations on memory. Should be atomic with respect
@@ -131,4 +131,4 @@ x86_atomic_clearbits_u64(volatile u_int64_t *ptr, u_int64_t bits)
 #undef LOCK
 
 #endif /* defined(_KERNEL) && !defined(_LOCORE) */
-#endif /* _AMD64_ATOMIC_H_ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/amd64/include/biosvar.h b/sys/arch/amd64/include/biosvar.h
index 0abc8c2b4f8..583e5544148 100644
--- a/sys/arch/amd64/include/biosvar.h
+++ b/sys/arch/amd64/include/biosvar.h
@@ -1,5 +1,5 @@
 /* XXX - DSR */
-/*	$OpenBSD: biosvar.h,v 1.12 2011/03/14 22:14:40 krw Exp $	*/
+/*	$OpenBSD: biosvar.h,v 1.13 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -29,8 +29,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_BIOSVAR_H_
-#define _I386_BIOSVAR_H_
+#ifndef _MACHINE_BIOSVAR_H_
+#define _MACHINE_BIOSVAR_H_
 
 	/* some boxes put apm data seg in the 2nd page */
 #define	BOOTARG_OFF	(NBPG*2)
@@ -263,4 +263,4 @@ extern bios_memmap_t *bios_memmap;
 #endif /* _LOCORE */
 #endif /* _KERNEL || _STANDALONE */
 
-#endif /* _I386_BIOSVAR_H_ */
+#endif /* _MACHINE_BIOSVAR_H_ */
diff --git a/sys/arch/amd64/include/bus.h b/sys/arch/amd64/include/bus.h
index cdb107a2022..5c8fab5b0bc 100644
--- a/sys/arch/amd64/include/bus.h
+++ b/sys/arch/amd64/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.24 2010/09/06 19:05:48 kettenis Exp $	*/
+/*	$OpenBSD: bus.h,v 1.25 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $	*/
 
 /*-
@@ -63,8 +63,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _X86_BUS_H_
-#define _X86_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 #include <sys/mutex.h>
 #include <sys/tree.h>
@@ -682,4 +682,4 @@ int	sg_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t,
  
 paddr_t bus_space_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int);
 
-#endif /* _X86_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index 7666e74dfa8..260212f10a9 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.62 2010/11/29 00:04:09 dlg Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.63 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)cpu.h	5.4 (Berkeley) 5/9/91
  */
 
-#ifndef _AMD64_CPU_H_
-#define _AMD64_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 /*
  * Definitions unique to x86-64 cpu support.
@@ -370,4 +370,4 @@ void mp_setperf_init(void);
  */
 #define CR4_DEFAULT (CR4_PAE|CR4_PGE|CR4_PSE|CR4_OSFXSR|CR4_OSXMMEXCPT)
 
-#endif /* !_AMD64_CPU_H_ */
+#endif /* !_MACHINE_CPU_H_ */
diff --git a/sys/arch/amd64/include/cpufunc.h b/sys/arch/amd64/include/cpufunc.h
index dcc80a93ee5..1373e1712df 100644
--- a/sys/arch/amd64/include/cpufunc.h
+++ b/sys/arch/amd64/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.6 2010/12/07 22:12:44 deraadt Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.3 2003/05/08 10:27:43 fvdl Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AMD64_CPUFUNC_H_
-#define	_AMD64_CPUFUNC_H_
+#ifndef _MACHINE_CPUFUNC_H_
+#define	_MACHINE_CPUFUNC_H_
 
 /*
  * Functions to provide access to i386-specific instructions.
@@ -309,4 +309,4 @@ void amd64_errata(struct cpu_info *);
 
 #endif /* _KERNEL */
 
-#endif /* !_AMD64_CPUFUNC_H_ */
+#endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/arch/amd64/include/db_machdep.h b/sys/arch/amd64/include/db_machdep.h
index 94f4433dbad..343d50acd6c 100644
--- a/sys/arch/amd64/include/db_machdep.h
+++ b/sys/arch/amd64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.9 2010/11/27 19:57:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.10 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.2 2003/04/29 17:06:04 scw Exp $	*/
 
 /* 
@@ -27,8 +27,8 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef	_I386_DB_MACHDEP_H_
-#define	_I386_DB_MACHDEP_H_
+#ifndef	_MACHINE_DB_MACHDEP_H_
+#define	_MACHINE_DB_MACHDEP_H_
 
 /*
  * Machine-dependent defines for new kernel debugger.
@@ -122,4 +122,4 @@ extern void db_machine_init(void);
 
 extern void cpu_debug_dump(void);
 
-#endif	/* _I386_DB_MACHDEP_H_ */
+#endif	/* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/amd64/include/exec.h b/sys/arch/amd64/include/exec.h
index 4acd4243c80..c57d61e4340 100644
--- a/sys/arch/amd64/include/exec.h
+++ b/sys/arch/amd64/include/exec.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: exec.h,v 1.2 2004/02/27 17:41:25 deraadt Exp $	*/
+/*	$OpenBSD: exec.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Written by Artur Grabowski <art@openbsd.org> Public Domain
  */
 
-#ifndef _AMD64_EXEC_H_
-#define _AMD64_EXEC_H_
+#ifndef _MACHINE_EXEC_H_
+#define _MACHINE_EXEC_H_
 
 #define __LDPGSZ 4096
 
diff --git a/sys/arch/amd64/include/float.h b/sys/arch/amd64/include/float.h
index 6050cd4fa76..6aab8daf03a 100644
--- a/sys/arch/amd64/include/float.h
+++ b/sys/arch/amd64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.3 2008/07/21 20:50:54 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	@(#)float.h	7.1 (Berkeley) 5/8/90
  */
 
-#ifndef _I386_FLOAT_H_
-#define _I386_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -75,4 +75,4 @@ __END_DECLS
 #define LDBL_MAX	1.18973149535723176502e+4932L
 #define LDBL_MAX_10_EXP	4932
 
-#endif	/* _I386_FLOAT_H_ */
+#endif	/* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/amd64/include/fpu.h b/sys/arch/amd64/include/fpu.h
index 345bebbb8ce..bda8f0521d0 100644
--- a/sys/arch/amd64/include/fpu.h
+++ b/sys/arch/amd64/include/fpu.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: fpu.h,v 1.8 2011/03/20 21:44:08 guenther Exp $	*/
+/*	$OpenBSD: fpu.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: fpu.h,v 1.1 2003/04/26 18:39:40 fvdl Exp $	*/
 
-#ifndef	_AMD64_FPU_H_
-#define	_AMD64_FPU_H_
+#ifndef	_MACHINE_FPU_H_
+#define	_MACHINE_FPU_H_
 
 #include <sys/types.h>
 
@@ -62,4 +62,4 @@ void fpu_kernel_exit(void);
 
 #endif
 
-#endif /* _AMD64_FPU_H_ */
+#endif /* _MACHINE_FPU_H_ */
diff --git a/sys/arch/amd64/include/frame.h b/sys/arch/amd64/include/frame.h
index 5aee1643160..dcf53bba447 100644
--- a/sys/arch/amd64/include/frame.h
+++ b/sys/arch/amd64/include/frame.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frame.h,v 1.4 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: frame.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: frame.h,v 1.1 2003/04/26 18:39:40 fvdl Exp $	*/
 
 /*-
@@ -68,8 +68,8 @@
  * Adapted for NetBSD/amd64 by fvdl@wasabisystems.com
  */
 
-#ifndef _AMD64_FRAME_H_
-#define _AMD64_FRAME_H_
+#ifndef _MACHINE_FRAME_H_
+#define _MACHINE_FRAME_H_
 
 #include <sys/signal.h>
 #include <machine/fpu.h>
@@ -160,4 +160,4 @@ struct switchframe {
 	int64_t	sf_rip;
 };
 
-#endif  /* _AMD64_FRAME_H_ */
+#endif  /* _MACHINE_FRAME_H_ */
diff --git a/sys/arch/amd64/include/i82093var.h b/sys/arch/amd64/include/i82093var.h
index f1817ac0c51..45b3eeb24e2 100644
--- a/sys/arch/amd64/include/i82093var.h
+++ b/sys/arch/amd64/include/i82093var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82093var.h,v 1.2 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: i82093var.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _X86_I82093VAR_H_
-#define _X86_I82093VAR_H_
+#ifndef _MACHINE_I82093VAR_H_
+#define _MACHINE_I82093VAR_H_
 
 #include <machine/apicvar.h>
 
@@ -94,4 +94,4 @@ extern int ioapic_bsp_id;
 extern int nioapics;
 extern struct ioapic_softc *ioapics;
 
-#endif /* !_X86_I82093VAR_H_ */
+#endif /* !_MACHINE_I82093VAR_H_ */
diff --git a/sys/arch/amd64/include/i82489var.h b/sys/arch/amd64/include/i82489var.h
index 565675b0192..1181e137d0e 100644
--- a/sys/arch/amd64/include/i82489var.h
+++ b/sys/arch/amd64/include/i82489var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82489var.h,v 1.11 2010/07/25 21:43:38 deraadt Exp $	*/
+/*	$OpenBSD: i82489var.h,v 1.12 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: i82489var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _X86_I82489REG_H_
-#define _X86_I82489REG_H_
+#ifndef _MACHINE_I82489VAR_H_
+#define _MACHINE_I82489VAR_H_
 
 /*
  * Software definitions belonging to Local APIC driver.
diff --git a/sys/arch/amd64/include/i8259.h b/sys/arch/amd64/include/i8259.h
index 5e3d2672a4e..0a686b99baf 100644
--- a/sys/arch/amd64/include/i8259.h
+++ b/sys/arch/amd64/include/i8259.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i8259.h,v 1.2 2005/12/13 00:18:19 jsg Exp $	*/
+/*	$OpenBSD: i8259.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: i8259.h,v 1.3 2003/05/04 22:01:56 fvdl Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)icu.h	5.6 (Berkeley) 5/9/91
  */
 
-#ifndef	_X86_I8259_H_
-#define	_X86_I8259_H_
+#ifndef	_MACHINE_I8259_H_
+#define	_MACHINE_I8259_H_
 
 #include <dev/isa/isareg.h>
 
@@ -145,4 +145,4 @@ extern void i8259_reinit(void);
 #endif /* ICU_HARDWARE_MASK */
 #endif /* ICU_SPECIAL_MASK_MODE */
 
-#endif /* !_X86_I8259_H_ */
+#endif /* !_MACHINE_I8259_H_ */
diff --git a/sys/arch/amd64/include/ieeefp.h b/sys/arch/amd64/include/ieeefp.h
index 774ee8d6adc..fce3d83447a 100644
--- a/sys/arch/amd64/include/ieeefp.h
+++ b/sys/arch/amd64/include/ieeefp.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: ieeefp.h,v 1.1 2004/01/28 01:39:39 mickey Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* 
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
  */
 
-#ifndef _I386_IEEEFP_H_
-#define _I386_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
 
 typedef int fp_except;
 #define FP_X_INV	0x01	/* invalid operation exception */
@@ -23,4 +23,4 @@ typedef enum {
     FP_RZ=3			/* round to zero (truncate) */
 } fp_rnd;
 
-#endif /* _I386_IEEEFP_H_ */
+#endif /* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h
index c820a2456e7..5a6212ffcdf 100644
--- a/sys/arch/amd64/include/intr.h
+++ b/sys/arch/amd64/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.21 2010/12/27 19:51:27 guenther Exp $	*/
+/*	$OpenBSD: intr.h,v 1.22 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _X86_INTR_H_
-#define _X86_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 #include <machine/intrdefs.h>
 
@@ -270,4 +270,4 @@ do {									\
 } while (/*CONSTCOND*/ 0)
 #endif /* _LOCORE */
 
-#endif /* !_X86_INTR_H_ */
+#endif /* !_MACHINE_INTR_H_ */
diff --git a/sys/arch/amd64/include/ioctl_fd.h b/sys/arch/amd64/include/ioctl_fd.h
index 51f95755e5d..b0c4c6f9ce0 100644
--- a/sys/arch/amd64/include/ioctl_fd.h
+++ b/sys/arch/amd64/include/ioctl_fd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioctl_fd.h,v 1.1 2005/09/19 01:28:04 deraadt Exp $	*/
+/*	$OpenBSD: ioctl_fd.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (C) 1992-1994 by Joerg Wunsch, Dresden
@@ -29,8 +29,8 @@
  * From: Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp
  */
 
-#ifndef _AMD64_IOCTL_FD_H_
-#define _AMD64_IOCTL_FD_H_
+#ifndef _MACHINE_IOCTL_FD_H_
+#define _MACHINE_IOCTL_FD_H_
 
 #include <sys/ioccom.h>
 
@@ -127,4 +127,4 @@ struct fd_type {
 #endif /* FDC_500KBPS */
 
 
-#endif /* !_AMD64_IOCTL_FD_H__ */
+#endif /* !_MACHINE_IOCTL_FD_H__ */
diff --git a/sys/arch/amd64/include/kcore.h b/sys/arch/amd64/include/kcore.h
index 47b3e329641..ebf214799b7 100644
--- a/sys/arch/amd64/include/kcore.h
+++ b/sys/arch/amd64/include/kcore.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kcore.h,v 1.3 2007/11/16 17:09:17 mikeb Exp $	*/
+/*	$OpenBSD: kcore.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: kcore.h,v 1.1 2003/04/26 18:39:43 fvdl Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * Wasabi Systems, Inc.
  */
 
-#ifndef _AMD64_KCORE_H_
-#define _AMD64_KCORE_H_
+#ifndef _MACHINE_KCORE_H_
+#define _MACHINE_KCORE_H_
 
 typedef struct cpu_kcore_hdr {
 	u_int64_t	ptdpaddr;		/* PA of PML4 */
@@ -47,4 +47,4 @@ typedef struct cpu_kcore_hdr {
 #endif
 } cpu_kcore_hdr_t;
 
-#endif /* _AMD64_KCORE_H_ */
+#endif /* _MACHINE_KCORE_H_ */
diff --git a/sys/arch/amd64/include/lock.h b/sys/arch/amd64/include/lock.h
index 2dfd082f08c..4cff0e75ebe 100644
--- a/sys/arch/amd64/include/lock.h
+++ b/sys/arch/amd64/include/lock.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lock.h,v 1.5 2008/12/04 15:48:19 weingart Exp $	*/
+/*	$OpenBSD: lock.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: lock.h,v 1.1.2.2 2000/05/03 14:40:55 sommerfeld Exp $	*/
 
 /*-
@@ -34,8 +34,8 @@
  * Machine-dependent spin lock operations.
  */
 
-#ifndef _AMD64_LOCK_H_
-#define	_AMD64_LOCK_H_
+#ifndef _MACHINE_LOCK_H_
+#define	_MACHINE_LOCK_H_
 
 typedef	__volatile int		__cpu_simple_lock_t;
 
@@ -112,4 +112,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t *lockp)
 
 #define rw_cas(p, o, n) (x86_atomic_cas_ul(p, o, n) != o)
 
-#endif /* _AMD64_LOCK_H_ */
+#endif /* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/amd64/include/mcontext.h b/sys/arch/amd64/include/mcontext.h
index 7f71b77ca87..6d2c7d57c0b 100644
--- a/sys/arch/amd64/include/mcontext.h
+++ b/sys/arch/amd64/include/mcontext.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcontext.h,v 1.2 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: mcontext.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: mcontext.h,v 1.1 2003/04/26 18:39:44 fvdl Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AMD64_MCONTEXT_H_
-#define _AMD64_MCONTEXT_H_
+#ifndef _MACHINE_MCONTEXT_H_
+#define _MACHINE_MCONTEXT_H_
 
 /*
  * Layout of mcontext_t according to the System V Application Binary Interface,
@@ -98,4 +98,4 @@ typedef struct {
 #define _UC_MACHINE_SP(uc)	((uc)->uc_mcontext.__gregs[_REG_URSP])
 #endif
 
-#endif	/* !_AMD64_MCONTEXT_H_ */
+#endif	/* !_MACHINE_MCONTEXT_H_ */
diff --git a/sys/arch/amd64/include/mpbiosreg.h b/sys/arch/amd64/include/mpbiosreg.h
index ea37a7e21d6..9e284b053ad 100644
--- a/sys/arch/amd64/include/mpbiosreg.h
+++ b/sys/arch/amd64/include/mpbiosreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpbiosreg.h,v 1.3 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: mpbiosreg.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /* 	$NetBSD: mpbiosreg.h,v 1.3 2003/03/04 23:27:32 fvdl Exp $ */
 
 /*-
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _X86_MPBIOSREG_H_
-#define _X86_MPBIOSREG_H_
+#ifndef _MACHINE_MPBIOSREG_H_
+#define _MACHINE_MPBIOSREG_H_
 
 #define BIOS_BASE		(0xf0000)
 #define BIOS_SIZE		(0x10000)
@@ -153,4 +153,4 @@ struct mpbios_int {
 };
 
 
-#endif /* !_X86_MPBIOSREG_H_ */
+#endif /* !_MACHINE_MPBIOSREG_H_ */
diff --git a/sys/arch/amd64/include/mpbiosvar.h b/sys/arch/amd64/include/mpbiosvar.h
index ff715a29f65..8dce24cbb5e 100644
--- a/sys/arch/amd64/include/mpbiosvar.h
+++ b/sys/arch/amd64/include/mpbiosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpbiosvar.h,v 1.3 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: mpbiosvar.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /* $NetBSD: mpbiosvar.h,v 1.2 2003/04/02 07:53:57 thorpej Exp $ */
 
 /*-
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef _X86_MPBIOSVAR_H_
-#define _X86_MPBIOSVAR_H_
+#ifndef _MACHINE_MPBIOSVAR_H_
+#define _MACHINE_MPBIOSVAR_H_
 
 #define MP_TRAMPOLINE  (2 * PAGE_SIZE)
 
@@ -54,4 +54,4 @@ extern int mpbios_scanned;
 
 #endif
 
-#endif /* !_X86_MPBIOSVAR_H_ */
+#endif /* !_MACHINE_MPBIOSVAR_H_ */
diff --git a/sys/arch/amd64/include/mutex.h b/sys/arch/amd64/include/mutex.h
index 1c712e87bce..6ce401c8f34 100644
--- a/sys/arch/amd64/include/mutex.h
+++ b/sys/arch/amd64/include/mutex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mutex.h,v 1.3 2005/07/18 02:43:24 fgsch Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -24,8 +24,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
-#ifndef _AMD64_MUTEX_H_
-#define _AMD64_MUTEX_H_
+#ifndef _MACHINE_MUTEX_H_
+#define _MACHINE_MUTEX_H_
 
 struct mutex {
 	int mtx_wantipl;
diff --git a/sys/arch/amd64/include/pcb.h b/sys/arch/amd64/include/pcb.h
index 8151dc666d4..3a7ced70e88 100644
--- a/sys/arch/amd64/include/pcb.h
+++ b/sys/arch/amd64/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.7 2010/11/13 04:16:42 guenther Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: pcb.h,v 1.1 2003/04/26 18:39:45 fvdl Exp $	*/
 
 /*-
@@ -68,8 +68,8 @@
  * XXXfvdl these copyrights don't really match anymore
  */
 
-#ifndef _AMD64_PCB_H_
-#define _AMD64_PCB_H_
+#ifndef _MACHINE_PCB_H_
+#define _MACHINE_PCB_H_
 
 #include <sys/signal.h>
 
@@ -100,4 +100,4 @@ struct md_coredump {
 	long	md_pad[8];
 };    
 
-#endif /* _AMD64_PCB_H_ */
+#endif /* _MACHINE_PCB_H_ */
diff --git a/sys/arch/amd64/include/pctr.h b/sys/arch/amd64/include/pctr.h
index 427bcb52ee0..bcaef0814ec 100644
--- a/sys/arch/amd64/include/pctr.h
+++ b/sys/arch/amd64/include/pctr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pctr.h,v 1.3 2007/10/24 17:56:57 mikeb Exp $	*/
+/*	$OpenBSD: pctr.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Pentium performance counter driver for OpenBSD.
@@ -9,8 +9,8 @@
  * OpenBSD project by leaving this copyright notice intact.
  */
 
-#ifndef _AMD64_PCTR_H_
-#define _AMD64_PCTR_H_
+#ifndef _MACHINE_PCTR_H_
+#define _MACHINE_PCTR_H_
 
 #include <sys/ioccom.h>
 
@@ -90,4 +90,4 @@ int	pctrclose(dev_t, int, int, struct proc *);
 int	pctrioctl(dev_t, u_long, caddr_t, int, struct proc *);
 
 #endif /* _KERNEL */
-#endif /* ! _AMD64_PCTR_H_ */
+#endif /* ! _MACHINE_PCTR_H_ */
diff --git a/sys/arch/amd64/include/pio.h b/sys/arch/amd64/include/pio.h
index e35d8da275e..ddf48d4c6f1 100644
--- a/sys/arch/amd64/include/pio.h
+++ b/sys/arch/amd64/include/pio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pio.h,v 1.2 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: pio.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: pio.h,v 1.2 2003/02/27 11:22:46 fvdl Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _X86_PIO_H_
-#define _X86_PIO_H_
+#ifndef _MACHINE_PIO_H_
+#define _MACHINE_PIO_H_
 
 /*
  * Functions to provide access to x86 programmed I/O instructions.
@@ -222,4 +222,4 @@ outsl(unsigned port, const void *addr, int cnt)
 			 "d" (port), "0" (addr), "1" (cnt));
 }
 
-#endif /* _X86_PIO_H_ */
+#endif /* _MACHINE_PIO_H_ */
diff --git a/sys/arch/amd64/include/pmap.h b/sys/arch/amd64/include/pmap.h
index 17be6cc7b0e..b559ff03244 100644
--- a/sys/arch/amd64/include/pmap.h
+++ b/sys/arch/amd64/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.37 2010/12/26 15:40:59 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.38 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: pmap.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $	*/
 
 /*
@@ -72,8 +72,8 @@
  * pmap.h: see pmap.c for the history of this pmap module.
  */
 
-#ifndef	_AMD64_PMAP_H_
-#define	_AMD64_PMAP_H_
+#ifndef	_MACHINE_PMAP_H_
+#define	_MACHINE_PMAP_H_
 
 #ifndef _LOCORE
 #include <machine/cpufunc.h>
@@ -570,4 +570,4 @@ kvtopte(vaddr_t va)
 #define __HAVE_PMAP_DIRECT
 
 #endif /* _KERNEL && !_LOCORE */
-#endif	/* _AMD64_PMAP_H_ */
+#endif	/* _MACHINE_PMAP_H_ */
diff --git a/sys/arch/amd64/include/proc.h b/sys/arch/amd64/include/proc.h
index 07679dfa575..b56cdb7e50f 100644
--- a/sys/arch/amd64/include/proc.h
+++ b/sys/arch/amd64/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.5 2011/03/18 03:10:47 guenther Exp $	*/
+/*	$OpenBSD: proc.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: proc.h,v 1.1 2003/04/26 18:39:46 fvdl Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	@(#)proc.h	7.1 (Berkeley) 5/15/91
  */
 
-#ifndef _AMD64_PROC_H
-#define _AMD64_PROC_H
+#ifndef _MACHINE_PROC_H_
+#define _MACHINE_PROC_H_
 
 #include <machine/frame.h>
 
@@ -50,4 +50,4 @@ struct mdproc {
 #define	MDP_USEDFPU	0x0001	/* has used the FPU */
 #define MDP_IRET	0x0002	/* return via iret, not sysret */
 
-#endif /* _AMD64_PROC_H */
+#endif /* _MACHINE_PROC_H_ */
diff --git a/sys/arch/amd64/include/psl.h b/sys/arch/amd64/include/psl.h
index 081c7152e53..c409bc18e97 100644
--- a/sys/arch/amd64/include/psl.h
+++ b/sys/arch/amd64/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.3 2007/02/11 20:29:20 miod Exp $	*/
+/*	$OpenBSD: psl.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: psl.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)psl.h	5.2 (Berkeley) 1/18/91
  */
 
-#ifndef _X86_PSL_H_
-#define _X86_PSL_H_
+#ifndef _MACHINE_PSL_H_
+#define _MACHINE_PSL_H_
 
 /*
  * 386 processor status longword.
@@ -77,4 +77,4 @@
 #include <machine/intr.h>
 #endif
 
-#endif /* !_X86_PSL_H_ */
+#endif /* !_MACHINE_PSL_H_ */
diff --git a/sys/arch/amd64/include/pte.h b/sys/arch/amd64/include/pte.h
index c8431fd1fb0..526a695b008 100644
--- a/sys/arch/amd64/include/pte.h
+++ b/sys/arch/amd64/include/pte.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pte.h,v 1.7 2010/05/08 16:54:07 oga Exp $	*/
+/*	$OpenBSD: pte.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: pte.h,v 1.1 2003/04/26 18:39:47 fvdl Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AMD64_PTE_H_
-#define _AMD64_PTE_H_
+#ifndef _MACHINE_PTE_H_
+#define _MACHINE_PTE_H_
 
 /*
  * amd64 MMU hardware structure:
@@ -144,4 +144,4 @@ typedef u_int64_t pt_entry_t;		/* PTE */
 #define PGEX_U		0x04	/* exception while in user mode (upl) */
 #define PGEX_I		0x10	/* instruction fetch blocked by NX */
 
-#endif /* _AMD64_PTE_H_ */
+#endif /* _MACHINE_PTE_H_ */
diff --git a/sys/arch/amd64/include/rbus_machdep.h b/sys/arch/amd64/include/rbus_machdep.h
index 57e99a8383f..7e5dc1e58f7 100644
--- a/sys/arch/amd64/include/rbus_machdep.h
+++ b/sys/arch/amd64/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.6 2010/01/13 09:10:33 jsg Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $	*/
 
 /*
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AMD64_RBUS_MACHDEP_H_
-#define _AMD64_RBUS_MACHDEP_H_
+#ifndef _MACHINE_RBUS_MACHDEP_H_
+#define _MACHINE_RBUS_MACHDEP_H_
 
 struct pci_attach_args;		/* XXX */
 
@@ -47,4 +47,4 @@ bus_addr_t	rbus_min_start_hint(void);
 void		pccbb_attach_hook(struct device *, struct device *,
 		    struct pci_attach_args *);
 
-#endif /* _AMD64_RBUS_MACHDEP_H_ */
+#endif /* _MACHINE_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/amd64/include/reg.h b/sys/arch/amd64/include/reg.h
index 1cd569d0d80..ee50e0bfdc9 100644
--- a/sys/arch/amd64/include/reg.h
+++ b/sys/arch/amd64/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.5 2009/12/25 20:54:48 miod Exp $	*/
+/*	$OpenBSD: reg.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: reg.h,v 1.1 2003/04/26 18:39:47 fvdl Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)reg.h	5.5 (Berkeley) 1/18/91
  */
 
-#ifndef _AMD64_REG_H_
-#define _AMD64_REG_H_
+#ifndef _MACHINE_REG_H_
+#define _MACHINE_REG_H_
 
 #include <machine/fpu.h>
 
@@ -124,4 +124,4 @@ struct fpreg {
 int check_context(const struct reg *, struct trapframe *);
 #endif
 
-#endif /* !_AMD64_REG_H_ */
+#endif /* !_MACHINE_REG_H_ */
diff --git a/sys/arch/amd64/include/reloc.h b/sys/arch/amd64/include/reloc.h
index 09df798135c..7eedfc94d2f 100644
--- a/sys/arch/amd64/include/reloc.h
+++ b/sys/arch/amd64/include/reloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reloc.h,v 1.2 2010/06/27 03:11:44 guenther Exp $ */
+/* $OpenBSD: reloc.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */
 
 /*
  * Copyright (c) 2002,2003 Dale Rahn
@@ -24,8 +24,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef  _MACH_RELOC_H 
-#define  _MACH_RELOC_H 
+#ifndef  _MACHINE_RELOC_H_
+#define  _MACHINE_RELOC_H_
 #define R_TYPE(X)       __CONCAT(R_X86_64_,X)
 
 #define R_X86_64_NONE		0
@@ -53,4 +53,4 @@
 #define R_X86_64_GOTTPOFF	22
 #define R_X86_64_TPOFF32	23
 
-#endif /* _MACH_RELOC_H */
+#endif /* _MACHINE_RELOC_H_ */
diff --git a/sys/arch/amd64/include/segments.h b/sys/arch/amd64/include/segments.h
index 1325f2cd0c6..56f23480738 100644
--- a/sys/arch/amd64/include/segments.h
+++ b/sys/arch/amd64/include/segments.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: segments.h,v 1.9 2010/11/20 20:11:17 miod Exp $	*/
+/*	$OpenBSD: segments.h,v 1.10 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: segments.h,v 1.1 2003/04/26 18:39:47 fvdl Exp $	*/
 
 /*-
@@ -47,8 +47,8 @@
  *	William F. Jolitz (william@ernie.berkeley.edu) 6/20/1989
  */
 
-#ifndef _AMD64_SEGMENTS_H_
-#define _AMD64_SEGMENTS_H_
+#ifndef _MACHINE_SEGMENTS_H_
+#define _MACHINE_SEGMENTS_H_
 
 /*
  * Selectors
@@ -279,4 +279,4 @@ void cpu_init_idt(void);
 #define VALID_USER_DSEL(s) \
     ((s) == GSEL(GUDATA_SEL, SEL_UPL))
 
-#endif /* _AMD64_SEGMENTS_H_ */
+#endif /* _MACHINE_SEGMENTS_H_ */
diff --git a/sys/arch/amd64/include/signal.h b/sys/arch/amd64/include/signal.h
index 30b3850f6a5..88dfc97cecf 100644
--- a/sys/arch/amd64/include/signal.h
+++ b/sys/arch/amd64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.5 2006/01/08 14:20:17 millert Exp $	*/
+/*	$OpenBSD: signal.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: signal.h,v 1.2 2003/04/28 23:16:17 bjh21 Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	@(#)signal.h	7.16 (Berkeley) 3/17/91
  */
 
-#ifndef _AMD64_SIGNAL_H_
-#define _AMD64_SIGNAL_H_
+#ifndef _MACHINE_SIGNAL_H_
+#define _MACHINE_SIGNAL_H_
 
 #include <sys/cdefs.h>
 
@@ -85,4 +85,4 @@ struct sigcontext {
 	int	sc_mask;
 };
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif	/* !_AMD64_SIGNAL_H_ */
+#endif	/* !_MACHINE_SIGNAL_H_ */
diff --git a/sys/arch/amd64/include/stdarg.h b/sys/arch/amd64/include/stdarg.h
index 9e97937198c..cfffc33e2a9 100644
--- a/sys/arch/amd64/include/stdarg.h
+++ b/sys/arch/amd64/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.7 2010/12/30 05:01:36 tedu Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.2 2003/04/28 23:16:17 bjh21 Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _AMD64_STDARG_H_
-#define	_AMD64_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define	_MACHINE_STDARG_H_
 
 #include <sys/cdefs.h>
 #include <machine/_types.h>		/* for __va_list */
@@ -60,4 +60,4 @@ typedef __va_list	va_list;
 
 #define	va_end(ap)	
 
-#endif /* !_AMD64_STDARG_H_ */
+#endif /* !_MACHINE_STDARG_H_ */
diff --git a/sys/arch/amd64/include/sysarch.h b/sys/arch/amd64/include/sysarch.h
index 69f5d9046ff..92e50db5848 100644
--- a/sys/arch/amd64/include/sysarch.h
+++ b/sys/arch/amd64/include/sysarch.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: sysarch.h,v 1.6 2011/03/18 03:10:47 guenther Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: sysarch.h,v 1.1 2003/04/26 18:39:48 fvdl Exp $	*/
 
-#ifndef _AMD64_SYSARCH_H_
-#define _AMD64_SYSARCH_H_
+#ifndef _MACHINE_SYSARCH_H_
+#define _MACHINE_SYSARCH_H_
 
 /*
  * Architecture specific syscalls (amd64)
@@ -73,4 +73,4 @@ int amd64_pmc_read(struct amd64_pmc_read_args *);
 int sysarch(int, void *);
 #endif
 
-#endif /* !_AMD64_SYSARCH_H_ */
+#endif /* !_MACHINE_SYSARCH_H_ */
diff --git a/sys/arch/amd64/include/tss.h b/sys/arch/amd64/include/tss.h
index f3ee6fdf705..d63d6bf062e 100644
--- a/sys/arch/amd64/include/tss.h
+++ b/sys/arch/amd64/include/tss.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tss.h,v 1.3 2010/11/20 20:11:17 miod Exp $	*/
+/*	$OpenBSD: tss.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: tss.h,v 1.1 2003/04/26 18:39:49 fvdl Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AMD64_TSS_H_
-#define _AMD64_TSS_H_
+#ifndef _MACHINE_TSS_H_
+#define _MACHINE_TSS_H_
 
 /*
  * TSS structure. Since TSS hw switching is not supported in long
@@ -59,4 +59,4 @@ struct x86_64_tss {
 	u_int16_t	tss_iobase;
 } __packed;
 
-#endif /* _AMD64_TSS_H_ */
+#endif /* _MACHINE_TSS_H_ */
diff --git a/sys/arch/amd64/include/vga_post.h b/sys/arch/amd64/include/vga_post.h
index 36a9a2d4680..00dab5c0a78 100644
--- a/sys/arch/amd64/include/vga_post.h
+++ b/sys/arch/amd64/include/vga_post.h
@@ -1,5 +1,5 @@
 /* $NetBSD: vga_post.h,v 1.2 2008/03/29 17:40:22 jmcneill Exp $ */
-/* $OpenBSD: vga_post.h,v 1.1 2009/06/06 00:35:00 pirofti Exp $ */
+/* $OpenBSD: vga_post.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $ */
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _X86_VGA_POST_H_
-#define _X86_VGA_POST_H_
+#ifndef _MACHINE_VGA_POST_H_
+#define _MACHINE_VGA_POST_H_
 
 #ifdef _KERNEL
 struct vga_post;
diff --git a/sys/arch/amd64/include/vmparam.h b/sys/arch/amd64/include/vmparam.h
index be67a9bf016..13cb27f9edd 100644
--- a/sys/arch/amd64/include/vmparam.h
+++ b/sys/arch/amd64/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.13 2010/12/15 05:30:19 tedu Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.14 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.1 2003/04/26 18:39:49 fvdl Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)vmparam.h	5.9 (Berkeley) 5/12/91
  */
 
-#ifndef _VMPARAM_H_
-#define _VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 /*
  * Machine dependent constants for amd64.
@@ -125,4 +125,4 @@ struct vm_page_md {
 	(pg)->mdpage.pv_list = NULL;	\
 } while (0)
 
-#endif /* _VMPARAM_H_ */
+#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/arm/include/asm.h b/sys/arch/arm/include/asm.h
index c7bd017aa70..9360d2fa9ec 100644
--- a/sys/arch/arm/include/asm.h
+++ b/sys/arch/arm/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: asm.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $	*/
 
 /*
@@ -35,8 +35,8 @@
  *	from: @(#)asm.h	5.5 (Berkeley) 5/7/91
  */
 
-#ifndef _ARM32_ASM_H_
-#define _ARM32_ASM_H_
+#ifndef _ARM_ASM_H_
+#define _ARM_ASM_H_
 
 #ifdef __ELF__
 # define _C_LABEL(x)	x
diff --git a/sys/arch/arm/include/atomic.h b/sys/arch/arm/include/atomic.h
index ebdc3ade1c6..5b2de71e43b 100644
--- a/sys/arch/arm/include/atomic.h
+++ b/sys/arch/arm/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.7 2010/04/22 21:03:17 drahn Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __ARM_ATOMIC_H__
-#define __ARM_ATOMIC_H__
+#ifndef _ARM_ATOMIC_H_
+#define _ARM_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -16,4 +16,4 @@ void atomic_setbits_int(__volatile unsigned int *, unsigned int);
 void atomic_clearbits_int(__volatile unsigned int *, unsigned int);
 
 #endif /* defined(_KERNEL) */
-#endif /* __ARM_ATOMIC_H__ */
+#endif /* _ARM_ATOMIC_H_ */
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index 187ff95fadb..6fdcdf83a87 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.13 2010/04/04 12:49:30 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.14 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.12 2003/10/23 15:03:24 scw Exp $	*/
 
 /*-
@@ -62,8 +62,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ARM32_BUS_H_
-#define _ARM32_BUS_H_
+#ifndef _ARM_BUS_H_
+#define _ARM_BUS_H_
 
 /*
  * Addresses (in bus space).
@@ -889,4 +889,4 @@ bus_space_write_raw_multi_4(bus_space_tag_t bst, bus_space_handle_t bsh,
     !!! bus_space_write_raw_region_8 unimplemented !!!
 #endif
 
-#endif /* _ARM32_BUS_H_ */
+#endif /* _ARM_BUS_H_ */
diff --git a/sys/arch/arm/include/cdefs.h b/sys/arch/arm/include/cdefs.h
index 324c07ef9c4..b903dd9d60c 100644
--- a/sys/arch/arm/include/cdefs.h
+++ b/sys/arch/arm/include/cdefs.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: cdefs.h,v 1.2 2005/11/24 20:46:44 deraadt Exp $	*/
+/*	$OpenBSD: cdefs.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
-#ifndef	_MACHINE_CDEFS_H_
-#define	_MACHINE_CDEFS_H_
+#ifndef	_ARM_CDEFS_H_
+#define	_ARM_CDEFS_H_
 
 #if defined(lint)
 #define __indr_reference(sym,alias)	__lint_equal__(sym,alias)
@@ -16,4 +16,4 @@
 	    " ; .ascii \"" msg "\" ; .text")
 #endif
 
-#endif /* !_MACHINE_CDEFS_H_ */
+#endif /* !_ARM_CDEFS_H_ */
diff --git a/sys/arch/arm/include/conf.h b/sys/arch/arm/include/conf.h
index 8ce86aa35a0..9fe2f2d3c52 100644
--- a/sys/arch/arm/include/conf.h
+++ b/sys/arch/arm/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.8 2010/11/28 20:48:46 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: conf.h,v 1.7 2002/04/19 01:04:39 wiz Exp $	*/
 
 /*
@@ -40,8 +40,8 @@
  * Prototypes for device driver functions
  */
 
-#ifndef _ARM_CONF_H
-#define	_ARM_CONF_H
+#ifndef _ARM_CONF_H_
+#define	_ARM_CONF_H_
  
 
 #include <sys/conf.h>
@@ -70,4 +70,4 @@ cdev_decl(pci);
 cdev_decl(apm);
 cdev_decl(spkr);
 
-#endif	/* _ARM_CONF_H_ */
+#endif	/* _ARM_CONF_H__ */
diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h
index f21266a8087..e3dd2d860b0 100644
--- a/sys/arch/arm/include/cpufunc.h
+++ b/sys/arch/arm/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.7 2010/04/22 21:01:45 drahn Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $	*/
 
 /*
@@ -40,8 +40,8 @@
  * Prototypes for cpu, mmu and tlb related functions.
  */
 
-#ifndef _ARM32_CPUFUNC_H_
-#define _ARM32_CPUFUNC_H_
+#ifndef _ARM_CPUFUNC_H_
+#define _ARM_CPUFUNC_H_
 
 #ifdef _KERNEL
 
@@ -602,6 +602,6 @@ extern int	arm_dcache_align;
 extern int	arm_dcache_align_mask;
 
 #endif	/* _KERNEL */
-#endif	/* _ARM32_CPUFUNC_H_ */
+#endif	/* _ARM_CPUFUNC_H_ */
 
 /* End of cpufunc.h */
diff --git a/sys/arch/arm/include/endian.h b/sys/arch/arm/include/endian.h
index 1e834f9e0df..b5221b6cb5f 100644
--- a/sys/arch/arm/include/endian.h
+++ b/sys/arch/arm/include/endian.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: endian.h,v 1.4 2011/03/11 15:17:08 pirofti Exp $	*/
+/*	$OpenBSD: endian.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
+#ifndef _ARM_ENDIAN_H_
+#define _ARM_ENDIAN_H_
 
 #ifdef __ARMEB__
 #define _BYTE_ORDER _BIG_ENDIAN
@@ -11,4 +11,4 @@
 #define	__STRICT_ALIGNMENT
 #include <sys/endian.h>
 
-#endif /* _MACHINE_ENDIAN_H_ */
+#endif /* _ARM_ENDIAN_H_ */
diff --git a/sys/arch/arm/include/float.h b/sys/arch/arm/include/float.h
index 46d7792966e..a97befef15e 100644
--- a/sys/arch/arm/include/float.h
+++ b/sys/arch/arm/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.3 2008/07/21 20:50:54 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
 
 /*
@@ -45,8 +45,8 @@
  *	@(#)float.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _ARM32_FLOAT_H_
-#define _ARM32_FLOAT_H_
+#ifndef _ARM_FLOAT_H_
+#define _ARM_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -88,4 +88,4 @@ __END_DECLS
 #define LDBL_MAX	DBL_MAX
 #define LDBL_MAX_10_EXP	DBL_MAX_10_EXP
 
-#endif	/* _ARM32_FLOAT_H_ */
+#endif	/* _ARM_FLOAT_H_ */
diff --git a/sys/arch/arm/include/ieeefp.h b/sys/arch/arm/include/ieeefp.h
index 6aaf2b950e1..d4d57c8114f 100644
--- a/sys/arch/arm/include/ieeefp.h
+++ b/sys/arch/arm/include/ieeefp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieeefp.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: ieeefp.h,v 1.1 2001/01/10 19:02:06 bjh21 Exp $	*/
 
 /* 
@@ -6,8 +6,8 @@
  * Public domain.
  */
 
-#ifndef _ARM32_IEEEFP_H_
-#define _ARM32_IEEEFP_H_
+#ifndef _ARM_IEEEFP_H_
+#define _ARM_IEEEFP_H_
 
 /* FP exception codes */
 
@@ -38,4 +38,4 @@ typedef enum {
     FP_RZ=3			/* round to zero (truncate) */
 } fp_rnd;
 
-#endif /* _ARM32_IEEEFP_H_ */
+#endif /* _ARM_IEEEFP_H_ */
diff --git a/sys/arch/arm/include/isa_machdep.h b/sys/arch/arm/include/isa_machdep.h
index 92249a0df36..21b2c0588c8 100644
--- a/sys/arch/arm/include/isa_machdep.h
+++ b/sys/arch/arm/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.6 2010/11/22 21:07:40 miod Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.3 2002/01/07 22:58:07 chris Exp $	*/
 
 /*-
@@ -31,8 +31,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ARM32_ISA_MACHDEP_H_
-#define _ARM32_ISA_MACHDEP_H_
+#ifndef _ARM_ISA_MACHDEP_H_
+#define _ARM_ISA_MACHDEP_H_
 
 #include <machine/bus.h>
 #include <dev/isa/isadmavar.h>
@@ -173,4 +173,4 @@ void	isa_intr_init(void);
  */
 void isa_fillw(u_int val, void *addr, size_t len);
 
-#endif	/* _ARM32_ISA_MACHDEP_H_ XXX */
+#endif	/* _ARM_ISA_MACHDEP_H_ XXX */
diff --git a/sys/arch/arm/include/limits.h b/sys/arch/arm/include/limits.h
index d6cfb8b94de..75084da58ca 100644
--- a/sys/arch/arm/include/limits.h
+++ b/sys/arch/arm/include/limits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.4 2009/11/27 19:54:35 guenther Exp $	*/
+/*	$OpenBSD: limits.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: limits.h,v 1.4 2003/04/28 23:16:18 bjh21 Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	from: @(#)limits.h	7.2 (Berkeley) 6/28/90
  */
 
-#ifndef	_ARM32_LIMITS_H_
-#define	_ARM32_LIMITS_H_
+#ifndef	_ARM_LIMITS_H_
+#define	_ARM_LIMITS_H_
 
 #include <sys/cdefs.h>
 
@@ -53,4 +53,4 @@
 
 #endif /* __BSD_VISIBLE */
 
-#endif	/* _ARM32_LIMITS_H_ */
+#endif	/* _ARM_LIMITS_H_ */
diff --git a/sys/arch/arm/include/machdep.h b/sys/arch/arm/include/machdep.h
index dead7bd4433..2b03ed76562 100644
--- a/sys/arch/arm/include/machdep.h
+++ b/sys/arch/arm/include/machdep.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: machdep.h,v 1.2 2004/05/19 03:17:07 drahn Exp $	*/
+/*	$OpenBSD: machdep.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /* $NetBSD: machdep.h,v 1.7 2002/02/21 02:52:21 thorpej Exp $ */
 
-#ifndef _ARM32_BOOT_MACHDEP_H_
-#define _ARM32_BOOT_MACHDEP_H_
+#ifndef _ARM_MACHDEP_H_
+#define _ARM_MACHDEP_H_
 
 /* misc prototypes used by the many arm machdeps */
 void halt (void);
diff --git a/sys/arch/arm/include/mutex.h b/sys/arch/arm/include/mutex.h
index 87e0f873060..9dcea763704 100644
--- a/sys/arch/arm/include/mutex.h
+++ b/sys/arch/arm/include/mutex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mutex.h,v 1.1 2007/12/05 16:08:04 deraadt Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef _MACHINE_MUTEX_H_
-#define _MACHINE_MUTEX_H_
+#ifndef _ARM_MUTEX_H_
+#define _ARM_MUTEX_H_
 
 /*
  * Simple non-mp implementation.
diff --git a/sys/arch/arm/include/pio.h b/sys/arch/arm/include/pio.h
index 280c3c2d4c5..e7828aef407 100644
--- a/sys/arch/arm/include/pio.h
+++ b/sys/arch/arm/include/pio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pio.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: pio.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: pio.h,v 1.1 2001/02/23 21:23:48 reinoud Exp $	*/
 
 /*
@@ -34,8 +34,8 @@
  *    even if advised of the possibility of such damage.
  */
 
-#ifndef _ARM32_PIO_H_
-#define _ARM32_PIO_H_
+#ifndef _ARM_PIO_H_
+#define _ARM_PIO_H_
 
 #include <machine/bus.h>
 
@@ -44,4 +44,4 @@ extern struct bus_space isa_io_bs_tag;
 #define	inb(port)	 bus_space_read_1( &isa_io_bs_tag, (bus_space_handle_t)isa_io_bs_tag.bs_cookie, (port))
 #define	outb(port, byte) bus_space_write_1(&isa_io_bs_tag, (bus_space_handle_t)isa_io_bs_tag.bs_cookie, (port), (byte))
 
-#endif /* _ARM32_PIO_H_ */
+#endif /* _ARM_PIO_H_ */
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index 51c2a23816f..a1be2bd7280 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.16 2011/01/04 21:11:41 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.17 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $	*/
 
 /*
@@ -66,8 +66,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_PMAP_H_
-#define	_ARM32_PMAP_H_
+#ifndef	_ARM_PMAP_H_
+#define	_ARM_PMAP_H_
 
 #ifdef _KERNEL
 
@@ -624,4 +624,4 @@ extern uint32_t pmap_alias_bits;
 
 #endif /* _KERNEL */
 
-#endif	/* _ARM32_PMAP_H_ */
+#endif	/* _ARM_PMAP_H_ */
diff --git a/sys/arch/arm/include/proc.h b/sys/arch/arm/include/proc.h
index 539c30c05fb..826968c4bd7 100644
--- a/sys/arch/arm/include/proc.h
+++ b/sys/arch/arm/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.2 2005/09/15 21:16:35 miod Exp $	*/
+/*	$OpenBSD: proc.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: proc.h,v 1.5 2003/03/01 04:36:39 thorpej Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_PROC_H_
-#define	_ARM32_PROC_H_
+#ifndef	_ARM_PROC_H_
+#define	_ARM_PROC_H_
 
 /*
  * Machine-dependent part of the proc structure for arm.
@@ -47,4 +47,4 @@ struct mdproc {
 	void	*pmc_state;		/* port-specific pmc state */
 };
 
-#endif /* _ARM32_PROC_H_ */
+#endif /* _ARM_PROC_H_ */
diff --git a/sys/arch/arm/include/reg.h b/sys/arch/arm/include/reg.h
index 28c1b43b26e..237c789ef6b 100644
--- a/sys/arch/arm/include/reg.h
+++ b/sys/arch/arm/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: reg.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: reg.h,v 1.1 2001/02/11 14:51:55 bjh21 Exp $	*/
 
 /*
@@ -34,8 +34,8 @@
  *	@(#)reg.h	5.5 (Berkeley) 1/18/91
  */
 
-#ifndef _ARM32_REG_H_
-#define _ARM32_REG_H_
+#ifndef _ARM_REG_H_
+#define _ARM_REG_H_
 
 #include <machine/fp.h>
 
@@ -52,4 +52,4 @@ struct fpreg {
 	fp_reg_t fpr[8];
 };
 
-#endif /* !_ARM32_REG_H_ */
+#endif /* !_ARM_REG_H_ */
diff --git a/sys/arch/arm/include/signal.h b/sys/arch/arm/include/signal.h
index 6bac6aca5e2..5db3568611b 100644
--- a/sys/arch/arm/include/signal.h
+++ b/sys/arch/arm/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.5 2006/05/26 20:31:25 miod Exp $	*/
+/*	$OpenBSD: signal.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: signal.h,v 1.5 2003/10/18 17:57:21 briggs Exp $	*/
 
 /*
@@ -44,8 +44,8 @@
  * Created      : 30/09/94
  */
 
-#ifndef _ARM32_SIGNAL_H_
-#define _ARM32_SIGNAL_H_
+#ifndef _ARM_SIGNAL_H_
+#define _ARM_SIGNAL_H_
 
 #ifndef _LOCORE
 #include <sys/cdefs.h>
@@ -90,4 +90,4 @@ struct sigcontext {
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
 #endif /* !_LOCORE */
 
-#endif	/* !_ARM32_SIGNAL_H_ */
+#endif	/* !_ARM_SIGNAL_H_ */
diff --git a/sys/arch/arm/include/stdarg.h b/sys/arch/arm/include/stdarg.h
index 6161c58b8ce..0bcb8df025c 100644
--- a/sys/arch/arm/include/stdarg.h
+++ b/sys/arch/arm/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.8 2011/03/02 18:31:58 matthew Exp $ */
+/*	$OpenBSD: stdarg.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $ */
 /*	$NetBSD: stdarg.h,v 1.7 2003/08/07 16:26:53 agc Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	from: @(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _ARM32_STDARG_H_
-#define	_ARM32_STDARG_H_
+#ifndef _ARM_STDARG_H_
+#define	_ARM_STDARG_H_
 
 #include <sys/cdefs.h>
 #include <machine/_types.h>
@@ -53,4 +53,4 @@ typedef __va_list	va_list;
 #define	va_end(ap)		__builtin_va_end((ap))
 #define	__va_copy(dest, src)	__builtin_va_copy((dest), (src))
 
-#endif /* !_ARM32_STDARG_H_ */
+#endif /* !_ARM_STDARG_H_ */
diff --git a/sys/arch/arm/include/vmparam.h b/sys/arch/arm/include/vmparam.h
index e32e14743cf..29e2c9ed2f9 100644
--- a/sys/arch/arm/include/vmparam.h
+++ b/sys/arch/arm/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.7 2010/12/15 05:30:19 tedu Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.18 2003/05/21 18:04:44 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ARM_ARM_VMPARAM_H_
-#define	_ARM_ARM_VMPARAM_H_
+#ifndef _ARM_VMPARAM_H_
+#define	_ARM_VMPARAM_H_
 
 #ifdef _KERNEL
 
@@ -134,4 +134,4 @@ do {									\
 
 #endif /* _KERNEL */
 
-#endif /* _ARM_ARM_VMPARAM_H_ */
+#endif /* _ARM_VMPARAM_H_ */
diff --git a/sys/arch/armish/include/_types.h b/sys/arch/armish/include/_types.h
index e23642dacd2..0f071a85499 100644
--- a/sys/arch/armish/include/_types.h
+++ b/sys/arch/armish/include/_types.h
@@ -1,12 +1,12 @@
-/* 	$OpenBSD: _types.h,v 1.5 2009/11/04 19:14:09 kettenis Exp $	*/
+/* 	$OpenBSD: _types.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: types.h,v 1.4 2002/02/28 03:17:26 simonb Exp $	*/
 
-#ifndef _ARMISH__TYPES_H_
-#define	_ARMISH__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define	_MACHINE__TYPES_H_
 
 #include <arm/_types.h>
 
 /* Feature test macros */
 #define __HAVE_TIMECOUNTER
 
-#endif /* _ARMISH__TYPES_H_ */
+#endif /* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/armish/include/armish_intr.h b/sys/arch/armish/include/armish_intr.h
index 05b3d430bae..78f8b1a6931 100644
--- a/sys/arch/armish/include/armish_intr.h
+++ b/sys/arch/armish/include/armish_intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: armish_intr.h,v 1.6 2009/08/23 07:53:57 krw Exp $ */
+/*	$OpenBSD: armish_intr.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $ */
 /*	$NetBSD: i80321_intr.h,v 1.4 2003/07/05 06:53:08 dogcow Exp $ */
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I80321_INTR_H_
-#define _I80321_INTR_H_
+#ifndef _MACHINE_ARMISH_INTR_H_
+#define _MACHINE_ARMISH_INTR_H_
 
 #define	ARM_IRQ_HANDLER	_C_LABEL(i80321_irq_handler)
 
@@ -116,5 +116,5 @@ void i80321_splassert_check(int, const char *);
 
 #endif /* ! _LOCORE */
 
-#endif /* _I80321_INTR_H_ */
+#endif /* _MACHINE_ARMISH_INTR_H_ */
 
diff --git a/sys/arch/armish/include/atomic.h b/sys/arch/armish/include/atomic.h
index d8fc16eb2d7..f4c6309bcf4 100644
--- a/sys/arch/armish/include/atomic.h
+++ b/sys/arch/armish/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.4 2007/02/19 17:18:42 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __ARMISH_ATOMIC_H__
-#define __ARMISH_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <arm/atomic.h>
 
-#endif /* __ARMISH_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/armish/include/conf.h b/sys/arch/armish/include/conf.h
index 95364118ff8..3eb8e907a1f 100644
--- a/sys/arch/armish/include/conf.h
+++ b/sys/arch/armish/include/conf.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: conf.h,v 1.2 2010/11/28 20:49:45 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $	*/
 
-#ifndef _ARMISH_CONF_H
-#define	_ARMISH_CONF_H
+#ifndef _MACHINE_CONF_H_
+#define	_MACHINE_CONF_H_
 
 #include <sys/conf.h>
 
@@ -14,4 +14,4 @@
 
 #include <arm/conf.h>
 
-#endif	/* _ARMISH_CONF_H */
+#endif	/* _MACHINE_CONF_H_ */
diff --git a/sys/arch/armish/include/intr.h b/sys/arch/armish/include/intr.h
index 21ea4659704..c892c264473 100644
--- a/sys/arch/armish/include/intr.h
+++ b/sys/arch/armish/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.6 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_ARMISH_INTR_H_
-#define	_ARMISH_INTR_H_
+#ifndef	_MACHINE_INTR_H_
+#define	_MACHINE_INTR_H_
 
 #ifdef _KERNEL
 
@@ -100,5 +100,5 @@
 
 #endif /* _KERNEL */
 
-#endif	/* _ARMISH_INTR_H_ */
+#endif	/* _MACHINE_INTR_H_ */
 
diff --git a/sys/arch/armish/include/param.h b/sys/arch/armish/include/param.h
index cad71c3f3ad..fb03842b2df 100644
--- a/sys/arch/armish/include/param.h
+++ b/sys/arch/armish/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.1 2006/05/29 17:13:19 drahn Exp $	*/
+/*	$OpenBSD: param.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.4 2002/02/12 06:58:19 thorpej Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARMISH_PARAM_H_
-#define	_ARMISH_PARAM_H_
+#ifndef	_MACHINE_PARAM_H_
+#define	_MACHINE_PARAM_H_
 
 /*
  * 1 page should be enough
@@ -48,4 +48,4 @@
 #define	_MACHINE	armish
 #define	MACHINE		"armish"
 
-#endif	/* _ARMISH_PARAM_H_ */
+#endif	/* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/armish/include/spinlock.h b/sys/arch/armish/include/spinlock.h
index f9b55586ad6..7a07c2fe6dd 100644
--- a/sys/arch/armish/include/spinlock.h
+++ b/sys/arch/armish/include/spinlock.h
@@ -1,7 +1,7 @@
 
-/*	$OpenBSD: spinlock.h,v 1.1 2006/05/29 17:13:19 drahn Exp $	*/
-#ifndef _ARMISH_SPINLOCK_H_
-#define _ARMISH_SPINLOCK_H_
+/*	$OpenBSD: spinlock.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
+#ifndef _MACHINE_SPINLOCK_H_
+#define _MACHINE_SPINLOCK_H_
 #include <arm/spinlock.h>
-#endif /* _ARMISH_SPINLOCK_H_ */
+#endif /* _MACHINE_SPINLOCK_H_ */
 
diff --git a/sys/arch/armish/include/vmparam.h b/sys/arch/armish/include/vmparam.h
index 2a437eb79ef..beea6057023 100644
--- a/sys/arch/armish/include/vmparam.h
+++ b/sys/arch/armish/include/vmparam.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: vmparam.h,v 1.5 2010/12/15 05:30:19 tedu Exp $	*/
+/* 	$OpenBSD: vmparam.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.23 2003/05/22 05:47:07 thorpej Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARMISH_VMPARAM_H_
-#define	_ARMISH_VMPARAM_H_
+#ifndef	_MACHINE_VMPARAM_H_
+#define	_MACHINE_VMPARAM_H_
 
 #define	ARM_KERNEL_BASE		0xc0000000
 
@@ -97,4 +97,4 @@
 #define	VM_FREELIST_DEFAULT	0
 
 
-#endif	/* _ARMISH_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/aviion/include/atomic.h b/sys/arch/aviion/include/atomic.h
index 62b7808fefb..860cfdf9638 100644
--- a/sys/arch/aviion/include/atomic.h
+++ b/sys/arch/aviion/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:42 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __AVIION_ATOMIC_H__
-#define __AVIION_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <m88k/atomic.h>
 
-#endif /* __AVIION_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/aviion/include/autoconf.h b/sys/arch/aviion/include/autoconf.h
index 5a8d44b6e34..8e5f8c86086 100644
--- a/sys/arch/aviion/include/autoconf.h
+++ b/sys/arch/aviion/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.1 2006/05/09 18:19:19 miod Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $ */
 /*
  * Copyright (c) 1999, Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -34,8 +34,8 @@
  * Autoconfiguration information.
  */
 
-#ifndef _AVIION_AUTOCONF_H_
-#define _AVIION_AUTOCONF_H_
+#ifndef _MACHINE_AUTOCONF_H_
+#define _MACHINE_AUTOCONF_H_
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/aviion/include/av400.h b/sys/arch/aviion/include/av400.h
index 919cb1a51fc..f3ff49e3769 100644
--- a/sys/arch/aviion/include/av400.h
+++ b/sys/arch/aviion/include/av400.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: av400.h,v 1.7 2010/04/21 19:33:47 miod Exp $	*/
+/*	$OpenBSD: av400.h,v 1.8 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -43,8 +43,8 @@
  *
  */
 
-#ifndef	__MACHINE_AV400_H__
-#define	__MACHINE_AV400_H__
+#ifndef	_MACHINE_AV400_H_
+#define	_MACHINE_AV400_H_
 
 #define	AV400_PROM		0xffc00000
 #define	AV400_PROM_SIZE		0x00200000
@@ -139,4 +139,4 @@
 #define AV400_CMMU_D3	0xfff06000
 #define AV400_CMMU_I3	0xfff07000
 
-#endif	/* __MACHINE_AV400_H__ */
+#endif	/* _MACHINE_AV400_H_ */
diff --git a/sys/arch/aviion/include/av530.h b/sys/arch/aviion/include/av530.h
index 62f4b907b8e..a601d1bea33 100644
--- a/sys/arch/aviion/include/av530.h
+++ b/sys/arch/aviion/include/av530.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: av530.h,v 1.3 2010/04/24 18:46:55 miod Exp $	*/
+/*	$OpenBSD: av530.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (c) 2006, 2010 Miodrag Vallat
  *
@@ -24,8 +24,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	__MACHINE_AV530_H__
-#define	__MACHINE_AV530_H__
+#ifndef	_MACHINE_AV530_H_
+#define	_MACHINE_AV530_H_
 
 #define	AV530_PROM		0xffc00000
 #define	AV530_PROM_SIZE		0x00080000
@@ -242,4 +242,4 @@
 #define AV530_CMMU6_I6	0xfff0e000
 #define AV530_CMMU6_I7	0xfff0f000
 
-#endif	/* __MACHINE_AV530_H__ */
+#endif	/* _MACHINE_AV530_H_ */
diff --git a/sys/arch/aviion/include/avcommon.h b/sys/arch/aviion/include/avcommon.h
index d2f31566634..c5f05347f85 100644
--- a/sys/arch/aviion/include/avcommon.h
+++ b/sys/arch/aviion/include/avcommon.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: avcommon.h,v 1.5 2010/04/21 19:33:47 miod Exp $	*/
+/*	$OpenBSD: avcommon.h,v 1.6 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -43,8 +43,8 @@
  *
  */
 
-#ifndef	__MACHINE_AVCOMMON_H__
-#define	__MACHINE_AVCOMMON_H__
+#ifndef	_MACHINE_AVCOMMON_H_
+#define	_MACHINE_AVCOMMON_H_
 
 /*
  * Common declarations for hardware level device registers and such,
@@ -140,4 +140,4 @@ extern u_int32_t ext_int_mask_val[NIPLS];
 
 #endif
 
-#endif	/* __MACHINE_AVCOMMON_H__ */
+#endif	/* _MACHINE_AVCOMMON_H_ */
diff --git a/sys/arch/aviion/include/bus.h b/sys/arch/aviion/include/bus.h
index a81fd5bd92b..87439d7b0d7 100644
--- a/sys/arch/aviion/include/bus.h
+++ b/sys/arch/aviion/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.3 2010/04/20 22:53:24 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB Sweden.  All rights reserved.
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AVIION_BUS_H_
-#define _AVIION_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 #include <machine/asm_macro.h>
 
@@ -362,4 +362,4 @@ void	bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
 paddr_t bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, off_t off, int prot, int flags);
 
-#endif	/* _AVIION_BUS_H_ */
+#endif	/* _MACHINE_BUS_H_ */
diff --git a/sys/arch/aviion/include/cpu.h b/sys/arch/aviion/include/cpu.h
index fc813dc299e..137c0ef0ce2 100644
--- a/sys/arch/aviion/include/cpu.h
+++ b/sys/arch/aviion/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.3 2007/12/19 22:05:06 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -37,8 +37,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef	_AVIION_CPU_H_
-#define	_AVIION_CPU_H_
+#ifndef	_MACHINE_CPU_H_
+#define	_MACHINE_CPU_H_
 
 #include <m88k/cpu.h>
 
diff --git a/sys/arch/aviion/include/disklabel.h b/sys/arch/aviion/include/disklabel.h
index d4762b0b943..611bfe9b85e 100644
--- a/sys/arch/aviion/include/disklabel.h
+++ b/sys/arch/aviion/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.10 2010/04/24 20:14:03 miod Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.11 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef	_AVIION_DISKLABEL_H_
-#define	_AVIION_DISKLABEL_H_
+#ifndef	_MACHINE_DISKLABEL_H_
+#define	_MACHINE_DISKLABEL_H_
 
 #define	LABELSECTOR	1		/* sector containing label */
 #define	LABELOFFSET	0		/* offset of label in sector */
@@ -171,4 +171,4 @@ struct vdit_vdmremap_instance {
 	struct vdit_instance_id		remap_area;
 } __packed;
 
-#endif	/* _AVIION_DISKLABEL_H_ */
+#endif	/* _MACHINE_DISKLABEL_H_ */
diff --git a/sys/arch/aviion/include/intr.h b/sys/arch/aviion/include/intr.h
index 0483a817b4d..fc07673ea26 100644
--- a/sys/arch/aviion/include/intr.h
+++ b/sys/arch/aviion/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.3 2009/03/15 20:39:53 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _AVIION_INTR_H_
-#define _AVIION_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 /*
  * IPL levels.
@@ -53,4 +53,4 @@
 
 #include <m88k/intr.h>
 
-#endif /* _AVIION_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/aviion/include/m8820x.h b/sys/arch/aviion/include/m8820x.h
index a8b019164d1..83d69a8a1b9 100644
--- a/sys/arch/aviion/include/m8820x.h
+++ b/sys/arch/aviion/include/m8820x.h
@@ -1,6 +1,6 @@
-#ifndef	_AVIION_M8820X_H_
-#define	_AVIION_M8820X_H_
-/*	$OpenBSD: m8820x.h,v 1.2 2006/05/20 11:58:35 miod Exp $ */
+#ifndef	_MACHINE_M8820X_H_
+#define	_MACHINE_M8820X_H_
+/*	$OpenBSD: m8820x.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -60,4 +60,4 @@
 
 #include <m88k/m8820x.h>
 
-#endif	/* _AVIION_M8820X_H_ */
+#endif	/* _MACHINE_M8820X_H_ */
diff --git a/sys/arch/aviion/include/prom.h b/sys/arch/aviion/include/prom.h
index f3280b146c2..d6a0f254933 100644
--- a/sys/arch/aviion/include/prom.h
+++ b/sys/arch/aviion/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.4 2010/12/23 20:05:08 miod Exp $	*/
+/*	$OpenBSD: prom.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 /*
  * Copyright (c) 2006, Miodrag Vallat.
  *
@@ -24,8 +24,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __AVIION_PROM_H__
-#define __AVIION_PROM_H__
+#ifndef _MACHINE_PROM_H_
+#define _MACHINE_PROM_H_
 
 #include <sys/cdefs.h>
 
@@ -82,4 +82,4 @@ void	scm_putcrlf(void);
 __dead void scm_reboot(const char *);
 u_int	scm_sysid(void);
 
-#endif /* __AVIION_PROM_H__ */
+#endif /* _MACHINE_PROM_H_ */
diff --git a/sys/arch/beagle/include/_types.h b/sys/arch/beagle/include/_types.h
index b3b7ac18212..d2455188651 100644
--- a/sys/arch/beagle/include/_types.h
+++ b/sys/arch/beagle/include/_types.h
@@ -1,12 +1,12 @@
-/* 	$OpenBSD: _types.h,v 1.2 2009/11/04 19:14:09 kettenis Exp $	*/
+/* 	$OpenBSD: _types.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: types.h,v 1.4 2002/02/28 03:17:26 simonb Exp $	*/
 
-#ifndef _BEAGLE__TYPES_H_
-#define	_BEAGLE__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define	_MACHINE__TYPES_H_
 
 #include <arm/_types.h>
 
 /* Feature test macros */
 #define __HAVE_TIMECOUNTER
 
-#endif /* _BEAGLE__TYPES_H_ */
+#endif /* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/beagle/include/atomic.h b/sys/arch/beagle/include/atomic.h
index ecff4e22093..c50298299da 100644
--- a/sys/arch/beagle/include/atomic.h
+++ b/sys/arch/beagle/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.1 2009/05/08 03:13:26 drahn Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __ARMISH_ATOMIC_H__
-#define __ARMISH_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <arm/atomic.h>
 
-#endif /* __ARMISH_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/beagle/include/conf.h b/sys/arch/beagle/include/conf.h
index b057f5984c6..e5b6957e60b 100644
--- a/sys/arch/beagle/include/conf.h
+++ b/sys/arch/beagle/include/conf.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: conf.h,v 1.2 2010/11/28 20:49:47 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $	*/
 
-#ifndef _BEAGLEBOARD_CONF_H
-#define	_BEAGLEBOARD_CONF_H
+#ifndef _MACHINE_CONF_H_
+#define	_MACHINE_CONF_H_
 
 #include <sys/conf.h>
 
@@ -14,4 +14,4 @@
 
 #include <arm/conf.h>
 
-#endif	/* _BEAGLEBOARD_CONF_H */
+#endif	/* _MACHINE_CONF_H_ */
diff --git a/sys/arch/beagle/include/intr.h b/sys/arch/beagle/include/intr.h
index 355fe332f1e..80a43d88a7a 100644
--- a/sys/arch/beagle/include/intr.h
+++ b/sys/arch/beagle/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.2 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_BEAGLEBOARD_INTR_H_
-#define	_BEAGLEBOARD_INTR_H_
+#ifndef	_MACHINE_INTR_H_
+#define	_MACHINE_INTR_H_
 
 #ifdef _KERNEL
 
@@ -100,5 +100,5 @@
 
 #endif /* _KERNEL */
 
-#endif	/* _BEAGLEBOARD_INTR_H_ */
+#endif	/* _MACHINE_INTR_H_ */
 
diff --git a/sys/arch/beagle/include/isa_machdep.h b/sys/arch/beagle/include/isa_machdep.h
index 15aa3b0ac82..38b9b56e7ad 100644
--- a/sys/arch/beagle/include/isa_machdep.h
+++ b/sys/arch/beagle/include/isa_machdep.h
@@ -1,8 +1,8 @@
-/* 	$OpenBSD: isa_machdep.h,v 1.1 2009/05/08 03:13:26 drahn Exp $	*/
+/* 	$OpenBSD: isa_machdep.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /* $NetBSD: isa_machdep.h,v 1.4 2002/01/07 22:58:08 chris Exp $ */
 
-#ifndef _MPHONE_ISA_MACHDEP_H_
-#define _MPHONE_ISA_MACHDEP_H_
+#ifndef _MACHINE_ISA_MACHDEP_H_
+#define _MACHINE_ISA_MACHDEP_H_
 #include <arm/isa_machdep.h>
 
 #ifdef _KERNEL
@@ -10,4 +10,4 @@
 void	isa_footbridge_init(u_int, u_int);
 #endif /* _KERNEL */
 
-#endif /* _MPHONE_ISA_MACHDEP_H_ */
+#endif /* _MACHINE_ISA_MACHDEP_H_ */
diff --git a/sys/arch/beagle/include/param.h b/sys/arch/beagle/include/param.h
index 66ef8cf4d6f..0f2622246c7 100644
--- a/sys/arch/beagle/include/param.h
+++ b/sys/arch/beagle/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.2 2010/02/07 18:49:42 drahn Exp $	*/
+/*	$OpenBSD: param.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.4 2002/02/12 06:58:19 thorpej Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_MPHONE_PARAM_H_
-#define	_MPHONE_PARAM_H_
+#ifndef	_MACHINE_PARAM_H_
+#define	_MACHINE_PARAM_H_
 
 /*
  * 1 page should be enough
@@ -48,4 +48,4 @@
 #define	_MACHINE	beagle
 #define	MACHINE		"beagle"
 
-#endif	/* _MPHONE_PARAM_H_ */
+#endif	/* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/beagle/include/spinlock.h b/sys/arch/beagle/include/spinlock.h
index e9adb3fd2f3..bfe40238d85 100644
--- a/sys/arch/beagle/include/spinlock.h
+++ b/sys/arch/beagle/include/spinlock.h
@@ -1,6 +1,6 @@
 
-/*	$OpenBSD: spinlock.h,v 1.1 2009/05/08 03:13:27 drahn Exp $	*/
-#ifndef _MPHONE_SPINLOCK_H_
-#define _MPHONE_SPINLOCK_H_
+/*	$OpenBSD: spinlock.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
+#ifndef _MACHINE_SPINLOCK_H_
+#define _MACHINE_SPINLOCK_H_
 #include <arm/spinlock.h>
-#endif /* _MPHONE_SPINLOCK_H_ */
+#endif /* _MACHINE_SPINLOCK_H_ */
diff --git a/sys/arch/beagle/include/vmparam.h b/sys/arch/beagle/include/vmparam.h
index 176a8c782b1..5b363d19a41 100644
--- a/sys/arch/beagle/include/vmparam.h
+++ b/sys/arch/beagle/include/vmparam.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: vmparam.h,v 1.2 2010/12/15 05:30:19 tedu Exp $	*/
+/* 	$OpenBSD: vmparam.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.23 2003/05/22 05:47:07 thorpej Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARMISH_VMPARAM_H_
-#define	_ARMISH_VMPARAM_H_
+#ifndef	_MACHINE_VMPARAM_H_
+#define	_MACHINE_VMPARAM_H_
 
 #define	ARM_KERNEL_BASE		0xc0000000
 
@@ -97,4 +97,4 @@
 #define	VM_FREELIST_DEFAULT	0
 
 
-#endif	/* _ARMISH_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/gumstix/include/_types.h b/sys/arch/gumstix/include/_types.h
index ec5a2eabd28..77d95f7e006 100644
--- a/sys/arch/gumstix/include/_types.h
+++ b/sys/arch/gumstix/include/_types.h
@@ -1,7 +1,7 @@
-/* 	$OpenBSD: _types.h,v 1.3 2009/11/04 19:14:09 kettenis Exp $	*/
+/* 	$OpenBSD: _types.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 
-#ifndef _GUMSTIX__TYPES_H_
-#define	_GUMSTIX__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define	_MACHINE__TYPES_H_
 
 #include <arm/_types.h>
 
diff --git a/sys/arch/gumstix/include/atomic.h b/sys/arch/gumstix/include/atomic.h
index d35442ec52b..4f75a01c2de 100644
--- a/sys/arch/gumstix/include/atomic.h
+++ b/sys/arch/gumstix/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2008/11/27 20:51:48 miod Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __GUMSTIX_ATOMIC_H__
-#define __GUMSTIX_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <arm/atomic.h>
 
-#endif /* __GUMSTIX_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/gumstix/include/conf.h b/sys/arch/gumstix/include/conf.h
index a5743a98909..f934d5629d8 100644
--- a/sys/arch/gumstix/include/conf.h
+++ b/sys/arch/gumstix/include/conf.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: conf.h,v 1.3 2010/11/28 20:49:47 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $	*/
 
-#ifndef _GUMSTIX_CONF_H
-#define	_GUMSTIX_CONF_H
+#ifndef _MACHINE_CONF_H_
+#define	_MACHINE_CONF_H_
 
 #include <sys/conf.h>
 
@@ -14,4 +14,4 @@
 
 #include <arm/conf.h>
 
-#endif	/* _GUMSTIX_CONF_H */
+#endif	/* _MACHINE_CONF_H_ */
diff --git a/sys/arch/gumstix/include/intr.h b/sys/arch/gumstix/include/intr.h
index 6c6ac884b01..aa4508eb717 100644
--- a/sys/arch/gumstix/include/intr.h
+++ b/sys/arch/gumstix/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.4 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.5 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_EVBARM_INTR_H_
-#define	_EVBARM_INTR_H_
+#ifndef	_MACHINE_INTR_H_
+#define	_MACHINE_INTR_H_
 
 #ifdef _KERNEL
 
@@ -100,4 +100,4 @@
 
 #endif /* _KERNEL */
 
-#endif	/* _EVBARM_INTR_H_ */
+#endif	/* _MACHINE_INTR_H_ */
diff --git a/sys/arch/gumstix/include/param.h b/sys/arch/gumstix/include/param.h
index cb559c7321a..b17cc4736e8 100644
--- a/sys/arch/gumstix/include/param.h
+++ b/sys/arch/gumstix/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.2 2008/11/27 20:51:48 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.4 2002/02/12 06:58:19 thorpej Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_GUMSTIX_PARAM_H_
-#define	_GUMSTIX_PARAM_H_
+#ifndef	_MACHINE_PARAM_H_
+#define	_MACHINE_PARAM_H_
 
 /*
  * 1 page should be enough
@@ -48,4 +48,4 @@
 #define	_MACHINE	gumstix
 #define	MACHINE		"gumstix"
 
-#endif	/* _GUMSTIX_PARAM_H_ */
+#endif	/* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/gumstix/include/spinlock.h b/sys/arch/gumstix/include/spinlock.h
index a19900d98b9..715af71061d 100644
--- a/sys/arch/gumstix/include/spinlock.h
+++ b/sys/arch/gumstix/include/spinlock.h
@@ -1,6 +1,6 @@
-/*	$OpenBSD: spinlock.h,v 1.2 2008/11/27 20:51:48 miod Exp $	*/
-#ifndef _GUMSTIX_SPINLOCK_H_
-#define _GUMSTIX_SPINLOCK_H_
+/*	$OpenBSD: spinlock.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
+#ifndef _MACHINE_SPINLOCK_H_
+#define _MACHINE_SPINLOCK_H_
 #include <arm/spinlock.h>
-#endif /* _GUMSTIX_SPINLOCK_H_ */
+#endif /* _MACHINE_SPINLOCK_H_ */
 
diff --git a/sys/arch/gumstix/include/vmparam.h b/sys/arch/gumstix/include/vmparam.h
index f3342ca1443..14159c2371a 100644
--- a/sys/arch/gumstix/include/vmparam.h
+++ b/sys/arch/gumstix/include/vmparam.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: vmparam.h,v 1.1 2008/11/26 14:18:11 drahn Exp $	*/
+/* 	$OpenBSD: vmparam.h,v 1.2 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.23 2003/05/22 05:47:07 thorpej Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_VMPARAM_H_
-#define	_ARM32_VMPARAM_H_
+#ifndef	_MACHINE_VMPARAM_H_
+#define	_MACHINE_VMPARAM_H_
 
 #define	ARM_KERNEL_BASE		0xc0000000
 
@@ -83,4 +83,4 @@
 #define	VM_FREELIST_DEFAULT	0
 
 
-#endif	/* _ARM32_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/hp300/include/_types.h b/sys/arch/hp300/include/_types.h
index c63ef92c5ce..c94a2348549 100644
--- a/sys/arch/hp300/include/_types.h
+++ b/sys/arch/hp300/include/_types.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: _types.h,v 1.2 2007/05/15 01:56:46 deraadt Exp $	*/
+/*	$OpenBSD: _types.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* public domain */
 
-#ifndef _HP300__TYPES_H_
-#define _HP300__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #include <m68k/_types.h>
 
-#endif /* _HP300__TYPES_H_ */
+#endif /* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/hp300/include/atomic.h b/sys/arch/hp300/include/atomic.h
index 5750d14bcd7..94c3f687476 100644
--- a/sys/arch/hp300/include/atomic.h
+++ b/sys/arch/hp300/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:42 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:34 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __HP300_ATOMIC_H__
-#define __HP300_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <m68k/atomic.h>
 
-#endif /* __HP300_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/hp300/include/bus.h b/sys/arch/hp300/include/bus.h
index a732ce49355..4a553b65591 100644
--- a/sys/arch/hp300/include/bus.h
+++ b/sys/arch/hp300/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.6 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: bus.h,v 1.7 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.9 1998/01/13 18:32:15 scottr Exp $	*/
 
 /*-
@@ -57,8 +57,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _HP300_BUS_H_
-#define _HP300_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 /*
  * Bus address and size types
@@ -278,4 +278,4 @@ typedef const struct hp300_bus_space_tag *bus_space_tag_t;
 #define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */
 #define	BUS_SPACE_BARRIER_WRITE	0x02		/* force write barrier */
 
-#endif /* _HP300_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/hp300/include/cpu.h b/sys/arch/hp300/include/cpu.h
index abe27cf610a..5b491cb61dc 100644
--- a/sys/arch/hp300/include/cpu.h
+++ b/sys/arch/hp300/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.38 2010/07/24 12:18:58 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.39 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: cpu.h,v 1.28 1998/02/13 07:41:51 scottr Exp $	*/
 
 /*
@@ -39,8 +39,8 @@
  *	@(#)cpu.h	8.4 (Berkeley) 1/5/94
  */
 
-#ifndef _HP300_CPU_H_
-#define	_HP300_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define	_MACHINE_CPU_H_
 
 /*
  * Exported definitions unique to hp300/68k cpu support.
@@ -197,4 +197,4 @@ void	dumpconf(void);
 #define	MMU_FAULT	(MMU_PTF|MMU_PF|MMU_WPF|MMU_BERR)
 #define	MMU_ENAB	(MMU_UMEN|MMU_SMEN|MMU_IEN|MMU_FPE)
 
-#endif /* _HP300_CPU_H_ */
+#endif /* _MACHINE_CPU_H_ */
diff --git a/sys/arch/hp300/include/float.h b/sys/arch/hp300/include/float.h
index eed6c785f47..da6f2a6b166 100644
--- a/sys/arch/hp300/include/float.h
+++ b/sys/arch/hp300/include/float.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: float.h,v 1.3 2004/05/21 22:54:15 todd Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.7 1995/06/20 20:45:34 jtc Exp $	*/
 
-#ifndef _HP300_FLOAT_H_
-#define _HP300_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <m68k/float.h>
 
diff --git a/sys/arch/hp300/include/hp300spu.h b/sys/arch/hp300/include/hp300spu.h
index 4b597daca73..ed1933935cc 100644
--- a/sys/arch/hp300/include/hp300spu.h
+++ b/sys/arch/hp300/include/hp300spu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hp300spu.h,v 1.8 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: hp300spu.h,v 1.9 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: hp300spu.h,v 1.2 1997/05/01 05:26:48 thorpej Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _HP300_HP300SPU_H_
-#define	_HP300_HP300SPU_H_
+#ifndef _MACHINE_HP300SPU_H_
+#define	_MACHINE_HP300SPU_H_
 
 /*
  * This file describes various constants that describe and/or
@@ -75,4 +75,4 @@ extern	int cpuspeed;		/* CPU speed, in MHz */
 extern	int mmuid;		/* MMU id */
 #endif /* _KERNEL && ! _LOCORE */
 
-#endif /* _HP300_HP300SPU_H_ */
+#endif /* _MACHINE_HP300SPU_H_ */
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index 5af424eb28c..712b220a31f 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.27 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.28 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _HP300_INTR_H_
-#define	_HP300_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define	_MACHINE_INTR_H_
 
 #include <machine/psl.h>
 #include <sys/evcount.h>
@@ -104,4 +104,4 @@ void	intr_dispatch(int);
 void	intr_printlevels(void);
 #endif /* _KERNEL */
 
-#endif /* _HP300_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/hp300/include/vmparam.h b/sys/arch/hp300/include/vmparam.h
index 9b47a01fbe6..0ec70df2e4b 100644
--- a/sys/arch/hp300/include/vmparam.h
+++ b/sys/arch/hp300/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.18 2009/06/10 15:58:51 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.19 2011/03/23 16:54:34 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.16 1998/08/20 08:33:48 kleink Exp $	*/
 
 /*
@@ -39,8 +39,8 @@
  *	@(#)vmparam.h	8.2 (Berkeley) 4/19/94
  */
 
-#ifndef _HP300_VMPARAM_H_
-#define	_HP300_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define	_MACHINE_VMPARAM_H_
 
 /*
  * Machine dependent constants for HP300
@@ -61,4 +61,4 @@
 #define	VM_PHYSSEG_MAX		1
 #define	VM_PHYSSEG_STRAT	VM_PSTRAT_RANDOM
 
-#endif /* _HP300_VMPARAM_H_ */
+#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/hppa/include/_types.h b/sys/arch/hppa/include/_types.h
index a4536444daf..feae0162791 100644
--- a/sys/arch/hppa/include/_types.h
+++ b/sys/arch/hppa/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.11 2009/11/04 19:14:09 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.12 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,8 +32,8 @@
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
-#ifndef _HPPA__TYPES_H_
-#define _HPPA__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
 typedef struct label_t {
@@ -127,4 +127,4 @@ typedef	void *			__wctype_t;
 /* Feature test macros */
 #define __HAVE_TIMECOUNTER
 
-#endif	/* _HPPA__TYPES_H_ */
+#endif	/* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/hppa/include/atomic.h b/sys/arch/hppa/include/atomic.h
index ca98933c21d..b9e676805e0 100644
--- a/sys/arch/hppa/include/atomic.h
+++ b/sys/arch/hppa/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.4 2010/06/27 00:04:44 jsing Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __HPPA_ATOMIC_H__
-#define __HPPA_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -71,4 +71,4 @@ atomic_clearbits_long(__volatile unsigned long *uip, unsigned long v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __HPPA_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/hppa/include/eisa_machdep.h b/sys/arch/hppa/include/eisa_machdep.h
index 212c6a9c8d5..5283719f2e4 100644
--- a/sys/arch/hppa/include/eisa_machdep.h
+++ b/sys/arch/hppa/include/eisa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa_machdep.h,v 1.3 2004/04/07 18:24:19 mickey Exp $	*/
+/*	$OpenBSD: eisa_machdep.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -26,8 +26,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _EISA_MACHDEP_H_
-#define _EISA_MACHDEP_H_
+#ifndef _MACHINE_EISA_MACHDEP_H_
+#define _MACHINE_EISA_MACHDEP_H_
 
 /*
  * Types provided to machine-independent EISA code.
@@ -68,4 +68,4 @@ struct hppa_eisa_chipset {
 #define	eisa_intr_disestablish(c, h)					\
     (*(c)->ec_intr_disestablish)((c)->ec_v, (h))
 
-#endif /* _EISA_MACHDEP_H_ */
+#endif /* _MACHINE_EISA_MACHDEP_H_ */
diff --git a/sys/arch/hppa/include/float.h b/sys/arch/hppa/include/float.h
index 490231408e3..bbbb538f453 100644
--- a/sys/arch/hppa/include/float.h
+++ b/sys/arch/hppa/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.9 2008/07/21 20:50:54 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -31,8 +31,8 @@
  *	@(#)float.h	7.1 (Berkeley) 5/8/90
  */
 
-#ifndef _HPPA_FLOAT_H_
-#define _HPPA_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <sys/cdefs.h>
 
diff --git a/sys/arch/hppa/include/ieeefp.h b/sys/arch/hppa/include/ieeefp.h
index 07845bbab09..8a74f5481ec 100644
--- a/sys/arch/hppa/include/ieeefp.h
+++ b/sys/arch/hppa/include/ieeefp.h
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ieeefp.h,v 1.2 2002/05/22 20:04:55 miod Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* 
  * Written by Miodrag Vallat.  Public domain.
  */
 
-#ifndef _HPPA_IEEEFP_H_
-#define _HPPA_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
 
 typedef int fp_except;
 #define FP_X_INV	0x10	/* invalid operation exception */
@@ -21,4 +21,4 @@ typedef enum {
     FP_RM=3			/* round toward negative infinity */
 } fp_rnd;
 
-#endif /* _HPPA_IEEEFP_H_ */
+#endif /* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/hppa/include/isa_machdep.h b/sys/arch/hppa/include/isa_machdep.h
index a6cd6a6307e..71ea8984d8d 100644
--- a/sys/arch/hppa/include/isa_machdep.h
+++ b/sys/arch/hppa/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.3 2004/04/07 18:24:19 mickey Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -26,8 +26,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ISA_MACHDEP_H_
-#define _ISA_MACHDEP_H_
+#ifndef _MACHINE_ISA_MACHDEP_H_
+#define _MACHINE_ISA_MACHDEP_H_
 /*
  * Types provided to machine-independent ISA code.
  */
@@ -56,4 +56,4 @@ struct hppa_isa_chipset {
 #define isa_intr_check(c, i, t)						\
     (*(c)->ic_intr_check)((c)->ic_v, (i), (t))
 
-#endif /* _ISA_MACHDEP_H_ */
+#endif /* _MACHINE_ISA_MACHDEP_H_ */
diff --git a/sys/arch/hppa/include/loadfile_machdep.h b/sys/arch/hppa/include/loadfile_machdep.h
index dfceeda9471..bfb659f363e 100644
--- a/sys/arch/hppa/include/loadfile_machdep.h
+++ b/sys/arch/hppa/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.5 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _HPPA_LOADFILE_MACHDEP_H_
-#define	_HPPA_LOADFILE_MACHDEP_H_
+#ifndef _MACHINE_LOADFILE_MACHDEP_H_
+#define	_MACHINE_LOADFILE_MACHDEP_H_
 
 #define	BOOT_ELF
 #define	BOOT_ELF32
@@ -77,4 +77,4 @@ void vcopy(u_long, u_long, u_long *, size_t);
 void vzero(u_long, u_long *, size_t);
 
 #endif
-#endif /* ! _HPPA_LOADFILE_MACHDEP_H_ */
+#endif /* ! _MACHINE_LOADFILE_MACHDEP_H_ */
diff --git a/sys/arch/hppa/include/lock.h b/sys/arch/hppa/include/lock.h
index 5d21e8cb8ea..6bbe382589c 100644
--- a/sys/arch/hppa/include/lock.h
+++ b/sys/arch/hppa/include/lock.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lock.h,v 1.4 2011/01/12 21:11:12 kettenis Exp $	*/
+/*	$OpenBSD: lock.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* public domain */
 
-#ifndef	_HPPA_LOCK_H_
-#define	_HPPA_LOCK_H_
+#ifndef	_MACHINE_LOCK_H_
+#define	_MACHINE_LOCK_H_
 
 #include <machine/atomic.h>
 
@@ -52,4 +52,4 @@ int	rw_cas_hppa(volatile unsigned long *, unsigned long, unsigned long);
 #define	rw_cas rw_cas_hppa
 #endif
 
-#endif	/* _HPPA_LOCK_H_ */
+#endif	/* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/hppa/include/rbus_machdep.h b/sys/arch/hppa/include/rbus_machdep.h
index 3ae9ac5b0de..82a5c08278f 100644
--- a/sys/arch/hppa/include/rbus_machdep.h
+++ b/sys/arch/hppa/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.4 2009/07/21 21:20:03 miod Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2004 Michael Shalayeff
@@ -27,8 +27,8 @@
  */
 
 
-#if !defined _ARCH_HPPA_HPPA_RBUS_MACHDEP_H_
-#define _ARCH_HPPA_HPPA_RBUS_MACHDEP_H_
+#if !defined _MACHINE_RBUS_MACHDEP_H_
+#define _MACHINE_RBUS_MACHDEP_H_
 
 static __inline int
 md_space_map(rbus_tag_t rbt, bus_addr_t bpa, bus_size_t size, int flags,
@@ -49,4 +49,4 @@ struct pci_attach_args;
 
 #define pccbb_attach_hook(parent, self, pa)	/* nothing */
 
-#endif /* _ARCH_HPPA_HPPA_RBUS_MACHDEP_H_ */
+#endif /* _MACHINE_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/hppa/include/signal.h b/sys/arch/hppa/include/signal.h
index 90a72f482a8..c857ff1ea88 100644
--- a/sys/arch/hppa/include/signal.h
+++ b/sys/arch/hppa/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.7 2006/01/08 14:20:17 millert Exp $	*/
+/*	$OpenBSD: signal.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* 
  * Copyright (c) 1994, The University of Utah and
@@ -23,8 +23,8 @@
  * 	Utah $Hdr: signal.h 1.3 94/12/16$
  */
 
-#ifndef	_HPPA_SIGNAL_H_
-#define	_HPPA_SIGNAL_H_
+#ifndef	_MACHINE_SIGNAL_H_
+#define	_MACHINE_SIGNAL_H_
 
 #include <sys/cdefs.h>
 
@@ -58,4 +58,4 @@ struct	sigcontext {
 	unsigned	sc_fpregs[64];
 };
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif  /* !_HPPA_SIGNAL_H_ */
+#endif  /* !_MACHINE_SIGNAL_H_ */
diff --git a/sys/arch/hppa64/include/_types.h b/sys/arch/hppa64/include/_types.h
index f6d4586f18a..84cf50aac4c 100644
--- a/sys/arch/hppa64/include/_types.h
+++ b/sys/arch/hppa64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.5 2010/07/24 21:27:57 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,8 +32,8 @@
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
-#ifndef _HPPA64__TYPES_H_
-#define _HPPA64__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
 typedef struct label_t {
@@ -123,4 +123,4 @@ typedef	void *			__wctype_t;
 /* Feature test macros */
 #define __HAVE_TIMECOUNTER
 
-#endif	/* _HPPA64__TYPES_H_ */
+#endif	/* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/hppa64/include/atomic.h b/sys/arch/hppa64/include/atomic.h
index d8474e881ad..bb4a8e244c8 100644
--- a/sys/arch/hppa64/include/atomic.h
+++ b/sys/arch/hppa64/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.3 2010/07/01 03:36:12 jsing Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __HPPA64_ATOMIC_H__
-#define __HPPA64_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -52,4 +52,4 @@ atomic_clearbits_long(__volatile unsigned long *uip, unsigned long v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __HPPA64_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/hppa64/include/cpufunc.h b/sys/arch/hppa64/include/cpufunc.h
index d048f000480..5a5c83af6ef 100644
--- a/sys/arch/hppa64/include/cpufunc.h
+++ b/sys/arch/hppa64/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.1 2010/07/01 04:29:10 jsing Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -26,8 +26,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _HPPA64_CPUFUNC_H_
-#define _HPPA64_CPUFUNC_H_
+#ifndef _MACHINE_CPUFUNC_H_
+#define _MACHINE_CPUFUNC_H_
 
 #define	mtsp(v,r)	__asm __volatile ("mtsp %0,%1":: "r" (v), "i" (r))
 
diff --git a/sys/arch/hppa64/include/float.h b/sys/arch/hppa64/include/float.h
index b6c689c8444..8c7b4e7abb0 100644
--- a/sys/arch/hppa64/include/float.h
+++ b/sys/arch/hppa64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.2 2008/07/21 20:50:54 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -31,8 +31,8 @@
  *	@(#)float.h	7.1 (Berkeley) 5/8/90
  */
 
-#ifndef _HPPA_FLOAT_H_
-#define _HPPA_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <sys/cdefs.h>
 
diff --git a/sys/arch/hppa64/include/ieeefp.h b/sys/arch/hppa64/include/ieeefp.h
index d33f6ac542e..1956810c69b 100644
--- a/sys/arch/hppa64/include/ieeefp.h
+++ b/sys/arch/hppa64/include/ieeefp.h
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ieeefp.h,v 1.1 2005/04/01 10:40:48 mickey Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* 
  * Written by Miodrag Vallat.  Public domain.
  */
 
-#ifndef _HPPA64_IEEEFP_H_
-#define _HPPA64_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
 
 typedef int fp_except;
 #define FP_X_INV	0x10	/* invalid operation exception */
@@ -21,4 +21,4 @@ typedef enum {
     FP_RM=3			/* round toward negative infinity */
 } fp_rnd;
 
-#endif /* _HPPA64_IEEEFP_H_ */
+#endif /* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/hppa64/include/loadfile_machdep.h b/sys/arch/hppa64/include/loadfile_machdep.h
index e21f59d021c..093bf0978c1 100644
--- a/sys/arch/hppa64/include/loadfile_machdep.h
+++ b/sys/arch/hppa64/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loadfile_machdep.h,v 1.2 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: loadfile_machdep.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _HPPA64_LOADFILE_MACHDEP_H_
-#define	_HPPA64_LOADFILE_MACHDEP_H_
+#ifndef _MACHINE_LOADFILE_MACHDEP_H_
+#define	_MACHINE_LOADFILE_MACHDEP_H_
 
 #define	BOOT_ELF
 #define	ELFSIZE	64
@@ -73,4 +73,4 @@ void vcopy(u_long, u_long, u_long *, size_t);
 void vzero(u_long, u_long *, size_t);
 
 #endif
-#endif /* ! _HPPA64_LOADFILE_MACHDEP_H_ */
+#endif /* ! _MACHINE_LOADFILE_MACHDEP_H_ */
diff --git a/sys/arch/hppa64/include/lock.h b/sys/arch/hppa64/include/lock.h
index a6d910c01dc..6bd03940965 100644
--- a/sys/arch/hppa64/include/lock.h
+++ b/sys/arch/hppa64/include/lock.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lock.h,v 1.2 2010/07/01 04:20:38 jsing Exp $	*/
+/*	$OpenBSD: lock.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* public domain */
 
-#ifndef	_HPPA64_LOCK_H_
-#define	_HPPA64_LOCK_H_
+#ifndef	_MACHINE_LOCK_H_
+#define	_MACHINE_LOCK_H_
 
 #include <machine/atomic.h>
 
@@ -47,4 +47,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t *l)
 	*l = __SIMPLELOCK_UNLOCKED;
 }
 
-#endif	/* _HPPA64_LOCK_H_ */
+#endif	/* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/hppa64/include/rbus_machdep.h b/sys/arch/hppa64/include/rbus_machdep.h
index 501241b7952..8628aaff63f 100644
--- a/sys/arch/hppa64/include/rbus_machdep.h
+++ b/sys/arch/hppa64/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.4 2009/07/21 21:20:05 miod Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -18,8 +18,8 @@
  */
 
 
-#if !defined _ARCH_HPPA64_HPPA64_RBUS_MACHDEP_H_
-#define _ARCH_HPPA64_HPPA64_RBUS_MACHDEP_H_
+#if !defined _MACHINE_RBUS_MACHDEP_H_
+#define _MACHINE_RBUS_MACHDEP_H_
 
 static __inline int
 md_space_map(rbus_tag_t rbt, bus_addr_t bpa, bus_size_t size, int flags,
@@ -40,4 +40,4 @@ struct pci_attach_args;
 
 #define pccbb_attach_hook(parent, self, pa)	/* nothing */
 
-#endif /* _ARCH_HPPA64_HPPA64_RBUS_MACHDEP_H_ */
+#endif /* _MACHINE_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/hppa64/include/signal.h b/sys/arch/hppa64/include/signal.h
index 2bc5c13a0b6..baaf5902d46 100644
--- a/sys/arch/hppa64/include/signal.h
+++ b/sys/arch/hppa64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.3 2006/01/08 14:20:17 millert Exp $	*/
+/*	$OpenBSD: signal.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* 
  * Copyright (c) 1994, The University of Utah and
@@ -23,8 +23,8 @@
  * 	Utah $Hdr: signal.h 1.3 94/12/16$
  */
 
-#ifndef	_HPPA64_SIGNAL_H_
-#define	_HPPA64_SIGNAL_H_
+#ifndef	_MACHINE_SIGNAL_H_
+#define	_MACHINE_SIGNAL_H_
 
 #include <sys/cdefs.h>
 
@@ -58,4 +58,4 @@ struct	sigcontext {
 	unsigned long	sc_fpregs[64];
 };
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif  /* !_HPPA64_SIGNAL_H_ */
+#endif  /* !_MACHINE_SIGNAL_H_ */
diff --git a/sys/arch/i386/include/_types.h b/sys/arch/i386/include/_types.h
index 2bfdb013b50..e48789e3167 100644
--- a/sys/arch/i386/include/_types.h
+++ b/sys/arch/i386/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.10 2009/11/04 19:14:09 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.11 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,8 +32,8 @@
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
-#ifndef _I386__TYPES_H_
-#define _I386__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
 typedef struct label_t {
@@ -119,4 +119,4 @@ typedef	void *			__wctype_t;
 /* Feature test macros */
 #define __HAVE_TIMECOUNTER
 
-#endif	/* _I386__TYPES_H_ */
+#endif	/* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/i386/include/amdmsr.h b/sys/arch/i386/include/amdmsr.h
index 00750cfa58c..b1d13fa2279 100644
--- a/sys/arch/i386/include/amdmsr.h
+++ b/sys/arch/i386/include/amdmsr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amdmsr.h,v 1.3 2008/06/19 09:58:40 mbalmer Exp $ */
+/*	$OpenBSD: amdmsr.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */
 
 /*
  * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SYS_AMDMSR_H_
-#define _SYS_AMDMSR_H_
+#ifndef _MACHINE_AMDMSR_H_
+#define _MACHINE_AMDMSR_H_
 
 struct amdmsr_req {
 	u_int32_t addr;	/* 32-bit MSR address */
@@ -31,4 +31,4 @@ struct amdmsr_req {
 int	amdmsr_probe(void);
 #endif
 
-#endif	/* !_SYS_AMDMSR_H_ */
+#endif	/* !_MACHINE_AMDMSR_H_ */
diff --git a/sys/arch/i386/include/apicvar.h b/sys/arch/i386/include/apicvar.h
index 4762234503e..e282603bd8f 100644
--- a/sys/arch/i386/include/apicvar.h
+++ b/sys/arch/i386/include/apicvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apicvar.h,v 1.5 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: apicvar.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $	*/
 /* $NetBSD: apicvar.h,v 1.1.2.3 2000/02/27 20:25:00 sommerfeld Exp $ */
 
 /*-
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_APICVAR_H_
-#define _I386_APICVAR_H_
+#ifndef _MACHINE_APICVAR_H_
+#define _MACHINE_APICVAR_H_
 
 struct apic_attach_args {
 	const char *aaa_name;
@@ -48,4 +48,4 @@ struct apic_attach_args {
 
 void apic_format_redir(char *, char *, int, u_int32_t, u_int32_t);
 
-#endif /* !_I386_APICVAR_H_ */
+#endif /* !_MACHINE_APICVAR_H_ */
diff --git a/sys/arch/i386/include/apmvar.h b/sys/arch/i386/include/apmvar.h
index 7afcf85352d..3844f7ee89d 100644
--- a/sys/arch/i386/include/apmvar.h
+++ b/sys/arch/i386/include/apmvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmvar.h,v 1.16 2009/02/26 17:19:47 oga Exp $	*/
+/*	$OpenBSD: apmvar.h,v 1.17 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  *  Copyright (c) 1995 John T. Kohl
@@ -28,8 +28,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-#ifndef _I386_APMVAR_H_
-#define _I386_APMVAR_H_
+#ifndef _MACHINE_APMVAR_H_
+#define _MACHINE_APMVAR_H_
 
 #include <sys/ioccom.h>
 
@@ -299,4 +299,4 @@ int apm_set_powstate(u_int devid, u_int powstate);
 int apm_kqfilter(dev_t dev, struct knote *kn);
 #endif /* _KERNEL */
 
-#endif /* _I386_APMVAR_H_ */
+#endif /* _MACHINE_APMVAR_H_ */
diff --git a/sys/arch/i386/include/asm.h b/sys/arch/i386/include/asm.h
index 791b415b40e..ce4d1de02ff 100644
--- a/sys/arch/i386/include/asm.h
+++ b/sys/arch/i386/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.10 2007/05/27 18:34:01 art Exp $	*/
+/*	$OpenBSD: asm.h,v 1.11 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: asm.h,v 1.7 1994/10/27 04:15:56 cgd Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)asm.h	5.5 (Berkeley) 5/7/91
  */
 
-#ifndef _I386_ASM_H_
-#define _I386_ASM_H_
+#ifndef _MACHINE_ASM_H_
+#define _MACHINE_ASM_H_
 
 #ifdef PIC
 #define PIC_PROLOGUE	\
@@ -120,4 +120,4 @@
 
 #endif /* _KERNEL */
 
-#endif /* !_I386_ASM_H_ */
+#endif /* !_MACHINE_ASM_H_ */
diff --git a/sys/arch/i386/include/atomic.h b/sys/arch/i386/include/atomic.h
index 217c97b7043..baa720d3e3c 100644
--- a/sys/arch/i386/include/atomic.h
+++ b/sys/arch/i386/include/atomic.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atomic.h,v 1.7 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $	*/
 /* $NetBSD: atomic.h,v 1.1.2.2 2000/02/21 18:54:07 sommerfeld Exp $ */
 
 /*-
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_ATOMIC_H_
-#define _I386_ATOMIC_H_
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 /*
  * Perform atomic operations on memory. Should be atomic with respect
@@ -105,4 +105,4 @@ i486_atomic_cas_int(volatile u_int *ptr, u_int expect, u_int set)
 #undef LOCK
 
 #endif /* defined(_KERNEL) && !defined(_LOCORE) */
-#endif /* _I386_ATOMIC_H_ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/i386/include/biosvar.h b/sys/arch/i386/include/biosvar.h
index a044490736d..4e8be582aec 100644
--- a/sys/arch/i386/include/biosvar.h
+++ b/sys/arch/i386/include/biosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosvar.h,v 1.54 2011/03/14 22:14:40 krw Exp $	*/
+/*	$OpenBSD: biosvar.h,v 1.55 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1997-1999 Michael Shalayeff
@@ -26,8 +26,8 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_BIOSVAR_H_
-#define _I386_BIOSVAR_H_
+#ifndef _MACHINE_BIOSVAR_H_
+#define _MACHINE_BIOSVAR_H_
 
 	/* some boxes put apm data seg in the 2nd page */
 #define	BOOTARG_OFF	(NBPG*2)
@@ -266,4 +266,4 @@ extern bios_pciinfo_t *bios_pciinfo;
 #endif /* _LOCORE */
 #endif /* _KERNEL || _STANDALONE */
 
-#endif /* _I386_BIOSVAR_H_ */
+#endif /* _MACHINE_BIOSVAR_H_ */
diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h
index fc4ec2e0338..e980c2f16dc 100644
--- a/sys/arch/i386/include/bus.h
+++ b/sys/arch/i386/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.53 2010/09/06 19:05:48 kettenis Exp $	*/
+/*	$OpenBSD: bus.h,v 1.54 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $	*/
 
 /*-
@@ -63,8 +63,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_BUS_H_
-#define _I386_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 #include <sys/mutex.h>
 #include <sys/tree.h>
@@ -686,4 +686,4 @@ int	sg_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, bus_size_t,
 	    bus_dma_segment_t *, int, int *, int);
 
 
-#endif /* _I386_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index 77a060fdf71..f4bc7840041 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.117 2010/10/02 23:13:28 deraadt Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.118 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)cpu.h	5.4 (Berkeley) 5/9/91
  */
 
-#ifndef _I386_CPU_H_
-#define _I386_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 /*
  * Definitions unique to i386 cpu support.
@@ -492,4 +492,4 @@ void	vm86_gpfault(struct proc *, int);
 #include <sys/mplock.h>
 #endif
 
-#endif /* !_I386_CPU_H_ */
+#endif /* !_MACHINE_CPU_H_ */
diff --git a/sys/arch/i386/include/cpufunc.h b/sys/arch/i386/include/cpufunc.h
index 0da7c4807a6..fde5f80e289 100644
--- a/sys/arch/i386/include/cpufunc.h
+++ b/sys/arch/i386/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.17 2010/08/19 19:31:53 kettenis Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.18 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.8 1994/10/27 04:15:59 cgd Exp $	*/
 
 /*
@@ -31,8 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_CPUFUNC_H_
-#define	_I386_CPUFUNC_H_
+#ifndef _MACHINE_CPUFUNC_H_
+#define	_MACHINE_CPUFUNC_H_
 
 #ifdef _KERNEL
 
@@ -288,4 +288,4 @@ breakpoint(void)
 void amd64_errata(struct cpu_info *);
 
 #endif /* _KERNEL */
-#endif /* !_I386_CPUFUNC_H_ */
+#endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/arch/i386/include/db_machdep.h b/sys/arch/i386/include/db_machdep.h
index d375dc9ea02..65d5b12ed0e 100644
--- a/sys/arch/i386/include/db_machdep.h
+++ b/sys/arch/i386/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.20 2010/11/27 19:57:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.21 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.9 1996/05/03 19:23:59 christos Exp $	*/
 
 /* 
@@ -27,8 +27,8 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef	_I386_DB_MACHDEP_H_
-#define	_I386_DB_MACHDEP_H_
+#ifndef	_MACHINE_DB_MACHDEP_H_
+#define	_MACHINE_DB_MACHDEP_H_
 
 /*
  * Machine-dependent defines for new kernel debugger.
@@ -112,4 +112,4 @@ extern struct mutex ddb_mp_mutex;
 #define DDB_STATE_RUNNING	1
 #define DDB_STATE_EXITING	2
 
-#endif	/* _I386_DB_MACHDEP_H_ */
+#endif	/* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/i386/include/exec.h b/sys/arch/i386/include/exec.h
index d091741917b..69091707d34 100644
--- a/sys/arch/i386/include/exec.h
+++ b/sys/arch/i386/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.9 2003/04/17 03:42:14 drahn Exp $	*/
+/*	$OpenBSD: exec.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: exec.h,v 1.6 1994/10/27 04:16:05 cgd Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_EXEC_H_
-#define _I386_EXEC_H_
+#ifndef _MACHINE_EXEC_H_
+#define _MACHINE_EXEC_H_
 
 #define __LDPGSZ	4096
 
@@ -48,4 +48,4 @@
 #define _KERN_DO_AOUT
 #define _KERN_DO_ELF
 
-#endif  /* _I386_EXEC_H_ */
+#endif  /* _MACHINE_EXEC_H_ */
diff --git a/sys/arch/i386/include/float.h b/sys/arch/i386/include/float.h
index e2f99895e0c..e31ba958ab8 100644
--- a/sys/arch/i386/include/float.h
+++ b/sys/arch/i386/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.7 2008/07/21 20:50:54 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	@(#)float.h	7.1 (Berkeley) 5/8/90
  */
 
-#ifndef _I386_FLOAT_H_
-#define _I386_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -75,4 +75,4 @@ __END_DECLS
 #define LDBL_MAX	1.18973149535723176502e+4932L
 #define LDBL_MAX_10_EXP	4932
 
-#endif	/* _I386_FLOAT_H_ */
+#endif	/* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/i386/include/i82093var.h b/sys/arch/i386/include/i82093var.h
index 3359f5b8fc8..ef7715b6f42 100644
--- a/sys/arch/i386/include/i82093var.h
+++ b/sys/arch/i386/include/i82093var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82093var.h,v 1.9 2009/08/22 02:54:50 mk Exp $	*/
+/*	$OpenBSD: i82093var.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $	*/
 /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_I82093VAR_H_
-#define _I386_I82093VAR_H_
+#ifndef _MACHINE_I82093VAR_H_
+#define _MACHINE_I82093VAR_H_
 
 #include <machine/apicvar.h>
 
@@ -98,4 +98,4 @@ extern struct ioapic_softc *ioapics;
 extern u_int16_t ioapic_id_map;
 extern u_int8_t ioapic_id_remap[];
 
-#endif /* !_I386_I82093VAR_H_ */
+#endif /* !_MACHINE_I82093VAR_H_ */
diff --git a/sys/arch/i386/include/i82489var.h b/sys/arch/i386/include/i82489var.h
index 6a81e1a9b05..b170587afb1 100644
--- a/sys/arch/i386/include/i82489var.h
+++ b/sys/arch/i386/include/i82489var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82489var.h,v 1.11 2010/07/25 21:43:37 deraadt Exp $	*/
+/*	$OpenBSD: i82489var.h,v 1.12 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: i82489var.h,v 1.1.2.2 2000/02/21 18:46:14 sommerfeld Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_I82489VAR_H_
-#define _I386_I82489VAR_H_
+#ifndef _MACHINE_I82489VAR_H_
+#define _MACHINE_I82489VAR_H_
 
 static __inline__ u_int32_t i82489_readreg(int);
 static __inline__ void i82489_writereg(int, u_int32_t);
diff --git a/sys/arch/i386/include/i8259.h b/sys/arch/i386/include/i8259.h
index e9c887bf7bf..eea69eb0aa8 100644
--- a/sys/arch/i386/include/i8259.h
+++ b/sys/arch/i386/include/i8259.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i8259.h,v 1.4 2006/04/14 22:26:46 weingart Exp $	*/
+/*	$OpenBSD: i8259.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: i8259.h,v 1.3 2003/05/04 22:01:56 fvdl Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)icu.h	5.6 (Berkeley) 5/9/91
  */
 
-#ifndef	_I386_I8259_H_
-#define	_I386_I8259_H_
+#ifndef	_MACHINE_I8259_H_
+#define	_MACHINE_I8259_H_
 
 #include <dev/isa/isareg.h>
 
@@ -145,4 +145,4 @@ extern void i8259_reinit(void);
 #endif /* ICU_HARDWARE_MASK */
 #endif /* ICU_SPECIAL_MASK_MODE */
 
-#endif /* !_X86_I8259_H_ */
+#endif /* !_MACHINE_I8259_H_ */
diff --git a/sys/arch/i386/include/ieeefp.h b/sys/arch/i386/include/ieeefp.h
index 73e5c2d8ac5..7e5df84f504 100644
--- a/sys/arch/i386/include/ieeefp.h
+++ b/sys/arch/i386/include/ieeefp.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: ieeefp.h,v 1.2 2000/08/05 22:07:31 niklas Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* 
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
  */
 
-#ifndef _I386_IEEEFP_H_
-#define _I386_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
 
 typedef int fp_except;
 #define FP_X_INV	0x01	/* invalid operation exception */
@@ -23,4 +23,4 @@ typedef enum {
     FP_RZ=3			/* round to zero (truncate) */
 } fp_rnd;
 
-#endif /* _I386_IEEEFP_H_ */
+#endif /* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/i386/include/intr.h b/sys/arch/i386/include/intr.h
index f5f4e0d2e8a..015bea84f8c 100644
--- a/sys/arch/i386/include/intr.h
+++ b/sys/arch/i386/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.41 2010/12/27 19:51:27 guenther Exp $	*/
+/*	$OpenBSD: intr.h,v 1.42 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.5 1996/05/13 06:11:28 mycroft Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_INTR_H_
-#define _I386_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 #include <machine/intrdefs.h>
 
@@ -194,4 +194,4 @@ do {									\
 } while (/*CONSTCOND*/ 0)
 #endif /* _LOCORE */
 
-#endif /* !_I386_INTR_H_ */
+#endif /* !_MACHINE_INTR_H_ */
diff --git a/sys/arch/i386/include/ioctl_fd.h b/sys/arch/i386/include/ioctl_fd.h
index 4d5b07f2964..296cffbbe6a 100644
--- a/sys/arch/i386/include/ioctl_fd.h
+++ b/sys/arch/i386/include/ioctl_fd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioctl_fd.h,v 1.3 1997/09/16 07:52:31 deraadt Exp $	*/
+/*	$OpenBSD: ioctl_fd.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	from: ioctl_fd.h,v 1.4 1995/06/29 03:49:32 jtk Exp 	*/
 
 /*
@@ -30,8 +30,8 @@
  * From: Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp
  */
 
-#ifndef _I386_IOCTL_FD_H_
-#define _I386_IOCTL_FD_H_
+#ifndef _MACHINE_IOCTL_FD_H_
+#define _MACHINE_IOCTL_FD_H_
 
 #include <sys/ioccom.h>
 
@@ -128,4 +128,4 @@ struct fd_type {
 #endif /* FDC_500KBPS */
 
 
-#endif /* !_I386_IOCTL_FD_H__ */
+#endif /* !_MACHINE_IOCTL_FD_H__ */
diff --git a/sys/arch/i386/include/joystick.h b/sys/arch/i386/include/joystick.h
index a2406a2f492..fe37d3576dc 100644
--- a/sys/arch/i386/include/joystick.h
+++ b/sys/arch/i386/include/joystick.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: joystick.h,v 1.5 2005/01/09 16:39:55 jmc Exp $ */
+/*	$OpenBSD: joystick.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $ */
 /*	$NetBSD: joystick.h,v 1.1 1996/03/27 19:18:56 perry Exp $	*/
 
-#ifndef _JOY_IOCTL_H_
-#define _JOY_IOCTL_H_
+#ifndef _MACHINE_JOYSTICK_H_
+#define _MACHINE_JOYSTICK_H_
 
 #include <sys/ioccom.h>
 
@@ -20,4 +20,4 @@ struct joystick {
 #define JOY_GET_X_OFFSET  _IOR('J', 5, int)    /* get offset on X-axis */
 #define JOY_GET_Y_OFFSET  _IOR('J', 6, int)    /* get offset on Y-axis */
 
-#endif /* _JOY_IOCTL_H_ */
+#endif /* _MACHINE_JOYSTICK_H_ */
diff --git a/sys/arch/i386/include/kvm86.h b/sys/arch/i386/include/kvm86.h
index 358208200fb..3641d3b2c10 100644
--- a/sys/arch/i386/include/kvm86.h
+++ b/sys/arch/i386/include/kvm86.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm86.h,v 1.1 2006/06/13 03:01:04 gwk Exp $ */
+/* $OpenBSD: kvm86.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 2006 Gordon Willem Klok <gwk@openbsd.org>
  *
@@ -14,8 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef _I386_KVM86_H_
-#define _I386_KVM86_H_
+#ifndef _MACHINE_KVM86_H_
+#define _MACHINE_KVM86_H_
 
 struct kvm86regs {
 	uint32_t eax;
diff --git a/sys/arch/i386/include/lock.h b/sys/arch/i386/include/lock.h
index f0e83ab50b5..fce789cf241 100644
--- a/sys/arch/i386/include/lock.h
+++ b/sys/arch/i386/include/lock.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lock.h,v 1.6 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: lock.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: lock.h,v 1.1.2.2 2000/05/03 14:40:55 sommerfeld Exp $	*/
 
 /*-
@@ -34,8 +34,8 @@
  * Machine-dependent spin lock operations.
  */
 
-#ifndef _I386_LOCK_H_
-#define	_I386_LOCK_H_
+#ifndef _MACHINE_LOCK_H_
+#define	_MACHINE_LOCK_H_
 
 typedef	__volatile int		__cpu_simple_lock_t;
 
@@ -115,4 +115,4 @@ extern int rw_cas_486(volatile unsigned long *, unsigned long, unsigned long);
 #define rw_cas rw_cas_486
 #endif
 
-#endif /* _I386_LOCK_H_ */
+#endif /* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/i386/include/mouse.h b/sys/arch/i386/include/mouse.h
index 6ed881d6cea..036bd4013dc 100644
--- a/sys/arch/i386/include/mouse.h
+++ b/sys/arch/i386/include/mouse.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mouse.h,v 1.2 1996/10/13 00:55:50 downsj Exp $	*/
+/*	$OpenBSD: mouse.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: mouse.h,v 1.4 1994/10/27 04:16:10 cgd Exp $	*/
 
 /*-
@@ -24,8 +24,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_MOUSE_H_
-#define _I386_MOUSE_H_
+#ifndef _MACHINE_MOUSE_H_
+#define _MACHINE_MOUSE_H_
 
 struct mouseinfo {
 	unsigned char status;
@@ -50,4 +50,4 @@ struct mouseinfo {
 #define MOUSEIOCSRAW	(MOUSEIOC|61)
 #define MOUSEIOCSCOOKED	(MOUSEIOC|62)
 
-#endif /* !_I386_MOUSE_H_ */
+#endif /* !_MACHINE_MOUSE_H_ */
diff --git a/sys/arch/i386/include/mpbiosreg.h b/sys/arch/i386/include/mpbiosreg.h
index 63efba7acba..d1af6118619 100644
--- a/sys/arch/i386/include/mpbiosreg.h
+++ b/sys/arch/i386/include/mpbiosreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpbiosreg.h,v 1.4 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: mpbiosreg.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $	*/
 /* $NetBSD: mpbiosreg.h,v 1.1.2.3 2000/02/29 13:17:51 sommerfeld Exp $ */
 
 /*-
@@ -32,8 +32,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_MPBIOSREG_H_
-#define _I386_MPBIOSREG_H_
+#ifndef _MACHINE_MPBIOSREG_H_
+#define _MACHINE_MPBIOSREG_H_
 
 #define BIOS_BASE		(0xf0000)
 #define BIOS_SIZE		(0x10000)
@@ -152,4 +152,4 @@ struct mpbios_int {
 	u_int8_t  dst_apic_int;
 };
 
-#endif /* !_I386_MPBIOSREG_H_ */
+#endif /* !_MACHINE_MPBIOSREG_H_ */
diff --git a/sys/arch/i386/include/mpbiosvar.h b/sys/arch/i386/include/mpbiosvar.h
index 09c9be2f986..86525ffae1c 100644
--- a/sys/arch/i386/include/mpbiosvar.h
+++ b/sys/arch/i386/include/mpbiosvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpbiosvar.h,v 1.8 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: mpbiosvar.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $	*/
 /* $NetBSD: mpbiosvar.h,v 1.1.2.3 2000/02/29 13:17:20 sommerfeld Exp $ */
 
 /*-
@@ -33,8 +33,8 @@
  */
 
 
-#ifndef _I386_MPBIOSVAR_H_
-#define _I386_MPBIOSVAR_H_
+#ifndef _MACHINE_MPBIOSVAR_H_
+#define _MACHINE_MPBIOSVAR_H_
 
 #define MP_TRAMPOLINE  (7 * PAGE_SIZE)
 
@@ -83,4 +83,4 @@ void mpbios_intr_fixup(void);
 
 #endif
 
-#endif /* !_I386_MPBIOSVAR_H_ */
+#endif /* !_MACHINE_MPBIOSVAR_H_ */
diff --git a/sys/arch/i386/include/mutex.h b/sys/arch/i386/include/mutex.h
index 044ab5087ad..de340320e57 100644
--- a/sys/arch/i386/include/mutex.h
+++ b/sys/arch/i386/include/mutex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mutex.h,v 1.3 2005/07/18 02:43:25 fgsch Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -24,8 +24,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
-#ifndef _I386_MUTEX_H_
-#define _I386_MUTEX_H_
+#ifndef _MACHINE_MUTEX_H_
+#define _MACHINE_MUTEX_H_
 
 /*
  * XXX - we don't really need the mtx_lock field, we can use mtx_oldipl
diff --git a/sys/arch/i386/include/npx.h b/sys/arch/i386/include/npx.h
index c4171607f67..2949dbb230f 100644
--- a/sys/arch/i386/include/npx.h
+++ b/sys/arch/i386/include/npx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npx.h,v 1.16 2011/03/20 21:44:08 guenther Exp $	*/
+/*	$OpenBSD: npx.h,v 1.17 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: npx.h,v 1.11 1994/10/27 04:16:11 cgd Exp $	*/
 
 /*-
@@ -40,8 +40,8 @@
  * W. Jolitz 1/90
  */
 
-#ifndef	_I386_NPX_H_
-#define	_I386_NPX_H_
+#ifndef	_MACHINE_NPX_H_
+#define	_MACHINE_NPX_H_
 
 /* Environment information of floating point unit */
 struct	env87 {
@@ -166,4 +166,4 @@ void	npxtrap(struct trapframe *);
 void	fpu_kernel_enter(void);
 void	fpu_kernel_exit(void);
 
-#endif /* !_I386_NPX_H_ */
+#endif /* !_MACHINE_NPX_H_ */
diff --git a/sys/arch/i386/include/pcb.h b/sys/arch/i386/include/pcb.h
index 66c1b816a63..afea776a2d3 100644
--- a/sys/arch/i386/include/pcb.h
+++ b/sys/arch/i386/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.15 2011/03/12 03:52:26 guenther Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.16 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: pcb.h,v 1.21 1996/01/08 13:51:42 mycroft Exp $	*/
 
 /*-
@@ -40,8 +40,8 @@
  * Intel 386 process control block
  */
 
-#ifndef _I386_PCB_H_
-#define _I386_PCB_H_
+#ifndef _MACHINE_PCB_H_
+#define _MACHINE_PCB_H_
 
 #include <sys/signal.h>
 
@@ -93,4 +93,4 @@ struct md_coredump {
 	long	md_pad[8];
 };    
 
-#endif /* _I386_PCB_H_ */
+#endif /* _MACHINE_PCB_H_ */
diff --git a/sys/arch/i386/include/pctr.h b/sys/arch/i386/include/pctr.h
index 8dcc8f228e1..9e8b99fce5b 100644
--- a/sys/arch/i386/include/pctr.h
+++ b/sys/arch/i386/include/pctr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pctr.h,v 1.15 2007/10/24 17:56:59 mikeb Exp $	*/
+/*	$OpenBSD: pctr.h,v 1.16 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Pentium performance counter driver for OpenBSD.
@@ -9,8 +9,8 @@
  * OpenBSD project by leaving this copyright notice intact.
  */
 
-#ifndef _I386_PCTR_H_
-#define _I386_PCTR_H_
+#ifndef _MACHINE_PCTR_H_
+#define _MACHINE_PCTR_H_
 
 #include <sys/ioccom.h>
 
@@ -90,4 +90,4 @@ int	pctrclose(dev_t, int, int, struct proc *);
 int	pctrioctl(dev_t, u_long, caddr_t, int, struct proc *);
 
 #endif /* _KERNEL */
-#endif /* ! _I386_PCTR_H_ */
+#endif /* ! _MACHINE_PCTR_H_ */
diff --git a/sys/arch/i386/include/pio.h b/sys/arch/i386/include/pio.h
index 106b2a0c29d..bd56b0f6e07 100644
--- a/sys/arch/i386/include/pio.h
+++ b/sys/arch/i386/include/pio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pio.h,v 1.9 2001/06/27 04:34:23 mickey Exp $	*/
+/*	$OpenBSD: pio.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: pio.h,v 1.13 1996/03/08 20:15:23 cgd Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_PIO_H_
-#define _I386_PIO_H_
+#ifndef _MACHINE_PIO_H_
+#define _MACHINE_PIO_H_
 
 /*
  * Functions to provide access to i386 programmed I/O instructions.
@@ -198,4 +198,4 @@ outsl(int port, const void *addr, int cnt)
 	    : "+S" (addr), "+c" (cnt) : "d" (port) : "cc");
 }
 
-#endif /* _I386_PIO_H_ */
+#endif /* _MACHINE_PIO_H_ */
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index 12f981ee252..7c269ff5be5 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.56 2010/12/26 15:40:59 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.57 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: pmap.h,v 1.44 2000/04/24 17:18:18 thorpej Exp $	*/
 
 /*
@@ -37,8 +37,8 @@
  * pmap.h: see pmap.c for the history of this pmap module.
  */
 
-#ifndef	_I386_PMAP_H_
-#define	_I386_PMAP_H_
+#ifndef	_MACHINE_PMAP_H_
+#define	_MACHINE_PMAP_H_
 
 #include <machine/cpufunc.h>
 #include <machine/pte.h>
@@ -488,4 +488,4 @@ void	pmap_ldt_cleanup(struct proc *);
 #endif /* USER_LDT */
 
 #endif /* _KERNEL */
-#endif	/* _I386_PMAP_H_ */
+#endif	/* _MACHINE_PMAP_H_ */
diff --git a/sys/arch/i386/include/psl.h b/sys/arch/i386/include/psl.h
index 27545225f3d..39b93d748d7 100644
--- a/sys/arch/i386/include/psl.h
+++ b/sys/arch/i386/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.16 2004/06/28 01:41:53 aaron Exp $	*/
+/*	$OpenBSD: psl.h,v 1.17 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: psl.h,v 1.30 1996/05/13 01:28:05 mycroft Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)psl.h	5.2 (Berkeley) 1/18/91
  */
 
-#ifndef _I386_PSL_H_
-#define _I386_PSL_H_
+#ifndef _MACHINE_PSL_H_
+#define _MACHINE_PSL_H_
 
 /*
  * 386 processor status longword.
@@ -94,4 +94,4 @@ struct intrhand {
 #endif /* _LOCORE */
 #endif /* _KERNEL */
  
-#endif /* !_I386_PSL_H_ */
+#endif /* !_MACHINE_PSL_H_ */
diff --git a/sys/arch/i386/include/pte.h b/sys/arch/i386/include/pte.h
index 237d14087e4..1dc9df81457 100644
--- a/sys/arch/i386/include/pte.h
+++ b/sys/arch/i386/include/pte.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pte.h,v 1.12 2010/09/06 14:44:19 jasper Exp $	*/
+/*	$OpenBSD: pte.h,v 1.13 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: pte.h,v 1.11 1998/02/06 21:58:05 thorpej Exp $	*/
 
 /*
@@ -41,8 +41,8 @@
  * to refer to a hardware manual.
  */
 
-#ifndef _I386_PTE_H_
-#define _I386_PTE_H_
+#ifndef _MACHINE_PTE_H_
+#define _MACHINE_PTE_H_
 
 /*
  * i386 MMU hardware structure:
@@ -201,4 +201,4 @@ typedef u_int32_t pt_entry_t;		/* PTE */
 #define PGEX_U		0x04	/* exception while in user mode (upl) */
 #define PGEX_I		0x10	/* instruction fetch blocked by NX */
 
-#endif /* _I386_PTE_H_ */
+#endif /* _MACHINE_PTE_H_ */
diff --git a/sys/arch/i386/include/rbus_machdep.h b/sys/arch/i386/include/rbus_machdep.h
index 8384016d56e..b8c1d54e776 100644
--- a/sys/arch/i386/include/rbus_machdep.h
+++ b/sys/arch/i386/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.8 2010/01/13 09:10:33 jsg Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $	*/
 
 /*
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _I386_RBUS_MACHDEP_H_
-#define _I386_RBUS_MACHDEP_H_
+#ifndef _MACHINE_RBUS_MACHDEP_H_
+#define _MACHINE_RBUS_MACHDEP_H_
 
 struct pci_attach_args;		/* XXX */
 
@@ -47,4 +47,4 @@ bus_addr_t	rbus_min_start_hint(void);
 void		pccbb_attach_hook(struct device *, struct device *,
 		    struct pci_attach_args *);
 
-#endif /* _I386_RBUS_MACHDEP_H_ */
+#endif /* _MACHINE_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/i386/include/reg.h b/sys/arch/i386/include/reg.h
index 2b92eb0d520..d5912a23c06 100644
--- a/sys/arch/i386/include/reg.h
+++ b/sys/arch/i386/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.6 2005/04/03 20:21:44 kettenis Exp $	*/
+/*	$OpenBSD: reg.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: reg.h,v 1.14 1995/10/11 04:20:24 mycroft Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)reg.h	5.5 (Berkeley) 1/18/91
  */
 
-#ifndef _I386_REG_H_
-#define _I386_REG_H_
+#ifndef _MACHINE_REG_H_
+#define _MACHINE_REG_H_
 
 /*
  * Location of the users' stored
@@ -100,4 +100,4 @@ struct xmmregs {
 	char	__data[512];
 };
 
-#endif /* !_I386_REG_H_ */
+#endif /* !_MACHINE_REG_H_ */
diff --git a/sys/arch/i386/include/reloc.h b/sys/arch/i386/include/reloc.h
index 42b34fae737..c183f5475c2 100644
--- a/sys/arch/i386/include/reloc.h
+++ b/sys/arch/i386/include/reloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: reloc.h,v 1.2 2010/06/27 03:11:44 guenther Exp $ */
+/* $OpenBSD: reloc.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $ */
 
 /*
  * Copyright (c) 2002,2003 Dale Rahn
@@ -24,8 +24,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef  _MACH_RELOC_H 
-#define  _MACH_RELOC_H 
+#ifndef  _MACHINE_RELOC_H_
+#define  _MACHINE_RELOC_H_
 #define R_TYPE(X)       __CONCAT(RELOC_,X)
 
 
@@ -49,6 +49,4 @@
 #define RELOC_TLS_DTPOFF32	36 /* Offset in TLS block */
 #define RELOC_TLS_TPOFF32	37 /* Offset in static TLS block */
 
-#endif /* _MACH_RELOC_H */
-
-
+#endif /* _MACHINE_RELOC_H_ */
diff --git a/sys/arch/i386/include/segments.h b/sys/arch/i386/include/segments.h
index 1a56a1887e2..f19433322a0 100644
--- a/sys/arch/i386/include/segments.h
+++ b/sys/arch/i386/include/segments.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: segments.h,v 1.19 2011/03/12 03:52:26 guenther Exp $	*/
+/*	$OpenBSD: segments.h,v 1.20 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: segments.h,v 1.23 1996/02/01 22:31:03 mycroft Exp $	*/
 
 /*-
@@ -42,8 +42,8 @@
  *	William F. Jolitz (william@ernie.berkeley.edu) 6/20/1989
  */
 
-#ifndef _I386_SEGMENTS_H_
-#define _I386_SEGMENTS_H_
+#ifndef _MACHINE_SEGMENTS_H_
+#define _MACHINE_SEGMENTS_H_
 
 /*
  * Selectors
@@ -231,4 +231,4 @@ void idt_vec_free(int);
  */
 #define	NLDT		17
 
-#endif /* _I386_SEGMENTS_H_ */
+#endif /* _MACHINE_SEGMENTS_H_ */
diff --git a/sys/arch/i386/include/signal.h b/sys/arch/i386/include/signal.h
index ed3fb62bbb8..b006e83c164 100644
--- a/sys/arch/i386/include/signal.h
+++ b/sys/arch/i386/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.7 2010/07/03 04:54:32 kettenis Exp $	*/
+/*	$OpenBSD: signal.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: signal.h,v 1.6 1996/01/08 13:51:43 mycroft Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	@(#)signal.h	7.16 (Berkeley) 3/17/91
  */
 
-#ifndef _I386_SIGNAL_H_
-#define _I386_SIGNAL_H_
+#ifndef _MACHINE_SIGNAL_H_
+#define _MACHINE_SIGNAL_H_
 
 #include <sys/cdefs.h>
 
@@ -88,4 +88,4 @@ struct	sigcontext {
 #define sc_ps sc_eflags
 
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif	/* !_I386_SIGNAL_H_ */
+#endif	/* !_MACHINE_SIGNAL_H_ */
diff --git a/sys/arch/i386/include/stdarg.h b/sys/arch/i386/include/stdarg.h
index 9c4ec1b1714..b752bbabce6 100644
--- a/sys/arch/i386/include/stdarg.h
+++ b/sys/arch/i386/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.14 2010/12/30 05:01:36 tedu Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.15 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.12 1995/12/25 23:15:31 mycroft Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _I386_STDARG_H_
-#define	_I386_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define	_MACHINE_STDARG_H_
 
 #include <sys/cdefs.h>
 #include <machine/_types.h>
@@ -56,4 +56,4 @@ typedef __va_list	va_list;
 
 #define	va_end(ap)	
 
-#endif /* !_I386_STDARG_H_ */
+#endif /* !_MACHINE_STDARG_H_ */
diff --git a/sys/arch/i386/include/svr4_machdep.h b/sys/arch/i386/include/svr4_machdep.h
index 17926ef3cfc..dfd506fd5cc 100644
--- a/sys/arch/i386/include/svr4_machdep.h
+++ b/sys/arch/i386/include/svr4_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_machdep.h,v 1.7 2002/03/14 01:26:33 millert Exp $	 */
+/*	$OpenBSD: svr4_machdep.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $	 */
 /*	$NetBSD: svr4_machdep.h,v 1.5 1995/03/31 02:51:37 christos Exp $	 */
 
 /*
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_I386_SVR4_MACHDEP_H_
-#define	_I386_SVR4_MACHDEP_H_
+#ifndef	_MACHINE_SVR4_MACHDEP_H_
+#define	_MACHINE_SVR4_MACHDEP_H_
 
 #include <compat/svr4/svr4_types.h>
 
@@ -116,4 +116,4 @@ struct svr4_ssd {
 #define	SVR4_T_PAGEFLT		14
 #define	SVR4_T_ALIGNFLT		17
 
-#endif /* !_I386_SVR4_MACHDEP_H_ */
+#endif /* !_MACHINE_SVR4_MACHDEP_H_ */
diff --git a/sys/arch/i386/include/sysarch.h b/sys/arch/i386/include/sysarch.h
index 1115026c63d..88be9d6036e 100644
--- a/sys/arch/i386/include/sysarch.h
+++ b/sys/arch/i386/include/sysarch.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: sysarch.h,v 1.6 2011/03/12 03:52:26 guenther Exp $	*/
+/*	$OpenBSD: sysarch.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: sysarch.h,v 1.8 1996/01/08 13:51:44 mycroft Exp $	*/
 
-#ifndef _I386_SYSARCH_H_
-#define _I386_SYSARCH_H_
+#ifndef _MACHINE_SYSARCH_H_
+#define _MACHINE_SYSARCH_H_
 
 /*
  * Architecture specific syscalls (i386)
@@ -55,4 +55,4 @@ int i386_set_gsbase(void *);
 int sysarch(int, void *);
 #endif
 
-#endif /* !_I386_SYSARCH_H_ */
+#endif /* !_MACHINE_SYSARCH_H_ */
diff --git a/sys/arch/i386/include/tss.h b/sys/arch/i386/include/tss.h
index 7590b8ce3a1..705d62b6b18 100644
--- a/sys/arch/i386/include/tss.h
+++ b/sys/arch/i386/include/tss.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tss.h,v 1.7 2006/04/27 15:37:53 mickey Exp $	*/
+/*	$OpenBSD: tss.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: tss.h,v 1.6 1995/10/11 04:20:28 mycroft Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)tss.h	5.4 (Berkeley) 1/18/91
  */
 
-#ifndef _I386_TSS_H_
-#define _I386_TSS_H_
+#ifndef _MACHINE_TSS_H_
+#define _MACHINE_TSS_H_
 
 /*
  * Intel 386 Context Data Type
@@ -71,4 +71,4 @@ struct i386tss {
 	int	tss_ioopt;	/* options and I/O permission map offset */
 };
 
-#endif /* _I386_TSS_H_ */
+#endif /* _MACHINE_TSS_H_ */
diff --git a/sys/arch/i386/include/varargs.h b/sys/arch/i386/include/varargs.h
index 58f14545a9c..9710eb95d48 100644
--- a/sys/arch/i386/include/varargs.h
+++ b/sys/arch/i386/include/varargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:47 millert Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: varargs.h,v 1.14 1995/12/26 01:16:26 mycroft Exp $	*/
 
 /*-
@@ -37,8 +37,8 @@
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  */
 
-#ifndef _I386_VARARGS_H_
-#define	_I386_VARARGS_H_
+#ifndef _MACHINE_VARARGS_H_
+#define	_MACHINE_VARARGS_H_
 
 #include <machine/stdarg.h>
 
@@ -55,4 +55,4 @@
 #define	va_start(ap) \
 	((ap) = (va_list)&__builtin_va_alist)
 
-#endif /* !_I386_VARARGS_H_ */
+#endif /* !_MACHINE_VARARGS_H_ */
diff --git a/sys/arch/i386/include/vga_post.h b/sys/arch/i386/include/vga_post.h
index 36a9a2d4680..913fa68eff0 100644
--- a/sys/arch/i386/include/vga_post.h
+++ b/sys/arch/i386/include/vga_post.h
@@ -1,5 +1,5 @@
 /* $NetBSD: vga_post.h,v 1.2 2008/03/29 17:40:22 jmcneill Exp $ */
-/* $OpenBSD: vga_post.h,v 1.1 2009/06/06 00:35:00 pirofti Exp $ */
+/* $OpenBSD: vga_post.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _X86_VGA_POST_H_
-#define _X86_VGA_POST_H_
+#ifndef _MACHINE_VGA_POST_H_
+#define _MACHINE_VGA_POST_H_
 
 #ifdef _KERNEL
 struct vga_post;
diff --git a/sys/arch/i386/include/vmparam.h b/sys/arch/i386/include/vmparam.h
index 11cd911f1bf..a515322edc0 100644
--- a/sys/arch/i386/include/vmparam.h
+++ b/sys/arch/i386/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.46 2011/01/07 03:15:39 tedu Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.47 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.15 1994/10/27 04:16:34 cgd Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  *	@(#)vmparam.h	5.9 (Berkeley) 5/12/91
  */
 
-#ifndef _MACHINE_VM_PARAM_H_
-#define _MACHINE_VM_PARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 /*
  * Machine dependent constants for 386.
  */
@@ -131,4 +131,4 @@ struct vm_page_md {
 	(pg)->mdpage.pv_list = NULL;	\
 } while (0)
 
-#endif /* _MACHINE_VM_PARAM_H_ */
+#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/landisk/include/atomic.h b/sys/arch/landisk/include/atomic.h
index e3f0a814ad3..161b27ed3d8 100644
--- a/sys/arch/landisk/include/atomic.h
+++ b/sys/arch/landisk/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:42 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __LANDISK_ATOMIC_H__
-#define __LANDISK_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <sh/atomic.h>
 
-#endif /* __LANDISK_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/landisk/include/bus.h b/sys/arch/landisk/include/bus.h
index 6cb749469f1..5514c446910 100644
--- a/sys/arch/landisk/include/bus.h
+++ b/sys/arch/landisk/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.7 2010/04/04 12:49:30 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -62,8 +62,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LANDISK_BUS_H_
-#define	_LANDISK_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define	_MACHINE_BUS_H_
 
 #include <sys/types.h>
 
@@ -589,4 +589,4 @@ paddr_t	_bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, off_t off, int prot, int flags);
 #endif	/* _LANDISK_BUS_DMA_PRIVATE */
 
-#endif	/* _LANDISK_BUS_H_ */
+#endif	/* _MACHINE_BUS_H_ */
diff --git a/sys/arch/landisk/include/conf.h b/sys/arch/landisk/include/conf.h
index ce0cf6bd430..53a9522d8c0 100644
--- a/sys/arch/landisk/include/conf.h
+++ b/sys/arch/landisk/include/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.4 2010/07/21 15:40:04 deraadt Exp $	*/
+/*	$OpenBSD: conf.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1997 Mark Brinicombe.
@@ -39,8 +39,8 @@
  * Prototypes for device driver functions
  */
 
-#ifndef _LANDISK_CONF_H
-#define	_LANDISK_CONF_H
+#ifndef _MACHINE_CONF_H_
+#define	_MACHINE_CONF_H_
  
 
 #include <sys/conf.h>
@@ -74,4 +74,4 @@ cdev_decl(apm);
 cdev_decl(spkr);
 cdev_decl(scif);
 
-#endif	/* _LANDISK_CONF_H_ */
+#endif	/* _MACHINE_CONF_H_ */
diff --git a/sys/arch/landisk/include/cpu.h b/sys/arch/landisk/include/cpu.h
index 47e51585e47..54d84c0d210 100644
--- a/sys/arch/landisk/include/cpu.h
+++ b/sys/arch/landisk/include/cpu.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: cpu.h,v 1.2 2007/04/29 17:53:37 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: cpu.h,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
-#ifndef	_LANDISK_CPU_H_
-#define	_LANDISK_CPU_H_
+#ifndef	_MACHINE_CPU_H_
+#define	_MACHINE_CPU_H_
 
 void machine_reset(void);
 
@@ -23,4 +23,4 @@ void machine_reset(void);
 	{ "led_blink",		CTLTYPE_INT }				\
 }
 
-#endif	/* _LANDISK_CPU_H_ */
+#endif	/* _MACHINE_CPU_H_ */
diff --git a/sys/arch/landisk/include/intr.h b/sys/arch/landisk/include/intr.h
index 6fb05efaccf..68c00e358e4 100644
--- a/sys/arch/landisk/include/intr.h
+++ b/sys/arch/landisk/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.9 2009/03/15 19:40:40 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LANDISK_INTR_H_
-#define _LANDISK_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 #include <sh/intr.h>
 
@@ -89,4 +89,4 @@ void extintr_enable(void *ih);
 void extintr_disable(void *ih);
 void extintr_disable_by_num(int irq);
 
-#endif /* !_LANDISK_INTR_H_ */
+#endif /* !_MACHINE_INTR_H_ */
diff --git a/sys/arch/landisk/include/param.h b/sys/arch/landisk/include/param.h
index 3801db99fac..dd9f47db602 100644
--- a/sys/arch/landisk/include/param.h
+++ b/sys/arch/landisk/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.1 2006/10/06 21:16:15 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -39,8 +39,8 @@
  * Machine dependent constants for landisk
  */
 
-#ifndef _LANDISK_PARAM_H_
-#define _LANDISK_PARAM_H_
+#ifndef _MACHINE_PARAM_H_
+#define _MACHINE_PARAM_H_
 
 #include <sh/param.h>
 
@@ -55,4 +55,4 @@
 #define IOM_RAM_BEGIN	0x0c000000
 #define IOM_RAM_SIZE	0x04000000	/* 64MB */
 
-#endif /* _LANDISK_PARAM_H_ */
+#endif /* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/landisk/include/vmparam.h b/sys/arch/landisk/include/vmparam.h
index 5c1f0229582..5c5d1abed77 100644
--- a/sys/arch/landisk/include/vmparam.h
+++ b/sys/arch/landisk/include/vmparam.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: vmparam.h,v 1.2 2007/05/20 20:16:07 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
-#ifndef _LANDISK_VMPARAM_H_
-#define _LANDISK_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 #include <sh/vmparam.h>
 
@@ -15,4 +15,4 @@
 #define VM_NFREELIST		1
 #define VM_FREELIST_DEFAULT	0
 
-#endif /* _LANDISK_VMPARAM_H_ */
+#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/loongson/include/apmvar.h b/sys/arch/loongson/include/apmvar.h
index 7311616b411..0930f0340b9 100644
--- a/sys/arch/loongson/include/apmvar.h
+++ b/sys/arch/loongson/include/apmvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmvar.h,v 1.1 2010/02/28 08:30:27 otto Exp $	*/
+/*	$OpenBSD: apmvar.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  *  Copyright (c) 2001 Alexander Guy
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-#ifndef _LOONGSON_APMVAR_H_
-#define _LOONGSON_APMVAR_H_
+#ifndef _MACHINE_APMVAR_H_
+#define _MACHINE_APMVAR_H_
 
 #include <sys/ioccom.h>
 
@@ -122,4 +122,4 @@ void apm_setinfohook(int (*)(struct apm_power_info *));
 int apm_record_event(u_int, const char *, const char *);
 #endif
 
-#endif /* _LOONGSON_APMVAR_H_ */
+#endif /* _MACHINE_APMVAR_H_ */
diff --git a/sys/arch/loongson/include/vmparam.h b/sys/arch/loongson/include/vmparam.h
index 0b6cb11698e..b7bee8c3ed2 100644
--- a/sys/arch/loongson/include/vmparam.h
+++ b/sys/arch/loongson/include/vmparam.h
@@ -1,11 +1,11 @@
-/*	$OpenBSD: vmparam.h,v 1.2 2010/11/28 20:28:26 miod Exp $ */
+/*	$OpenBSD: vmparam.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $ */
 /* public domain */
-#ifndef _LOONGSON_VMPARAM_H_
-#define _LOONGSON_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 #define	VM_PHYSSEG_MAX		2 /* Max number of physical memory segments */
 #define	VM_PHYSSEG_STRAT	VM_PSTRAT_BIGFIRST
 
 #include <mips64/vmparam.h>
 
-#endif	/* _LOONGSON_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/luna88k/include/atomic.h b/sys/arch/luna88k/include/atomic.h
index 0a85c5cc875..ff94057f8ec 100644
--- a/sys/arch/luna88k/include/atomic.h
+++ b/sys/arch/luna88k/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __LUNA88K_ATOMIC_H__
-#define __LUNA88K_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <m88k/atomic.h>
 
-#endif /* __LUNA88K_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/luna88k/include/autoconf.h b/sys/arch/luna88k/include/autoconf.h
index 47287777f79..cfd78120827 100644
--- a/sys/arch/luna88k/include/autoconf.h
+++ b/sys/arch/luna88k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.5 2007/05/08 15:33:10 deraadt Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 1999, Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -34,8 +34,8 @@
  * Autoconfiguration information.
  */
 
-#ifndef _LUNA88K_AUTOCONF_H_
-#define _LUNA88K_AUTOCONF_H_
+#ifndef _MACHINE_AUTOCONF_H_
+#define _MACHINE_AUTOCONF_H_
 
 /* the following are from the prom/bootblocks */
 extern void	*bootaddr;	/* PA of boot device */
diff --git a/sys/arch/luna88k/include/board.h b/sys/arch/luna88k/include/board.h
index fe7289a9364..5402fc6bdcf 100644
--- a/sys/arch/luna88k/include/board.h
+++ b/sys/arch/luna88k/include/board.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: board.h,v 1.9 2007/11/25 16:40:04 jmc Exp $	*/
+/*	$OpenBSD: board.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -26,8 +26,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef __LUNA88K_BOARD_H__
-#define __LUNA88K_BOARD_H__
+#ifndef _MACHINE_BOARD_H_
+#define _MACHINE_BOARD_H_
 
 /*
  *      OMRON SX9100DT CPU board constants
@@ -190,4 +190,4 @@
 #define CMMU_I3		U(0xFFF01000) 	/* CMMU instruction cpu 3 */
 #define CMMU_D3		U(0xFFF00000) 	/* CMMU data cpu 3 */
 
-#endif /* __LUNA88K_BOARD_H__ */
+#endif /* _MACHINE_BOARD_H_ */
diff --git a/sys/arch/luna88k/include/bus.h b/sys/arch/luna88k/include/bus.h
index 2df7e4681dd..47f31ef8162 100644
--- a/sys/arch/luna88k/include/bus.h
+++ b/sys/arch/luna88k/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.7 2010/11/22 21:08:57 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.9 1998/01/13 18:32:15 scottr Exp $	*/
 
 /*-
@@ -57,8 +57,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LUNA88K_BUS_H_
-#define _LUNA88K_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 /*
  * Bus address and size types
@@ -479,4 +479,4 @@ __LUNA88K_copy_N(4)
 #define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */
 #define	BUS_SPACE_BARRIER_WRITE	0x02		/* force write barrier */
 
-#endif /* _LUNA88K_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/luna88k/include/cpu.h b/sys/arch/luna88k/include/cpu.h
index e2990974dfe..f2af9e6a177 100644
--- a/sys/arch/luna88k/include/cpu.h
+++ b/sys/arch/luna88k/include/cpu.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: cpu.h,v 1.5 2009/02/16 22:55:03 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $ */
 /* public domain */
-#ifndef	_LUNA88K_CPU_H_
+#ifndef	_MACHINE_CPU_H_
 #define	_LUNA88k_CPU_H_
 
 #include <m88k/cpu.h>
diff --git a/sys/arch/luna88k/include/intr.h b/sys/arch/luna88k/include/intr.h
index a81fa6423a2..49c0875276c 100644
--- a/sys/arch/luna88k/include/intr.h
+++ b/sys/arch/luna88k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.6 2009/03/15 20:39:53 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LUNA88K_INTR_H_
-#define _LUNA88K_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 /*
  * IPL levels.
@@ -48,4 +48,4 @@
 
 #include <m88k/intr.h>
 
-#endif /* _LUNA88K_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/luna88k/include/lcd.h b/sys/arch/luna88k/include/lcd.h
index 3620a88c9af..b5fa1e424f2 100644
--- a/sys/arch/luna88k/include/lcd.h
+++ b/sys/arch/luna88k/include/lcd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcd.h,v 1.1 2007/01/29 14:18:00 aoyama Exp $ */
+/* $OpenBSD: lcd.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
 
 /* 
  * Copyright (c) 2007 Kenji AOYAMA <aoyama@nk-home.net>
@@ -26,8 +26,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _LUNA88K_LCD_H_
-#define _LUNA88K_LCD_H_
+#ifndef _MACHINE_LCD_H_
+#define _MACHINE_LCD_H_
 
 /*
  * OpenBSD/luna88k LCD driver
@@ -62,4 +62,4 @@
 #define	LCDMOVE_D_LEFT	0x18	/* display area shifts to left */
 #define	LCDMOVE_D_RIGHT	0x1c	/* display area shifts to right */
 
-#endif /* _LUNA88K_LCD_H_ */
+#endif /* _MACHINE_LCD_H_ */
diff --git a/sys/arch/m68k/include/asm.h b/sys/arch/m68k/include/asm.h
index 6e806a72da0..640f5b12a95 100644
--- a/sys/arch/m68k/include/asm.h
+++ b/sys/arch/m68k/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.8 2007/11/24 20:58:26 deraadt Exp $	*/
+/*	$OpenBSD: asm.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: asm.h,v 1.13 1997/04/24 22:49:39 thorpej Exp $	*/
 
 /*
@@ -39,8 +39,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ASM_H_
-#define _ASM_H_
+#ifndef _M68K_ASM_H_
+#define _M68K_ASM_H_
 
 #ifdef	__ELF__
 #define	_C_LABEL(name)		name
@@ -169,4 +169,4 @@
 
 #endif /* _KERNEL */
 
-#endif /* _ASM_H_ */
+#endif /* _M68K_ASM_H_ */
diff --git a/sys/arch/m68k/include/atomic.h b/sys/arch/m68k/include/atomic.h
index 9a411d7d0b8..46c7688f64f 100644
--- a/sys/arch/m68k/include/atomic.h
+++ b/sys/arch/m68k/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.3 2007/03/21 05:28:20 miod Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __M68K_ATOMIC_H__
-#define __M68K_ATOMIC_H__
+#ifndef _M68K_ATOMIC_H_
+#define _M68K_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -34,4 +34,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __M68K_ATOMIC_H__ */
+#endif /* _M68K_ATOMIC_H_ */
diff --git a/sys/arch/m68k/include/endian.h b/sys/arch/m68k/include/endian.h
index ca2e6ab46c6..76881edb8e4 100644
--- a/sys/arch/m68k/include/endian.h
+++ b/sys/arch/m68k/include/endian.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: endian.h,v 1.17 2011/03/12 04:03:04 guenther Exp $	*/
+/*	$OpenBSD: endian.h,v 1.18 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -24,8 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
+#ifndef _M68K_ENDIAN_H_
+#define _M68K_ENDIAN_H_
 
 #ifdef __GNUC__
 
@@ -55,4 +55,4 @@
 #define _BYTE_ORDER _BIG_ENDIAN
 #include <sys/endian.h>
 
-#endif /* _MACHINE_ENDIAN_H_ */
+#endif /* _M68K_ENDIAN_H_ */
diff --git a/sys/arch/m68k/include/internal_types.h b/sys/arch/m68k/include/internal_types.h
index 4d1833cf8a0..4e56c8c7c4f 100644
--- a/sys/arch/m68k/include/internal_types.h
+++ b/sys/arch/m68k/include/internal_types.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:11 espie Exp $ */
+/* $OpenBSD: internal_types.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
 /* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
+#ifndef _M68K_INTERNAL_TYPES_H_
+#define _M68K_INTERNAL_TYPES_H_
 
 #endif
diff --git a/sys/arch/m68k/include/mutex.h b/sys/arch/m68k/include/mutex.h
index 4675d44e088..1840ec3856c 100644
--- a/sys/arch/m68k/include/mutex.h
+++ b/sys/arch/m68k/include/mutex.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mutex.h,v 1.1 2007/02/03 20:08:49 miod Exp $	*/
+/*	$OpenBSD: mutex.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
@@ -25,8 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef _MACHINE_MUTEX_H_
-#define _MACHINE_MUTEX_H_
+#ifndef _M68K_MUTEX_H_
+#define _M68K_MUTEX_H_
 
 /*
  * Simple non-mp implementation.
diff --git a/sys/arch/m68k/include/pmap_motorola.h b/sys/arch/m68k/include/pmap_motorola.h
index 67e1182b62e..02c819d6710 100644
--- a/sys/arch/m68k/include/pmap_motorola.h
+++ b/sys/arch/m68k/include/pmap_motorola.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_motorola.h,v 1.21 2010/12/26 15:40:59 miod Exp $	*/
+/*	$OpenBSD: pmap_motorola.h,v 1.22 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* 
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -36,8 +36,8 @@
  *	@(#)pmap.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef	_PMAP_MOTOROLA_H_
-#define	_PMAP_MOTOROLA_H_
+#ifndef	_M68K_M68K_M68K_PMAP_MOTOROLA_H_
+#define	_M68K_M68K_M68K_PMAP_MOTOROLA_H_
 
 #ifdef	_KERNEL
 
@@ -143,4 +143,4 @@ vaddr_t	pmap_prefer(vaddr_t, vaddr_t);
 
 #endif	/* _KERNEL */
 
-#endif /* !_PMAP_MOTOROLA_H_ */
+#endif /* !_M68K_M68K_M68K_PMAP_MOTOROLA_H_ */
diff --git a/sys/arch/m68k/include/pte_motorola.h b/sys/arch/m68k/include/pte_motorola.h
index 79e69583577..27fe0a1a53d 100644
--- a/sys/arch/m68k/include/pte_motorola.h
+++ b/sys/arch/m68k/include/pte_motorola.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pte_motorola.h,v 1.5 2005/09/25 22:19:57 miod Exp $	*/
+/*	$OpenBSD: pte_motorola.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -38,8 +38,8 @@
  *	@(#)pte.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef	_PTE_MOTOROLA_H_
-#define	_PTE_MOTOROLA_H_
+#ifndef	_M68K_M68K_M68K_PTE_MOTOROLA_H_
+#define	_M68K_M68K_M68K_PTE_MOTOROLA_H_
 
 /*
  * m68k hardware with motorola MMU segment/page table entries
@@ -110,4 +110,4 @@ typedef int	pt_entry_t;	/* Mach page table entry */
 #define	kvtopte(va) \
 	(&Sysmap[((unsigned)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT])
 
-#endif /* !_PTE_MOTOROLA_H_ */
+#endif /* !_M68K_M68K_M68K_PTE_MOTOROLA_H_ */
diff --git a/sys/arch/m88k/include/asm.h b/sys/arch/m88k/include/asm.h
index 25ca003130d..627f940625b 100644
--- a/sys/arch/m88k/include/asm.h
+++ b/sys/arch/m88k/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.9 2007/12/02 21:24:21 miod Exp $	*/
+/*	$OpenBSD: asm.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Mach Operating System
@@ -27,8 +27,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef __M88K_ASM_H__
-#define __M88K_ASM_H__
+#ifndef _M88K_ASM_H_
+#define _M88K_ASM_H_
 
 #ifdef __STDC__
 #define	_C_LABEL(name)		_ ## name
@@ -197,4 +197,4 @@
 
 #endif	/* _KERNEL */
 
-#endif	/* __M88K_ASM_H__ */
+#endif	/* _M88K_ASM_H_ */
diff --git a/sys/arch/m88k/include/asm_macro.h b/sys/arch/m88k/include/asm_macro.h
index b0599eb2922..5678acfbef6 100644
--- a/sys/arch/m88k/include/asm_macro.h
+++ b/sys/arch/m88k/include/asm_macro.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm_macro.h,v 1.6 2007/12/20 21:19:34 miod Exp $ */
+/*	$OpenBSD: asm_macro.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -26,8 +26,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef __M88K_ASM_MACRO_H__
-#define __M88K_ASM_MACRO_H__
+#ifndef _M88K_ASM_MACRO_H_
+#define _M88K_ASM_MACRO_H_
 
 /*
  * Various compiler macros used for speed and efficiency.
@@ -75,4 +75,4 @@ static __inline__ u_int get_cpu_pid(void)
 	return (pid);
 }
 
-#endif /* __M88K_ASM_MACRO_H__ */
+#endif /* _M88K_ASM_MACRO_H_ */
diff --git a/sys/arch/m88k/include/atomic.h b/sys/arch/m88k/include/atomic.h
index 86b6edec9da..a2ef2187ce3 100644
--- a/sys/arch/m88k/include/atomic.h
+++ b/sys/arch/m88k/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.7 2009/03/04 19:37:14 miod Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.8 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __M88K_ATOMIC_H__
-#define __M88K_ATOMIC_H__
+#ifndef _M88K_ATOMIC_H_
+#define _M88K_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -54,4 +54,4 @@ atomic_clear_int(__volatile unsigned int *uip)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __M88K_ATOMIC_H__ */
+#endif /* _M88K_ATOMIC_H_ */
diff --git a/sys/arch/m88k/include/cdefs.h b/sys/arch/m88k/include/cdefs.h
index 21999d06ada..4e37dc269bd 100644
--- a/sys/arch/m88k/include/cdefs.h
+++ b/sys/arch/m88k/include/cdefs.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: cdefs.h,v 1.3 2006/01/10 00:04:04 millert Exp $ */
+/*	$OpenBSD: cdefs.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */
 
 /*
  * Written by J.T. Conklin <jtc@wimsey.com> 01/17/95.
  * Public domain.
  */
 
-#ifndef	__MACHINE_CDEFS_H__
-#define	__MACHINE_CDEFS_H__
+#ifndef	_M88K_CDEFS_H_
+#define	_M88K_CDEFS_H_
 
 #if defined(lint)
 #define __indr_reference(sym,alias)	__lint_equal__(sym,alias)
@@ -23,4 +23,4 @@
 	__asm__(".weak _" #alias "; _" #alias "= _" __STRING(sym))
 #endif
 
-#endif /* __MACHINE_CDEFS_H__ */
+#endif /* _M88K_CDEFS_H_ */
diff --git a/sys/arch/m88k/include/cpu.h b/sys/arch/m88k/include/cpu.h
index e14afe7f851..17d4b974df1 100644
--- a/sys/arch/m88k/include/cpu.h
+++ b/sys/arch/m88k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.52 2011/01/05 22:16:14 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.53 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -38,8 +38,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __M88K_CPU_H__
-#define __M88K_CPU_H__
+#ifndef _M88K_CPU_H_
+#define _M88K_CPU_H_
 
 /*
  * CTL_MACHDEP definitions.
@@ -286,4 +286,4 @@ void	set_vbr(register_t);
 extern register_t kernel_vbr;
 
 #endif /* _KERNEL */
-#endif /* __M88K_CPU_H__ */
+#endif /* _M88K_CPU_H_ */
diff --git a/sys/arch/m88k/include/db_machdep.h b/sys/arch/m88k/include/db_machdep.h
index e8c7b74297c..8e5e9be47d9 100644
--- a/sys/arch/m88k/include/db_machdep.h
+++ b/sys/arch/m88k/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.14 2010/11/27 19:57:23 miod Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.15 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -26,8 +26,8 @@
  * rights to redistribute these changes.
  */
 
-#ifndef  _M88K_DB_MACHDEP_H_
-#define  _M88K_DB_MACHDEP_H_
+#ifndef _M88K_DB_MACHDEP_H_
+#define _M88K_DB_MACHDEP_H_
 
 /* trap numbers used by ddb */
 #define	DDB_ENTRY_BKPT_NO	130
diff --git a/sys/arch/m88k/include/endian.h b/sys/arch/m88k/include/endian.h
index 8cc0485cbea..0a2c32e80f0 100644
--- a/sys/arch/m88k/include/endian.h
+++ b/sys/arch/m88k/include/endian.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: endian.h,v 1.4 2011/03/11 15:17:08 pirofti Exp $ */
+/*	$OpenBSD: endian.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -24,13 +24,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MACHINE_ENDIAN_H__
-#define __MACHINE_ENDIAN_H__
+#ifndef _M88K_ENDIAN_H_
+#define _M88K_ENDIAN_H_
 
 #define _BYTE_ORDER _BIG_ENDIAN
 #include <sys/endian.h>
 
 #define	__STRICT_ALIGNMENT
 
-#endif /* __MACHINE_ENDIAN_H__ */
+#endif /* _M88K_ENDIAN_H_ */
 
diff --git a/sys/arch/m88k/include/exec.h b/sys/arch/m88k/include/exec.h
index 2b6a3f6e321..e4f45a2427e 100644
--- a/sys/arch/m88k/include/exec.h
+++ b/sys/arch/m88k/include/exec.h
@@ -1,6 +1,6 @@
-/*	$OpenBSD: exec.h,v 1.1 2004/04/26 12:34:05 miod Exp $ */
-#ifndef __MACHINE_EXEC_H__
-#define __MACHINE_EXEC_H__
+/*	$OpenBSD: exec.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
+#ifndef _M88K_EXEC_H_
+#define _M88K_EXEC_H_
 
 #define __LDPGSZ        4096
 
@@ -29,4 +29,4 @@ struct relocation_info_m88k {
 #define _KERN_DO_AOUT
 #define _KERN_DO_ELF
 
-#endif /* __MACHINE_EXEC_H__ */
+#endif /* _M88K_EXEC_H_ */
diff --git a/sys/arch/m88k/include/float.h b/sys/arch/m88k/include/float.h
index 8e46928dafb..cd903f51969 100644
--- a/sys/arch/m88k/include/float.h
+++ b/sys/arch/m88k/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.3 2008/09/07 20:36:06 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -31,8 +31,8 @@
  *	@(#)float.h	7.1 (Berkeley) 5/8/90
  */
 
-#ifndef __M88K_FLOAT_H__
-#define __M88K_FLOAT_H__
+#ifndef _M88K_FLOAT_H_
+#define _M88K_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -74,4 +74,4 @@ __END_DECLS
 #define LDBL_MAX	1.18973149535723176502e+4932L
 #define LDBL_MAX_10_EXP	4932
 
-#endif /* __M88K_FLOAT_H__ */
+#endif /* _M88K_FLOAT_H_ */
diff --git a/sys/arch/m88k/include/internal_types.h b/sys/arch/m88k/include/internal_types.h
index adcc8987a47..bc3cf703766 100644
--- a/sys/arch/m88k/include/internal_types.h
+++ b/sys/arch/m88k/include/internal_types.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: internal_types.h,v 1.1 2004/04/26 12:34:05 miod Exp $ */
+/* $OpenBSD: internal_types.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $ */
 /* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
+#ifndef _M88K_INTERNAL_TYPES_H_
+#define _M88K_INTERNAL_TYPES_H_
 
 #endif
diff --git a/sys/arch/m88k/include/limits.h b/sys/arch/m88k/include/limits.h
index e650c2f04db..89735c1dbea 100644
--- a/sys/arch/m88k/include/limits.h
+++ b/sys/arch/m88k/include/limits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.4 2009/11/27 19:54:35 guenther Exp $ */
+/*	$OpenBSD: limits.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -30,8 +30,8 @@
  *	from: @(#)limits.h	8.3 (Berkeley) 1/4/94
  */
 
-#ifndef _MACHINE_LIMITS_H_
-#define _MACHINE_LIMITS_H_
+#ifndef _M88K_LIMITS_H_
+#define _M88K_LIMITS_H_
 
 #include <sys/cdefs.h>
 
@@ -52,4 +52,4 @@
 #define	QUAD_MIN	(-QUAD_MAX-1)	/* min value for a quad_t */
 #endif /* __BSD_VISIBLE */
 
-#endif /* _MACHINE_LIMITS_H_ */
+#endif /* _M88K_LIMITS_H_ */
diff --git a/sys/arch/m88k/include/m88100.h b/sys/arch/m88k/include/m88100.h
index 245e2af244f..82b6be45b3c 100644
--- a/sys/arch/m88k/include/m88100.h
+++ b/sys/arch/m88k/include/m88100.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88100.h,v 1.5 2009/02/21 18:37:47 miod Exp $ */
+/*	$OpenBSD: m88100.h,v 1.6 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -25,8 +25,8 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef __M88K_M88100_H__
-#define __M88K_M88100_H__
+#ifndef _M88K_M88100_H_
+#define _M88K_M88100_H_
 
 /*
  *	88100 RISC definitions
@@ -75,4 +75,4 @@ void	m88100_smp_setup(struct cpu_info *);
 
 #endif
 
-#endif /* __M88K_M88100_H__ */
+#endif /* _M88K_M88100_H_ */
diff --git a/sys/arch/m88k/include/m8820x.h b/sys/arch/m88k/include/m8820x.h
index efb1f28a70e..45eaaca75c3 100644
--- a/sys/arch/m88k/include/m8820x.h
+++ b/sys/arch/m88k/include/m8820x.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m8820x.h,v 1.8 2010/04/18 22:04:39 miod Exp $ */
+/*	$OpenBSD: m8820x.h,v 1.9 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -49,8 +49,8 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef	__M88K_M8820X_H__
-#define	__M88K_M8820X_H__
+#ifndef	_M88K_M8820X_H_
+#define	_M88K_M8820X_H_
 
 /*
  * 8820x CMMU definitions
@@ -211,4 +211,4 @@ void	m8820x_setup_board_config(void);
 cpuid_t	m8820x_cpu_number(void);
 
 #endif	/* _LOCORE */
-#endif	/* __M88K_M8820X_H__ */
+#endif	/* _M88K_M8820X_H_ */
diff --git a/sys/arch/m88k/include/mmu.h b/sys/arch/m88k/include/mmu.h
index a6122d8f005..5293d7a40ef 100644
--- a/sys/arch/m88k/include/mmu.h
+++ b/sys/arch/m88k/include/mmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mmu.h,v 1.11 2007/11/21 21:45:47 miod Exp $ */
+/*	$OpenBSD: mmu.h,v 1.12 2011/03/23 16:54:35 pirofti Exp $ */
 
 /*
  * This file bears almost no resemblance to the original m68k file,
@@ -44,8 +44,8 @@
  *	@(#)pte.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef	_MACHINE_MMU_H_
-#define	_MACHINE_MMU_H_
+#ifndef	_M88K_MMU_H_
+#define	_M88K_MMU_H_
 
 /*
  * Parameters which determine the 'geometry' of the m88K page tables in memory.
@@ -216,4 +216,4 @@ invalidate_pte(pt_entry_t *pte)
 	return oldpte;
 }
 
-#endif /* __MACHINE_MMU_H__ */
+#endif /* __M88K_MMU_H__ */
diff --git a/sys/arch/m88k/include/mplock.h b/sys/arch/m88k/include/mplock.h
index 94ffede4ac1..8b9e828bd99 100644
--- a/sys/arch/m88k/include/mplock.h
+++ b/sys/arch/m88k/include/mplock.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mplock.h,v 1.1 2007/12/02 21:20:17 miod Exp $	*/
+/*	$OpenBSD: mplock.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2004 Niklas Hallqvist.  All rights reserved.
@@ -24,8 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MACHINE_MPLOCK_H_
-#define _MACHINE_MPLOCK_H_
+#ifndef _M88K_MPLOCK_H_
+#define _M88K_MPLOCK_H_
 
 #ifndef _LOCORE
 
diff --git a/sys/arch/m88k/include/pmap_table.h b/sys/arch/m88k/include/pmap_table.h
index 6f5944e7612..b44097ae7b2 100644
--- a/sys/arch/m88k/include/pmap_table.h
+++ b/sys/arch/m88k/include/pmap_table.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_table.h,v 1.3 2011/01/02 13:40:07 miod Exp $	*/
+/*	$OpenBSD: pmap_table.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -25,8 +25,8 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef __M88K_PMAP_TABLE_H__
-#define __M88K_PMAP_TABLE_H__
+#ifndef _M88K_PMAP_TABLE_H_
+#define _M88K_PMAP_TABLE_H_
 
 /*
  * Built-in mappings list.
@@ -42,4 +42,4 @@ struct pmap_table {
 
 const struct pmap_table *pmap_table_build(void);
 
-#endif	/* __M88K_PMAP_TABLE_H__ */
+#endif	/* _M88K_PMAP_TABLE_H_ */
diff --git a/sys/arch/m88k/include/proc.h b/sys/arch/m88k/include/proc.h
index dd71a085a1c..95d041da92a 100644
--- a/sys/arch/m88k/include/proc.h
+++ b/sys/arch/m88k/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.4 2005/11/28 22:21:15 miod Exp $ */
+/*	$OpenBSD: proc.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,8 +41,8 @@
  * from: Header: proc.h,v 1.6 92/11/26 02:04:41 torek Exp  (LBL)
  */
 
-#ifndef __MACHINE_PROC_H__
-#define __MACHINE_PROC_H__
+#ifndef _M88K_PROC_H_
+#define _M88K_PROC_H_
 
 struct trapframe;
 
@@ -67,4 +67,4 @@ struct mdproc {
 	u_int	md_bp1save;
 };
 
-#endif /* __MACHINE_PROC_H__ */
+#endif /* _M88K_PROC_H_ */
diff --git a/sys/arch/m88k/include/profile.h b/sys/arch/m88k/include/profile.h
index 6d22d78f6ea..0b625f3ebe9 100644
--- a/sys/arch/m88k/include/profile.h
+++ b/sys/arch/m88k/include/profile.h
@@ -1,6 +1,6 @@
-#ifndef __M88K_PROFILE_H__
-#define __M88K_PROFILE_H__
-/*	$OpenBSD: profile.h,v 1.4 2007/12/20 21:19:34 miod Exp $ */
+#ifndef _M88K_PROFILE_H_
+#define _M88K_PROFILE_H_
+/*	$OpenBSD: profile.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -49,4 +49,4 @@ mcount() \
 #define	MCOUNT_EXIT	set_psr(s)
 #endif /* _KERNEL */
 
-#endif /* __M88K_PROFILE_H__ */
+#endif /* _M88K_PROFILE_H_ */
diff --git a/sys/arch/m88k/include/psl.h b/sys/arch/m88k/include/psl.h
index a03dfa2ddd5..ee9d4da0d81 100644
--- a/sys/arch/m88k/include/psl.h
+++ b/sys/arch/m88k/include/psl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psl.h,v 1.6 2008/07/28 17:50:09 miod Exp $ */
+/*	$OpenBSD: psl.h,v 1.7 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -43,8 +43,8 @@
  *
  */
 
-#ifndef __M88K_PSL_H__
-#define __M88K_PSL_H__
+#ifndef _M88K_PSL_H_
+#define _M88K_PSL_H_
 
 /*
  * 881x0 control registers
@@ -93,4 +93,4 @@
 #define XIP_E		0x00000001	/* exception */
 #define XIP_ADDR	0xfffffffc	/* address mask */
 
-#endif /* __M88K_PSL_H__ */
+#endif /* _M88K_PSL_H_ */
diff --git a/sys/arch/m88k/include/ptrace.h b/sys/arch/m88k/include/ptrace.h
index f258f2fff90..53ed9659e00 100644
--- a/sys/arch/m88k/include/ptrace.h
+++ b/sys/arch/m88k/include/ptrace.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ptrace.h,v 1.3 2005/05/18 16:44:37 miod Exp $ */
+/*	$OpenBSD: ptrace.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 1999, Steve Murphree, Jr.
  * Copyright (c) 1992, 1993
@@ -46,11 +46,11 @@
  * m88k-dependent ptrace definitions.
  */
 
-#ifndef __MACHINE_PTRACE_H__
-#define __MACHINE_PTRACE_H__
+#ifndef _M88K_PTRACE_H_
+#define _M88K_PTRACE_H_
 
 #define	PT_STEP		(PT_FIRSTMACH + 0)
 #define	PT_GETREGS	(PT_FIRSTMACH + 1)
 #define	PT_SETREGS	(PT_FIRSTMACH + 2)
 
-#endif /* __MACHINE_PTRACE_H__ */
+#endif /* _M88K_PTRACE_H_ */
diff --git a/sys/arch/m88k/include/setjmp.h b/sys/arch/m88k/include/setjmp.h
index 397c27d8ee9..c38e9500322 100644
--- a/sys/arch/m88k/include/setjmp.h
+++ b/sys/arch/m88k/include/setjmp.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: setjmp.h,v 1.1 2004/04/26 12:34:05 miod Exp $	*/
+/*	$OpenBSD: setjmp.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /*
  * machine/setjmp.h: machine dependent setjmp-related information.
  */
-#ifndef __MACHINE_SETJMP_H__
-#define __MACHINE_SETJMP_H__
+#ifndef _M88K_SETJMP_H_
+#define _M88K_SETJMP_H_
 #define	_JBLEN	21		/* size, in longs, of a jmp_buf */
-#endif /* __MACHINE_SETJMP_H__ */
+#endif /* _M88K_SETJMP_H_ */
diff --git a/sys/arch/m88k/include/signal.h b/sys/arch/m88k/include/signal.h
index 798c75a148d..ef4dfed462b 100644
--- a/sys/arch/m88k/include/signal.h
+++ b/sys/arch/m88k/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.4 2006/01/09 23:53:41 millert Exp $ */
+/*	$OpenBSD: signal.h,v 1.5 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -30,8 +30,8 @@
  *
  */
 
-#ifndef __MACHINE_SIGNAL_H__
-#define __MACHINE_SIGNAL_H__
+#ifndef _M88K_SIGNAL_H_
+#define _M88K_SIGNAL_H_
 
 #include <sys/cdefs.h>
 
@@ -56,4 +56,4 @@ struct  sigcontext {
 	struct reg sc_regs;
 };
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif /* __MACHINE_SIGNAL_H__ */
+#endif /* _M88K_SIGNAL_H_ */
diff --git a/sys/arch/m88k/include/stdarg.h b/sys/arch/m88k/include/stdarg.h
index 1b42ef6d009..63b13410656 100644
--- a/sys/arch/m88k/include/stdarg.h
+++ b/sys/arch/m88k/include/stdarg.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: stdarg.h,v 1.2 2006/01/06 18:53:05 millert Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
-#ifndef _M88K_STDARGS_H_
-#define _M88K_STDARGS_H_
+#ifndef _M88K_STDARG_H_
+#define _M88K_STDARG_H_
 
 #include <machine/_types.h>
 
@@ -13,4 +13,4 @@
 
 typedef	__va_list	va_list;
 
-#endif	/* _M88K_STDARGS_H_ */
+#endif	/* _M88K_STDARG_H_ */
diff --git a/sys/arch/m88k/include/trap.h b/sys/arch/m88k/include/trap.h
index 642b447d1b6..2012ee1c244 100644
--- a/sys/arch/m88k/include/trap.h
+++ b/sys/arch/m88k/include/trap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.h,v 1.9 2009/03/01 17:43:23 miod Exp $ */
+/*	$OpenBSD: trap.h,v 1.10 2011/03/23 16:54:35 pirofti Exp $ */
 /*
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
@@ -27,8 +27,8 @@
 /*
  * Trap codes
  */
-#ifndef __M88K_TRAP_H__
-#define __M88K_TRAP_H__
+#ifndef _M88K_TRAP_H_
+#define _M88K_TRAP_H_
 
 /*
  * Trap type values
@@ -72,4 +72,4 @@ void	m88110_fpu_exception(struct trapframe *);
 
 #endif /* _LOCORE */
 
-#endif /* __M88K_TRAP_H__ */
+#endif /* _M88K_TRAP_H_ */
diff --git a/sys/arch/mac68k/include/_types.h b/sys/arch/mac68k/include/_types.h
index ce50c6171c0..35b1108bd5b 100644
--- a/sys/arch/mac68k/include/_types.h
+++ b/sys/arch/mac68k/include/_types.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: _types.h,v 1.1 2006/01/06 18:50:09 millert Exp $	*/
+/*	$OpenBSD: _types.h,v 1.2 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* public domain */
 
-#ifndef _MAC68K__TYPES_H_
-#define _MAC68K__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #include <m68k/_types.h>
 
-#endif /* _MAC68K__TYPES_H_ */
+#endif /* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/mac68k/include/asm.h b/sys/arch/mac68k/include/asm.h
index e8e1274d44e..95c23293bbe 100644
--- a/sys/arch/mac68k/include/asm.h
+++ b/sys/arch/mac68k/include/asm.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: asm.h,v 1.3 1997/11/30 06:10:29 gene Exp $	*/
+/*	$OpenBSD: asm.h,v 1.4 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: asm.h,v 1.2 1994/10/26 08:46:25 cgd Exp $	*/
 
-#ifndef _MAC68K_ASM_H_
-#define _MAC68K_ASM_H_
+#ifndef _MACHINE_ASM_H_
+#define _MACHINE_ASM_H_
 
 #include <m68k/asm.h>
 
diff --git a/sys/arch/mac68k/include/atomic.h b/sys/arch/mac68k/include/atomic.h
index 0f5a329af1e..c62462c7c3a 100644
--- a/sys/arch/mac68k/include/atomic.h
+++ b/sys/arch/mac68k/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:35 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __MAC68K_ATOMIC_H__
-#define __MAC68K_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <m68k/atomic.h>
 
-#endif /* __MAC68K_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h
index 737fa7374e7..863e6ebf4fd 100644
--- a/sys/arch/mac68k/include/autoconf.h
+++ b/sys/arch/mac68k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.14 2010/05/23 22:41:50 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.15 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.5 1996/12/17 06:47:40 scottr Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _MAC68K_AUTOCONF_H_
-#define _MAC68K_AUTOCONF_H_
+#ifndef _MACHINE_AUTOCONF_H_
+#define _MACHINE_AUTOCONF_H_
 
 /*
  * Autoconfiguration information.
@@ -54,4 +54,4 @@ void	startrtclock(void);
 
 #endif	/* _KERNEL */
 
-#endif	/* _MAC68K_AUTOCONF_H_ */
+#endif	/* _MACHINE_AUTOCONF_H_ */
diff --git a/sys/arch/mac68k/include/bus.h b/sys/arch/mac68k/include/bus.h
index 75c22b1f333..af7d89dc0dc 100644
--- a/sys/arch/mac68k/include/bus.h
+++ b/sys/arch/mac68k/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.14 2009/07/26 18:48:55 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.15 2011/03/23 16:54:35 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.9 1998/01/13 18:32:15 scottr Exp $	*/
 
 /*-
@@ -57,8 +57,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MAC68K_BUS_H_
-#define _MAC68K_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 /*
  * Value for the mac68k bus space tag, not to be used directly by MI code.
@@ -431,4 +431,4 @@ void mac68k_bssr4_swap(bus_space_tag_t t, bus_space_handle_t *h,
 
 #define	bus_space_vaddr(t, h)			(void *)((h).base)
 
-#endif /* _MAC68K_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/mac68k/include/cdefs.h b/sys/arch/mac68k/include/cdefs.h
index cbacbe37e0f..5c9b2fcc416 100644
--- a/sys/arch/mac68k/include/cdefs.h
+++ b/sys/arch/mac68k/include/cdefs.h
@@ -1,8 +1,3 @@
-/*	$OpenBSD: cdefs.h,v 1.5 2005/11/24 20:46:46 deraadt Exp $	*/
-
-#ifndef _MAC68K_CDEFS_H_
-#define _MAC68K_CDEFS_H_
-
+/*	$OpenBSD: cdefs.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $	*/
+/* public domain */
 #include <m68k/cdefs.h>
-
-#endif /* _MAC68K_CDEFS_H_ */
diff --git a/sys/arch/mac68k/include/db_machdep.h b/sys/arch/mac68k/include/db_machdep.h
index 1b99e8c7ea7..f8188f7e258 100644
--- a/sys/arch/mac68k/include/db_machdep.h
+++ b/sys/arch/mac68k/include/db_machdep.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: db_machdep.h,v 1.3 1997/11/30 06:10:30 gene Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.3 1994/10/26 08:46:27 cgd Exp $	*/
 
-#ifndef _MAC68K_DB_MACHDEP_H_
-#define _MAC68K_DB_MACHDEP_H_
+#ifndef _MACHINE_DB_MACHDEP_H_
+#define _MACHINE_DB_MACHDEP_H_
 
 #include <m68k/db_machdep.h>
 
-#endif	/* _MAC68K_DB_MACHDEP_H_ */
+#endif	/* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/mac68k/include/disklabel.h b/sys/arch/mac68k/include/disklabel.h
index 6142b2af4d2..98612bee869 100644
--- a/sys/arch/mac68k/include/disklabel.h
+++ b/sys/arch/mac68k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.8 2007/06/20 18:15:45 deraadt Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.9 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -30,11 +30,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MAC68K_DISKLABEL_H_
-#define _MAC68K_DISKLABEL_H_
+#ifndef _MACHINE_DISKLABEL_H_
+#define _MACHINE_DISKLABEL_H_
 
 #define	LABELSECTOR	0			/* sector containing label */
 #define	LABELOFFSET	64			/* offset of label in sector */
 #define	MAXPARTITIONS	16			/* number of partitions */
 
-#endif /* _MAC68K_DISKLABEL_H_ */
+#endif /* _MACHINE_DISKLABEL_H_ */
diff --git a/sys/arch/mac68k/include/float.h b/sys/arch/mac68k/include/float.h
index 22c30d794fe..142d8258609 100644
--- a/sys/arch/mac68k/include/float.h
+++ b/sys/arch/mac68k/include/float.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: float.h,v 1.4 1997/11/30 06:12:26 gene Exp $	*/
+/*	$OpenBSD: float.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.6 1996/05/05 06:17:44 briggs Exp $	*/
 
-#ifndef _MAC68K_FLOAT_H_
-#define _MAC68K_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <m68k/float.h>
 
-#endif /* _MAC68K_FLOAT_H_ */
+#endif /* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/mac68k/include/frame.h b/sys/arch/mac68k/include/frame.h
index c6776983dc2..79c680e1459 100644
--- a/sys/arch/mac68k/include/frame.h
+++ b/sys/arch/mac68k/include/frame.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: frame.h,v 1.4 1997/11/30 06:12:27 gene Exp $	*/
+/*	$OpenBSD: frame.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: frame.h,v 1.5 1996/05/05 06:17:46 briggs Exp $	*/
 
-#ifndef _MAC68K_FRAME_H_
-#define _MAC68K_FRAME_H_
+#ifndef _MACHINE_FRAME_H_
+#define _MACHINE_FRAME_H_
 
 #include <m68k/frame.h>
 
-#endif /* _MAC68K_FRAME_H_ */
+#endif /* _MACHINE_FRAME_H_ */
diff --git a/sys/arch/mac68k/include/ieeefp.h b/sys/arch/mac68k/include/ieeefp.h
index c4872b03a52..b9f71534588 100644
--- a/sys/arch/mac68k/include/ieeefp.h
+++ b/sys/arch/mac68k/include/ieeefp.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: ieeefp.h,v 1.3 1997/11/30 06:10:31 gene Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: ieeefp.h,v 1.2 1995/04/16 16:47:07 jtc Exp $	*/
 
-#ifndef _MAC68K_IEEEFP_H_
-#define _MAC68K_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
 
 #include <m68k/ieeefp.h>
 
-#endif	/* _MAC68K_IEEEFP_H_ */
+#endif	/* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h
index 5acce0eb251..64364f25a09 100644
--- a/sys/arch/mac68k/include/intr.h
+++ b/sys/arch/mac68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.21 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.22 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.9 1998/08/12 06:58:42 scottr Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MAC68K_INTR_H_
-#define _MAC68K_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 #include <machine/psl.h>
 
@@ -121,4 +121,4 @@ struct intrhand {
 };
 #endif /* _KERNEL */
 
-#endif /* _MAC68K_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/mac68k/include/limits.h b/sys/arch/mac68k/include/limits.h
index 1d8171e47cf..0dd4fb31483 100644
--- a/sys/arch/mac68k/include/limits.h
+++ b/sys/arch/mac68k/include/limits.h
@@ -1,9 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.4 1997/11/30 06:12:29 gene Exp $	*/
+/*	$OpenBSD: limits.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: limits.h,v 1.6 1994/10/26 08:46:34 cgd Exp $	*/
-
-#ifndef _MAC68K_LIMITS_H_
-#define _MAC68K_LIMITS_H_
-
+/* public domain */
 #include <m68k/limits.h>
-
-#endif /* _MAC68K_LIMITS_H_ */
diff --git a/sys/arch/mac68k/include/param.h b/sys/arch/mac68k/include/param.h
index c9e1348bc79..1747f5fc8ee 100644
--- a/sys/arch/mac68k/include/param.h
+++ b/sys/arch/mac68k/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.21 2006/06/11 20:48:13 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.22 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.28 1997/03/01 06:57:45 scottr Exp $	*/
 
 /*
@@ -73,8 +73,8 @@
  *	@(#)param.h	7.8 (Berkeley) 6/28/91
  */
 
-#ifndef _MAC68K_PARAM_H_
-#define _MAC68K_PARAM_H_
+#ifndef _MACHINE_PARAM_H_
+#define _MACHINE_PARAM_H_
 
 /*
  * Machine dependent constants for Macintosh II-and-similar series.
@@ -97,4 +97,4 @@ void	delay(unsigned);
 #define DELAY(ms)	delay(ms)
 #endif	/* _KERNEL && !_LOCORE */
 
-#endif /* _MAC68K_PARAM_H_ */
+#endif /* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/mac68k/include/pmap.h b/sys/arch/mac68k/include/pmap.h
index 6d0f75cf370..ad7cd3d90ea 100644
--- a/sys/arch/mac68k/include/pmap.h
+++ b/sys/arch/mac68k/include/pmap.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: pmap.h,v 1.19 2005/04/27 00:12:43 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.20 2011/03/23 16:54:36 pirofti Exp $	*/
 
-#ifndef	_MAC68K_PMAP_H_
-#define	_MAC68K_PMAP_H_
+#ifndef	_MACHINE_PMAP_H_
+#define	_MACHINE_PMAP_H_
 
 #include <m68k/pmap_motorola.h>
 
@@ -10,4 +10,4 @@ void pmap_init_md(void);
 #define	PMAP_INIT_MD()	pmap_init_md()
 #endif	/* _KERNEL */
 
-#endif	/* _MAC68K_PMAP_H_ */
+#endif	/* _MACHINE_PMAP_H_ */
diff --git a/sys/arch/mac68k/include/profile.h b/sys/arch/mac68k/include/profile.h
index 9ca89ff0903..d8f8974df40 100644
--- a/sys/arch/mac68k/include/profile.h
+++ b/sys/arch/mac68k/include/profile.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: profile.h,v 1.4 1997/11/30 06:12:33 gene Exp $	*/
+/*	$OpenBSD: profile.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: profile.h,v 1.3 1996/05/05 06:17:55 briggs Exp $	*/
 
-#ifndef _MAC68K_PROFILE_H_
-#define _MAC68K_PROFILE_H_
+#ifndef _MACHINE_PROFILE_H_
+#define _MACHINE_PROFILE_H_
 
 #include <m68k/profile.h>
 
diff --git a/sys/arch/mac68k/include/ptrace.h b/sys/arch/mac68k/include/ptrace.h
index a9568f813a9..17a3905e7f5 100644
--- a/sys/arch/mac68k/include/ptrace.h
+++ b/sys/arch/mac68k/include/ptrace.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: ptrace.h,v 1.3 1997/11/30 06:10:33 gene Exp $	*/
+/*	$OpenBSD: ptrace.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: ptrace.h,v 1.2 1994/10/26 08:46:43 cgd Exp $	*/
 
-#ifndef _MAC68K_PTRACE_H_
-#define _MAC68K_PTRACE_H_
+#ifndef _MACHINE_PTRACE_H_
+#define _MACHINE_PTRACE_H_
 
 #include <m68k/ptrace.h>
 
diff --git a/sys/arch/mac68k/include/reg.h b/sys/arch/mac68k/include/reg.h
index b52c1bb9b31..68d9dbd8fa1 100644
--- a/sys/arch/mac68k/include/reg.h
+++ b/sys/arch/mac68k/include/reg.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: reg.h,v 1.5 2001/08/25 11:37:26 espie Exp $	*/
+/*	$OpenBSD: reg.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: reg.h,v 1.10 1996/05/05 06:18:00 briggs Exp $	*/
 
-#ifndef _MAC68K_REG_H_
-#define	_MAC68K_REG_H_
+#ifndef _MACHINE_REG_H_
+#define	_MACHINE_REG_H_
 
 #include <machine/frame.h>
 #include <m68k/reg.h>
 
-#endif	/* _MAC68K_REG_H_ */
+#endif	/* _MACHINE_REG_H_ */
diff --git a/sys/arch/mac68k/include/scsi_5380.h b/sys/arch/mac68k/include/scsi_5380.h
index 2a180f31d7f..dd52f93069f 100644
--- a/sys/arch/mac68k/include/scsi_5380.h
+++ b/sys/arch/mac68k/include/scsi_5380.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_5380.h,v 1.3 1997/11/30 06:10:34 gene Exp $	*/
+/*	$OpenBSD: scsi_5380.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: scsi_5380.h,v 1.3 1994/10/26 08:46:46 cgd Exp $	*/
 
 /*
@@ -34,8 +34,8 @@
  *	Defines for the NCR 5380 (SCSI chip), aka Am5380
  */
 
-#ifndef _MAC68K_SCSI5380_H_
-#define _MAC68K_SCSI5380_H_
+#ifndef _MACHINE_SCSI_5380_H_
+#define _MACHINE_SCSI_5380_H_
 
 /*
  * Register map
@@ -144,4 +144,4 @@ typedef struct {
 #define SCI_CSR_DREQ		0x40		/* r:  DMA request */
 #define SCI_CSR_DONE		0x80		/* r:  DMA count is zero */
 
-#endif	/* _MAC68K_SCSI5380_H_ */
+#endif	/* _MACHINE_SCSI_5380_H_ */
diff --git a/sys/arch/mac68k/include/setjmp.h b/sys/arch/mac68k/include/setjmp.h
index 7723d37167d..d3ee5255fdf 100644
--- a/sys/arch/mac68k/include/setjmp.h
+++ b/sys/arch/mac68k/include/setjmp.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: setjmp.h,v 1.3 1997/11/30 06:10:34 gene Exp $	*/
+/*	$OpenBSD: setjmp.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: setjmp.h,v 1.1 1994/12/20 10:36:57 cgd Exp $	*/
 
-#ifndef _MAC68K_SETJMP_H_
-#define _MAC68K_SETJMP_H_
+#ifndef _MACHINE_SETJMP_H_
+#define _MACHINE_SETJMP_H_
 
 #include <m68k/setjmp.h>
 
diff --git a/sys/arch/mac68k/include/signal.h b/sys/arch/mac68k/include/signal.h
index de8f84dbf23..8236a88bbde 100644
--- a/sys/arch/mac68k/include/signal.h
+++ b/sys/arch/mac68k/include/signal.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: signal.h,v 1.3 1997/11/30 06:10:35 gene Exp $	*/
+/*	$OpenBSD: signal.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: signal.h,v 1.3 1994/10/26 08:46:47 cgd Exp $	*/
 
-#ifndef _MAC68K_SIGNAL_H_
-#define _MAC68K_SIGNAL_H_
+#ifndef _MACHINE_SIGNAL_H_
+#define _MACHINE_SIGNAL_H_
 
 #include <m68k/signal.h>
 
diff --git a/sys/arch/mac68k/include/stdarg.h b/sys/arch/mac68k/include/stdarg.h
index 1343263b0ab..d6ca78ac8dc 100644
--- a/sys/arch/mac68k/include/stdarg.h
+++ b/sys/arch/mac68k/include/stdarg.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: stdarg.h,v 1.3 1997/11/30 06:10:35 gene Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.5 1994/10/26 08:46:48 cgd Exp $	*/
 
-#ifndef _MAC68K_STDARG_H_
-#define _MAC68K_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define _MACHINE_STDARG_H_
 
 #include <m68k/stdarg.h>
 
diff --git a/sys/arch/mac68k/include/trap.h b/sys/arch/mac68k/include/trap.h
index e817d72270e..74e07d224b7 100644
--- a/sys/arch/mac68k/include/trap.h
+++ b/sys/arch/mac68k/include/trap.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: trap.h,v 1.3 1997/11/30 06:10:36 gene Exp $	*/
+/*	$OpenBSD: trap.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: trap.h,v 1.5 1994/10/26 08:46:49 cgd Exp $	*/
 
-#ifndef _MAC68K_TRAP_H_
-#define _MAC68K_TRAP_H_
+#ifndef _MACHINE_TRAP_H_
+#define _MACHINE_TRAP_H_
 
 #include <m68k/trap.h>
 
diff --git a/sys/arch/mac68k/include/varargs.h b/sys/arch/mac68k/include/varargs.h
index 5b09d808011..1e90c548efc 100644
--- a/sys/arch/mac68k/include/varargs.h
+++ b/sys/arch/mac68k/include/varargs.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: varargs.h,v 1.3 1997/11/30 06:10:36 gene Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: varargs.h,v 1.2 1994/10/26 08:46:51 cgd Exp $	*/
 
-#ifndef _MAC68K_VARARGS_H_
-#define _MAC68K_VARARGS_H_
+#ifndef _MACHINE_VARARGS_H_
+#define _MACHINE_VARARGS_H_
 
 #include <m68k/varargs.h>
 
diff --git a/sys/arch/mac68k/include/viareg.h b/sys/arch/mac68k/include/viareg.h
index 4fc3dc5c32e..52ad5f10686 100644
--- a/sys/arch/mac68k/include/viareg.h
+++ b/sys/arch/mac68k/include/viareg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: viareg.h,v 1.19 2007/09/10 20:29:48 miod Exp $	*/
+/*	$OpenBSD: viareg.h,v 1.20 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: viareg.h,v 1.6 1997/02/28 07:41:41 scottr Exp $	*/
 
 /*-
@@ -38,8 +38,8 @@
 /*
  * Prototype VIA control definitions
  */
-#ifndef _MAC68K_VIAREG_H_
-#define _MAC68K_VIAREG_H_
+#ifndef _MACHINE_VIAREG_H_
+#define _MACHINE_VIAREG_H_
 
 /* VIA1 data register A */
 #define DA1I_vSCCWrReq	0x80
@@ -219,4 +219,4 @@ void	via1_register_irq(int, int (*)(void *), void *, const char *);
 int	via2_register_irq(struct via2hand *, const char *);
 #endif	/* _KERNEL */
 
-#endif	/* _MAC68K_VIAREG_H_ */
+#endif	/* _MACHINE_VIAREG_H_ */
diff --git a/sys/arch/mac68k/include/vmparam.h b/sys/arch/mac68k/include/vmparam.h
index e477c3d4d0e..ec07dcede74 100644
--- a/sys/arch/mac68k/include/vmparam.h
+++ b/sys/arch/mac68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.16 2006/09/17 22:23:40 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.17 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.8 1996/11/15 14:21:00 briggs Exp $	*/
 
 /*
@@ -73,8 +73,8 @@
  *	@(#)vmparam.h	7.3 (Berkeley) 5/7/91
  */
 
-#ifndef _MAC68K_VMPARAM_H_
-#define _MAC68K_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 /*
  * Machine dependent constants for mac68k -- mostly derived from hp300.
@@ -97,4 +97,4 @@
 #define	VM_PHYSSEG_MAX		8
 #define	VM_PHYSSEG_STRAT	VM_PSTRAT_BIGFIRST
 
-#endif	/* _MAC68K_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/mac68k/include/z8530var.h b/sys/arch/mac68k/include/z8530var.h
index f031d38cda9..7e5e45e0641 100644
--- a/sys/arch/mac68k/include/z8530var.h
+++ b/sys/arch/mac68k/include/z8530var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530var.h,v 1.8 2009/03/15 20:40:25 miod Exp $	*/
+/*	$OpenBSD: z8530var.h,v 1.9 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: z8530var.h,v 1.2 1996/06/07 10:27:19 briggs Exp $	*/
 
 /*
@@ -42,8 +42,8 @@
  *	@(#)zsvar.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _MAC68K_Z8530VAR_H_
-#define _MAC68K_Z8530VAR_H_
+#ifndef _MACHINE_Z8530VAR_H_
+#define _MACHINE_Z8530VAR_H_
 
 #ifdef _KERNEL
 #include <mac68k/dev/z8530sc.h>
diff --git a/sys/arch/macppc/include/apmvar.h b/sys/arch/macppc/include/apmvar.h
index d158467e37a..bd00bfdfd9c 100644
--- a/sys/arch/macppc/include/apmvar.h
+++ b/sys/arch/macppc/include/apmvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmvar.h,v 1.5 2009/02/26 17:19:47 oga Exp $	*/
+/*	$OpenBSD: apmvar.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  *  Copyright (c) 2001 Alexander Guy
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-#ifndef _MACPPC_APMVAR_H_
-#define _MACPPC_APMVAR_H_
+#ifndef _MACHINE_APMVAR_H_
+#define _MACHINE_APMVAR_H_
 
 #include <sys/ioccom.h>
 
@@ -117,4 +117,4 @@ struct apm_ctl {
 #define	APM_IOC_STANDBY_REQ	_IO('A', 7)	/* request standby */
 #define	APM_IOC_SUSPEND_REQ	_IO('A', 8)	/* request suspend */
 
-#endif /* _MACPPC_APMVAR_H_ */
+#endif /* _MACHINE_APMVAR_H_ */
diff --git a/sys/arch/macppc/include/atomic.h b/sys/arch/macppc/include/atomic.h
index 9c2125f6652..741dc7ea4a5 100644
--- a/sys/arch/macppc/include/atomic.h
+++ b/sys/arch/macppc/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __MACPPC_ATOMIC_H__
-#define __MACPPC_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <powerpc/atomic.h>
 
-#endif /* __MACPPC_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/macppc/include/rbus_machdep.h b/sys/arch/macppc/include/rbus_machdep.h
index 01278552673..83a230e750b 100644
--- a/sys/arch/macppc/include/rbus_machdep.h
+++ b/sys/arch/macppc/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.5 2010/01/13 09:10:33 jsg Exp $ */
+/*	$OpenBSD: rbus_machdep.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $ */
 /*	$NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $	*/
 
 /*
@@ -27,8 +27,8 @@
  */
 
 
-#if !defined _ARCH_MACPPC_MACPPC_RBUS_MACHDEP_H_
-#define _ARCH_MACPPC_MACPPC_RBUS_MACHDEP_H_
+#if !defined _MACHINE_RBUS_MACHDEP_H_
+#define _MACHINE_RBUS_MACHDEP_H_
 
 struct pci_attach_args;		/* XXX */
 
@@ -59,4 +59,4 @@ rbus_tag_t rbus_pccbb_parent_mem(struct device *self,
 void	pccbb_attach_hook(struct device *, struct device *,
 	    struct pci_attach_args *);
 
-#endif /* _ARCH_MACPPC_MACPPC_RBUS_MACHDEP_H_ */
+#endif /* _MACHINE_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/mips64/include/archtype.h b/sys/arch/mips64/include/archtype.h
index e2b7accef0d..907c413e268 100644
--- a/sys/arch/mips64/include/archtype.h
+++ b/sys/arch/mips64/include/archtype.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: archtype.h,v 1.12 2010/05/08 21:59:56 miod Exp $	*/
+/*	$OpenBSD: archtype.h,v 1.13 2011/03/23 16:54:36 pirofti Exp $	*/
 /*
  * Copyright (c) 1997-2004 Opsycon AB, Sweden (www.opsycon.se)
  *
@@ -25,8 +25,8 @@
  *
  */
 
-#ifndef _MIPS_ARCHTYPE_H_
-#define _MIPS_ARCHTYPE_H_
+#ifndef _MIPS64_ARCHTYPE_H_
+#define _MIPS64_ARCHTYPE_H_
 /*
  * Define architectural identities for the different Mips machines.
  */
@@ -89,4 +89,4 @@
 
 #define	ARCHCLASS(n)	((n) & 0xf0)
 
-#endif /* !_MIPS_ARCHTYPE_H_ */
+#endif /* !_MIPS64_ARCHTYPE_H_ */
diff --git a/sys/arch/mips64/include/asm.h b/sys/arch/mips64/include/asm.h
index 5fb4f23b98b..65289dcaf37 100644
--- a/sys/arch/mips64/include/asm.h
+++ b/sys/arch/mips64/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.13 2010/10/01 05:02:19 guenther Exp $ */
+/*	$OpenBSD: asm.h,v 1.14 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -25,8 +25,8 @@
  * SUCH DAMAGE.
  *
  */
-#ifndef _MIPS64_ASM_H
-#define _MIPS64_ASM_H
+#ifndef _MIPS64_ASM_H_
+#define _MIPS64_ASM_H_
 
 #include <machine/regdef.h>
 
@@ -311,4 +311,4 @@ x: ;				\
 	LA	ci, cpu_info_primary
 #endif /* MULTIPROCESSOR */
 
-#endif /* !_MIPS_ASM_H */
+#endif /* !_MIPS64_ASM_H_ */
diff --git a/sys/arch/mips64/include/atomic.h b/sys/arch/mips64/include/atomic.h
index 7731a67baaa..467a2ada83a 100644
--- a/sys/arch/mips64/include/atomic.h
+++ b/sys/arch/mips64/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.6 2009/12/28 06:55:27 syuu Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __MIPS64_ATOMIC_H__
-#define __MIPS64_ATOMIC_H__
+#ifndef _MIPS64_ATOMIC_H_
+#define _MIPS64_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -84,4 +84,4 @@ atomic_add_uint64(__volatile uint64_t *uip, uint64_t v)
 		"r"(uip), "r"(v) : "memory");
 }
 #endif /* defined(_KERNEL) */
-#endif /* __MIPS64_ATOMIC_H__ */
+#endif /* _MIPS64_ATOMIC_H_ */
diff --git a/sys/arch/mips64/include/cdefs.h b/sys/arch/mips64/include/cdefs.h
index d52376ae167..d2db0bc7aee 100644
--- a/sys/arch/mips64/include/cdefs.h
+++ b/sys/arch/mips64/include/cdefs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdefs.h,v 1.4 2006/01/10 00:04:04 millert Exp $	*/
+/*	$OpenBSD: cdefs.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2002-2003 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -27,8 +27,8 @@
  */
 
 
-#ifndef _MIPS_CDEFS_H_
-#define	_MIPS_CDEFS_H_
+#ifndef _MIPS64_CDEFS_H_
+#define	_MIPS64_CDEFS_H_
 
 #if defined(lint)
 #define __indr_reference(sym,alias)	__lint_equal__(sym,alias)
@@ -44,4 +44,4 @@
 #define	__indr_references(sym,msg)	/* nothing */
 #endif
 
-#endif /* !_MIPS_CDEFS_H_ */
+#endif /* !_MIPS64_CDEFS_H_ */
diff --git a/sys/arch/mips64/include/cpu.h b/sys/arch/mips64/include/cpu.h
index 2ef12590d9d..3438add409e 100644
--- a/sys/arch/mips64/include/cpu.h
+++ b/sys/arch/mips64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.69 2010/11/24 21:16:26 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.70 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,8 +42,8 @@
  *	from: @(#)cpu.h	8.4 (Berkeley) 1/4/94
  */
 
-#ifndef _MIPS_CPU_H_
-#define	_MIPS_CPU_H_
+#ifndef _MIPS64_CPU_H_
+#define	_MIPS64_CPU_H_
 
 #ifndef _LOCORE
 
@@ -635,4 +635,4 @@ uint32_t getsr(void);
 uint32_t setsr(uint32_t);
 
 #endif /* _KERNEL && !_LOCORE */
-#endif /* !_MIPS_CPU_H_ */
+#endif /* !_MIPS64_CPU_H_ */
diff --git a/sys/arch/mips64/include/db_machdep.h b/sys/arch/mips64/include/db_machdep.h
index 26f2d9f4371..2ddf903fb32 100644
--- a/sys/arch/mips64/include/db_machdep.h
+++ b/sys/arch/mips64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.11 2010/11/27 19:57:23 miod Exp $ */
+/*	$OpenBSD: db_machdep.h,v 1.12 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1998-2003 Opsycon AB (www.opsycon.se)
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef	_MIPS_DB_MACHDEP_H_
-#define	_MIPS_DB_MACHDEP_H_
+#ifndef	_MIPS64_DB_MACHDEP_H_
+#define	_MIPS64_DB_MACHDEP_H_
 
 #include <machine/frame.h>
 #include <machine/trap.h>
@@ -82,4 +82,4 @@ extern struct mutex ddb_mp_mutex;
 #define DDB_STATE_RUNNING	1
 #define DDB_STATE_EXITING	2
 
-#endif	/* !_MIPS_DB_MACHDEP_H_ */
+#endif	/* !_MIPS64_DB_MACHDEP_H_ */
diff --git a/sys/arch/mips64/include/endian.h b/sys/arch/mips64/include/endian.h
index 093c0bc100e..71d0554ec60 100644
--- a/sys/arch/mips64/include/endian.h
+++ b/sys/arch/mips64/include/endian.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: endian.h,v 1.6 2011/03/11 15:17:08 pirofti Exp $ */
+/*	$OpenBSD: endian.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 2001-2002 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
+#ifndef _MIPS64_ENDIAN_H_
+#define _MIPS64_ENDIAN_H_
 
 #if defined(__MIPSEL__)
 #define _BYTE_ORDER _LITTLE_ENDIAN
@@ -44,4 +44,4 @@
 
 #define	__STRICT_ALIGNMENT
 
-#endif /* _MACHINE_ENDIAN_H_ */
+#endif /* _MIPS64_ENDIAN_H_ */
diff --git a/sys/arch/mips64/include/float.h b/sys/arch/mips64/include/float.h
index 4764dfea4a9..3e9c05ada9e 100644
--- a/sys/arch/mips64/include/float.h
+++ b/sys/arch/mips64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.6 2010/07/17 17:52:43 miod Exp $	*/
+/*	$OpenBSD: float.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -31,8 +31,8 @@
  *	@(#)float.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MIPS_FLOAT_H_
-#define _MIPS_FLOAT_H_
+#ifndef _MIPS64_FLOAT_H_
+#define _MIPS64_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -74,4 +74,4 @@ __END_DECLS
 #define LDBL_MAX	1.18973149535723176508575932662800702e+4932L
 #define LDBL_MAX_10_EXP	4932
 
-#endif	/* !_MIPS_FLOAT_H_ */
+#endif	/* !_MIPS64_FLOAT_H_ */
diff --git a/sys/arch/mips64/include/ieeefp.h b/sys/arch/mips64/include/ieeefp.h
index 0c2f18909b5..f3dbac462b2 100644
--- a/sys/arch/mips64/include/ieeefp.h
+++ b/sys/arch/mips64/include/ieeefp.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: ieeefp.h,v 1.3 2010/09/21 20:29:17 miod Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 11, 1995
  * Public domain.
  */
 
-#ifndef _MIPS_IEEEFP_H_
-#define _MIPS_IEEEFP_H_
+#ifndef _MIPS64_IEEEFP_H_
+#define _MIPS64_IEEEFP_H_
 
 typedef int fp_except;
 #define FP_X_IMP	0x01	/* imprecise (loss of precision) */
@@ -43,4 +43,4 @@ typedef enum {
 
 #endif
 
-#endif /* !_MIPS_IEEEFP_H_ */
+#endif /* !_MIPS64_IEEEFP_H_ */
diff --git a/sys/arch/mips64/include/kcore.h b/sys/arch/mips64/include/kcore.h
index b7449467a60..e88cb0e5fe3 100644
--- a/sys/arch/mips64/include/kcore.h
+++ b/sys/arch/mips64/include/kcore.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kcore.h,v 1.1 2004/08/06 20:56:02 pefo Exp $	*/
+/*	$OpenBSD: kcore.h,v 1.2 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: kcore.h,v 1.1 1996/03/10 21:55:18 leo Exp $	*/
 
 /*
@@ -31,8 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MIPS_KCORE_H_
-#define	_MIPS_KCORE_H_
+#ifndef _MIPS64_KCORE_H_
+#define	_MIPS64_KCORE_H_
 
 #define	NPHYS_RAM_SEGS	8
 
@@ -42,4 +42,4 @@ typedef struct cpu_kcore_hdr {
 	phys_ram_seg_t  ram_segs[NPHYS_RAM_SEGS];
 } cpu_kcore_hdr_t;
 
-#endif /* !_MIPS_KCORE_H_ */
+#endif /* !_MIPS64_KCORE_H_ */
diff --git a/sys/arch/mips64/include/limits.h b/sys/arch/mips64/include/limits.h
index 71e839360f6..cdb6d60a9b1 100644
--- a/sys/arch/mips64/include/limits.h
+++ b/sys/arch/mips64/include/limits.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: limits.h,v 1.6 2009/11/27 19:54:35 guenther Exp $	*/
+/*	$OpenBSD: limits.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993
@@ -31,8 +31,8 @@
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
  */
 
-#ifndef _MIPS_LIMITS_H_
-#define _MIPS_LIMITS_H_
+#ifndef _MIPS64_LIMITS_H_
+#define _MIPS64_LIMITS_H_
 
 #include <sys/cdefs.h>
 
@@ -53,4 +53,4 @@
 
 #endif /* __BSD_VISIBLE */
 
-#endif /* !_MIPS_LIMITS_H_ */
+#endif /* !_MIPS64_LIMITS_H_ */
diff --git a/sys/arch/mips64/include/loongson2.h b/sys/arch/mips64/include/loongson2.h
index a5e4a032e7b..1561b19cbc2 100644
--- a/sys/arch/mips64/include/loongson2.h
+++ b/sys/arch/mips64/include/loongson2.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: loongson2.h,v 1.2 2010/01/28 21:24:08 miod Exp $	*/
+/*	$OpenBSD: loongson2.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef	_MACHINE_LOONGSON2_H_
-#define	_MACHINE_LOONGSON2_H_
+#ifndef	_MIPS64_LOONGSON2_H_
+#define	_MIPS64_LOONGSON2_H_
 
 /*
  * Loongson 2E/2F specific defines
@@ -57,4 +57,4 @@
 #define	COP_0_DIAG_BTB_CLEAR		0x02
 #define	COP_0_DIAG_RAS_DISABLE		0x01
 
-#endif	/* _MACHINE_LOONGSON2_H_ */
+#endif	/* _MIPS64_LOONGSON2_H_ */
diff --git a/sys/arch/mips64/include/memconf.h b/sys/arch/mips64/include/memconf.h
index cb9c3c9cdac..9373abfa51b 100644
--- a/sys/arch/mips64/include/memconf.h
+++ b/sys/arch/mips64/include/memconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memconf.h,v 1.5 2009/11/19 06:06:49 miod Exp $	*/
+/*	$OpenBSD: memconf.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -29,8 +29,8 @@
  * Memory config list used by pmap_bootstrap.
  */
 
-#ifndef _MIPS_MEMCONF_H_
-#define _MIPS_MEMCONF_H_
+#ifndef _MIPS64_MEMCONF_H_
+#define _MIPS64_MEMCONF_H_
 
 struct phys_mem_desc {
 	uint64_t	mem_first_page;
@@ -46,4 +46,4 @@ extern struct phys_mem_desc mem_layout[];
 int	memrange_register(uint64_t, uint64_t, uint64_t, unsigned int);
 #endif
 
-#endif /* !_MIPS_MEMCONF_H_ */
+#endif /* !_MIPS64_MEMCONF_H_ */
diff --git a/sys/arch/mips64/include/mips_opcode.h b/sys/arch/mips64/include/mips_opcode.h
index 6c324c10efa..fadd9c972b0 100644
--- a/sys/arch/mips64/include/mips_opcode.h
+++ b/sys/arch/mips64/include/mips_opcode.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: mips_opcode.h,v 1.5 2010/09/19 23:34:33 miod Exp $	*/
+/*      $OpenBSD: mips_opcode.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
  *	from: @(#)mips_opcode.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MIPS_MIPS_OPCODE_H_
-#define	_MIPS_MIPS_OPCODE_H_
+#ifndef _MIPS64_MIPS_OPCODE_H_
+#define	_MIPS64_MIPS_OPCODE_H_
 
 /*
  * Define the instruction formats and opcode values for the
@@ -336,4 +336,4 @@ typedef union {
 #define	OP_NMADD	06
 #define	OP_NMSUB	07
 
-#endif /* !_MIPS_MIPS_OPCODE_H_ */
+#endif /* !_MIPS64_MIPS_OPCODE_H_ */
diff --git a/sys/arch/mips64/include/param.h b/sys/arch/mips64/include/param.h
index c0570edd533..c1276defcf6 100644
--- a/sys/arch/mips64/include/param.h
+++ b/sys/arch/mips64/include/param.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: param.h,v 1.27 2010/11/28 20:35:15 miod Exp $ */
+/*      $OpenBSD: param.h,v 1.28 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -37,8 +37,8 @@
  *	from: @(#)param.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MIPS_PARAM_H_
-#define _MIPS_PARAM_H_
+#ifndef _MIPS64_PARAM_H_
+#define _MIPS64_PARAM_H_
 
 #ifdef _KERNEL
 #include <machine/cpu.h>
@@ -109,4 +109,4 @@ void delay(int);
 #endif
 #endif /* _KERNEL */
 
-#endif /* !_MIPS_PARAM_H_ */
+#endif /* !_MIPS64_PARAM_H_ */
diff --git a/sys/arch/mips64/include/pcb.h b/sys/arch/mips64/include/pcb.h
index 18bc0dfbad7..6243b028b24 100644
--- a/sys/arch/mips64/include/pcb.h
+++ b/sys/arch/mips64/include/pcb.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pcb.h,v 1.4 2010/02/13 14:04:45 miod Exp $	*/
+/*      $OpenBSD: pcb.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -37,8 +37,8 @@
  *	from: @(#)pcb.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MIPS_PCB_H_
-#define _MIPS_PCB_H_
+#ifndef _MIPS64_PCB_H_
+#define _MIPS64_PCB_H_
 
 #include <machine/frame.h>
 
@@ -62,4 +62,4 @@ struct md_coredump {
 	long	md_pad[8];
 };
 
-#endif	/* !_MIPS_PCB_H_ */
+#endif	/* !_MIPS64_PCB_H_ */
diff --git a/sys/arch/mips64/include/pmap.h b/sys/arch/mips64/include/pmap.h
index ddc59007d3d..7c969b277db 100644
--- a/sys/arch/mips64/include/pmap.h
+++ b/sys/arch/mips64/include/pmap.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pmap.h,v 1.24 2010/12/26 15:40:59 miod Exp $ */
+/*      $OpenBSD: pmap.h,v 1.25 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1987 Carnegie-Mellon University
@@ -35,8 +35,8 @@
  *	from: @(#)pmap.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef	_MIPS_PMAP_H_
-#define	_MIPS_PMAP_H_
+#ifndef	_MIPS64_PMAP_H_
+#define	_MIPS64_PMAP_H_
 
 #ifdef	_KERNEL
 
@@ -163,4 +163,4 @@ vm_page_t pmap_unmap_direct(vaddr_t);
 
 #endif	/* _KERNEL */
 
-#endif	/* !_MIPS_PMAP_H_ */
+#endif	/* !_MIPS64_PMAP_H_ */
diff --git a/sys/arch/mips64/include/proc.h b/sys/arch/mips64/include/proc.h
index f4d31e7201a..04aba12c08c 100644
--- a/sys/arch/mips64/include/proc.h
+++ b/sys/arch/mips64/include/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.7 2010/11/24 21:16:26 miod Exp $	*/
+/*	$OpenBSD: proc.h,v 1.8 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
  *	@(#)proc.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef	_MIPS_PROC_H_
-#define	_MIPS_PROC_H_
+#ifndef	_MIPS64_PROC_H_
+#define	_MIPS64_PROC_H_
 
 /*
  * Machine-dependent part of the proc structure.
@@ -77,4 +77,4 @@ struct mdproc {
 #define	MDP_WATCH2	0x00040000	/* Watch register 1 used */
 #define	MDP_FORKSAVE	0x0000ffff	/* Flags to save when forking */
 
-#endif	/* !_MIPS_PROC_H_ */
+#endif	/* !_MIPS64_PROC_H_ */
diff --git a/sys/arch/mips64/include/profile.h b/sys/arch/mips64/include/profile.h
index e5dce1ed317..4b48e1c436e 100644
--- a/sys/arch/mips64/include/profile.h
+++ b/sys/arch/mips64/include/profile.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: profile.h,v 1.3 2009/12/11 05:10:17 miod Exp $	*/
+/*      $OpenBSD: profile.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -33,8 +33,8 @@
  *
  *	from: @(#)profile.h	8.1 (Berkeley) 6/10/93
  */
-#ifndef	_MIPS_PROFILE_H_
-#define	_MIPS_PROFILE_H_
+#ifndef	_MIPS64_PROFILE_H_
+#define	_MIPS64_PROFILE_H_
 
 #define	_MCOUNT_DECL static void ___mcount
 
@@ -81,4 +81,4 @@
 #define	MCOUNT_EXIT	_splx(s)
 #endif /* _KERNEL */
 
-#endif /* !_MIPS_PROFILE_H_ */
+#endif /* !_MIPS64_PROFILE_H_ */
diff --git a/sys/arch/mips64/include/ptrace.h b/sys/arch/mips64/include/ptrace.h
index a89fd596b6c..a6399a6b2fe 100644
--- a/sys/arch/mips64/include/ptrace.h
+++ b/sys/arch/mips64/include/ptrace.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ptrace.h,v 1.2 2005/08/07 07:29:44 miod Exp $	*/
+/*      $OpenBSD: ptrace.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -31,8 +31,8 @@
  *	from: @(#)ptrace.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MIPS_PTRACE_H_
-#define _MIPS_PTRACE_H_
+#ifndef _MIPS64_PTRACE_H_
+#define _MIPS64_PTRACE_H_
 
 /*
  * Machine dependent trace commands.
@@ -43,4 +43,4 @@
 #define	PT_SETREGS	 (PT_FIRSTMACH+1)
 #define	PT_STEP		 (PT_FIRSTMACH+2)
 
-#endif /* !_MIPS_PTRACE_H_ */
+#endif /* !_MIPS64_PTRACE_H_ */
diff --git a/sys/arch/mips64/include/reg.h b/sys/arch/mips64/include/reg.h
index 1af5bae6e3e..9a67a457ec9 100644
--- a/sys/arch/mips64/include/reg.h
+++ b/sys/arch/mips64/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.2 2005/08/07 07:29:44 miod Exp $	*/
+/*	$OpenBSD: reg.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -37,8 +37,8 @@
  *	@(#)reg.h	8.2 (Berkeley) 1/11/94
  */
 
-#ifndef _MIPS_REG_H_
-#define _MIPS_REG_H_
+#ifndef _MIPS64_REG_H_
+#define _MIPS64_REG_H_
 /*
  * Location of the users' stored
  * registers relative to ZERO.
@@ -54,4 +54,4 @@
 struct reg {
         register_t     r_regs[NREGS];	/* numbered as above */
 };
-#endif /* !_MIPS_REG_H_ */
+#endif /* !_MIPS64_REG_H_ */
diff --git a/sys/arch/mips64/include/regdef.h b/sys/arch/mips64/include/regdef.h
index ae18392391f..fe62f63f143 100644
--- a/sys/arch/mips64/include/regdef.h
+++ b/sys/arch/mips64/include/regdef.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: regdef.h,v 1.3 2005/08/07 07:29:44 miod Exp $	*/
+/*	$OpenBSD: regdef.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
  *
  *	@(#)regdef.h	8.1 (Berkeley) 6/10/93
  */
-#ifndef _MIPS_REGDEF_H_
-#define _MIPS_REGDEF_H_
+#ifndef _MIPS64_REGDEF_H_
+#define _MIPS64_REGDEF_H_
 
 #define zero	$0	/* always zero */
 #define AT	$at	/* assembler temp */
@@ -89,4 +89,4 @@
 #define s8	$30	/* one more callee saved */
 #define ra	$31	/* return address */
 
-#endif /* !_MIPS_REGDEF_H_ */
+#endif /* !_MIPS64_REGDEF_H_ */
diff --git a/sys/arch/mips64/include/setjmp.h b/sys/arch/mips64/include/setjmp.h
index d611ac3f426..51097989680 100644
--- a/sys/arch/mips64/include/setjmp.h
+++ b/sys/arch/mips64/include/setjmp.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: setjmp.h,v 1.2 2004/08/10 21:10:56 pefo Exp $	*/
+/*	$OpenBSD: setjmp.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public domain */
 
-#ifndef _MIPS_SETJMP_H_
-#define _MIPS_SETJMP_H_
+#ifndef _MIPS64_SETJMP_H_
+#define _MIPS64_SETJMP_H_
 
 #define	_JBLEN	83		/* size, in longs, of a jmp_buf */
 
-#endif /* !_MIPS_SETJMP_H_ */
+#endif /* !_MIPS64_SETJMP_H_ */
diff --git a/sys/arch/mips64/include/signal.h b/sys/arch/mips64/include/signal.h
index 4425e862a49..8061057125a 100644
--- a/sys/arch/mips64/include/signal.h
+++ b/sys/arch/mips64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.8 2006/01/09 18:18:37 millert Exp $	*/
+/*	$OpenBSD: signal.h,v 1.9 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
  *	@(#)signal.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MIPS_SIGNAL_H_
-#define _MIPS_SIGNAL_H_
+#ifndef _MIPS64_SIGNAL_H_
+#define _MIPS64_SIGNAL_H_
 
 #include <sys/cdefs.h>
 
@@ -81,4 +81,4 @@ struct	sigcontext {
 #define	SC_FPC_EIR	(71 * REGSZ)
 #endif /* __LANGUAGE_ASSEMBLY */
 
-#endif	/* !_MIPS_SIGNAL_H_ */
+#endif	/* !_MIPS64_SIGNAL_H_ */
diff --git a/sys/arch/mips64/include/spinlock.h b/sys/arch/mips64/include/spinlock.h
index 283a41903e3..87e9be5a768 100644
--- a/sys/arch/mips64/include/spinlock.h
+++ b/sys/arch/mips64/include/spinlock.h
@@ -1,11 +1,11 @@
-/*	$OpenBSD: spinlock.h,v 1.2 2004/08/10 21:10:56 pefo Exp $	*/
+/*	$OpenBSD: spinlock.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
  /* Public domain */
 
-#ifndef _MIPS_SPINLOCK_H_
-#define _MIPS_SPINLOCK_H_
+#ifndef _MIPS64_SPINLOCK_H_
+#define _MIPS64_SPINLOCK_H_
 
 #define _SPINLOCK_UNLOCKED	(0)
 #define _SPINLOCK_LOCKED	(1)
 typedef int _spinlock_lock_t;
 
-#endif /* !_MIPS_SPINLOCK_H_ */
+#endif /* !_MIPS64_SPINLOCK_H_ */
diff --git a/sys/arch/mips64/include/stdarg.h b/sys/arch/mips64/include/stdarg.h
index 5e8769beca7..d569959c0c4 100644
--- a/sys/arch/mips64/include/stdarg.h
+++ b/sys/arch/mips64/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.7 2008/10/23 21:25:07 kettenis Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.8 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -31,8 +31,8 @@
  *	@(#)stdarg.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MIPS_STDARG_H_
-#define	_MIPS_STDARG_H_
+#ifndef _MIPS64_STDARG_H_
+#define	_MIPS64_STDARG_H_
 
 #include <sys/cdefs.h>
 #include <machine/_types.h>
@@ -61,8 +61,8 @@ typedef char * __gnuc_va_list;
 
 /* If this is for internal libc use, don't define anything but __gnuc_va_list */
 
-#ifndef _VA_MIPS_H_ENUM
-#define _VA_MIPS_H_ENUM
+#ifndef _MIPS64_STDARG_H_
+#define _MIPS64_STDARG_H_
 enum {
   __no_type_class = -1,
   __void_type_class,
@@ -244,4 +244,4 @@ void va_end (__gnuc_va_list);		/* Defined in libgcc.a */
 /* Copy __gnuc_va_list into another variable of this type.  */
 #define __va_copy(dest, src) (dest) = (src)
 
-#endif /* !_MIPS_STDARG_H_ */
+#endif /* !_MIPS64_STDARG_H_ */
diff --git a/sys/arch/mips64/include/trap.h b/sys/arch/mips64/include/trap.h
index c1533aace1f..445e9ca0a2a 100644
--- a/sys/arch/mips64/include/trap.h
+++ b/sys/arch/mips64/include/trap.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: trap.h,v 1.12 2010/01/18 16:57:44 miod Exp $	*/
+/*      $OpenBSD: trap.h,v 1.13 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -37,8 +37,8 @@
  *	from: @(#)trap.h	8.1 (Berkeley) 6/10/93
  */
 
-#ifndef _MIPS_TRAP_H_
-#define _MIPS_TRAP_H_
+#ifndef _MIPS64_TRAP_H_
+#define _MIPS64_TRAP_H_
 
 /*
  * Trap codes (ExcCode in the cause register); also known in trap.c for
@@ -125,4 +125,4 @@ void trapDump(char *msg);
 #endif
 #endif /* _LOCORE */
 
-#endif /* !_MIPS_TRAP_H_ */
+#endif /* !_MIPS64_TRAP_H_ */
diff --git a/sys/arch/mips64/include/varargs.h b/sys/arch/mips64/include/varargs.h
index 702f981021d..f008bcc3bf2 100644
--- a/sys/arch/mips64/include/varargs.h
+++ b/sys/arch/mips64/include/varargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: varargs.h,v 1.2 2005/08/07 07:29:44 miod Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -36,8 +36,8 @@
  *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
  */
 
-#ifndef _MIPS_VARARGS_H_
-#define	_MIPS_VARARGS_H_
+#ifndef _MIPS64_VARARGS_H_
+#define	_MIPS64_VARARGS_H_
 
 #include <machine/stdarg.h>
 
@@ -47,4 +47,4 @@
 #define	va_start(ap) \
 	ap = (char *)&va_alist
 
-#endif /* !_MIPS_VARARGS_H_ */
+#endif /* !_MIPS64_VARARGS_H_ */
diff --git a/sys/arch/mips64/include/vmparam.h b/sys/arch/mips64/include/vmparam.h
index 3258da6ce0a..f62e462e1ba 100644
--- a/sys/arch/mips64/include/vmparam.h
+++ b/sys/arch/mips64/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.22 2010/12/15 05:30:19 tedu Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.23 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $	*/
 
 /*
@@ -38,8 +38,8 @@
  *	@(#)vmparam.h	8.2 (Berkeley) 4/22/94
  */
 
-#ifndef _MIPS_VMPARAM_H_
-#define _MIPS_VMPARAM_H_
+#ifndef _MIPS64_VMPARAM_H_
+#define _MIPS64_VMPARAM_H_
 
 /*
  * Machine dependent constants mips processors.
@@ -140,4 +140,4 @@ struct vm_page_md {
 
 #endif	/* _KERNEL && !_LOCORE */
 
-#endif /* !_MIPS_VMPARAM_H_ */
+#endif /* !_MIPS64_VMPARAM_H_ */
diff --git a/sys/arch/mvme68k/include/atomic.h b/sys/arch/mvme68k/include/atomic.h
index d8f11efa428..acd3f628b99 100644
--- a/sys/arch/mvme68k/include/atomic.h
+++ b/sys/arch/mvme68k/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __MVME68K_ATOMIC_H__
-#define __MVME68K_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <m68k/atomic.h>
 
-#endif /* __MVME68K_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/mvme68k/include/autoconf.h b/sys/arch/mvme68k/include/autoconf.h
index 429a6cfa7c7..585a56ab988 100644
--- a/sys/arch/mvme68k/include/autoconf.h
+++ b/sys/arch/mvme68k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.17 2009/03/01 22:08:13 miod Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.18 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MVME68K_AUTOCONF_H_
-#define _MVME68K_AUTOCONF_H_
+#ifndef _MACHINE_AUTOCONF_H_
+#define _MACHINE_AUTOCONF_H_
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/mvme68k/include/bus.h b/sys/arch/mvme68k/include/bus.h
index 9d898749c4b..9e2d3e44229 100644
--- a/sys/arch/mvme68k/include/bus.h
+++ b/sys/arch/mvme68k/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.6 2009/07/30 21:39:54 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -33,8 +33,8 @@
  * the management functions.
  */
 
-#ifndef	_MVME68K_BUS_H_
-#define	_MVME68K_BUS_H_
+#ifndef	_MACHINE_BUS_H_
+#define	_MACHINE_BUS_H_
 
 #include <sys/types.h>
 
@@ -797,4 +797,4 @@ void	bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
 paddr_t bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, off_t off, int prot, int flags);
 
-#endif	/* _MVME68K_BUS_H_ */
+#endif	/* _MACHINE_BUS_H_ */
diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index 492c7898cae..cb6f653fcfc 100644
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.33 2010/07/24 12:18:58 miod Exp $ */
+/*	$OpenBSD: cpu.h,v 1.34 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -61,8 +61,8 @@
  *	@(#)cpu.h	8.4 (Berkeley) 1/5/94
  */
 
-#ifndef _MVME68K_CPU_H_
-#define _MVME68K_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 /*
  * Exported definitions unique to mvme68k cpu support.
@@ -216,4 +216,4 @@ int intr_findvec(int, int);
 paddr_t kvtop(vaddr_t);
 
 #endif	/* _KERNEL */
-#endif	/* _MVME68K_CPU_H_ */
+#endif	/* _MACHINE_CPU_H_ */
diff --git a/sys/arch/mvme68k/include/disklabel.h b/sys/arch/mvme68k/include/disklabel.h
index 2815e417369..874fbed1317 100644
--- a/sys/arch/mvme68k/include/disklabel.h
+++ b/sys/arch/mvme68k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.11 2007/06/20 18:15:45 deraadt Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.12 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 1996 Nivas Madhur
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */  
 
-#ifndef _MVME68K_DISKLABEL_H_
-#define _MVME68K_DISKLABEL_H_
+#ifndef _MACHINE_DISKLABEL_H_
+#define _MACHINE_DISKLABEL_H_
 
 #define LABELSECTOR     0                       /* sector containing label */
 #define LABELOFFSET	0			/* offset of label in sector */
@@ -132,4 +132,4 @@ struct mvmedisklabel {
 	u_long		magic2;
 	u_char		cfg_4[192];
 };
-#endif	/* _MVME68K_DISKLABEL_H_ */
+#endif	/* _MACHINE_DISKLABEL_H_ */
diff --git a/sys/arch/mvme68k/include/intr.h b/sys/arch/mvme68k/include/intr.h
index 636df352576..309d87302ab 100644
--- a/sys/arch/mvme68k/include/intr.h
+++ b/sys/arch/mvme68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.20 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.21 2011/03/23 16:54:36 pirofti Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MVME68K_INTR_H_
-#define _MVME68K_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 #include <machine/psl.h>
 
@@ -75,4 +75,4 @@
 int	spl0(void);
 
 #endif /* _KERNEL */
-#endif /* _MVME68K_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/mvme68k/include/nvram.h b/sys/arch/mvme68k/include/nvram.h
index 7a2e4c31d61..e1029bc0835 100644
--- a/sys/arch/mvme68k/include/nvram.h
+++ b/sys/arch/mvme68k/include/nvram.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvram.h,v 1.5 2003/06/02 05:09:14 deraadt Exp $ */
+/*	$OpenBSD: nvram.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_MVME68K_NVRAM_H_
-#define	_MVME68K_NVRAM_H_
+#ifndef	_MACHINE_NVRAM_H_
+#define	_MACHINE_NVRAM_H_
 
 struct nvram_147 {
 	u_char	user[0x400];
diff --git a/sys/arch/mvme68k/include/vmparam.h b/sys/arch/mvme68k/include/vmparam.h
index 8ece9d88b40..7f46c6a3144 100644
--- a/sys/arch/mvme68k/include/vmparam.h
+++ b/sys/arch/mvme68k/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.16 2006/06/04 17:20:39 miod Exp $ */
+/*	$OpenBSD: vmparam.h,v 1.17 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -38,8 +38,8 @@
  *	@(#)vmparam.h	8.2 (Berkeley) 4/19/94
  */
 
-#ifndef _MVME68K_VMPARAM_H_
-#define _MVME68K_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 /*
  * Machine dependent constants for MVME68K
@@ -61,4 +61,4 @@
 #define	VM_PHYSSEG_MAX		1
 #define	VM_PHYSSEG_STRAT	VM_PSTRAT_RANDOM
 
-#endif /* _MVME68K_VMPARAM_H_ */
+#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/mvme88k/include/atomic.h b/sys/arch/mvme88k/include/atomic.h
index 51af8ca4d5f..751ea9a18ff 100644
--- a/sys/arch/mvme88k/include/atomic.h
+++ b/sys/arch/mvme88k/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __MVME88K_ATOMIC_H__
-#define __MVME88K_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <m88k/atomic.h>
 
-#endif /* __MVME88K_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/mvme88k/include/autoconf.h b/sys/arch/mvme88k/include/autoconf.h
index dcd6943e79c..dfc8e6cabb7 100644
--- a/sys/arch/mvme88k/include/autoconf.h
+++ b/sys/arch/mvme88k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.17 2007/05/08 15:33:10 deraadt Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.18 2011/03/23 16:54:36 pirofti Exp $ */
 /*
  * Copyright (c) 1999, Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -34,8 +34,8 @@
  * Autoconfiguration information.
  */
 
-#ifndef _MVME88K_AUTOCONF_H_
-#define _MVME88K_AUTOCONF_H_
+#ifndef _MACHINE_AUTOCONF_H_
+#define _MACHINE_AUTOCONF_H_
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/mvme88k/include/bugio.h b/sys/arch/mvme88k/include/bugio.h
index ce7340a33ee..ad078622509 100644
--- a/sys/arch/mvme88k/include/bugio.h
+++ b/sys/arch/mvme88k/include/bugio.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: bugio.h,v 1.16 2006/05/02 21:43:08 miod Exp $ */
+/*	$OpenBSD: bugio.h,v 1.17 2011/03/23 16:54:36 pirofti Exp $ */
 
-#ifndef __MACHINE_BUGIO_H__
-#define __MACHINE_BUGIO_H__
+#ifndef _MACHINE_BUGIO_H_
+#define _MACHINE_BUGIO_H_
 
 #include <machine/prom.h>
 
@@ -14,4 +14,4 @@ void	bugbrdid(struct mvmeprom_brdid *);
 void	bugdiskrd(struct mvmeprom_dskio *);
 int	spin_cpu(cpuid_t, vaddr_t);
 
-#endif /* __MACHINE_BUGIO_H__ */
+#endif /* _MACHINE_BUGIO_H_ */
diff --git a/sys/arch/mvme88k/include/bus.h b/sys/arch/mvme88k/include/bus.h
index a6b96bc4223..3ed50988340 100644
--- a/sys/arch/mvme88k/include/bus.h
+++ b/sys/arch/mvme88k/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.9 2009/07/30 21:39:54 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.10 2011/03/23 16:54:36 pirofti Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -33,8 +33,8 @@
  * the management functions.
  */
 
-#ifndef	_MVME88K_BUS_H_
-#define	_MVME88K_BUS_H_
+#ifndef	_MACHINE_BUS_H_
+#define	_MACHINE_BUS_H_
 
 #include <machine/asm_macro.h>
 
@@ -806,4 +806,4 @@ void	bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
 paddr_t bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, off_t off, int prot, int flags);
 
-#endif	/* _MVME88K_BUS_H_ */
+#endif	/* _MACHINE_BUS_H_ */
diff --git a/sys/arch/mvme88k/include/cpu.h b/sys/arch/mvme88k/include/cpu.h
index b824f8c6b3a..f5e8b4b9fba 100644
--- a/sys/arch/mvme88k/include/cpu.h
+++ b/sys/arch/mvme88k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.44 2009/03/15 20:39:53 miod Exp $ */
+/* $OpenBSD: cpu.h,v 1.45 2011/03/23 16:54:36 pirofti Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1992, 1993
@@ -37,8 +37,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef	_MVME88K_CPU_H_
-#define	_MVME88K_CPU_H_
+#ifndef	_MACHINE_CPU_H_
+#define	_MACHINE_CPU_H_
 
 #include <m88k/cpu.h>
 
diff --git a/sys/arch/mvme88k/include/disklabel.h b/sys/arch/mvme88k/include/disklabel.h
index 38daff81ada..bbce10c66a6 100644
--- a/sys/arch/mvme88k/include/disklabel.h
+++ b/sys/arch/mvme88k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.14 2007/06/20 18:15:45 deraadt Exp $ */
+/*	$OpenBSD: disklabel.h,v 1.15 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 1996 Nivas Madhur
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __MACHINE_DISKLABEL_H__
-#define __MACHINE_DISKLABEL_H__
+#ifndef _MACHINE_DISKLABEL_H_
+#define _MACHINE_DISKLABEL_H_
 
 #define LABELSECTOR     0                       /* sector containing label */
 #define LABELOFFSET	0			/* offset of label in sector */
@@ -117,4 +117,4 @@ struct mvmedisklabel {
 	u_char		cfg_4[192];
 };
 
-#endif /* __MACHINE_DISKLABEL_H__ */
+#endif /* _MACHINE_DISKLABEL_H_ */
diff --git a/sys/arch/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h
index 93b8f804d4e..854ccd51bce 100644
--- a/sys/arch/mvme88k/include/intr.h
+++ b/sys/arch/mvme88k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.20 2009/03/15 20:39:53 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.21 2011/03/23 16:54:36 pirofti Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MVME88K_INTR_H_
-#define _MVME88K_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 /*
  * IPL levels.
@@ -53,4 +53,4 @@
 
 #include <m88k/intr.h>
 
-#endif /* _MVME88K_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/mvme88k/include/m88110.h b/sys/arch/mvme88k/include/m88110.h
index 306bd6cd4ac..df52f528604 100644
--- a/sys/arch/mvme88k/include/m88110.h
+++ b/sys/arch/mvme88k/include/m88110.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: m88110.h,v 1.23 2010/12/31 20:54:21 miod Exp $ */
+/*	$OpenBSD: m88110.h,v 1.24 2011/03/23 16:54:36 pirofti Exp $ */
 
-#ifndef	__MACHINE_M88110_H__
-#define	__MACHINE_M88110_H__
+#ifndef	_MACHINE_M88110_H_
+#define	_MACHINE_M88110_H_
 
 /*
  *	88110 CMMU definitions
@@ -204,4 +204,4 @@ m88110_skip_insn(struct trapframe *frame)
 }
 
 #endif	/* _LOCORE */
-#endif	/* __MACHINE_M88110_H__ */
+#endif	/* _MACHINE_M88110_H_ */
diff --git a/sys/arch/mvme88k/include/m8820x.h b/sys/arch/mvme88k/include/m8820x.h
index 1a763f05f48..30804b9a6d7 100644
--- a/sys/arch/mvme88k/include/m8820x.h
+++ b/sys/arch/mvme88k/include/m8820x.h
@@ -1,6 +1,6 @@
-#ifndef	_MVME88K_M8820X_H_
-#define	_MVME88K_M8820X_H_
-/*	$OpenBSD: m8820x.h,v 1.15 2004/08/06 13:23:49 miod Exp $ */
+#ifndef	_MACHINE_M8820X_H_
+#define	_MACHINE_M8820X_H_
+/*	$OpenBSD: m8820x.h,v 1.16 2011/03/23 16:54:36 pirofti Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -70,4 +70,4 @@
 
 #include <m88k/m8820x.h>
 
-#endif	/* _MVME88K_M8820X_H_ */
+#endif	/* _MACHINE_M8820X_H_ */
diff --git a/sys/arch/mvme88k/include/m88410.h b/sys/arch/mvme88k/include/m88410.h
index 02a969450ff..ad8201c3297 100644
--- a/sys/arch/mvme88k/include/m88410.h
+++ b/sys/arch/mvme88k/include/m88410.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m88410.h,v 1.13 2010/12/31 20:54:21 miod Exp $ */
+/*	$OpenBSD: m88410.h,v 1.14 2011/03/23 16:54:36 pirofti Exp $ */
 /*
  * Copyright (c) 2001 Steve Murphree, Jr.
  * All rights reserved.
@@ -30,8 +30,8 @@
  *
  */
 
-#ifndef	__M88410_H__
-#define	__M88410_H__
+#ifndef	_MACHINE_M88410_H_
+#define	_MACHINE_M88410_H_
 
 #ifdef _KERNEL
 
@@ -61,4 +61,4 @@ mc88410_present(void)
 
 #endif	/* _KERNEL */
 
-#endif	/* __M88410_H__ */
+#endif	/* _MACHINE_M88410_H_ */
diff --git a/sys/arch/mvme88k/include/mvme187.h b/sys/arch/mvme88k/include/mvme187.h
index f6e3e031bff..88b986d72d9 100644
--- a/sys/arch/mvme88k/include/mvme187.h
+++ b/sys/arch/mvme88k/include/mvme187.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme187.h,v 1.9 2006/11/18 22:53:11 miod Exp $ */
+/*	$OpenBSD: mvme187.h,v 1.10 2011/03/23 16:54:36 pirofti Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -43,8 +43,8 @@
  * thereof, and that both notices appear in supporting documentation.
  *
  */
-#ifndef __MACHINE_MVME187_H__
-#define __MACHINE_MVME187_H__
+#ifndef _MACHINE_MVME187_H_
+#define _MACHINE_MVME187_H_
 
 #define BUG187_START	0xff800000	/* start of BUG PROM */
 #define BUG187_SIZE	0x00400000	/* size of BUG PROM */
@@ -67,4 +67,4 @@
 extern u_int32_t pfsr_save_187[];
 #endif
 
-#endif	/* __MACHINE_MVME187_H__ */
+#endif	/* _MACHINE_MVME187_H_ */
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index 817af7bb040..97bbab5f425 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.33 2009/03/08 16:03:05 miod Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.34 2011/03/23 16:54:36 pirofti Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -43,8 +43,8 @@
  *
  */
 
-#ifndef	__MACHINE_MVME188_H__
-#define	__MACHINE_MVME188_H__
+#ifndef	_MACHINE_MVME188_H_
+#define	_MACHINE_MVME188_H_
 
 #define MVME188_EPROM		0xffc00000
 #define MVME188_EPROM_SIZE	0x00080000
@@ -223,4 +223,4 @@ extern u_int32_t pfsr_save_188_quad[];
 extern u_int32_t int_mask_val[NIPLS];
 #endif
 
-#endif	/* __MACHINE_MVME188_H__ */
+#endif	/* _MACHINE_MVME188_H_ */
diff --git a/sys/arch/mvme88k/include/mvme197.h b/sys/arch/mvme88k/include/mvme197.h
index 3e52cc28c8f..ae6c5ab6787 100644
--- a/sys/arch/mvme88k/include/mvme197.h
+++ b/sys/arch/mvme88k/include/mvme197.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme197.h,v 1.11 2011/01/02 17:55:27 miod Exp $ */
+/*	$OpenBSD: mvme197.h,v 1.12 2011/03/23 16:54:36 pirofti Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -43,8 +43,8 @@
  * thereof, and that both notices appear in supporting documentation.
  *
  */
-#ifndef __MACHINE_MVME197_H__
-#define __MACHINE_MVME197_H__
+#ifndef _MACHINE_MVME197_H_
+#define _MACHINE_MVME197_H_
 
 #define	ECDM_BASE	0xfff01100	/* not what the doc says... */
 
@@ -66,4 +66,4 @@ void	m197_send_complex_ipi(int, cpuid_t, u_int32_t, u_int32_t);
 void	m197_send_ipi(int, cpuid_t);
 #endif
 
-#endif	/* __MACHINE_MVME197_H__ */
+#endif	/* _MACHINE_MVME197_H_ */
diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h
index 750fd8a54ff..6eb3116a01e 100644
--- a/sys/arch/mvme88k/include/prom.h
+++ b/sys/arch/mvme88k/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.18 2010/12/23 20:05:08 miod Exp $ */
+/*	$OpenBSD: prom.h,v 1.19 2011/03/23 16:54:36 pirofti Exp $ */
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -27,8 +27,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __MACHINE_PROM_H__
-#define __MACHINE_PROM_H__
+#ifndef _MACHINE_PROM_H_
+#define _MACHINE_PROM_H_
 
 /* BUG trap vector */
 #define	MVMEPROM_VECTOR		496
@@ -173,4 +173,4 @@ struct mvmeprom_dskio {
 #ifndef RB_NOSYM
 #define RB_NOSYM 0x4000
 #endif
-#endif /* __MACHINE_PROM_H__ */
+#endif /* _MACHINE_PROM_H_ */
diff --git a/sys/arch/mvmeppc/include/atomic.h b/sys/arch/mvmeppc/include/atomic.h
index ca0cd2f12b5..741dc7ea4a5 100644
--- a/sys/arch/mvmeppc/include/atomic.h
+++ b/sys/arch/mvmeppc/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __MVMEPPC_ATOMIC_H__
-#define __MVMEPPC_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <powerpc/atomic.h>
 
-#endif /* __MVMEPPC_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/mvmeppc/include/bus.h b/sys/arch/mvmeppc/include/bus.h
index 2a0cbff57fc..be6c127ba93 100644
--- a/sys/arch/mvmeppc/include/bus.h
+++ b/sys/arch/mvmeppc/include/bus.h
@@ -1,5 +1,5 @@
 /*      $NetBSD: bus.h,v 1.6 2001/06/15 15:50:05 nonaka Exp $        */
-/*	$OpenBSD: bus.h,v 1.4 2008/06/26 05:42:12 ray Exp $	*/
+/*	$OpenBSD: bus.h,v 1.5 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -94,8 +94,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PREP_BUS_H_
-#define _PREP_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 #define _POWERPC_BUS_DMA_PRIVATE
 #include <machine/bus_mi.h>
@@ -121,4 +121,4 @@ extern const struct ppc_bus_space prep_isa_mem_space_tag;
 void prep_bus_space_init(void);
 void prep_bus_space_mallocok(void);
 
-#endif /* _PREP_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/mvmeppc/include/bus_mi.h b/sys/arch/mvmeppc/include/bus_mi.h
index a6bdedf978d..fd9649bbc29 100644
--- a/sys/arch/mvmeppc/include/bus_mi.h
+++ b/sys/arch/mvmeppc/include/bus_mi.h
@@ -1,5 +1,5 @@
 /*	$NetBSD: bus.h,v 1.1 2001/06/06 17:37:37 matt Exp $	*/
-/*	$OpenBSD: bus_mi.h,v 1.12 2010/04/04 12:49:30 miod Exp $	*/
+/*	$OpenBSD: bus_mi.h,v 1.13 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -94,8 +94,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _POWERPC_BUS_H_
-#define _POWERPC_BUS_H_
+#ifndef _MACHINE_BUS_MI_H_
+#define _MACHINE_BUS_MI_H_
 
 #include <machine/pio.h>
 
@@ -1133,4 +1133,4 @@ int	_bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
 	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
 	    paddr_t low, paddr_t high);
 #endif /* _POWERPC_BUS_DMA_PRIVATE */
-#endif /* _POWERPC_BUS_H_ */
+#endif /* _MACHINE_BUS_MI_H_ */
diff --git a/sys/arch/mvmeppc/include/prom.h b/sys/arch/mvmeppc/include/prom.h
index a089e625db2..62c48a3ea78 100644
--- a/sys/arch/mvmeppc/include/prom.h
+++ b/sys/arch/mvmeppc/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.5 2004/01/24 21:10:31 miod Exp $ */
+/*	$OpenBSD: prom.h,v 1.6 2011/03/23 16:54:36 pirofti Exp $ */
 /*
  * Copyright (c) 2001 Steve Murphree, Jr.
  * All rights reserved.
@@ -23,8 +23,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __MACHINE_PROM_H__
-#define __MACHINE_PROM_H__
+#ifndef _MACHINE_PROM_H_
+#define _MACHINE_PROM_H_
 
 #define MVMEPROM_INCHR		0x0000
 #define MVMEPROM_INSTAT		0x0001
@@ -364,4 +364,4 @@ struct mvmeprom_args {
 #ifndef RB_NOSYM
 #define RB_NOSYM 0x4000
 #endif
-#endif /* __MACHINE_PROM_H__ */
+#endif /* _MACHINE_PROM_H_ */
diff --git a/sys/arch/octeon/include/cpu.h b/sys/arch/octeon/include/cpu.h
index 2f7ed1cd5c3..edaea5ce55b 100644
--- a/sys/arch/octeon/include/cpu.h
+++ b/sys/arch/octeon/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.2 2010/11/23 18:46:29 syuu Exp $ */
+/* $OpenBSD: cpu.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,8 +41,8 @@
  *	from: @(#)cpu.h	8.4 (Berkeley) 1/4/94
  */
 
-#ifndef _OCTEON_CPU_H_
-#define _OCTEON_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 #ifdef _KERNEL
 #if defined(MULTIPROCESSOR) && !defined(_LOCORE)
@@ -75,4 +75,4 @@ void hw_cpu_init_secondary(struct cpu_info *);
 
 #include <mips64/cpu.h>
 
-#endif /* !_OCTEON_CPU_H_ */
+#endif /* !_MACHINE_CPU_H_ */
diff --git a/sys/arch/palm/include/_types.h b/sys/arch/palm/include/_types.h
index fcf438af8e2..9727bc818aa 100644
--- a/sys/arch/palm/include/_types.h
+++ b/sys/arch/palm/include/_types.h
@@ -1,7 +1,7 @@
-/* 	$OpenBSD: _types.h,v 1.2 2009/11/04 19:14:10 kettenis Exp $	*/
+/* 	$OpenBSD: _types.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
-#ifndef _PALM__TYPES_H_
-#define	_PALM__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define	_MACHINE__TYPES_H_
 
 #include <arm/_types.h>
 
diff --git a/sys/arch/palm/include/atomic.h b/sys/arch/palm/include/atomic.h
index 7dc6d3f12ae..f88c0c50d1f 100644
--- a/sys/arch/palm/include/atomic.h
+++ b/sys/arch/palm/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.1 2009/09/05 01:22:11 marex Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.2 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __PALM_ATOMIC_H__
-#define __PALM_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <arm/atomic.h>
 
-#endif /* __PALM_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/palm/include/conf.h b/sys/arch/palm/include/conf.h
index 23a40d5a45b..f537361c069 100644
--- a/sys/arch/palm/include/conf.h
+++ b/sys/arch/palm/include/conf.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: conf.h,v 1.2 2010/11/28 20:49:47 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $	*/
 
-#ifndef _PALM_CONF_H
-#define	_PALM_CONF_H
+#ifndef _MACHINE_CONF_H_
+#define	_MACHINE_CONF_H_
 
 #include <sys/conf.h>
 
@@ -12,4 +12,4 @@
 
 #include <arm/conf.h>
 
-#endif	/* _PALM_CONF_H */
+#endif	/* _MACHINE_CONF_H_ */
diff --git a/sys/arch/palm/include/intr.h b/sys/arch/palm/include/intr.h
index 8cdb0868853..869a3760a70 100644
--- a/sys/arch/palm/include/intr.h
+++ b/sys/arch/palm/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.2 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_EVBARM_INTR_H_
-#define	_EVBARM_INTR_H_
+#ifndef	_MACHINE_INTR_H_
+#define	_MACHINE_INTR_H_
 
 #ifdef _KERNEL
 
@@ -101,5 +101,5 @@
 
 #endif /* _KERNEL */
 
-#endif	/* _EVBARM_INTR_H_ */
+#endif	/* _MACHINE_INTR_H_ */
 
diff --git a/sys/arch/palm/include/param.h b/sys/arch/palm/include/param.h
index eda43c5ff2d..f31b8ad1163 100644
--- a/sys/arch/palm/include/param.h
+++ b/sys/arch/palm/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.1 2009/09/05 01:22:11 marex Exp $	*/
+/*	$OpenBSD: param.h,v 1.2 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.4 2002/02/12 06:58:19 thorpej Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_PALM_PARAM_H_
-#define	_PALM_PARAM_H_
+#ifndef	_MACHINE_PARAM_H_
+#define	_MACHINE_PARAM_H_
 
 /*
  * 1 page should be enough
@@ -48,4 +48,4 @@
 #define	_MACHINE	palm
 #define	MACHINE		"palm"
 
-#endif	/* _PALM_PARAM_H_ */
+#endif	/* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/palm/include/spinlock.h b/sys/arch/palm/include/spinlock.h
index 08f6357886f..fb2e9dd8f57 100644
--- a/sys/arch/palm/include/spinlock.h
+++ b/sys/arch/palm/include/spinlock.h
@@ -1,7 +1,7 @@
 
-/*	$OpenBSD: spinlock.h,v 1.1 2009/09/05 01:22:11 marex Exp $	*/
-#ifndef _PALM_SPINLOCK_H_
-#define _PALM_SPINLOCK_H_
+/*	$OpenBSD: spinlock.h,v 1.2 2011/03/23 16:54:36 pirofti Exp $	*/
+#ifndef _MACHINE_SPINLOCK_H_
+#define _MACHINE_SPINLOCK_H_
 #include <arm/spinlock.h>
-#endif /* _PALM_SPINLOCK_H_ */
+#endif /* _MACHINE_SPINLOCK_H_ */
 
diff --git a/sys/arch/palm/include/vmparam.h b/sys/arch/palm/include/vmparam.h
index 159228a4679..49c1a1c0828 100644
--- a/sys/arch/palm/include/vmparam.h
+++ b/sys/arch/palm/include/vmparam.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: vmparam.h,v 1.1 2009/09/05 01:22:11 marex Exp $	*/
+/* 	$OpenBSD: vmparam.h,v 1.2 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.23 2003/05/22 05:47:07 thorpej Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_VMPARAM_H_
-#define	_ARM32_VMPARAM_H_
+#ifndef	_MACHINE_VMPARAM_H_
+#define	_MACHINE_VMPARAM_H_
 
 #define	ARM_KERNEL_BASE		0xc0000000
 
@@ -83,4 +83,4 @@
 #define	VM_FREELIST_DEFAULT	0
 
 
-#endif	/* _ARM32_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/powerpc/include/atomic.h b/sys/arch/powerpc/include/atomic.h
index 21f8233844e..152d4d4a29d 100644
--- a/sys/arch/powerpc/include/atomic.h
+++ b/sys/arch/powerpc/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.3 2007/03/17 22:10:04 kettenis Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __POWERPC_ATOMIC_H__
-#define __POWERPC_ATOMIC_H__
+#ifndef _POWERPC_ATOMIC_H_
+#define _POWERPC_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -34,4 +34,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __POWERPC_ATOMIC_H__ */
+#endif /* _POWERPC_ATOMIC_H_ */
diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h
index 1f46b301975..984310981eb 100644
--- a/sys/arch/powerpc/include/db_machdep.h
+++ b/sys/arch/powerpc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.23 2010/11/27 19:57:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.24 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
 /*
  * Machine-dependent defines for new kernel debugger.
  */
-#ifndef	_PPC_DB_MACHDEP_H_
-#define	_PPC_DB_MACHDEP_H_
+#ifndef	_POWERPC_DB_MACHDEP_H_
+#define	_POWERPC_DB_MACHDEP_H_
 
 #include <sys/types.h>
 #include <uvm/uvm_param.h>
@@ -110,4 +110,4 @@ extern struct mutex ddb_mp_mutex;
 
 #endif /* _KERNEL */
 
-#endif	/* _PPC_DB_MACHDEP_H_ */
+#endif	/* _POWERPC_DB_MACHDEP_H_ */
diff --git a/sys/arch/powerpc/include/endian.h b/sys/arch/powerpc/include/endian.h
index 5372139b261..5518c48b398 100644
--- a/sys/arch/powerpc/include/endian.h
+++ b/sys/arch/powerpc/include/endian.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: endian.h,v 1.15 2011/03/11 15:17:08 pirofti Exp $ */
+/*	$OpenBSD: endian.h,v 1.16 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*-
  * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
@@ -24,8 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
+#ifndef _POWERPC_ENDIAN_H_
+#define _POWERPC_ENDIAN_H_
 
 #undef _BIG_ENDIAN	/* XXX - gcc may define _BIG_ENDIAN too */
 #define _BYTE_ORDER _BIG_ENDIAN
@@ -33,4 +33,4 @@
 
 #define	__STRICT_ALIGNMENT
 
-#endif /* _MACHINE_ENDIAN_H_ */
+#endif /* _POWERPC_ENDIAN_H_ */
diff --git a/sys/arch/powerpc/include/internal_types.h b/sys/arch/powerpc/include/internal_types.h
index d5b5111fe3b..75e5d9f9b8f 100644
--- a/sys/arch/powerpc/include/internal_types.h
+++ b/sys/arch/powerpc/include/internal_types.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: internal_types.h,v 1.2 2003/06/24 14:43:12 drahn Exp $ */
+/* $OpenBSD: internal_types.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
 /* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
+#ifndef _POWERPC_INTERNAL_TYPES_H_
+#define _POWERPC_INTERNAL_TYPES_H_
 
 #ifdef __CHAR_UNSIGNED__
 #define __machine_has_unsigned_chars
diff --git a/sys/arch/powerpc/include/reloc.h b/sys/arch/powerpc/include/reloc.h
index bf77daec8eb..6a881cb1616 100644
--- a/sys/arch/powerpc/include/reloc.h
+++ b/sys/arch/powerpc/include/reloc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reloc.h,v 1.3 2010/06/27 03:11:44 guenther Exp $	*/
+/*	$OpenBSD: reloc.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: reloc.h,v 1.1 1996/09/30 16:34:33 ws Exp $	*/
 
 /*-
@@ -31,8 +31,8 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef	_MACH_RELOC_H_
-#define	_MACH_RELOC_H_
+#ifndef	_POWERPC_RELOC_H_
+#define	_POWERPC_RELOC_H_
 
 /*
  * Quite a number of relocation types
@@ -88,4 +88,4 @@ enum reloc_type {
 	RELOC_MAX
 };
 
-#endif	/* _MACH_RELOC_H_ */
+#endif	/* _POWERPC_RELOC_H_ */
diff --git a/sys/arch/sgi/include/atomic.h b/sys/arch/sgi/include/atomic.h
index a8829697fd6..bc1f3a4a1cf 100644
--- a/sys/arch/sgi/include/atomic.h
+++ b/sys/arch/sgi/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __SGI_ATOMIC_H__
-#define __SGI_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <mips64/atomic.h>
 
-#endif /* __SGI_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/sgi/include/cpu.h b/sys/arch/sgi/include/cpu.h
index 011721c63fe..41ba8aa4834 100644
--- a/sys/arch/sgi/include/cpu.h
+++ b/sys/arch/sgi/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.11 2010/09/11 11:29:50 syuu Exp $ */
+/*	$OpenBSD: cpu.h,v 1.12 2011/03/23 16:54:36 pirofti Exp $ */
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -41,8 +41,8 @@
  *	from: @(#)cpu.h	8.4 (Berkeley) 1/4/94
  */
 
-#ifndef _SGI_CPU_H_
-#define _SGI_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 #ifdef _KERNEL
 #if defined(MULTIPROCESSOR) && !defined(_LOCORE)
@@ -78,4 +78,4 @@ void hw_cpu_init_secondary(struct cpu_info *);
 
 #include <mips64/cpu.h>
 
-#endif /* !_SGI_CPU_H_ */
+#endif /* !_MACHINE_CPU_H_ */
diff --git a/sys/arch/sgi/include/memconf.h b/sys/arch/sgi/include/memconf.h
index 00929344c40..306f0ef4c4d 100644
--- a/sys/arch/sgi/include/memconf.h
+++ b/sys/arch/sgi/include/memconf.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: memconf.h,v 1.2 2008/04/07 22:41:52 miod Exp $ */
+/*	$OpenBSD: memconf.h,v 1.3 2011/03/23 16:54:36 pirofti Exp $ */
 
-#ifndef	_SGI_MEMCONF_H_
-#define	_SGI_MEMCONF_H_
+#ifndef	_MACHINE_MEMCONF_H_
+#define	_MACHINE_MEMCONF_H_
 
 #define	MAXMEMSEGS	32
 
 #include <mips64/memconf.h>
 
-#endif	/* _SGI_MEMCONF_H_ */
+#endif	/* _MACHINE_MEMCONF_H_ */
diff --git a/sys/arch/sgi/include/mnode.h b/sys/arch/sgi/include/mnode.h
index f1ee600a3ca..274f80488e9 100644
--- a/sys/arch/sgi/include/mnode.h
+++ b/sys/arch/sgi/include/mnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mnode.h,v 1.15 2010/04/06 19:09:44 miod Exp $ */
+/*	$OpenBSD: mnode.h,v 1.16 2011/03/23 16:54:36 pirofti Exp $ */
 
 /*
  * Copyright (c) 2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -26,8 +26,8 @@
  *
  */
 
-#ifndef __MACHINE_MNODE_H__
-#define __MACHINE_MNODE_H__
+#ifndef _MACHINE_MNODE_H_
+#define _MACHINE_MNODE_H_
 
 /*
  * Definitions for Nodes set up in M-Mode. Some stuff here
@@ -482,4 +482,4 @@ extern klinfo_t *kl_glass_console;
 extern gda_t *gda;
 extern uint maxnodes;
 
-#endif /* __MACHINE_MNODE_H__ */
+#endif /* _MACHINE_MNODE_H_ */
diff --git a/sys/arch/sgi/include/rbus_machdep.h b/sys/arch/sgi/include/rbus_machdep.h
index c98c66b0648..70f4ef2d8ea 100644
--- a/sys/arch/sgi/include/rbus_machdep.h
+++ b/sys/arch/sgi/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.1 2009/07/21 21:25:19 miod Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.2 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef	_SGI_RBUS_MACHDEP_H_
-#define	_SGI_RBUS_MACHDEP_H_
+#ifndef	_MACHINE_RBUS_MACHDEP_H_
+#define	_MACHINE_RBUS_MACHDEP_H_
 
 /*
  * RBUS mapping routines
@@ -57,4 +57,4 @@ md_space_unmap(rbus_tag_t rbt, bus_space_handle_t h, bus_size_t size,
 #define	pccbb_attach_hook(parent, self, paa)	\
 	do { /* nothing */} while (/*CONSTCOND*/0)
 
-#endif	/* _SGI_RBUS_MACHDEP_H_ */
+#endif	/* _MACHINE_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/sgi/include/vmparam.h b/sys/arch/sgi/include/vmparam.h
index 174c25f9573..3b2042a94c1 100644
--- a/sys/arch/sgi/include/vmparam.h
+++ b/sys/arch/sgi/include/vmparam.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: vmparam.h,v 1.7 2009/12/08 22:15:48 miod Exp $ */
+/*	$OpenBSD: vmparam.h,v 1.8 2011/03/23 16:54:36 pirofti Exp $ */
 /* public domain */
-#ifndef _SGI_VMPARAM_H_
-#define _SGI_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 #define	VM_PHYSSEG_MAX	32	/* Max number of physical memory segments */
 
@@ -21,4 +21,4 @@
 
 #include <mips64/vmparam.h>
 
-#endif	/* _SGI_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/sh/include/atomic.h b/sys/arch/sh/include/atomic.h
index 9ba0a329bdf..09a4d13779e 100644
--- a/sys/arch/sh/include/atomic.h
+++ b/sys/arch/sh/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.3 2007/04/05 17:35:11 miod Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __SH_ATOMIC_H__
-#define __SH_ATOMIC_H__
+#ifndef _SH_ATOMIC_H_
+#define _SH_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -32,4 +32,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __SH_ATOMIC_H__ */
+#endif /* _SH_ATOMIC_H_ */
diff --git a/sys/arch/sh/include/endian.h b/sys/arch/sh/include/endian.h
index 9efcde9d80b..689b168d2ab 100644
--- a/sys/arch/sh/include/endian.h
+++ b/sys/arch/sh/include/endian.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: endian.h,v 1.3 2011/03/12 04:03:04 guenther Exp $	*/
+/*	$OpenBSD: endian.h,v 1.4 2011/03/23 16:54:36 pirofti Exp $	*/
 /*	$NetBSD: endian.h,v 1.4 2000/03/17 00:09:25 mycroft Exp $	*/
 
 /* Written by Manuel Bouyer. Public domain */
 
-#ifndef _MACHINE_ENDIAN_H_
-#define	_MACHINE_ENDIAN_H_
+#ifndef _SH_ENDIAN_H_
+#define	_SH_ENDIAN_H_
 
 #ifdef  __GNUC__
 
@@ -40,4 +40,4 @@
 
 #define	__STRICT_ALIGNMENT
 
-#endif /* !_MACHINE_ENDIAN_H_ */
+#endif /* !_SH_ENDIAN_H_ */
diff --git a/sys/arch/sh/include/param.h b/sys/arch/sh/include/param.h
index 6a26f5bc068..57243585b3d 100644
--- a/sys/arch/sh/include/param.h
+++ b/sys/arch/sh/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.5 2008/05/04 21:18:00 martin Exp $	*/
+/*	$OpenBSD: param.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.15 2006/08/28 13:43:35 yamt Exp $	*/
 
 /*-
@@ -124,4 +124,4 @@
 #define	NKMEMPAGES_MIN_DEFAULT	((4 * 1024 * 1024) >> PAGE_SHIFT)
 #define	NKMEMPAGES_MAX_DEFAULT	((64 * 1024 * 1024) >> PAGE_SHIFT)
 
-#endif /* !_SH3_PARAM_H_ */
+#endif /* !_SH_PARAM_H_ */
diff --git a/sys/arch/sh/include/trap.h b/sys/arch/sh/include/trap.h
index e67015c37c6..75bcaaa6887 100644
--- a/sys/arch/sh/include/trap.h
+++ b/sys/arch/sh/include/trap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.h,v 1.3 2008/06/26 05:42:13 ray Exp $	*/
+/*	$OpenBSD: trap.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: exception.h,v 1.9 2006/07/22 21:58:29 uwe Exp $	*/
 
 /*-
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SH_EXCEPTION_H_
-#define	_SH_EXCEPTION_H_
+#ifndef _SH_TRAP_H_
+#define	_SH_TRAP_H_
 /*
  * SH3/SH4 Exception handling.
  */
@@ -178,4 +178,4 @@ extern const int exp_types;
 #endif /* !_LOCORE */
 
 #endif /* _KERNEL */
-#endif /* !_SH_EXCEPTION_H_ */
+#endif /* !_SH_TRAP_H_ */
diff --git a/sys/arch/solbourne/include/atomic.h b/sys/arch/solbourne/include/atomic.h
index 5b18dff2233..255818f8e0c 100644
--- a/sys/arch/solbourne/include/atomic.h
+++ b/sys/arch/solbourne/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.2 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __SOLBOURNE_ATOMIC_H__
-#define __SOLBOURNE_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <sparc/atomic.h>
 
-#endif /* __SOLBOURNE_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/solbourne/include/idt.h b/sys/arch/solbourne/include/idt.h
index 523f178f2ba..fdc1639c468 100644
--- a/sys/arch/solbourne/include/idt.h
+++ b/sys/arch/solbourne/include/idt.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: idt.h,v 1.1 2005/04/19 21:30:17 miod Exp $	*/
+/*	$OpenBSD: idt.h,v 1.2 2011/03/23 16:54:37 pirofti Exp $	*/
 /*
  * Copyright (c) 2005, Miodrag Vallat
  *
@@ -24,8 +24,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_SOLBOURNE_IDT_H_
-#define	_SOLBOURNE_IDT_H_
+#ifndef	_MACHINE_IDT_H_
+#define	_MACHINE_IDT_H_
 
 /*
  * Definitions for the core chips found on the IDT motherboard.
@@ -185,4 +185,4 @@
 #define	OBIO_PA_START	0x80000000
 #define	OBIO_PA_END	0x80018000
 
-#endif	/* _SOLBOURNE_IDT_H_ */
+#endif	/* _MACHINE_IDT_H_ */
diff --git a/sys/arch/solbourne/include/kap.h b/sys/arch/solbourne/include/kap.h
index c11f1d3957b..77d56540e78 100644
--- a/sys/arch/solbourne/include/kap.h
+++ b/sys/arch/solbourne/include/kap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kap.h,v 1.2 2006/04/15 17:35:48 miod Exp $	*/
+/*	$OpenBSD: kap.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $	*/
 /*
  * Copyright (c) 2005, Miodrag Vallat
  *
@@ -24,8 +24,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SOLBOURNE_KAP_H_
-#define _SOLBOURNE_KAP_H_
+#ifndef _MACHINE_KAP_H_
+#define _MACHINE_KAP_H_
 
 /*
  * KAP specific control registers
@@ -169,4 +169,4 @@
 
 #endif	/* _KERNEL */
 
-#endif /* _SOLBOURNE_KAP_H_ */
+#endif /* _MACHINE_KAP_H_ */
diff --git a/sys/arch/solbourne/include/param.h b/sys/arch/solbourne/include/param.h
index e51952a19fc..8fdef00c24d 100644
--- a/sys/arch/solbourne/include/param.h
+++ b/sys/arch/solbourne/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.7 2008/05/03 20:18:24 martin Exp $	*/
+/*	$OpenBSD: param.h,v 1.8 2011/03/23 16:54:37 pirofti Exp $	*/
 /*     OpenBSD: param.h,v 1.29 2004/08/06 22:31:31 mickey Exp 	*/
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)param.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _SOLBOURNE_PARAM_H_
-#define _SOLBOURNE_PARAM_H_
+#ifndef _MACHINE_PARAM_H_
+#define _MACHINE_PARAM_H_
 
 #define	_MACHINE	solbourne
 #define	MACHINE		"solbourne"
@@ -163,4 +163,4 @@ extern int mmumod;
 #define PAGE_MASK	(PAGE_SIZE - 1)
 #define PAGE_SHIFT	SUN4_PGSHIFT
 
-#endif /* _SOLBOURNE_PARAM_H_ */
+#endif /* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/solbourne/include/pmap.h b/sys/arch/solbourne/include/pmap.h
index 0e20888aba9..45552654bdc 100644
--- a/sys/arch/solbourne/include/pmap.h
+++ b/sys/arch/solbourne/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.5 2010/12/26 15:41:00 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $	*/
 /*
  * Copyright (c) 2005, Miodrag Vallat
  *
@@ -24,8 +24,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_SOLBOURNE_PMAP_H_
-#define _SOLBOURNE_PMAP_H_
+#ifndef	_MACHINE_PMAP_H_
+#define _MACHINE_PMAP_H_
 
 #include <machine/pte.h>
 
@@ -91,4 +91,4 @@ void		pmap_writetext(unsigned char *, int);
 
 #endif /* _KERNEL */
 
-#endif /* _SOLBOURNE_PMAP_H_ */
+#endif /* _MACHINE_PMAP_H_ */
diff --git a/sys/arch/solbourne/include/prom.h b/sys/arch/solbourne/include/prom.h
index 1162c4a6586..d2f097c9aa6 100644
--- a/sys/arch/solbourne/include/prom.h
+++ b/sys/arch/solbourne/include/prom.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prom.h,v 1.1 2005/04/19 21:30:18 miod Exp $	*/
+/*	$OpenBSD: prom.h,v 1.2 2011/03/23 16:54:37 pirofti Exp $	*/
 /*
  * Copyright (c) 2005, Miodrag Vallat
  *
@@ -24,8 +24,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_SOLBOURNE_PROM_H_
-#define	_SOLBOURNE_PROM_H_
+#ifndef	_MACHINE_PROM_H_
+#define	_MACHINE_PROM_H_
 
 /*
  * The following describes the PROM communication structure,
@@ -105,4 +105,4 @@ extern int sysmodel;
 
 const char *prom_getenv(const char *);
 
-#endif	/* _SOLBOURNE_PROM_H_ */
+#endif	/* _MACHINE_PROM_H_ */
diff --git a/sys/arch/solbourne/include/vmparam.h b/sys/arch/solbourne/include/vmparam.h
index c47ff005635..4b345b3bb5c 100644
--- a/sys/arch/solbourne/include/vmparam.h
+++ b/sys/arch/solbourne/include/vmparam.h
@@ -1,8 +1,8 @@
-/* $OpenBSD: vmparam.h,v 1.2 2006/06/04 17:21:24 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $ */
 /* public domain */
 
-#ifndef _SOLBOURNE_VMPARAM_H_
-#define _SOLBOURNE_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 #include <sparc/vmparam.h>
 
@@ -24,4 +24,4 @@
 #undef	VM_PHYSSEG_STRAT
 #define	VM_PHYSSEG_STRAT	VM_PSTRAT_BIGFIRST
 
-#endif /* _SOLBOURNE_VMPARAM_H_ */
+#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/sparc/include/_types.h b/sys/arch/sparc/include/_types.h
index fa41d48590d..a3d481dab38 100644
--- a/sys/arch/sparc/include/_types.h
+++ b/sys/arch/sparc/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.11 2009/11/04 19:14:10 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.12 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,8 +32,8 @@
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
-#ifndef _SPARC__TYPES_H_
-#define _SPARC__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
 typedef struct label_t {
@@ -116,4 +116,4 @@ typedef	int			__rune_t;
 typedef	void *			__wctrans_t;
 typedef	void *			__wctype_t;
 
-#endif	/* _SPARC__TYPES_H_ */
+#endif	/* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/sparc/include/asm.h b/sys/arch/sparc/include/asm.h
index c942f03e297..ad4dde78929 100644
--- a/sys/arch/sparc/include/asm.h
+++ b/sys/arch/sparc/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.4 2003/06/04 22:08:17 deraadt Exp $	*/
+/*	$OpenBSD: asm.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: asm.h,v 1.5 1997/07/16 15:16:43 christos Exp $ */
 
 /*
@@ -38,8 +38,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ASM_H_
-#define _ASM_H_
+#ifndef _MACHINE_ASM_H_
+#define _MACHINE_ASM_H_
 
 #ifdef __ELF__
 #define _C_LABEL(name)		name
@@ -121,4 +121,4 @@
 
 #define RCSID(name)		.asciz name
 
-#endif /* _ASM_H_ */
+#endif /* _MACHINE_ASM_H_ */
diff --git a/sys/arch/sparc/include/atomic.h b/sys/arch/sparc/include/atomic.h
index 0f057e147b4..1eb4e49631b 100644
--- a/sys/arch/sparc/include/atomic.h
+++ b/sys/arch/sparc/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.4 2010/04/21 03:03:24 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __SPARC_ATOMIC_H__
-#define __SPARC_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -32,4 +32,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __SPARC_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/sparc/include/bus.h b/sys/arch/sparc/include/bus.h
index 3c4f723123f..cbf3f0f63f0 100644
--- a/sys/arch/sparc/include/bus.h
+++ b/sys/arch/sparc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.10 2009/12/25 20:51:43 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.11 2011/03/23 16:54:37 pirofti Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  *
@@ -36,8 +36,8 @@
  *   own wrappers on a need-to-do basis.
  */
 
-#ifndef	_SPARC_BUS_H_
-#define	_SPARC_BUS_H_
+#ifndef	_MACHINE_BUS_H_
+#define	_MACHINE_BUS_H_
 
 #include <machine/autoconf.h>
 
@@ -681,4 +681,4 @@ int	_bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
 
 vaddr_t	_bus_dma_valloc_skewed(size_t, u_long, u_long, u_long);
 
-#endif	/* _SPARC_BUS_H_ */
+#endif	/* _MACHINE_BUS_H_ */
diff --git a/sys/arch/sparc/include/cpu.h b/sys/arch/sparc/include/cpu.h
index acc93fbe407..1ed4a47830a 100644
--- a/sys/arch/sparc/include/cpu.h
+++ b/sys/arch/sparc/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.33 2010/11/27 19:41:45 miod Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.34 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)cpu.h	8.4 (Berkeley) 1/5/94
  */
 
-#ifndef _SPARC_CPU_H_
-#define _SPARC_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 /*
  * CTL_MACHDEP definitions.
@@ -202,4 +202,4 @@ struct trapvec {
 extern struct trapvec *trapbase;	/* the 256 vectors */
 
 #endif /* _KERNEL */
-#endif /* _SPARC_CPU_H_ */
+#endif /* _MACHINE_CPU_H_ */
diff --git a/sys/arch/sparc/include/db_machdep.h b/sys/arch/sparc/include/db_machdep.h
index 99f948c8aac..88e1148862d 100644
--- a/sys/arch/sparc/include/db_machdep.h
+++ b/sys/arch/sparc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.14 2010/11/27 19:57:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.15 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.10 1997/08/31 21:23:40 pk Exp $ */
 
 /*
@@ -27,8 +27,8 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef	_SPARC_DB_MACHDEP_H_
-#define	_SPARC_DB_MACHDEP_H_
+#ifndef	_MACHINE_DB_MACHDEP_H_
+#define	_MACHINE_DB_MACHDEP_H_
 
 /*
  * Machine-dependent defines for new kernel debugger.
@@ -98,4 +98,4 @@ typedef u_long		kgdb_reg_t;
 #define KGDB_PREPARE	fb_unblank()
 #define KGDB_ENTER	__asm("ta %0" :: "n" (T_KGDB_EXEC))
 
-#endif	/* _SPARC_DB_MACHDEP_H_ */
+#endif	/* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/sparc/include/exec.h b/sys/arch/sparc/include/exec.h
index a533892c5c7..24d512ca290 100644
--- a/sys/arch/sparc/include/exec.h
+++ b/sys/arch/sparc/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.13 2010/07/02 19:57:15 tedu Exp $	*/
+/*	$OpenBSD: exec.h,v 1.14 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: exec.h,v 1.7 1994/11/20 20:53:02 deraadt Exp $ */
 
 /*
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SPARC_EXEC_H_
-#define _SPARC_EXEC_H_
+#ifndef _MACHINE_EXEC_H_
+#define _MACHINE_EXEC_H_
 
 #define __LDPGSZ	8192	/* linker page size */
 
@@ -131,4 +131,4 @@ struct relocation_info_sparc {
 
 #define _KERN_DO_ELF
 
-#endif  /* _SPARC_EXEC_H_ */
+#endif  /* _MACHINE_EXEC_H_ */
diff --git a/sys/arch/sparc/include/float.h b/sys/arch/sparc/include/float.h
index 5bf1736cf8d..d0c56ccb2ed 100644
--- a/sys/arch/sparc/include/float.h
+++ b/sys/arch/sparc/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.6 2008/07/21 20:50:55 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.6 1997/07/18 05:11:52 thorpej Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)float.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _SPARC_FLOAT_H_
-#define _SPARC_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -84,4 +84,4 @@ __END_DECLS
 #define LDBL_MAX	DBL_MAX
 #define LDBL_MAX_10_EXP	DBL_MAX_10_EXP
 
-#endif	/* _SPARC_FLOAT_H_ */
+#endif	/* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/sparc/include/ieeefp.h b/sys/arch/sparc/include/ieeefp.h
index c3fd819eb2f..6ebc2b9ad46 100644
--- a/sys/arch/sparc/include/ieeefp.h
+++ b/sys/arch/sparc/include/ieeefp.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: ieeefp.h,v 1.4 2001/09/28 15:18:15 jason Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /*
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
  */
 
-#ifndef _SPARC_IEEEFP_H_
-#define _SPARC_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
 
 typedef int fp_except;
 #define FP_X_IMP	0x01	/* imprecise (loss of precision) */
@@ -22,4 +22,4 @@ typedef enum {
     FP_RM=3			/* round toward negative infinity */
 } fp_rnd;
 
-#endif /* _SPARC_IEEEFP_H_ */
+#endif /* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/sparc/include/intr.h b/sys/arch/sparc/include/intr.h
index 79078575957..f3f5cd83eed 100644
--- a/sys/arch/sparc/include/intr.h
+++ b/sys/arch/sparc/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.2 2010/12/21 14:56:24 claudio Exp $	*/
+/*	$OpenBSD: intr.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: cpu.h,v 1.24 1997/03/15 22:25:15 pk Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)cpu.h	8.4 (Berkeley) 1/5/94
  */
 
-#ifndef _SPARC_INTR_H_
-#define _SPARC_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 #ifdef _KERNEL
 #include <sys/evcount.h>
@@ -95,4 +95,4 @@ void	*softintr_establish(int, void (*)(void *), void *);
 void	 softintr_schedule(void *);
 
 #endif /* _KERNEL */
-#endif /* _SPARC_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/sparc/include/ioctl_fd.h b/sys/arch/sparc/include/ioctl_fd.h
index 20ed00830f2..8d4cd459c6d 100644
--- a/sys/arch/sparc/include/ioctl_fd.h
+++ b/sys/arch/sparc/include/ioctl_fd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioctl_fd.h,v 1.1 1997/06/24 09:50:58 downsj Exp $	*/
+/*	$OpenBSD: ioctl_fd.h,v 1.2 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	from: ioctl_fd.h,v 1.4 1995/06/29 03:49:32 jtk Exp 	*/
 
 /*
@@ -30,8 +30,8 @@
  * From: Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp
  */
 
-#ifndef _SPARC_IOCTL_FD_H_
-#define _SPARC_IOCTL_FD_H_
+#ifndef _MACHINE_IOCTL_FD_H_
+#define _MACHINE_IOCTL_FD_H_
 
 #define FD_FORMAT_VERSION 110	/* used to validate before formatting */
 #define FD_MAX_NSEC 36		/* highest known number of spt - allow for */
@@ -127,4 +127,4 @@ struct fd_type {
 #endif /* FDC_500KBPS */
 
 
-#endif /* !_SPARC_IOCTL_FD_H__ */
+#endif /* !_MACHINE_IOCTL_FD_H__ */
diff --git a/sys/arch/sparc/include/lock.h b/sys/arch/sparc/include/lock.h
index b19904e93e4..2d32b88e8e7 100644
--- a/sys/arch/sparc/include/lock.h
+++ b/sys/arch/sparc/include/lock.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lock.h,v 1.3 2010/09/05 18:07:12 kettenis Exp $	*/
+/*	$OpenBSD: lock.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /* public domain */
 
-#ifndef	_SPARC_LOCK_H_
-#define	_SPARC_LOCK_H_
+#ifndef	_MACHINE_LOCK_H_
+#define	_MACHINE_LOCK_H_
 
 #include <machine/atomic.h>
 
@@ -47,4 +47,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t *l)
 	*l = __SIMPLELOCK_UNLOCKED;
 }
 
-#endif	/* _SPARC_LOCK_H_ */
+#endif	/* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h
index fdb004be1eb..36921c85089 100644
--- a/sys/arch/sparc/include/param.h
+++ b/sys/arch/sparc/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.43 2010/07/11 14:09:10 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.44 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.29 1997/03/10 22:50:37 pk Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)param.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _SPARC_PARAM_H_
-#define _SPARC_PARAM_H_
+#ifndef _MACHINE_PARAM_H_
+#define _MACHINE_PARAM_H_
 
 /*
  * Sun4M support by Aaron Brown, Harvard University.
@@ -257,4 +257,4 @@ extern int mmumod;
 				/* (CPU_ISSUN4D || CPU_ISSUN4M) */
 #endif
 
-#endif /* _SPARC_PARAM_H_ */
+#endif /* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/sparc/include/pcb.h b/sys/arch/sparc/include/pcb.h
index dadf7f626bb..6942c653e93 100644
--- a/sys/arch/sparc/include/pcb.h
+++ b/sys/arch/sparc/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.5 2003/06/02 23:27:54 millert Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: pcb.h,v 1.4 1995/03/28 18:19:56 jtc Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)pcb.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _SPARC_PCB_H_
-#define _SPARC_PCB_H_
+#ifndef _MACHINE_PCB_H_
+#define _MACHINE_PCB_H_
 
 #include <machine/reg.h>
 
diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h
index b14264f11f8..1441f9e8296 100644
--- a/sys/arch/sparc/include/pmap.h
+++ b/sys/arch/sparc/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.50 2010/12/26 15:41:00 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.51 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */
 
 /*
@@ -44,8 +44,8 @@
  *	@(#)pmap.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef	_SPARC_PMAP_H_
-#define _SPARC_PMAP_H_
+#ifndef	_MACHINE_PMAP_H_
+#define _MACHINE_PMAP_H_
 
 #include <machine/pte.h>
 
@@ -400,4 +400,4 @@ extern void		(*pmap_changeprot_p)(pmap_t, vaddr_t,
 
 #endif /* _KERNEL */
 
-#endif /* _SPARC_PMAP_H_ */
+#endif /* _MACHINE_PMAP_H_ */
diff --git a/sys/arch/sparc/include/reloc.h b/sys/arch/sparc/include/reloc.h
index 9d79ca0a8ef..597c42512c9 100644
--- a/sys/arch/sparc/include/reloc.h
+++ b/sys/arch/sparc/include/reloc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reloc.h,v 1.4 2006/05/07 15:38:05 miod Exp $	*/
+/*	$OpenBSD: reloc.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 /* 
  * Copyright (c) 2001 Artur Grabowski <art@openbsd.org>
  *   
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef	_MACH_RELOC_H_
-#define	_MACH_RELOC_H_
+#ifndef	_MACHINE_RELOC_H_
+#define	_MACHINE_RELOC_H_
 
 #define RELOC_NONE	0
 
@@ -25,4 +25,4 @@
 #define RELOC_JMP_SLOT	21
 #define RELOC_RELATIVE	22
 
-#endif	/* _MACH_RELOC_H_ */
+#endif	/* _MACHINE_RELOC_H_ */
diff --git a/sys/arch/sparc/include/signal.h b/sys/arch/sparc/include/signal.h
index cf278a7a9f0..2193b1cd601 100644
--- a/sys/arch/sparc/include/signal.h
+++ b/sys/arch/sparc/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.8 2006/01/08 14:20:17 millert Exp $	*/
+/*	$OpenBSD: signal.h,v 1.9 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: signal.h,v 1.4 1996/02/01 22:32:35 mycroft Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef	_SPARC_SIGNAL_H_
-#define _SPARC_SIGNAL_H_
+#ifndef	_MACHINE_SIGNAL_H_
+#define _MACHINE_SIGNAL_H_
 
 #ifndef _LOCORE
 #include <sys/cdefs.h>
@@ -94,4 +94,4 @@ struct sigcontext {
 #define	FPE_FLTOPERR_TRAP	0xd0	/* operand error */
 #define	FPE_FLTOVF_TRAP		0xd4	/* overflow */
 #endif /* _LOCORE || __BSD_VISIBLE */
-#endif	/* !_SPARC_SIGNAL_H_ */
+#endif	/* !_MACHINE_SIGNAL_H_ */
diff --git a/sys/arch/sparc/include/stdarg.h b/sys/arch/sparc/include/stdarg.h
index 45366503699..86aed57f62b 100644
--- a/sys/arch/sparc/include/stdarg.h
+++ b/sys/arch/sparc/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.14 2008/10/23 21:25:08 kettenis Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.15 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.10 1996/12/27 20:55:28 pk Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	from: @(#)stdarg.h	8.2 (Berkeley) 9/27/93
  */
 
-#ifndef _SPARC_STDARG_H_
-#define	_SPARC_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define	_MACHINE_STDARG_H_
 
 #include <sys/cdefs.h>
 #include <machine/_types.h>
@@ -105,4 +105,4 @@ typedef __va_list	va_list;
 
 #define va_end(ap)	
 
-#endif /* !_SPARC_STDARG_H_ */
+#endif /* !_MACHINE_STDARG_H_ */
diff --git a/sys/arch/sparc/include/svr4_machdep.h b/sys/arch/sparc/include/svr4_machdep.h
index 77b8e9b8251..b2f730cd6d5 100644
--- a/sys/arch/sparc/include/svr4_machdep.h
+++ b/sys/arch/sparc/include/svr4_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_machdep.h,v 1.7 2002/03/14 01:26:44 millert Exp $	*/
+/*	$OpenBSD: svr4_machdep.h,v 1.8 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: svr4_machdep.h,v 1.4 1996/03/31 22:21:45 pk Exp $	 */
 
 /*
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_SPARC_SVR4_MACHDEP_H_
-#define	_SPARC_SVR4_MACHDEP_H_
+#ifndef	_MACHINE_SVR4_MACHDEP_H_
+#define	_MACHINE_SVR4_MACHDEP_H_
 
 #include <compat/svr4/svr4_types.h>
 
@@ -125,4 +125,4 @@ int svr4_trap(int, struct proc *);
 #define	SVR4_T_PAGEFLT		14
 #define	SVR4_T_ALIGNFLT		17
 
-#endif /* !_SPARC_SVR4_MACHDEP_H_ */
+#endif /* !_MACHINE_SVR4_MACHDEP_H_ */
diff --git a/sys/arch/sparc/include/varargs.h b/sys/arch/sparc/include/varargs.h
index af33ab0d83e..fc22cbae59b 100644
--- a/sys/arch/sparc/include/varargs.h
+++ b/sys/arch/sparc/include/varargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: varargs.h,v 1.6 2003/06/02 23:27:54 millert Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: varargs.h,v 1.10 1995/12/29 18:53:02 mycroft Exp $ */
 
 /*
@@ -46,8 +46,8 @@
  *	from: @(#)varargs.h	8.3 (Berkeley) 3/22/94
  */
 
-#ifndef _SPARC_VARARGS_H_
-#define	_SPARC_VARARGS_H_
+#ifndef _MACHINE_VARARGS_H_
+#define	_MACHINE_VARARGS_H_
 
 #include <machine/stdarg.h>
 
@@ -64,4 +64,4 @@
 #define	va_start(ap) \
 	((ap) = (va_list)__builtin_saveregs())
 
-#endif /* !_SPARC_VARARGS_H_ */
+#endif /* !_MACHINE_VARARGS_H_ */
diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h
index 2b230acac3f..bc0fb4b9798 100644
--- a/sys/arch/sparc/include/vmparam.h
+++ b/sys/arch/sparc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.36 2010/12/15 05:30:19 tedu Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.37 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.13 1997/07/12 16:20:03 perry Exp $	*/
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)vmparam.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _SPARC_VMPARAM_H_
-#define _SPARC_VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 /*
  * Machine dependent constants for Sun-4c SPARC
@@ -140,4 +140,4 @@ vaddr_t		dvma_mapin_space(struct vm_map *, vaddr_t, int, int, int);
 void		dvma_mapout(vaddr_t, vaddr_t, int);
 #endif
 
-#endif /* _SPARC_VMPARAM_H_ */
+#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/sparc64/include/_types.h b/sys/arch/sparc64/include/_types.h
index a9cfe0a0319..45cd452137f 100644
--- a/sys/arch/sparc64/include/_types.h
+++ b/sys/arch/sparc64/include/_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _types.h,v 1.10 2010/05/10 21:41:08 kettenis Exp $	*/
+/*	$OpenBSD: _types.h,v 1.11 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -32,8 +32,8 @@
  *	@(#)ansi.h	8.2 (Berkeley) 1/4/94
  */
 
-#ifndef _SPARC64__TYPES_H_
-#define _SPARC64__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define _MACHINE__TYPES_H_
 
 #if defined(_KERNEL)
 typedef struct label_t {
@@ -119,4 +119,4 @@ typedef	void *			__wctype_t;
 /* Feature test macros */
 #define __HAVE_TIMECOUNTER
 
-#endif	/* _SPARC64__TYPES_H_ */
+#endif	/* _MACHINE__TYPES_H_ */
diff --git a/sys/arch/sparc64/include/apmvar.h b/sys/arch/sparc64/include/apmvar.h
index 1712ce1cd5e..96c6be8bc36 100644
--- a/sys/arch/sparc64/include/apmvar.h
+++ b/sys/arch/sparc64/include/apmvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apmvar.h,v 1.2 2009/02/26 17:19:47 oga Exp $	*/
+/*	$OpenBSD: apmvar.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /*
  *  Copyright (c) 2001 Alexander Guy
@@ -29,8 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * 
  */
-#ifndef _SPARC64_APMVAR_H_
-#define _SPARC64_APMVAR_H_
+#ifndef _MACHINE_APMVAR_H_
+#define _MACHINE_APMVAR_H_
 
 #include <sys/ioccom.h>
 
@@ -117,4 +117,4 @@ struct apm_ctl {
 #define	APM_IOC_STANDBY_REQ	_IO('A', 7)	/* request standby */
 #define	APM_IOC_SUSPEND_REQ	_IO('A', 8)	/* request suspend */
 
-#endif /* _SPARC64_APMVAR_H_ */
+#endif /* _MACHINE_APMVAR_H_ */
diff --git a/sys/arch/sparc64/include/asm.h b/sys/arch/sparc64/include/asm.h
index bd6b812d3ab..b36bd0bacaf 100644
--- a/sys/arch/sparc64/include/asm.h
+++ b/sys/arch/sparc64/include/asm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asm.h,v 1.4 2003/06/12 01:07:30 deraadt Exp $	*/
+/*	$OpenBSD: asm.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: asm.h,v 1.15 2000/08/02 22:24:39 eeh Exp $ */
 
 /*
@@ -38,8 +38,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _ASM_H_
-#define _ASM_H_
+#ifndef _MACHINE_ASM_H_
+#define _MACHINE_ASM_H_
 
 #ifndef _LOCORE
 #define _LOCORE
@@ -145,4 +145,4 @@
 #endif /* __STDC__ */
 #endif /* __ELF__ */
 
-#endif /* _ASM_H_ */
+#endif /* _MACHINE_ASM_H_ */
diff --git a/sys/arch/sparc64/include/atomic.h b/sys/arch/sparc64/include/atomic.h
index 3ca239b5ee7..504ff33c682 100644
--- a/sys/arch/sparc64/include/atomic.h
+++ b/sys/arch/sparc64/include/atomic.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atomic.h,v 1.6 2010/07/07 15:36:18 kettenis Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $	*/
 /*
  * Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
  *
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SPARC64_ATOMIC_H_
-#define _SPARC64_ATOMIC_H_
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -78,4 +78,4 @@ atomic_add_ulong(volatile unsigned long *ulp, unsigned long v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* _SPARC64_ATOMIC_H_ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/sparc64/include/boot_flag.h b/sys/arch/sparc64/include/boot_flag.h
index 8293fc7f4b8..c95eae95cb5 100644
--- a/sys/arch/sparc64/include/boot_flag.h
+++ b/sys/arch/sparc64/include/boot_flag.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot_flag.h,v 1.2 2008/06/26 05:42:13 ray Exp $	*/
+/*	$OpenBSD: boot_flag.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: boot_flag.h,v 1.3 2001/07/01 02:56:21 gmcgarry Exp $	*/
 
 /*-
@@ -27,8 +27,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SYS_BOOT_FLAG_H_
-#define _SYS_BOOT_FLAG_H_
+#ifndef _MACHINE_BOOT_FLAG_H_
+#define _MACHINE_BOOT_FLAG_H_
 
 #include <sys/reboot.h>
 
@@ -65,4 +65,4 @@
 								\
 	} while (/* CONSTCOND */ 0)
 
-#endif /* _SYS_BOOT_FLAG_H_ */
+#endif /* _MACHINE_BOOT_FLAG_H_ */
diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h
index 0a837546c8f..34d8a60db73 100644
--- a/sys/arch/sparc64/include/bus.h
+++ b/sys/arch/sparc64/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.25 2009/04/20 00:42:06 oga Exp $	*/
+/*	$OpenBSD: bus.h,v 1.26 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $	*/
 
 /*-
@@ -63,8 +63,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SPARC_BUS_H_
-#define _SPARC_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 #include <machine/ctlreg.h>
 
@@ -83,7 +83,7 @@ extern int bus_space_debug;
 #define BSHDB_NO_ACCESS	0x02
 
 #if defined(BUS_SPACE_DEBUG)
-#ifndef __SYSTM_H__
+#ifndef _MACHINE_BUS_H_
 #include <sys/systm.h>
 #endif
 #define BUS_SPACE_PRINTF(l, s) do {				\
@@ -622,5 +622,5 @@ struct sparc_bus_dmamap {
 	bus_dma_segment_t dm_segs[1];	/* segments; variable length */
 };
 
-#endif /* _SPARC_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
 
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 9ef70cd12b6..dbe6b079dd6 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.75 2010/12/21 14:56:24 claudio Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.76 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)cpu.h	8.4 (Berkeley) 1/5/94
  */
 
-#ifndef _CPU_H_
-#define _CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 
 /*
  * CTL_MACHDEP definitions.
@@ -325,4 +325,4 @@ extern void blink_led_register(struct blink_led *);
 #endif
 
 #endif /* _KERNEL */
-#endif /* _CPU_H_ */
+#endif /* _MACHINE_CPU_H_ */
diff --git a/sys/arch/sparc64/include/db_machdep.h b/sys/arch/sparc64/include/db_machdep.h
index e052a9f8f7d..31665039596 100644
--- a/sys/arch/sparc64/include/db_machdep.h
+++ b/sys/arch/sparc64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.12 2010/11/27 19:57:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.13 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.12 2001/07/07 15:16:13 eeh Exp $ */
 
 /*
@@ -27,8 +27,8 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef	_SPARC_DB_MACHDEP_H_
-#define	_SPARC_DB_MACHDEP_H_
+#ifndef	_MACHINE_DB_MACHDEP_H_
+#define	_MACHINE_DB_MACHDEP_H_
 
 /*
  * Machine-dependent defines for new kernel debugger.
@@ -143,4 +143,4 @@ int kdb_trap(int, struct trapframe64 *);
 /* Register device-specific method for triggering XIRs. */
 void db_register_xir(void (*)(void *, int), void *);
 
-#endif	/* _SPARC_DB_MACHDEP_H_ */
+#endif	/* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/sparc64/include/float.h b/sys/arch/sparc64/include/float.h
index a65587d8b65..c91197f83d2 100644
--- a/sys/arch/sparc64/include/float.h
+++ b/sys/arch/sparc64/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.5 2008/07/21 20:50:55 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)float.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _SPARC64_FLOAT_H_
-#define _SPARC64_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #include <sys/cdefs.h>
 
@@ -84,4 +84,4 @@ __END_DECLS
 #define LDBL_MAX	1.189731495357231765085759326628007016E+4932L
 #define LDBL_MAX_10_EXP	(+4932)
 
-#endif	/* _SPARC64_FLOAT_H_ */
+#endif	/* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/sparc64/include/frame.h b/sys/arch/sparc64/include/frame.h
index 2c795100c76..662b258dc2f 100644
--- a/sys/arch/sparc64/include/frame.h
+++ b/sys/arch/sparc64/include/frame.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frame.h,v 1.5 2006/06/21 20:52:18 jason Exp $	*/
+/*	$OpenBSD: frame.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: frame.h,v 1.9 2001/03/04 09:28:35 mrg Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)frame.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _SPARC64_FRAME_H_
-#define _SPARC64_FRAME_H_
+#ifndef _MACHINE_FRAME_H_
+#define _MACHINE_FRAME_H_
 
 /*
  * Sparc stack frame format.
@@ -116,4 +116,4 @@ struct frame64 {
  */
 #define BIAS	(2048-1)
 
-#endif /* _SPARC64_FRAME_H_ */
+#endif /* _MACHINE_FRAME_H_ */
diff --git a/sys/arch/sparc64/include/ieeefp.h b/sys/arch/sparc64/include/ieeefp.h
index b25b1e3b123..11730b11315 100644
--- a/sys/arch/sparc64/include/ieeefp.h
+++ b/sys/arch/sparc64/include/ieeefp.h
@@ -1,11 +1,11 @@
-/*	$OpenBSD: ieeefp.h,v 1.2 2001/09/28 15:18:15 jason Exp $	*/
+/*	$OpenBSD: ieeefp.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $	*/
 /*
  * Written by J.T. Conklin, Apr 6, 1995
  * Public domain.
  */
 
-#ifndef _SPARC_IEEEFP_H_
-#define _SPARC_IEEEFP_H_
+#ifndef _MACHINE_IEEEFP_H_
+#define _MACHINE_IEEEFP_H_
 
 typedef int fp_except;
 #define FP_X_IMP	0x01	/* imprecise (loss of precision) */
@@ -21,4 +21,4 @@ typedef enum {
     FP_RM=3			/* round toward negative infinity */
 } fp_rnd;
 
-#endif /* _SPARC_IEEEFP_H_ */
+#endif /* _MACHINE_IEEEFP_H_ */
diff --git a/sys/arch/sparc64/include/intr.h b/sys/arch/sparc64/include/intr.h
index 15711053168..82cf8c6cf7a 100644
--- a/sys/arch/sparc64/include/intr.h
+++ b/sys/arch/sparc64/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.12 2008/06/26 05:42:13 ray Exp $	*/
+/*	$OpenBSD: intr.h,v 1.13 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.8 2001/01/14 23:50:30 thorpej Exp $ */
 
 /*-
@@ -30,10 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SPARC64_INTR_H_
-#define _SPARC64_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
-#ifndef _SPARC64_INTREG_H_
+#ifndef _MACHINE_INTR_H_
 #include <sparc64/sparc64/intreg.h>
 #endif
 
@@ -87,4 +87,4 @@ void	*softintr_establish(int, void (*)(void *), void *);
 void	 softintr_disestablish(void *);
 void	 softintr_schedule(void *);
 
-#endif /* _SPARC64_INTR_H_ */
+#endif /* _MACHINE_INTR_H_ */
diff --git a/sys/arch/sparc64/include/ioctl_fd.h b/sys/arch/sparc64/include/ioctl_fd.h
index dc68af65c5c..8d4cd459c6d 100644
--- a/sys/arch/sparc64/include/ioctl_fd.h
+++ b/sys/arch/sparc64/include/ioctl_fd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioctl_fd.h,v 1.1 2005/03/09 18:41:49 miod Exp $	*/
+/*	$OpenBSD: ioctl_fd.h,v 1.2 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	from: ioctl_fd.h,v 1.4 1995/06/29 03:49:32 jtk Exp 	*/
 
 /*
@@ -30,8 +30,8 @@
  * From: Id: ioctl_fd.h,v 1.7 1994/10/30 19:17:39 joerg Exp
  */
 
-#ifndef _SPARC64_IOCTL_FD_H_
-#define _SPARC64_IOCTL_FD_H_
+#ifndef _MACHINE_IOCTL_FD_H_
+#define _MACHINE_IOCTL_FD_H_
 
 #define FD_FORMAT_VERSION 110	/* used to validate before formatting */
 #define FD_MAX_NSEC 36		/* highest known number of spt - allow for */
@@ -127,4 +127,4 @@ struct fd_type {
 #endif /* FDC_500KBPS */
 
 
-#endif /* !_SPARC64_IOCTL_FD_H__ */
+#endif /* !_MACHINE_IOCTL_FD_H__ */
diff --git a/sys/arch/sparc64/include/lock.h b/sys/arch/sparc64/include/lock.h
index 0e873b3955b..b42f88e820f 100644
--- a/sys/arch/sparc64/include/lock.h
+++ b/sys/arch/sparc64/include/lock.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lock.h,v 1.5 2010/04/27 21:15:01 kettenis Exp $	*/
+/*	$OpenBSD: lock.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /* public domain */
 
-#ifndef	_SPARC64_LOCK_H_
-#define	_SPARC64_LOCK_H_
+#ifndef	_MACHINE_LOCK_H_
+#define	_MACHINE_LOCK_H_
 
 #include <machine/atomic.h>
 #include <machine/ctlreg.h>
@@ -53,4 +53,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t *l)
 
 #define	rw_cas(p, o, n)		(sparc64_casx(p, o, n) != o)
 
-#endif	/* _SPARC64_LOCK_H_ */
+#endif	/* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h
index 6a917a7d1bd..998462b96fd 100644
--- a/sys/arch/sparc64/include/param.h
+++ b/sys/arch/sparc64/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.33 2010/11/22 20:28:31 miod Exp $	*/
+/*	$OpenBSD: param.h,v 1.34 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */
 
 /*
@@ -64,8 +64,8 @@
  *
  */
 
-#ifndef _SPARC64_PARAM_H_
-#define _SPARC64_PARAM_H_
+#ifndef _MACHINE_PARAM_H_
+#define _MACHINE_PARAM_H_
 
 #define	_MACHINE	sparc64
 #define	MACHINE		"sparc64"
@@ -220,4 +220,4 @@ extern int cputyp;
 #endif
 #endif
 
-#endif	/* _SPARC64_PARAM_H_ */
+#endif	/* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/sparc64/include/pcb.h b/sys/arch/sparc64/include/pcb.h
index 7c4b337952d..dc72ecad17a 100644
--- a/sys/arch/sparc64/include/pcb.h
+++ b/sys/arch/sparc64/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.8 2008/01/16 20:55:37 kettenis Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.9 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: pcb.h,v 1.7 2000/12/29 17:12:05 eeh Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)pcb.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _SPARC64_PCB_H_
-#define _SPARC64_PCB_H_
+#ifndef _MACHINE_PCB_H_
+#define _MACHINE_PCB_H_
 
 #include <machine/reg.h>
 
@@ -161,4 +161,4 @@ struct md_coredump {
 #define pcb_wim	pcb_cwp
 #endif /* _KERNEL */
 
-#endif /* _SPARC64_PCB_H_ */
+#endif /* _MACHINE_PCB_H_ */
diff --git a/sys/arch/sparc64/include/rbus_machdep.h b/sys/arch/sparc64/include/rbus_machdep.h
index ef1a927ce2b..ae4376cf079 100644
--- a/sys/arch/sparc64/include/rbus_machdep.h
+++ b/sys/arch/sparc64/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.h,v 1.3 2009/07/21 21:20:05 miod Exp $	*/
+/*	$OpenBSD: rbus_machdep.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2007 Mark Kettenis
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef _SPARC64_RBUS_MACHDEP_H_
-#define _SPARC64_RBUS_MACHDEP_H_
+#ifndef _MACHINE_RBUS_MACHDEP_H_
+#define _MACHINE_RBUS_MACHDEP_H_
 
 struct pci_attach_args;
 
@@ -36,4 +36,4 @@ rbus_tag_t rbus_pccbb_parent_mem(struct device *, struct pci_attach_args *);
 void pccbb_attach_hook(struct device *, struct device *,
 	struct pci_attach_args *);
 
-#endif /* _SPARC64_RBUS_MACHDEP_H_ */
+#endif /* _MACHINE_RBUS_MACHDEP_H_ */
diff --git a/sys/arch/sparc64/include/reloc.h b/sys/arch/sparc64/include/reloc.h
index 05a206f479c..b20ce3b7437 100644
--- a/sys/arch/sparc64/include/reloc.h
+++ b/sys/arch/sparc64/include/reloc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reloc.h,v 1.4 2010/06/27 03:11:44 guenther Exp $	*/
+/*	$OpenBSD: reloc.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 /* 
  * Copyright (c) 2001 Artur Grabowski <art@openbsd.org>
  *   
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef	_MACH_RELOC_H_
-#define	_MACH_RELOC_H_
+#ifndef	_MACHINE_RELOC_H_
+#define	_MACHINE_RELOC_H_
 
 #define RELOC_NONE		0
 
@@ -33,4 +33,4 @@
 #define RELOC_TLS_TPOFF32	78
 #define RELOC_TLS_TPOFF64	79
 
-#endif	/* _MACH_RELOC_H_ */
+#endif	/* _MACHINE_RELOC_H_ */
diff --git a/sys/arch/sparc64/include/signal.h b/sys/arch/sparc64/include/signal.h
index aec130fb7e2..2a67ba7cd71 100644
--- a/sys/arch/sparc64/include/signal.h
+++ b/sys/arch/sparc64/include/signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signal.h,v 1.8 2006/01/08 14:20:17 millert Exp $	*/
+/*	$OpenBSD: signal.h,v 1.9 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: signal.h,v 1.10 2001/05/09 19:50:49 kleink Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	@(#)signal.h	8.1 (Berkeley) 6/11/93
  */
 
-#ifndef	_SPARC64_SIGNAL_H_
-#define _SPARC64_SIGNAL_H_
+#ifndef	_MACHINE_SIGNAL_H_
+#define _MACHINE_SIGNAL_H_
 
 #ifndef _LOCORE
 #include <sys/cdefs.h>
@@ -89,4 +89,4 @@ struct sigcontext {
 #define	FPE_FLTOVF_TRAP		0xd4	/* overflow */
 #endif
 
-#endif	/* !_SPARC64_SIGNAL_H_ */
+#endif	/* !_MACHINE_SIGNAL_H_ */
diff --git a/sys/arch/sparc64/include/stdarg.h b/sys/arch/sparc64/include/stdarg.h
index 97ad19f0886..9bd7855ce28 100644
--- a/sys/arch/sparc64/include/stdarg.h
+++ b/sys/arch/sparc64/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.8 2010/12/30 05:01:36 tedu Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.9 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.11 2000/07/23 21:36:56 mycroft Exp $ */
 
 /*
@@ -41,8 +41,8 @@
  *	from: @(#)stdarg.h	8.2 (Berkeley) 9/27/93
  */
 
-#ifndef _SPARC64_STDARG_H_
-#define	_SPARC64_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define	_MACHINE_STDARG_H_
 
 #include <sys/cdefs.h>
 #include <machine/_types.h>
@@ -88,4 +88,4 @@ typedef __va_list	va_list;
 	   (sizeof(type) <= 16 ? __va_arg16(ap, type) :			\
 	    *__va_arg8(ap, type *)))))
 
-#endif /* !_SPARC64_STDARG_H_ */
+#endif /* !_MACHINE_STDARG_H_ */
diff --git a/sys/arch/sparc64/include/varargs.h b/sys/arch/sparc64/include/varargs.h
index d2699bf2500..3a68ffc21d6 100644
--- a/sys/arch/sparc64/include/varargs.h
+++ b/sys/arch/sparc64/include/varargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: varargs.h,v 1.2 2003/06/02 23:27:56 millert Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: varargs.h,v 1.10 1995/12/29 18:53:02 mycroft Exp $ */
 
 /*
@@ -46,8 +46,8 @@
  *	from: @(#)varargs.h	8.3 (Berkeley) 3/22/94
  */
 
-#ifndef _SPARC_VARARGS_H_
-#define	_SPARC_VARARGS_H_
+#ifndef _MACHINE_VARARGS_H_
+#define	_MACHINE_VARARGS_H_
 
 #include <machine/stdarg.h>
 
@@ -64,4 +64,4 @@
 #define	va_start(ap) \
 	((ap) = (va_list)__builtin_saveregs())
 
-#endif /* !_SPARC_VARARGS_H_ */
+#endif /* !_MACHINE_VARARGS_H_ */
diff --git a/sys/arch/vax/include/aout_machdep.h b/sys/arch/vax/include/aout_machdep.h
index f84e2a379ff..a2e78959ec9 100644
--- a/sys/arch/vax/include/aout_machdep.h
+++ b/sys/arch/vax/include/aout_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aout_machdep.h,v 1.3 2001/11/14 14:38:33 hugh Exp $	*/
+/*	$OpenBSD: aout_machdep.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: aout_machdep.h,v 1.4 1995/09/23 14:57:40 ragge Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _VAX_EXEC_H_
-#define _VAX_EXEC_H_
+#ifndef _MACHINE_AOUT_MACHDEP_H_
+#define _MACHINE_AOUT_MACHDEP_H_
 
 #define __LDPGSZ	4096
 
@@ -47,4 +47,4 @@ struct relocation_info_vax {
 };
 #define relocation_info	relocation_info_vax
 
-#endif  /* _VAX_EXEC_H_ */
+#endif  /* _MACHINE_AOUT_MACHDEP_H_ */
diff --git a/sys/arch/vax/include/atomic.h b/sys/arch/vax/include/atomic.h
index 4166463158e..4ff15e2e49c 100644
--- a/sys/arch/vax/include/atomic.h
+++ b/sys/arch/vax/include/atomic.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: atomic.h,v 1.4 2010/04/21 03:03:26 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __VAX_ATOMIC_H__
-#define __VAX_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #if defined(_KERNEL)
 
@@ -31,4 +31,4 @@ atomic_clearbits_int(__volatile unsigned int *uip, unsigned int v)
 }
 
 #endif /* defined(_KERNEL) */
-#endif /* __VAX_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/vax/include/bus.h b/sys/arch/vax/include/bus.h
index cf0ffaf2180..6ab4071d5f8 100644
--- a/sys/arch/vax/include/bus.h
+++ b/sys/arch/vax/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.15 2010/04/04 12:49:30 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.16 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: bus.h,v 1.14 2000/06/26 04:56:13 simonb Exp $	*/
 
 /*-
@@ -62,8 +62,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _VAX_BUS_H_
-#define _VAX_BUS_H_
+#ifndef _MACHINE_BUS_H_
+#define _MACHINE_BUS_H_
 
 /*
  * Bus address and size types
@@ -965,4 +965,4 @@ paddr_t	_bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
 	    int nsegs, off_t off, int prot, int flags);
 #endif /* _VAX_BUS_DMA_PRIVATE */
 
-#endif /* _VAX_BUS_H_ */
+#endif /* _MACHINE_BUS_H_ */
diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index e2b276e805c..924a18c8419 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: cpu.h,v 1.36 2010/09/28 20:27:56 miod Exp $      */
+/*      $OpenBSD: cpu.h,v 1.37 2011/03/23 16:54:37 pirofti Exp $      */
 /*      $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $      */
 
 /*
@@ -31,8 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _VAX_CPU_H_
-#define _VAX_CPU_H_
+#ifndef _MACHINE_CPU_H_
+#define _MACHINE_CPU_H_
 #ifdef _KERNEL
 
 #include <sys/cdefs.h>
@@ -176,4 +176,4 @@ int	kdbrint(int);
 	{ "led_blink", CTLTYPE_INT } \
 }
 
-#endif /* _VAX_CPU_H_ */
+#endif /* _MACHINE_CPU_H_ */
diff --git a/sys/arch/vax/include/db_machdep.h b/sys/arch/vax/include/db_machdep.h
index 08917d010e1..0d592a43ba1 100644
--- a/sys/arch/vax/include/db_machdep.h
+++ b/sys/arch/vax/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.13 2010/11/27 19:57:23 miod Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.14 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.6 1998/08/10 14:33:33 ragge Exp $	*/
 
 /* 
@@ -27,8 +27,8 @@
  * the rights to redistribute these changes.
  */
 
-#ifndef	_VAX_DB_MACHDEP_H_
-#define	_VAX_DB_MACHDEP_H_
+#ifndef	_MACHINE_DB_MACHDEP_H_
+#define	_MACHINE_DB_MACHDEP_H_
 
 /*
  * Machine-dependent defines for new kernel debugger.
@@ -78,4 +78,4 @@ void	kdb_trap(struct trapframe *);
  */
 #define	DB_AOUT_SYMBOLS
 
-#endif	/* _VAX_DB_MACHDEP_H_ */
+#endif	/* _MACHINE_DB_MACHDEP_H_ */
diff --git a/sys/arch/vax/include/exec.h b/sys/arch/vax/include/exec.h
index 67900f666d5..d073a46013b 100644
--- a/sys/arch/vax/include/exec.h
+++ b/sys/arch/vax/include/exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.h,v 1.8 2008/03/30 18:24:30 miod Exp $	*/
+/*	$OpenBSD: exec.h,v 1.9 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: exec.h,v 1.4 1995/09/23 14:57:40 ragge Exp $	*/
 
 /*
@@ -28,8 +28,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _VAX_EXEC_H_
-#define _VAX_EXEC_H_
+#ifndef _MACHINE_EXEC_H_
+#define _MACHINE_EXEC_H_
 
 #define __LDPGSZ	4096
 
@@ -59,4 +59,4 @@ struct relocation_info_vax {
 #define ELF_TARG_DATA		ELFDATA2LSB
 #define ELF_TARG_MACH		EM_VAX
 
-#endif  /* _VAX_EXEC_H_ */
+#endif  /* _MACHINE_EXEC_H_ */
diff --git a/sys/arch/vax/include/float.h b/sys/arch/vax/include/float.h
index c9f76c10468..ceb63589fbd 100644
--- a/sys/arch/vax/include/float.h
+++ b/sys/arch/vax/include/float.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: float.h,v 1.7 2008/07/21 20:50:55 martynas Exp $	*/
+/*	$OpenBSD: float.h,v 1.8 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: float.h,v 1.5 1998/10/10 02:13:55 matt Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  *	@(#)float.h     7.2 (Berkeley) 6/28/90
  */
 
-#ifndef _VAX_FLOAT_H_
-#define _VAX_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
 
 #define FLT_RADIX	2		/* b */
 #define FLT_ROUNDS	1		/* FP addition rounds to nearest */
@@ -73,4 +73,4 @@
 #define LDBL_MAX	DBL_MAX
 #define LDBL_MAX_10_EXP	DBL_MAX_10_EXP
 
-#endif	/* _VAX_FLOAT_H_ */
+#endif	/* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/vax/include/frame.h b/sys/arch/vax/include/frame.h
index f83892f8195..7d339843075 100644
--- a/sys/arch/vax/include/frame.h
+++ b/sys/arch/vax/include/frame.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frame.h,v 1.3 2001/08/25 13:33:36 hugh Exp $ */
+/*	$OpenBSD: frame.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $ */
 /*	$NetBSD: frame.h,v 1.2 2000/06/04 19:30:15 matt Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -31,8 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _VAX_FRAME_H_
-#define	_VAX_FRAME_H_
+#ifndef _MACHINE_FRAME_H_
+#define	_MACHINE_FRAME_H_
 
 /*
  * Description of calls frame on stack. This is the 
diff --git a/sys/arch/vax/include/intr.h b/sys/arch/vax/include/intr.h
index 39ccf31ad00..0b427659ac0 100644
--- a/sys/arch/vax/include/intr.h
+++ b/sys/arch/vax/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.13 2010/12/21 14:56:24 claudio Exp $	*/
+/*	$OpenBSD: intr.h,v 1.14 2011/03/23 16:54:37 pirofti Exp $	*/
 /* 	$NetBSD: intr.h,v 1.1 1998/08/18 23:55:00 matt Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _VAX_INTR_H_
-#define _VAX_INTR_H_
+#ifndef _MACHINE_INTR_H_
+#define _MACHINE_INTR_H_
 
 /* Define the various Interrupt Priority Levels */
 
diff --git a/sys/arch/vax/include/ka630.h b/sys/arch/vax/include/ka630.h
index 9bce6065483..cd6e32914d9 100644
--- a/sys/arch/vax/include/ka630.h
+++ b/sys/arch/vax/include/ka630.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ka630.h,v 1.6 2003/06/02 23:27:57 millert Exp $ */
+/*	$OpenBSD: ka630.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $ */
 /*	$NetBSD: ka630.h,v 1.5 2000/07/19 01:01:58 matt Exp $ */
 /*-
  * Copyright (c) 1986, 1988 The Regents of the University of California.
@@ -31,8 +31,8 @@
  *	@(#)uvaxII.h	7.4 (Berkeley) 5/9/91
  */
 
-#ifndef _VAX_INCLUDE_KA630_H_
-#define	_VAX_INCLUDE_KA630_H_
+#ifndef _MACHINE_KA630_H_
+#define	_MACHINE_KA630_H_
 
 #define UVAXIISID	((u_long *)0x20040004)
 #define UVAXIICPU	((struct uvaxIIcpu *)0x20080000)
@@ -131,5 +131,5 @@ struct ka630clock {
 #define KA630_MINCOL	0x51
 #define KA630_MAXCOL	0x52
 
-#endif /* _VAX_INCLUDE_KA630_H_ */
+#endif /* _MACHINE_KA630_H_ */
 
diff --git a/sys/arch/vax/include/lock.h b/sys/arch/vax/include/lock.h
index 364b430f0ff..37deaf4b399 100644
--- a/sys/arch/vax/include/lock.h
+++ b/sys/arch/vax/include/lock.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lock.h,v 1.2 2010/04/21 03:03:26 deraadt Exp $	*/
+/*	$OpenBSD: lock.h,v 1.3 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /* public domain */
 
-#ifndef	_VAX_LOCK_H_
-#define	_VAX_LOCK_H_
+#ifndef	_MACHINE_LOCK_H_
+#define	_MACHINE_LOCK_H_
 
 #include <machine/atomic.h>
 
@@ -53,4 +53,4 @@ __cpu_simple_unlock(__cpu_simple_lock_t *l)
 	*l = __SIMPLELOCK_UNLOCKED;
 }
 
-#endif	/* _VAX_LOCK_H_ */
+#endif	/* _MACHINE_LOCK_H_ */
diff --git a/sys/arch/vax/include/macros.h b/sys/arch/vax/include/macros.h
index b39d64c9228..3a700c5237d 100644
--- a/sys/arch/vax/include/macros.h
+++ b/sys/arch/vax/include/macros.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macros.h,v 1.16 2009/08/19 19:47:51 miod Exp $ */
+/*	$OpenBSD: macros.h,v 1.17 2011/03/23 16:54:37 pirofti Exp $ */
 /*	$NetBSD: macros.h,v 1.20 2000/07/19 01:02:52 matt Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
 
  /* All bugs are subject to removal without further notice */
 
-#if !defined(_VAX_MACROS_H_) && !defined(lint)
-#define _VAX_MACROS_H_
+#if !defined(_MACHINE_MACROS_H_) && !defined(lint)
+#define _MACHINE_MACROS_H_
 
 /* Here general macros are supposed to be stored */
 
@@ -209,4 +209,4 @@ remqhi(void *header) {
 #define	Q_EMPTY		0	/* Queue is/was empty */
 #define	Q_OK		1	/* Inserted OK */
 
-#endif	/* _VAX_MACROS_H_ */
+#endif	/* _MACHINE_MACROS_H_ */
diff --git a/sys/arch/vax/include/mtpr.h b/sys/arch/vax/include/mtpr.h
index f41e3474b38..9aa610f86ab 100644
--- a/sys/arch/vax/include/mtpr.h
+++ b/sys/arch/vax/include/mtpr.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: mtpr.h,v 1.5 2000/04/26 03:08:42 bjc Exp $     */
+/*      $OpenBSD: mtpr.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $     */
 /*      $NetBSD: mtpr.h,v 1.12 1999/06/06 19:06:29 ragge Exp $     */
 
 /*
@@ -33,8 +33,8 @@
 
  /* All bugs are subject to removal without further notice */
 
-#ifndef	_VAX_MTPR_H_
-#define	_VAX_MTPR_H_
+#ifndef	_MACHINE_MTPR_H_
+#define	_MACHINE_MTPR_H_
 
 /******************************************************************************
 
@@ -175,4 +175,4 @@
 })
 #endif	/* _LOCORE */
 
-#endif /* _VAX_MTPR_H_ */
+#endif /* _MACHINE_MTPR_H_ */
diff --git a/sys/arch/vax/include/nexus.h b/sys/arch/vax/include/nexus.h
index fe2101f5f53..9d844dc9a57 100644
--- a/sys/arch/vax/include/nexus.h
+++ b/sys/arch/vax/include/nexus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nexus.h,v 1.14 2008/08/18 23:19:24 miod Exp $	*/
+/*	$OpenBSD: nexus.h,v 1.15 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: nexus.h,v 1.17 2000/06/04 17:58:19 ragge Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  *	@(#)nexus.h	7.3 (Berkeley) 5/9/91
  */
 
-#ifndef _VAX_NEXUS_H_
-#define _VAX_NEXUS_H_
+#ifndef _MACHINE_NEXUS_H_
+#define _MACHINE_NEXUS_H_
 
 #include <machine/bus.h>
 
@@ -194,4 +194,4 @@ struct bp_conf {
 #define	MCHK_PANIC	-1
 #define	MCHK_RECOVERED	0
 
-#endif /* _VAX_NEXUS_H_ */
+#endif /* _MACHINE_NEXUS_H_ */
diff --git a/sys/arch/vax/include/param.h b/sys/arch/vax/include/param.h
index 6069808dc04..aee4ea40275 100644
--- a/sys/arch/vax/include/param.h
+++ b/sys/arch/vax/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.34 2008/08/14 11:41:30 martin Exp $ */
+/*	$OpenBSD: param.h,v 1.35 2011/03/23 16:54:37 pirofti Exp $ */
 /*      $NetBSD: param.h,v 1.39 1999/10/22 21:14:34 ragge Exp $    */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -34,8 +34,8 @@
  *	@(#)param.h	5.8 (Berkeley) 6/28/91
  */
 
-#ifndef _VAX_PARAM_H_
-#define _VAX_PARAM_H_
+#ifndef _MACHINE_PARAM_H_
+#define _MACHINE_PARAM_H_
 
 /*
  * Machine dependent constants for VAX.
@@ -140,4 +140,4 @@ void	delay(int);
 #define	DELAY(x) delay(x)
 #endif /* _KERNEL */
 
-#endif /* _VAX_PARAM_H_ */
+#endif /* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/vax/include/pcb.h b/sys/arch/vax/include/pcb.h
index 4f1f787aa42..36fa056984f 100644
--- a/sys/arch/vax/include/pcb.h
+++ b/sys/arch/vax/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.6 2003/11/10 21:05:06 miod Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: pcb.h,v 1.10 1996/02/02 18:08:26 mycroft Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
 
  /* All bugs are subject to removal without further notice */
 
-#ifndef _VAX_PCB_H_
-#define _VAX_PCB_H_
+#ifndef _MACHINE_PCB_H_
+#define _MACHINE_PCB_H_
 
 #include <machine/reg.h>
 #include <machine/pte.h>
@@ -70,5 +70,5 @@ struct	md_coredump {
 	struct reg md_reg;
 };
 
-#endif /* _VAX_PCB_H_ */
+#endif /* _MACHINE_PCB_H_ */
 
diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h
index dfa1568180d..4ae2a3c290b 100644
--- a/sys/arch/vax/include/pmap.h
+++ b/sys/arch/vax/include/pmap.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pmap.h,v 1.31 2010/12/26 15:41:00 miod Exp $     */
+/*      $OpenBSD: pmap.h,v 1.32 2011/03/23 16:54:37 pirofti Exp $     */
 /*	$NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $	   */
 
 /* 
@@ -40,8 +40,8 @@
  */
 
 
-#ifndef PMAP_H
-#define PMAP_H
+#ifndef _MACHINE_PMAP_H_
+#define _MACHINE_PMAP_H_
 
 #ifdef _KERNEL
 
@@ -146,4 +146,4 @@ void	pmap_pinit(pmap_t);
 
 #endif	/* _KERNEL */
 
-#endif /* PMAP_H */
+#endif /* _MACHINE_PMAP_H_ */
diff --git a/sys/arch/vax/include/pte.h b/sys/arch/vax/include/pte.h
index ba91f1faf6e..ef979991aab 100644
--- a/sys/arch/vax/include/pte.h
+++ b/sys/arch/vax/include/pte.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: pte.h,v 1.10 2006/07/25 21:05:31 miod Exp $      */
+/*      $OpenBSD: pte.h,v 1.11 2011/03/23 16:54:37 pirofti Exp $      */
 /*	$NetBSD: pte.h,v 1.21 2005/12/24 22:45:40 perry Exp $	  */
 
 /*
@@ -31,8 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _VAX_PTE_H_
-#define _VAX_PTE_H_
+#ifndef _MACHINE_PTE_H_
+#define _MACHINE_PTE_H_
 
 #ifndef _LOCORE
 
diff --git a/sys/arch/vax/include/reg.h b/sys/arch/vax/include/reg.h
index b04552f8165..5940bcec204 100644
--- a/sys/arch/vax/include/reg.h
+++ b/sys/arch/vax/include/reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: reg.h,v 1.3 2000/10/09 23:11:57 bjc Exp $	*/
+/*	$OpenBSD: reg.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: reg.h,v 1.3 1995/04/12 15:26:52 ragge Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
 
  /* All bugs are subject to removal without further notice */
 
-#ifndef _VAX_REG_H_
-#define _VAX_REG_H_
+#ifndef _MACHINE_REG_H_
+#define _MACHINE_REG_H_
 
 struct  reg {
 	int	r0;     /* General registers saved upon trap/syscall */
@@ -56,4 +56,4 @@ struct  reg {
 	int	psl;    /* User psl */
 };
 
-#endif /* _VAX_REG_H_ */
+#endif /* _MACHINE_REG_H_ */
diff --git a/sys/arch/vax/include/signal.h b/sys/arch/vax/include/signal.h
index 3101c749350..65f8a520838 100644
--- a/sys/arch/vax/include/signal.h
+++ b/sys/arch/vax/include/signal.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: signal.h,v 1.6 2009/06/20 21:02:13 miod Exp $   */
+/*      $OpenBSD: signal.h,v 1.7 2011/03/23 16:54:37 pirofti Exp $   */
 /*      $NetBSD: signal.h,v 1.4 1995/01/10 19:01:52 jtc Exp $   */
 
 /*
@@ -34,8 +34,8 @@
 
  /* All bugs are subject to removal without further notice */
 
-#ifndef _VAX_SIGNAL_H_
-#define _VAX_SIGNAL_H_
+#ifndef _MACHINE_SIGNAL_H_
+#define _MACHINE_SIGNAL_H_
 
 #include <sys/cdefs.h>
 
@@ -60,4 +60,4 @@ struct	sigcontext {
 	int	sc_r[12];		/* registers to restore */
 };
 #endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */
-#endif	/* !_VAX_SIGNAL_H_ */
+#endif	/* !_MACHINE_SIGNAL_H_ */
diff --git a/sys/arch/vax/include/stdarg.h b/sys/arch/vax/include/stdarg.h
index 73e6fcd1558..2f55b8a9398 100644
--- a/sys/arch/vax/include/stdarg.h
+++ b/sys/arch/vax/include/stdarg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdarg.h,v 1.10 2008/10/23 21:25:08 kettenis Exp $	*/
+/*	$OpenBSD: stdarg.h,v 1.11 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: stdarg.h,v 1.11 1999/05/03 16:30:34 christos Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  *      @(#)stdarg.h    7.2 (Berkeley) 5/4/91
  */
 
-#ifndef _VAX_STDARG_H_
-#define	_VAX_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define	_MACHINE_STDARG_H_
 
 #include <sys/cdefs.h>
 #include <machine/_types.h>
@@ -64,4 +64,4 @@ typedef __va_list	va_list;
 
 #define va_end(ap)	
 
-#endif /* !_VAX_STDARG_H_ */
+#endif /* !_MACHINE_STDARG_H_ */
diff --git a/sys/arch/vax/include/trap.h b/sys/arch/vax/include/trap.h
index 5537927f304..50d2a39d90e 100644
--- a/sys/arch/vax/include/trap.h
+++ b/sys/arch/vax/include/trap.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: trap.h,v 1.12 2003/06/02 23:27:57 millert Exp $     */
+/*      $OpenBSD: trap.h,v 1.13 2011/03/23 16:54:37 pirofti Exp $     */
 /*      $NetBSD: trap.h,v 1.18 2000/06/04 02:19:26 matt Exp $     */
 
 /*-
@@ -39,8 +39,8 @@
  * Trap type values
  * also known in trap.c for name strings
  */
-#ifndef _VAX_TRAP_H_
-#define _VAX_TRAP_H_
+#ifndef _MACHINE_TRAP_H_
+#define _MACHINE_TRAP_H_
 
 #define	T_RESADFLT	0	/* reserved addressing */
 #define	T_PRIVINFLT	1	/* privileged instruction */
@@ -90,4 +90,4 @@ struct	trapframe {
 
 #endif /* _LOCORE */
 
-#endif /* _VAX_TRAP_H_ */
+#endif /* _MACHINE_TRAP_H_ */
diff --git a/sys/arch/vax/include/uvax.h b/sys/arch/vax/include/uvax.h
index 9d65eb9e909..fe113862173 100644
--- a/sys/arch/vax/include/uvax.h
+++ b/sys/arch/vax/include/uvax.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvax.h,v 1.5 2002/09/21 13:42:43 hugh Exp $ */
+/*	$OpenBSD: uvax.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $ */
 /*	$NetBSD: uvax.h,v 1.5 1999/02/02 18:37:22 ragge Exp $ */
 /*
  * Copyright (c) 2002 Hugh Graham.
@@ -34,8 +34,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _VAX_UVAX_H_
-#define _VAX_UVAX_H_
+#ifndef _MACHINE_UVAX_H_
+#define _MACHINE_UVAX_H_
 
 /*
  * Generic definitions common on all MicroVAXen clock chip.
diff --git a/sys/arch/vax/include/varargs.h b/sys/arch/vax/include/varargs.h
index a235faa6468..c5593e0da1e 100644
--- a/sys/arch/vax/include/varargs.h
+++ b/sys/arch/vax/include/varargs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: varargs.h,v 1.5 2003/06/02 23:27:57 millert Exp $	*/
+/*	$OpenBSD: varargs.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: varargs.h,v 1.9 1995/12/26 01:16:35 mycroft Exp $	*/
 
 /*-
@@ -32,8 +32,8 @@
  *	@(#)varargs.h	5.3 (Berkeley) 4/3/91
  */
 
-#ifndef _VAX_VARARGS_H_
-#define	_VAX_VARARGS_H_
+#ifndef _MACHINE_VARARGS_H_
+#define	_MACHINE_VARARGS_H_
 
 #include <machine/stdarg.h>
 
@@ -50,4 +50,4 @@
 #define	va_start(ap) \
 	((ap) = (va_list)&__builtin_va_alist)
 
-#endif /* !_VAX_VARARGS_H_ */
+#endif /* !_MACHINE_VARARGS_H_ */
diff --git a/sys/arch/vax/include/vaxfp.h b/sys/arch/vax/include/vaxfp.h
index 39a0fb15021..2b3407faab6 100644
--- a/sys/arch/vax/include/vaxfp.h
+++ b/sys/arch/vax/include/vaxfp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vaxfp.h,v 1.1 2008/07/21 21:50:06 martynas Exp $	*/
+/*	$OpenBSD: vaxfp.h,v 1.2 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: vaxfp.h,v 1.7 2008/04/28 20:23:39 martin Exp $	*/
 
 /*-
@@ -35,8 +35,8 @@
  * Only F_floating and D_floating types are defined here;
  * G_floating and H_floating are not supported by OpenBSD.
  */
-#ifndef _VAX_VAXFP_H_
-#define	_VAX_VAXFP_H_
+#ifndef _MACHINE_VAXFP_H_
+#define	_MACHINE_VAXFP_H_
 
 #define	FFLT_EXPBITS	8
 #define	FFLT_FRACHBITS	7
@@ -83,4 +83,4 @@ union vax_dfloating_u {
 	struct vax_d_floating	dfltu_dflt;
 };
 
-#endif /* _VAX_VAXFP_H_ */
+#endif /* _MACHINE_VAXFP_H_ */
diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h
index 40e41933392..b8ac6f284ae 100644
--- a/sys/arch/vax/include/vmparam.h
+++ b/sys/arch/vax/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.29 2008/06/24 21:24:03 deraadt Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.30 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.32 2000/03/07 00:05:59 matt Exp $	*/
 
 /*-
@@ -36,8 +36,8 @@
  *
  *	@(#)vmparam.h	5.9 (Berkeley) 5/12/91
  */
-#ifndef _VMPARAM_H_
-#define _VMPARAM_H_
+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_
 
 /*
  * Machine dependent constants for VAX.
@@ -47,8 +47,7 @@
  * USRTEXT is the start of the user text/data space, while USRSTACK
  * is the top (end) of the user stack. Immediately above the user stack
  * resides kernel.
- *
- */
+ * */
 
 #define USRTEXT		NBPG
 #define USRSTACK	KERNBASE
@@ -123,4 +122,4 @@ struct vm_page_md {
 		(pg)->mdpage.pv_attr = 0; \
 	} while (0)
 
-#endif
+#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/sys/arch/vax/include/vsbus.h b/sys/arch/vax/include/vsbus.h
index b34ead53776..38d44444cc2 100644
--- a/sys/arch/vax/include/vsbus.h
+++ b/sys/arch/vax/include/vsbus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbus.h,v 1.9 2006/12/13 21:11:23 miod Exp $ */
+/*	$OpenBSD: vsbus.h,v 1.10 2011/03/23 16:54:37 pirofti Exp $ */
 /*	$NetBSD: vsbus.h,v 1.13 2000/06/25 16:00:46 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -38,8 +38,8 @@
  * used by all VAXstations.
  */
 
-#ifndef _VAX_VSBUS_H_
-#define _VAX_VSBUS_H_
+#ifndef _MACHINE_VSBUS_H_
+#define _MACHINE_VSBUS_H_
 
 #include <machine/bus.h>
 #include <machine/sgmap.h>
@@ -105,4 +105,4 @@ void	vsbus_copyfromproc(struct proc *, caddr_t, caddr_t, int);
 void	vsbus_dma_start(struct vsbus_dma *);
 void	vsbus_dma_intr(void);
 #endif
-#endif /* _VAX_VSBUS_H_ */
+#endif /* _MACHINE_VSBUS_H_ */
diff --git a/sys/arch/zaurus/include/_types.h b/sys/arch/zaurus/include/_types.h
index 34a18e47fd3..7d1985392fb 100644
--- a/sys/arch/zaurus/include/_types.h
+++ b/sys/arch/zaurus/include/_types.h
@@ -1,7 +1,7 @@
-/* 	$OpenBSD: _types.h,v 1.5 2009/11/04 19:14:10 kettenis Exp $	*/
+/* 	$OpenBSD: _types.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $	*/
 
-#ifndef _ZAURUS__TYPES_H_
-#define	_ZAURUS__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define	_MACHINE__TYPES_H_
 
 #include <arm/_types.h>
 
diff --git a/sys/arch/zaurus/include/atomic.h b/sys/arch/zaurus/include/atomic.h
index 7812833a3f7..2cdf06fcd23 100644
--- a/sys/arch/zaurus/include/atomic.h
+++ b/sys/arch/zaurus/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.4 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __ZAURUS_ATOMIC_H__
-#define __ZAURUS_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <arm/atomic.h>
 
-#endif /* __ZAURUS_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/zaurus/include/conf.h b/sys/arch/zaurus/include/conf.h
index 7049fcaac10..87b4a7dda5d 100644
--- a/sys/arch/zaurus/include/conf.h
+++ b/sys/arch/zaurus/include/conf.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: conf.h,v 1.7 2010/11/28 20:49:47 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.8 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $	*/
 
-#ifndef _ZAURUS_CONF_H
-#define	_ZAURUS_CONF_H
+#ifndef _MACHINE_CONF_H_
+#define	_MACHINE_CONF_H_
 
 #include <sys/conf.h>
 
@@ -14,4 +14,4 @@
 
 #include <arm/conf.h>
 
-#endif	/* _ZAURUS_CONF_H */
+#endif	/* _MACHINE_CONF_H_ */
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index b1e0feb0442..a2c69799f6d 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.9 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.10 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_EVBARM_INTR_H_
-#define	_EVBARM_INTR_H_
+#ifndef	_MACHINE_INTR_H_
+#define	_MACHINE_INTR_H_
 
 #ifdef _KERNEL
 
@@ -101,5 +101,5 @@
 
 #endif /* _KERNEL */
 
-#endif	/* _EVBARM_INTR_H_ */
+#endif	/* _MACHINE_INTR_H_ */
 
diff --git a/sys/arch/zaurus/include/param.h b/sys/arch/zaurus/include/param.h
index 1b8a3abffcd..11fba7cfedd 100644
--- a/sys/arch/zaurus/include/param.h
+++ b/sys/arch/zaurus/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.4 2004/12/31 14:58:53 drahn Exp $	*/
+/*	$OpenBSD: param.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.4 2002/02/12 06:58:19 thorpej Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ZAURUS_PARAM_H_
-#define	_ZAURUS_PARAM_H_
+#ifndef	_MACHINE_PARAM_H_
+#define	_MACHINE_PARAM_H_
 
 /*
  * 1 page should be enough
@@ -48,4 +48,4 @@
 #define	_MACHINE	zaurus
 #define	MACHINE		"zaurus"
 
-#endif	/* _ZAURUS_PARAM_H_ */
+#endif	/* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/zaurus/include/spinlock.h b/sys/arch/zaurus/include/spinlock.h
index 7d443100474..76c99ed16d7 100644
--- a/sys/arch/zaurus/include/spinlock.h
+++ b/sys/arch/zaurus/include/spinlock.h
@@ -1,7 +1,7 @@
 
-/*	$OpenBSD: spinlock.h,v 1.3 2005/12/01 22:09:59 deraadt Exp $	*/
-#ifndef _ZAURUS_SPINLOCK_H_
-#define _ZAURUS_SPINLOCK_H_
+/*	$OpenBSD: spinlock.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $	*/
+#ifndef _MACHINE_SPINLOCK_H_
+#define _MACHINE_SPINLOCK_H_
 #include <arm/spinlock.h>
-#endif /* _ZAURUS_SPINLOCK_H_ */
+#endif /* _MACHINE_SPINLOCK_H_ */
 
diff --git a/sys/arch/zaurus/include/vmparam.h b/sys/arch/zaurus/include/vmparam.h
index ef976fed4de..137c992070c 100644
--- a/sys/arch/zaurus/include/vmparam.h
+++ b/sys/arch/zaurus/include/vmparam.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: vmparam.h,v 1.4 2006/06/04 17:21:24 miod Exp $	*/
+/* 	$OpenBSD: vmparam.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.23 2003/05/22 05:47:07 thorpej Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_VMPARAM_H_
-#define	_ARM32_VMPARAM_H_
+#ifndef	_MACHINE_VMPARAM_H_
+#define	_MACHINE_VMPARAM_H_
 
 #define	ARM_KERNEL_BASE		0xc0000000
 
@@ -83,4 +83,4 @@
 #define	VM_FREELIST_DEFAULT	0
 
 
-#endif	/* _ARM32_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */