diff --git a/src/mainboard/winent/mb6047/acpi_tables.c b/src/mainboard/winent/mb6047/acpi_tables.c
index a61a47bcd2..6302c1da89 100644
--- a/src/mainboard/winent/mb6047/acpi_tables.c
+++ b/src/mainboard/winent/mb6047/acpi_tables.c
@@ -19,7 +19,7 @@
 /* APIC */
 unsigned long acpi_fill_madt(unsigned long current)
 {
-	device_t dev;
+	struct device *dev;
 	struct resource *res;
 
 	get_bus_conf();
diff --git a/src/mainboard/winent/mb6047/get_bus_conf.c b/src/mainboard/winent/mb6047/get_bus_conf.c
index a0d3c94e95..de79fa05a7 100644
--- a/src/mainboard/winent/mb6047/get_bus_conf.c
+++ b/src/mainboard/winent/mb6047/get_bus_conf.c
@@ -35,7 +35,7 @@ void get_bus_conf(void)
 	unsigned apicid_base;
 	unsigned sbdn;
 
-	device_t dev;
+	struct device *dev;
 	int i;
 
 	if (get_bus_conf_done == 1)
diff --git a/src/mainboard/winent/mb6047/mainboard.c b/src/mainboard/winent/mb6047/mainboard.c
index e928711438..7d9516b4f5 100644
--- a/src/mainboard/winent/mb6047/mainboard.c
+++ b/src/mainboard/winent/mb6047/mainboard.c
@@ -15,7 +15,7 @@ static void hwm_write(u16 base, u8 bank, u8 reg, u8 value)
 
 static void mb6047_hwm_init(void)
 {
-	device_t dev;
+	struct device *dev;
 	struct resource *res;
 	size_t i;
 
@@ -40,12 +40,12 @@ static void mb6047_hwm_init(void)
 		hwm_write(res->base, hwmtab[i].bnk, hwmtab[i].idx, hwmtab[i].dat);
 }
 
-static void mb6047_mainboard_init(device_t dev)
+static void mb6047_mainboard_init(struct device *dev)
 {
 	mb6047_hwm_init();
 }
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 	dev->ops->init = mb6047_mainboard_init;
 }
diff --git a/src/mainboard/winent/mb6047/mptable.c b/src/mainboard/winent/mb6047/mptable.c
index 853fe653ce..407c59c7e6 100644
--- a/src/mainboard/winent/mb6047/mptable.c
+++ b/src/mainboard/winent/mb6047/mptable.c
@@ -33,7 +33,7 @@ static void *smp_write_config_table(void *v)
 
 /*I/O APICs:	APIC ID	Version	State		Address*/
 
-	device_t dev;
+	struct device *dev;
 	struct resource *res;
 	uint32_t dword;