diff --git a/sys/sys/bio.h b/sys/sys/bio.h
index 06c5ef8a2a8d..670150713cd4 100644
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -144,9 +144,9 @@ struct bio_queue_head {
 
 static __inline void bioq_init(struct bio_queue_head *head);
 static __inline void bioq_insert_tail(struct bio_queue_head *head,
-					   struct bio *bp);
-static __inline void bioq_remove(struct bio_queue_head *head,
 				      struct bio *bp);
+static __inline void bioq_remove(struct bio_queue_head *head,
+				 struct bio *bp);
 static __inline struct bio *bioq_first(struct bio_queue_head *head);
 
 static __inline void
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index ed93cdffabe2..af58f3951d27 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -138,7 +138,7 @@ typedef int d_open_t(dev_t dev, int oflags, int devtype, struct thread *td);
 typedef int d_close_t(dev_t dev, int fflag, int devtype, struct thread *td);
 typedef void d_strategy_t(struct bio *bp);
 typedef int d_ioctl_t(dev_t dev, u_long cmd, caddr_t data,
-			   int fflag, struct thread *td);
+		      int fflag, struct thread *td);
 typedef int d_dump_t(dev_t dev);
 typedef int d_psize_t(dev_t dev);
 
@@ -153,7 +153,7 @@ typedef int l_close_t(struct tty *tp, int flag);
 typedef int l_read_t(struct tty *tp, struct uio *uio, int flag);
 typedef int l_write_t(struct tty *tp, struct uio *uio, int flag);
 typedef int l_ioctl_t(struct tty *tp, u_long cmd, caddr_t data,
-			   int flag, struct thread *td);
+		      int flag, struct thread *td);
 typedef int l_rint_t(int c, struct tty *tp);
 typedef int l_start_t(struct tty *tp);
 typedef int l_modem_t(struct tty *tp, int flag);
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 046160a6d228..af136d8a18bb 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -460,16 +460,15 @@ struct	bio;
 struct	bio_queue_head;
 
 int	bounds_check_with_label(struct bio *bp, struct disklabel *lp,
-				     int wlabel);
-void	diskerr(struct bio *bp, char *what, int blkdone,
-		     struct disklabel *lp);
+	    int wlabel);
+void	diskerr(struct bio *bp, char *what, int blkdone, struct disklabel *lp);
 dev_t	dkmodpart(dev_t dev, int part);
 dev_t	dkmodslice(dev_t dev, int slice);
 u_int	dkunit(dev_t dev);
 char	*readdisklabel(dev_t dev, struct disklabel *lp);
 void	bioqdisksort(struct bio_queue_head *ap, struct bio *bp);
 int	setdisklabel(struct disklabel *olp, struct disklabel *nlp,
-			  u_long openmask);
+	    u_long openmask);
 int	writedisklabel(dev_t dev, struct disklabel *lp);
 #ifdef __alpha__
 struct	buf;			
diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 046160a6d228..af136d8a18bb 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -460,16 +460,15 @@ struct	bio;
 struct	bio_queue_head;
 
 int	bounds_check_with_label(struct bio *bp, struct disklabel *lp,
-				     int wlabel);
-void	diskerr(struct bio *bp, char *what, int blkdone,
-		     struct disklabel *lp);
+	    int wlabel);
+void	diskerr(struct bio *bp, char *what, int blkdone, struct disklabel *lp);
 dev_t	dkmodpart(dev_t dev, int part);
 dev_t	dkmodslice(dev_t dev, int slice);
 u_int	dkunit(dev_t dev);
 char	*readdisklabel(dev_t dev, struct disklabel *lp);
 void	bioqdisksort(struct bio_queue_head *ap, struct bio *bp);
 int	setdisklabel(struct disklabel *olp, struct disklabel *nlp,
-			  u_long openmask);
+	    u_long openmask);
 int	writedisklabel(dev_t dev, struct disklabel *lp);
 #ifdef __alpha__
 struct	buf;			
