diff --git a/sys/sys/_atomic64e.h b/sys/sys/_atomic64e.h
index 289e5117ee0b..d0abdc2e5a89 100644
--- a/sys/sys/_atomic64e.h
+++ b/sys/sys/_atomic64e.h
@@ -27,7 +27,6 @@
  * $FreeBSD$
  */
 
-
 #ifndef _SYS_ATOMIC64E_H_
 #define _SYS_ATOMIC64E_H_
 
diff --git a/sys/sys/_rangeset.h b/sys/sys/_rangeset.h
index a700c6eaf23e..f7c72810ead5 100644
--- a/sys/sys/_rangeset.h
+++ b/sys/sys/_rangeset.h
@@ -48,4 +48,3 @@ struct rangeset {
 };
 
 #endif
-
diff --git a/sys/sys/_stdarg.h b/sys/sys/_stdarg.h
index d20cfaa988ce..0d4ca8996f00 100644
--- a/sys/sys/_stdarg.h
+++ b/sys/sys/_stdarg.h
@@ -52,4 +52,3 @@
 #endif
 
 #endif /* ! _SYS__STDARG_H_ */
-
diff --git a/sys/sys/_termios.h b/sys/sys/_termios.h
index fab12cfa4064..edbda0a161fc 100644
--- a/sys/sys/_termios.h
+++ b/sys/sys/_termios.h
@@ -146,7 +146,6 @@
 #define	CNO_RTSDTR	0x00200000	/* Do not assert RTS or DTR automatically */
 #endif
 
-
 /*
  * "Local" flags - dumping ground for other state
  *
diff --git a/sys/sys/assym.h b/sys/sys/assym.h
index f5204fa83b16..858989fe505f 100644
--- a/sys/sys/assym.h
+++ b/sys/sys/assym.h
@@ -43,7 +43,6 @@ char name ## w1[((ASSYM_ABS(value) & 0xFFFF0000UL) >> 16) + ASSYM_BIAS];      \
 char name ## w2[((ASSYM_ABS(value) & 0xFFFF00000000ULL) >> 32) + ASSYM_BIAS]; \
 char name ## w3[((ASSYM_ABS(value) & 0xFFFF000000000000ULL) >> 48) + ASSYM_BIAS]
 
-
 /* char name ## _datatype_ ## STRINGIFY(typeof(((struct parenttype *)(0x0))-> name)) [1]; */
 #ifdef OFFSET_TEST
 #define OFFSET_CTASSERT CTASSERT
