diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 3b4896b118..8b6b2c1d28 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -640,7 +640,7 @@ void acpi_create_ivrs(acpi_ivrs_t *ivrs,
 	header->checksum = acpi_checksum((void *)ivrs, header->length);
 }
 
-unsigned long acpi_write_hpet(device_t device, unsigned long current,
+unsigned long acpi_write_hpet(struct device *device, unsigned long current,
 	acpi_rsdp_t *rsdp)
 {
 	acpi_hpet_t *hpet;
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index fe0c6f25b0..586a0851ad 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -693,11 +693,11 @@ void acpi_create_ivrs(acpi_ivrs_t *ivrs,
 
 #if ENV_RAMSTAGE && !defined(__SIMPLE_DEVICE__)
 void acpi_create_hpet(acpi_hpet_t *hpet);
-unsigned long acpi_write_hpet(device_t device, unsigned long start,
+unsigned long acpi_write_hpet(struct device *device, unsigned long start,
 			      acpi_rsdp_t *rsdp);
 
 /* cpu/intel/speedstep/acpi.c */
-void generate_cpu_entries(device_t device);
+void generate_cpu_entries(struct device *device);
 #endif
 
 void acpi_create_mcfg(acpi_mcfg_t *mcfg);