diff --git a/sys/sys/diskpc98.h b/sys/sys/diskpc98.h
index 046160a6d228..af136d8a18bb 100644
--- a/sys/sys/diskpc98.h
+++ b/sys/sys/diskpc98.h
@@ -460,16 +460,15 @@ struct	bio;
 struct	bio_queue_head;
 
 int	bounds_check_with_label(struct bio *bp, struct disklabel *lp,
-				     int wlabel);
-void	diskerr(struct bio *bp, char *what, int blkdone,
-		     struct disklabel *lp);
+	    int wlabel);
+void	diskerr(struct bio *bp, char *what, int blkdone, struct disklabel *lp);
 dev_t	dkmodpart(dev_t dev, int part);
 dev_t	dkmodslice(dev_t dev, int slice);
 u_int	dkunit(dev_t dev);
 char	*readdisklabel(dev_t dev, struct disklabel *lp);
 void	bioqdisksort(struct bio_queue_head *ap, struct bio *bp);
 int	setdisklabel(struct disklabel *olp, struct disklabel *nlp,
-			  u_long openmask);
+	    u_long openmask);
 int	writedisklabel(dev_t dev, struct disklabel *lp);
 #ifdef __alpha__
 struct	buf;			
diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h
index b633d2e741e4..277070a5e9c6 100644
--- a/sys/sys/diskslice.h
+++ b/sys/sys/diskslice.h
@@ -81,16 +81,14 @@ struct disklabel;
 int	dscheck(struct bio *bp, struct diskslices *ssp);
 void	dsclose(dev_t dev, int mode, struct diskslices *ssp);
 void	dsgone(struct diskslices **sspp);
-int	dsinit(dev_t dev, struct disklabel *lp,
-		     struct diskslices **sspp);
-int	dsioctl(dev_t dev, u_long cmd, caddr_t data,
-		     int flags, struct diskslices **sspp);
+int	dsinit(dev_t dev, struct disklabel *lp, struct diskslices **sspp);
+int	dsioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
+	    struct diskslices **sspp);
 int	dsisopen(struct diskslices *ssp);
 struct diskslices *dsmakeslicestruct(int nslices, struct disklabel *lp);
-char	*dsname(dev_t dev, int unit, int slice, int part,
-		     char *partname);
-int	dsopen(dev_t dev, int mode, u_int flags,
-		    struct diskslices **sspp, struct disklabel *lp);
+char	*dsname(dev_t dev, int unit, int slice, int part, char *partname);
+int	dsopen(dev_t dev, int mode, u_int flags, struct diskslices **sspp,
+	    struct disklabel *lp);
 int	dssize(dev_t dev, struct diskslices **sspp);
 
 #endif /* _KERNEL */
