diff --git a/src/mainboard/pcengines/apu1/mainboard.c b/src/mainboard/pcengines/apu1/mainboard.c
index 95989be7b7..290a0ed231 100644
--- a/src/mainboard/pcengines/apu1/mainboard.c
+++ b/src/mainboard/pcengines/apu1/mainboard.c
@@ -176,7 +176,7 @@ static void config_addon_uart(void)
 /**********************************************
  * Enable the dedicated functions of the board.
  **********************************************/
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 
@@ -206,7 +206,7 @@ static void mainboard_enable(device_t dev)
 const char *smbios_mainboard_serial_number(void)
 {
 	static char serial[10];
-	device_t nic_dev;
+	struct device *nic_dev;
 	uintptr_t bar18;
 	u32 mac_addr = 0;
 	int i;
@@ -255,7 +255,7 @@ const char *smbios_mainboard_serial_number(void)
  */
 static void usb_oc_setup(void)
 {
-	device_t dev = dev_find_slot(0, PCI_DEVFN(0x12, 0));
+	struct device *dev = dev_find_slot(0, PCI_DEVFN(0x12, 0));
 
 	pci_write_config32(dev, 0x58, 0x011f0);
 }
diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c
index 7b8da2ed0a..8f2d622852 100644
--- a/src/mainboard/pcengines/apu2/mainboard.c
+++ b/src/mainboard/pcengines/apu2/mainboard.c
@@ -158,7 +158,7 @@ static void config_gpio_mux(void)
  * enable the dedicated function in mainboard.
  **********************************************/
 
-static void mainboard_enable(device_t dev)
+static void mainboard_enable(struct device *dev)
 {
 	printk(BIOS_INFO, "Mainboard " CONFIG_MAINBOARD_PART_NUMBER " Enable.\n");
 
@@ -185,7 +185,7 @@ static void mainboard_enable(device_t dev)
 const char *smbios_mainboard_serial_number(void)
 {
 	static char serial[10];
-	device_t nic_dev;
+	struct device *nic_dev;
 	uintptr_t bar10;
 	u32 mac_addr = 0;
 	int i;