diff --git a/sys/sys/ata.h b/sys/sys/ata.h
index 7ec4526be7df..83eb089dbecf 100644
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.h
@@ -384,7 +384,6 @@ struct ata_params {
 #define ATA_SA600               0x49
 #define ATA_DMA_MAX             0x4f
 
-
 /* ATA commands */
 #define ATA_NOP                         0x00    /* NOP */
 #define         ATA_NF_FLUSHQUEUE       0x00    /* flush queued cmd's */
@@ -517,7 +516,6 @@ struct ata_params {
 #define ATA_READ_NATIVE_MAX_ADDRESS     0xf8    /* read native max address */
 #define ATA_SET_MAX_ADDRESS             0xf9    /* set max address */
 
-
 /* ATAPI commands */
 #define ATAPI_TEST_UNIT_READY           0x00    /* check if device is ready */
 #define ATAPI_REZERO                    0x01    /* rewind */
@@ -578,7 +576,6 @@ struct ata_params {
 #define ATAPI_READ_CD                   0xbe    /* read data */
 #define ATAPI_POLL_DSC                  0xff    /* poll DSC status bit */
 
-
 struct ata_ioc_devices {
     int                 channel;
     char                name[2][32];
@@ -629,7 +626,7 @@ struct atapi_sense {
     u_int8_t	specific;		/* sense key specific */
 #define	ATA_SENSE_SPEC_VALID	0x80
 #define	ATA_SENSE_SPEC_MASK	0x7f
-	
+
     u_int8_t	specific1;		/* sense key specific */
     u_int8_t	specific2;		/* sense key specific */
 } __packed;
@@ -1009,7 +1006,6 @@ struct ata_security_password {
 #define IOCATAGSPINDOWN		_IOR('a', 104, int)
 #define IOCATASSPINDOWN		_IOW('a', 105, int)
 
-
 struct ata_ioc_raid_config {
 	    int                 lun;
 	    int                 type;
diff --git a/sys/sys/blist.h b/sys/sys/blist.h
index e37d82fc8b4d..654708b2ae5f 100644
--- a/sys/sys/blist.h
+++ b/sys/sys/blist.h
@@ -102,4 +102,3 @@ void	blist_resize(blist_t *pblist, daddr_t count, int freenew, int flags);
 void	blist_stats(blist_t blist, struct sbuf *s);
 
 #endif	/* _SYS_BLIST_H_ */
-
diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h
index b04b2cb5b81f..48c7101aad97 100644
--- a/sys/sys/buf_ring.h
+++ b/sys/sys/buf_ring.h
@@ -197,12 +197,12 @@ buf_ring_dequeue_sc(struct buf_ring *br)
 	cons_head = br->br_cons_head;
 #endif
 	prod_tail = atomic_load_acq_32(&br->br_prod_tail);
-	
+
 	cons_next = (cons_head + 1) & br->br_cons_mask;
 #ifdef PREFETCH_DEFINED
 	cons_next_next = (cons_head + 2) & br->br_cons_mask;
 #endif
-	
+
 	if (cons_head == prod_tail) 
 		return (NULL);
 
@@ -238,10 +238,10 @@ buf_ring_advance_sc(struct buf_ring *br)
 {
 	uint32_t cons_head, cons_next;
 	uint32_t prod_tail;
-	
+
 	cons_head = br->br_cons_head;
 	prod_tail = br->br_prod_tail;
-	
+
 	cons_next = (cons_head + 1) & br->br_cons_mask;
 	if (cons_head == prod_tail) 
 		return;
@@ -297,7 +297,7 @@ buf_ring_peek(struct buf_ring *br)
 	 */
 	if (br->br_cons_head == br->br_prod_tail)
 		return (NULL);
-	
+
 	return (br->br_ring[br->br_cons_head]);
 }
 
@@ -367,6 +367,4 @@ struct buf_ring *buf_ring_alloc(int count, struct malloc_type *type, int flags,
     struct mtx *);
 void buf_ring_free(struct buf_ring *br, struct malloc_type *type);
 
-
-
 #endif
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index b3b271efef07..6a286d0f9ef3 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -311,7 +311,7 @@ struct resource_map {
 	bus_size_t r_size;
 	void	*r_vaddr;
 };
-	
+
 /**
  * @brief Optional properties of a resource mapping request.
  */
diff --git a/sys/sys/bus_dma_internal.h b/sys/sys/bus_dma_internal.h
index ca67eb343975..0f5353974080 100644
--- a/sys/sys/bus_dma_internal.h
+++ b/sys/sys/bus_dma_internal.h
@@ -58,4 +58,3 @@ void	_bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
 	    void *callback_arg);
 
 #endif /* !_BUS_DMA_INTERNAL_H_ */
-
diff --git a/sys/sys/cdio.h b/sys/sys/cdio.h
index a3eb271a7514..d8c700024e22 100644
--- a/sys/sys/cdio.h
+++ b/sys/sys/cdio.h
@@ -108,7 +108,6 @@ struct cd_sub_channel_info {
 	} what;
 };
 
-
 /***************************************************************\
 * Ioctls for the CD drive					*
 \***************************************************************/
@@ -121,14 +120,12 @@ struct ioc_play_track {
 };
 #define	CDIOCPLAYTRACKS	_IOW('c',1,struct ioc_play_track)
 
-
 struct ioc_play_blocks {
 	int	blk;
 	int	len;
 };
 #define	CDIOCPLAYBLOCKS	_IOW('c',2,struct ioc_play_blocks)
 
-
 struct ioc_read_subchannel {
 	u_char address_format;
 #define CD_LBA_FORMAT	1
@@ -144,7 +141,6 @@ struct ioc_read_subchannel {
 };
 #define CDIOCREADSUBCHANNEL _IOWR('c', 3 , struct ioc_read_subchannel )
 
-
 struct ioc_toc_header {
 	u_short len;
 	u_char  starting_track;
@@ -152,7 +148,6 @@ struct ioc_toc_header {
 };
 #define CDIOREADTOCHEADER _IOR('c',4,struct ioc_toc_header)
 
-
 struct ioc_read_toc_entry {
 	u_char	address_format;
 	u_char	starting_track;
@@ -161,7 +156,6 @@ struct ioc_read_toc_entry {
 };
 #define CDIOREADTOCENTRYS _IOWR('c',5,struct ioc_read_toc_entry)
 
-
 struct ioc_read_toc_single_entry {
 	u_char	address_format;
 	u_char	track;
@@ -169,13 +163,11 @@ struct ioc_read_toc_single_entry {
 };
 #define CDIOREADTOCENTRY _IOWR('c',6,struct ioc_read_toc_single_entry)
 
-
 struct ioc_patch {
 	u_char	patch[4];	/* one for each channel */
 };
 #define	CDIOCSETPATCH	_IOW('c',9,struct ioc_patch)
 
-
 struct ioc_vol {
 	u_char	vol[4];	/* one for each channel */
 };
@@ -210,7 +202,6 @@ struct ioc_vol {
 
 #define	CDIOCEJECT	_IO('c',24)
 
-
 struct ioc_play_msf {
 	u_char	start_m;
 	u_char	start_s;
@@ -230,7 +221,6 @@ struct ioc_play_msf {
 				/*<1>and make the media (if any) ready*/
 #define CDIOCCLOSE	_IO('c',28)	/*<1>*/
 
-
 struct ioc_pitch {		/*<1>For drives that support it, this*/
 				/*<1>call instructs the drive to play the*/
 	short	speed;		/*<1>audio at a faster or slower-than-normal*/
diff --git a/sys/sys/chio.h b/sys/sys/chio.h
index e3a4d80da524..99cfd4528fb0 100644
--- a/sys/sys/chio.h
+++ b/sys/sys/chio.h
@@ -248,7 +248,6 @@ struct changer_element_status_request {
 	struct changer_element_status	*cesr_element_status;
 };
 
-
 struct changer_set_voltag_request {
 	u_int16_t		csvr_type;
 	u_int16_t		csvr_addr;
@@ -264,7 +263,6 @@ struct changer_set_voltag_request {
 	changer_voltag_t     	csvr_voltag;
 };
 
-
 #define	CESTATUS_BITS	\
 	"\20\6INENAB\5EXENAB\4ACCESS\3EXCEPT\2IMPEXP\1FULL"
 
diff --git a/sys/sys/cnv.h b/sys/sys/cnv.h
index 1e56cfbedd90..babc913c5637 100644
--- a/sys/sys/cnv.h
+++ b/sys/sys/cnv.h
@@ -75,7 +75,6 @@ int			 cnvlist_get_descriptor(const void *cookie);
 const int		*cnvlist_get_descriptor_array(const void *cookie, size_t *nitemsp);
 #endif
 
-
 /*
  * The cnvlist_take functions returns value associated with the given cookie and
  * remove the given entry from the nvlist.
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index b1b8b1c95c13..2a87e5d3a9ca 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -272,7 +272,7 @@ struct make_dev_args {
 void make_dev_args_init_impl(struct make_dev_args *_args, size_t _sz);
 #define	make_dev_args_init(a) \
     make_dev_args_init_impl((a), sizeof(struct make_dev_args))
-	
+
 void	delist_dev(struct cdev *_dev);
 void	destroy_dev(struct cdev *_dev);
 int	destroy_dev_sched(struct cdev *dev);
diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h
index 55a91c06e048..b7b4090be317 100644
--- a/sys/sys/copyright.h
+++ b/sys/sys/copyright.h
@@ -27,7 +27,6 @@
  * $FreeBSD$
  */
 
-
 /* Copyrights macros  */
 
 /* Add a FreeBSD vendor copyright here */
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 12827486d076..2d267778ecb2 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -63,7 +63,7 @@ void disk_err(struct bio *bp, const char *what, int blkdone, int nl);
 	 * Enable/Disable (the argument is boolean) the device for kernel
 	 * core dumps.
 	 */
-	
+
 #define	DIOCGFRONTSTUFF _IOR('d', 134, off_t)
 	/*
 	 * Many disk formats have some amount of space reserved at the
diff --git a/sys/sys/domainset.h b/sys/sys/domainset.h
index a2988e7cc27a..ff870a966226 100644
--- a/sys/sys/domainset.h
+++ b/sys/sys/domainset.h
@@ -43,7 +43,6 @@
 	    sizeof("::") + sizeof(__XSTRING(DOMAINSET_POLICY_MAX)) +	\
 	    sizeof(__XSTRING(MAXMEMDOM)))
 
-
 #define	DOMAINSET_CLR(n, p)		BIT_CLR(DOMAINSET_SETSIZE, n, p)
 #define	DOMAINSET_COPY(f, t)		BIT_COPY(DOMAINSET_SETSIZE, f, t)
 #define	DOMAINSET_ISSET(n, p)		BIT_ISSET(DOMAINSET_SETSIZE, n, p)
diff --git a/sys/sys/endian.h b/sys/sys/endian.h
index 3cef6130cd15..d070d09ad9f7 100644
--- a/sys/sys/endian.h
+++ b/sys/sys/endian.h
@@ -39,22 +39,22 @@
 typedef	__uint8_t	uint8_t;
 #define	_UINT8_T_DECLARED
 #endif
- 
+
 #ifndef _UINT16_T_DECLARED
 typedef	__uint16_t	uint16_t;
 #define	_UINT16_T_DECLARED
 #endif
- 
+
 #ifndef _UINT32_T_DECLARED
 typedef	__uint32_t	uint32_t;
 #define	_UINT32_T_DECLARED
 #endif
- 
+
 #ifndef _UINT64_T_DECLARED
 typedef	__uint64_t	uint64_t;
 #define	_UINT64_T_DECLARED
 #endif
- 
+
 /*
  * General byte order swapping functions.
  */
diff --git a/sys/sys/event.h b/sys/sys/event.h
index ef1d87ada9f6..f7e822a726a5 100644
--- a/sys/sys/event.h
+++ b/sys/sys/event.h
@@ -230,7 +230,6 @@ struct knlist {
 	int	kl_autodestroy;
 };
 
-
 #ifdef _KERNEL
 
 /*
diff --git a/sys/sys/fail.h b/sys/sys/fail.h
index ffb3f3d536d2..dbd2c3e51414 100644
--- a/sys/sys/fail.h
+++ b/sys/sys/fail.h
@@ -328,7 +328,6 @@ __END_DECLS
 		_FAIL_POINT_EVAL(name, true, code) \
 	} while (0)
 
-
 /**
  * Instantiate a failpoint which runs arbitrary code when triggered.
  * @param parent     The parent sysctl under which to locate the sysctl
diff --git a/sys/sys/fcntl.h b/sys/sys/fcntl.h
index 0febbcec5cd5..a68425513971 100644
--- a/sys/sys/fcntl.h
+++ b/sys/sys/fcntl.h
@@ -327,7 +327,6 @@ struct __oflock {
 #define	POSIX_FADV_NOREUSE	5	/* access data only once */
 #endif
 
-
 #ifdef __BSD_VISIBLE
 /*
  * Magic value that specify that corresponding file descriptor to filename
diff --git a/sys/sys/fdcio.h b/sys/sys/fdcio.h
index f041a6a8a8e3..bceffaed2a37 100644
--- a/sys/sys/fdcio.h
+++ b/sys/sys/fdcio.h
@@ -125,7 +125,6 @@ enum fd_drivetype {
 	FDT_288M
 };
 
-
 #define FD_FORM   _IOW('F', 61, struct fd_formb) /* format a track */
 #define FD_GTYPE  _IOR('F', 62, struct fd_type)  /* get drive type */
 #define FD_STYPE  _IOW('F', 63, struct fd_type)  /* set drive type */
diff --git a/sys/sys/imgact_aout.h b/sys/sys/imgact_aout.h
index f7cad87abb49..d1af92afd281 100644
--- a/sys/sys/imgact_aout.h
+++ b/sys/sys/imgact_aout.h
@@ -70,7 +70,6 @@
 	 N_GETMAGIC_NET(ex) != OMAGIC && N_GETMAGIC_NET(ex) != NMAGIC && \
 	 N_GETMAGIC_NET(ex) != ZMAGIC && N_GETMAGIC_NET(ex) != QMAGIC)
 
-
 /* Address of the bottom of the text segment. */
 /*
  * This can not be done right.  Abuse a_entry in some cases to handle kernels.
diff --git a/sys/sys/intr.h b/sys/sys/intr.h
index 74e2ae195b92..37a907a7409b 100644
--- a/sys/sys/intr.h
+++ b/sys/sys/intr.h
@@ -44,7 +44,7 @@ enum intr_map_data_type {
 	INTR_MAP_DATA_FDT,
 	INTR_MAP_DATA_GPIO,
 	INTR_MAP_DATA_MSI,
-	
+
 	/* Placeholders for platform specific types */
 	INTR_MAP_DATA_PLAT_1 = 1000,
 	INTR_MAP_DATA_PLAT_2,
diff --git a/sys/sys/iov.h b/sys/sys/iov.h
index 3be01180a107..ee60d6d4320b 100644
--- a/sys/sys/iov.h
+++ b/sys/sys/iov.h
@@ -256,4 +256,3 @@ struct pci_iov_arg
 #define	IOV_GET_SCHEMA	_IOWR('p', 12, struct pci_iov_schema)
 
 #endif
-
diff --git a/sys/sys/ipmi.h b/sys/sys/ipmi.h
index e5b962725287..3c805bac099d 100644
--- a/sys/sys/ipmi.h
+++ b/sys/sys/ipmi.h
@@ -127,7 +127,6 @@ struct ipmi_cmdspec {
 	unsigned char	cmd;
 };
 
-
 struct ipmi_addr {
 	int		addr_type;
 	short		channel;
diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h
index 3b0e038b5c83..77841a020e00 100644
--- a/sys/sys/kernel.h
+++ b/sys/sys/kernel.h
@@ -175,7 +175,6 @@ enum sysinit_sub_id {
 	SI_SUB_LAST		= 0xfffffff	/* final initialization */
 };
 
-
 /*
  * Some enumerated orders; "ANY" sorts last.
  */
@@ -192,7 +191,6 @@ enum sysinit_elem_order {
 	SI_ORDER_ANY		= 0xfffffff	/* last*/
 };
 
-
 /*
  * A system initialization call instance
  *
diff --git a/sys/sys/kobj.h b/sys/sys/kobj.h
index 5f8b2bb07be3..da8c2d5106bb 100644
--- a/sys/sys/kobj.h
+++ b/sys/sys/kobj.h
@@ -175,7 +175,6 @@ struct kobj_class classvar = {				\
 	#name, methods, size, name ## _baseclasses	\
 }
 
-
 /*
  * Compile the method table in a class.
  */
@@ -253,7 +252,6 @@ kobj_method_t* kobj_lookup_method(kobj_class_t cls,
 				  kobj_method_t **cep,
 				  kobjop_desc_t desc);
 
-
 /*
  * Default method implementation. Returns ENXIO.
  */
diff --git a/sys/sys/kthread.h b/sys/sys/kthread.h
index e6f1fa41a988..826472f4bb38 100644
--- a/sys/sys/kthread.h
+++ b/sys/sys/kthread.h
@@ -77,5 +77,4 @@ void	kthread_start(const void *);
 int	kthread_suspend(struct thread *, int);
 void	kthread_suspend_check(void);
 
-
 #endif /* !_SYS_KTHREAD_H_ */
diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h
index 3f4623787421..8d976e18ea28 100644
--- a/sys/sys/libkern.h
+++ b/sys/sys/libkern.h
@@ -88,7 +88,6 @@ validbcd(int bcd)
 
 	return (bcd == 0 || (bcd > 0 && bcd <= 0x99 && bcd2bin_data[bcd] != 0));
 }
-
 static __inline int imax(int a, int b) { return (a > b ? a : b); }
 static __inline int imin(int a, int b) { return (a < b ? a : b); }
 static __inline long lmax(long a, long b) { return (a > b ? a : b); }
@@ -113,7 +112,6 @@ static __inline __uintmax_t ummin(__uintmax_t a, __uintmax_t b)
 }
 static __inline off_t omax(off_t a, off_t b) { return (a > b ? a : b); }
 static __inline off_t omin(off_t a, off_t b) { return (a < b ? a : b); }
-
 static __inline int abs(int a) { return (a < 0 ? -a : a); }
 static __inline long labs(long a) { return (a < 0 ? -a : a); }
 static __inline quad_t qabs(quad_t a) { return (a < 0 ? -a : a); }
diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 7aedfee973c7..0611c3de0b73 100644
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -193,7 +193,6 @@ int linker_search_symbol_name_flags(caddr_t value, char *buf, u_int buflen,
 int linker_search_symbol_name(caddr_t value, char *buf, u_int buflen,
     long *offset);
 
-
 /* HWPMC helper */
 void *linker_hwpmc_list_objects(void);
 
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index e682f590985c..2db38f9df89a 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -137,7 +137,6 @@ struct lock_class {
 #define	LOCK_LOG_TEST(lo, flags)	0
 #endif
 
-
 #define	LOCK_LOG_LOCK(opname, lo, flags, recurse, file, line) do {	\
 	if (LOCK_LOG_TEST((lo), (flags)))				\
 		CTR6(KTR_LOCK, opname " (%s) %s %p r = %d at %s:%d",	\
diff --git a/sys/sys/lock_profile.h b/sys/sys/lock_profile.h
index 7c7edee4af0a..2ace6ef56983 100644
--- a/sys/sys/lock_profile.h
+++ b/sys/sys/lock_profile.h
@@ -29,7 +29,6 @@
  * $FreeBSD$
  */
 
-
 #ifndef _SYS_LOCK_PROFILE_H_
 #define _SYS_LOCK_PROFILE_H_
 
@@ -52,7 +51,6 @@ void lock_profile_obtain_lock_success(struct lock_object *lo, int contested,
 void lock_profile_release_lock(struct lock_object *lo);
 void lock_profile_thread_exit(struct thread *td);
 
-
 static inline void
 lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested,
     uint64_t *waittime)
diff --git a/sys/sys/lockstat.h b/sys/sys/lockstat.h
index 0526f4fbd94c..6a5f79a2f152 100644
--- a/sys/sys/lockstat.h
+++ b/sys/sys/lockstat.h
@@ -26,7 +26,7 @@
  *
  * $FreeBSD$
  */
- 
+
 /*
  * DTrace lockstat provider definitions
  */
diff --git a/sys/sys/mtio.h b/sys/sys/mtio.h
index d36125b20c39..843b32909224 100644
--- a/sys/sys/mtio.h
+++ b/sys/sys/mtio.h
@@ -174,7 +174,7 @@ struct scsi_tape_errors {
 		u_int64_t nbytes;	/* total # bytes processed */
 	} wterr, rderr;
 };
-	
+
 union mterrstat {
 	struct scsi_tape_errors scsi_errstat;
 	char _reserved_padding[256];
@@ -240,7 +240,6 @@ struct mtextget {
 #define	MT_DENS_DUP			0x40
 #define	MT_DENS_DEFLT			0x20
 
-
 #define	MT_PARAM_FIXED_STR_LEN	32
 union mt_param_value {
 	int64_t		value_signed;
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
index 224d84c484f4..4a6d57144020 100644
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -356,14 +356,12 @@ enum pmc_event {
 	__PMC_OP(CLOSELOG, "Close log file")				\
 	__PMC_OP(GETDYNEVENTINFO, "Get dynamic events list")
 
-
 enum pmc_ops {
 #undef	__PMC_OP
 #define	__PMC_OP(N, D)	PMC_OP_##N,
 	__PMC_OPS()
 };
 
-
 /*
  * Flags used in operations on PMCs.
  */
@@ -414,7 +412,6 @@ typedef uint64_t	pmc_value_t;
  * number of hardware PMCs on this cpu.
  */
 
-
 #define	PMC_ID_TO_ROWINDEX(ID)	((ID) & 0xFF)
 #define	PMC_ID_TO_CLASS(ID)	(((ID) & 0xF00) >> 8)
 #define	PMC_ID_TO_MODE(ID)	(((ID) & 0xFF000) >> 12)
@@ -487,7 +484,6 @@ struct pmc_op_pmcsetcount {
 	pmc_id_t	pm_pmcid;	/* PMC id to set */
 };
 
-
 /*
  * OP PMCRW
  *
@@ -495,14 +491,12 @@ struct pmc_op_pmcsetcount {
  * to have been previously allocated using PMCALLOCATE.
  */
 
-
 struct pmc_op_pmcrw {
 	uint32_t	pm_flags;	/* PMC_F_{OLD,NEW}VALUE*/
 	pmc_id_t	pm_pmcid;	/* pmc id */
 	pmc_value_t	pm_value;	/* new&returned value */
 };
 
-
 /*
  * OP GETPMCINFO
  *
@@ -528,14 +522,12 @@ struct pmc_op_getpmcinfo {
 	struct pmc_info	pm_pmcs[];	/* space for 'npmc' structures */
 };
 
-
 /*
  * OP GETCPUINFO
  *
  * Retrieve system CPU information.
  */
 
-
 struct pmc_classinfo {
 	enum pmc_class	pm_class;	/* class id */
 	uint32_t	pm_caps;	/* counter capabilities */
@@ -1000,7 +992,6 @@ struct pmc_binding {
 	int	pb_cpu;		/* if so, to which CPU */
 };
 
-
 struct pmc_mdep;
 
 /*
@@ -1137,7 +1128,7 @@ extern struct pmc_debugflags pmc_debugflags;
 		CTR6(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2, p3, p4,	\
 		    p5, p6);						\
 } while (0)
-	
+
 /* Major numbers */
 #define	PMC_DEBUG_MAJ_CPU		0 /* cpu switches */
 #define	PMC_DEBUG_MAJ_CSW		1 /* context switches */
diff --git a/sys/sys/posix4.h b/sys/sys/posix4.h
index 3019c6d5ccf8..bb3195e8a1a5 100644
--- a/sys/sys/posix4.h
+++ b/sys/sys/posix4.h
@@ -55,7 +55,6 @@ int sys_ ## SC (struct thread *td, struct SC##_args *uap) \
 	return syscall_not_present(td, #SC , (struct nosys_args *)uap); \
 }
 
-
 MALLOC_DECLARE(M_P31B);
 
 int p31b_proc(struct proc *, pid_t, struct proc **);
@@ -75,7 +74,6 @@ void p31b_unsetcfg(int);
  */
 
 enum ksched_op {
-
 #define KSCHED_OP_RW { 1, 0, 1, 0, 0, 0, 0, 0 }
 
 	SCHED_SETPARAM,
diff --git a/sys/sys/power.h b/sys/sys/power.h
index e333a65043bf..524bc3fabb24 100644
--- a/sys/sys/power.h
+++ b/sys/sys/power.h
@@ -64,4 +64,3 @@ typedef void (*power_profile_change_hook)(void *, int);
 EVENTHANDLER_DECLARE(power_profile_change, power_profile_change_hook);
 
 #endif	/* !_SYS_POWER_H_ */
-
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 68d60bb41a78..1f73f6667714 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -859,7 +859,6 @@ extern pid_t pid_max;
 
 #define	SESS_LEADER(p)	((p)->p_session->s_leader == (p))
 
-
 /* Lock and unlock a process. */
 #define	PROC_LOCK(p)	mtx_lock(&(p)->p_mtx)
 #define	PROC_TRYLOCK(p)	mtx_trylock(&(p)->p_mtx)
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index c0060cbbf6bf..14d55905dfc0 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -437,7 +437,6 @@ struct {								\
 		(head2)->stqh_last = &STAILQ_FIRST(head2);		\
 } while (0)
 
-
 /*
  * List declarations.
  */
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 6d06ee574ed4..e2c4ab144d2a 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -153,7 +153,6 @@ void random_harvest_deregister_source(enum random_entropy_source);
 #define random_harvest_queue_ether(a, b)	do {} while (0)
 #endif /* defined(RANDOM_ENABLE_ETHER) */
 
-
 #endif /* _KERNEL */
 
 #define GRND_NONBLOCK	0x1
diff --git a/sys/sys/rwlock.h b/sys/sys/rwlock.h
index 62655ae21ac5..4e7768595737 100644
--- a/sys/sys/rwlock.h
+++ b/sys/sys/rwlock.h
@@ -209,7 +209,6 @@ void	__rw_assert(const volatile uintptr_t *c, int what, const char *file,
 	__rw_assert(&(rw)->rw_lock, w, f, l)
 #endif
 
-
 /*
  * Public interface for lock operations.
  */
diff --git a/sys/sys/serial.h b/sys/sys/serial.h
index 3293ebdab931..804687d31271 100644
--- a/sys/sys/serial.h
+++ b/sys/sys/serial.h
@@ -35,7 +35,6 @@
 #ifndef _SYS_SERIAL_H_
 #define	_SYS_SERIAL_H_
 
-
 /*
  * Indentification of modem control signals.  These definitions match
  * the TIOCMGET definitions in <sys/ttycom.h> shifted a bit down, and
diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index 82ec6b0cf920..038c4d3ef8b9 100644
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -73,7 +73,7 @@ typedef	__sa_family_t	sa_family_t;
 typedef	__socklen_t	socklen_t;
 #define	_SOCKLEN_T_DECLARED
 #endif
- 
+
 #ifndef _SSIZE_T_DECLARED
 typedef	__ssize_t	ssize_t;
 #define	_SSIZE_T_DECLARED
@@ -619,7 +619,6 @@ struct omsghdr {
 #define PRU_FLUSH_RDWR   SHUT_RDWR
 #endif
 
-
 #if __BSD_VISIBLE
 /*
  * sendfile(2) header/trailer struct
diff --git a/sys/sys/sockopt.h b/sys/sys/sockopt.h
index e7cc6cf0657c..cb7fc3ffca27 100644
--- a/sys/sys/sockopt.h
+++ b/sys/sys/sockopt.h
@@ -39,7 +39,6 @@
 #error "no user-serviceable parts inside"
 #endif
 
-
 struct thread;
 struct socket;
 
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index 2410fe110aac..41cd8593914a 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -802,7 +802,6 @@ typedef struct {
 #define SNDCTL_DSP_SUBDIVIDE	_IOWR('P', 9, int)
 #define SNDCTL_DSP_SETFRAGMENT	_IOWR('P',10, int)
 
-
 #define SNDCTL_DSP_GETFMTS	_IOR ('P',11, int) /* Returns a mask */
 /*
  * Buffer status queries.
@@ -1046,7 +1045,6 @@ typedef struct copr_msg {
 #define SOUND_MIXER_RADIO       23      /* Radio in */
 #define SOUND_MIXER_MONITOR     24      /* Monitor (usually mic) volume */
 
-
 /*
  * Some on/off settings (SOUND_SPECIAL_MIN - SOUND_SPECIAL_MAX)
  * Not counted to SOUND_MIXER_NRDEVICES, but use the same number space
@@ -1420,7 +1418,6 @@ void seqbuf_dump(void);	/* This function must be provided by programs */
 #define SEQ_BENDER(dev, chn, value) \
 	_CHN_COMMON(dev, MIDI_PITCH_BEND, chn, 0, 0, value)
 
-
 #define SEQ_V2_X_CONTROL(dev, voice, controller, value)	{ \
 	_SEQ_NEEDBUF(8);\
 	_seqbuf[_seqbufptr] = SEQ_EXTENDED;\
@@ -1596,7 +1593,6 @@ typedef struct audio_errinfo
 #define SNDCTL_DSP_SETPLAYVOL           _IOWR('P', 24, int)
 #define SNDCTL_DSP_GETERROR             _IOR ('P', 25, audio_errinfo)
 
-
 /*
  ****************************************************************************
  * Sync groups for audio devices
diff --git a/sys/sys/stats.h b/sys/sys/stats.h
index 8f1c8edee5aa..c10bba856bfc 100644
--- a/sys/sys/stats.h
+++ b/sys/sys/stats.h
@@ -557,7 +557,6 @@ extern const struct voistatdata_numeric numeric_limits[2][VSD_DTYPE_Q_U64 + 1];
 #define	STATS_VSS_DVHIST64_USR(vals, vsdflags) \
     STATS_VSS_HIST(VSD_DTYPE_DVHIST64, HIST_HLPR_INFO(VSD_DTYPE_DVHIST64, \
     BKT_USR, vsdflags, 0, 0, HIST_HLPR_INFO_USR_FIELDS(vals)))
-
 #define	DRBKT(lb, ub) { stats_ctor_vsd_numeric(lb), stats_ctor_vsd_numeric(ub) }
 #define	DVBKT(val) DRBKT(val, val)
 #define	CRBKT(lb) DRBKT(lb, lb)
@@ -583,7 +582,7 @@ extern const struct voistatdata_numeric numeric_limits[2][VSD_DTYPE_Q_U64 + 1];
     VSD_HIST_FIELD(hist, , hist_dtype, (void *)&,field)
 #define	VSD_CONSTHIST_FIELDPTR(hist, hist_dtype, field) \
     VSD_HIST_FIELD(hist, const, hist_dtype, (void *)&,field)
-	
+
 #define	VSD_CRHIST_FIELD(hist, cnst, hist_dtype, op, field) \
     (VSD_DTYPE_CRHIST32 == (hist_dtype) ? \
     op(_VSD(cnst, crhist32, hist)->field) : \
diff --git a/sys/sys/stdatomic.h b/sys/sys/stdatomic.h
index cac36fa6adf6..4dc6d680f934 100644
--- a/sys/sys/stdatomic.h
+++ b/sys/sys/stdatomic.h
@@ -373,7 +373,6 @@ __extension__ ({							\
 typedef struct {
 	atomic_bool	__flag;
 } atomic_flag;
-
 #define	ATOMIC_FLAG_INIT		{ ATOMIC_VAR_INIT(0) }
 
 static __inline _Bool
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 03abffb41afb..c80a7d26f468 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -2404,7 +2404,6 @@ int	ogetdirentries(struct thread *, struct ogetdirentries_args *);
 
 #endif /* COMPAT_43 */
 
-
 #ifdef COMPAT_FREEBSD4
 
 struct freebsd4_getfsstat_args {
@@ -2465,7 +2464,6 @@ int	freebsd4_sigreturn(struct thread *, struct freebsd4_sigreturn_args *);
 
 #endif /* COMPAT_FREEBSD4 */
 
-
 #ifdef COMPAT_FREEBSD6
 
 struct freebsd6_pread_args {
@@ -2531,7 +2529,6 @@ int	freebsd6_lio_listio(struct thread *, struct freebsd6_lio_listio_args *);
 
 #endif /* COMPAT_FREEBSD6 */
 
-
 #ifdef COMPAT_FREEBSD7
 
 struct freebsd7___semctl_args {
@@ -2556,14 +2553,12 @@ int	freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *);
 
 #endif /* COMPAT_FREEBSD7 */
 
-
 #ifdef COMPAT_FREEBSD10
 
 int	freebsd10_pipe(struct thread *, struct freebsd10_pipe_args *);
 
 #endif /* COMPAT_FREEBSD10 */
 
-
 #ifdef COMPAT_FREEBSD11
 
 struct freebsd11_mknod_args {
@@ -2671,7 +2666,6 @@ int	freebsd11_mknodat(struct thread *, struct freebsd11_mknodat_args *);
 
 #endif /* COMPAT_FREEBSD11 */
 
-
 #ifdef COMPAT_FREEBSD12
 
 struct freebsd12_shm_open_args {
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index 466765fa906a..58920783aa78 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -167,7 +167,7 @@ void	kassert_panic(const char *fmt, ...)  __printflike(1, 2);
  */
 #define	CRITICAL_ASSERT(td)						\
 	KASSERT((td)->td_critnest >= 1, ("Not in critical section"));
- 
+
 /*
  * If we have already panic'd and this is the thread that called
  * panic(), then don't block on any mutexes but silently succeed.
@@ -268,7 +268,6 @@ void	tablefull(const char *);
 extern int (*lkpi_alloc_current)(struct thread *, int);
 int linux_alloc_current_noop(struct thread *, int);
 
-
 #if defined(KLD_MODULE) || defined(KTR_CRITICAL) || !defined(_KERNEL) || defined(GENOFFSET)
 #define critical_enter() critical_enter_KBI()
 #define critical_exit() critical_exit_KBI()
@@ -300,7 +299,6 @@ critical_exit(void)
 }
 #endif
 
-
 #ifdef  EARLY_PRINTF
 typedef void early_putc_t(int ch);
 extern early_putc_t *early_putc;
@@ -565,7 +563,6 @@ void root_mount_hold_token(const char *identifier, struct root_hold_token *h);
 void root_mount_rel(struct root_hold_token *h);
 int root_mounted(void);
 
-
 /*
  * Unit number allocation API. (kern/subr_unit.c)
  */
diff --git a/sys/sys/tiio.h b/sys/sys/tiio.h
index e1123905236d..acda7741d0b7 100644
--- a/sys/sys/tiio.h
+++ b/sys/sys/tiio.h
@@ -268,7 +268,6 @@ struct tg_mem {
 	int		len;
 }; 
 
-
 typedef enum {
 	TI_PARAM_NONE		= 0x00,
 	TI_PARAM_STAT_TICKS	= 0x01,
diff --git a/sys/sys/tim_filter.h b/sys/sys/tim_filter.h
index a131a5d251b1..b316fb0db3da 100644
--- a/sys/sys/tim_filter.h
+++ b/sys/sys/tim_filter.h
@@ -102,7 +102,6 @@ get_cur_timelim(struct time_filter *tf)
 	return(tf->cur_time_limit);
 }
 
-
 int setup_time_filter_small(struct time_filter_small *tf,
 			    int fil_type, uint32_t time_len);
 void reset_time_small(struct time_filter_small *tf, uint32_t time_len);
@@ -129,6 +128,5 @@ get_cur_timelim_small(struct time_filter_small *tf)
 	return(tf->cur_time_limit);
 }
 
-
 #endif
 #endif
diff --git a/sys/sys/timeet.h b/sys/sys/timeet.h
index dc43337d176a..a809106b2369 100644
--- a/sys/sys/timeet.h
+++ b/sys/sys/timeet.h
@@ -105,4 +105,3 @@ int	et_free(struct eventtimer *et);
 SYSCTL_DECL(_kern_eventtimer);
 #endif
 #endif /* !_SYS_TIMETC_H_ */
-
diff --git a/sys/sys/timepps.h b/sys/sys/timepps.h
index 99ea2207be35..578d42704f12 100644
--- a/sys/sys/timepps.h
+++ b/sys/sys/timepps.h
@@ -81,7 +81,6 @@ typedef struct {
 #define assert_offset_ntpfp     assert_off_tu.ntpfp
 #define clear_offset_ntpfp      clear_off_tu.ntpfp
 
-
 #define PPS_CAPTUREASSERT	0x01
 #define PPS_CAPTURECLEAR	0x02
 #define PPS_CAPTUREBOTH		0x03
diff --git a/sys/sys/tree.h b/sys/sys/tree.h
index 7fa7806c9a91..eb5f244d8a12 100644
--- a/sys/sys/tree.h
+++ b/sys/sys/tree.h
@@ -99,7 +99,7 @@ struct {								\
 	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
 	(head)->sph_root = tmp;						\
 } while (/*CONSTCOND*/ 0)
-	
+
 #define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
 	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
 	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
@@ -460,7 +460,6 @@ struct {								\
 	RB_GENERATE_MINMAX(name, type, field, attr)			\
 	RB_GENERATE_REINSERT(name, type, field, cmp, attr)
 
-
 #define RB_GENERATE_INSERT_COLOR(name, type, field, attr)		\
 attr void								\
 name##_RB_INSERT_COLOR(struct name *head, struct type *elm)		\
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 76b7a85ea9bc..d4f5f286845d 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -522,7 +522,6 @@ extern struct vnodeop_desc *vnodeop_descs[];
 #define	VOPARG_OFFSETTO(s_type, s_offset, struct_p) \
     ((s_type)(((char*)(struct_p)) + (s_offset)))
 
-
 #ifdef DEBUG_VFS_LOCKS
 /*
  * Support code to aid in debugging VFS locking problems.  Not totally
@@ -570,7 +569,6 @@ void	assert_vop_unlocked(struct vnode *vp, const char *str);
 
 #endif /* DEBUG_VFS_LOCKS */
 
-
 /*
  * This call works for vnodes in the kernel.
  */