diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 46a1b760099d..7e2484cbf0ab 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -129,23 +129,24 @@ struct knote;
  * gives.
  *
  * Users of struct thread/struct proc that aren't device drivers should
- * not use d_thread_t.  It is used here only as a shorthand to prevent
- * lines from wrapping.
+ * not use d_thread_t.
  */
 
 typedef struct thread d_thread_t;
 
-typedef int d_open_t __P((dev_t dev, int oflags, int devtype, d_thread_t *td));
-typedef int d_close_t __P((dev_t dev, int fflag, int devtype, d_thread_t *td));
+typedef int d_open_t __P((dev_t dev, int oflags, int devtype,
+			  struct thread *td));
+typedef int d_close_t __P((dev_t dev, int fflag, int devtype,
+			   struct thread *td));
 typedef void d_strategy_t __P((struct bio *bp));
 typedef int d_ioctl_t __P((dev_t dev, u_long cmd, caddr_t data,
-			   int fflag, d_thread_t *td));
+			   int fflag, struct thread *td));
 typedef int d_dump_t __P((dev_t dev));
 typedef int d_psize_t __P((dev_t dev));
 
 typedef int d_read_t __P((dev_t dev, struct uio *uio, int ioflag));
 typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag));
-typedef int d_poll_t __P((dev_t dev, int events, d_thread_t *td));
+typedef int d_poll_t __P((dev_t dev, int events, struct thread *td));
 typedef int d_kqfilter_t __P((dev_t dev, struct knote *kn));
 typedef int d_mmap_t __P((dev_t dev, vm_offset_t offset, int nprot));
 
@@ -154,7 +155,7 @@ typedef int l_close_t __P((struct tty *tp, int flag));
 typedef int l_read_t __P((struct tty *tp, struct uio *uio, int flag));
 typedef int l_write_t __P((struct tty *tp, struct uio *uio, int flag));
 typedef int l_ioctl_t __P((struct tty *tp, u_long cmd, caddr_t data,
-			   int flag, d_thread_t *td));
+			   int flag, struct thread*td));
 typedef int l_rint_t __P((int c, struct tty *tp));
 typedef int l_start_t __P((struct tty *tp));
 typedef int l_modem_t __P((struct tty *tp, int flag));
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index 46a1b760099d..7e2484cbf0ab 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -129,23 +129,24 @@ struct knote;
  * gives.
  *
  * Users of struct thread/struct proc that aren't device drivers should
- * not use d_thread_t.  It is used here only as a shorthand to prevent
- * lines from wrapping.
+ * not use d_thread_t.
  */
 
 typedef struct thread d_thread_t;
 
-typedef int d_open_t __P((dev_t dev, int oflags, int devtype, d_thread_t *td));
-typedef int d_close_t __P((dev_t dev, int fflag, int devtype, d_thread_t *td));
+typedef int d_open_t __P((dev_t dev, int oflags, int devtype,
+			  struct thread *td));
+typedef int d_close_t __P((dev_t dev, int fflag, int devtype,
+			   struct thread *td));
 typedef void d_strategy_t __P((struct bio *bp));
 typedef int d_ioctl_t __P((dev_t dev, u_long cmd, caddr_t data,
-			   int fflag, d_thread_t *td));
+			   int fflag, struct thread *td));
 typedef int d_dump_t __P((dev_t dev));
 typedef int d_psize_t __P((dev_t dev));
 
 typedef int d_read_t __P((dev_t dev, struct uio *uio, int ioflag));
 typedef int d_write_t __P((dev_t dev, struct uio *uio, int ioflag));
-typedef int d_poll_t __P((dev_t dev, int events, d_thread_t *td));
+typedef int d_poll_t __P((dev_t dev, int events, struct thread *td));
 typedef int d_kqfilter_t __P((dev_t dev, struct knote *kn));
 typedef int d_mmap_t __P((dev_t dev, vm_offset_t offset, int nprot));
 
@@ -154,7 +155,7 @@ typedef int l_close_t __P((struct tty *tp, int flag));
 typedef int l_read_t __P((struct tty *tp, struct uio *uio, int flag));
 typedef int l_write_t __P((struct tty *tp, struct uio *uio, int flag));
 typedef int l_ioctl_t __P((struct tty *tp, u_long cmd, caddr_t data,
-			   int flag, d_thread_t *td));
+			   int flag, struct thread*td));
 typedef int l_rint_t __P((int c, struct tty *tp));
 typedef int l_start_t __P((struct tty *tp));
 typedef int l_modem_t __P((struct tty *tp, int flag));