utvfu(4) currently includes videoio.h in utvfu.c and utvfu.h, which
isn't required.  Instead include it the same way like uvideo(4) does.

While there, move together audioio.h/videoio.h, and
audio_if.h/video_if.h.

OK?


Index: sys/dev/usb/utvfu.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/utvfu.c,v
diff -u -p -u -p -r1.20 utvfu.c
--- sys/dev/usb/utvfu.c	23 May 2024 03:21:09 -0000	1.20
+++ sys/dev/usb/utvfu.c	12 Jan 2025 12:48:52 -0000
@@ -50,23 +50,21 @@
 #include <sys/kthread.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/audioio.h>
-#include <sys/videoio.h>
 
 #include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 
-#include <dev/audio_if.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
 #include <dev/usb/usb_mem.h>
 #include <dev/usb/usbdi_util.h>
 #include <dev/usb/usbdevs.h>
-#include <dev/video_if.h>
+#include <dev/usb/utvfu.h>
 
-#include "utvfu.h"
+#include <dev/audio_if.h>
+#include <dev/video_if.h>
 
 #ifdef UTVFU_DEBUG
 int utvfu_debug = 1;
Index: sys/dev/usb/utvfu.h
===================================================================
RCS file: /cvs/src/sys/dev/usb/utvfu.h,v
diff -u -p -u -p -r1.5 utvfu.h
--- sys/dev/usb/utvfu.h	24 Nov 2021 22:03:05 -0000	1.5
+++ sys/dev/usb/utvfu.h	12 Jan 2025 12:48:52 -0000
@@ -42,6 +42,7 @@
 
 #include <sys/rwlock.h>
 #include <sys/queue.h>
+#include <sys/audioio.h>
 #include <sys/videoio.h>
 
 /* Hardware. */