diff --git a/src/mem/catalyst_flash.c b/src/mem/catalyst_flash.c
index 246063276..0a7fe2cdf 100644
--- a/src/mem/catalyst_flash.c
+++ b/src/mem/catalyst_flash.c
@@ -242,14 +242,16 @@ catalyst_flash_close(void *p)
 }
 
 
-const device_t catalyst_flash_device =
-{
-    "Catalyst 28F010-D Flash BIOS",
-    "catalyst_flash",
-    DEVICE_PCI,
-    0,
-    catalyst_flash_init,
-    catalyst_flash_close,
-    catalyst_flash_reset,
-    { NULL }, NULL, NULL, NULL
+const device_t catalyst_flash_device = {
+    .name = "Catalyst 28F010-D Flash BIOS",
+    .internal_name = "catalyst_flash",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = catalyst_flash_init,
+    .close = catalyst_flash_close,
+    .reset = catalyst_flash_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/mem/intel_flash.c b/src/mem/intel_flash.c
index 42da74e71..66c59914d 100644
--- a/src/mem/intel_flash.c
+++ b/src/mem/intel_flash.c
@@ -560,40 +560,45 @@ intel_flash_close(void *p)
     free(dev);
 }
 
-
 /* For AMI BIOS'es - Intel 28F001BXT with A16 pin inverted. */
-const device_t intel_flash_bxt_ami_device =
-{
-    "Intel 28F001BXT/28F002BXT/28F004BXT Flash BIOS",
-    "intel_flash_bxt_ami",
-    DEVICE_PCI,
-    FLAG_INV_A16,
-    intel_flash_init,
-    intel_flash_close,
-    intel_flash_reset,
-    { NULL }, NULL, NULL, NULL
+const device_t intel_flash_bxt_ami_device = {
+    .name = "Intel 28F001BXT/28F002BXT/28F004BXT Flash BIOS",
+    .internal_name = "intel_flash_bxt_ami",
+    .flags = DEVICE_PCI,
+    .local = FLAG_INV_A16,
+    .init = intel_flash_init,
+    .close = intel_flash_close,
+    .reset = intel_flash_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t intel_flash_bxt_device =
-{
-    "Intel 28F001BXT/28F002BXT/28F004BXT Flash BIOS",
-    "intel_flash_bxt",
-    DEVICE_PCI, 0,
-    intel_flash_init,
-    intel_flash_close,
-    intel_flash_reset,
-    { NULL }, NULL, NULL, NULL
+const device_t intel_flash_bxt_device = {
+    .name = "Intel 28F001BXT/28F002BXT/28F004BXT Flash BIOS",
+    .internal_name = "intel_flash_bxt",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = intel_flash_init,
+    .close = intel_flash_close,
+    .reset = intel_flash_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t intel_flash_bxb_device =
-{
-    "Intel 28F001BXB/28F002BXB/28F004BXB Flash BIOS",
-    "intel_flash_bxb",
-    DEVICE_PCI, FLAG_BXB,
-    intel_flash_init,
-    intel_flash_close,
-    intel_flash_reset,
-    { NULL }, NULL, NULL, NULL
+const device_t intel_flash_bxb_device = {
+    .name = "Intel 28F001BXB/28F002BXB/28F004BXB Flash BIOS",
+    .internal_name = "intel_flash_bxb",
+    .flags = DEVICE_PCI,
+    .local = FLAG_BXB,
+    .init = intel_flash_init,
+    .close = intel_flash_close,
+    .reset = intel_flash_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/mem/spd.c b/src/mem/spd.c
index f65d72ae7..96df99867 100644
--- a/src/mem/spd.c
+++ b/src/mem/spd.c
@@ -578,11 +578,15 @@ spd_write_drbs_ali1621(uint8_t *regs, uint8_t reg_min, uint8_t reg_max)
 
 
 static const device_t spd_device = {
-    "Serial Presence Detect ROMs",
-    "spd",
-    DEVICE_ISA,
-    0,
-    spd_init, spd_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Serial Presence Detect ROMs",
+    .internal_name = "spd",
+    .flags = DEVICE_ISA,
+    .local = 0,
+    .init = spd_init,
+    .close = spd_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/mem/sst_flash.c b/src/mem/sst_flash.c
index 8988b7e14..1fc5b2082 100644
--- a/src/mem/sst_flash.c
+++ b/src/mem/sst_flash.c
@@ -474,79 +474,86 @@ sst_close(void *p)
     free(dev);
 }
 
-
-const device_t sst_flash_29ee010_device =
-{
-    "SST 29EE010 Flash BIOS",
-    "sst_flash_29ee010",
-    0,
-    SST | SST29EE010 | SIZE_1M,
-    sst_init,
-    sst_close,
-    NULL,
-    { NULL }, NULL, NULL, NULL
+const device_t sst_flash_29ee010_device = {
+    .name = "SST 29EE010 Flash BIOS",
+    .internal_name = "sst_flash_29ee010",
+    .flags = 0,
+    .local = SST | SST29EE010 | SIZE_1M,
+    .init = sst_init,
+    .close = sst_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t sst_flash_29ee020_device =
-{
-    "SST 29EE020 Flash BIOS",
-    "sst_flash_29ee020",
-    0,
-    SST | SST29EE020 | SIZE_2M,
-    sst_init,
-    sst_close,
-    NULL,
-    { NULL }, NULL, NULL, NULL
+const device_t sst_flash_29ee020_device = {
+    .name = "SST 29EE020 Flash BIOS",
+    .internal_name = "sst_flash_29ee020",
+    .flags = 0,
+    .local = SST | SST29EE020 | SIZE_2M,
+    .init = sst_init,
+    .close = sst_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t winbond_flash_w29c020_device =
-{
-    "Winbond W29C020 Flash BIOS",
-    "winbond_flash_w29c020",
-    0,
-    WINBOND | W29C020 | SIZE_2M,
-    sst_init,
-    sst_close,
-    NULL,
-    { NULL }, NULL, NULL, NULL
+const device_t winbond_flash_w29c020_device = {
+    .name = "Winbond W29C020 Flash BIOS",
+    .internal_name = "winbond_flash_w29c020",
+    .flags = 0,
+    .local = WINBOND | W29C020 | SIZE_2M,
+    .init = sst_init,
+    .close = sst_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t sst_flash_39sf010_device =
-{
-    "SST 39SF010 Flash BIOS",
-    "sst_flash_39sf010",
-    0,
-    SST | SST39SF010 | SIZE_1M,
-    sst_init,
-    sst_close,
-    NULL,
-    { NULL }, NULL, NULL, NULL
+const device_t sst_flash_39sf010_device = {
+    .name = "SST 39SF010 Flash BIOS",
+    .internal_name = "sst_flash_39sf010",
+    .flags = 0,
+    .local = SST | SST39SF010 | SIZE_1M,
+    .init = sst_init,
+    .close = sst_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t sst_flash_39sf020_device =
-{
-    "SST 39SF020 Flash BIOS",
-    "sst_flash_39sf020",
-    0,
-    SST | SST39SF020 | SIZE_2M,
-    sst_init,
-    sst_close,
-    NULL,
-    { NULL }, NULL, NULL, NULL
+const device_t sst_flash_39sf020_device = {
+    .name = "SST 39SF020 Flash BIOS",
+    .internal_name = "sst_flash_39sf020",
+    .flags = 0,
+    .local = SST | SST39SF020 | SIZE_2M,
+    .init = sst_init,
+    .close = sst_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t sst_flash_39sf040_device =
-{
-    "SST 39SF040 Flash BIOS",
-    "sst_flash_39sf040",
-    0,
-    SST | SST39SF040 | SIZE_4M,
-    sst_init,
-    sst_close,
-    NULL,
-    { NULL }, NULL, NULL, NULL
+const device_t sst_flash_39sf040_device = {
+    .name = "SST 39SF040 Flash BIOS",
+    .internal_name = "sst_flash_39sf040",
+    .flags = 0,
+    .local = SST | SST39SF040 | SIZE_4M,
+    .init = sst_init,
+    .close = sst_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };