diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index ca18b6d11f68..82138e61f14c 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -304,6 +304,5 @@ static device_method_t nexus_acpi_methods[] = {
 };
 
 DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver);
-static devclass_t nexus_devclass;
 
-DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0);
+DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, 0, 0);
diff --git a/sys/i386/bios/smapi.c b/sys/i386/bios/smapi.c
index 719d9b9558dc..aebe656e9102 100644
--- a/sys/i386/bios/smapi.c
+++ b/sys/i386/bios/smapi.c
@@ -74,8 +74,6 @@ struct smapi_softc {
 extern u_long smapi32_offset;
 extern u_short smapi32_segment;
 
-devclass_t smapi_devclass;
-
 static d_ioctl_t smapi_ioctl;
 
 static struct cdevsw smapi_cdevsw = {
@@ -318,5 +316,5 @@ smapi_modevent (module_t mod, int what, void *arg)
 	return (0);
 }
 
-DRIVER_MODULE(smapi, nexus, smapi_driver, smapi_devclass, smapi_modevent, 0);
+DRIVER_MODULE(smapi, nexus, smapi_driver, smapi_modevent, NULL);
 MODULE_VERSION(smapi, 1);
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 48cf1ad9ade1..a4786a9d7563 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -721,7 +721,5 @@ static driver_t pnpbios_driver = {
 	1,			/* no softc */
 };
 
-static devclass_t pnpbios_devclass;
-
-DRIVER_MODULE(pnpbios, isa, pnpbios_driver, pnpbios_devclass, 0, 0);
+DRIVER_MODULE(pnpbios, isa, pnpbios_driver, 0, 0);
 #endif /* DEV_ISA */
diff --git a/sys/i386/i386/mp_clock.c b/sys/i386/i386/mp_clock.c
index 7b0fd9918624..4405d2e79bc3 100644
--- a/sys/i386/i386/mp_clock.c
+++ b/sys/i386/i386/mp_clock.c
@@ -148,6 +148,4 @@ static driver_t piix_driver = {
 	1,
 };
 
-static devclass_t piix_devclass;
-
-DRIVER_MODULE(piix, pci, piix_driver, piix_devclass, 0, 0);
+DRIVER_MODULE(piix, pci, piix_driver, 0, 0);
diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c
index 307099925f23..f18c75a4a576 100644
--- a/sys/i386/i386/npx.c
+++ b/sys/i386/i386/npx.c
@@ -1347,10 +1347,8 @@ static driver_t npxisa_driver = {
 	1,			/* no softc */
 };
 
-static devclass_t npxisa_devclass;
-
-DRIVER_MODULE(npxisa, isa, npxisa_driver, npxisa_devclass, 0, 0);
-DRIVER_MODULE(npxisa, acpi, npxisa_driver, npxisa_devclass, 0, 0);
+DRIVER_MODULE(npxisa, isa, npxisa_driver, 0, 0);
+DRIVER_MODULE(npxisa, acpi, npxisa_driver, 0, 0);
 ISA_PNP_INFO(npxisa_ids);
 #endif /* DEV_ISA */
 
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 0d2257d526fe..c17319e99491 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -740,6 +740,4 @@ static driver_t pir_driver = {
 	1,
 };
 
-static devclass_t pir_devclass;
-
-DRIVER_MODULE(pir, legacy, pir_driver, pir_devclass, 0, 0);
+DRIVER_MODULE(pir, legacy, pir_driver, 0, 0);