From 78d996a8c75ee87fccfc358dbfbfb9fd4667e470 Mon Sep 17 00:00:00 2001
From: riastradh <riastradh@NetBSD.org>
Date: Sat, 13 Jun 2020 18:38:33 +0000
Subject: [PATCH] Tidy up includes.

---
 sys/dev/cgd.c        | 27 ++++++++++++++-------------
 sys/dev/cgd_crypto.c | 10 +++++-----
 sys/dev/cgdvar.h     |  3 ++-
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index 00f418dff483..8c4a6f134423 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.128 2020/06/13 18:36:07 riastradh Exp $ */
+/* $NetBSD: cgd.c,v 1.129 2020/06/13 18:38:33 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,32 +30,33 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.128 2020/06/13 18:36:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.129 2020/06/13 18:38:33 riastradh Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/errno.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
-#include <sys/kmem.h>
-#include <sys/module.h>
-#include <sys/pool.h>
-#include <sys/ioctl.h>
+#include <sys/conf.h>
+#include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
+#include <sys/errno.h>
 #include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/kmem.h>
+#include <sys/module.h>
 #include <sys/namei.h> /* for pathbuf */
-#include <sys/vnode.h>
-#include <sys/conf.h>
+#include <sys/pool.h>
+#include <sys/proc.h>
 #include <sys/syslog.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
 #include <sys/workqueue.h>
-#include <sys/cpu.h>
 
-#include <dev/dkvar.h>
+#include <dev/cgd_crypto.h>
 #include <dev/cgdvar.h>
+#include <dev/dkvar.h>
 
 #include <miscfs/specfs/specdev.h> /* for v_rdev */
 
diff --git a/sys/dev/cgd_crypto.c b/sys/dev/cgd_crypto.c
index f5829488f08a..03473a46e04f 100644
--- a/sys/dev/cgd_crypto.c
+++ b/sys/dev/cgd_crypto.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd_crypto.c,v 1.18 2020/06/13 18:35:35 riastradh Exp $ */
+/* $NetBSD: cgd_crypto.c,v 1.19 2020/06/13 18:38:33 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,17 +37,17 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.18 2020/06/13 18:35:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.19 2020/06/13 18:38:33 riastradh Exp $");
 
 #include <sys/param.h>
-#include <sys/systm.h>
 #include <sys/malloc.h>
+#include <sys/systm.h>
 
 #include <dev/cgd_crypto.h>
 
-#include <crypto/rijndael/rijndael-api-fst.h>
-#include <crypto/des/des.h>
 #include <crypto/blowfish/blowfish.h>
+#include <crypto/des/des.h>
+#include <crypto/rijndael/rijndael-api-fst.h>
 
 /*
  * The general framework provides only one generic function.
diff --git a/sys/dev/cgdvar.h b/sys/dev/cgdvar.h
index 8c876e85298e..787e402035b2 100644
--- a/sys/dev/cgdvar.h
+++ b/sys/dev/cgdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdvar.h,v 1.19 2020/03/09 08:33:15 mlelstv Exp $ */
+/* $NetBSD: cgdvar.h,v 1.20 2020/06/13 18:38:33 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -66,6 +66,7 @@ struct cgd_user {
 #ifdef _KERNEL
 
 #include <dev/cgd_crypto.h>
+#include <dev/dkvar.h>
 
 /* This cryptdata structure is here rather than cgd_crypto.h, since
  * it stores local state which will not be generalised beyond the