diff --git a/sys/sys/event.h b/sys/sys/event.h
index e1ededbc296b..924f8b03b559 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -136,9 +136,9 @@ MALLOC_DECLARE(M_KQUEUE);
 
 struct filterops {
 	int	f_isfd;		/* true if ident == filedescriptor */
-	int	(*f_attach)	(struct knote *kn);
-	void	(*f_detach)	(struct knote *kn);
-	int	(*f_event)	(struct knote *kn, long hint);
+	int	(*f_attach)(struct knote *kn);
+	void	(*f_detach)(struct knote *kn);
+	int	(*f_event)(struct knote *kn, long hint);
 };
 
 struct knote {
@@ -188,8 +188,8 @@ struct timespec;
 __BEGIN_DECLS
 int     kqueue(void);
 int     kevent(int kq, const struct kevent *changelist, int nchanges,
-		    struct kevent *eventlist, int nevents,
-		    const struct timespec *timeout);
+	    struct kevent *eventlist, int nevents,
+	    const struct timespec *timeout);
 __END_DECLS
 
 #endif /* !_KERNEL */
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 50b560b6768c..16347be45da9 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -79,22 +79,19 @@ struct file {
 	int	f_msgcount;	/* (f) references from message queue */
 	struct	ucred *f_cred;	/* credentials associated with descriptor */
 	struct fileops {
-		int	(*fo_read)	(struct file *fp, struct uio *uio,
-					    struct ucred *cred, int flags,
-					    struct thread *td);
-		int	(*fo_write)	(struct file *fp, struct uio *uio,
-					    struct ucred *cred, int flags,
-					    struct thread *td);
+		int	(*fo_read)(struct file *fp, struct uio *uio,
+			    struct ucred *cred, int flags, struct thread *td);
+		int	(*fo_write)(struct file *fp, struct uio *uio,
+			    struct ucred *cred, int flags, struct thread *td);
 #define	FOF_OFFSET	1
-		int	(*fo_ioctl)	(struct file *fp, u_long com,
-					    caddr_t data, struct thread *td);
-		int	(*fo_poll)	(struct file *fp, int events,
-					    struct ucred *cred,
-					    struct thread *td);
-		int	(*fo_kqfilter)	(struct file *fp, struct knote *kn);
-		int	(*fo_stat)	(struct file *fp, struct stat *sb,
-					    struct thread *td);
-		int	(*fo_close)	(struct file *fp, struct thread *td);
+		int	(*fo_ioctl)(struct file *fp, u_long com, caddr_t data,
+			    struct thread *td);
+		int	(*fo_poll)(struct file *fp, int events,
+			    struct ucred *cred, struct thread *td);
+		int	(*fo_kqfilter)(struct file *fp, struct knote *kn);
+		int	(*fo_stat)(struct file *fp, struct stat *sb,
+			    struct thread *td);
+		int	(*fo_close)(struct file *fp, struct thread *td);
 	} *f_ops;
 	int	f_seqcount;	/*
 				 * count of sequential accesses -- cleared
diff --git a/sys/sys/filedesc.h b/sys/sys/filedesc.h
index 05bb4e09975a..ebb478d8d76f 100644
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
@@ -139,8 +139,8 @@ SLIST_HEAD(sigiolst, sigio);
 #define	FILEDESC_LOCK_ASSERT(fd, type)	mtx_assert(&(fd)->fd_mtx, (type))
 
 int	closef(struct file *fp, struct thread *p);
-int	dupfdopen(struct thread *td, struct filedesc *fdp, int indx,
-		       int dfd, int mode, int error);
+int	dupfdopen(struct thread *td, struct filedesc *fdp, int indx, int dfd,
+	    int mode, int error);
 int	falloc(struct thread *p, struct file **resultfp, int *resultfd);
 int	fdalloc(struct thread *p, int want, int *result);
 int	fdavail(struct thread *td, int n);
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 691ace7a1b80..2ca50d36728d 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -76,7 +76,7 @@ int	 fls(int);
 #endif
 int	 locc(int, char *, u_int);
 void	 qsort(void *base, size_t nmemb, size_t size,
-		    int (*compar)(const void *, const void *));
+	    int (*compar)(const void *, const void *));
 u_long	 random(void);
 char	*index(const char *, int);
 char	*rindex(const char *, int);
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index ed93cdffabe2..af58f3951d27 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -138,7 +138,7 @@ typedef int d_open_t(dev_t dev, int oflags, int devtype, struct thread *td);
 typedef int d_close_t(dev_t dev, int fflag, int devtype, struct thread *td);
 typedef void d_strategy_t(struct bio *bp);
 typedef int d_ioctl_t(dev_t dev, u_long cmd, caddr_t data,
-			   int fflag, struct thread *td);
+		      int fflag, struct thread *td);
 typedef int d_dump_t(dev_t dev);
 typedef int d_psize_t(dev_t dev);
 
@@ -153,7 +153,7 @@ typedef int l_close_t(struct tty *tp, int flag);
 typedef int l_read_t(struct tty *tp, struct uio *uio, int flag);
 typedef int l_write_t(struct tty *tp, struct uio *uio, int flag);
 typedef int l_ioctl_t(struct tty *tp, u_long cmd, caddr_t data,
-			   int flag, struct thread *td);
+		      int flag, struct thread *td);
 typedef int l_rint_t(int c, struct tty *tp);
 typedef int l_start_t(struct tty *tp);
 typedef int l_modem_t(struct tty *tp, int flag);
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index f14ef9858106..76c57254ae5b 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -100,19 +100,18 @@ MALLOC_DECLARE(M_IP6NDP); /* for INET6 */
 MALLOC_DECLARE(M_IOV);
 
 /* XXX struct malloc_type is unused for contig*(). */
-void	contigfree(void *addr, unsigned long size,
-			struct malloc_type *type);
-void	*contigmalloc(unsigned long size, struct malloc_type *type,
-			   int flags, unsigned long low, unsigned long high,
-			   unsigned long alignment, unsigned long boundary);
+void	contigfree(void *addr, unsigned long size, struct malloc_type *type);
+void	*contigmalloc(unsigned long size, struct malloc_type *type, int flags,
+	    unsigned long low, unsigned long high, unsigned long alignment,
+	    unsigned long boundary);
 void	free(void *addr, struct malloc_type *type);
 void	*malloc(unsigned long size, struct malloc_type *type, int flags);
 void	malloc_init(void *);
 void	malloc_uninit(void *);
-void	*realloc(void *addr, unsigned long size,
-		      struct malloc_type *type, int flags);
-void	*reallocf(void *addr, unsigned long size,
-		      struct malloc_type *type, int flags);
+void	*realloc(void *addr, unsigned long size, struct malloc_type *type,
+	    int flags);
+void	*reallocf(void *addr, unsigned long size, struct malloc_type *type,
+	    int flags);
 #endif /* _KERNEL */
 
 #endif /* !_SYS_MALLOC_H_ */
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 3bcd1a9f02fb..eea3a2244d02 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -345,32 +345,30 @@ struct mount_args;
 #endif
 
 struct vfsops {
-	int	(*vfs_mount)	(struct mount *mp, char *path, caddr_t data,
-				    struct nameidata *ndp, struct thread *td);
-	int	(*vfs_start)	(struct mount *mp, int flags,
-				    struct thread *td);
-	int	(*vfs_unmount)	(struct mount *mp, int mntflags,
-				    struct thread *td);
-	int	(*vfs_root)	(struct mount *mp, struct vnode **vpp);
-	int	(*vfs_quotactl)	(struct mount *mp, int cmds, uid_t uid,
-				    caddr_t arg, struct thread *td);
-	int	(*vfs_statfs)	(struct mount *mp, struct statfs *sbp,
-				    struct thread *td);
-	int	(*vfs_sync)	(struct mount *mp, int waitfor,
-				    struct ucred *cred, struct thread *td);
-	int	(*vfs_vget)	(struct mount *mp, ino_t ino, int flags,
-				    struct vnode **vpp);
-	int	(*vfs_fhtovp)	(struct mount *mp, struct fid *fhp,
-				    struct vnode **vpp);
+	int	(*vfs_mount)(struct mount *mp, char *path, caddr_t data,
+		    struct nameidata *ndp, struct thread *td);
+	int	(*vfs_start)(struct mount *mp, int flags, struct thread *td);
+	int	(*vfs_unmount)(struct mount *mp, int mntflags,
+		    struct thread *td);
+	int	(*vfs_root)(struct mount *mp, struct vnode **vpp);
+	int	(*vfs_quotactl)(struct mount *mp, int cmds, uid_t uid,
+		    caddr_t arg, struct thread *td);
+	int	(*vfs_statfs)(struct mount *mp, struct statfs *sbp,
+		    struct thread *td);
+	int	(*vfs_sync)(struct mount *mp, int waitfor, struct ucred *cred,
+		    struct thread *td);
+	int	(*vfs_vget)(struct mount *mp, ino_t ino, int flags,
+		    struct vnode **vpp);
+	int	(*vfs_fhtovp)(struct mount *mp, struct fid *fhp,
+		    struct vnode **vpp);
 	int	(*vfs_checkexp)(struct mount *mp, struct sockaddr *nam,
-				    int *extflagsp, struct ucred **credanonp);
-	int	(*vfs_vptofh)	(struct vnode *vp, struct fid *fhp);
-	int	(*vfs_init)	(struct vfsconf *);
-	int	(*vfs_uninit)	(struct vfsconf *);
+		    int *extflagsp, struct ucred **credanonp);
+	int	(*vfs_vptofh)(struct vnode *vp, struct fid *fhp);
+	int	(*vfs_init)(struct vfsconf *);
+	int	(*vfs_uninit)(struct vfsconf *);
 	int	(*vfs_extattrctl)(struct mount *mp, int cmd,
-					struct vnode *filename_vp,
-					int attrnamespace, const char *attrname,
-					struct thread *td);
+		    struct vnode *filename_vp, int attrnamespace,
+		    const char *attrname, struct thread *td);
 };
 
 #define VFS_MOUNT(MP, PATH, DATA, NDP, P) \
