Unify header sentinel names.

21 files changed, 84 insertions, 84 deletions

diff --git a/sys/compat/linux/linux_blkio.h b/sys/compat/linux/linux_blkio.h
index 944946827e2..b31cca814fd 100644
--- a/sys/compat/linux/linux_blkio.h
+++ b/sys/compat/linux/linux_blkio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_blkio.h,v 1.1 2001/04/09 06:53:44 tholo Exp $	*/
+/*	$OpenBSD: linux_blkio.h,v 1.2 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_blkio.h,v 1.2 2001/01/18 17:48:04 tv Exp $	*/
 
 /*
@@ -41,8 +41,8 @@
  * in <linux/fs.h>
  */
 
-#ifndef _LINUX_BLKIO_H
-#define _LINUX_BLKIO_H
+#ifndef _LINUX_BLKIO_H_
+#define _LINUX_BLKIO_H_
 
 #define LINUX_BLKROSET		_LINUX_IO(0x12, 93)
 #define LINUX_BLKROGET		_LINUX_IO(0x12, 94)
@@ -58,4 +58,4 @@
 #define LINUX_BLKSSZGET		_LINUX_IO(0x12, 104)
 #define LINUX_BLKPG		_LINUX_IO(0x12, 105)
 
-#endif /* _LINUX_BLKIO_H */
+#endif /* _LINUX_BLKIO_H_ */
diff --git a/sys/compat/linux/linux_dirent.h b/sys/compat/linux/linux_dirent.h
index 04e1aeaa97d..95194e7521c 100644
--- a/sys/compat/linux/linux_dirent.h
+++ b/sys/compat/linux/linux_dirent.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_dirent.h,v 1.3 2002/10/28 03:39:30 fgsch Exp $	*/
+/*	$OpenBSD: linux_dirent.h,v 1.4 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_dirent.h,v 1.3 1995/10/07 06:26:59 mycroft Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_DIRENT_H
-#define _LINUX_DIRENT_H
+#ifndef _LINUX_DIRENT_H_
+#define _LINUX_DIRENT_H_
 
 #define LINUX_MAXNAMLEN	255
 
@@ -55,4 +55,4 @@ struct linux_dirent64 {
 #define LINUX_NAMEOFF(dp)       ((char *)&(dp)->d_name - (char *)dp)
 #define LINUX_RECLEN(de,namlen) ALIGN((LINUX_NAMEOFF(de) + (namlen) + 1))
 
-#endif /* !_LINUX_DIRENT_H */
+#endif /* !_LINUX_DIRENT_H_ */
diff --git a/sys/compat/linux/linux_emuldata.h b/sys/compat/linux/linux_emuldata.h
index 4eb541081d4..f00fe1b2a57 100644
--- a/sys/compat/linux/linux_emuldata.h
+++ b/sys/compat/linux/linux_emuldata.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_emuldata.h,v 1.5 2011/04/05 15:44:40 pirofti Exp $	*/
+/*	$OpenBSD: linux_emuldata.h,v 1.6 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_emuldata.h,v 1.4 2002/02/15 16:48:02 christos Exp $	*/
 /*-
  * Copyright (c) 1998,2002 The NetBSD Foundation, Inc.
@@ -28,8 +28,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef _LINUX_EMULDATA_H
-#define _LINUX_EMULDATA_H
+#ifndef _LINUX_EMULDATA_H_
+#define _LINUX_EMULDATA_H_
 
 /*
  * This is auxiliary data the linux compat code
@@ -49,4 +49,4 @@ struct linux_emuldata {
 	void *my_clear_tid;
 	unsigned my_tls_base;
 };
-#endif /* !_LINUX_EMULDATA_H */
+#endif /* !_LINUX_EMULDATA_H_ */
diff --git a/sys/compat/linux/linux_errno.h b/sys/compat/linux/linux_errno.h
index 5f85b75c7d4..54f95987018 100644
--- a/sys/compat/linux/linux_errno.h
+++ b/sys/compat/linux/linux_errno.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_errno.h,v 1.2 1996/04/17 05:23:44 mickey Exp $	*/
+/*	$OpenBSD: linux_errno.h,v 1.3 2011/04/05 22:54:30 pirofti Exp $	*/
 /* 	$NetBSD: linux_errno.h,v 1.1 1995/02/28 23:25:34 fvdl Exp $	*/
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -31,8 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_ERRNO_H
-#define _LINUX_ERRNO_H
+#ifndef _LINUX_ERRNO_H_
+#define _LINUX_ERRNO_H_
 
 #define LINUX_EPERM		 1
 #define LINUX_ENOENT		 2
