diff --git a/sys/arch/arm/rockchip/rk_drm.c b/sys/arch/arm/rockchip/rk_drm.c
index 5b3e50b5fa89..c457bbbae6c0 100644
--- a/sys/arch/arm/rockchip/rk_drm.c
+++ b/sys/arch/arm/rockchip/rk_drm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_drm.c,v 1.8 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: rk_drm.c,v 1.9 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,32 +27,32 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.8 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.9 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 
+#include <uvm/uvm_device.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_object.h>
-#include <uvm/uvm_device.h>
+
+#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
+
+#include <arm/rockchip/rk_drm.h>
 
 #include <drm/drm_auth.h>
-#include <drm/drm_drv.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fb_helper.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_vblank.h>
 
-#include <dev/fdt/fdtvar.h>
-#include <dev/fdt/fdt_port.h>
-
-#include <arm/rockchip/rk_drm.h>
-
 #define	RK_DRM_MAX_WIDTH	3840
 #define	RK_DRM_MAX_HEIGHT	2160
 
diff --git a/sys/arch/arm/rockchip/rk_dwhdmi.c b/sys/arch/arm/rockchip/rk_dwhdmi.c
index 7743c817e12e..248794600643 100644
--- a/sys/arch/arm/rockchip/rk_dwhdmi.c
+++ b/sys/arch/arm/rockchip/rk_dwhdmi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_dwhdmi.c,v 1.6 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: rk_dwhdmi.c,v 1.7 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,25 +27,25 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_dwhdmi.c,v 1.6 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_dwhdmi.c,v 1.7 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 
-#include <drm/drm_drv.h>
-#include <drm/drm_crtc_helper.h>
-
-#include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
 #include <dev/fdt/syscon.h>
 
 #include <dev/ic/dw_hdmi.h>
 
+#include <drm/drm_drv.h>
+#include <drm/drm_crtc_helper.h>
+
 #define	RK3399_GRF_SOC_CON20		0x6250
 #define	 HDMI_LCDC_SEL			__BIT(6)
 
diff --git a/sys/arch/arm/rockchip/rk_fb.c b/sys/arch/arm/rockchip/rk_fb.c
index 1b6f988f3834..94efa07c4618 100644
--- a/sys/arch/arm/rockchip/rk_fb.c
+++ b/sys/arch/arm/rockchip/rk_fb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_fb.c,v 1.3 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: rk_fb.c,v 1.4 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2015-2019 Jared McNeill <jmcneill@invisible.ca>
@@ -29,7 +29,7 @@
 #include "opt_wsdisplay_compat.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_fb.c,v 1.3 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_fb.c,v 1.4 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -37,11 +37,11 @@ __KERNEL_RCSID(0, "$NetBSD: rk_fb.c,v 1.3 2021/12/19 11:00:46 riastradh Exp $");
 
 #include <dev/fdt/fdtvar.h>
 
+#include <arm/rockchip/rk_drm.h>
+
 #include <drm/drm_drv.h>
 #include <drm/drmfb.h>
 
-#include <arm/rockchip/rk_drm.h>
-
 static int	rk_fb_match(device_t, cfdata_t, void *);
 static void	rk_fb_attach(device_t, device_t, void *);
 
diff --git a/sys/arch/arm/rockchip/rk_vop.c b/sys/arch/arm/rockchip/rk_vop.c
index 1be37c18906c..ca447893ba3e 100644
--- a/sys/arch/arm/rockchip/rk_vop.c
+++ b/sys/arch/arm/rockchip/rk_vop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_vop.c,v 1.11 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: rk_vop.c,v 1.12 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,28 +27,28 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.11 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.12 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/sysctl.h>
+#include <sys/systm.h>
 
-#include <drm/drm_drv.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_crtc_helper.h>
-#include <drm/drm_fourcc.h>
-#include <drm/drm_plane_helper.h>
-
-#include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
 
 #include <arm/rockchip/rk_drm.h>
 
+#include <drm/drm_crtc.h>
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_plane_helper.h>
+
 #define	VOP_REG_CFG_DONE		0x0000
 #define	 REG_LOAD_EN			__BIT(0)
 #define	VOP_SYS_CTRL			0x0008
diff --git a/sys/arch/arm/sunxi/sunxi_drm.c b/sys/arch/arm/sunxi/sunxi_drm.c
index d789fd580645..78784f73ed56 100644
--- a/sys/arch/arm/sunxi/sunxi_drm.c
+++ b/sys/arch/arm/sunxi/sunxi_drm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_drm.c,v 1.16 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_drm.c,v 1.17 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,19 +27,24 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.16 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.17 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 
+#include <uvm/uvm_device.h>
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_object.h>
-#include <uvm/uvm_device.h>
+
+#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
+
+#include <arm/sunxi/sunxi_drm.h>
 
 #include <drm/drm_auth.h>
 #include <drm/drm_crtc_helper.h>
@@ -48,11 +53,6 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.16 2021/12/19 11:00:46 riastradh Exp
 #include <drm/drm_fourcc.h>
 #include <drm/drm_vblank.h>
 
-#include <dev/fdt/fdtvar.h>
-#include <dev/fdt/fdt_port.h>
-
-#include <arm/sunxi/sunxi_drm.h>
-
 #define	SUNXI_DRM_MAX_WIDTH	3840
 #define	SUNXI_DRM_MAX_HEIGHT	2160
 
diff --git a/sys/arch/arm/sunxi/sunxi_dwhdmi.c b/sys/arch/arm/sunxi/sunxi_dwhdmi.c
index d70e444008a6..27625bdeded5 100644
--- a/sys/arch/arm/sunxi/sunxi_dwhdmi.c
+++ b/sys/arch/arm/sunxi/sunxi_dwhdmi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_dwhdmi.c,v 1.10 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_dwhdmi.c,v 1.11 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,25 +27,25 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_dwhdmi.c,v 1.10 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_dwhdmi.c,v 1.11 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 
-#include <drm/drm_drv.h>
-
-#include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
 
 #include <dev/ic/dw_hdmi.h>
 
 #include <arm/sunxi/sunxi_hdmiphy.h>
 
