diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c
--- a/sys/dev/smbios/smbios.c
+++ b/sys/dev/smbios/smbios.c
@@ -209,10 +209,7 @@
 }
 
 static int
-smbios_modevent (mod, what, arg)
-        module_t        mod;
-        int             what;
-        void *          arg;
+smbios_modevent (module_t mod, int what, void *arg)
 {
 	device_t *	devs;
 	int		count;
@@ -222,7 +219,7 @@
 	case MOD_LOAD:
 		break;
 	case MOD_UNLOAD:
-		devclass_get_devices(smbios_devclass, &devs, &count);
+		devclass_get_devices(devclass_find("smbios"), &devs, &count);
 		for (i = 0; i < count; i++) {
 			device_delete_child(device_get_parent(devs[i]), devs[i]);
 		}
diff --git a/sys/x86/bios/vpd.c b/sys/x86/bios/vpd.c
--- a/sys/x86/bios/vpd.c
+++ b/sys/x86/bios/vpd.c
@@ -252,10 +252,7 @@
 }
 
 static int
-vpd_modevent (mod, what, arg)
-        module_t        mod;
-        int             what;
-        void *          arg;
+vpd_modevent (module_t mod, int what, void *arg)
 {
 	device_t *	devs;
 	int		count;
@@ -265,7 +262,7 @@
 	case MOD_LOAD:
 		break;
 	case MOD_UNLOAD:
-		devclass_get_devices(vpd_devclass, &devs, &count);
+		devclass_get_devices(devclass_find("vpd"), &devs, &count);
 		for (i = 0; i < count; i++) {
 			device_delete_child(device_get_parent(devs[i]), devs[i]);
 		}