diff --git a/sys/security/audit/audit.h b/sys/security/audit/audit.h
index 574f6af243c9..a0af12235e27 100644
--- a/sys/security/audit/audit.h
+++ b/sys/security/audit/audit.h
@@ -64,58 +64,58 @@ extern int	audit_suspended;
  * vnode is being logged.  These should move to audit_private.h when that is
  * fixed.
  */
-#define ARG_EUID		0x0000000000000001ULL
-#define ARG_RUID		0x0000000000000002ULL
-#define ARG_SUID		0x0000000000000004ULL
-#define ARG_EGID		0x0000000000000008ULL
-#define ARG_RGID		0x0000000000000010ULL
-#define ARG_SGID		0x0000000000000020ULL
-#define ARG_PID			0x0000000000000040ULL
-#define ARG_UID			0x0000000000000080ULL
-#define ARG_AUID		0x0000000000000100ULL
-#define ARG_GID			0x0000000000000200ULL
-#define ARG_FD			0x0000000000000400ULL
-#define ARG_POSIX_IPC_PERM	0x0000000000000800ULL
-#define ARG_FFLAGS		0x0000000000001000ULL
-#define ARG_MODE		0x0000000000002000ULL
-#define ARG_DEV			0x0000000000004000ULL
-#define ARG_ADDR		0x0000000000008000ULL
-#define ARG_LEN			0x0000000000010000ULL
-#define ARG_MASK		0x0000000000020000ULL
-#define ARG_SIGNUM		0x0000000000040000ULL
-#define ARG_LOGIN		0x0000000000080000ULL
-#define ARG_SADDRINET		0x0000000000100000ULL
-#define ARG_SADDRINET6		0x0000000000200000ULL
-#define ARG_SADDRUNIX		0x0000000000400000ULL
-#define ARG_UNUSED1		0x0000000000800000ULL
-#define ARG_UNUSED2		0x0000000001000000ULL
-#define ARG_UPATH1		0x0000000002000000ULL
-#define ARG_UPATH2		0x0000000004000000ULL
-#define ARG_TEXT		0x0000000008000000ULL
-#define ARG_VNODE1		0x0000000010000000ULL
-#define ARG_VNODE2		0x0000000020000000ULL
-#define ARG_SVIPC_CMD		0x0000000040000000ULL
-#define ARG_SVIPC_PERM		0x0000000080000000ULL
-#define ARG_SVIPC_ID		0x0000000100000000ULL
-#define ARG_SVIPC_ADDR		0x0000000200000000ULL
-#define ARG_GROUPSET		0x0000000400000000ULL
-#define ARG_CMD			0x0000000800000000ULL
-#define ARG_SOCKINFO		0x0000001000000000ULL
-#define ARG_ASID		0x0000002000000000ULL
-#define ARG_TERMID		0x0000004000000000ULL
-#define ARG_AUDITON		0x0000008000000000ULL
-#define ARG_VALUE		0x0000010000000000ULL
-#define ARG_AMASK		0x0000020000000000ULL
-#define ARG_CTLNAME		0x0000040000000000ULL
-#define ARG_PROCESS		0x0000080000000000ULL
-#define ARG_MACHPORT1		0x0000100000000000ULL
-#define ARG_MACHPORT2		0x0000200000000000ULL
+#define	ARG_EUID		0x0000000000000001ULL
+#define	ARG_RUID		0x0000000000000002ULL
+#define	ARG_SUID		0x0000000000000004ULL
+#define	ARG_EGID		0x0000000000000008ULL
+#define	ARG_RGID		0x0000000000000010ULL
+#define	ARG_SGID		0x0000000000000020ULL
+#define	ARG_PID			0x0000000000000040ULL
+#define	ARG_UID			0x0000000000000080ULL
+#define	ARG_AUID		0x0000000000000100ULL
+#define	ARG_GID			0x0000000000000200ULL
+#define	ARG_FD			0x0000000000000400ULL
+#define	ARG_POSIX_IPC_PERM	0x0000000000000800ULL
+#define	ARG_FFLAGS		0x0000000000001000ULL
+#define	ARG_MODE		0x0000000000002000ULL
+#define	ARG_DEV			0x0000000000004000ULL
+#define	ARG_ADDR		0x0000000000008000ULL
+#define	ARG_LEN			0x0000000000010000ULL
+#define	ARG_MASK		0x0000000000020000ULL
+#define	ARG_SIGNUM		0x0000000000040000ULL
+#define	ARG_LOGIN		0x0000000000080000ULL
+#define	ARG_SADDRINET		0x0000000000100000ULL
+#define	ARG_SADDRINET6		0x0000000000200000ULL
+#define	ARG_SADDRUNIX		0x0000000000400000ULL
+#define	ARG_UNUSED1		0x0000000000800000ULL
+#define	ARG_UNUSED2		0x0000000001000000ULL
+#define	ARG_UPATH1		0x0000000002000000ULL
+#define	ARG_UPATH2		0x0000000004000000ULL
+#define	ARG_TEXT		0x0000000008000000ULL
+#define	ARG_VNODE1		0x0000000010000000ULL
+#define	ARG_VNODE2		0x0000000020000000ULL
+#define	ARG_SVIPC_CMD		0x0000000040000000ULL
+#define	ARG_SVIPC_PERM		0x0000000080000000ULL
+#define	ARG_SVIPC_ID		0x0000000100000000ULL
+#define	ARG_SVIPC_ADDR		0x0000000200000000ULL
+#define	ARG_GROUPSET		0x0000000400000000ULL
+#define	ARG_CMD			0x0000000800000000ULL
+#define	ARG_SOCKINFO		0x0000001000000000ULL
+#define	ARG_ASID		0x0000002000000000ULL
+#define	ARG_TERMID		0x0000004000000000ULL
+#define	ARG_AUDITON		0x0000008000000000ULL
+#define	ARG_VALUE		0x0000010000000000ULL
+#define	ARG_AMASK		0x0000020000000000ULL
+#define	ARG_CTLNAME		0x0000040000000000ULL
+#define	ARG_PROCESS		0x0000080000000000ULL
+#define	ARG_MACHPORT1		0x0000100000000000ULL
+#define	ARG_MACHPORT2		0x0000200000000000ULL
 #define	ARG_EXIT		0x0000400000000000ULL
 #define	ARG_IOVECSTR		0x0000800000000000ULL
 #define	ARG_ARGV		0x0001000000000000ULL
 #define	ARG_ENVV		0x0002000000000000ULL