@@ -156,4 +156,4 @@
 #define LINUX_EREMOTEIO		121
 #define LINUX_EDQUOT		122
 
-#endif /* !_LINUX_ERRNO_H */
+#endif /* !_LINUX_ERRNO_H_ */
diff --git a/sys/compat/linux/linux_exec.h b/sys/compat/linux/linux_exec.h
index 633356fd874..d4f0f14d2e1 100644
--- a/sys/compat/linux/linux_exec.h
+++ b/sys/compat/linux/linux_exec.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_exec.h,v 1.6 2010/04/28 21:31:59 kettenis Exp $	*/
+/*	$OpenBSD: linux_exec.h,v 1.7 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_exec.h,v 1.5 1995/10/07 06:27:01 mycroft Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  *
  */
 
-#ifndef	_LINUX_EXEC_H
-#define	_LINUX_EXEC_H
+#ifndef	_LINUX_EXEC_H_
+#define	_LINUX_EXEC_H_
 
 #define LINUX_M_I386	100
 /* Sparc? Alpha? */
@@ -72,4 +72,4 @@ int exec_linux_elf32_makecmds(struct proc *, struct exec_package *);
 int linux_elf_probe(struct proc *, struct exec_package *, char *,
     u_long *, u_int8_t *);
 
-#endif /* !_LINUX_EXEC_H */
+#endif /* !_LINUX_EXEC_H_ */
diff --git a/sys/compat/linux/linux_fcntl.h b/sys/compat/linux/linux_fcntl.h
index 9f3ea5ebd47..ea99f3c366b 100644
--- a/sys/compat/linux/linux_fcntl.h
+++ b/sys/compat/linux/linux_fcntl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_fcntl.h,v 1.3 2002/02/04 20:04:52 provos Exp $	*/
+/*	$OpenBSD: linux_fcntl.h,v 1.4 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_fcntl.h,v 1.1 1995/02/28 23:25:40 fvdl Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * Various flag values used in Linux for open(2) and fcntl(2).
  */
 
-#ifndef _LINUX_FCNTL_H
-#define _LINUX_FCNTL_H
+#ifndef _LINUX_FCNTL_H_
+#define _LINUX_FCNTL_H_
 
 /* read/write mode for open(2) (as usual) */
 #define LINUX_O_RDONLY		0x0000
@@ -100,4 +100,4 @@ struct linux_flock64 {
         linux_pid_t  l_pid;
 };
 
