diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c
index 51357322d7eb..112a96a521b6 100644
--- a/sys/amd64/amd64/legacy.c
+++ b/sys/amd64/amd64/legacy.c
@@ -279,7 +279,7 @@ static driver_t cpu_driver = {
 	cpu_methods,
 	1,		/* no softc */
 };
-devclass_t cpu_devclass;
+static devclass_t cpu_devclass;
 DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0);
 
 static device_t
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index a86423d55959..22d58cf11217 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -203,8 +203,8 @@ static driver_t acpi_cpu_driver = {
     sizeof(struct acpi_cpu_softc),
 };
 
-static devclass_t cpu_devclass;
-DRIVER_MODULE(cpu, acpi, acpi_cpu_driver, cpu_devclass, 0, 0);
+static devclass_t acpi_cpu_devclass;
+DRIVER_MODULE(cpu, acpi, acpi_cpu_driver, acpi_cpu_devclass, 0, 0);
 MODULE_DEPEND(cpu, acpi, 1, 1, 1);
 
 static int
@@ -760,7 +760,7 @@ acpi_cpu_startup(void *arg)
     int count, i;
 
     /* Get set of CPU devices */
-    devclass_get_devices(cpu_devclass, &cpu_devices, &cpu_ndevices);
+    devclass_get_devices(acpi_cpu_devclass, &cpu_devices, &cpu_ndevices);
 
     /* Check for quirks via the first CPU device. */
     sc = device_get_softc(cpu_devices[0]);
diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c
index ea7fc2566673..276c40f3f07e 100644
--- a/sys/i386/i386/legacy.c
+++ b/sys/i386/i386/legacy.c
@@ -300,7 +300,7 @@ static driver_t cpu_driver = {
 	cpu_methods,
 	1,		/* no softc */
 };
-devclass_t cpu_devclass;
+static devclass_t cpu_devclass;
 DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0);
 
 static device_t