diff --git a/sys/dev/ic/ac97.c b/sys/dev/ic/ac97.c
index e9356b01e0ff..18c35fe9138c 100644
--- a/sys/dev/ic/ac97.c
+++ b/sys/dev/ic/ac97.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: ac97.c,v 1.8 2000/04/28 12:39:59 augustss Exp $ */
+/*      $NetBSD: ac97.c,v 1.9 2000/05/15 01:27:44 thorpej Exp $ */
 /*      $OpenBSD: ac97.c,v 1.2 1999/09/21 16:06:27 csapuntz Exp $ */
 
 /*
@@ -67,7 +67,7 @@
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
-#include <dev/ic/ac97.h>
+#include <dev/ic/ac97var.h>
 
 #define AC97_REG_RESET                0x00
 #define AC97_SOUND_ENHANCEMENT(reg)   (((reg) >> 10) & 0x1f)
diff --git a/sys/dev/ic/ac97.h b/sys/dev/ic/ac97var.h
similarity index 97%
rename from sys/dev/ic/ac97.h
rename to sys/dev/ic/ac97var.h
index cce7b3c75ab1..8647648819ce 100644
--- a/sys/dev/ic/ac97.h
+++ b/sys/dev/ic/ac97var.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: ac97.h,v 1.1 1999/10/27 13:18:03 augustss Exp $ */
+/*	$NetBSD: ac97var.h,v 1.1 2000/05/15 01:27:45 thorpej Exp $	*/
 /*      $OpenBSD: ac97.h,v 1.1 1999/09/19 06:45:12 csapuntz Exp $ */
 
 /*
@@ -45,7 +45,6 @@ struct ac97_host_if {
 /*
  * This is the interface exported by the AC97 compliant CODEC
  */
-
 struct ac97_codec_if_vtbl {
 	int (*mixer_get_port)(struct ac97_codec_if *addr, mixer_ctrl_t *cp);
 	int (*mixer_set_port)(struct ac97_codec_if *addr, mixer_ctrl_t *cp);
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index a7d81c1ef986..0c2a99f0bc85 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: auvia.c,v 1.2 2000/04/08 03:33:58 tsarna Exp $	*/
+/*	$NetBSD: auvia.c,v 1.3 2000/05/15 01:27:46 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
 #include <dev/mulaw.h>
 #include <dev/auconv.h>
 
-#include <dev/ic/ac97.h>
+#include <dev/ic/ac97var.h>
 
 #include <dev/pci/auviavar.h>
 
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index ee9dbf86c409..c21127298538 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cs4280.c,v 1.2 2000/01/14 14:39:13 augustss Exp $	*/
+/*	$NetBSD: cs4280.c,v 1.3 2000/05/15 01:27:46 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Tatoku Ogaito.  All rights reserved.
@@ -83,7 +83,7 @@ int cs4280debug = 0;
 #include <dev/midi_if.h>
 #include <dev/mulaw.h>
 #include <dev/auconv.h>
-#include <dev/ic/ac97.h>
+#include <dev/ic/ac97var.h>
 
 #include <machine/bus.h>
 #include <machine/bswap.h>
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index b41aa8983a1f..af4d4cdc7df9 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: eap.c,v 1.38 2000/05/01 17:15:41 augustss Exp $	*/
+/*	$NetBSD: eap.c,v 1.39 2000/05/15 01:27:47 thorpej Exp $	*/
 /*      $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */
 
 /*
@@ -74,7 +74,7 @@
 #include <dev/midi_if.h>
 #include <dev/mulaw.h>
 #include <dev/auconv.h>
-#include <dev/ic/ac97.h>
+#include <dev/ic/ac97var.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index 3c7b25a4a097..f9c0a824f2ec 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fms.c,v 1.4 2000/04/08 03:50:48 tsarna Exp $	*/
+/*	$NetBSD: fms.c,v 1.5 2000/05/15 01:27:47 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 #include <dev/mulaw.h>
 #include <dev/auconv.h>
 
-#include <dev/ic/ac97.h>
+#include <dev/ic/ac97var.h>
 #include <dev/ic/mpuvar.h>
 
 #include <dev/pci/fmsvar.h>
diff --git a/sys/dev/pci/mpu_fms.c b/sys/dev/pci/mpu_fms.c
index f47f5e1dd28f..9d9416f6906e 100644
--- a/sys/dev/pci/mpu_fms.c
+++ b/sys/dev/pci/mpu_fms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mpu_fms.c,v 1.1 1999/11/01 20:43:13 augustss Exp $	*/
+/*	$NetBSD: mpu_fms.c,v 1.2 2000/05/15 01:27:48 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
 
 #include <dev/audio_if.h>
 #include <dev/midi_if.h>
-#include <dev/ic/ac97.h>
+#include <dev/ic/ac97var.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
diff --git a/sys/dev/pci/opl_fms.c b/sys/dev/pci/opl_fms.c
index 33a798e1aa46..7d9a74dfce20 100644
--- a/sys/dev/pci/opl_fms.c
+++ b/sys/dev/pci/opl_fms.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: opl_fms.c,v 1.1 1999/11/01 20:43:13 augustss Exp $	*/
+/*	$NetBSD: opl_fms.c,v 1.2 2000/05/15 01:27:48 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
 #include <dev/midi_if.h>
 #include <dev/ic/oplreg.h>
 #include <dev/ic/oplvar.h>
-#include <dev/ic/ac97.h>
+#include <dev/ic/ac97var.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>