diff --git a/src/acpi.c b/src/acpi.c
index 7db4d0e26..11d991f63 100644
--- a/src/acpi.c
+++ b/src/acpi.c
@@ -1613,79 +1613,72 @@ acpi_init(const device_t *info)
     return dev;
 }
 
-const device_t acpi_ali_device =
-{
-    "ALi M7101 ACPI",
-    "acpi_ali",
-    DEVICE_PCI,
-    VEN_ALI,
-    acpi_init,
-    acpi_close,
-    acpi_reset,
-    { NULL },
-    acpi_speed_changed,
-    NULL,
-    NULL
+const device_t acpi_ali_device = {
+    .name = "ALi M7101 ACPI",
+    .internal_name = "acpi_ali",
+    .flags = DEVICE_PCI,
+    .local = VEN_ALI,
+    .init = acpi_init,
+    .close = acpi_close,
+    .reset = acpi_reset,
+    { .available = NULL },
+    .speed_changed = acpi_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t acpi_intel_device =
-{
-    "Intel ACPI",
-    "acpi_intel",
-    DEVICE_PCI,
-    VEN_INTEL,
-    acpi_init,
-    acpi_close,
-    acpi_reset,
-    { NULL },
-    acpi_speed_changed,
-    NULL,
-    NULL
+const device_t acpi_intel_device = {
+    .name = "Intel ACPI",
+    .internal_name = "acpi_intel",
+    .flags = DEVICE_PCI,
+    .local = VEN_INTEL,
+    .init = acpi_init,
+    .close = acpi_close,
+    .reset = acpi_reset,
+    { .available = NULL },
+    .speed_changed = acpi_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-const device_t acpi_via_device =
-{
-    "VIA ACPI",
-    "acpi_via",
-    DEVICE_PCI,
-    VEN_VIA,
-    acpi_init,
-    acpi_close,
-    acpi_reset,
-    { NULL },
-    acpi_speed_changed,
-    NULL,
-    NULL
+const device_t acpi_via_device = {
+    .name = "VIA ACPI",
+    .internal_name = "acpi_via",
+    .flags = DEVICE_PCI,
+    .local = VEN_VIA,
+    .init = acpi_init,
+    .close = acpi_close,
+    .reset = acpi_reset,
+    { .available = NULL },
+    .speed_changed = acpi_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t acpi_via_596b_device =
-{
-    "VIA VT82C596 ACPI",
-    "acpi_via_596b",
-    DEVICE_PCI,
-    VEN_VIA_596B,
-    acpi_init,
-    acpi_close,
-    acpi_reset,
-    { NULL },
-    acpi_speed_changed,
-    NULL,
-    NULL
+const device_t acpi_via_596b_device = {
+    .name = "VIA VT82C596 ACPI",
+    .internal_name = "acpi_via_596b",
+    .flags = DEVICE_PCI,
+    .local = VEN_VIA_596B,
+    .init = acpi_init,
+    .close = acpi_close,
+    .reset = acpi_reset,
+    { .available = NULL },
+    .speed_changed = acpi_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t acpi_smc_device =
-{
-    "SMC FDC73C931APM ACPI",
-    "acpi_smc",
-    DEVICE_PCI,
-    VEN_SMC,
-    acpi_init,
-    acpi_close,
-    acpi_reset,
-    { NULL },
-    acpi_speed_changed,
-    NULL,
-    NULL
+const device_t acpi_smc_device = {
+    .name = "SMC FDC73C931APM ACPI",
+    .internal_name = "acpi_smc",
+    .flags = DEVICE_PCI,
+    .local = VEN_SMC,
+    .init = acpi_init,
+    .close = acpi_close,
+    .reset = acpi_reset,
+    { .available = NULL },
+    .speed_changed = acpi_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/apm.c b/src/apm.c
index def8db7bc..9bee70e78 100644
--- a/src/apm.c
+++ b/src/apm.c
@@ -123,49 +123,44 @@ static void
 }
 
 
-const device_t apm_device =
-{
-    "Advanced Power Management",
-    "apm",
-    0,
-    0,
-    apm_init,
-    apm_close,
-    NULL,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t apm_device = {
+    .name = "Advanced Power Management",
+    .internal_name = "apm",
+    .flags = 0,
+    .local = 0,
+    .init = apm_init,
+    .close = apm_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t apm_pci_device =
-{
-    "Advanced Power Management (PCI)",
-    "apm_pci",
-    DEVICE_PCI,
-    0,
-    apm_init,
-    apm_close,
-    apm_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t apm_pci_device = {
+    .name = "Advanced Power Management (PCI)",
+    .internal_name = "apm_pci",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = apm_init,
+    .close = apm_close,
+    .reset = apm_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t apm_pci_acpi_device =
-{
-    "Advanced Power Management (PCI)",
-    "apm_pci_acpi",
-    DEVICE_PCI,
-    1,
-    apm_init,
-    apm_close,
-    apm_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t apm_pci_acpi_device = {
+    .name = "Advanced Power Management (PCI)",
+    .internal_name = "apm_pci_acpi",
+    .flags = DEVICE_PCI,
+    .local = 1,
+    .init = apm_init,
+    .close = apm_close,
+    .reset = apm_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/ddma.c b/src/ddma.c
index c99225150..2993add52 100644
--- a/src/ddma.c
+++ b/src/ddma.c
@@ -184,18 +184,16 @@ ddma_init(const device_t *info)
     return dev;
 }
 
-
-const device_t ddma_device =
-{
-    "Distributed DMA",
-    "ddma",
-    DEVICE_PCI,
-    0,
-    ddma_init,
-    ddma_close,
-    NULL,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t ddma_device = {
+    .name = "Distributed DMA",
+    .internal_name = "ddma",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = ddma_init,
+    .close = ddma_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/ioapic.c b/src/ioapic.c
index b899beec0..e308b9a1c 100644
--- a/src/ioapic.c
+++ b/src/ioapic.c
@@ -121,11 +121,15 @@ ioapic_init(const device_t *info)
 
 
 const device_t ioapic_device = {
-    "I/O Advanced Programmable Interrupt Controller",
-    "ioapic",
-    DEVICE_AT,
-    0,
-    ioapic_init, ioapic_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "I/O Advanced Programmable Interrupt Controller",
+    .internal_name = "ioapic",
+    .flags = DEVICE_AT,
+    .local = 0,
+    .init = ioapic_init,
+    .close = ioapic_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/nvr_at.c b/src/nvr_at.c
index b3c6299b3..d7b1a780f 100644
--- a/src/nvr_at.c
+++ b/src/nvr_at.c
@@ -1120,113 +1120,156 @@ nvr_at_close(void *priv)
 	nvr_at_inited = 0;
 }
 
-
 const device_t at_nvr_old_device = {
-    "PC/AT NVRAM (No century)",
-    "at_nvr_old",
-    DEVICE_ISA | DEVICE_AT,
-    0,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "PC/AT NVRAM (No century)",
+    .internal_name = "at_nvr_old",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 0,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t at_nvr_device = {
-    "PC/AT NVRAM",
-    "at_nvr",
-    DEVICE_ISA | DEVICE_AT,
-    1,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "PC/AT NVRAM",
+    .internal_name = "at_nvr",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 1,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t ps_nvr_device = {
-    "PS/1 or PS/2 NVRAM",
-    "ps_nvr",
-    DEVICE_PS2,
-    2,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "PS/1 or PS/2 NVRAM",
+    .internal_name = "ps_nvr",
+    .flags = DEVICE_PS2,
+    .local = 2,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t amstrad_nvr_device = {
-    "Amstrad NVRAM",
-    "amstrad_nvr",
-    DEVICE_ISA | DEVICE_AT,
-    3,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "Amstrad NVRAM",
+    .internal_name = "amstrad_nvr",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 3,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t ibmat_nvr_device = {
-    "IBM AT NVRAM",
-    "ibmat_nvr",
-    DEVICE_ISA | DEVICE_AT,
-    4,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "IBM AT NVRAM",
+    .internal_name = "ibmat_nvr",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 4,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t piix4_nvr_device = {
-    "Intel PIIX4 PC/AT NVRAM",
-    "piix4_nvr",
-    DEVICE_ISA | DEVICE_AT,
-    9,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "Intel PIIX4 PC/AT NVRAM",
+    .internal_name = "piix4_nvr",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 9,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t ami_1992_nvr_device = {
-    "AMI Color 1992 PC/AT NVRAM",
-    "ami_1992_nvr",
-    DEVICE_ISA | DEVICE_AT,
-    12,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "AMI Color 1992 PC/AT NVRAM",
+    .internal_name = "ami_1992_nvr",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 12,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t ami_1994_nvr_device = {
-    "AMI WinBIOS 1994 PC/AT NVRAM",
-    "ami_1994_nvr",
-    DEVICE_ISA | DEVICE_AT,
-    13,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "AMI WinBIOS 1994 PC/AT NVRAM",
+    .internal_name = "ami_1994_nvr",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 13,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t ami_1995_nvr_device = {
-    "AMI WinBIOS 1995 PC/AT NVRAM",
-    "ami_1995_nvr",
-    DEVICE_ISA | DEVICE_AT,
-    14,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "AMI WinBIOS 1995 PC/AT NVRAM",
+    .internal_name = "ami_1995_nvr",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 14,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t via_nvr_device = {
-    "VIA PC/AT NVRAM",
-    "via_nvr",
-    DEVICE_ISA | DEVICE_AT,
-    15,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "VIA PC/AT NVRAM",
+    .internal_name = "via_nvr",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 15,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
 const device_t p6rp4_nvr_device = {
-    "ASUS P/I-P6RP4 PC/AT NVRAM",
-    "p6rp4_nvr",
-    DEVICE_ISA | DEVICE_AT,
-    16,
-    nvr_at_init, nvr_at_close, nvr_at_reset,
-    { NULL }, nvr_at_speed_changed,
-    NULL
+    .name = "ASUS P/I-P6RP4 PC/AT NVRAM",
+    .internal_name = "p6rp4_nvr",
+    .flags = DEVICE_ISA | DEVICE_AT,
+    .local = 16,
+    .init = nvr_at_init,
+    .close = nvr_at_close,
+    .reset = nvr_at_reset,
+    { .available = NULL },
+    .speed_changed = nvr_at_speed_changed,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/nvr_ps2.c b/src/nvr_ps2.c
index 5e38d5a57..cd6f47af7 100644
--- a/src/nvr_ps2.c
+++ b/src/nvr_ps2.c
@@ -153,10 +153,15 @@ ps2_nvr_close(void *priv)
 
 
 const device_t ps2_nvr_device = {
-    "PS/2 Secondary NVRAM",
-    "ps2_nvr",
-    0, 0,
-    ps2_nvr_init, ps2_nvr_close, NULL,
-    { NULL }, NULL,
-    NULL
+    .name = "PS/2 Secondary NVRAM",
+    .internal_name = "ps2_nvr",
+    .flags = 0,
+    .local = 0,
+    .init = ps2_nvr_init,
+    .close = ps2_nvr_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/pit.c b/src/pit.c
index 40927dea5..28fc9b3c2 100644
--- a/src/pit.c
+++ b/src/pit.c
@@ -841,67 +841,76 @@ pit_init(const device_t *info)
     return dev;
 }
 
-
-const device_t i8253_device =
-{
-    "Intel 8253/8253-5 Programmable Interval Timer",
-    "i8253",
-    DEVICE_ISA,
-    PIT_8253,
-        pit_init, pit_close, NULL,
-        { NULL }, NULL, NULL,
-    NULL
+const device_t i8253_device = {
+    .name = "Intel 8253/8253-5 Programmable Interval Timer",
+    .internal_name = "i8253",
+    .flags = DEVICE_ISA,
+    .local = PIT_8253,
+    .init = pit_init,
+    .close = pit_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i8254_device =
-{
-        "Intel 8254 Programmable Interval Timer",
-        "i8254",
-        DEVICE_ISA,
-	PIT_8254,
-        pit_init, pit_close, NULL,
-        { NULL }, NULL, NULL,
-	NULL
+const device_t i8254_device = {
+    .name = "Intel 8254 Programmable Interval Timer",
+    .internal_name = "i8254",
+    .flags = DEVICE_ISA,
+    .local = PIT_8254,
+    .init = pit_init,
+    .close = pit_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i8254_sec_device =
-{
-        "Intel 8254 Programmable Interval Timer (Secondary)",
-        "i8254_sec",
-        DEVICE_ISA,
-	PIT_8254 | PIT_SECONDARY,
-        pit_init, pit_close, NULL,
-        { NULL }, NULL, NULL,
-	NULL
+const device_t i8254_sec_device = {
+    .name = "Intel 8254 Programmable Interval Timer (Secondary)",
+    .internal_name = "i8254_sec",
+    .flags = DEVICE_ISA,
+    .local = PIT_8254 | PIT_SECONDARY,
+    .init = pit_init,
+    .close = pit_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i8254_ext_io_device =
-{
-        "Intel 8254 Programmable Interval Timer (External I/O)",
-        "i8254_ext_io",
-        DEVICE_ISA,
-	PIT_8254 | PIT_EXT_IO,
-        pit_init, pit_close, NULL,
-        { NULL }, NULL, NULL,
-	NULL
+const device_t i8254_ext_io_device = {
+    .name = "Intel 8254 Programmable Interval Timer (External I/O)",
+    .internal_name = "i8254_ext_io",
+    .flags = DEVICE_ISA,
+    .local = PIT_8254 | PIT_EXT_IO,
+    .init = pit_init,
+    .close = pit_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
-const device_t i8254_ps2_device =
-{
-        "Intel 8254 Programmable Interval Timer (PS/2)",
-        "i8254_ps2",
-        DEVICE_ISA,
-	PIT_8254 | PIT_PS2 | PIT_EXT_IO,
-        pit_init, pit_close, NULL,
-        { NULL }, NULL, NULL,
-	NULL
+const device_t i8254_ps2_device = {
+    .name = "Intel 8254 Programmable Interval Timer (PS/2)",
+    .internal_name = "i8254_ps2",
+    .flags = DEVICE_ISA,
+    .local = PIT_8254 | PIT_PS2 | PIT_EXT_IO,
+    .init = pit_init,
+    .close = pit_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 pit_t *
 pit_common_init(int type, void (*out0)(int new_out, int old_out), void (*out1)(int new_out, int old_out))
 {
diff --git a/src/port_6x.c b/src/port_6x.c
index 365b2aff9..dafa5d987 100644
--- a/src/port_6x.c
+++ b/src/port_6x.c
@@ -173,46 +173,58 @@ port_6x_init(const device_t *info)
     return dev;
 }
 
-
 const device_t port_6x_device = {
-    "Port 6x Registers",
-    "port_6x",
-    0,
-    0,
-    port_6x_init, port_6x_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Port 6x Registers",
+    .internal_name = "port_6x",
+    .flags = 0,
+    .local = 0,
+    .init = port_6x_init,
+    .close = port_6x_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t port_6x_xi8088_device = {
-    "Port 6x Registers (Xi8088)",
-    "port_6x_xi8088",
-    0,
-    PORT_6X_TURBO | PORT_6X_EXT_REF | PORT_6X_MIRROR,
-    port_6x_init, port_6x_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Port 6x Registers (Xi8088)",
+    .internal_name = "port_6x_xi8088",
+    .flags = 0,
+    .local = PORT_6X_TURBO | PORT_6X_EXT_REF | PORT_6X_MIRROR,
+    .init = port_6x_init,
+    .close = port_6x_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t port_6x_ps2_device = {
-    "Port 6x Registers (IBM PS/2)",
-    "port_6x_ps2",
-    0,
-    PORT_6X_EXT_REF,
-    port_6x_init, port_6x_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Port 6x Registers (IBM PS/2)",
+    .internal_name = "port_6x_ps2",
+    .flags = 0,
+    .local = PORT_6X_EXT_REF,
+    .init = port_6x_init,
+    .close = port_6x_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t port_6x_olivetti_device = {
-    "Port 6x Registers (Olivetti)",
-    "port_6x_olivetti",
-    0,
-    PORT_6X_SWA,
-    port_6x_init, port_6x_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Port 6x Registers (Olivetti)",
+    .internal_name = "port_6x_olivetti",
+    .flags = 0,
+    .local = PORT_6X_SWA,
+    .init = port_6x_init,
+    .close = port_6x_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/port_92.c b/src/port_92.c
index 6981a3596..c4c421f53 100644
--- a/src/port_92.c
+++ b/src/port_92.c
@@ -216,46 +216,58 @@ port_92_init(const device_t *info)
     return dev;
 }
 
-
 const device_t port_92_device = {
-    "Port 92 Register",
-    "port_92",
-    0,
-    0,
-    port_92_init, port_92_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Port 92 Register",
+    .internal_name = "port_92",
+    .flags = 0,
+    .local = 0,
+    .init = port_92_init,
+    .close = port_92_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t port_92_inv_device = {
-    "Port 92 Register (inverted bits 2-7)",
-    "port_92_inv",
-    0,
-    PORT_92_INV,
-    port_92_init, port_92_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Port 92 Register (inverted bits 2-7)",
+    .internal_name = "port_92_inv",
+    .flags = 0,
+    .local = PORT_92_INV,
+    .init = port_92_init,
+    .close = port_92_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t port_92_word_device = {
-    "Port 92 Register (16-bit)",
-    "port_92_word",
-    0,
-    PORT_92_WORD,
-    port_92_init, port_92_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Port 92 Register (16-bit)",
+    .internal_name = "port_92_word",
+    .flags = 0,
+    .local = PORT_92_WORD,
+    .init = port_92_init,
+    .close = port_92_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
 
-
 const device_t port_92_pci_device = {
-    "Port 92 Register (PCI)",
-    "port_92_pci",
-    0,
-    PORT_92_PCI,
-    port_92_init, port_92_close, NULL,
-    { NULL }, NULL, NULL,
-    NULL
+    .name = "Port 92 Register (PCI)",
+    .internal_name = "port_92_pci",
+    .flags = 0,
+    .local = PORT_92_PCI,
+    .init = port_92_init,
+    .close = port_92_close,
+    .reset = NULL,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };
diff --git a/src/usb.c b/src/usb.c
index d1424023e..2f8f957b5 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -409,18 +409,16 @@ usb_init(const device_t *info)
     return dev;
 }
 
-
-const device_t usb_device =
-{
-    "Universal Serial Bus",
-    "usb",
-    DEVICE_PCI,
-    0,
-    usb_init,
-    usb_close,
-    usb_reset,
-    { NULL },
-    NULL,
-    NULL,
-    NULL
+const device_t usb_device = {
+    .name = "Universal Serial Bus",
+    .internal_name = "usb",
+    .flags = DEVICE_PCI,
+    .local = 0,
+    .init = usb_init,
+    .close = usb_close,
+    .reset = usb_reset,
+    { .available = NULL },
+    .speed_changed = NULL,
+    .force_redraw = NULL,
+    .config = NULL
 };