Index: sys/param.h
===================================================================
RCS file: /cvs/src/sys/sys/param.h,v
retrieving revision 1.123
diff -u -p -r1.123 param.h
--- sys/param.h	9 Sep 2016 18:12:37 -0000	1.123
+++ sys/param.h	19 Sep 2016 00:06:10 -0000
@@ -77,7 +77,6 @@
 #include <sys/resource.h>
 #include <sys/ucred.h>
 #include <sys/uio.h>
-#include <sys/srp.h>
 #endif
 
 /* Signals. */
Index: sys/refcnt.h
===================================================================
RCS file: /cvs/src/sys/sys/refcnt.h,v
retrieving revision 1.4
diff -u -p -r1.4 refcnt.h
--- sys/refcnt.h	7 Jun 2016 07:53:33 -0000	1.4
+++ sys/refcnt.h	19 Sep 2016 00:06:10 -0000
@@ -19,13 +19,11 @@
 #ifndef _SYS_REFCNT_H_
 #define _SYS_REFCNT_H_
 
-struct refcnt {
-	unsigned int refs;
-};
-
-#define REFCNT_INITIALIZER()	{ .refs = 1 }
+#include <sys/refcnt_t.h>
 
 #ifdef _KERNEL
+
+#define REFCNT_INITIALIZER()    { .refs = 1 }
 
 void	refcnt_init(struct refcnt *);
 void	refcnt_take(struct refcnt *);
Index: sys/refcnt_t.h
===================================================================
RCS file: sys/refcnt_t.h
diff -N sys/refcnt_t.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/refcnt_t.h	19 Sep 2016 00:06:10 -0000
@@ -0,0 +1,26 @@
+/*	$OpenBSD: refcnt.h,v 1.4 2016/06/07 07:53:33 mpi Exp $ */
+
+/*
+ * Copyright (c) 2015 David Gwynne <dlg@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _SYS_REFCNT_T_H_
+#define _SYS_REFCNT_T_H_
+
+struct refcnt {
+	unsigned int refs;
+};
+
+#endif /* _SYS_REFCNT_H_ */
Index: sys/srp.h
===================================================================
RCS file: /cvs/src/sys/sys/srp.h,v
retrieving revision 1.11
diff -u -p -r1.11 srp.h
--- sys/srp.h	7 Jun 2016 07:53:33 -0000	1.11
+++ sys/srp.h	19 Sep 2016 00:06:10 -0000
@@ -19,57 +19,22 @@
 #ifndef _SYS_SRP_H_
 #define _SYS_SRP_H_
 
-#include <sys/refcnt.h>
+#include <sys/srp_t.h>
 
-#ifdef MULTIPROCESSOR
-#define __upunused
-#else
-#define __upunused __attribute__((__unused__))
+#ifndef _KERNEL
+#error srp.h without _KERNEL
 #endif
 
-struct srp {
-	void			*ref;
-};
+#ifdef _KERNEL
+
+#include <sys/refcnt.h>
 
 #define SRP_INITIALIZER() { NULL }
 
-struct srp_hazard {
-	struct srp		*sh_p;
-	void			*sh_v;
-};
-
-struct srp_ref {
-	struct srp_hazard	*hz;
-} __upunused;
-
-#define SRP_HAZARD_NUM 16
-
-struct srp_gc {
-	void			(*srp_gc_dtor)(void *, void *);
-	void			*srp_gc_cookie;
-	struct refcnt		srp_gc_refcnt;
-};
-
 #define SRP_GC_INITIALIZER(_d, _c) { (_d), (_c), REFCNT_INITIALIZER() }
 
-/*
- * singly linked list built by following srps
- */
-
-struct srpl_rc {
-	void			(*srpl_ref)(void *, void *);
-	struct srp_gc		srpl_gc;
-};
-#define srpl_cookie		srpl_gc.srp_gc_cookie
-
 #define SRPL_RC_INITIALIZER(_r, _u, _c) { _r, SRP_GC_INITIALIZER(_u, _c) }
 
-struct srpl {
-	struct srp		sl_head;
-};
-
-#ifdef _KERNEL
-
 void		 srp_startup(void);
 void		 srp_gc_init(struct srp_gc *, void (*)(void *, void *), void *);
 void		*srp_swap_locked(struct srp *, void *);
