diff --git a/src/include/86box/sio.h b/src/include/86box/sio.h
index f34381039..941604ddb 100644
--- a/src/include/86box/sio.h
+++ b/src/include/86box/sio.h
@@ -84,22 +84,6 @@ extern const device_t i82091aa_ide_device;
 extern const device_t pc87310_device;
 
 /* National Semiconductors */
-#define PC8730X_AMI_MEGAKEY  FDC37XXX2
-#define PC8730X_PHOENIX_42   FDC37XXX5
-#define PC8730X_PHOENIX_42I  FDC37XXX7
-#define PC8730X_KBC          FDC37XXXX_KBC
-
-extern const device_t pc87306_device;
-
-extern const device_t pc87311_device;
-extern const device_t pc87311_ide_device;
-extern const device_t pc87332_device;
-extern const device_t pc87332_398_device;
-extern const device_t pc87332_398_ide_device;
-extern const device_t pc87332_398_ide_sec_device;
-extern const device_t pc87332_398_ide_fdcon_device;
-
-/* National Semiconductors PC87307 / PC87309 */
 #define PCX7307_PC87307      0x00c0
 #define PCX7307_PC97307      0x00cf
 
@@ -114,6 +98,17 @@ extern const device_t pc87332_398_ide_fdcon_device;
 
 #define PCX730X_15C          0x2000
 
+extern const device_t pc87306_device;
+
+extern const device_t pc87311_device;
+extern const device_t pc87311_ide_device;
+extern const device_t pc87332_device;
+extern const device_t pc87332_398_device;
+extern const device_t pc87332_398_ide_device;
+extern const device_t pc87332_398_ide_sec_device;
+extern const device_t pc87332_398_ide_fdcon_device;
+
+/* National Semiconductors PC87307 / PC87309 */
 extern const device_t pc87307_device;
 
 extern const device_t pc87309_device;
diff --git a/src/machine/m_at_socket5.c b/src/machine/m_at_socket5.c
index de7807abb..0088bc188 100644
--- a/src/machine/m_at_socket5.c
+++ b/src/machine/m_at_socket5.c
@@ -409,7 +409,7 @@ machine_at_zappa_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
diff --git a/src/machine/m_at_socket7.c b/src/machine/m_at_socket7.c
index 5ea7ebbe0..d5fdc7e0f 100644
--- a/src/machine/m_at_socket7.c
+++ b/src/machine/m_at_socket7.c
@@ -244,7 +244,7 @@ machine_at_tc430hx_init(const machine_t *model)
 
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
@@ -282,7 +282,7 @@ machine_at_infinia7200_init(const machine_t *model)
 
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
@@ -340,7 +340,7 @@ machine_at_cu430hx_common_init(const machine_t *model)
 
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 }
 
@@ -412,7 +412,7 @@ machine_at_pcv90_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
@@ -730,7 +730,7 @@ machine_at_pb680_init(const machine_t *model)
 
     device_add(&i430vx_device);
     device_add(&piix3_device);
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
diff --git a/src/machine/m_at_socket7_3v.c b/src/machine/m_at_socket7_3v.c
index 41f212b32..706608748 100644
--- a/src/machine/m_at_socket7_3v.c
+++ b/src/machine/m_at_socket7_3v.c
@@ -108,7 +108,7 @@ machine_at_thor_common_init(const machine_t *model, int has_video)
 
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 }
 
@@ -360,7 +360,7 @@ machine_at_endeavor_init(const machine_t *model)
 
     device_add(&i430fx_device);
     device_add(&piix_device);
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
@@ -455,7 +455,7 @@ machine_at_pb640_init(const machine_t *model)
     if (gfxcard[0] == VID_INTERNAL)
         device_add(machine_get_vid_device(machine));
 
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_ami_device);
 
     return ret;
@@ -715,7 +715,7 @@ machine_at_p55t2s_init(const machine_t *model)
     pci_register_slot(0x07, PCI_CARD_SOUTHBRIDGE, 0, 0, 0, 0);
     device_add(&i430hx_device);
     device_add(&piix3_device);
-    device_add_params(&pc87306_device, (void *) PC8730X_AMI_MEGAKEY);
+    device_add_params(&pc87306_device, (void *) PCX730X_AMI);
     device_add(&intel_flash_bxt_device);
 
     return ret;
diff --git a/src/sio/sio_pc87306.c b/src/sio/sio_pc87306.c
index 67f3dd59d..5b55907dd 100644
--- a/src/sio/sio_pc87306.c
+++ b/src/sio/sio_pc87306.c
@@ -509,7 +509,7 @@ pc87306_init(UNUSED(const device_t *info))
 {
     pc87306_t *dev = (pc87306_t *) calloc(1, sizeof(pc87306_t));
 
-    dev->kbc_type  = info->local & PC8730X_KBC;
+    dev->kbc_type  = info->local & PCX730X_KBC;
 
     dev->fdc = device_add(&fdc_at_nsc_device);
 
@@ -521,14 +521,14 @@ pc87306_init(UNUSED(const device_t *info))
     dev->nvr = device_add(&at_mb_nvr_device);
 
     switch (dev->kbc_type) {
-        case PC8730X_AMI_MEGAKEY:
+        case PCX730X_AMI:
         default:
             dev->kbc = device_add(&kbc_ps2_intel_ami_pci_device);
             break;
-        case PC8730X_PHOENIX_42:
+        case PCX730X_PHOENIX_42:
             dev->kbc = device_add(&kbc_ps2_phoenix_device);
             break;
-        case PC8730X_PHOENIX_42I:
+        case PCX730X_PHOENIX_42I:
             dev->kbc = device_add(&kbc_ps2_phoenix_pci_device);
             break;
     }