diff --git a/sys/sys/_task.h b/sys/sys/_task.h
index 0e6f212990ec..86c68da8bab0 100644
--- a/sys/sys/_task.h
+++ b/sys/sys/_task.h
@@ -29,6 +29,7 @@
 #ifndef _SYS__TASK_H_
 #define _SYS__TASK_H_
 
+#include <sys/_callout.h>
 #include <sys/queue.h>
 
 /*
@@ -58,6 +59,15 @@ struct task {
 
 #define	TASK_IS_NET(ta)		((ta)->ta_flags & TASK_NETWORK)
 
+struct taskqueue;
+
+struct timeout_task {
+	struct taskqueue *q;
+	struct task t;
+	struct callout c;
+	int    f;
+};
+
 #ifdef _KERNEL
 
 typedef void gtask_fn_t(void *context);
diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h
index 34d64a5042a6..9757e1fce575 100644
--- a/sys/sys/taskqueue.h
+++ b/sys/sys/taskqueue.h
@@ -35,7 +35,6 @@
 
 #include <sys/queue.h>
 #include <sys/_task.h>
-#include <sys/_callout.h>
 #include <sys/_cpuset.h>
 
 struct taskqueue;
@@ -43,13 +42,6 @@ struct taskqgroup;
 struct proc;
 struct thread;
 
-struct timeout_task {
-	struct taskqueue *q;
-	struct task t;
-	struct callout c;
-	int    f;
-};
-
 enum taskqueue_callback_type {
 	TASKQUEUE_CALLBACK_TYPE_INIT,
 	TASKQUEUE_CALLBACK_TYPE_SHUTDOWN,