@@ -100,13 +65,6 @@ void		srpl_rc_init(struct srpl_rc *, voi
 		    void (*)(void *, void *), void *);
 
 #define SRPL_INIT(_sl)			srp_init(&(_sl)->sl_head)
-
-#define SRPL_HEAD(name, type)		struct srpl
-
-#define SRPL_ENTRY(type)						\
-struct {								\
-	struct srp		se_next;				\
-}
 
 #define SRPL_ENTER(_sr, _sl)		srp_enter((_sr), &(_sl)->sl_head)
 
Index: sys/srp_t.h
===================================================================
RCS file: sys/srp_t.h
diff -N sys/srp_t.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/srp_t.h	19 Sep 2016 00:06:10 -0000
@@ -0,0 +1,72 @@
+/*	$OpenBSD: srp.h,v 1.11 2016/06/07 07:53:33 mpi Exp $ */
+
+/*
+ * Copyright (c) 2014 Jonathan Matthew <jmatthew@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _SYS_SRP_T_H_
+#define _SYS_SRP_T_H_
+
+#include <sys/refcnt_t.h>
+
+#ifdef MULTIPROCESSOR
+#define __upunused
+#else
+#define __upunused __attribute__((__unused__))
+#endif
+
+struct srp {
+	void			*ref;
+};
+
+struct srp_hazard {
+	struct srp		*sh_p;
+	void			*sh_v;
+};
+
+struct srp_ref {
+	struct srp_hazard	*hz;
+} __upunused;
+
+#define SRP_HAZARD_NUM 16
+
+struct srp_gc {
+	void			(*srp_gc_dtor)(void *, void *);
+	void			*srp_gc_cookie;
+	struct refcnt		srp_gc_refcnt;
+};
+
+/*
+ * singly linked list built by following srps
+ */
+
+struct srpl_rc {
+	void			(*srpl_ref)(void *, void *);
+	struct srp_gc		srpl_gc;
+};
+#define srpl_cookie		srpl_gc.srp_gc_cookie
+
+struct srpl {
+	struct srp		sl_head;
+};
+
+#define SRPL_HEAD(name, type)	struct srpl
+
+#define SRPL_ENTRY(type)						\
+struct {								\
+	struct srp		se_next;				\
+}
+
+#endif /* _SYS_SRP_T_H_ */
Index: sys/task.h
===================================================================
RCS file: /cvs/src/sys/sys/task.h,v
retrieving revision 1.11
diff -u -p -r1.11 task.h
--- sys/task.h	7 Jun 2016 07:53:33 -0000	1.11
+++ sys/task.h	19 Sep 2016 00:06:10 -0000
@@ -19,27 +19,17 @@
 #ifndef _SYS_TASK_H_
 #define _SYS_TASK_H_
 
-#include <sys/queue.h>
+#include <sys/task_t.h>
 
-struct taskq;
-
-struct task {
-	TAILQ_ENTRY(task) t_entry;
-	void		(*t_func)(void *);
-	void		*t_arg;
-	unsigned int	t_flags;
-};
-
-TAILQ_HEAD(task_list, task);
+#ifdef _KERNEL
 
 #define TASKQ_MPSAFE		(1 << 0)
 #define TASKQ_CANTSLEEP		(1 << 1)
 
-#define TASK_INITIALIZER(_f, _a)  {{ NULL, NULL }, (_f), (_a), 0 }
-
-#ifdef _KERNEL
 extern struct taskq *const systq;
 extern struct taskq *const systqmp;
+
+#define TASK_INITIALIZER(_f, _a)  {{ NULL, NULL }, (_f), (_a), 0 }
 
 struct taskq	*taskq_create(const char *, unsigned int, int, unsigned int);
 void		 taskq_destroy(struct taskq *);