@@ -414,18 +412,18 @@ extern	char *mountrootfsname;
  * exported vnode operations
  */
 int	dounmount(struct mount *, int, struct thread *td);
-int	vfs_mount (struct thread *td, const char *type, char *path,
+int	vfs_mount(struct thread *td, const char *type, char *path,
 	    int flags, void *data);
 int	vfs_setpublicfs			    /* set publicly exported fs */
-	(struct mount *, struct netexport *, struct export_args *);
+	    (struct mount *, struct netexport *, struct export_args *);
 int	vfs_lock(struct mount *);         /* lock a vfs */
 void	vfs_msync(struct mount *, int);
 void	vfs_unlock(struct mount *);       /* unlock a vfs */
 int	vfs_busy(struct mount *, int, struct mtx *, struct thread *td);
 int	vfs_export			 /* process mount export info */
-	(struct mount *, struct export_args *);
+	    (struct mount *, struct export_args *);
 struct	netcred *vfs_export_lookup	    /* lookup host in fs export list */
-	(struct mount *, struct sockaddr *);
+	    (struct mount *, struct sockaddr *);
 int	vfs_allocate_syncvnode(struct mount *);
 void	vfs_getnewfsid(struct mount *);
 dev_t	vfs_getrootfsid(struct mount *);
diff --git a/sys/sys/msgbuf.h b/sys/sys/msgbuf.h
index 8ffb5e3d2199..7ac13bfb501d 100644
--- a/sys/sys/msgbuf.h
+++ b/sys/sys/msgbuf.h
@@ -49,7 +49,7 @@ struct msgbuf {
 #ifdef _KERNEL
 extern int	msgbuftrigger;
 extern struct	msgbuf *msgbufp;
-void	msgbufinit	(void *ptr, size_t size);
+void	msgbufinit(void *ptr, size_t size);
 
 #if !defined(MSGBUF_SIZE)
 #define	MSGBUF_SIZE	32768
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
index eceef4f0dcb8..2783e8386b15 100644
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -200,12 +200,12 @@ struct pr_usrreqs {
 	int	(*pru_accept)(struct socket *so, struct sockaddr **nam);
 	int	(*pru_attach)(struct socket *so, int proto, struct thread *td);
 	int	(*pru_bind)(struct socket *so, struct sockaddr *nam,
-				 struct thread *td);
+		    struct thread *td);
 	int	(*pru_connect)(struct socket *so, struct sockaddr *nam,
-				    struct thread *td);
+		    struct thread *td);
 	int	(*pru_connect2)(struct socket *so1, struct socket *so2);
 	int	(*pru_control)(struct socket *so, u_long cmd, caddr_t data,
-				    struct ifnet *ifp, struct thread *td);
+		    struct ifnet *ifp, struct thread *td);
 	int	(*pru_detach)(struct socket *so);
 	int	(*pru_disconnect)(struct socket *so);
 	int	(*pru_listen)(struct socket *so, struct thread *td);