-#endif /* _LINUX_FCNTL_H */
+#endif /* _LINUX_FCNTL_H_ */
diff --git a/sys/compat/linux/linux_fdio.h b/sys/compat/linux/linux_fdio.h
index 99f60335548..bfa141fee86 100644
--- a/sys/compat/linux/linux_fdio.h
+++ b/sys/compat/linux/linux_fdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_fdio.h,v 1.1 2001/04/09 06:53:44 tholo Exp $	*/
+/*	$OpenBSD: linux_fdio.h,v 1.2 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_fdio.h,v 1.1 2000/12/10 14:12:16 fvdl Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_FDIO_H
-#define _LINUX_FDIO_H
+#ifndef _LINUX_FDIO_H_
+#define _LINUX_FDIO_H_
 
 /*
  * Linux floppy ioctl call structures and defines.
@@ -198,4 +198,4 @@ typedef char linux_floppy_drive_name[16];
 #define LINUX_FDTWADDLE		_LINUX_IO(2, 0x59)
 #define LINUX_FDEJECT		_LINUX_IO(2, 0x5a)
 
-#endif /* _LINUX_FDIO_H */
+#endif /* _LINUX_FDIO_H_ */
diff --git a/sys/compat/linux/linux_hdio.h b/sys/compat/linux/linux_hdio.h
index fc76ad416ac..dc6cac20041 100644
--- a/sys/compat/linux/linux_hdio.h
+++ b/sys/compat/linux/linux_hdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_hdio.h,v 1.1 2001/04/09 06:53:45 tholo Exp $	*/
+/*	$OpenBSD: linux_hdio.h,v 1.2 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_hdio.h,v 1.1 2000/12/10 14:12:17 fvdl Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_HDIO_H
-#define _LINUX_HDIO_H
+#ifndef _LINUX_HDIO_H_
+#define _LINUX_HDIO_H_
 
 /*
  * Linux 'hd' (mostly really IDE disk) ioctl calls.
@@ -86,4 +86,4 @@ struct linux_hd_big_geometry {
 	u_long start;
 };
 
-#endif /* _LINUX_HDIO_H */
+#endif /* _LINUX_HDIO_H_ */
diff --git a/sys/compat/linux/linux_ipc.h b/sys/compat/linux/linux_ipc.h
index c98730cd923..cfd7ff781d7 100644
--- a/sys/compat/linux/linux_ipc.h
+++ b/sys/compat/linux/linux_ipc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_ipc.h,v 1.3 2000/07/23 22:35:38 jasoni Exp $	*/
+/*	$OpenBSD: linux_ipc.h,v 1.4 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_ipc.h,v 1.1 1995/02/28 23:25:47 fvdl Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_IPC_H
-#define _LINUX_IPC_H
+#ifndef _LINUX_IPC_H_
+#define _LINUX_IPC_H_
 
 /*
  * Structs and values to handle the SYSV ipc/shm/msg calls implemented
@@ -62,4 +62,4 @@ struct linux_ipc_perm {
 #define LINUX_IPC_STAT	2
 #define LINUX_IPC_INFO	3
 
-#endif /* _LINUX_IPC_H */
+#endif /* _LINUX_IPC_H_ */
diff --git a/sys/compat/linux/linux_ipccall.h b/sys/compat/linux/linux_ipccall.h
index 835f72d1b5d..dc55fbe4682 100644
--- a/sys/compat/linux/linux_ipccall.h
+++ b/sys/compat/linux/linux_ipccall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_ipccall.h,v 1.2 1996/04/17 05:23:54 mickey Exp $	*/
+/*	$OpenBSD: linux_ipccall.h,v 1.3 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_ipccall.h,v 1.2 1995/08/15 21:14:33 fvdl Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_IPC_CALL_H
-#define _LINUX_IPC_CALL_H
+#ifndef _LINUX_IPC_CALL_H_
+#define _LINUX_IPC_CALL_H_
 
 /*
  * Defines for the numbers passes as the first argument to the
@@ -52,4 +52,4 @@
 #define LINUX_SYS_shmget	23
 #define LINUX_SYS_shmctl	24
 
-#endif /* _LINUX_IPC_CALL_H */
+#endif /* _LINUX_IPC_CALL_H_ */
diff --git a/sys/compat/linux/linux_misc.h b/sys/compat/linux/linux_misc.h
index dce517cffb4..a4fd5c17baa 100644
--- a/sys/compat/linux/linux_misc.h
+++ b/sys/compat/linux/linux_misc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_misc.h,v 1.4 2008/06/26 05:42:14 ray Exp $	*/
+/*	$OpenBSD: linux_misc.h,v 1.5 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_misc.h,v 1.3 1999/05/13 00:31:57 thorpej Exp $	*/
 
 /*-
@@ -30,8 +30,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_MISC_H
-#define _LINUX_MISC_H
+#ifndef _LINUX_MISC_H_
+#define _LINUX_MISC_H_
 
 /* This looks very unportable to me, but this is how Linux defines it. */
 struct linux_sysinfo {
@@ -66,4 +66,4 @@ int linux_select1(struct proc *, register_t *, int, fd_set *, fd_set *,
 __END_DECLS
 #endif /* !_KERNEL */
 
-#endif /* !_LINUX_MISC_H */
+#endif /* !_LINUX_MISC_H_ */
diff --git a/sys/compat/linux/linux_mmap.h b/sys/compat/linux/linux_mmap.h
index 248864beda5..66c68c39f60 100644
--- a/sys/compat/linux/linux_mmap.h
+++ b/sys/compat/linux/linux_mmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_mmap.h,v 1.2 1996/04/17 05:23:56 mickey Exp $	*/
+/*	$OpenBSD: linux_mmap.h,v 1.3 2011/04/05 22:54:30 pirofti Exp $	*/
 /*	$NetBSD: linux_mmap.h,v 1.1 1995/02/28 23:25:52 fvdl Exp $	*/
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -31,8 +31,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_MMAP_H
-#define _LINUX_MMAP_H
+#ifndef _LINUX_MMAP_H_
+#define _LINUX_MMAP_H_
 
 #define LINUX_PROT_NONE		0x00
 #define LINUX_PROT_READ		0x01
@@ -51,4 +51,4 @@
 #define LINUX_MAP_DENYWRITE	0x0800
 #define LINUX_MAP_EXECUTABLE	0x1000
 
-#endif /* !_LINUX_MMAP_H */
+#endif /* !_LINUX_MMAP_H_ */
diff --git a/sys/compat/linux/linux_msg.h b/sys/compat/linux/linux_msg.h
index 992457190dc..e3e591f6223 100644
--- a/sys/compat/linux/linux_msg.h
+++ b/sys/compat/linux/linux_msg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_msg.h,v 1.2 1996/04/17 05:23:56 mickey Exp $	*/
+/*	$OpenBSD: linux_msg.h,v 1.3 2011/04/05 22:54:31 pirofti Exp $	*/
 /*	$NetBSD: linux_msg.h,v 1.2 1995/08/15 21:14:34 fvdl Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_MSG_H
-#define _LINUX_MSG_H
+#ifndef _LINUX_MSG_H_
+#define _LINUX_MSG_H_
 
 /*
  * msq_id_ds structure. Mostly the same fields, except for some internal
@@ -91,4 +91,4 @@ struct linux_msginfo {
 #define LINUX_MSG_STAT	11
 #define LINUX_MSG_INFO	12
 
-#endif /* _LINUX_MSG_H */
+#endif /* _LINUX_MSG_H_ */
diff --git a/sys/compat/linux/linux_sched.h b/sys/compat/linux/linux_sched.h
index bfa9bc1a4fd..0cfba5caf2f 100644
--- a/sys/compat/linux/linux_sched.h
+++ b/sys/compat/linux/linux_sched.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_sched.h,v 1.3 2009/12/28 02:54:24 guenther Exp $	*/
+/*	$OpenBSD: linux_sched.h,v 1.4 2011/04/05 22:54:31 pirofti Exp $	*/
 /*	$NetBSD: linux_sched.h,v 1.1 1999/05/12 19:49:09 thorpej Exp $	*/
 
 /*-
@@ -31,8 +31,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_SCHED_H
-#define	_LINUX_SCHED_H
+#ifndef _LINUX_SCHED_H_
+#define	_LINUX_SCHED_H_
 
 /*
  * Flags passed to the Linux __clone(2) system call.
@@ -67,4 +67,4 @@ struct linux_sched_param {
 #define LINUX_SCHED_FIFO	1
 #define LINUX_SCHED_RR		2
 
-#endif /* _LINUX_SCHED_H */
+#endif /* _LINUX_SCHED_H_ */
diff --git a/sys/compat/linux/linux_sem.h b/sys/compat/linux/linux_sem.h
index 2177679e273..c2aa18792e1 100644
--- a/sys/compat/linux/linux_sem.h
+++ b/sys/compat/linux/linux_sem.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_sem.h,v 1.2 1996/04/17 05:23:57 mickey Exp $	*/
+/*	$OpenBSD: linux_sem.h,v 1.3 2011/04/05 22:54:31 pirofti Exp $	*/
 /*	$NetBSD: linux_sem.h,v 1.1 1995/08/15 21:14:35 fvdl Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_SEM_H
-#define _LINUX_SEM_H
+#ifndef _LINUX_SEM_H_
+#define _LINUX_SEM_H_
 
 /*
  * Operations for semctl(2), in addition to IPC_STAT and IPC_SET
@@ -70,4 +70,4 @@ union linux_semun {
 	void			*l___pad;
 };
 
-#endif /* _LINUX_SEM_H */
+#endif /* _LINUX_SEM_H_ */
diff --git a/sys/compat/linux/linux_shm.h b/sys/compat/linux/linux_shm.h
index 1c1f83c2d35..72534306657 100644
--- a/sys/compat/linux/linux_shm.h
+++ b/sys/compat/linux/linux_shm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_shm.h,v 1.2 1996/04/17 05:23:58 mickey Exp $	*/
+/*	$OpenBSD: linux_shm.h,v 1.3 2011/04/05 22:54:31 pirofti Exp $	*/
 /*	$NetBSD: linux_shm.h,v 1.1 1995/02/28 23:25:57 fvdl Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_SHM_H
-#define _LINUX_SHM_H
+#ifndef _LINUX_SHM_H_
+#define _LINUX_SHM_H_
 
 /*
  * shm segment control structure
@@ -61,4 +61,4 @@ struct linux_shmid_ds {
 #define LINUX_SHM_STAT		13
 #define LINUX_SHM_INFO		14
 
-#endif /* _LINUX_SHM_H */
+#endif /* _LINUX_SHM_H_ */
diff --git a/sys/compat/linux/linux_signal.h b/sys/compat/linux/linux_signal.h
index 97288b738b7..26f44aee300 100644
--- a/sys/compat/linux/linux_signal.h
+++ b/sys/compat/linux/linux_signal.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_signal.h,v 1.8 2002/03/14 01:26:50 millert Exp $	*/
+/*	$OpenBSD: linux_signal.h,v 1.9 2011/04/05 22:54:31 pirofti Exp $	*/
 /* 	$NetBSD: linux_signal.h,v 1.4 1995/08/27 20:51:51 fvdl Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_SIGNAL_H
-#define _LINUX_SIGNAL_H
+#ifndef _LINUX_SIGNAL_H_
+#define _LINUX_SIGNAL_H_
 
 #define LINUX_SIGHUP	 1
 #define LINUX_SIGINT	 2
@@ -145,4 +145,4 @@ void bsd_to_linux_sigaction(struct sigaction *,
 int  linux_to_bsd_signal (int, int *);
 int  bsd_to_linux_signal (int, int *);
 
-#endif /* !_LINUX_SIGNAL_H */
+#endif /* !_LINUX_SIGNAL_H_ */
diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h
index 1698293702f..3f304c72d2c 100644
--- a/sys/compat/linux/linux_socket.h
+++ b/sys/compat/linux/linux_socket.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_socket.h,v 1.7 2002/11/27 07:30:36 ish Exp $	*/
+/*	$OpenBSD: linux_socket.h,v 1.8 2011/04/05 22:54:31 pirofti Exp $	*/
 /*	$NetBSD: linux_socket.h,v 1.3 1995/05/28 10:16:34 mycroft Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_SOCKET_H
-#define _LINUX_SOCKET_H
+#ifndef _LINUX_SOCKET_H_
+#define _LINUX_SOCKET_H_
 
 /*
  * Various Linux socket defines. Everything that is not re-defined here
@@ -147,4 +147,4 @@ struct linux_ifreq {
 #define ifr_name	ifr_ifrn.ifrn_name		/* interface name */
 #define ifr_hwaddr	ifr_ifru.ifru_hwaddr		/* MAC address */
 
-#endif /* _LINUX_SOCKET_H */
+#endif /* _LINUX_SOCKET_H_ */
diff --git a/sys/compat/linux/linux_socketcall.h b/sys/compat/linux/linux_socketcall.h
index 57c3ad90db6..57c4709b420 100644
--- a/sys/compat/linux/linux_socketcall.h
+++ b/sys/compat/linux/linux_socketcall.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_socketcall.h,v 1.4 2002/11/27 07:30:36 ish Exp $	*/
+/*	$OpenBSD: linux_socketcall.h,v 1.5 2011/04/05 22:54:31 pirofti Exp $	*/
 /*	$NetBSD: linux_socketcall.h,v 1.1 1995/02/28 23:26:05 fvdl Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_SOCKETCALL_H
-#define _LINUX_SOCKETCALL_H
+#ifndef _LINUX_SOCKETCALL_H_
+#define _LINUX_SOCKETCALL_H_
 
 /*
  * Values passed to the Linux socketcall() syscall, determining the actual
@@ -174,4 +174,4 @@ struct linux_recvmsg_args {
 	int flags;
 };
 
-#endif /* _LINUX_SOCKETCALL_H */
+#endif /* _LINUX_SOCKETCALL_H_ */
diff --git a/sys/compat/linux/linux_sockio.h b/sys/compat/linux/linux_sockio.h
index 44325602a01..e5f068c6290 100644
--- a/sys/compat/linux/linux_sockio.h
+++ b/sys/compat/linux/linux_sockio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_sockio.h,v 1.8 2002/02/06 01:55:04 jasoni Exp $ */
+/*	$OpenBSD: linux_sockio.h,v 1.9 2011/04/05 22:54:31 pirofti Exp $ */
 /*	$NetBSD: linux_sockio.h,v 1.5 1996/03/08 04:56:07 mycroft Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_SOCKIO_H
-#define _LINUX_SOCKIO_H
+#ifndef _LINUX_SOCKIO_H_
+#define _LINUX_SOCKIO_H_
 
 #define	LINUX_FIOSETOWN		_LINUX_IO(0x89, 1)
 #define	LINUX_SIOCSPGRP		_LINUX_IO(0x89, 2)
@@ -57,4 +57,4 @@
 #define LINUX_SIOCGIFBR		_LINUX_IO(0x89, 64)
 #define LINUX_SIOCDEVPRIVATE	_LINUX_IO(0x89, 0xf0)
 
-#endif /* _LINUX_SOCKIO_H */
+#endif /* _LINUX_SOCKIO_H_ */
diff --git a/sys/compat/linux/linux_types.h b/sys/compat/linux/linux_types.h
index bffad3c09d3..880faf07797 100644
--- a/sys/compat/linux/linux_types.h
+++ b/sys/compat/linux/linux_types.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_types.h,v 1.9 2011/02/10 11:58:43 pirofti Exp $	*/
+/*	$OpenBSD: linux_types.h,v 1.10 2011/04/05 22:54:31 pirofti Exp $	*/
 /*	$NetBSD: linux_types.h,v 1.5 1996/05/20 01:59:28 fvdl Exp $	*/
 
 /*
@@ -32,8 +32,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LINUX_TYPES_H
-#define _LINUX_TYPES_H
+#ifndef _LINUX_TYPES_H_
+#define _LINUX_TYPES_H_
 
 typedef struct {
 	long	val[2];
@@ -202,4 +202,4 @@ struct l_timespec {
 	long		tv_nsec;
 };
 
-#endif /* !_LINUX_TYPES_H */
+#endif /* !_LINUX_TYPES_H_ */