+#include <drm/drm_drv.h>
+
 enum {
 	DWHDMI_PORT_INPUT = 0,
 	DWHDMI_PORT_OUTPUT = 1,
diff --git a/sys/arch/arm/sunxi/sunxi_fb.c b/sys/arch/arm/sunxi/sunxi_fb.c
index 020289fc93b0..284d4df16f8d 100644
--- a/sys/arch/arm/sunxi/sunxi_fb.c
+++ b/sys/arch/arm/sunxi/sunxi_fb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_fb.c,v 1.4 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_fb.c,v 1.5 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2015-2019 Jared McNeill <jmcneill@invisible.ca>
@@ -29,7 +29,7 @@
 #include "opt_wsdisplay_compat.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_fb.c,v 1.4 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_fb.c,v 1.5 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -37,11 +37,11 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_fb.c,v 1.4 2021/12/19 11:00:46 riastradh Exp $
 
 #include <dev/fdt/fdtvar.h>
 
+#include <arm/sunxi/sunxi_drm.h>
+
 #include <drm/drm_drv.h>
 #include <drm/drmfb.h>
 
-#include <arm/sunxi/sunxi_drm.h>
-
 static int	sunxi_fb_match(device_t, cfdata_t, void *);
 static void	sunxi_fb_attach(device_t, device_t, void *);
 
diff --git a/sys/arch/arm/sunxi/sunxi_lcdc.c b/sys/arch/arm/sunxi/sunxi_lcdc.c
index 74fc09dc2777..6bccbfc4bd43 100644
--- a/sys/arch/arm/sunxi/sunxi_lcdc.c
+++ b/sys/arch/arm/sunxi/sunxi_lcdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_lcdc.c,v 1.13 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_lcdc.c,v 1.14 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,25 +27,25 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.13 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.14 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 
-#include <drm/drm_drv.h>
-#include <drm/drm_crtc_helper.h>
-#include <drm/drm_vblank.h>
-
-#include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
 
 #include <arm/sunxi/sunxi_drm.h>
 
+#include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_vblank.h>
+
 #define	TCON_GCTL_REG		0x000
 #define	 TCON_GCTL_TCON_EN			__BIT(31)
 #define	 TCON_GCTL_GAMMA_EN			__BIT(30)
diff --git a/sys/arch/arm/sunxi/sunxi_mixer.c b/sys/arch/arm/sunxi/sunxi_mixer.c
index 09da24251c7b..a8d24c7f2400 100644
--- a/sys/arch/arm/sunxi/sunxi_mixer.c
+++ b/sys/arch/arm/sunxi/sunxi_mixer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mixer.c,v 1.17 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: sunxi_mixer.c,v 1.18 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,29 +27,29 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.c,v 1.17 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mixer.c,v 1.18 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
 #include <sys/sysctl.h>
+#include <sys/systm.h>
+
+#include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
+
+#include <arm/sunxi/sunxi_drm.h>
 
-#include <drm/drm_drv.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_fourcc.h>
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_vblank.h>
 
-#include <dev/fdt/fdtvar.h>
-#include <dev/fdt/fdt_port.h>
-
-#include <arm/sunxi/sunxi_drm.h>
-
 #define	MIXER_CURSOR_MAXWIDTH	256
 #define	MIXER_CURSOR_MAXHEIGHT	256
 
diff --git a/sys/dev/fdt/fdt_panel.c b/sys/dev/fdt/fdt_panel.c
index e056c6d52a6c..24e7d289173a 100644
--- a/sys/dev/fdt/fdt_panel.c
+++ b/sys/dev/fdt/fdt_panel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_panel.c,v 1.5 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: fdt_panel.c,v 1.6 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jonathan A. Kollasch <jakllsch@kollasch.net>
@@ -27,22 +27,22 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_panel.c,v 1.5 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_panel.c,v 1.6 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
-#include <sys/systm.h>
 #include <sys/gpio.h>
+#include <sys/systm.h>
 
-#include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
 
 #include <dev/i2c/ddcvar.h>
 
 #include <drm/drm_drv.h>
-#include <drm/drm_panel.h>
 #include <drm/drm_edid.h>
+#include <drm/drm_panel.h>
 
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "simple-panel" },
diff --git a/sys/dev/fdt/hdmi_connector.c b/sys/dev/fdt/hdmi_connector.c
index b55fbf1c5458..8f50983193e5 100644
--- a/sys/dev/fdt/hdmi_connector.c
+++ b/sys/dev/fdt/hdmi_connector.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hdmi_connector.c,v 1.3 2021/12/19 11:00:46 riastradh Exp $ */
+/* $NetBSD: hdmi_connector.c,v 1.4 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill@invisible.ca>
@@ -27,22 +27,22 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdmi_connector.c,v 1.3 2021/12/19 11:00:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdmi_connector.c,v 1.4 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
-#include <sys/systm.h>
 #include <sys/gpio.h>
+#include <sys/systm.h>
 
-#include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
 
 #include <dev/i2c/ddcvar.h>
 
-#include <drm/drm_drv.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_probe_helper.h>
 
diff --git a/sys/dev/i2c/anxedp.c b/sys/dev/i2c/anxedp.c
index 2c1049ef8139..640d4ba0a99c 100644
--- a/sys/dev/i2c/anxedp.c
+++ b/sys/dev/i2c/anxedp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: anxedp.c,v 1.7 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: anxedp.c,v 1.8 2021/12/19 11:01:10 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,31 +27,30 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.7 2021/12/19 11:00:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: anxedp.c,v 1.8 2021/12/19 11:01:10 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 
 #include <dev/ic/dw_hdmi.h>
 
-#include <dev/i2c/i2cvar.h>
-#include <dev/i2c/ddcvar.h>
 #include <dev/i2c/ddcreg.h>
-#include <dev/videomode/videomode.h>
+#include <dev/i2c/ddcvar.h>
+#include <dev/i2c/i2cvar.h>
 #include <dev/videomode/edidvar.h>
 
-#include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_port.h>
+#include <dev/fdt/fdtvar.h>
 
-#include <drm/drm_drv.h>
 #include <drm/drm_connector.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_probe_helper.h>
 
diff --git a/sys/dev/ic/anx_dp.c b/sys/dev/ic/anx_dp.c
index e8564257b7ae..4e9e17dc25db 100644
--- a/sys/dev/ic/anx_dp.c
+++ b/sys/dev/ic/anx_dp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: anx_dp.c,v 1.3 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: anx_dp.c,v 1.4 2021/12/19 11:01:11 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jonathan A. Kollasch <jakllsch@kollasch.net>
@@ -27,15 +27,15 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: anx_dp.c,v 1.3 2021/12/19 11:00:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: anx_dp.c,v 1.4 2021/12/19 11:01:11 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 
 #include <dev/ic/anx_dp.h>
 
@@ -43,10 +43,10 @@ __KERNEL_RCSID(0, "$NetBSD: anx_dp.c,v 1.3 2021/12/19 11:00:47 riastradh Exp $")
 #include <dev/audio/audio_dai.h>
 #endif
 
-#include <drm/drm_drv.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_dp_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_edid.h>
 
 #define	ANXDP_DP_TX_VERSION	0x010
diff --git a/sys/dev/ic/anx_dp.h b/sys/dev/ic/anx_dp.h
index 49f97c46e607..5fc596d4f7ad 100644
--- a/sys/dev/ic/anx_dp.h
+++ b/sys/dev/ic/anx_dp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: anx_dp.h,v 1.3 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: anx_dp.h,v 1.4 2021/12/19 11:01:11 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jonathan A. Kollasch <jakllsch@kollasch.net>
@@ -33,10 +33,10 @@
 #include <dev/audio/audio_dai.h>
 #endif
 
-#include <drm/drm_drv.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_connector.h>
 #include <drm/drm_dp_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_panel.h>
 #include <drm/drm_probe_helper.h>
 
diff --git a/sys/dev/ic/dw_hdmi.c b/sys/dev/ic/dw_hdmi.c
index 3b052decf1a3..db3e83f20d5f 100644
--- a/sys/dev/ic/dw_hdmi.c
+++ b/sys/dev/ic/dw_hdmi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dw_hdmi.c,v 1.8 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: dw_hdmi.c,v 1.9 2021/12/19 11:01:11 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -27,29 +27,29 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dw_hdmi.c,v 1.8 2021/12/19 11:00:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dw_hdmi.c,v 1.9 2021/12/19 11:01:11 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/intr.h>
-#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/conf.h>
+#include <sys/systm.h>
 
 #include <dev/ic/dw_hdmi.h>
 
-#include <dev/i2c/i2cvar.h>
-#include <dev/i2c/ddcvar.h>
 #include <dev/i2c/ddcreg.h>
-#include <dev/videomode/videomode.h>
+#include <dev/i2c/ddcvar.h>
+#include <dev/i2c/i2cvar.h>
 #include <dev/videomode/edidvar.h>
+#include <dev/videomode/videomode.h>
 
 #include <dev/audio/audio_dai.h>
 
-#include <drm/drm_drv.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_crtc_helper.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_probe_helper.h>
 
diff --git a/sys/dev/ic/dw_hdmi.h b/sys/dev/ic/dw_hdmi.h
index 0c5d4d8f5d33..f41e44f014c8 100644
--- a/sys/dev/ic/dw_hdmi.h
+++ b/sys/dev/ic/dw_hdmi.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dw_hdmi.h,v 1.7 2021/12/19 11:00:47 riastradh Exp $ */
+/* $NetBSD: dw_hdmi.h,v 1.8 2021/12/19 11:01:11 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -34,9 +34,9 @@
 
 #include <dev/audio/audio_dai.h>
 
-#include <drm/drm_drv.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_connector.h>
+#include <drm/drm_drv.h>
 #include <drm/drm_modes.h>
 
 struct dwhdmi_softc;