@@ -213,8 +213,8 @@ struct pr_usrreqs {
 	int	(*pru_rcvd)(struct socket *so, int flags);
 	int	(*pru_rcvoob)(struct socket *so, struct mbuf *m, int flags);
 	int	(*pru_send)(struct socket *so, int flags, struct mbuf *m, 
-				 struct sockaddr *addr, struct mbuf *control,
-				 struct thread *td);
+		    struct sockaddr *addr, struct mbuf *control,
+		    struct thread *td);
 #define	PRUS_OOB	0x1
 #define	PRUS_EOF	0x2
 #define	PRUS_MORETOCOME	0x4
@@ -231,23 +231,21 @@ struct pr_usrreqs {
 	 * the generic code, these just point to those routines.
 	 */
 	int	(*pru_sosend)(struct socket *so, struct sockaddr *addr,
-				   struct uio *uio, struct mbuf *top,
-				   struct mbuf *control, int flags,
-				   struct thread *td);
-	int	(*pru_soreceive)(struct socket *so, 
-				      struct sockaddr **paddr,
-				      struct uio *uio, struct mbuf **mp0,
-				      struct mbuf **controlp, int *flagsp);
+		    struct uio *uio, struct mbuf *top, struct mbuf *control,
+		    int flags, struct thread *td);
+	int	(*pru_soreceive)(struct socket *so, struct sockaddr **paddr,
+		    struct uio *uio, struct mbuf **mp0, struct mbuf **controlp,
+		    int *flagsp);
 	int	(*pru_sopoll)(struct socket *so, int events,
-				     struct ucred *cred, struct thread *td);
+		    struct ucred *cred, struct thread *td);
 };
 
 int	pru_accept_notsupp(struct socket *so, struct sockaddr **nam);
 int	pru_connect_notsupp(struct socket *so, struct sockaddr *nam,
-				 struct thread *td);
+	    struct thread *td);
 int	pru_connect2_notsupp(struct socket *so1, struct socket *so2);
 int	pru_control_notsupp(struct socket *so, u_long cmd, caddr_t data,
-				 struct ifnet *ifp, struct thread *td);
+	    struct ifnet *ifp, struct thread *td);
 int	pru_listen_notsupp(struct socket *so, struct thread *td);
 int	pru_rcvd_notsupp(struct socket *so, int flags);
 int	pru_rcvoob_notsupp(struct socket *so, struct mbuf *m, int flags);
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index c31eb5848796..e4cee77a570b 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -369,7 +369,7 @@ void	sbflush(struct sockbuf *sb);
 void	sbinsertoob(struct sockbuf *sb, struct mbuf *m0);
 void	sbrelease(struct sockbuf *sb, struct socket *so);
 int	sbreserve(struct sockbuf *sb, u_long cc, struct socket *so,
-		       struct thread *td);
+	    struct thread *td);
 void	sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb);
 int	sbwait(struct sockbuf *sb);
 int	sb_lock(struct sockbuf *sb);
