diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index eb5dc6b92a7..42e3697901e 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -69,8 +69,6 @@
 #include <dev/aac/aacvar.h>
 #include <dev/aac/aac_tables.h>
 
-devclass_t	aac_devclass;
-
 static void	aac_startup(void *arg);
 static void	aac_add_container(struct aac_softc *sc,
 				  struct aac_mntinforesponse *mir, int f);
diff --git a/sys/dev/aac/aac_debug.c b/sys/dev/aac/aac_debug.c
index 0d542237d09..3f29a836210 100644
--- a/sys/dev/aac/aac_debug.c
+++ b/sys/dev/aac/aac_debug.c
@@ -133,7 +133,7 @@ aac_printstate0(void)
 {
 	struct aac_softc *sc;
 
-	sc = devclass_get_softc(aac_devclass, 0);
+	sc = devclass_get_softc(devclass_find("aac"), 0);
 
 	aac_print_queues(sc);
 	switch (sc->aac_hwif) {
@@ -163,7 +163,7 @@ aac_intr0(void)
 {
 	struct aac_softc *sc;
 
-	sc = devclass_get_softc(aac_devclass, 0);
+	sc = devclass_get_softc(devclass_find("aac"), 0);
 
 	aac_intr(sc);
 }
diff --git a/sys/dev/aac/aac_disk.c b/sys/dev/aac/aac_disk.c
index 0af2b506aef..3dd25869a33 100644
--- a/sys/dev/aac/aac_disk.c
+++ b/sys/dev/aac/aac_disk.c
@@ -89,7 +89,7 @@ static struct cdevsw aac_disk_cdevsw = {
 #endif
 };
 
-devclass_t		aac_disk_devclass;
+static devclass_t	aac_disk_devclass;
 static struct cdevsw	aac_disk_disk_cdevsw;
 #ifdef FREEBSD_4
 static int		disks_registered = 0;
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index acaf6a43df1..c5d9dc63184 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -79,6 +79,8 @@ static driver_t aac_pci_driver = {
 	sizeof(struct aac_softc)
 };
 
+static devclass_t	aac_devclass;
+
 DRIVER_MODULE(aac, pci, aac_pci_driver, aac_devclass, 0, 0);
 
 struct aac_ident
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index 69faf2fe425..012c7d2e59e 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.h
@@ -369,7 +369,6 @@ extern int		aac_shutdown(device_t dev);
 extern int		aac_suspend(device_t dev); 
 extern int		aac_resume(device_t dev);
 extern void		aac_intr(void *arg);
-extern devclass_t	aac_devclass;
 extern void		aac_submit_bio(struct bio *bp);
 extern void		aac_biodone(struct bio *bp);
 extern int		aac_dump_enqueue(struct aac_disk *ad, u_int32_t lba,