Index: sys/task_t.h
===================================================================
RCS file: sys/task_t.h
diff -N sys/task_t.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/task_t.h	19 Sep 2016 00:06:10 -0000
@@ -0,0 +1,35 @@
+/*	$OpenBSD: task.h,v 1.11 2016/06/07 07:53:33 mpi Exp $ */
+
+/*
+ * Copyright (c) 2013 David Gwynne <dlg@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _SYS_TASK_T_H_
+#define _SYS_TASK_T_H_
+
+#include <sys/queue.h>
+
+struct taskq;
+
+struct task {
+	TAILQ_ENTRY(task) t_entry;
+	void		(*t_func)(void *);
+	void		*t_arg;
+	unsigned int	t_flags;
+};
+
+TAILQ_HEAD(task_list, task);
+
+#endif /* _SYS_TASK_T_H_ */
Index: sys/timeout.h
===================================================================
RCS file: /cvs/src/sys/sys/timeout.h,v
retrieving revision 1.25
diff -u -p -r1.25 timeout.h
--- sys/timeout.h	22 Dec 2014 04:43:38 -0000	1.25
+++ sys/timeout.h	19 Sep 2016 00:06:10 -0000
@@ -27,6 +27,8 @@
 #ifndef _SYS_TIMEOUT_H_
 #define _SYS_TIMEOUT_H_
 
+#include <sys/timeout_t.h>
+
 /*
  * Interface for handling time driven events in the kernel.
  *
@@ -51,18 +53,7 @@
  * These functions may be called in interrupt context (anything below splhigh).
  */
 
-struct circq {
-	struct circq *next;		/* next element */
-	struct circq *prev;		/* previous element */
-};
-
-struct timeout {
-	struct circq to_list;			/* timeout queue, don't move */
-	void (*to_func)(void *);		/* function to call */
-	void *to_arg;				/* function argument */
-	int to_time;				/* ticks on event */
-	int to_flags;				/* misc flags */
-};
+#ifdef _KERNEL
 
 /*
  * flags in the to_flags field.
@@ -71,7 +62,6 @@ struct timeout {
 #define TIMEOUT_INITIALIZED	4	/* timeout is initialized */
 #define TIMEOUT_TRIGGERED	8	/* timeout is running or ran */
 
