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

Discussed and okay drahn@. Okay deraadt@.

21 files changed, 86 insertions, 86 deletions

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_ */