@@ -397,8 +397,7 @@ struct socket *
 	sodropablereq(struct socket *head);
 struct socket *
 	sonewconn(struct socket *head, int connstatus);
-int	sooptcopyin(struct sockopt *sopt, void *buf, size_t len,
-			 size_t minlen);
+int	sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen);
 int	sooptcopyout(struct sockopt *sopt, void *buf, size_t len);
 
 /* XXX; prepare mbuf for (__FreeBSD__ < 3) routines. */
@@ -407,15 +406,14 @@ int	soopt_mcopyin(struct sockopt *sopt, struct mbuf *m);
 int	soopt_mcopyout(struct sockopt *sopt, struct mbuf *m);
 
 int	sopoll(struct socket *so, int events, struct ucred *cred,
-		    struct thread *td);
-int	soreceive(struct socket *so, struct sockaddr **paddr,
-		       struct uio *uio, struct mbuf **mp0,
-		       struct mbuf **controlp, int *flagsp);
+	    struct thread *td);
+int	soreceive(struct socket *so, struct sockaddr **paddr, struct uio *uio,
+	    struct mbuf **mp0, struct mbuf **controlp, int *flagsp);
 int	soreserve(struct socket *so, u_long sndcc, u_long rcvcc);
 void	sorflush(struct socket *so);
 int	sosend(struct socket *so, struct sockaddr *addr, struct uio *uio,
-		    struct mbuf *top, struct mbuf *control, int flags,
-		    struct thread *td);
+	    struct mbuf *top, struct mbuf *control, int flags,
+	    struct thread *td);
 int	sosetopt(struct socket *so, struct sockopt *sopt);
 int	soshutdown(struct socket *so, int how);
 void	sotoxsocket(struct socket *so, struct xsocket *xso);
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index 9d02ffa1a311..19c9bc07b478 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -68,16 +68,14 @@ struct sysentvec {
 					/* translate trap-to-signal mapping */
 	int		(*sv_fixup)(register_t **, struct image_params *);
 					/* stack fixup function */
-	void		(*sv_sendsig)(void (*)(int), int,
-					   struct __sigset *, u_long);
-					/* send signal */
+	void		(*sv_sendsig)(void (*)(int), int, struct __sigset *,
+			    u_long);	/* send signal */
 	char 		*sv_sigcode;	/* start of sigtramp code */
 	int 		*sv_szsigcode;	/* size of sigtramp code */
-	void		(*sv_prepsyscall)(struct trapframe *, int *,
-					       u_int *, caddr_t *);
+	void		(*sv_prepsyscall)(struct trapframe *, int *, u_int *,
+			    caddr_t *);
 	char		*sv_name;	/* name of binary type */
-	int		(*sv_coredump)(struct thread *, struct vnode *,
-					    off_t);
+	int		(*sv_coredump)(struct thread *, struct vnode *, off_t);
 					/* function to dump core, or NULL */
 	int		(*sv_imgact_try)(struct image_params *);
 	int		sv_minsigstksz;	/* minimum signal stack size */
@@ -124,7 +122,7 @@ SYSCALL_MODULE(syscallname,                             \
     NULL, NULL);
 
 int    syscall_register(int *offset, struct sysent *new_sysent,
-                             struct sysent *old_sysent);
+	    struct sysent *old_sysent);
 int    syscall_deregister(int *offset, struct sysent *old_sysent);
 int    syscall_module_handler(struct module *mod, int what, void *arg);
 
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 76606afe0a8d..59ed157ae764 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -135,7 +135,7 @@ void	init_param1(void);
 void	init_param2(int physpages);
 void	tablefull(const char *);
 int	kvprintf(char const *, void (*)(int, void*), void *, int,
-		      _BSD_VA_LIST_) __printflike(1, 0);
+	    _BSD_VA_LIST_) __printflike(1, 0);
 void	log(int, const char *, ...) __printflike(2, 3);
 void	log_console(struct uio *);
 int	printf(const char *, ...) __printflike(1, 2);