-#ifdef _KERNEL
 /*
  * special macros
  *
Index: sys/timeout_t.h
===================================================================
RCS file: sys/timeout_t.h
diff -N sys/timeout_t.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/timeout_t.h	19 Sep 2016 00:06:10 -0000
@@ -0,0 +1,43 @@
+/*	$OpenBSD: timeout.h,v 1.25 2014/12/22 04:43:38 dlg Exp $	*/
+/*
+ * Copyright (c) 2000-2001 Artur Grabowski <art@openbsd.org>
+ * All rights reserved. 
+ *
+ * Redistribution and use in source and binary forms, with or without 
+ * modification, are permitted provided that the following conditions 
+ * are met: 
+ *
+ * 1. Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer. 
+ * 2. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#ifndef _SYS_TIMEOUT_T_H_
+#define _SYS_TIMEOUT_T_H_
+
+struct circq {
+	struct circq *next;		/* next element */
+	struct circq *prev;		/* previous element */
+};
+
+struct timeout {
+	struct circq to_list;		/* timeout queue, don't move */
+	void (*to_func)(void *);	/* function to call */
+	void *to_arg;			/* function argument */
+	int to_time;			/* ticks on event */
+	int to_flags;			/* misc flags */
+};
+
+#endif	/* _SYS_TIMEOUT_T_H_ */
Index: arch/alpha/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/alpha/include/cpu.h,v
retrieving revision 1.57
diff -u -p -r1.57 cpu.h
--- arch/alpha/include/cpu.h	30 Mar 2016 15:39:46 -0000	1.57
+++ arch/alpha/include/cpu.h	19 Sep 2016 00:06:10 -0000
@@ -102,6 +102,8 @@ typedef union alpha_t_float {
 #include <sys/device.h>
 #include <sys/sched.h>
 
+#include <sys/srp_t.h>
+
 struct pcb;
 struct proc;
 struct reg;
Index: arch/amd64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/include/cpu.h,v
retrieving revision 1.103
diff -u -p -r1.103 cpu.h
--- arch/amd64/include/cpu.h	4 Sep 2016 09:22:28 -0000	1.103
+++ arch/amd64/include/cpu.h	19 Sep 2016 00:06:10 -0000
@@ -46,6 +46,8 @@
 #include <machine/segments.h>
 #include <machine/cacheinfo.h>
 #include <machine/intrdefs.h>
+
+#include <sys/srp_t.h>
 #endif /* _KERNEL */
 
 #include <sys/device.h>
Index: arch/hppa/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/hppa/include/cpu.h,v
retrieving revision 1.89
diff -u -p -r1.89 cpu.h
--- arch/hppa/include/cpu.h	10 May 2016 14:52:03 -0000	1.89
+++ arch/hppa/include/cpu.h	19 Sep 2016 00:06:10 -0000
@@ -70,6 +70,8 @@
 #include <sys/queue.h>
 #include <sys/sched.h>
 
+#include <sys/srp_t.h>
+
 #include <machine/mutex.h>
 
 /*
Index: arch/i386/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/i386/include/cpu.h,v
retrieving revision 1.148
diff -u -p -r1.148 cpu.h
--- arch/i386/include/cpu.h	28 Jul 2016 21:57:57 -0000	1.148
+++ arch/i386/include/cpu.h	19 Sep 2016 00:06:10 -0000
@@ -42,6 +42,8 @@
  * Definitions unique to i386 cpu support.
  */
 #ifdef _KERNEL
+#include <sys/srp_t.h>
+
 #include <machine/frame.h>
 #include <machine/psl.h>
 #include <machine/segments.h>
Index: arch/m88k/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/m88k/include/cpu.h,v
retrieving revision 1.64
diff -u -p -r1.64 cpu.h
--- arch/m88k/include/cpu.h	2 Jul 2015 01:33:59 -0000	1.64
+++ arch/m88k/include/cpu.h	19 Sep 2016 00:06:10 -0000
@@ -63,6 +63,8 @@
 #include <sys/queue.h>
 #include <sys/sched.h>
 
+#include <sys/srp_t.h>
+
 #if defined(MULTIPROCESSOR)
 #if !defined(MAX_CPUS) || MAX_CPUS > 4
 #undef	MAX_CPUS
Index: arch/mips64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/mips64/include/cpu.h,v
retrieving revision 1.111
diff -u -p -r1.111 cpu.h
--- arch/mips64/include/cpu.h	14 Aug 2016 08:23:52 -0000	1.111
+++ arch/mips64/include/cpu.h	19 Sep 2016 00:06:10 -0000
@@ -123,6 +123,7 @@
 #include <sys/device.h>
 #include <machine/intr.h>
 #include <sys/sched.h>
+#include <sys/srp_t.h>
 
 struct cpu_hwinfo {
 	uint32_t	c0prid;
Index: arch/powerpc/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/powerpc/include/cpu.h,v
retrieving revision 1.63
diff -u -p -r1.63 cpu.h
--- arch/powerpc/include/cpu.h	7 May 2016 22:46:54 -0000	1.63
+++ arch/powerpc/include/cpu.h	19 Sep 2016 00:06:10 -0000
@@ -38,6 +38,7 @@
 
 #include <sys/device.h>
 #include <sys/sched.h>
+#include <sys/srp_t.h>
 
 struct cpu_info {
 	struct device *ci_dev;		/* our device */
Index: arch/sparc64/conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/conf/GENERIC,v
retrieving revision 1.305
diff -u -p -r1.305 GENERIC
--- arch/sparc64/conf/GENERIC	28 Jun 2016 04:41:37 -0000	1.305
+++ arch/sparc64/conf/GENERIC	19 Sep 2016 00:06:10 -0000
@@ -28,6 +28,8 @@ option		WSDISPLAY_COMPAT_RAWKBD	# provid
 
 config		bsd	swap generic
 
+makeoption DEBUG="-g"
+
 # Main bus and CPU .. all systems.
 mainbus0 at root
 cpu0	at mainbus0
Index: arch/sparc64/include/cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/include/cpu.h,v
retrieving revision 1.89
diff -u -p -r1.89 cpu.h
--- arch/sparc64/include/cpu.h	17 Aug 2016 11:09:01 -0000	1.89
+++ arch/sparc64/include/cpu.h	19 Sep 2016 00:06:10 -0000
@@ -78,6 +78,7 @@
 #include <machine/intr.h>
 
 #include <sys/sched.h>
+#include <sys/srp_t.h>
 
 /*
  * The cpu_info structure is part of a 64KB structure mapped both the kernel
Index: crypto/crypto.c
===================================================================
RCS file: /cvs/src/sys/crypto/crypto.c,v
retrieving revision 1.77
diff -u -p -r1.77 crypto.c
--- crypto/crypto.c	15 Sep 2016 02:00:17 -0000	1.77
+++ crypto/crypto.c	19 Sep 2016 00:06:10 -0000
@@ -24,6 +24,7 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
+#include <sys/task.h>
 
 #include <crypto/cryptodev.h>
 
Index: crypto/cryptodev.h
===================================================================
RCS file: /cvs/src/sys/crypto/cryptodev.h,v
retrieving revision 1.68
diff -u -p -r1.68 cryptodev.h
--- crypto/cryptodev.h	18 Apr 2016 21:05:55 -0000	1.68
+++ crypto/cryptodev.h	19 Sep 2016 00:06:10 -0000
@@ -53,7 +53,7 @@
 #define _CRYPTO_CRYPTO_H_
 
 #include <sys/ioccom.h>
-#include <sys/task.h>
+#include <sys/task_t.h>
 
 /* Some initial values */
 #define CRYPTO_DRIVERS_INITIAL	4
Index: kern/init_main.c
===================================================================
RCS file: /cvs/src/sys/kern/init_main.c,v
retrieving revision 1.257
diff -u -p -r1.257 init_main.c
--- kern/init_main.c	4 Sep 2016 09:22:29 -0000	1.257
+++ kern/init_main.c	19 Sep 2016 00:06:10 -0000
@@ -144,6 +144,7 @@ void	init_exec(void);
 void	kqueue_init(void);
 void	taskq_init(void);
 void	pool_gc_pages(void *);
+void	srp_startup(void);
 
 extern char sigcode[], esigcode[], sigcoderet[];
 #ifdef SYSCALL_DEBUG
Index: kern/kern_srp.c
===================================================================
RCS file: /cvs/src/sys/kern/kern_srp.c,v
retrieving revision 1.11
diff -u -p -r1.11 kern_srp.c
--- kern/kern_srp.c	15 Sep 2016 02:00:16 -0000	1.11
+++ kern/kern_srp.c	19 Sep 2016 00:06:10 -0000
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
+#include <sys/refcnt.h>
 #include <sys/srp.h>
 #include <sys/atomic.h>
 
Index: net/art.c
===================================================================
RCS file: /cvs/src/sys/net/art.c,v
retrieving revision 1.24
diff -u -p -r1.24 art.c
--- net/art.c	15 Sep 2016 02:00:18 -0000	1.24
+++ net/art.c	19 Sep 2016 00:06:10 -0000
@@ -33,6 +33,7 @@
 #include <sys/pool.h>
 #include <sys/task.h>
 #include <sys/socket.h>
+#include <sys/srp.h>
 #endif
 
 #include <net/art.h>
Index: net/art.h
===================================================================
RCS file: /cvs/src/sys/net/art.h,v
retrieving revision 1.15
diff -u -p -r1.15 art.h
--- net/art.h	30 Aug 2016 07:42:57 -0000	1.15
+++ net/art.h	19 Sep 2016 00:06:10 -0000
@@ -20,6 +20,7 @@
 #define _NET_ART_H_
 
 #include <sys/rwlock.h>
+#include <sys/srp_t.h>
 
 #define ART_MAXLVL	32	/* We currently use 32 levels for IPv6. */
 
Index: net/if.c
===================================================================
RCS file: /cvs/src/sys/net/if.c,v
retrieving revision 1.448
diff -u -p -r1.448 if.c
--- net/if.c	13 Sep 2016 08:15:01 -0000	1.448
+++ net/if.c	19 Sep 2016 00:06:10 -0000
@@ -84,6 +84,7 @@
 #include <sys/domain.h>
 #include <sys/sysctl.h>
 #include <sys/task.h>
+#include <sys/srp.h>
 #include <sys/atomic.h>
 #include <sys/proc.h>
 
Index: net/if_bridge.c
===================================================================
RCS file: /cvs/src/sys/net/if_bridge.c,v
retrieving revision 1.284
diff -u -p -r1.284 if_bridge.c
--- net/if_bridge.c	3 Sep 2016 13:46:57 -0000	1.284
+++ net/if_bridge.c	19 Sep 2016 00:06:10 -0000
@@ -44,6 +44,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
+#include <sys/srp.h>
 
 #include <net/if.h>
 #include <net/if_types.h>
Index: net/if_ethersubr.c
===================================================================
RCS file: /cvs/src/sys/net/if_ethersubr.c,v
retrieving revision 1.239
diff -u -p -r1.239 if_ethersubr.c
--- net/if_ethersubr.c	12 Jul 2016 09:33:13 -0000	1.239
+++ net/if_ethersubr.c	19 Sep 2016 00:06:10 -0000
@@ -86,6 +86,7 @@ didn't get a copy, you may request one f
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/timeout.h>
+#include <sys/srp.h>
 
 #include <net/if.h>
 #include <net/netisr.h>
Index: net/if_var.h
===================================================================
RCS file: /cvs/src/sys/net/if_var.h,v
retrieving revision 1.75
diff -u -p -r1.75 if_var.h
--- net/if_var.h	4 Sep 2016 15:46:39 -0000	1.75
+++ net/if_var.h	19 Sep 2016 00:06:10 -0000
@@ -38,10 +38,11 @@
 
 #ifdef _KERNEL
 
+#include <sys/srp_t.h>
+#include <sys/refcnt_t.h>
+
 #include <sys/queue.h>
 #include <sys/mbuf.h>
-#include <sys/srp.h>
-#include <sys/refcnt.h>
 #include <sys/task.h>
 #include <sys/time.h>
 
Index: net/if_vlan.c
===================================================================
RCS file: /cvs/src/sys/net/if_vlan.c,v
retrieving revision 1.166
diff -u -p -r1.166 if_vlan.c
--- net/if_vlan.c	3 Sep 2016 13:46:57 -0000	1.166
+++ net/if_vlan.c	19 Sep 2016 00:06:10 -0000
@@ -57,6 +57,7 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
+#include <sys/srp.h>
 #include <sys/rwlock.h>
 
 #include <net/if.h>
Index: netinet/ip_carp.c
===================================================================
RCS file: /cvs/src/sys/netinet/ip_carp.c,v
retrieving revision 1.293
diff -u -p -r1.293 ip_carp.c
--- netinet/ip_carp.c	25 Jul 2016 16:44:04 -0000	1.293
+++ netinet/ip_carp.c	19 Sep 2016 00:06:10 -0000
@@ -49,6 +49,7 @@
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/refcnt.h>
+#include <sys/srp.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
Index: netinet/ip_mroute.h
===================================================================
RCS file: /cvs/src/sys/netinet/ip_mroute.h,v
retrieving revision 1.19
diff -u -p -r1.19 ip_mroute.h
--- netinet/ip_mroute.h	9 Feb 2015 12:18:19 -0000	1.19
+++ netinet/ip_mroute.h	19 Sep 2016 00:06:10 -0000
@@ -19,9 +19,6 @@
  * bandwidth metering and signaling.
  */
 
-#include <sys/queue.h>
-#include <sys/timeout.h>
-
 /*
  * Multicast Routing set/getsockopt commands.
  */
@@ -236,6 +233,9 @@ struct mrtstat {
 
 
 #ifdef _KERNEL
+
+#include <sys/queue.h>
+#include <sys/timeout.h>
 
 /*
  * The kernel's virtual-interface structure.
Index: netinet/tcp_var.h
===================================================================
RCS file: /cvs/src/sys/netinet/tcp_var.h,v
retrieving revision 1.115
diff -u -p -r1.115 tcp_var.h
--- netinet/tcp_var.h	20 Jul 2016 19:57:53 -0000	1.115
+++ netinet/tcp_var.h	19 Sep 2016 00:06:10 -0000
@@ -35,7 +35,8 @@
 #ifndef _NETINET_TCP_VAR_H_
 #define _NETINET_TCP_VAR_H_
 
-#include <sys/timeout.h>
+#include <sys/queue.h>
+#include <sys/timeout_t.h>
 
 /*
  * Kernel variables for tcp.