-#define ARG_NONE		0x0000000000000000ULL
-#define ARG_ALL			0xFFFFFFFFFFFFFFFFULL
+#define	ARG_NONE		0x0000000000000000ULL
+#define	ARG_ALL			0xFFFFFFFFFFFFFFFFULL
 
 void	 audit_syscall_enter(unsigned short code, struct thread *td);
 void	 audit_syscall_exit(int error, struct thread *td);
@@ -188,7 +188,7 @@ void	 audit_thread_free(struct thread *td);
 		audit_arg_ ## op (args);				\
 } while (0)
 
-#define AUDIT_SYSCALL_ENTER(code, td)	do {				\
+#define	AUDIT_SYSCALL_ENTER(code, td)	do {				\
 	if (audit_enabled) {						\
 		audit_syscall_enter(code, td);				\
 	}								\
@@ -199,7 +199,7 @@ void	 audit_thread_free(struct thread *td);
  * auditing is enabled, or we have a audit record on the thread. It is
  * possible that an audit record was begun before auditing was turned off.
  */
-#define AUDIT_SYSCALL_EXIT(error, td)	do {				\
+#define	AUDIT_SYSCALL_EXIT(error, td)	do {				\
 	if (audit_enabled | (td->td_ar != NULL))			\
 		audit_syscall_exit(error, td);				\
 } while (0)
@@ -218,13 +218,13 @@ void	 audit_proc_init(struct proc *p);
 void	 audit_proc_fork(struct proc *parent, struct proc *child);
 void	 audit_proc_free(struct proc *p);
 
-#define AUDIT_ARG(op, args...)	do {					\
+#define	AUDIT_ARG(op, args...)	do {					\
 } while (0)
 
-#define AUDIT_SYSCALL_ENTER(code, td)	do {				\
+#define	AUDIT_SYSCALL_ENTER(code, td)	do {				\
 } while (0)
 
-#define AUDIT_SYSCALL_EXIT(error, td)	do {				\
+#define	AUDIT_SYSCALL_EXIT(error, td)	do {				\
 } while (0)
 
 #define	AUDIT_SYSCLOSE(p, fd)	do {					\