@@ -166,9 +166,9 @@ void	bzero(void *buf, size_t len);
 void	*memcpy(void *to, const void *from, size_t len);
 
 int	copystr(const void *kfaddr, void *kdaddr, size_t len,
-		size_t *lencopied);
+	    size_t *lencopied);
 int	copyinstr(const void *udaddr, void *kaddr, size_t len,
-		size_t *lencopied);
+	    size_t *lencopied);
 int	copyin(const void *udaddr, void *kaddr, size_t len);
 int	copyout(const void *kaddr, void *udaddr, size_t len);
 
@@ -269,8 +269,7 @@ int	at_exit(exitlist_fn function);
 int	rm_at_exit(exitlist_fn function);
 
 /* Fork callout list declarations. */
-typedef void (*forklist_fn)(struct proc *parent, struct proc *child,
-				 int flags);
+typedef void (*forklist_fn)(struct proc *parent, struct proc *child, int flags);
 
 int	at_fork(forklist_fn function);
 int	rm_at_fork(forklist_fn function);
@@ -297,7 +296,7 @@ extern watchdog_tickle_fn	wdog_tickler;
  * less often.
  */
 int	msleep(void *chan, struct mtx *mtx, int pri, const char *wmesg,
-		    int timo);
+	    int timo);
 #define	tsleep(chan, pri, wmesg, timo)	msleep(chan, NULL, pri, wmesg, timo)
 void	wakeup(void *chan);
 void	wakeup_one(void *chan);