diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c
index 37128fbcc..d7cd6f734 100644
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -422,6 +422,8 @@ cdrom_seek(cdrom_t *dev, uint32_t pos, uint8_t vendor_type)
         case 0x80:
             pos = bcd2bin((pos >> 24) & 0xff);
             break;
+        default:
+            break;
     }
 
     dev->seek_pos = pos;
@@ -611,6 +613,8 @@ cdrom_audio_track_search(cdrom_t *dev, uint32_t pos, int type, uint8_t playbit)
             }
             dev->seek_pos = (pos >> 24) & 0xff;
             break;
+        default:
+            break;
     }
 
     /* Unlike standard commands, if there's a data track on an Audio CD (mixed mode)
@@ -652,6 +656,8 @@ cdrom_audio_play_toshiba(cdrom_t *dev, uint32_t pos, int type)
             }
             dev->cd_end = pos;
             break;
+        default:
+            break;
     }
 
     cdrom_log("Toshiba/NEC Play Audio: MSF = %06x, type = %02x, cdstatus = %02x\n", pos, type, dev->cd_status);
@@ -698,6 +704,8 @@ cdrom_audio_scan(cdrom_t *dev, uint32_t pos, int type)
         case 0x80:
             dev->seek_pos = (pos >> 24) & 0xff;
             break;
+        default:
+            break;
     }
 
     /* Do this at this point, since it's at this point that we know the
@@ -1331,13 +1339,15 @@ cdrom_read_disc_info_toc(cdrom_t *dev, unsigned char *b, unsigned char track, in
             b[2] = 0;
             b[3] = 0;
             break;
+        default:
+            break;
     }
 
     return 1;
 }
 
 static int
-track_type_is_valid(uint8_t id, int type, int flags, int audio, int mode2)
+track_type_is_valid(UNUSED(uint8_t id), int type, int flags, int audio, int mode2)
 {
     if (!(flags & 0x70) && (flags & 0xf8)) { /* 0x08/0x80/0x88 are illegal modes */
         cdrom_log("CD-ROM %i: [Any Mode] 0x08/0x80/0x88 are illegal modes\n", id);
diff --git a/src/cdrom/cdrom_image_backend.c b/src/cdrom/cdrom_image_backend.c
index 5d8294213..7dae28bf4 100644
--- a/src/cdrom/cdrom_image_backend.c
+++ b/src/cdrom/cdrom_image_backend.c
@@ -283,7 +283,7 @@ cdi_get_audio_track_pre(cd_img_t *cdi, int track)
 
 /* This replaces both Info and EndInfo, they are specified by a variable. */
 int
-cdi_get_audio_track_info(cd_img_t *cdi, int end, int track, int *track_num, TMSF *start, uint8_t *attr)
+cdi_get_audio_track_info(cd_img_t *cdi, UNUSED(int end), int track, int *track_num, TMSF *start, uint8_t *attr)
 {
     track_t *trk = &cdi->tracks[track - 1];
     int      pos = trk->start + 150;
@@ -302,7 +302,7 @@ cdi_get_audio_track_info(cd_img_t *cdi, int end, int track, int *track_num, TMSF
 }
 
 int
-cdi_get_audio_track_info_lba(cd_img_t *cdi, int end, int track, int *track_num, uint32_t *start, uint8_t *attr)
+cdi_get_audio_track_info_lba(cd_img_t *cdi, UNUSED(int end), int track, int *track_num, uint32_t *start, uint8_t *attr)
 {
     track_t *trk = &cdi->tracks[track - 1];
 
diff --git a/src/cdrom/cdrom_image_viso.c b/src/cdrom/cdrom_image_viso.c
index 2feff2aff..41498baa0 100644
--- a/src/cdrom/cdrom_image_viso.c
+++ b/src/cdrom/cdrom_image_viso.c
@@ -114,8 +114,10 @@ typedef struct _viso_entry_ {
 } viso_entry_t;
 
 typedef struct {
-    uint64_t vol_size_offsets[2], pt_meta_offsets[2];
-    int      format, use_version_suffix : 1;
+    uint64_t vol_size_offsets[2];
+    uint64_t pt_meta_offsets[2];
+    int      format;
+    int      use_version_suffix : 1;
     size_t   metadata_sectors, all_sectors, entry_map_size, sector_size, file_fifo_pos;
     uint8_t *metadata;
 
diff --git a/src/cdrom/cdrom_mitsumi.c b/src/cdrom/cdrom_mitsumi.c
index e7e12bb94..40c31a2f1 100644
--- a/src/cdrom/cdrom_mitsumi.c
+++ b/src/cdrom/cdrom_mitsumi.c
@@ -242,9 +242,11 @@ mitsumi_cdrom_in(uint16_t port, void *priv)
                 ret |= FLAG_NOSTAT;
             pclog("Read port 1: ret = %02x\n", ret | FLAG_UNK);
             return ret | FLAG_UNK;
+        default:
+            break;
     }
 
-    return (0xff);
+    return 0xff;
 }
 
 static void
@@ -283,6 +285,8 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
                                     case 0x10:
                                         dev->enable_irq = val;
                                         break;
+                                    default:
+                                        break;
                                 }
                                 dev->cmdbuf[1]    = 0;
                                 dev->cmdbuf_count = 2;
@@ -297,6 +301,8 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
                                 if (dev->conf == 1)
                                     dev->cmdrd_count++;
                                 break;
+                            default:
+                                break;
                         }
                         break;
                     case CMD_READ1X:
@@ -320,8 +326,12 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
                             case 3:
                                 dev->readmsf |= CD_DCB(val) << ((dev->cmdrd_count - 3) << 3);
                                 break;
+                            default:
+                                break;
                         }
                         break;
+                    default:
+                        break;
                 }
                 if (!dev->cmdrd_count)
                     dev->stat = cdrom.host_drive ? (STAT_READY | (dev->change ? STAT_CHANGE : 0)) : 0;
@@ -406,11 +416,13 @@ mitsumi_cdrom_out(uint16_t port, uint8_t val, void *priv)
         case 1:
             mitsumi_cdrom_reset(dev);
             break;
+        default:
+            break;
     }
 }
 
 static void *
-mitsumi_cdrom_init(const device_t *info)
+mitsumi_cdrom_init(UNUSED(const device_t *info))
 {
     mcd_t *dev;
 
diff --git a/src/chipset/82c100.c b/src/chipset/82c100.c
index 4d75ca387..607f63cb7 100644
--- a/src/chipset/82c100.c
+++ b/src/chipset/82c100.c
@@ -28,6 +28,7 @@
 #include <86box/io.h>
 #include <86box/mem.h>
 #include <86box/nmi.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/rom.h>
 #include <86box/chipset.h>
@@ -349,7 +350,7 @@ ct_82c100_close(void *priv)
 }
 
 static void *
-ct_82c100_init(const device_t *info)
+ct_82c100_init(UNUSED(const device_t *info))
 {
     ct_82c100_t *dev;
 
diff --git a/src/chipset/acc2168.c b/src/chipset/acc2168.c
index 765913672..72f296e26 100644
--- a/src/chipset/acc2168.c
+++ b/src/chipset/acc2168.c
@@ -30,6 +30,7 @@
 #include <86box/io.h>
 #include <86box/mem.h>
 #include <86box/port_92.h>
+#include <86box/plat_unused.h>
 #include <86box/chipset.h>
 
 #define ENABLED_SHADOW  (MEM_READ_INTERNAL | ((dev->regs[0x02] & 0x20) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL))
@@ -158,6 +159,8 @@ acc2168_write(uint16_t addr, uint8_t val, void *p)
                     break;
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -178,7 +181,7 @@ acc2168_close(void *priv)
 }
 
 static void *
-acc2168_init(const device_t *info)
+acc2168_init(UNUSED(const device_t *info))
 {
     acc2168_t *dev = (acc2168_t *) malloc(sizeof(acc2168_t));
     memset(dev, 0, sizeof(acc2168_t));
diff --git a/src/chipset/ali1429.c b/src/chipset/ali1429.c
index e245603a9..6f85d7bb5 100644
--- a/src/chipset/ali1429.c
+++ b/src/chipset/ali1429.c
@@ -239,12 +239,16 @@ ali1429_write(uint16_t addr, uint8_t val, void *priv)
                             case 6:
                                 cpu_set_isa_speed(cpu_busspeed / 12);
                                 break;
+                            default:
+                                break;
                         }
                         break;
 
                     case 0x21 ... 0x27:
                         dev->regs[dev->index] = val;
                         break;
+                    default:
+                        break;
                 }
 
                 /* M1429G Only Registers */
@@ -260,10 +264,14 @@ ali1429_write(uint16_t addr, uint8_t val, void *priv)
                         case 0x57:
                             dev->reg_57h = val;
                             break;
+                        default:
+                            break;
                     }
                 }
             }
             break;
+        default:
+            break;
     }
 }
 
diff --git a/src/chipset/ali1435.c b/src/chipset/ali1435.c
index c80611e1b..dd04d9e39 100644
--- a/src/chipset/ali1435.c
+++ b/src/chipset/ali1435.c
@@ -31,6 +31,7 @@
 #include <86box/timer.h>
 #include <86box/pic.h>
 #include <86box/pit.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdc.h>
@@ -188,11 +189,12 @@ ali1435_write(uint16_t addr, uint8_t val, void *priv)
             break;
 
         case 0x23:
-            /* #ifdef ENABLE_ALI1435_LOG
-                            if (dev->index != 0x03)
-                                    ali1435_log("M1435: dev->regs[%02x] = %02x\n", dev->index, val);
-            #endif */
-
+#if 0
+#ifdef ENABLE_ALI1435_LOG
+            if (dev->index != 0x03)
+                ali1435_log("M1435: dev->regs[%02x] = %02x\n", dev->index, val);
+#endif
+#endif
             if (dev->index == 0x03)
                 dev->cfg_locked = (val != 0x69);
 
@@ -216,9 +218,14 @@ ali1435_write(uint16_t addr, uint8_t val, void *priv)
                     case 0x07:
                         dev->regs[dev->index] = val;
                         break;
+
+                    default:
+                        break;
                 }
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -277,7 +284,7 @@ ali1435_close(void *p)
 }
 
 static void *
-ali1435_init(const device_t *info)
+ali1435_init(UNUSED(const device_t *info))
 {
     ali1435_t *dev = (ali1435_t *) malloc(sizeof(ali1435_t));
     memset(dev, 0, sizeof(ali1435_t));
@@ -294,10 +301,12 @@ ali1435_init(const device_t *info)
 
     ali1435_reset(dev);
 
-    /* pci_set_irq_level(PCI_INTA, 0);
+#if 0
+    pci_set_irq_level(PCI_INTA, 0);
     pci_set_irq_level(PCI_INTB, 0);
     pci_set_irq_level(PCI_INTC, 0);
-    pci_set_irq_level(PCI_INTD, 0); */
+    pci_set_irq_level(PCI_INTD, 0);
+#endif
 
     return dev;
 }
diff --git a/src/chipset/ali1489.c b/src/chipset/ali1489.c
index c7139612a..ae9145b93 100644
--- a/src/chipset/ali1489.c
+++ b/src/chipset/ali1489.c
@@ -35,6 +35,7 @@
 #include <86box/nmi.h>
 #include <86box/pic.h>
 #include <86box/pci.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/smram.h>
 
@@ -126,6 +127,8 @@ ali1489_smram_recalc(ali1489_t *dev)
             else
                 smram_enable(dev->smram, 0x38000, 0xa8000, 0x08000, (dev->regs[0x19] & 0x08), 1);
             break;
+        default:
+            break;
     }
 
     if ((dev->regs[0x19] & 0x31) == 0x11) {
@@ -320,6 +323,8 @@ ali1489_write(uint16_t addr, uint8_t val, void *priv)
                                 case 0x30:
                                     picint(1 << 10);
                                     break;
+                                default:
+                                    break;
                             }
                             dev->regs[0x35] |= 0x0e;
                         } else if (!(val & 0x10))
@@ -381,6 +386,8 @@ ali1489_write(uint16_t addr, uint8_t val, void *priv)
                         /* TODO: When doing the IRQ and PCI IRQ rewrite, bits 0 to 3 toggle edge/level output. */
                         dev->regs[dev->index] = val;
                         break;
+                    default:
+                        break;
                 }
 
                 if (dev->index != 0x03) {
@@ -390,6 +397,9 @@ ali1489_write(uint16_t addr, uint8_t val, void *priv)
                 dev->regs[dev->index] = val;
 
             break;
+
+        default:
+            break;
     }
 }
 
@@ -409,6 +419,8 @@ ali1489_read(uint16_t addr, void *priv)
             else
                 ret = dev->regs[dev->index];
             break;
+        default:
+            break;
     }
 
     ali1489_log("M1489: dev->regs[%02x] (%02x)\n", dev->index, ret);
@@ -417,7 +429,7 @@ ali1489_read(uint16_t addr, void *priv)
 }
 
 static void
-ali1489_pci_write(int func, int addr, uint8_t val, void *priv)
+ali1489_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     ali1489_t *dev = (ali1489_t *) priv;
 
@@ -433,11 +445,13 @@ ali1489_pci_write(int func, int addr, uint8_t val, void *priv)
         case 0x07:
             dev->pci_conf[0x07] &= ~(val & 0xb8);
             break;
+        default:
+            break;
     }
 }
 
 static uint8_t
-ali1489_pci_read(int func, int addr, void *priv)
+ali1489_pci_read(UNUSED(int func), int addr, void *priv)
 {
     ali1489_t *dev = (ali1489_t *) priv;
     uint8_t    ret = 0xff;
@@ -529,8 +543,12 @@ ali1489_ide_write(uint16_t addr, uint8_t val, void *priv)
                     dev->ide_regs[dev->ide_index] = val;
                     ali1489_ide_handler(dev);
                     break;
+                default:
+                    break;
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -548,6 +566,8 @@ ali1489_ide_read(uint16_t addr, void *priv)
             ret = dev->ide_regs[dev->ide_index];
             ali1489_log("M1489-IDE: dev->regs[%02x] (%02x)\n", dev->ide_index, ret);
             break;
+        default:
+            break;
     }
 
     return ret;
@@ -576,7 +596,7 @@ ali1489_close(void *priv)
 }
 
 static void *
-ali1489_init(const device_t *info)
+ali1489_init(UNUSED(const device_t *info))
 {
     ali1489_t *dev = (ali1489_t *) malloc(sizeof(ali1489_t));
     memset(dev, 0, sizeof(ali1489_t));
diff --git a/src/chipset/ali1531.c b/src/chipset/ali1531.c
index 8d8358731..d3e049ecb 100644
--- a/src/chipset/ali1531.c
+++ b/src/chipset/ali1531.c
@@ -28,6 +28,7 @@
 #include <86box/io.h>
 #include <86box/mem.h>
 #include <86box/pci.h>
+#include <86box/plat_unused.h>
 #include <86box/smram.h>
 #include <86box/spd.h>
 
@@ -82,6 +83,8 @@ ali1531_smram_recalc(uint8_t val, ali1531_t *dev)
                 if (val & 0x10)
                     mem_set_mem_state_smram_ex(1, 0x30000, 0x10000, 0x02);
                 break;
+            default:
+                break;
         }
     }
 
@@ -89,7 +92,7 @@ ali1531_smram_recalc(uint8_t val, ali1531_t *dev)
 }
 
 static void
-ali1531_shadow_recalc(int cur_reg, ali1531_t *dev)
+ali1531_shadow_recalc(UNUSED(int cur_reg), ali1531_t *dev)
 {
     int      bit;
     int      r_reg;
@@ -124,7 +127,7 @@ ali1531_shadow_recalc(int cur_reg, ali1531_t *dev)
 }
 
 static void
-ali1531_write(int func, int addr, uint8_t val, void *priv)
+ali1531_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     ali1531_t *dev = (ali1531_t *) priv;
 
@@ -228,8 +231,10 @@ ali1531_write(int func, int addr, uint8_t val, void *priv)
         case 0x57: /* H2PO */
             dev->pci_conf[addr] = val & 0x60;
             /* Find where the Shut-down Special cycle is initiated. */
-            // if (!(val & 0x20))
-            // outb(0x92, 0x01);
+#if 0
+            if (!(val & 0x20))
+                outb(0x92, 0x01);
+#endif
             break;
 
         case 0x58:
@@ -288,11 +293,14 @@ ali1531_write(int func, int addr, uint8_t val, void *priv)
         case 0x83:
             dev->pci_conf[addr] = val & 0x10;
             break;
+
+        default:
+            break;
     }
 }
 
 static uint8_t
-ali1531_read(int func, int addr, void *priv)
+ali1531_read(UNUSED(int func), int addr, void *priv)
 {
     ali1531_t *dev = (ali1531_t *) priv;
     uint8_t    ret = 0xff;
@@ -361,7 +369,7 @@ ali1531_close(void *priv)
 }
 
 static void *
-ali1531_init(const device_t *info)
+ali1531_init(UNUSED(const device_t *info))
 {
     ali1531_t *dev = (ali1531_t *) malloc(sizeof(ali1531_t));
     memset(dev, 0, sizeof(ali1531_t));
diff --git a/src/chipset/ali1541.c b/src/chipset/ali1541.c
index 509bb95f2..716106722 100644
--- a/src/chipset/ali1541.c
+++ b/src/chipset/ali1541.c
@@ -28,6 +28,7 @@
 #include <86box/io.h>
 #include <86box/mem.h>
 #include <86box/pci.h>
+#include <86box/plat_unused.h>
 #include <86box/smram.h>
 #include <86box/spd.h>
 
@@ -83,6 +84,8 @@ ali1541_smram_recalc(uint8_t val, ali1541_t *dev)
                 if (val & 0x10)
                     mem_set_mem_state_smram_ex(1, 0x30000, 0x10000, 0x02);
                 break;
+            default:
+                break;
         }
     }
 
@@ -90,7 +93,7 @@ ali1541_smram_recalc(uint8_t val, ali1541_t *dev)
 }
 
 static void
-ali1541_shadow_recalc(int cur_reg, ali1541_t *dev)
+ali1541_shadow_recalc(UNUSED(int cur_reg), ali1541_t *dev)
 {
     int      bit;
     int      r_reg;
@@ -131,8 +134,8 @@ ali1541_mask_bar(ali1541_t *dev)
     uint32_t mask;
 
     switch (dev->pci_conf[0xbc] & 0x0f) {
-        case 0x00:
         default:
+        case 0x00:
             mask = 0x00000000;
             break;
         case 0x01:
@@ -170,7 +173,7 @@ ali1541_mask_bar(ali1541_t *dev)
 }
 
 static void
-ali1541_write(int func, int addr, uint8_t val, void *priv)
+ali1541_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     ali1541_t *dev = (ali1541_t *) priv;
 
@@ -367,8 +370,10 @@ ali1541_write(int func, int addr, uint8_t val, void *priv)
         case 0x87: /* H2PO */
             dev->pci_conf[addr] = val;
             /* Find where the Shut-down Special cycle is initiated. */
-            // if (!(val & 0x20))
-            // outb(0x92, 0x01);
+#if 0
+            if (!(val & 0x20))
+                outb(0x92, 0x01);
+#endif
             break;
 
         case 0x88:
@@ -546,11 +551,14 @@ ali1541_write(int func, int addr, uint8_t val, void *priv)
         case 0xf7:
             dev->pci_conf[addr] = val & 0x43;
             break;
+
+        default:
+            break;
     }
 }
 
 static uint8_t
-ali1541_read(int func, int addr, void *priv)
+ali1541_read(UNUSED(int func), int addr, void *priv)
 {
     ali1541_t *dev = (ali1541_t *) priv;
     uint8_t    ret = 0xff;
@@ -628,7 +636,7 @@ ali1541_close(void *priv)
 }
 
 static void *
-ali1541_init(const device_t *info)
+ali1541_init(UNUSED(const device_t *info))
 {
     ali1541_t *dev = (ali1541_t *) malloc(sizeof(ali1541_t));
     memset(dev, 0, sizeof(ali1541_t));
diff --git a/src/chipset/ali1543.c b/src/chipset/ali1543.c
index fcad2486a..917780515 100644
--- a/src/chipset/ali1543.c
+++ b/src/chipset/ali1543.c
@@ -36,6 +36,7 @@
 #include <86box/nvr.h>
 #include <86box/pci.h>
 #include <86box/pic.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/sio.h>
 #include <86box/smbus.h>
@@ -95,7 +96,7 @@ ali1543_log(const char *fmt, ...)
 #endif
 
 static void
-ali1533_ddma_handler(ali1543_t *dev)
+ali1533_ddma_handler(UNUSED(ali1543_t *dev))
 {
     /* TODO: Find any documentation that actually explains the ALi southbridge DDMA mapping. */
 }
@@ -168,6 +169,8 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
                 case 6:
                     cpu_set_isa_pci_div((val & 7) + 1);
                     break;
+                default:
+                    break;
             }
             break;
 
@@ -227,8 +230,10 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
                 dev->pci_conf[addr] = val;
 
                 ali1543_log("SIRQI = IRQ %i; SIRQII = IRQ %i\n", ali1533_irq_routing[(val >> 4) & 0x0f], ali1533_irq_routing[val & 0x0f]);
-                // pci_set_mirq_routing(PCI_MIRQ0, ali1533_irq_routing[(val >> 4) & 0x0f]);
-                // pci_set_mirq_routing(PCI_MIRQ1, ali1533_irq_routing[val & 0x0f]);
+#if 0
+                pci_set_mirq_routing(PCI_MIRQ0, ali1533_irq_routing[(val >> 4) & 0x0f]);
+                pci_set_mirq_routing(PCI_MIRQ1, ali1533_irq_routing[val & 0x0f]);
+#endif
             }
             break;
 
@@ -293,6 +298,8 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
                 case 0x30:
                     dev->ide_slot = 0x0d; /* A24 = slot 13 */
                     break;
+                default:
+                    break;
             }
             pci_relocate_slot(PCI_CARD_SOUTHBRIDGE_IDE, ((int) dev->ide_slot) + dev->offset);
             ali1543_log("IDE slot = %02X (A%0i)\n", ((int) dev->ide_slot) + dev->offset, dev->ide_slot + 11);
@@ -364,6 +371,8 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
                 case 0x0c:
                     dev->pmu_slot = 0x04; /* A15 = slot 04 */
                     break;
+                default:
+                    break;
             }
             pci_relocate_slot(PCI_CARD_SOUTHBRIDGE_PMU, ((int) dev->pmu_slot) + dev->offset);
             ali1543_log("PMU slot = %02X (A%0i)\n", ((int) dev->pmu_slot) + dev->offset, dev->pmu_slot + 11);
@@ -380,6 +389,8 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
                 case 0x03:
                     dev->usb_slot = 0x01; /* A12 = slot 01 */
                     break;
+                default:
+                    break;
             }
             pci_relocate_slot(PCI_CARD_SOUTHBRIDGE_USB, ((int) dev->usb_slot) + dev->offset);
             ali1543_log("USB slot = %02X (A%0i)\n", ((int) dev->usb_slot) + dev->offset, dev->usb_slot + 11);
@@ -437,6 +448,9 @@ ali1533_write(int func, int addr, uint8_t val, void *priv)
                 dev->pmu_dev_enable = 0;
             }
             break;
+
+        default:
+            break;
     }
 }
 
@@ -509,6 +523,8 @@ ali5229_ide_irq_handler(ali1543_t *dev)
                 sff_set_irq_mode(dev->ide_controller[ctl], 0 ^ ch, 0);
                 sff_set_irq_mode(dev->ide_controller[ctl], 1 ^ ch, 2);
                 break;
+            default:
+                break;
         }
     }
 
@@ -546,6 +562,8 @@ ali5229_ide_irq_handler(ali1543_t *dev)
                 sff_set_irq_mode(dev->ide_controller[ctl], 0 ^ ch, 0);
                 sff_set_irq_mode(dev->ide_controller[ctl], 1 ^ ch, 2);
                 break;
+            default:
+                break;
         }
     }
 }
@@ -857,6 +875,9 @@ ali5229_write(int func, int addr, uint8_t val, void *priv)
         case 0x5f:
             dev->ide_conf[addr] = val & 0x7f;
             break;
+
+        default:
+            break;
     }
 }
 
@@ -942,6 +963,9 @@ ali5237_write(int func, int addr, uint8_t val, void *priv)
             if (!(dev->usb_conf[0x42] & 0x10))
                 dev->usb_conf[addr] = val;
             break;
+
+        default:
+            break;
     }
 }
 
@@ -1426,6 +1450,9 @@ ali7101_read(int func, int addr, void *priv)
                 case 0x74:
                     dev->pmu_conf[addr] &= 0xcc;
                     break;
+
+                default:
+                    break;
             }
         }
     }
diff --git a/src/chipset/ali1621.c b/src/chipset/ali1621.c
index aba05e776..73b65d801 100644
--- a/src/chipset/ali1621.c
+++ b/src/chipset/ali1621.c
@@ -28,6 +28,7 @@
 #include <86box/io.h>
 #include <86box/mem.h>
 #include <86box/pci.h>
+#include <86box/plat_unused.h>
 #include <86box/smram.h>
 #include <86box/spd.h>
 
@@ -111,6 +112,8 @@ ali1621_smram_recalc(uint8_t val, ali1621_t *dev)
                 case 0x30: /* Protect. */
                     access_smm |= ACCESS_SMRAM_R;
                     break;
+                default:
+                    break;
             }
         }
 
@@ -122,6 +125,8 @@ ali1621_smram_recalc(uint8_t val, ali1621_t *dev)
                 case 0x30: /* Protect. */
                     access_smm |= ACCESS_SMRAM_W;
                     break;
+                default:
+                    break;
             }
 
         smram_enable(dev->smram[0], 0xa0000, 0xa0000, 0x20000, ((val & 0x30) == 0x10), (val & 0x30));
@@ -137,7 +142,7 @@ ali1621_smram_recalc(uint8_t val, ali1621_t *dev)
 }
 
 static void
-ali1621_shadow_recalc(int cur_reg, ali1621_t *dev)
+ali1621_shadow_recalc(UNUSED(int cur_reg), ali1621_t *dev)
 {
     int      r_bit;
     int      w_bit;
@@ -207,8 +212,8 @@ ali1621_mask_bar(ali1621_t *dev)
     uint32_t mask;
 
     switch (dev->pci_conf[0xbc] & 0x0f) {
-        case 0x00:
         default:
+        case 0x00:
             mask = 0x00000000;
             break;
         case 0x01:
@@ -246,7 +251,7 @@ ali1621_mask_bar(ali1621_t *dev)
 }
 
 static void
-ali1621_write(int func, int addr, uint8_t val, void *priv)
+ali1621_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     ali1621_t *dev = (ali1621_t *) priv;
 
@@ -565,11 +570,14 @@ ali1621_write(int func, int addr, uint8_t val, void *priv)
         case 0xf0 ... 0xff:
             dev->pci_conf[addr] = val;
             break;
+
+        default:
+            break;
     }
 }
 
 static uint8_t
-ali1621_read(int func, int addr, void *priv)
+ali1621_read(UNUSED(int func), int addr, void *priv)
 {
     ali1621_t *dev = (ali1621_t *) priv;
     uint8_t    ret = 0xff;
@@ -653,7 +661,7 @@ ali1621_close(void *priv)
 }
 
 static void *
-ali1621_init(const device_t *info)
+ali1621_init(UNUSED(const device_t *info))
 {
     ali1621_t *dev = (ali1621_t *) malloc(sizeof(ali1621_t));
     memset(dev, 0, sizeof(ali1621_t));
diff --git a/src/chipset/ali6117.c b/src/chipset/ali6117.c
index 3d86fbcd2..7ac5e19b2 100644
--- a/src/chipset/ali6117.c
+++ b/src/chipset/ali6117.c
@@ -277,6 +277,9 @@ ali6117_reg_write(uint16_t addr, uint8_t val, void *priv)
                         case 0x7:
                             cpu_set_isa_speed(cpu_busspeed / 6);
                             break;
+
+                        default:
+                            break;
                     }
                     break;
 
@@ -372,6 +375,9 @@ ali6117_reg_write(uint16_t addr, uint8_t val, void *priv)
                 case 0x71:
                     val &= 0x1f;
                     break;
+
+                default:
+                    break;
             }
 
         dev->regs[dev->reg_offset] = val;
diff --git a/src/chipset/contaq_82c59x.c b/src/chipset/contaq_82c59x.c
index 720d7c81e..77e78d854 100644
--- a/src/chipset/contaq_82c59x.c
+++ b/src/chipset/contaq_82c59x.c
@@ -82,6 +82,8 @@ contaq_82c59x_isa_speed_recalc(contaq_82c59x_t *dev)
             case 0x03:
                 cpu_set_isa_speed(cpu_busspeed / 5);
                 break;
+            default:
+                break;
         }
     }
 }
@@ -274,8 +276,14 @@ contaq_82c59x_write(uint16_t addr, uint8_t val, void *priv)
                 case 0x7c:
                     dev->regs[dev->index] = val;
                     break;
+
+                default:
+                    break;
             }
             break;
+        
+        default:
+            break;
     }
 }
 
diff --git a/src/chipset/cs4031.c b/src/chipset/cs4031.c
index a2cef50b9..d6267d5e0 100644
--- a/src/chipset/cs4031.c
+++ b/src/chipset/cs4031.c
@@ -27,6 +27,7 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/chipset.h>
 
@@ -134,8 +135,14 @@ cs4031_write(uint16_t addr, uint8_t val, void *priv)
                     dev->regs[dev->index] = val & 0xb3;
                     port_92_set_features(dev->port_92, val & 0x10, val & 0x20);
                     break;
+
+                default:
+                    break;
             }
             break;
+
+            default:
+                break;
     }
 }
 
@@ -156,7 +163,7 @@ cs4031_close(void *priv)
 }
 
 static void *
-cs4031_init(const device_t *info)
+cs4031_init(UNUSED(const device_t *info))
 {
     cs4031_t *dev = (cs4031_t *) malloc(sizeof(cs4031_t));
     memset(dev, 0, sizeof(cs4031_t));
diff --git a/src/chipset/cs8230.c b/src/chipset/cs8230.c
index edf4ac8c2..d78e64afb 100644
--- a/src/chipset/cs8230.c
+++ b/src/chipset/cs8230.c
@@ -25,6 +25,7 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/chipset.h>
@@ -51,6 +52,8 @@ shadow_control(uint32_t addr, uint32_t size, int state)
         case 0x11:
             mem_set_mem_state(addr, size, MEM_READ_EXTANY | MEM_WRITE_EXTANY);
             break;
+        default:
+            break;
     }
 
     flushmmucache_nopc();
@@ -112,6 +115,8 @@ cs8230_read(uint16_t port, void *p)
             case 0x2a:
                 ret = cs8230->regs[cs8230->idx];
                 break;
+            default:
+                break;
         }
     }
 
@@ -137,6 +142,8 @@ cs8230_write(uint16_t port, uint8_t val, void *p)
             case 0x0f: /* Address maps */
                 rethink_shadow_mappings(cs8230);
                 break;
+            default:
+                break;
         }
     }
 }
@@ -151,7 +158,7 @@ cs8230_close(void *priv)
 
 static void
     *
-    cs8230_init(const device_t *info)
+    cs8230_init(UNUSED(const device_t *info))
 {
     cs8230_t *cs8230 = (cs8230_t *) malloc(sizeof(cs8230_t));
     memset(cs8230, 0, sizeof(cs8230_t));
diff --git a/src/chipset/et6000.c b/src/chipset/et6000.c
index ca011e33c..1377b1a51 100644
--- a/src/chipset/et6000.c
+++ b/src/chipset/et6000.c
@@ -28,6 +28,7 @@
 #include <86box/device.h>
 #include <86box/mem.h>
 #include <86box/pit.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/chipset.h>
 
@@ -105,9 +106,15 @@ et6000_write(uint16_t addr, uint8_t val, void *priv)
                     et6000_shadow_control(0xe0000, 0x10000, val & 0x20, (val & 0x20) && (val & 0x10));
                     et6000_shadow_control(0xf0000, 0x10000, val & 0x40, !(val & 0x40));
                     break;
+
+                default:
+                    break;
             }
             et6000_log("ET6000: dev->regs[%02x] = %02x\n", dev->index, dev->regs[dev->index]);
             break;
+
+        default:
+            break;
     }
 }
 
@@ -128,7 +135,7 @@ et6000_close(void *priv)
 }
 
 static void *
-et6000_init(const device_t *info)
+et6000_init(UNUSED(const device_t *info))
 {
     et6000_t *dev = (et6000_t *) malloc(sizeof(et6000_t));
     memset(dev, 0, sizeof(et6000_t));
diff --git a/src/chipset/gc100.c b/src/chipset/gc100.c
index 0df25b1d6..5110b48eb 100644
--- a/src/chipset/gc100.c
+++ b/src/chipset/gc100.c
@@ -70,7 +70,7 @@ gc100_log(const char *fmt, ...)
 static uint8_t
 get_fdd_switch_settings(void)
 {
-    int fdd_count = 0;
+    uint8_t fdd_count = 0;
 
     for (uint8_t i = 0; i < FDD_NUM; i++) {
         if (fdd_get_flags(i))
@@ -135,6 +135,9 @@ gc100_write(uint16_t port, uint8_t val, void *priv)
             /* addr 0x6 */
 
             /* addr 0x7 */
+
+        default:
+            break;
     }
 
     gc100_log("GC100: Write %02x at %02x\n", val, port);
@@ -187,6 +190,9 @@ gc100_read(uint16_t port, void *priv)
             /* addr 0x6 */
 
             /* addr 0x7 */
+
+        default:
+            break;
     }
 
     return ret;
diff --git a/src/chipset/headland.c b/src/chipset/headland.c
index 31cb75253..cba9ed25d 100644
--- a/src/chipset/headland.c
+++ b/src/chipset/headland.c
@@ -34,6 +34,7 @@
 #include <86box/device.h>
 #include <86box/fdd.h>
 #include <86box/fdc.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/chipset.h>
 
@@ -205,7 +206,7 @@ hl_ems_update(headland_t *dev, uint8_t mar)
 }
 
 static void
-set_global_EMS_state(headland_t *dev, int state)
+set_global_EMS_state(headland_t *dev, UNUSED(int state))
 {
     for (uint8_t i = 0; i < 32; i++) {
         hl_ems_update(dev, i | (((dev->cr[0] & 0x01) << 5) ^ 0x20));
diff --git a/src/chipset/ims8848.c b/src/chipset/ims8848.c
index 34a09ae35..afb12d955 100644
--- a/src/chipset/ims8848.c
+++ b/src/chipset/ims8848.c
@@ -31,6 +31,7 @@
 #include <86box/smram.h>
 #include <86box/pci.h>
 #include <86box/pic.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/chipset.h>
 
@@ -244,10 +245,16 @@ ims8848_write(uint16_t addr, uint8_t val, void *priv)
                         /* Base Memory */
                         ims8848_base_memory(dev);
                         break;
+
+                    default:
+                        break;
                 }
                 dev->access_data = 0;
             }
             break;
+
+            default:
+                break;
     }
 }
 
@@ -276,6 +283,8 @@ ims8848_read(uint16_t addr, void *priv)
             }
             ims8848_log("[R] [%i] REG %02X = %02X\n", old_ad, dev->idx, ret);
             break;
+        default:
+            break;
     }
 
     return ret;
@@ -309,6 +318,9 @@ ims8849_pci_write(int func, int addr, uint8_t val, void *priv)
             case 0x52 ... 0x55:
                 dev->pci_conf[addr] = val;
                 break;
+
+            default:
+                break;
         }
 }
 
@@ -364,7 +376,7 @@ ims8848_close(void *priv)
 }
 
 static void *
-ims8848_init(const device_t *info)
+ims8848_init(UNUSED(const device_t *info))
 {
     ims8848_t *dev = (ims8848_t *) malloc(sizeof(ims8848_t));
     memset(dev, 0, sizeof(ims8848_t));
diff --git a/src/chipset/intel_420ex.c b/src/chipset/intel_420ex.c
index b2a0e082b..b62a4c487 100644
--- a/src/chipset/intel_420ex.c
+++ b/src/chipset/intel_420ex.c
@@ -34,6 +34,7 @@
 #include <86box/pic.h>
 #include <86box/timer.h>
 #include <86box/pit.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdc.h>
@@ -97,6 +98,8 @@ i420ex_map(uint32_t addr, uint32_t size, int state)
         case 3:
             mem_set_mem_state_both(addr, size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
             break;
+        default:
+            break;
     }
     flushmmucache_nopc();
 }
@@ -118,9 +121,9 @@ i420ex_smram_handler_phase1(i420ex_t *dev)
     uint32_t size      = 0x00010000;
 
     switch (regs[0x70] & 0x07) {
+        default:
         case 0:
         case 1:
-        default:
             host_base = ram_base = 0x00000000;
             size                 = 0x00000000;
             break;
@@ -195,6 +198,8 @@ i420ex_write(int func, int addr, uint8_t val, void *priv)
                         ide_set_side(0, 0x0376);
                         ide_pri_enable();
                         break;
+                    default:
+                        break;
                 }
             }
             break;
@@ -356,6 +361,8 @@ i420ex_write(int func, int addr, uint8_t val, void *priv)
             cpu_fast_off_count = val + 1;
             cpu_fast_off_period_set(cpu_fast_off_val, dev->fast_off_period);
             break;
+        default:
+            break;
     }
 }
 
@@ -411,9 +418,9 @@ i420ex_reset_hard(void *priv)
 }
 
 static void
-i420ex_apm_out(uint16_t port, uint8_t val, void *p)
+i420ex_apm_out(UNUSED(uint16_t port), UNUSED(uint8_t val), void *priv)
 {
-    i420ex_t *dev = (i420ex_t *) p;
+    i420ex_t *dev = (i420ex_t *) priv;
 
     if (dev->apm->do_smi)
         dev->regs[0xaa] |= 0x80;
diff --git a/src/chipset/intel_4x0.c b/src/chipset/intel_4x0.c
index bebfa6ade..c9cb4bf17 100644
--- a/src/chipset/intel_4x0.c
+++ b/src/chipset/intel_4x0.c
@@ -28,6 +28,7 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/pci.h>
+#include <86box/plat_unused.h>
 #include <86box/chipset.h>
 #include <86box/spd.h>
 #include <86box/machine.h>
@@ -165,8 +166,8 @@ i4x0_smram_handler_phase1(i4x0_t *dev)
     } else {
         size[0] = 0x00010000;
         switch (*reg & 0x03) {
-            case 0:
             default:
+            case 0:
                 base[0] = (mem_size << 10) - size[0];
                 s       = 1;
                 break;
@@ -222,17 +223,17 @@ i4x0_mask_bar(uint8_t *regs, void *agpgart)
 }
 
 static uint8_t
-pm2_cntrl_read(uint16_t addr, void *p)
+pm2_cntrl_read(UNUSED(uint16_t addr), void *priv)
 {
-    i4x0_t *dev = (i4x0_t *) p;
+    i4x0_t *dev = (i4x0_t *) priv;
 
     return dev->pm2_cntrl & 0x01;
 }
 
 static void
-pm2_cntrl_write(uint16_t addr, uint8_t val, void *p)
+pm2_cntrl_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
 {
-    i4x0_t *dev = (i4x0_t *) p;
+    i4x0_t *dev = (i4x0_t *) priv;
 
     dev->pm2_cntrl = val & 0x01;
 }
@@ -251,6 +252,7 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
         switch (addr) {
             case 0x04: /*Command register*/
                 switch (dev->type) {
+                    default:
                     case INTEL_420TX:
                     case INTEL_420ZX:
                     case INTEL_430LX:
@@ -258,7 +260,6 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440BX:
                     case INTEL_440GX:
                     case INTEL_440ZX:
-                    default:
                         regs[0x04] = (regs[0x04] & ~0x42) | (val & 0x42);
                         break;
                     case INTEL_430FX:
@@ -291,16 +292,18 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440EX:
                         regs[0x05] = val & 0x01;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x07:
                 switch (dev->type) {
+                    default:
                     case INTEL_420TX:
                     case INTEL_420ZX:
                     case INTEL_430LX:
                     case INTEL_430NX:
                     case INTEL_430HX:
-                    default:
                         regs[0x07] &= ~(val & 0x70);
                         break;
                     case INTEL_430FX:
@@ -343,6 +346,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_430TX:
                         regs[0x0f] = (val & 0x40);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x12:
@@ -355,6 +360,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         regs[0x12] = (val & 0xc0);
                         i4x0_mask_bar(regs, dev->agpgart);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x13:
@@ -367,6 +374,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         regs[0x13] = val;
                         i4x0_mask_bar(regs, dev->agpgart);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x2c:
@@ -382,6 +391,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                             regs_l[addr] = 1;
                         }
                         break;
+                    default:
+                        break;
                 }
                 break;
 
@@ -396,14 +407,16 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_430TX:
                         regs[0x4f] = (val & 0x80);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x50:
                 switch (dev->type) {
+                    default:
                     case INTEL_420TX:
                     case INTEL_420ZX:
                     case INTEL_430LX:
-                    default:
                         regs[0x50] = (val & 0xe5);
                         break;
                     case INTEL_430NX:
@@ -467,17 +480,19 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         regs[0x51] = (regs[0x51] & 0xb0) | (val & 0x4f);
                         i4x0_mask_bar(regs, dev->agpgart);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x52: /* Cache Control Register */
                 switch (dev->type) {
+                    default:
                     case INTEL_420TX:
                     case INTEL_420ZX:
                     case INTEL_430LX:
                     case INTEL_430FX:
                     case INTEL_430VX:
                     case INTEL_430TX:
-                    default:
                         regs[0x52] = (val & 0xfb);
                         break;
                     case INTEL_430NX:
@@ -515,6 +530,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         /* Not applicable to 440ZX as that does not support ECC. */
                         regs[0x53] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x54:
@@ -534,6 +551,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440FX:
                         regs[0x54] = val & 0x82;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x55:
@@ -553,6 +572,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440EX:
                         regs[0x55] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x56:
@@ -577,6 +598,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440EX:
                         regs[0x56] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x57:
@@ -628,10 +651,10 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                 break;
             case 0x58:
                 switch (dev->type) {
+                    default:
                     case INTEL_420TX:
                     case INTEL_420ZX:
                     case INTEL_430LX:
-                    default:
                         regs[0x58] = val & 0x01;
                         break;
                     case INTEL_430NX:
@@ -720,6 +743,7 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     break;
                 }
                 switch (dev->type) {
+                    default:
                     case INTEL_420TX:
                     case INTEL_420ZX:
                     case INTEL_430LX:
@@ -731,7 +755,6 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440BX:
                     case INTEL_440ZX:
                     case INTEL_440GX:
-                    default:
                         regs[addr] = val;
                         break;
                     case INTEL_430FX:
@@ -768,6 +791,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_430TX:
                         regs[addr] = val & 0x7f;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x66:
@@ -786,6 +811,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440ZX:
                         regs[addr] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x67:
@@ -810,6 +837,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_430TX:
                         regs[addr] = val & 0xb7;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x68:
@@ -838,6 +867,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440ZX:
                         regs[0x68] = (regs[0x68] & 0x3f) | (val & 0xc0);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x69:
@@ -856,6 +887,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440ZX:
                         regs[0x69] = val & 0x3f;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x6a:
@@ -880,6 +913,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         else
                             regs[addr] = val & 0x33;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x6c:
@@ -899,6 +934,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         else if (addr == 0x6d)
                             regs[addr] = val & 0xcf;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x6f:
@@ -909,6 +946,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440EX:
                         regs[addr] = val & 0xcf;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x70:
@@ -930,6 +969,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440EX:
                         regs[addr] = val & 0xf8;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x71:
@@ -953,6 +994,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440LX:
                         regs[addr] = val & 0x1f;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x72: /* SMRAM */
@@ -998,6 +1041,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                             i4x0_smram_handler_phase1(dev);
                         }
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x74:
@@ -1008,6 +1053,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0x74] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x75:
@@ -1018,6 +1065,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440ZX:
                     case INTEL_440GX:
                         regs[addr] = val;
+                    default:
+                        break;
                 }
                 break;
             case 0x77:
@@ -1025,6 +1074,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440BX:
                     case INTEL_440ZX:
                         regs[0x77] = val & 0x03;
+                    default:
+                        break;
                 }
                 break;
             case 0x78:
@@ -1039,6 +1090,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0x78] = val & 0x1f;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x79:
@@ -1054,6 +1107,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0x79] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x7a:
@@ -1066,6 +1121,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         if (val & 0x40)
                             io_sethandler(0x0022, 0x01, pm2_cntrl_read, NULL, NULL, pm2_cntrl_write, NULL, NULL, dev);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x7c:
@@ -1081,6 +1138,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440ZX:
                         regs[0x7c] = val & 0x1f;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x7d:
@@ -1091,6 +1150,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_430NX:
                         regs[0x7d] = val & 0x32;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x7e:
@@ -1102,6 +1163,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_430NX:
                         regs[addr] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x80:
@@ -1111,6 +1174,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0x80] &= ~(val & 0x03);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x90:
@@ -1132,6 +1197,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0x90] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x91:
@@ -1144,6 +1211,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         /* Not applicable on 82443EX and 82443ZX. */
                         regs[0x91] &= ~(val & 0x11);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x92:
@@ -1157,6 +1226,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0x92] &= ~(val & 0x1f);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0x93:
@@ -1170,6 +1241,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         regs[0x93] = (val & 0x0e);
                         trc_write(0x0093, val & 0x06, NULL);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xa7:
@@ -1178,6 +1251,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440EX:
                         regs[0xa7] = val & 0x1f;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xa8:
@@ -1190,6 +1265,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[addr] = (val & 0x03);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xb0:
@@ -1201,6 +1278,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0xb0] = (val & 0x80);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xb1:
@@ -1214,6 +1293,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0xb1] = (val & 0xa0);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xb4:
@@ -1226,6 +1307,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         regs[0xb4] = (val & 0x3f);
                         i4x0_mask_bar(regs, dev->agpgart);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xb9:
@@ -1238,6 +1321,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         regs[0xb9] = (val & 0xf0);
                         i4x0_mask_bar(regs, dev->agpgart);
                         break;
+                    default:
+                        break;
                 }
                 break;
 
@@ -1252,6 +1337,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         regs[addr] = val;
                         i4x0_mask_bar(regs, dev->agpgart);
                         break;
+                    default:
+                        break;
                 }
                 break;
 
@@ -1261,6 +1348,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440EX:
                         regs[addr] = (val & 0xf8);
                         break;
+                    default:
+                        break;
                 }
                 break;
 
@@ -1270,6 +1359,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440EX:
                         regs[addr] = (val & 0xf8);
                         break;
+                    default:
+                        break;
                 }
                 break;
 
@@ -1287,6 +1378,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[addr] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xca:
@@ -1298,6 +1391,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440ZX:
                         regs[addr] = val & 0xe7;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xcb:
@@ -1309,6 +1404,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440ZX:
                         regs[addr] = val & 0xa7;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xcc:
@@ -1320,6 +1417,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440ZX:
                         regs[0xcc] = (val & 0x58);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xe0:
@@ -1339,6 +1438,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         if (!regs_l[addr])
                             regs[addr] = val;
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xe5:
@@ -1350,6 +1451,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                         if (!regs_l[addr])
                             regs[addr] = (val & 0x3f);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xe7:
@@ -1364,6 +1467,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                             regs[0xe7] |= (val & 0x7f);
                         }
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xf0:
@@ -1373,6 +1478,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0xf0] = (val & 0xc0);
                         break;
+                    default:
+                        break;
                 }
                 break;
             case 0xf1:
@@ -1382,6 +1489,8 @@ i4x0_write(int func, int addr, uint8_t val, void *priv)
                     case INTEL_440GX:
                         regs[0xf1] = (val & 0x03);
                         break;
+                    default:
+                        break;
                 }
                 break;
         }
@@ -1746,6 +1855,8 @@ static void
             dev->drb_unit                                                                                         = 8;
             dev->drb_default                                                                                      = 0x01;
             break;
+        default:
+            break;
     }
 
     regs[0x04] = 0x06;
diff --git a/src/chipset/intel_82335.c b/src/chipset/intel_82335.c
index 678c868f3..d9dc8ae8b 100644
--- a/src/chipset/intel_82335.c
+++ b/src/chipset/intel_82335.c
@@ -28,6 +28,7 @@
 #include <86box/device.h>
 #include <86box/mem.h>
 #include <86box/chipset.h>
+#include <86box/plat_unused.h>
 
 /* Shadow capabilities */
 #define DISABLED_SHADOW (MEM_READ_EXTANY | MEM_WRITE_EXTANY)
@@ -109,7 +110,9 @@ intel_82335_write(uint16_t addr, uint16_t val, void *priv)
                     shadowbios_write = !!(dev->regs[0x22] & 0x01);
 
                     /* Base System 512/640KB set */
-                    // mem_set_mem_state_both(0x80000, 0x20000, (dev->regs[0x22] & 0x08) ? ENABLE_TOP_128KB : DISABLE_TOP_128KB);
+#if 0
+                    mem_set_mem_state_both(0x80000, 0x20000, (dev->regs[0x22] & 0x08) ? ENABLE_TOP_128KB : DISABLE_TOP_128KB);
+#endif
 
                     /* Video RAM shadow*/
                     mem_set_mem_state_both(0xa0000, 0x20000, (dev->regs[0x22] & (0x04 << 8)) ? DETERMINE_VIDEO_RAM_WRITE_ACCESS : DISABLED_SHADOW);
@@ -139,6 +142,9 @@ intel_82335_write(uint16_t addr, uint16_t val, void *priv)
                     }
                     break;
                 }
+
+            default:
+                break;
         }
     }
 
@@ -165,7 +171,7 @@ intel_82335_close(void *priv)
 }
 
 static void *
-intel_82335_init(const device_t *info)
+intel_82335_init(UNUSED(const device_t *info))
 {
     intel_82335_t *dev = (intel_82335_t *) malloc(sizeof(intel_82335_t));
     memset(dev, 0, sizeof(intel_82335_t));
diff --git a/src/chipset/intel_i450kx.c b/src/chipset/intel_i450kx.c
index de6d25422..ef909ea19 100644
--- a/src/chipset/intel_i450kx.c
+++ b/src/chipset/intel_i450kx.c
@@ -35,6 +35,7 @@ i450GX is way more popular of an option but needs more stuff.
 #include <86box/device.h>
 #include <86box/mem.h>
 #include <86box/pci.h>
+#include <86box/plat_unused.h>
 #include <86box/smram.h>
 #include <86box/spd.h>
 #include <86box/chipset.h>
@@ -112,7 +113,9 @@ i450kx_vid_buf_recalc(i450kx_t *dev, int bus)
 {
     uint8_t *regs = bus ? dev->pb_pci_conf : dev->mc_pci_conf;
 
+#if 0
     // int state = (regs[0x58] & 0x02) ? (MEM_READ_EXTANY | MEM_WRITE_EXTANY) : (MEM_READ_DISABLED | MEM_WRITE_DISABLED);
+#endif
     int state = (regs[0x58] & 0x02) ? (MEM_READ_INTERNAL | MEM_WRITE_INTERNAL) : (MEM_READ_EXTANY | MEM_WRITE_EXTANY);
 
     if (bus)
@@ -167,8 +170,10 @@ pb_write(int func, int addr, uint8_t val, void *priv)
             case 0x4a:
             case 0x4b:
                 dev->pb_pci_conf[addr] = val;
-                // if (addr == 0x4a)
-                // pci_remap_bus(dev->bus_index, val);
+#if 0
+                if (addr == 0x4a)
+                    pci_remap_bus(dev->bus_index, val);
+#endif
                 break;
 
             case 0x4c:
@@ -366,6 +371,9 @@ pb_write(int func, int addr, uint8_t val, void *priv)
             case 0xcb:
                 dev->pb_pci_conf[addr] = val;
                 break;
+
+            default:
+                break;
         }
 }
 
@@ -590,6 +598,9 @@ mc_write(int func, int addr, uint8_t val, void *priv)
             case 0xcb:
                 dev->mc_pci_conf[addr] = val;
                 break;
+
+            default:
+                break;
         }
 }
 
@@ -613,7 +624,9 @@ i450kx_reset(void *priv)
     i450kx_t *dev = (i450kx_t *) priv;
     uint32_t  i;
 
+#if 0
     // pclog("i450KX: i450kx_reset()\n");
+#endif
 
     /* Defaults PB */
     dev->pb_pci_conf[0x00] = 0x86;
@@ -671,8 +684,10 @@ i450kx_reset(void *priv)
     dev->pb_pci_conf[0xa6] = 0xfe;
     dev->pb_pci_conf[0xa7] = 0x00;
     /* Note: Do NOT reset these two registers on programmed (TRC) hard reset! */
-    // dev->pb_pci_conf[0xb0] = 0x00;
-    // dev->pb_pci_conf[0xb1] = 0x00;
+#if 0
+    dev->pb_pci_conf[0xb0] = 0x00;
+    dev->pb_pci_conf[0xb1] = 0x00;
+#endif
     dev->pb_pci_conf[0xb4] = 0x00;
     dev->pb_pci_conf[0xb5] = 0x00;
     dev->pb_pci_conf[0xb8] = 0x05;
@@ -693,7 +708,9 @@ i450kx_reset(void *priv)
     dev->pb_pci_conf[0xca] = 0x00;
     dev->pb_pci_conf[0xcb] = 0x00;
 
-    // pci_remap_bus(dev->bus_index, 0x00);
+#if 0
+    pci_remap_bus(dev->bus_index, 0x00);
+#endif
     i450kx_smram_recalc(dev, 1);
     i450kx_vid_buf_recalc(dev, 1);
     pb_write(0, 0x59, 0x30, dev);
@@ -786,7 +803,7 @@ i450kx_close(void *priv)
 }
 
 static void *
-i450kx_init(const device_t *info)
+i450kx_init(UNUSED(const device_t *info))
 {
     i450kx_t *dev = (i450kx_t *) malloc(sizeof(i450kx_t));
     memset(dev, 0, sizeof(i450kx_t));
diff --git a/src/chipset/intel_piix.c b/src/chipset/intel_piix.c
index 3a65d5de3..2b993fd16 100644
--- a/src/chipset/intel_piix.c
+++ b/src/chipset/intel_piix.c
@@ -40,6 +40,7 @@
 #include <86box/pci.h>
 #include <86box/pic.h>
 #include <86box/pit.h>
+#include <86box/plat.h>
 #include <86box/port_92.h>
 #include <86box/scsi_device.h>
 #include <86box/hdc.h>
@@ -135,6 +136,8 @@ smsc_ide_irqs(piix_t *dev)
         case 0x07:
             irq_line = 15;
             break;
+        default:
+            break;
     }
 
     sff_set_irq_line(dev->bm[0], irq_line);
@@ -203,7 +206,7 @@ piix_ide_bm_handlers(piix_t *dev)
 }
 
 static uint8_t
-kbc_alias_reg_read(uint16_t addr, void *p)
+kbc_alias_reg_read(UNUSED(uint16_t addr), UNUSED(void *priv))
 {
     uint8_t ret = inb(0x61);
 
@@ -211,7 +214,7 @@ kbc_alias_reg_read(uint16_t addr, void *p)
 }
 
 static void
-kbc_alias_reg_write(uint16_t addr, uint8_t val, void *p)
+kbc_alias_reg_write(UNUSED(uint16_t addr), uint8_t val, UNUSED(void *priv))
 {
     outb(0x61, val);
 }
@@ -267,7 +270,7 @@ nvr_update_io_mapping(piix_t *dev)
 }
 
 static void
-piix_trap_io(int size, uint16_t addr, uint8_t write, uint8_t val, void *priv)
+piix_trap_io(UNUSED(int size), UNUSED(uint16_t addr), UNUSED(uint8_t write), UNUSED(uint8_t val), void *priv)
 {
     piix_io_trap_t *trap = (piix_io_trap_t *) priv;
 
@@ -555,8 +558,8 @@ piix_write(int func, int addr, uint8_t val, void *priv)
                 break;
             case 0x6a:
                 switch (dev->type) {
-                    case 1:
                     default:
+                    case 1:
                         fregs[0x6a] = (fregs[0x6a] & 0xfb) | (val & 0x04);
                         fregs[0x0e] = (val & 0x04) ? 0x80 : 0x00;
                         piix_log("PIIX: Write %02X\n", val);
@@ -791,6 +794,8 @@ piix_write(int func, int addr, uint8_t val, void *priv)
                     }
                 }
                 break;
+            default:
+                break;
         }
     else if (func == 1)
         switch (addr) { /* IDE */
@@ -1012,6 +1017,8 @@ piix_write(int func, int addr, uint8_t val, void *priv)
                     nvr_read_addr_set(!!(val & 0x10), dev->nvr);
                 }
                 break;
+            default:
+                break;
         }
     else if (func == 3)
         switch (addr) { /* Power Management */
@@ -1145,6 +1152,8 @@ piix_write(int func, int addr, uint8_t val, void *priv)
                 fregs[0x91] = val;
                 smbus_update_io_mapping(dev);
                 break;
+            default:
+                break;
         }
 }
 
@@ -1409,9 +1418,9 @@ piix_reset_hard(piix_t *dev)
 }
 
 static void
-piix_apm_out(uint16_t port, uint8_t val, void *p)
+piix_apm_out(UNUSED(uint16_t port), UNUSED(uint8_t val), void *priv)
 {
-    piix_t *dev = (piix_t *) p;
+    piix_t *dev = (piix_t *) priv;
 
     if (dev->apm->do_smi) {
         if (dev->type < 4)
@@ -1695,7 +1704,9 @@ piix_init(const device_t *info)
     else
         dev->board_config[1] |= 0x00;
 
-    // device_add(&i8254_sec_device);
+#if 0
+    device_add(&i8254_sec_device);
+#endif
 
     return dev;
 }
diff --git a/src/chipset/intel_sio.c b/src/chipset/intel_sio.c
index 26f3cb422..2360a25b1 100644
--- a/src/chipset/intel_sio.c
+++ b/src/chipset/intel_sio.c
@@ -315,6 +315,8 @@ sio_write(int func, int addr, uint8_t val, void *priv)
             cpu_fast_off_count = val + 1;
             cpu_fast_off_period_set(cpu_fast_off_val, dev->fast_off_period);
             break;
+        default:
+            break;
     }
 }
 
@@ -542,7 +544,9 @@ sio_init(const device_t *info)
 
     timer_add(&dev->timer, NULL, NULL, 0);
 
-    // device_add(&i8254_sec_device);
+#if 0
+    device_add(&i8254_sec_device);
+#endif
 
     return dev;
 }
diff --git a/src/chipset/neat.c b/src/chipset/neat.c
index 2613b8de9..848215789 100644
--- a/src/chipset/neat.c
+++ b/src/chipset/neat.c
@@ -30,6 +30,7 @@
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 #include <86box/chipset.h>
 
 #define NEAT_DEBUG  0
@@ -340,6 +341,8 @@ ems_write(uint16_t port, uint8_t val, void *priv)
             ems->page |= (val & 0x7f); /* add new bits */
             ems_recalc(dev, ems);
             break;
+        default:
+            break;
     }
 }
 
@@ -359,6 +362,8 @@ ems_read(uint16_t port, void *priv)
             if (dev->ems[vpage].enabled)
                 ret |= 0x80;
             break;
+        default:
+            break;
     }
 
 #if NEAT_DEBUG > 1
@@ -608,6 +613,8 @@ neat_write(uint16_t port, uint8_t val, void *priv)
                         case 7: /* 7 MB */
                             dev->ems_size = i << 10;
                             break;
+                        default:
+                            break;
                     }
                     dev->ems_pages = (dev->ems_size << 10) / EMS_PGSIZE;
                     if (dev->regs[REG_RB7] & RB7_EMSEN) {
@@ -622,6 +629,8 @@ neat_write(uint16_t port, uint8_t val, void *priv)
                     break;
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -660,7 +669,7 @@ neat_close(void *priv)
 }
 
 static void *
-neat_init(const device_t *info)
+neat_init(UNUSED(const device_t *info))
 {
     neat_t *dev;
     int     i;
diff --git a/src/chipset/olivetti_eva.c b/src/chipset/olivetti_eva.c
index ce9ba9a1f..c684b408a 100644
--- a/src/chipset/olivetti_eva.c
+++ b/src/chipset/olivetti_eva.c
@@ -32,6 +32,7 @@
 #include <86box/chipset.h>
 #include <86box/video.h>
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 
 typedef struct
 {
@@ -77,20 +78,24 @@ olivetti_eva_write(uint16_t addr, uint8_t val, void *priv)
              * Unfortunately, if triggered, the BIOS remapping function fails causing
              * a fatal error. Therefore, this code section is currently commented.
              */
-            // if (val & 1){
-            //     /*
-            //      * Set the register to 7 or above for the BIOS to trigger the
-            //      * memory remapping function if shadowing is active.
-            //      */
-            //     dev->reg_069 = 0x7;
-            // }
-            // if (val & 8) {
-            //     /*
-            //      * Activate shadowing for region e0000-fffff
-            //      */
-            //     mem_remap_top(256);
-            //     mem_set_mem_state_both(0xa0000, 0x60000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
-            // }
+#if 0
+            if (val & 1) {
+                /*
+                 * Set the register to 7 or above for the BIOS to trigger the
+                 * memory remapping function if shadowing is active.
+                 */
+                 dev->reg_069 = 0x7;
+            }
+            if (val & 8) {
+                /*
+                 * Activate shadowing for region e0000-fffff
+                 */
+                 mem_remap_top(256);
+                 mem_set_mem_state_both(0xa0000, 0x60000, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
+            }
+#endif
+            break;
+        default:
             break;
     }
 }
@@ -111,6 +116,8 @@ olivetti_eva_read(uint16_t addr, void *priv)
         case 0x069:
             ret = dev->reg_069;
             break;
+        default:
+            break;
     }
     olivetti_eva_log("Olivetti EVA Gate Array: Read %02x at %02x\n", ret, addr);
     return ret;
@@ -125,7 +132,7 @@ olivetti_eva_close(void *priv)
 }
 
 static void *
-olivetti_eva_init(const device_t *info)
+olivetti_eva_init(UNUSED(const device_t *info))
 {
     olivetti_eva_t *dev = (olivetti_eva_t *) malloc(sizeof(olivetti_eva_t));
     memset(dev, 0, sizeof(olivetti_eva_t));
diff --git a/src/chipset/opti283.c b/src/chipset/opti283.c
index 8989139e4..4fd630c84 100644
--- a/src/chipset/opti283.c
+++ b/src/chipset/opti283.c
@@ -29,6 +29,7 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 #include <86box/chipset.h>
 
 #ifdef ENABLE_OPTI283_LOG
@@ -234,8 +235,12 @@ opti283_write(uint16_t addr, uint8_t val, void *priv)
                     dev->regs[dev->index] = val;
                     opti283_shadow_recalc(dev);
                     break;
+                default:
+                    break;
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -260,7 +265,7 @@ opti283_close(void *priv)
 }
 
 static void *
-opti283_init(const device_t *info)
+opti283_init(UNUSED(const device_t *info))
 {
     opti283_t *dev = (opti283_t *) malloc(sizeof(opti283_t));
     memset(dev, 0x00, sizeof(opti283_t));
diff --git a/src/chipset/opti291.c b/src/chipset/opti291.c
index b15b71260..7307229b1 100644
--- a/src/chipset/opti291.c
+++ b/src/chipset/opti291.c
@@ -28,6 +28,7 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/chipset.h>
 
@@ -107,8 +108,12 @@ opti291_write(uint16_t addr, uint8_t val, void *priv)
                 case 0x2c:
                     dev->regs[dev->index] = val;
                     break;
+                default:
+                    break;
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -129,7 +134,7 @@ opti291_close(void *priv)
 }
 
 static void *
-opti291_init(const device_t *info)
+opti291_init(UNUSED(const device_t *info))
 {
     opti291_t *dev = (opti291_t *) malloc(sizeof(opti291_t));
     memset(dev, 0, sizeof(opti291_t));
diff --git a/src/chipset/opti391.c b/src/chipset/opti391.c
index 1aad0a8cc..7fb2cacf7 100644
--- a/src/chipset/opti391.c
+++ b/src/chipset/opti391.c
@@ -27,6 +27,7 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 #include <86box/chipset.h>
 
 #ifdef ENABLE_OPTI391_LOG
@@ -164,8 +165,12 @@ opti391_write(uint16_t addr, uint8_t val, void *priv)
                     dev->regs[dev->index] = val;
                     opti391_shadow_recalc(dev);
                     break;
+                default:
+                    break;
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -190,7 +195,7 @@ opti391_close(void *priv)
 }
 
 static void *
-opti391_init(const device_t *info)
+opti391_init(UNUSED(const device_t *info))
 {
     opti391_t *dev = (opti391_t *) malloc(sizeof(opti391_t));
     memset(dev, 0x00, sizeof(opti391_t));
diff --git a/src/chipset/opti495.c b/src/chipset/opti495.c
index c02f19e10..f6e9abd26 100644
--- a/src/chipset/opti495.c
+++ b/src/chipset/opti495.c
@@ -141,6 +141,8 @@ opti495_write(uint16_t addr, uint8_t val, void *priv)
                     case 0x26:
                         opti495_recalc(dev);
                         break;
+                    default:
+                        break;
                 }
             }
             break;
@@ -149,6 +151,8 @@ opti495_write(uint16_t addr, uint8_t val, void *priv)
         case 0xe2:
             dev->scratch[~addr & 0x01] = val;
             break;
+        default:
+            break;
     }
 }
 
@@ -172,6 +176,8 @@ opti495_read(uint16_t addr, void *priv)
         case 0xe2:
             ret = dev->scratch[~addr & 0x01];
             break;
+        default:
+            break;
     }
 
     return ret;
diff --git a/src/chipset/opti499.c b/src/chipset/opti499.c
index b6219b1a4..db8062b39 100644
--- a/src/chipset/opti499.c
+++ b/src/chipset/opti499.c
@@ -29,6 +29,7 @@
 #include <86box/device.h>
 #include <86box/mem.h>
 #include <86box/port_92.h>
+#include <86box/plat_unused.h>
 #include <86box/chipset.h>
 
 typedef struct
@@ -154,6 +155,8 @@ opti499_write(uint16_t addr, uint8_t val, void *priv)
                     case 0x2d:
                         opti499_recalc(dev);
                         break;
+                    default:
+                        break;
                 }
             }
             break;
@@ -162,6 +165,8 @@ opti499_write(uint16_t addr, uint8_t val, void *priv)
         case 0xe2:
             dev->scratch[~addr & 0x01] = val;
             break;
+        default:
+            break;
     }
 }
 
@@ -188,6 +193,8 @@ opti499_read(uint16_t addr, void *priv)
         case 0xe2:
             ret = dev->scratch[~addr & 0x01];
             break;
+        default:
+            break;
     }
 
     return ret;
@@ -230,7 +237,7 @@ opti499_close(void *priv)
 }
 
 static void *
-opti499_init(const device_t *info)
+opti499_init(UNUSED(const device_t *info))
 {
     opti499_t *dev = (opti499_t *) malloc(sizeof(opti499_t));
     memset(dev, 0, sizeof(opti499_t));
diff --git a/src/chipset/opti5x7.c b/src/chipset/opti5x7.c
index fdcb4fc3e..25d6a5164 100644
--- a/src/chipset/opti5x7.c
+++ b/src/chipset/opti5x7.c
@@ -143,9 +143,13 @@ opti5x7_write(uint16_t addr, uint8_t val, void *priv)
                 case 0x11: /* Master Cycle Control Register */
                     dev->regs[dev->idx] = val;
                     break;
+                default:
+                    break;
             }
             opti5x7_log("OPTi 5x7: dev->regs[%02x] = %02x\n", dev->idx, dev->regs[dev->idx]);
             break;
+        default:
+            break;
     }
 }
 
diff --git a/src/chipset/opti822.c b/src/chipset/opti822.c
index f9b0bf8a7..d235dccee 100644
--- a/src/chipset/opti822.c
+++ b/src/chipset/opti822.c
@@ -33,6 +33,7 @@
 #include <86box/timer.h>
 #include <86box/pic.h>
 #include <86box/pit.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdc.h>
@@ -107,7 +108,9 @@ opti822_update_irqs(opti822_t *dev, int set)
     int     irq_map[8] = { -1, 5, 9, 10, 11, 12, 14, 15 };
     pic_t  *temp_pic;
 
-    // dev->irq_convert = (dev->pci_regs[0x53] & 0x08);
+#if 0
+    dev->irq_convert = (dev->pci_regs[0x53] & 0x08);
+#endif
     dev->irq_convert = 1;
 
     for (uint8_t i = 0; i < 16; i++) {
@@ -325,6 +328,8 @@ opti822_pci_write(int func, int addr, uint8_t val, void *priv)
             }
             opti822_update_irqs(dev, 1);
             break;
+        default:
+            break;
     }
 }
 
@@ -383,7 +388,7 @@ opti822_close(void *p)
 }
 
 static void *
-opti822_init(const device_t *info)
+opti822_init(UNUSED(const device_t *info))
 {
     opti822_t *dev = (opti822_t *) malloc(sizeof(opti822_t));
     memset(dev, 0, sizeof(opti822_t));
diff --git a/src/chipset/opti895.c b/src/chipset/opti895.c
index 18f1791e8..40dda63d5 100644
--- a/src/chipset/opti895.c
+++ b/src/chipset/opti895.c
@@ -185,6 +185,8 @@ opti895_write(uint16_t addr, uint8_t val, void *priv)
                             break;
                         }
                         break;
+                    default:
+                        break;
                 }
             }
             break;
@@ -193,6 +195,8 @@ opti895_write(uint16_t addr, uint8_t val, void *priv)
         case 0xe2:
             dev->scratch[addr - 0xe1] = val;
             break;
+        default:
+            break;
     }
 }
 
@@ -218,6 +222,8 @@ opti895_read(uint16_t addr, void *priv)
         case 0xe2:
             ret = dev->scratch[addr - 0xe1];
             break;
+        default:
+            break;
     }
 
     return ret;
diff --git a/src/chipset/scamp.c b/src/chipset/scamp.c
index 1ab5749f7..b819e3a8d 100644
--- a/src/chipset/scamp.c
+++ b/src/chipset/scamp.c
@@ -31,6 +31,7 @@
 #include <86box/io.h>
 #include <86box/mem.h>
 #include <86box/nmi.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/chipset.h>
 
@@ -424,6 +425,8 @@ recalc_mappings(void *priv)
                     virt_base += (1 << 24);
                     dev->row_virt_shift[bank_nr] = 12;
                     break;
+                default:
+                    break;
             }
         } else {
             switch (rammap[cur_rammap].bank[bank_nr]) {
@@ -489,6 +492,8 @@ recalc_mappings(void *priv)
                     virt_base += (1 << 24);
                     dev->row_virt_shift[bank_nr] = 12;
                     break;
+                default:
+                    break;
             }
         }
         switch (rammap[cur_rammap].bank[bank_nr]) {
@@ -534,6 +539,8 @@ recalc_mappings(void *priv)
                                                 ram_mirrored_interleaved_write, NULL, NULL);
                 }
                 break;
+            default:
+                break;
         }
     }
 }
@@ -644,6 +651,8 @@ shadow_control(uint32_t addr, uint32_t size, int state, int ems_enable)
             case 3:
                 mem_set_mem_state(addr, size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
                 break;
+            default:
+                break;
         }
 
     flushmmucache_nopc();
@@ -756,6 +765,8 @@ scamp_write(uint16_t addr, uint8_t val, void *priv)
                     case CFG_FEAXS:
                         shadow_recalc(dev);
                         break;
+                    default:
+                        break;
                 }
             }
             break;
@@ -767,6 +778,8 @@ scamp_write(uint16_t addr, uint8_t val, void *priv)
                 mem_a20_recalc();
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -809,6 +822,8 @@ scamp_read(uint16_t addr, void *priv)
             softresetx86();
             cpu_set_edx();
             break;
+        default:
+            break;
     }
 
     return ret;
@@ -823,7 +838,7 @@ scamp_close(void *priv)
 }
 
 static void *
-scamp_init(const device_t *info)
+scamp_init(UNUSED(const device_t *info))
 {
     uint32_t addr;
     int      c;
@@ -924,6 +939,8 @@ scamp_init(const device_t *info)
                 dev->ibank_shift[c]     = 23;
                 dev->ram_interleaved[c] = 1;
                 break;
+            default:
+                break;
         }
     }
 
diff --git a/src/chipset/scat.c b/src/chipset/scat.c
index e2c1bf103..ca316c3e6 100644
--- a/src/chipset/scat.c
+++ b/src/chipset/scat.c
@@ -1191,6 +1191,8 @@ scat_out(uint16_t port, uint8_t val, void *priv)
             if ((dev->regs[SCAT_EMS_CONTROL] & 0x41) == (0x40 | ((port & 0x10) >> 4)))
                 dev->reg_2xA = ((dev->regs[SCAT_VERSION] & 0xf0) == 0) ? val : val & 0xc3;
             break;
+        default:
+            break;
     }
 }
 
@@ -1258,6 +1260,8 @@ scat_in(uint16_t port, void *priv)
             if ((dev->regs[SCAT_EMS_CONTROL] & 0x41) == (0x40 | ((port & 0x10) >> 4)))
                 ret = dev->reg_2xA;
             break;
+        default:
+            break;
     }
 
     return ret;
diff --git a/src/chipset/sis_5511.c b/src/chipset/sis_5511.c
index 462db88ea..88d5c59b5 100644
--- a/src/chipset/sis_5511.c
+++ b/src/chipset/sis_5511.c
@@ -32,6 +32,7 @@
 #include <86box/hdc_ide.h>
 #include <86box/hdc_ide_sff8038i.h>
 #include <86box/pci.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/smram.h>
 
@@ -121,6 +122,8 @@ sis_5511_smram_recalc(sis_5511_t *dev)
         case 2:
             smram_enable(dev->smram, 0x000e0000, 0x000b0000, 0x8000, dev->pci_conf[0x65] & 0x10, 1);
             break;
+        default:
+            break;
     }
 
     flushmmucache();
@@ -153,7 +156,7 @@ sis_5513_bm_handler(sis_5511_t *dev)
 }
 
 static void
-sis_5511_write(int func, int addr, uint8_t val, void *priv)
+sis_5511_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     sis_5511_t *dev = (sis_5511_t *) priv;
 
@@ -331,12 +334,14 @@ sis_5511_write(int func, int addr, uint8_t val, void *priv)
         case 0x93: /* 5512 General Purpose Register Index */
             dev->pci_conf[addr] = val;
             break;
+        default:
+            break;
     }
     sis_5511_log("SiS 5511: dev->pci_conf[%02x] = %02x POST: %02x\n", addr, dev->pci_conf[addr], inb(0x80));
 }
 
 static uint8_t
-sis_5511_read(int func, int addr, void *priv)
+sis_5511_read(UNUSED(int func), int addr, void *priv)
 {
     sis_5511_t *dev = (sis_5511_t *) priv;
     sis_5511_log("SiS 5511: dev->pci_conf[%02x] (%02x) POST %02x\n", addr, dev->pci_conf[addr], inb(0x80));
@@ -428,6 +433,8 @@ sis_5513_pci_to_isa_write(int addr, uint8_t val, sis_5511_t *dev)
         case 0x6a: /* GPIO Status Register */
             dev->pci_conf_sb[0][addr] &= val & 0x15;
             break;
+        default:
+            break;
     }
 }
 
@@ -514,6 +521,8 @@ sis_5513_ide_write(int addr, uint8_t val, sis_5511_t *dev)
         case 0x4f: /* Prefetch Count of Secondary Channel (High Byte) */
             dev->pci_conf_sb[1][addr] = val;
             break;
+        default:
+            break;
     }
 }
 
@@ -528,6 +537,8 @@ sis_5513_write(int func, int addr, uint8_t val, void *priv)
         case 1:
             sis_5513_ide_write(addr, val, dev);
             break;
+        default:
+            break;
     }
     sis_5511_log("SiS 5513: dev->pci_conf[%02x][%02x] = %02x POST: %02x\n", func, addr, dev->pci_conf_sb[func][addr], inb(0x80));
 }
@@ -567,6 +578,8 @@ sis_5513_isa_write(uint16_t addr, uint8_t val, void *priv)
                         case 2:
                             cpu_set_isa_pci_div(3);
                             break;
+                        default:
+                            break;
                     }
                     break;
                 case 0x01:
@@ -587,9 +600,13 @@ sis_5513_isa_write(uint16_t addr, uint8_t val, void *priv)
                 case 0x0b:
                     dev->regs[dev->index] = val;
                     break;
+                default:
+                    break;
             }
             sis_5511_log("SiS 5513-ISA: dev->regs[%02x] = %02x POST: %02x\n", dev->index + 0x50, dev->regs[dev->index], inb(0x80));
             break;
+        default:
+            break;
     }
 }
 
@@ -700,7 +717,7 @@ sis_5511_close(void *priv)
 }
 
 static void *
-sis_5511_init(const device_t *info)
+sis_5511_init(UNUSED(const device_t *info))
 {
     sis_5511_t *dev = (sis_5511_t *) malloc(sizeof(sis_5511_t));
     memset(dev, 0, sizeof(sis_5511_t));
diff --git a/src/chipset/sis_5571.c b/src/chipset/sis_5571.c
index c158e2d63..0f35da8c8 100644
--- a/src/chipset/sis_5571.c
+++ b/src/chipset/sis_5571.c
@@ -30,6 +30,7 @@
 #include <86box/mem.h>
 #include <86box/pci.h>
 #include <86box/pic.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/hdc_ide.h>
 #include <86box/hdc_ide_sff8038i.h>
@@ -117,6 +118,8 @@ sis_5571_smm_recalc(sis_5571_t *dev)
         case 0x03:
             smram_enable(dev->smram, 0xa0000, 0xa0000, 0x10000, (dev->pci_conf[0xa3] & 0x10), 1);
             break;
+        default:
+            break;
     }
 
     flushmmucache();
@@ -149,7 +152,7 @@ sis_5571_bm_handler(sis_5571_t *dev)
 }
 
 static void
-memory_pci_bridge_write(int func, int addr, uint8_t val, void *priv)
+memory_pci_bridge_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     sis_5571_t *dev = (sis_5571_t *) priv;
 
@@ -324,12 +327,14 @@ memory_pci_bridge_write(int func, int addr, uint8_t val, void *priv)
             dev->pci_conf[addr] = val & 0xd0;
             sis_5571_smm_recalc(dev);
             break;
+        default:
+            break;
     }
     sis_5571_log("SiS5571: dev->pci_conf[%02x] = %02x\n", addr, val);
 }
 
 static uint8_t
-memory_pci_bridge_read(int func, int addr, void *priv)
+memory_pci_bridge_read(UNUSED(int func), int addr, void *priv)
 {
     sis_5571_t *dev = (sis_5571_t *) priv;
     sis_5571_log("SiS5571: dev->pci_conf[%02x] (%02x)\n", addr, dev->pci_conf[addr]);
@@ -375,6 +380,8 @@ pci_isa_bridge_write(int func, int addr, uint8_t val, void *priv)
                         case 2:
                             cpu_set_isa_pci_div(3);
                             break;
+                        default:
+                            break;
                     }
                     break;
 
@@ -498,6 +505,8 @@ pci_isa_bridge_write(int func, int addr, uint8_t val, void *priv)
                 case 0x77: /* Monitor Standby Timer Reload And Monitor Standby State ExitControl */
                     dev->pci_conf_sb[0][addr] = val;
                     break;
+                default:
+                    break;
             }
             sis_5571_log("SiS5571-SB: dev->pci_conf[%02x] = %02x\n", addr, val);
             break;
@@ -577,6 +586,8 @@ pci_isa_bridge_write(int func, int addr, uint8_t val, void *priv)
                 case 0x4f: /* Prefetch Count of Secondary Channel (High Byte) */
                     dev->pci_conf_sb[1][addr] = val;
                     break;
+                default:
+                    break;
             }
             sis_5571_log("SiS5571-IDE: dev->pci_conf[%02x] = %02x\n", addr, val);
             break;
@@ -615,6 +626,8 @@ pci_isa_bridge_write(int func, int addr, uint8_t val, void *priv)
                 case 0x3c: /* Interrupt Line */
                     dev->pci_conf_sb[2][addr] = val;
                     break;
+                default:
+                    break;
             }
             sis_5571_log("SiS5571-USB: dev->pci_conf[%02x] = %02x\n", addr, val);
     }
@@ -670,7 +683,7 @@ sis_5571_usb_update_interrupt(usb_t* usb, void* priv)
 }
 
 static uint8_t
-sis_5571_usb_handle_smi(usb_t* usb, void* priv)
+sis_5571_usb_handle_smi(UNUSED(usb_t* usb), UNUSED(void* priv))
 {
     /* Left unimplemented for now. */
     return 1;
@@ -740,7 +753,7 @@ sis_5571_close(void *priv)
 }
 
 static void *
-sis_5571_init(const device_t *info)
+sis_5571_init(UNUSED(const device_t *info))
 {
     sis_5571_t *dev = (sis_5571_t *) malloc(sizeof(sis_5571_t));
     memset(dev, 0x00, sizeof(sis_5571_t));
diff --git a/src/chipset/sis_85c310.c b/src/chipset/sis_85c310.c
index 64efba5bb..2e8a21ffc 100644
--- a/src/chipset/sis_85c310.c
+++ b/src/chipset/sis_85c310.c
@@ -10,6 +10,7 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 #include <86box/chipset.h>
 
 typedef struct
@@ -64,6 +65,8 @@ rabbit_recalcmapping(rabbit_t *dev)
             /* 128K at 0E0000-0FFFFF */
             mem_set_mem_state(0x000e0000, 0x00020000, shflags);
             break;
+        default:
+            break;
     }
 
     flushmmucache();
@@ -89,6 +92,8 @@ rabbit_write(uint16_t addr, uint8_t val, void *priv)
             } else
                 dev->regs[dev->cur_reg] = val;
             break;
+        default:
+            break;
     }
 }
 
@@ -106,6 +111,8 @@ rabbit_read(uint16_t addr, void *priv)
             } else
                 ret = dev->regs[dev->cur_reg];
             break;
+        default:
+            break;
     }
 
     return ret;
@@ -120,7 +127,7 @@ rabbit_close(void *priv)
 }
 
 static void *
-rabbit_init(const device_t *info)
+rabbit_init(UNUSED(const device_t *info))
 {
     rabbit_t *dev = (rabbit_t *) malloc(sizeof(rabbit_t));
     memset(dev, 0, sizeof(rabbit_t));
diff --git a/src/chipset/sis_85c496.c b/src/chipset/sis_85c496.c
index 6b09cf87e..d28c7cdb0 100644
--- a/src/chipset/sis_85c496.c
+++ b/src/chipset/sis_85c496.c
@@ -32,6 +32,7 @@
 #include <86box/dma.h>
 #include <86box/nvr.h>
 #include <86box/pic.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/hdc_ide.h>
 #include <86box/machine.h>
@@ -98,6 +99,8 @@ sis_85c497_isa_write(uint16_t port, uint8_t val, void *priv)
                 dev->regs[dev->cur_reg] = val & 0xfc;
                 dma_set_mask((val & 0x80) ? 0xffffffff : 0x00ffffff);
                 break;
+            default:
+                break;
         }
 }
 
@@ -182,7 +185,7 @@ sis_85c496_ide_handler(sis_85c496_t *dev)
 
 /* 00 - 3F = PCI Configuration, 40 - 7F = 85C496, 80 - FF = 85C497 */
 static void
-sis_85c49x_pci_write(int func, int addr, uint8_t val, void *priv)
+sis_85c49x_pci_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     sis_85c496_t *dev = (sis_85c496_t *) priv;
     uint8_t       old;
@@ -255,7 +258,9 @@ sis_85c49x_pci_write(int func, int addr, uint8_t val, void *priv)
         case 0x4d:
         case 0x4e:
         case 0x4f:
-            // dev->pci_conf[addr] = val;
+#if 0
+            dev->pci_conf[addr] = val;
+#endif
             spd_write_drbs(dev->pci_conf, 0x48, 0x4f, 1);
             break;
         case 0x50:
@@ -321,6 +326,8 @@ sis_85c49x_pci_write(int func, int addr, uint8_t val, void *priv)
                             host_base = 0x000e0000;
                             ram_base  = 0x000b0000;
                             break;
+                        default:
+                            break;
                     }
 
                     smram_enable(dev->smram, host_base, ram_base, size,
@@ -459,11 +466,13 @@ sis_85c49x_pci_write(int func, int addr, uint8_t val, void *priv)
             dev->pci_conf[addr] = val & 0x6e;
             nvr_bank_set(0, !!(val & 0x40), dev->nvr);
             break;
+        default:
+            break;
     }
 }
 
 static uint8_t
-sis_85c49x_pci_read(int func, int addr, void *priv)
+sis_85c49x_pci_read(UNUSED(int func), int addr, void *priv)
 {
     sis_85c496_t *dev = (sis_85c496_t *) priv;
     uint8_t       ret = dev->pci_conf[addr];
@@ -481,6 +490,8 @@ sis_85c49x_pci_read(int func, int addr, void *priv)
         case 0x83: /*Port 70h Mirror*/
             ret = inb(0x70);
             break;
+        default:
+            break;
     }
 
     sis_85c496_log("[%04X:%08X] PCI Read  %02X from %02X:%02X\n", CS, cpu_state.pc, ret, func, addr);
@@ -607,7 +618,9 @@ static void
 
     pci_add_card(PCI_ADD_NORTHBRIDGE, sis_85c49x_pci_read, sis_85c49x_pci_write, dev);
 
-    // sis_85c497_isa_reset(dev);
+#if 0
+    sis_85c497_isa_reset(dev);
+#endif
 
     dev->port_92 = device_add(&port_92_device);
     port_92_set_period(dev->port_92, 2ULL * TIMER_USEC);
diff --git a/src/chipset/sis_85c4xx.c b/src/chipset/sis_85c4xx.c
index 94a1fc876..611c2627a 100644
--- a/src/chipset/sis_85c4xx.c
+++ b/src/chipset/sis_85c4xx.c
@@ -28,6 +28,7 @@
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/device.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/mem.h>
 #include <86box/smram.h>
@@ -124,7 +125,7 @@ sis_85c4xx_recalcmapping(sis_85c4xx_t *dev)
 }
 
 static void
-sis_85c4xx_sw_smi_out(uint16_t port, uint8_t val, void *priv)
+sis_85c4xx_sw_smi_out(UNUSED(uint16_t port), UNUSED(uint8_t val), void *priv)
 {
     sis_85c4xx_t *dev = (sis_85c4xx_t *) priv;
 
@@ -235,6 +236,8 @@ sis_85c4xx_out(uint16_t port, uint8_t val, void *priv)
                                 port_92_add(dev->port_92);
                         }
                         break;
+                    default:
+                        break;
                 }
             } else if ((dev->reg_base == 0x60) && (dev->cur_reg == 0x00))
                 dev->reg_00 = val;
@@ -245,6 +248,8 @@ sis_85c4xx_out(uint16_t port, uint8_t val, void *priv)
         case 0xe2:
             dev->scratch[port - 0xe1] = val;
             return;
+        default:
+            break;
     }
 }
 
@@ -273,6 +278,8 @@ sis_85c4xx_in(uint16_t port, void *priv)
         case 0xe1:
         case 0xe2:
             ret = dev->scratch[port - 0xe1];
+        default:
+            break;
     }
 
     return ret;
diff --git a/src/chipset/sis_85c50x.c b/src/chipset/sis_85c50x.c
index db274a60b..29eb1b8eb 100644
--- a/src/chipset/sis_85c50x.c
+++ b/src/chipset/sis_85c50x.c
@@ -31,6 +31,7 @@
 #include <86box/apm.h>
 #include <86box/machine.h>
 #include <86box/pic.h>
+#include <86box/plat_unused.h>
 #include <86box/mem.h>
 #include <86box/smram.h>
 #include <86box/pci.h>
@@ -133,6 +134,8 @@ sis_85c50x_smm_recalc(sis_85c50x_t *dev)
             smram_enable(dev->smram[0], host_base, 0xb0000, 0x8000, (dev->pci_conf[0x65] & 0x10), 1);
             smram_enable(dev->smram[1], host_base ^ 0x00100000, 0xa0000, 0x8000, (dev->pci_conf[0x65] & 0x10), 1);
             break;
+        default:
+            break;
     }
 }
 
@@ -213,7 +216,9 @@ sis_85c50x_write(int func, int addr, uint8_t val, void *priv)
                 dev->pci_conf[addr] = (val & 0x7f);
                 break;
             case 0x69:
-                dev->pci_conf[addr] &= ~(val);
+                dev->pci_conf[addr] &= ~val;
+                break;
+            default:
                 break;
         }
 }
@@ -267,6 +272,8 @@ sis_85c50x_sb_write(int func, int addr, uint8_t val, void *priv)
             case 0x4b: /* ISA Master/DMA Memory Cycle Control Register 4 */
                 dev->pci_conf_sb[addr] = val;
                 break;
+            default:
+                break;
         }
 }
 
@@ -314,8 +321,12 @@ sis_85c50x_isa_write(uint16_t addr, uint8_t val, void *priv)
                 case 0x85:
                     outb(0x70, val);
                     break;
+                default:
+                    break;
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -336,6 +347,8 @@ sis_85c50x_isa_read(uint16_t addr, void *priv)
             else
                 ret = dev->regs[dev->index];
             break;
+        default:
+            break;
     }
 
     sis_85c50x_log("85C503 ISA: [R] (%04X) = %02X\n", addr, ret);
@@ -401,7 +414,7 @@ sis_85c50x_close(void *priv)
 }
 
 static void *
-sis_85c50x_init(const device_t *info)
+sis_85c50x_init(UNUSED(const device_t *info))
 {
     sis_85c50x_t *dev = (sis_85c50x_t *) malloc(sizeof(sis_85c50x_t));
     memset(dev, 0x00, sizeof(sis_85c50x_t));
diff --git a/src/chipset/stpc.c b/src/chipset/stpc.c
index eecaa0a58..4babc0126 100644
--- a/src/chipset/stpc.c
+++ b/src/chipset/stpc.c
@@ -30,6 +30,7 @@
 #include <86box/timer.h>
 #include <86box/pit.h>
 #include <86box/device.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/usb.h>
 #include <86box/hdc_ide.h>
@@ -248,6 +249,8 @@ stpc_nb_write(int func, int addr, uint8_t val, void *priv)
         case 0x52:
             val &= 0x70;
             break;
+        default:
+            break;
     }
 
     dev->pci_conf[0][addr] = val;
@@ -432,6 +435,8 @@ stpc_ide_write(int func, int addr, uint8_t val, void *priv)
                 sff_bus_master_set_irq(0x00, dev->bm[1]);
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -489,6 +494,8 @@ stpc_isab_write(int func, int addr, uint8_t val, void *priv)
         case 0x05:
             val &= 0x01;
             break;
+        default:
+            break;
     }
 
     dev->pci_conf[1][addr] = val;
@@ -551,6 +558,8 @@ stpc_usb_write(int func, int addr, uint8_t val, void *priv)
             dev->pci_conf[3][addr] = val;
             ohci_update_mem_mapping(dev->usb, dev->pci_conf[3][0x11], dev->pci_conf[3][0x12], dev->pci_conf[3][0x13], 1);
             break;
+        default:
+            break;
     }
 
     dev->pci_conf[3][addr] = val;
@@ -720,6 +729,9 @@ stpc_reg_write(uint16_t addr, uint8_t val, void *priv)
                 val &= 0xf1;
                 stpc_serial_handlers(val);
                 break;
+
+            default:
+                break;
         }
 
         dev->regs[dev->reg_offset] = val;
@@ -957,7 +969,7 @@ stpc_serial_close(void *priv)
 }
 
 static void *
-stpc_serial_init(const device_t *info)
+stpc_serial_init(UNUSED(const device_t *info))
 {
     stpc_log("STPC: serial_init()\n");
 
@@ -990,6 +1002,8 @@ stpc_lpt_handlers(stpc_lpt_t *dev, uint8_t val)
         case 0x3:
             lpt2_remove();
             break;
+        default:
+            break;
     }
 
     switch (new_addr) {
@@ -1068,7 +1082,7 @@ stpc_lpt_close(void *priv)
 }
 
 static void *
-stpc_lpt_init(const device_t *info)
+stpc_lpt_init(UNUSED(const device_t *info))
 {
     stpc_log("STPC: lpt_init()\n");
 
diff --git a/src/chipset/umc_8886.c b/src/chipset/umc_8886.c
index dea5ac99a..63ec90d72 100644
--- a/src/chipset/umc_8886.c
+++ b/src/chipset/umc_8886.c
@@ -212,6 +212,8 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
                             case 2:
                                 cpu_set_isa_pci_div(2);
                                 break;
+                            default:
+                                break;
                         }
 
                         break;
@@ -250,6 +252,9 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
                     case 0xa5 ... 0xa8:
                         dev->pci_conf_sb[func][addr] = val;
                         break;
+
+                    default:
+                        break;
                 }
                 break;
 
@@ -271,8 +276,13 @@ umc_8886_write(int func, int addr, uint8_t val, void *priv)
                     case 0x41:
                         dev->pci_conf_sb[func][addr] = val;
                         break;
+
+                    default:
+                        break;
                 }
                 break;
+            default:
+                break;
         }
 }
 
diff --git a/src/chipset/umc_hb4.c b/src/chipset/umc_hb4.c
index e3174be8a..e3a9b2a58 100644
--- a/src/chipset/umc_hb4.c
+++ b/src/chipset/umc_hb4.c
@@ -106,6 +106,7 @@
 
 #include <86box/mem.h>
 #include <86box/pci.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/smram.h>
 
@@ -261,7 +262,7 @@ hb4_smram(hb4_t *dev)
 }
 
 static void
-hb4_write(int func, int addr, uint8_t val, void *priv)
+hb4_write(UNUSED(int func), int addr, uint8_t val, void *priv)
 {
     hb4_t *dev = (hb4_t *) priv;
 
@@ -322,6 +323,9 @@ hb4_write(int func, int addr, uint8_t val, void *priv)
         case 0x61:
             dev->pci_conf[addr] = val;
             break;
+
+        default:
+            break;
     }
 }
 
@@ -383,7 +387,7 @@ hb4_close(void *priv)
 }
 
 static void *
-hb4_init(const device_t *info)
+hb4_init(UNUSED(const device_t *info))
 {
     hb4_t *dev = (hb4_t *) malloc(sizeof(hb4_t));
     memset(dev, 0, sizeof(hb4_t));
diff --git a/src/chipset/via_apollo.c b/src/chipset/via_apollo.c
index 61485fc91..b4655842a 100644
--- a/src/chipset/via_apollo.c
+++ b/src/chipset/via_apollo.c
@@ -69,6 +69,8 @@ apollo_map(uint32_t addr, uint32_t size, int state)
         case 3:
             mem_set_mem_state_both(addr, size, MEM_READ_INTERNAL | MEM_WRITE_INTERNAL);
             break;
+        default:
+            break;
     }
 
     flushmmucache_nopc();
@@ -392,8 +394,8 @@ via_apollo_host_bridge_write(int func, int addr, uint8_t val, void *priv)
             smram_disable_all();
             if (dev->id >= VIA_691)
                 switch (val & 0x03) {
-                    case 0x00:
                     default:
+                    case 0x00:
                         apollo_smram_map(dev, 1, 0x000a0000, 0x00020000, 1); /* SMM: Code DRAM, Data DRAM */
                         apollo_smram_map(dev, 0, 0x000a0000, 0x00020000, 0); /* Non-SMM: Code PCI, Data PCI */
                         break;
@@ -412,8 +414,8 @@ via_apollo_host_bridge_write(int func, int addr, uint8_t val, void *priv)
                 }
             else if (dev->id >= VIA_597)
                 switch (val & 0x03) {
-                    case 0x00:
                     default:
+                    case 0x00:
                         /* Disable SMI Address Redirection (default) */
                         apollo_smram_map(dev, 1, 0x000a0000, 0x00020000, 0);
                         apollo_smram_map(dev, 0, 0x000a0000, 0x00020000, 0);
@@ -458,6 +460,8 @@ via_apollo_host_bridge_write(int func, int addr, uint8_t val, void *priv)
                         apollo_smram_map(dev, 1, 0x000a0000, 0x00020000, 3);
                         apollo_smram_map(dev, 0, 0x000a0000, 0x00020000, 3);
                         break;
+                    default:
+                        break;
                 }
             break;
         case 0x65:
@@ -673,6 +677,8 @@ via_apollo_read(int func, int addr, void *priv)
         case 0:
             ret = dev->pci_conf[addr];
             break;
+        default:
+            break;
     }
 
     return ret;
@@ -685,6 +691,8 @@ via_apollo_write(int func, int addr, uint8_t val, void *priv)
         case 0:
             via_apollo_host_bridge_write(func, addr, val, priv);
             break;
+        default:
+            break;
     }
 }
 
@@ -728,6 +736,9 @@ via_apollo_init(const device_t *info)
         case VIA_694:
             device_add(&via_mvp3_agp_device);
             break;
+
+        default:
+            break;
     }
 
     if (dev->id >= VIA_597)
diff --git a/src/chipset/via_pipc.c b/src/chipset/via_pipc.c
index aa83c99b9..792ccf0a1 100644
--- a/src/chipset/via_pipc.c
+++ b/src/chipset/via_pipc.c
@@ -41,6 +41,7 @@
 #include <86box/ddma.h>
 #include <86box/pci.h>
 #include <86box/pic.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
@@ -162,7 +163,7 @@ static uint8_t pipc_read(int func, int addr, void *priv);
 static void    pipc_write(int func, int addr, uint8_t val, void *priv);
 
 static void
-pipc_io_trap_pact(int size, uint16_t addr, uint8_t write, uint8_t val, void *priv)
+pipc_io_trap_pact(UNUSED(int size), UNUSED(uint16_t addr), UNUSED(uint8_t write), UNUSED(uint8_t val), void *priv)
 {
     pipc_io_trap_t *trap = (pipc_io_trap_t *) priv;
 
@@ -175,7 +176,7 @@ pipc_io_trap_pact(int size, uint16_t addr, uint8_t write, uint8_t val, void *pri
 }
 
 static void
-pipc_io_trap_glb(int size, uint16_t addr, uint8_t write, uint8_t val, void *priv)
+pipc_io_trap_glb(UNUSED(int size), UNUSED(uint16_t addr), uint8_t write, UNUSED(uint8_t val), void *priv)
 {
     pipc_io_trap_t *trap = (pipc_io_trap_t *) priv;
 
@@ -332,6 +333,8 @@ pipc_reset_hard(void *priv)
             case VIA_PIPC_8231:
                 dev->usb_regs[i][0x08] = 0x1e;
                 break;
+            default:
+                break;
         }
 
         dev->usb_regs[i][0x0a] = 0x03;
@@ -392,6 +395,9 @@ pipc_reset_hard(void *priv)
             case VIA_PIPC_686B:
                 dev->power_regs[0x08] = 0x40;
                 break;
+
+            default:
+                break;
         }
         if (dev->local == VIA_PIPC_686B)
             dev->power_regs[0x34] = 0x68;
@@ -453,6 +459,9 @@ pipc_reset_hard(void *priv)
                 case VIA_PIPC_8231:
                     dev->ac97_regs[i][0x08] = (i == 0) ? 0x40 : 0x20;
                     break;
+
+                default:
+                    break;
             }
 
             if (i == 0) {
diff --git a/src/chipset/via_vt82c49x.c b/src/chipset/via_vt82c49x.c
index 3be28b155..ae566bb07 100644
--- a/src/chipset/via_vt82c49x.c
+++ b/src/chipset/via_vt82c49x.c
@@ -189,6 +189,8 @@ vt82c49x_recalc(vt82c49x_t *dev)
             if (!shadow_bitmap)
                 mem_remap_top(384);
             break;
+        default:
+            break;
     }
 }
 
@@ -280,8 +282,13 @@ vt82c49x_write(uint16_t addr, uint8_t val, void *priv)
                                      (val & 0x40) ? "second" : "prim");
                     }
                     break;
+
+                default:
+                    break;
             }
             break;
+        default:
+            break;
     }
 }
 
@@ -303,6 +310,8 @@ vt82c49x_read(uint16_t addr, void *priv)
             else if (dev->index < 0x80)
                 ret = dev->regs[dev->index];
             break;
+        default:
+            break;
     }
 
     return ret;
diff --git a/src/chipset/via_vt82c505.c b/src/chipset/via_vt82c505.c
index 5d494d7c1..f2725d335 100644
--- a/src/chipset/via_vt82c505.c
+++ b/src/chipset/via_vt82c505.c
@@ -26,6 +26,7 @@
 #include <86box/io.h>
 #include <86box/pic.h>
 #include <86box/pci.h>
+#include <86box/plat_unused.h>
 #include <86box/device.h>
 #include <86box/chipset.h>
 
@@ -116,6 +117,8 @@ vt82c505_write(int func, int addr, uint8_t val, void *priv)
         case 0x93:
             dev->pci_conf[addr] = val & 0xe0;
             break;
+        default:
+            break;
     }
 }
 
@@ -194,7 +197,7 @@ vt82c505_close(void *priv)
 }
 
 static void *
-vt82c505_init(const device_t *info)
+vt82c505_init(UNUSED(const device_t *info))
 {
     vt82c505_t *dev = (vt82c505_t *) malloc(sizeof(vt82c505_t));
     memset(dev, 0, sizeof(vt82c505_t));
diff --git a/src/chipset/vl82c480.c b/src/chipset/vl82c480.c
index 4b9df40fa..169a73a53 100644
--- a/src/chipset/vl82c480.c
+++ b/src/chipset/vl82c480.c
@@ -40,8 +40,8 @@ vl82c480_shflags(uint8_t access)
     int ret = MEM_READ_EXTANY | MEM_WRITE_EXTANY;
 
     switch (access) {
-        case 0x00:
         default:
+        case 0x00:
             ret = MEM_READ_EXTANY | MEM_WRITE_EXTANY;
             break;
         case 0x01:
@@ -125,6 +125,9 @@ vl82c480_write(uint16_t addr, uint8_t val, void *p)
             if (mem_a20_alt)
                 outb(0x92, inb(0x92) & ~2);
             break;
+
+        default:
+            break;
     }
 }
 
@@ -152,6 +155,9 @@ vl82c480_read(uint16_t addr, void *p)
             softresetx86();
             cpu_set_edx();
             break;
+
+        default:
+            break;
     }
 
     return ret;
diff --git a/src/chipset/wd76c10.c b/src/chipset/wd76c10.c
index 41fad0418..478cf0e1e 100644
--- a/src/chipset/wd76c10.c
+++ b/src/chipset/wd76c10.c
@@ -37,6 +37,7 @@
 #include <86box/hdc_ide.h>
 #include <86box/lpt.h>
 #include <86box/mem.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/serial.h>
 #include <86box/chipset.h>
@@ -100,6 +101,8 @@ wd76c10_refresh_control(wd76c10_t *dev)
         case 4:
             serial_setup(dev->uart[1], 0x2e8, 3);
             break;
+        default:
+            break;
     }
 
     serial_remove(dev->uart[0]);
@@ -117,6 +120,8 @@ wd76c10_refresh_control(wd76c10_t *dev)
         case 4:
             serial_setup(dev->uart[0], 0x2e8, 4);
             break;
+        default:
+            break;
     }
 
     lpt1_remove();
@@ -153,6 +158,8 @@ wd76c10_split_addr(wd76c10_t *dev)
             if (((dev->shadow_ram >> 8) & 3) == 3)
                 mem_remap_top(384);
             break;
+        default:
+            break;
     }
 }
 
@@ -187,6 +194,8 @@ wd76c10_shadow_recalc(wd76c10_t *dev)
         case 3:
             mem_set_mem_state_both(0x20000, 0x80000, MEM_READ_DISABLED | MEM_WRITE_DISABLED);
             break;
+        default:
+            break;
     }
 
     switch ((dev->shadow_ram >> 8) & 3) {
@@ -203,6 +212,8 @@ wd76c10_shadow_recalc(wd76c10_t *dev)
         case 3:
             mem_set_mem_state_both(0x20000, 0x80000, MEM_READ_DISABLED | (!!(dev->shadow_ram & 0x1000) ? MEM_WRITE_DISABLED : MEM_WRITE_INTERNAL));
             break;
+        default:
+            break;
     }
 }
 
@@ -424,7 +435,7 @@ wd76c10_close(void *priv)
 }
 
 static void *
-wd76c10_init(const device_t *info)
+wd76c10_init(UNUSED(const device_t *info))
 {
     wd76c10_t *dev = (wd76c10_t *) malloc(sizeof(wd76c10_t));
     memset(dev, 0, sizeof(wd76c10_t));
diff --git a/src/device/bugger.c b/src/device/bugger.c
index 05df6530e..c2678d66a 100644
--- a/src/device/bugger.c
+++ b/src/device/bugger.c
@@ -266,7 +266,7 @@ bug_reset(void)
 
 /* Handle a WRITE operation to one of our registers. */
 static void
-bug_write(uint16_t port, uint8_t val, void *priv)
+bug_write(uint16_t port, uint8_t val, UNUSED(void *priv))
 {
     switch (port - BUGGER_ADDR) {
         case BUG_CTRL: /* control register */
@@ -284,12 +284,14 @@ bug_write(uint16_t port, uint8_t val, void *priv)
                 bug_wdata(val);
             }
             break;
+        default:
+            break;
     }
 }
 
 /* Handle a READ operation from one of our registers. */
 static uint8_t
-bug_read(uint16_t port, void *priv)
+bug_read(uint16_t port, UNUSED(void *priv))
 {
     uint8_t ret = 0xff;
 
@@ -319,7 +321,7 @@ bug_read(uint16_t port, void *priv)
 
 /* Initialize the ISA BusBugger emulator. */
 static void *
-bug_init(const device_t *info)
+bug_init(UNUSED(const device_t *info))
 {
     bugger_log("%s, I/O=%04x\n", info->name, BUGGER_ADDR);
 
diff --git a/src/device/cartridge.c b/src/device/cartridge.c
index 6f8424f70..bc38da15b 100644
--- a/src/device/cartridge.c
+++ b/src/device/cartridge.c
@@ -68,7 +68,7 @@ cart_read(uint32_t addr, void *priv)
 }
 
 static void
-cart_load_error(int drive, char *fn)
+cart_load_error(int drive, UNUSED(char *fn))
 {
     cartridge_log("Cartridge: could not load '%s'\n", fn);
     memset(cart_fns[drive], 0, sizeof(cart_fns[drive]));
diff --git a/src/device/cassette.c b/src/device/cassette.c
index 4582e0751..8bb1c26bd 100644
--- a/src/device/cassette.c
+++ b/src/device/cassette.c
@@ -544,7 +544,7 @@ pc_cas_set_out(pc_cassette_t *cas, unsigned char val)
 }
 
 void
-pc_cas_print_state(const pc_cassette_t *cas)
+pc_cas_print_state(UNUSED(const pc_cassette_t *cas))
 {
     cassette_log("%s %s %lu %s %lu\n", (cas->fname != NULL) ? cas->fname : "<none>", cas->pcm ? "pcm" : "cas", cas->srate, cas->save ? "save" : "load", cas->position);
 }
@@ -642,7 +642,7 @@ pc_cas_advance(pc_cassette_t *cas)
 }
 
 static void
-cassette_close(void *p)
+cassette_close(UNUSED(void *priv))
 {
     if (cassette != NULL) {
         free(cassette);
@@ -664,7 +664,7 @@ cassette_callback(void *p)
 }
 
 static void *
-cassette_init(const device_t *info)
+cassette_init(UNUSED(const device_t *info))
 {
     cassette = NULL;
 
diff --git a/src/device/clock_ics9xxx.c b/src/device/clock_ics9xxx.c
index 0fedfaef7..39e950290 100644
--- a/src/device/clock_ics9xxx.c
+++ b/src/device/clock_ics9xxx.c
@@ -26,6 +26,7 @@
 #include <86box/i2c.h>
 #include "cpu.h"
 #include <86box/clock.h>
+#include <86box/plat_unused.h>
 
 #ifdef ENABLE_ICS9xxx_LOG
 int ics9xxx_do_log = ENABLE_ICS9xxx_LOG;
@@ -983,7 +984,7 @@ ics9xxx_detect(ics9xxx_t *dev)
 #endif
 
 static uint8_t
-ics9xxx_start(void *bus, uint8_t addr, uint8_t read, void *priv)
+ics9xxx_start(UNUSED(void *bus), UNUSED(uint8_t addr), UNUSED(uint8_t read), void *priv)
 {
     ics9xxx_t *dev = (ics9xxx_t *) priv;
 
@@ -995,7 +996,7 @@ ics9xxx_start(void *bus, uint8_t addr, uint8_t read, void *priv)
 }
 
 static uint8_t
-ics9xxx_read(void *bus, uint8_t addr, void *priv)
+ics9xxx_read(UNUSED(void *bus), UNUSED(uint8_t addr), void *priv)
 {
     ics9xxx_t *dev = (ics9xxx_t *) priv;
     uint8_t    ret = 0xff;
@@ -1049,7 +1050,7 @@ ics9xxx_set(ics9xxx_t *dev, uint8_t val)
 }
 
 static uint8_t
-ics9xxx_write(void *bus, uint8_t addr, uint8_t data, void *priv)
+ics9xxx_write(UNUSED(void *bus), UNUSED(uint8_t addr), uint8_t data, void *priv)
 {
     ics9xxx_t *dev = (ics9xxx_t *) priv;
 
diff --git a/src/device/hasp.c b/src/device/hasp.c
index 8c71e1f3f..aa5463106 100644
--- a/src/device/hasp.c
+++ b/src/device/hasp.c
@@ -131,6 +131,8 @@ hasp_write_data(uint8_t val, void *priv)
                 return;
             }
             break;
+        default:
+            break;
     }
 
     dev->status = 0;
@@ -163,6 +165,8 @@ hasp_write_data(uint8_t val, void *priv)
                        I guessed the implicit ones with a bit of trial and error */
                     dev->status = 0x20;
                     return;
+                default:
+                    break;
             }
         }
 
@@ -199,6 +203,8 @@ hasp_write_data(uint8_t val, void *priv)
                 /* again, just the relevant bits instead of the true values */
                 dev->status = 0x20;
                 break;
+            default:
+                break;
         }
     } else if (dev->state == HASP_STATE_PASSWORD_END) {
         if (val & 1) {
diff --git a/src/device/hwm_gl518sm.c b/src/device/hwm_gl518sm.c
index 730e2f2ce..8d0dce763 100644
--- a/src/device/hwm_gl518sm.c
+++ b/src/device/hwm_gl518sm.c
@@ -27,6 +27,8 @@
 #include <86box/io.h>
 #include <86box/i2c.h>
 #include <86box/hwm.h>
+#include <86box/plat_unused.h>
+
 
 #define CLAMP(a, min, max) (((a) < (min)) ? (min) : (((a) > (max)) ? (max) : (a)))
 /* Formulas and factors derived from Linux's gl518sm.c driver. */
@@ -85,7 +87,7 @@ gl518sm_remap(gl518sm_t *dev, uint8_t addr)
 }
 
 static uint8_t
-gl518sm_i2c_start(void *bus, uint8_t addr, uint8_t read, void *priv)
+gl518sm_i2c_start(UNUSED(void *bus), UNUSED(uint8_t addr), UNUSED(uint8_t read), void *priv)
 {
     gl518sm_t *dev = (gl518sm_t *) priv;
 
@@ -95,7 +97,7 @@ gl518sm_i2c_start(void *bus, uint8_t addr, uint8_t read, void *priv)
 }
 
 static uint8_t
-gl518sm_i2c_read(void *bus, uint8_t addr, void *priv)
+gl518sm_i2c_read(UNUSED(void *bus), UNUSED(uint8_t addr), void *priv)
 {
     gl518sm_t *dev  = (gl518sm_t *) priv;
     uint16_t   read = gl518sm_read(dev, dev->addr_register);
@@ -159,7 +161,7 @@ gl518sm_read(gl518sm_t *dev, uint8_t reg)
 }
 
 static uint8_t
-gl518sm_i2c_write(void *bus, uint8_t addr, uint8_t data, void *priv)
+gl518sm_i2c_write(UNUSED(void *bus), UNUSED(uint8_t addr), uint8_t data, void *priv)
 {
     gl518sm_t *dev = (gl518sm_t *) priv;
 
diff --git a/src/device/hwm_lm75.c b/src/device/hwm_lm75.c
index fdfff0e44..dd2c339d0 100644
--- a/src/device/hwm_lm75.c
+++ b/src/device/hwm_lm75.c
@@ -25,6 +25,7 @@
 #include <86box/device.h>
 #include <86box/i2c.h>
 #include <86box/hwm.h>
+#include <86box/plat_unused.h>
 
 #define LM75_TEMP_TO_REG(t) ((t) << 8)
 
@@ -47,7 +48,7 @@ lm75_log(const char *fmt, ...)
 #endif
 
 static uint8_t
-lm75_i2c_start(void *bus, uint8_t addr, uint8_t read, void *priv)
+lm75_i2c_start(UNUSED(void *bus), UNUSED(uint8_t addr), UNUSED(uint8_t read), void *priv)
 {
     lm75_t *dev = (lm75_t *) priv;
 
@@ -74,7 +75,7 @@ lm75_read(lm75_t *dev, uint8_t reg)
 }
 
 static uint8_t
-lm75_i2c_read(void *bus, uint8_t addr, void *priv)
+lm75_i2c_read(UNUSED(void *bus), UNUSED(uint8_t addr), void *priv)
 {
     lm75_t *dev = (lm75_t *) priv;
     uint8_t ret = 0;
@@ -103,6 +104,8 @@ lm75_i2c_read(void *bus, uint8_t addr, void *priv)
             case 0x3: /* Tos */
                 ret = lm75_read(dev, (dev->i2c_state == 1) ? 0x5 : 0x6);
                 break;
+            default:
+                break;
         }
     }
 
@@ -128,7 +131,7 @@ lm75_write(lm75_t *dev, uint8_t reg, uint8_t val)
 }
 
 static uint8_t
-lm75_i2c_write(void *bus, uint8_t addr, uint8_t data, void *priv)
+lm75_i2c_write(UNUSED(void *bus), UNUSED(uint8_t addr), uint8_t data, void *priv)
 {
     lm75_t *dev = (lm75_t *) priv;
 
diff --git a/src/device/hwm_lm78.c b/src/device/hwm_lm78.c
index 9455a2ebd..4b81250c1 100644
--- a/src/device/hwm_lm78.c
+++ b/src/device/hwm_lm78.c
@@ -27,6 +27,7 @@
 #include <86box/timer.h>
 #include <86box/machine.h>
 #include <86box/nvr.h>
+#include <86box/plat_unused.h>
 #include "cpu.h"
 #include <86box/i2c.h>
 #include <86box/hwm.h>
@@ -114,7 +115,7 @@ lm78_nvram(lm78_t *dev, uint8_t save)
 }
 
 static uint8_t
-lm78_nvram_start(void *bus, uint8_t addr, uint8_t read, void *priv)
+lm78_nvram_start(UNUSED(void *bus), UNUSED(uint8_t addr), UNUSED(uint8_t read), void *priv)
 {
     lm78_t *dev = (lm78_t *) priv;
 
@@ -124,7 +125,7 @@ lm78_nvram_start(void *bus, uint8_t addr, uint8_t read, void *priv)
 }
 
 static uint8_t
-lm78_nvram_read(void *bus, uint8_t addr, void *priv)
+lm78_nvram_read(UNUSED(void *bus), UNUSED(uint8_t addr), void *priv)
 {
     lm78_t *dev = (lm78_t *) priv;
     uint8_t ret = 0xff;
@@ -158,7 +159,7 @@ lm78_nvram_read(void *bus, uint8_t addr, void *priv)
 }
 
 static uint8_t
-lm78_nvram_write(void *bus, uint8_t addr, uint8_t val, void *priv)
+lm78_nvram_write(UNUSED(void *bus), uint8_t addr, uint8_t val, void *priv)
 {
     lm78_t *dev = (lm78_t *) priv;
 
@@ -195,7 +196,7 @@ lm78_nvram_write(void *bus, uint8_t addr, uint8_t val, void *priv)
 }
 
 static uint8_t
-lm78_security_start(void *bus, uint8_t addr, uint8_t read, void *priv)
+lm78_security_start(UNUSED(void *bus), UNUSED(uint8_t addr), UNUSED(uint8_t read), void *priv)
 {
     lm78_t *dev = (lm78_t *) priv;
 
@@ -205,7 +206,7 @@ lm78_security_start(void *bus, uint8_t addr, uint8_t read, void *priv)
 }
 
 static uint8_t
-lm78_security_read(void *bus, uint8_t addr, void *priv)
+lm78_security_read(UNUSED(void *bus), UNUSED(uint8_t addr), void *priv)
 {
     lm78_t *dev = (lm78_t *) priv;
 
@@ -213,7 +214,7 @@ lm78_security_read(void *bus, uint8_t addr, void *priv)
 }
 
 static uint8_t
-lm78_security_write(void *bus, uint8_t addr, uint8_t val, void *priv)
+lm78_security_write(UNUSED(void *bus), UNUSED(uint8_t addr), uint8_t val, void *priv)
 {
     lm78_t *dev = (lm78_t *) priv;
 
@@ -229,6 +230,8 @@ lm78_security_write(void *bus, uint8_t addr, uint8_t val, void *priv)
             case 0xe7:
                 /* read-only registers */
                 return 1;
+            default:
+                break;
         }
 
         dev->as99127f.regs[2][dev->as99127f.security_addr_register++] = val;
@@ -316,7 +319,7 @@ lm78_reset(void *priv)
 }
 
 static uint8_t
-lm78_i2c_start(void *bus, uint8_t addr, uint8_t read, void *priv)
+lm78_i2c_start(UNUSED(void *bus), UNUSED(uint8_t addr), UNUSED(uint8_t read), void *priv)
 {
     lm78_t *dev = (lm78_t *) priv;
 
@@ -405,7 +408,7 @@ lm78_isa_read(uint16_t port, void *priv)
 }
 
 static uint8_t
-lm78_i2c_read(void *bus, uint8_t addr, void *priv)
+lm78_i2c_read(UNUSED(void *bus), UNUSED(uint8_t addr), void *priv)
 {
     lm78_t *dev = (lm78_t *) priv;
 
@@ -446,6 +449,8 @@ lm78_write(lm78_t *dev, uint8_t reg, uint8_t val, uint8_t bank)
             case 0x20:
                 val &= 0x7f;
                 break;
+            default:
+                break;
         }
 
         dev->as99127f.regs[0][reg] = val;
@@ -477,6 +482,8 @@ lm78_write(lm78_t *dev, uint8_t reg, uint8_t val, uint8_t bank)
                     case 0x5f:
                         /* read-only registers */
                         return 0;
+                    default:
+                        break;
                 }
 
                 dev->w83782d.regs[0][reg & 0x0f] = val;
@@ -497,6 +504,8 @@ lm78_write(lm78_t *dev, uint8_t reg, uint8_t val, uint8_t bank)
                     case 0x5f:
                         /* read-only registers */
                         return 0;
+                    default:
+                        break;
                 }
 
                 dev->w83782d.regs[1][reg & 0x0f] = val;
@@ -559,6 +568,8 @@ lm78_write(lm78_t *dev, uint8_t reg, uint8_t val, uint8_t bank)
             if (!(dev->local & LM78_WINBOND))
                 return 0;
             break;
+        default:
+            break;
     }
 
     if ((reg >= 0x60) && (reg <= 0x94)) /* write auto-increment value RAM registers to their non-auto-increment locations */
@@ -613,6 +624,8 @@ lm78_write(lm78_t *dev, uint8_t reg, uint8_t val, uint8_t bank)
                     i2c_sethandler(i2c_smbus, (val & 0xf8) >> 1, 4, lm78_nvram_start, lm78_nvram_read, lm78_nvram_write, NULL, dev);
             }
             break;
+        default:
+            break;
     }
 
     return 1;
@@ -644,7 +657,7 @@ lm78_isa_write(uint16_t port, uint8_t val, void *priv)
 }
 
 static uint8_t
-lm78_i2c_write(void *bus, uint8_t addr, uint8_t val, void *priv)
+lm78_i2c_write(UNUSED(void *bus), UNUSED(uint8_t addr), uint8_t val, void *priv)
 {
     lm78_t *dev = (lm78_t *) priv;
 
@@ -694,13 +707,15 @@ lm78_as99127f_write(void *priv, uint8_t reg, uint8_t val)
                 resetx86();
             }
             break;
+        default:
+            break;
     }
 
     return 1;
 }
 
 static void
-lm78_reset_timer(void *priv)
+lm78_reset_timer(UNUSED(void *priv))
 {
     pc_reset_hard();
 }
diff --git a/src/device/hwm_vt82c686.c b/src/device/hwm_vt82c686.c
index 877138a4a..22adee922 100644
--- a/src/device/hwm_vt82c686.c
+++ b/src/device/hwm_vt82c686.c
@@ -25,6 +25,7 @@
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/hwm.h>
+#include <86box/plat_unused.h>
 
 #define CLAMP(a, min, max) (((a) < (min)) ? (min) : (((a) > (max)) ? (max) : (a)))
 /* Formulas and factors derived from Linux's via686a.c driver. */
@@ -113,6 +114,8 @@ vt82c686_write(uint16_t port, uint8_t val, void *priv)
         case 0x48:
             val &= 0x7f;
             break;
+        default:
+            break;
     }
 
     dev->regs[reg] = val;
@@ -143,6 +146,9 @@ vt82c686_hwm_write(uint8_t addr, uint8_t val, void *priv)
         case 0x74:
             dev->enable = val & 0x01;
             break;
+
+        default:
+            break;
     }
 
     if (dev->enable && dev->io_base)
@@ -174,7 +180,7 @@ vt82c686_close(void *priv)
 }
 
 static void *
-vt82c686_init(const device_t *info)
+vt82c686_init(UNUSED(const device_t *info))
 {
     vt82c686_t *dev = (vt82c686_t *) malloc(sizeof(vt82c686_t));
     memset(dev, 0, sizeof(vt82c686_t));
diff --git a/src/device/i2c_gpio.c b/src/device/i2c_gpio.c
index cb7cf6147..06cb1c0ab 100644
--- a/src/device/i2c_gpio.c
+++ b/src/device/i2c_gpio.c
@@ -136,6 +136,9 @@ i2c_gpio_set(void *dev_handle, uint8_t scl, uint8_t sda)
                     dev->slave_sda = !i2c_write(dev->i2c, dev->slave_addr, dev->byte);
                     i2c_gpio_log(2, "I2C GPIO %s: Write %02X %sACK\n", dev->bus_name, dev->byte, dev->slave_sda ? "N" : "");
                     break;
+                
+                default:
+                    break;
             }
         } else if (dev->pos == 9) {
             switch (dev->slave_read) {
diff --git a/src/device/ibm_5161.c b/src/device/ibm_5161.c
index ea62c2abf..5e6be5496 100644
--- a/src/device/ibm_5161.c
+++ b/src/device/ibm_5161.c
@@ -26,6 +26,7 @@
 #include <86box/pci.h>
 #include <86box/timer.h>
 #include <86box/pit.h>
+#include <86box/plat_unused.h>
 #include <86box/port_92.h>
 #include <86box/machine.h>
 
@@ -76,6 +77,9 @@ ibm_5161_in(uint16_t port, void *priv)
                                             0 =On */
             ret = dev->regs[3] & 0x01;
             break;
+
+        default:
+            break;
     }
 
     return ret;
@@ -90,7 +94,7 @@ ibm_5161_close(void *p)
 }
 
 static void *
-ibm_5161_init(const device_t *info)
+ibm_5161_init(UNUSED(const device_t *info))
 {
     ibm_5161_t *dev = (ibm_5161_t *) malloc(sizeof(ibm_5161_t));
     memset(dev, 0, sizeof(ibm_5161_t));
diff --git a/src/device/isamem.c b/src/device/isamem.c
index 708274fca..64471637a 100644
--- a/src/device/isamem.c
+++ b/src/device/isamem.c
@@ -305,6 +305,9 @@ ems_read(uint16_t port, void *priv)
 
         case 0x0001: /* W/O */
             break;
+
+        default:
+            break;
     }
 
 #if ISAMEM_DEBUG
@@ -383,6 +386,9 @@ ems_write(uint16_t port, uint8_t val, void *priv)
             if (val)
                 dev->flags |= FLAG_CONFIG;
             break;
+        
+        default:
+            break;
     }
 }
 
@@ -458,6 +464,9 @@ isamem_init(const device_t *info)
             if (!!device_get_config_int("speed"))
                 dev->flags |= FLAG_FAST;
             break;
+
+        default:
+            break;
     }
 
     /* Fix up the memory start address. */
@@ -471,6 +480,7 @@ isamem_init(const device_t *info)
         isamem_log(", FAST");
     if (dev->flags & FLAG_WIDE)
         isamem_log(", 16BIT");
+
     isamem_log(")\n");
 
     /* Force (back to) 8-bit bus if needed. */
@@ -617,6 +627,7 @@ isamem_init(const device_t *info)
                    dev->base_addr, dev->ems_size, dev->ems_pages);
         if (dev->frame_addr > 0)
             isamem_log(", Frame=%05XH", dev->frame_addr);
+
         isamem_log("\n");
 
         /*
diff --git a/src/device/isapnp.c b/src/device/isapnp.c
index fcf6053ae..d277957af 100644
--- a/src/device/isapnp.c
+++ b/src/device/isapnp.c
@@ -26,6 +26,7 @@
 #include <86box/device.h>
 #include <86box/io.h>
 #include <86box/isapnp.h>
+#include <86box/plat_unused.h>
 
 #define CHECK_CURRENT_LD()                                  \
     if (!dev->current_ld) {                                 \
@@ -245,14 +246,14 @@ isapnp_reset_ld_regs(isapnp_device_t *ld)
 }
 
 static uint8_t
-isapnp_read_rangecheck(uint16_t addr, void *priv)
+isapnp_read_rangecheck(UNUSED(uint16_t addr), void *priv)
 {
     isapnp_device_t *dev = (isapnp_device_t *) priv;
     return (dev->regs[0x31] & 0x01) ? 0x55 : 0xaa;
 }
 
 static uint8_t
-isapnp_read_data(uint16_t addr, void *priv)
+isapnp_read_data(UNUSED(uint16_t addr), void *priv)
 {
     isapnp_t      *dev = (isapnp_t *) priv;
     uint8_t        ret = 0xff;
@@ -418,7 +419,7 @@ isapnp_set_read_data(uint16_t addr, isapnp_t *dev)
 }
 
 static void
-isapnp_write_addr(uint16_t addr, uint8_t val, void *priv)
+isapnp_write_addr(UNUSED(uint16_t addr), uint8_t val, void *priv)
 {
     isapnp_t      *dev  = (isapnp_t *) priv;
     isapnp_card_t *card = dev->first_card;
@@ -449,7 +450,7 @@ isapnp_write_addr(uint16_t addr, uint8_t val, void *priv)
 }
 
 static void
-isapnp_write_data(uint16_t addr, uint8_t val, void *priv)
+isapnp_write_data(UNUSED(uint16_t addr), uint8_t val, void *priv)
 {
     isapnp_t        *dev = (isapnp_t *) priv;
     isapnp_card_t   *card;
@@ -681,6 +682,9 @@ isapnp_write_data(uint16_t addr, uint8_t val, void *priv)
                             val |= 0x02;
 
                         break;
+
+                    default:
+                        break;
                 }
 
                 dev->current_ld->regs[dev->reg] = val;
@@ -691,7 +695,7 @@ isapnp_write_data(uint16_t addr, uint8_t val, void *priv)
 }
 
 static void *
-isapnp_init(const device_t *info)
+isapnp_init(UNUSED(const device_t *info))
 {
     isapnp_t *dev = (isapnp_t *) malloc(sizeof(isapnp_t));
     memset(dev, 0, sizeof(isapnp_t));
@@ -862,6 +866,9 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
                 default:
                     isapnp_log("ISAPnP: >%s%s Large resource %02X (length %d)\n", ldn ? ">" : "", in_df ? ">" : "", res, (card->rom[i + 2] << 8) | card->rom[i + 1]);
                     break;
+#else
+                default:
+                    break;
 #endif
             }
 
@@ -1022,11 +1029,11 @@ isapnp_update_card_rom(void *priv, uint8_t *rom, uint16_t rom_size)
                     card->rom_size = i + 2;
                     break;
 
-#ifdef ENABLE_ISAPNP_LOG
                 default:
+#ifdef ENABLE_ISAPNP_LOG
                     isapnp_log("ISAPnP: >%s%s Small resource %02X (length %d)\n", ldn ? ">" : "", in_df ? ">" : "", res, card->rom[i] & 0x07);
-                    break;
 #endif
+                    break;
             }
 
             i++; /* header */
diff --git a/src/device/isartc.c b/src/device/isartc.c
index d2127146d..f62b4ce6d 100644
--- a/src/device/isartc.c
+++ b/src/device/isartc.c
@@ -427,7 +427,6 @@ mm67_write(uint16_t port, uint8_t val, void *priv)
 {
     rtcdev_t *dev = (rtcdev_t *) priv;
     int       reg = port - dev->base_addr;
-    int       i;
 
 #if ISARTC_DEBUG
     isartc_log("ISARTC: write(%04x, %02x)\n", port - dev->base_addr, val);
@@ -452,7 +451,7 @@ mm67_write(uint16_t port, uint8_t val, void *priv)
 
         case MM67_RSTRAM:
             if (val == 0xff) {
-                for (i = MM67_AL_MSEC; i <= MM67_AL_MON; i++)
+                for (uint8_t i = MM67_AL_MSEC; i <= MM67_AL_MON; i++)
                     dev->nvr.regs[i] = RTC_BCD(0);
                 dev->nvr.regs[MM67_DOW] = RTC_BCD(1);
                 dev->nvr.regs[MM67_DOM] = RTC_BCD(1);
diff --git a/src/device/kbc_at.c b/src/device/kbc_at.c
index 5395f3ac2..1f9b1978b 100644
--- a/src/device/kbc_at.c
+++ b/src/device/kbc_at.c
@@ -29,6 +29,7 @@
 #include <86box/io.h>
 #include <86box/pic.h>
 #include <86box/pit.h>
+#include <86box/plat_unused.h>
 #include <86box/ppi.h>
 #include <86box/mem.h>
 #include <86box/device.h>
@@ -279,6 +280,8 @@ kbc_translate(atkbc_t *dev, uint8_t val)
         case 0x4d:
             t3100e_notify_set(0x0f);
             break; /* Right */
+        default:
+            break;
     }
 
     kbc_at_log("ATkbc: translate is %s, ", translate ? "on" : "off");
@@ -399,10 +402,14 @@ kbc_scan_kbd_at(atkbc_t *dev)
                 kbc_ibf_process(dev);
         /* AT mode. */
         } else {
-            // dev->t = dev->mem[0x28];
+#if 0
+            dev->t = dev->mem[0x28];
+#endif
             if (dev->mem[0x2e] != 0x00) {
-                // if (!(dev->t & 0x02))
-                    // return;
+#if 0
+                if (!(dev->t & 0x02))
+                    return;
+#endif
                 dev->mem[0x2e] = 0x00;
             }
             dev->p2 &= 0xbf;
@@ -466,7 +473,9 @@ at_main_ibf:
             /* Keyboard controller command want to output a single byte. */
             kbc_at_log("ATkbc: %02X coming from channel %i with high status %02X\n", dev->val, dev->channel, dev->stat_hi);
             kbc_send_to_ob(dev, dev->val, dev->channel, dev->stat_hi);
-            // dev->state = (dev->pending == 2) ? STATE_KBC_AMI_OUT : STATE_MAIN_IBF;
+#if 0
+            dev->state = (dev->pending == 2) ? STATE_KBC_AMI_OUT : STATE_MAIN_IBF;
+#endif
             dev->state = STATE_MAIN_IBF;
             dev->pending = 0;
             goto at_main_ibf;
@@ -608,7 +617,9 @@ ps2_main_ibf:
             /* Keyboard controller command want to output a single byte. */
             kbc_at_log("ATkbc: %02X coming from channel %i with high status %02X\n", dev->val, dev->channel, dev->stat_hi);
             kbc_send_to_ob(dev, dev->val, dev->channel, dev->stat_hi);
-            // dev->state = (dev->pending == 2) ? STATE_KBC_AMI_OUT : STATE_MAIN_IBF;
+#if 0
+            dev->state = (dev->pending == 2) ? STATE_KBC_AMI_OUT : STATE_MAIN_IBF;
+#endif
             dev->state = STATE_MAIN_IBF;
             dev->pending = 0;
             goto ps2_main_ibf;
@@ -1041,6 +1052,9 @@ write60_ami(void *priv, uint8_t val)
                 kbc_at_do_poll = kbc_at_poll_at;
             }
             return 0;
+
+        default:
+            break;
     }
 
     return 1;
@@ -1244,13 +1258,16 @@ write64_ami(void *priv, uint8_t val)
         case 0xef: /* ??? - sent by AMI486 */
             kbc_at_log("ATkbc: ??? - sent by AMI486\n");
             return 0;
+
+        default:
+            break;
     }
 
     return write64_generic(dev, val);
 }
 
 static uint8_t
-write60_quadtel(void *priv, uint8_t val)
+write60_quadtel(void *priv, UNUSED(uint8_t val))
 {
     atkbc_t *dev = (atkbc_t *) priv;
 
@@ -1258,6 +1275,8 @@ write60_quadtel(void *priv, uint8_t val)
         case 0xcf: /*??? - sent by MegaPC BIOS*/
             kbc_at_log("ATkbc: ??? - sent by MegaPC BIOS\n");
             return 0;
+        default:
+            break;
     }
 
     return 1;
@@ -1280,6 +1299,8 @@ write64_olivetti(void *priv, uint8_t val)
             kbc_delay_to_ob(dev, (0x0c | (is386 ? 0x00 : 0x80)) & 0xdf, 0, 0x00);
             dev->p1 = ((dev->p1 + 1) & 3) | (dev->p1 & 0xfc);
             return 0;
+        default:
+            break;
     }
 
     return write64_generic(dev, val);
@@ -1300,6 +1321,9 @@ write64_quadtel(void *priv, uint8_t val)
             dev->wantdata  = 1;
             dev->state     = STATE_KBC_PARAM;
             return 0;
+
+        default:
+            break;
     }
 
     return write64_generic(dev, val);
@@ -1315,6 +1339,8 @@ write60_toshiba(void *priv, uint8_t val)
             kbc_at_log("ATkbc: T3100e - set color/mono switch\n");
             t3100e_mono_set(val);
             return 0;
+        default:
+            break;
     }
 
     return 1;
@@ -1405,6 +1431,9 @@ write64_toshiba(void *priv, uint8_t val)
             dev->p1 = (t3100e_mono_get() & 1) ? 0xff : 0xbf;
             kbc_delay_to_ob(dev, dev->p1, 0, 0x00);
             return 0;
+
+        default:
+            break;
     }
 
     return write64_generic(dev, val);
@@ -1726,6 +1755,9 @@ kbc_at_write(uint16_t port, uint8_t val, void *priv)
                 return;
             }
             break;
+
+        default:
+            break;
     }
 
     dev->ib = val;
@@ -1922,6 +1954,9 @@ kbc_at_init(const device_t *info)
             dev->write60_ven = write60_toshiba;
             dev->write64_ven = write64_toshiba;
             break;
+
+        default:
+            break;
     }
 
     max_ports = ((dev->flags & KBC_TYPE_MASK) >= KBC_TYPE_PS2_1) ? 2 : 1;
diff --git a/src/device/kbc_at_dev.c b/src/device/kbc_at_dev.c
index 2715f94fa..32323ceeb 100644
--- a/src/device/kbc_at_dev.c
+++ b/src/device/kbc_at_dev.c
@@ -169,6 +169,8 @@ kbc_at_dev_poll(void *priv)
             if (dev->cmd_queue_start == dev->cmd_queue_end)
                 dev->state = DEV_STATE_EXECUTE_BAT;
             break;
+        default:
+            break;
     }
 }
 
diff --git a/src/device/keyboard.c b/src/device/keyboard.c
index 9d15db79b..142b69ebc 100644
--- a/src/device/keyboard.c
+++ b/src/device/keyboard.c
@@ -167,6 +167,8 @@ keyboard_input(int down, uint16_t scan)
                 case 0x138: /* Right Alt */
                     shift |= 0x40;
                     break;
+                default:
+                    break;
             }
         } else {
             switch (scan & 0x1ff) {
@@ -197,13 +199,17 @@ keyboard_input(int down, uint16_t scan)
                 case 0x046:
                     scroll_lock ^= 1;
                     break;
+                default:
+                    break;
             }
         }
     }
 
     /* NOTE: Shouldn't this be some sort of bit shift? An array of 8 unsigned 64-bit integers
              should be enough. */
-    /* recv_key[scan >> 6] |= ((uint64_t) down << ((uint64_t) scan & 0x3fLL)); */
+#if 0
+    recv_key[scan >> 6] |= ((uint64_t) down << ((uint64_t) scan & 0x3fLL));
+#endif
 
     /* pclog("Received scan code: %03X (%s)\n", scan & 0x1ff, down ? "down" : "up"); */
     recv_key[scan & 0x1ff] = down;
diff --git a/src/device/keyboard_at.c b/src/device/keyboard_at.c
index 516303137..5a9ea13f5 100644
--- a/src/device/keyboard_at.c
+++ b/src/device/keyboard_at.c
@@ -491,8 +491,8 @@ static void
 keyboard_at_set_scancode_set(void)
 {
     switch (keyboard_mode) {
-        case 0x01:
         default:
+        case 0x01:
             keyboard_set_table(scancode_set1);
             break;
 
diff --git a/src/device/keyboard_xt.c b/src/device/keyboard_xt.c
index bdc1cc51b..613d8e277 100644
--- a/src/device/keyboard_xt.c
+++ b/src/device/keyboard_xt.c
@@ -454,6 +454,9 @@ kbd_adddata(uint16_t val)
                 case 0x54: /* SysRQ => toggle window */
                     t1000_syskey(0x00, 0x00, 0x08);
                     break;
+
+                default:
+                    break;
             }
         } else
             t1000_syskey(0x04, 0x00, 0x00); /* Reset 'Fn' indicator */
@@ -578,6 +581,9 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
                 kbd->pravetz_flags = (kbd->pravetz_flags & ~(1 << bit)) | set;
             }
             break;
+
+        default:
+            break;
     }
 }
 
@@ -686,6 +692,9 @@ kbd_read(uint16_t port, void *priv)
                 ret = kbd->pravetz_flags;
             kbd_log("XTkbd: Port %02X in : %02X\n", port, ret);
             break;
+
+        default:
+            break;
     }
 
     return ret;
diff --git a/src/device/mouse.c b/src/device/mouse.c
index 9409fa3cb..c606d5fd7 100644
--- a/src/device/mouse.c
+++ b/src/device/mouse.c
@@ -30,6 +30,7 @@
 #include <86box/timer.h>
 #include <86box/gdbstub.h>
 #include <86box/mouse.h>
+#include <86box/plat_unused.h>
 
 typedef struct {
     const device_t *device;
@@ -152,7 +153,7 @@ mouse_close(void)
 }
 
 static void
-mouse_timer_poll(void *priv)
+mouse_timer_poll(UNUSED(void *priv))
 {
     /* Poll at 255 Hz, maximum supported by PS/2 mic. */
     timer_on_auto(&mouse_timer, 1000000.0 / sample_rate);
diff --git a/src/device/mouse_bus.c b/src/device/mouse_bus.c
index 5025871d8..41783dba6 100644
--- a/src/device/mouse_bus.c
+++ b/src/device/mouse_bus.c
@@ -80,6 +80,7 @@
 #include <86box/timer.h>
 #include <86box/device.h>
 #include <86box/mouse.h>
+#include <86box/plat_unused.h>
 #include <86box/random.h>
 
 #define IRQ_MASK ((1 << 5) >> dev->irq)
@@ -216,6 +217,8 @@ lt_read(uint16_t port, void *priv)
             else
                 return 0xff;
             break;
+        default:
+            break;
     }
 
     bm_log("DEBUG: read from address 0x%04x, value = 0x%02x\n", port, value);
@@ -263,6 +266,8 @@ ms_read(uint16_t port, void *priv)
         case INP_PORT_CONFIG:
             bm_log("ERROR: Unsupported read from port 0x%04x\n", port);
             break;
+        default:
+            break;
     }
 
     bm_log("DEBUG: read from address 0x%04x, value = 0x%02x\n", port, value);
@@ -355,6 +360,9 @@ lt_write(uint16_t port, uint8_t val, void *priv)
                     dev->control_val &= ~bit; /* Reset */
             }
             break;
+
+        default:
+            break;
     }
 }
 
@@ -444,12 +452,15 @@ ms_write(uint16_t port, uint8_t val, void *priv)
         case INP_PORT_CONFIG:
             bm_log("ERROR: Unsupported write to port 0x%04x (value = 0x%02x)\n", port, val);
             break;
+
+        default:
+            break;
     }
 }
 
 /* The emulator calls us with an update on the host mouse device. */
 static int
-bm_poll(int x, int y, int z, int b, double abs_x, double abs_y, void *priv)
+bm_poll(int x, int y, UNUSED(int z), int b, UNUSED(double abs_x), UNUSED(double abs_y), void *priv)
 {
     mouse_t *dev = (mouse_t *) priv;
     int xor ;
diff --git a/src/device/mouse_ps2.c b/src/device/mouse_ps2.c
index 46144e02e..2d150b5ed 100644
--- a/src/device/mouse_ps2.c
+++ b/src/device/mouse_ps2.c
@@ -23,6 +23,7 @@
 #include <86box/device.h>
 #include <86box/keyboard.h>
 #include <86box/mouse.h>
+#include <86box/plat_unused.h>
 
 enum {
     MODE_STREAM,
@@ -310,7 +311,7 @@ ps2_write(void *priv)
 }
 
 static int
-ps2_poll(int x, int y, int z, int b, double abs_x, double abs_y, void *priv)
+ps2_poll(int x, int y, int z, int b, UNUSED(double abs_x), UNUSED(double abs_y), void *priv)
 {
     atkbc_dev_t *dev = (atkbc_dev_t *) priv;
     int packet_size = (dev->flags & FLAG_INTMODE) ? 4 : 3;
diff --git a/src/device/mouse_serial.c b/src/device/mouse_serial.c
index 37dc6b4a0..cd0ed71fb 100644
--- a/src/device/mouse_serial.c
+++ b/src/device/mouse_serial.c
@@ -26,6 +26,7 @@
 #include <86box/timer.h>
 #include <86box/serial.h>
 #include <86box/mouse.h>
+#include <86box/plat_unused.h>
 
 #define SERMOUSE_PORT 0 /* attach to Serial0 */
 
@@ -138,8 +139,8 @@ sermouse_transmit_period(mouse_t *dev, int bps, int rps)
         case 5: /* MM Series format: 8 data, odd parity, 1 stop, 1 start */
             word_len = 11;
             break;
-        default:
         case 7: /* Microsoft-compatible format: 7 data, no parity, 1 stop, 1 start */
+        default:
             word_len = 9;
             break;
     }
@@ -158,7 +159,7 @@ sermouse_transmit_period(mouse_t *dev, int bps, int rps)
 
 /* Callback from serial driver: RTS was toggled. */
 static void
-sermouse_callback(struct serial_s *serial, void *priv)
+sermouse_callback(UNUSED(struct serial_s *serial), void *priv)
 {
     mouse_t *dev = (mouse_t *) priv;
 
@@ -332,6 +333,9 @@ sermouse_report(int x, int y, int z, int b, mouse_t *dev)
         case 7:
             len = sermouse_data_ms(dev, x, y, z, b);
             break;
+
+        default:
+            break;
     }
 
     dev->data_len = len;
@@ -527,7 +531,7 @@ sermouse_command_timer(void *priv)
 }
 
 static int
-sermouse_poll(int x, int y, int z, int b, double abs_x, double abs_y, void *priv)
+sermouse_poll(int x, int y, int z, int b, UNUSED(double abs_x), UNUSED(double abs_y), void *priv)
 {
     mouse_t *dev = (mouse_t *) priv;
 
@@ -613,7 +617,7 @@ ltsermouse_switch_baud_rate(mouse_t *dev, int phase)
 }
 
 static void
-ltsermouse_write(struct serial_s *serial, void *priv, uint8_t data)
+ltsermouse_write(UNUSED(struct serial_s *serial), void *priv, uint8_t data)
 {
     mouse_t *dev = (mouse_t *) priv;
 
@@ -644,6 +648,8 @@ ltsermouse_write(struct serial_s *serial, void *priv, uint8_t data)
                 }
                 ltsermouse_switch_baud_rate(dev, PHASE_BAUD_RATE);
                 break;
+            default:
+                break;
         }
     else
         switch (data) {
@@ -728,11 +734,13 @@ ltsermouse_write(struct serial_s *serial, void *priv, uint8_t data)
             case 0x6B:
                 ltsermouse_command_phase(dev, PHASE_BUTTONS);
                 break;
+            default:
+                break;
         }
 }
 
 static void
-ltsermouse_transmit_period(serial_t *serial, void *priv, double transmit_period)
+ltsermouse_transmit_period(UNUSED(serial_t *serial), void *priv, double transmit_period)
 {
     mouse_t *dev = (mouse_t *) priv;
 
@@ -796,8 +804,8 @@ sermouse_init(const device_t *info)
         dev->id_len    = 1;
         dev->id[0]     = 'M';
         switch (dev->but) {
-            case 2:
             default:
+            case 2:
                 dev->type = info->local ? MOUSE_TYPE_LOGITECH : MOUSE_TYPE_MICROSOFT;
                 break;
             case 3:
@@ -846,7 +854,7 @@ sermouse_init(const device_t *info)
     mouse_set_buttons((dev->flags & FLAG_3BTN) ? 3 : 2);
 
     /* Return our private data to the I/O layer. */
-    return (dev);
+    return dev;
 }
 
 static const device_config_t mssermouse_config[] = {
diff --git a/src/device/mouse_wacom_tablet.c b/src/device/mouse_wacom_tablet.c
index fa5c4651f..87e34d0b0 100644
--- a/src/device/mouse_wacom_tablet.c
+++ b/src/device/mouse_wacom_tablet.c
@@ -197,6 +197,9 @@ wacom_process_settings_dword(mouse_wacom_t *wacom, uint32_t dword)
         case 3:
             wacom->transmit_period = wacom_transmit_period(wacom, 19200, -1);
             break;
+
+        default:
+            break;
     }
 
     mouse_mode = !wacom->settings_bits.coord_sys;
@@ -245,7 +248,7 @@ wacom_reset_artpad(mouse_wacom_t *wacom)
 }
 
 static void
-wacom_callback(struct serial_s *serial, void *priv)
+wacom_callback(UNUSED(struct serial_s *serial), void *priv)
 {
     mouse_wacom_t *wacom = (mouse_wacom_t *) priv;
 
@@ -265,13 +268,16 @@ wacom_callback(struct serial_s *serial, void *priv)
         case 3:
             wacom->transmit_period = wacom_transmit_period(wacom, 19200, -1);
             break;
+
+        default:
+            break;
     }
     timer_stop(&wacom->report_timer);
     timer_on_auto(&wacom->report_timer, wacom->transmit_period);
 }
 
 static void
-wacom_write(struct serial_s *serial, void *priv, uint8_t data)
+wacom_write(UNUSED(struct serial_s *serial), void *priv, uint8_t data)
 {
     mouse_wacom_t *wacom           = (mouse_wacom_t *) priv;
     static int     special_command = 0;
@@ -295,6 +301,8 @@ wacom_write(struct serial_s *serial, void *priv, uint8_t data)
                     wacom->data_rec[wacom->data_rec_pos++] = data;
                     break;
                 }
+            default:
+                break;
         }
         special_command = 0;
         return;
@@ -403,7 +411,7 @@ wacom_write(struct serial_s *serial, void *priv, uint8_t data)
 }
 
 static int
-wacom_poll(int x, int y, int z, int b, double abs_x, double abs_y, void *priv)
+wacom_poll(int x, int y, UNUSED(int z), int b, double abs_x, double abs_y, void *priv)
 {
     mouse_wacom_t *wacom = (mouse_wacom_t *) priv;
 
@@ -563,8 +571,8 @@ wacom_report_timer(void *priv)
             return;
 
         switch (wacom->mode) {
-            case WACOM_MODE_STREAM:
             default:
+            case WACOM_MODE_STREAM:
                 break;
 
             case WACOM_MODE_POINT:
diff --git a/src/device/pci_bridge.c b/src/device/pci_bridge.c
index e54cdea74..871a935ca 100644
--- a/src/device/pci_bridge.c
+++ b/src/device/pci_bridge.c
@@ -352,6 +352,9 @@ pci_bridge_write(int func, int addr, uint8_t val, void *priv)
                     return;
             }
             break;
+
+        default:
+            break;
     }
 
     dev->regs[addr] = val;
@@ -434,6 +437,9 @@ pci_bridge_reset(void *priv)
             dev->regs[0x06] = 0x20;
             dev->regs[0x07] = 0x02;
             break;
+
+        default:
+            break;
     }
 
     /* class */
diff --git a/src/device/phoenix_486_jumper.c b/src/device/phoenix_486_jumper.c
index d5e833404..45889e668 100644
--- a/src/device/phoenix_486_jumper.c
+++ b/src/device/phoenix_486_jumper.c
@@ -28,6 +28,7 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/chipset.h>
+#include <86box/plat_unused.h>
 
 /*
     Bit 7 = Super I/O chip: 1 = enabled, 0 = disabled;
@@ -64,7 +65,7 @@ phoenix_486_jumper_log(const char *fmt, ...)
 #endif
 
 static void
-phoenix_486_jumper_write(uint16_t addr, uint8_t val, void *priv)
+phoenix_486_jumper_write(UNUSED(uint16_t addr), uint8_t val, void *priv)
 {
     phoenix_486_jumper_t *dev = (phoenix_486_jumper_t *) priv;
     phoenix_486_jumper_log("Phoenix 486 Jumper: Write %02x\n", val);
@@ -75,7 +76,7 @@ phoenix_486_jumper_write(uint16_t addr, uint8_t val, void *priv)
 }
 
 static uint8_t
-phoenix_486_jumper_read(uint16_t addr, void *priv)
+phoenix_486_jumper_read(UNUSED(uint16_t addr), void *priv)
 {
     phoenix_486_jumper_t *dev = (phoenix_486_jumper_t *) priv;
     phoenix_486_jumper_log("Phoenix 486 Jumper: Read %02x\n", dev->jumper);
diff --git a/src/device/postcard.c b/src/device/postcard.c
index 8475f76fc..f5e85dafb 100644
--- a/src/device/postcard.c
+++ b/src/device/postcard.c
@@ -86,7 +86,7 @@ postcard_reset(void)
 }
 
 static void
-postcard_write(uint16_t port, uint8_t val, void *priv)
+postcard_write(UNUSED(uint16_t port), uint8_t val, UNUSED(void *priv))
 {
     if (postcard_written && (val == postcard_code))
         return;
@@ -100,7 +100,7 @@ postcard_write(uint16_t port, uint8_t val, void *priv)
 }
 
 static void *
-postcard_init(const device_t *info)
+postcard_init(UNUSED(const device_t *info))
 {
     postcard_reset();
 
diff --git a/src/device/serial.c b/src/device/serial.c
index bc4b3053d..a36e4f99f 100644
--- a/src/device/serial.c
+++ b/src/device/serial.c
@@ -154,7 +154,9 @@ serial_receive_timer(void *priv)
 {
     serial_t *dev = (serial_t *) priv;
 
-    // serial_log("serial_receive_timer()\n");
+#if 0
+    serial_log("serial_receive_timer()\n");
+#endif
 
     timer_on_auto(&dev->receive_timer, /* dev->bits * */ dev->transmit_period);
 
@@ -174,7 +176,9 @@ serial_receive_timer(void *priv)
             } else {
                 /* We can input data into the FIFO. */
                 dev->rcvr_fifo[dev->rcvr_fifo_end] = (uint8_t) (dev->out_new & 0xff);
-                // dev->rcvr_fifo_end = (dev->rcvr_fifo_end + 1) & 0x0f;
+#if 0
+                dev->rcvr_fifo_end = (dev->rcvr_fifo_end + 1) & 0x0f;
+#endif
                 /* Do not wrap around, makes sure it still triggers the interrupt
                    at 16 bytes. */
                 dev->rcvr_fifo_end++;
@@ -557,6 +561,8 @@ serial_write(uint16_t addr, uint8_t val, void *p)
                     case 3:
                         dev->rcvr_fifo_len = 14;
                         break;
+                    default:
+                        break;
                 }
                 dev->out_new = 0xffff;
                 serial_log("FIFO now %sabled, receive FIFO length = %i\n", dev->fifo_enabled ? "en" : "dis", dev->rcvr_fifo_len);
@@ -624,8 +630,10 @@ serial_write(uint16_t addr, uint8_t val, void *p)
             serial_update_ints(dev);
             break;
         case 6:
-            // dev->msr = (val & 0xf0) | (dev->msr & 0x0f);
-            // dev->msr = val;
+#if 0
+            dev->msr = (val & 0xf0) | (dev->msr & 0x0f);
+            dev->msr = val;
+#endif
             /* The actual condition bits of the MSR are read-only, but the delta bits are
                undocumentedly writable, and the PCjr BIOS uses them to raise MSR interrupts. */
             dev->msr = (dev->msr & 0xf0) | (val & 0x0f);
@@ -637,6 +645,8 @@ serial_write(uint16_t addr, uint8_t val, void *p)
             if (dev->type >= SERIAL_16450)
                 dev->scratch = val;
             break;
+        default:
+            break;
     }
 }
 
@@ -736,6 +746,8 @@ serial_read(uint16_t addr, void *p)
         case 7:
             ret = dev->scratch;
             break;
+        default:
+            break;
     }
 
     // serial_log("UART: Read %02X from port %02X\n", ret, addr);
@@ -914,7 +926,7 @@ serial_set_next_inst(int ni)
 void
 serial_standalone_init(void)
 {
-    for (; next_inst < SERIAL_MAX;)
+    while (next_inst < SERIAL_MAX)
         device_add_inst(&ns8250_device, next_inst + 1);
 };
 
diff --git a/src/device/serial_passthrough.c b/src/device/serial_passthrough.c
index 441d3e339..846d5b363 100644
--- a/src/device/serial_passthrough.c
+++ b/src/device/serial_passthrough.c
@@ -29,6 +29,7 @@
 #include <86box/serial.h>
 #include <86box/serial_passthrough.h>
 #include <86box/plat_serial_passthrough.h>
+#include <86box/plat_unused.h>
 
 #define ENABLE_SERIAL_PASSTHROUGH_LOG 1
 #ifdef ENABLE_SERIAL_PASSTHROUGH_LOG
@@ -61,7 +62,7 @@ serial_passthrough_init(void)
 }
 
 static void
-serial_passthrough_write(serial_t *s, void *priv, uint8_t val)
+serial_passthrough_write(UNUSED(serial_t *s), void *priv, uint8_t val)
 {
     plat_serpt_write(priv, val);
 }
@@ -86,24 +87,32 @@ host_to_serial_cb(void *priv)
         }
     }
     if (plat_serpt_read(dev, &byte)) {
-        // printf("got byte %02X\n", byte);
+#if 0
+        printf("got byte %02X\n", byte);
+#endif
         serial_write_fifo(dev->serial, byte);
-        // serial_set_dsr(dev->serial, 1);
+#if 0
+        serial_set_dsr(dev->serial, 1);
+#endif
     }
 no_write_to_machine:
-    // serial_device_timeout(dev->serial);
+#if 0
+    serial_device_timeout(dev->serial);
+#endif
     timer_on_auto(&dev->host_to_serial_timer, (1000000.0 / dev->baudrate) * (double) dev->bits);
 }
 
 static void
-serial_passthrough_rcr_cb(struct serial_s *serial, void *priv)
+serial_passthrough_rcr_cb(UNUSED(struct serial_s *serial), void *priv)
 {
     serial_passthrough_t *dev = (serial_passthrough_t *) priv;
 
     timer_stop(&dev->host_to_serial_timer);
     /* FIXME: do something to dev->baudrate */
     timer_on_auto(&dev->host_to_serial_timer, (1000000.0 / dev->baudrate) * (double) dev->bits);
-    // serial_clear_fifo(dev->serial);
+#if 0
+    serial_clear_fifo(dev->serial);
+#endif
 }
 
 static void
@@ -114,7 +123,9 @@ serial_passthrough_speed_changed(void *priv)
     timer_stop(&dev->host_to_serial_timer);
     /* FIXME: do something to dev->baudrate */
     timer_on_auto(&dev->host_to_serial_timer, (1000000.0 / dev->baudrate) * (double) dev->bits);
-    // serial_clear_fifo(dev->serial);
+#if 0
+    serial_clear_fifo(dev->serial);
+#endif
 }
 
 static void
@@ -131,28 +142,28 @@ serial_passthrough_dev_close(void *priv)
 }
 
 void
-serial_passthrough_transmit_period(serial_t *serial, void *p, double transmit_period)
+serial_passthrough_transmit_period(UNUSED(serial_t *serial), void *priv, double transmit_period)
 {
-    serial_passthrough_t *dev = (serial_passthrough_t *) p;
+    serial_passthrough_t *dev = (serial_passthrough_t *) priv;
 
     if (dev->mode != SERPT_MODE_HOSTSER)
         return;
     dev->baudrate = 1000000.0 / transmit_period;
 
-    serial_passthrough_speed_changed(p);
+    serial_passthrough_speed_changed(priv);
     plat_serpt_set_params(dev);
 }
 
 void
-serial_passthrough_lcr_callback(serial_t *serial, void *p, uint8_t lcr)
+serial_passthrough_lcr_callback(serial_t *serial, void *priv, uint8_t lcr)
 {
-    serial_passthrough_t *dev = (serial_passthrough_t *) p;
+    serial_passthrough_t *dev = (serial_passthrough_t *) priv;
 
     if (dev->mode != SERPT_MODE_HOSTSER)
         return;
     dev->bits      = serial->bits;
     dev->data_bits = ((lcr & 0x03) + 5);
-    serial_passthrough_speed_changed(p);
+    serial_passthrough_speed_changed(priv);
     plat_serpt_set_params(dev);
 }
 
diff --git a/src/device/smbus_ali7101.c b/src/device/smbus_ali7101.c
index 9ca89456a..d48749d28 100644
--- a/src/device/smbus_ali7101.c
+++ b/src/device/smbus_ali7101.c
@@ -79,6 +79,9 @@ smbus_ali7101_read(uint16_t addr, void *priv)
         case 0x07:
             ret = dev->cmd;
             break;
+
+        default:
+            break;
     }
 
     smbus_ali7101_log("SMBus ALI7101: read(%02X) = %02x\n", addr, ret);
@@ -223,6 +226,9 @@ smbus_ali7101_write(uint16_t addr, uint8_t val, void *priv)
         case 0x07:
             dev->cmd = val;
             break;
+
+        default:
+            break;
     }
 
     if (dev->next_stat != 0x04) { /* schedule dispatch of any pending status register update */
diff --git a/src/device/smbus_piix4.c b/src/device/smbus_piix4.c
index 670a9adf4..48a04451e 100644
--- a/src/device/smbus_piix4.c
+++ b/src/device/smbus_piix4.c
@@ -83,6 +83,9 @@ smbus_piix4_read(uint16_t addr, void *priv)
             if (dev->index >= SMBUS_PIIX4_BLOCK_DATA_SIZE)
                 dev->index = 0;
             break;
+
+        default:
+            break;
     }
 
     smbus_piix4_log("SMBus PIIX4: read(%02X) = %02x\n", addr, ret);
@@ -309,6 +312,9 @@ unknown_protocol:
             if (dev->index >= SMBUS_PIIX4_BLOCK_DATA_SIZE)
                 dev->index = 0;
             break;
+
+        default:
+            break;
     }
 
     if (dev->next_stat) { /* schedule dispatch of any pending status register update */
diff --git a/src/disk/hdc_esdi_at.c b/src/disk/hdc_esdi_at.c
index 7c0d08fca..9fc6b58d5 100644
--- a/src/disk/hdc_esdi_at.c
+++ b/src/disk/hdc_esdi_at.c
@@ -84,7 +84,11 @@ typedef struct {
 typedef struct {
     uint8_t status;
     uint8_t error;
-    int     secount, sector, cylinder, head, cylprecomp;
+    int     secount;
+    int     sector;
+    int     cylinder;
+    int     head;
+    int     cylprecomp;
     uint8_t command;
     uint8_t fdisk;
     int     pos;
@@ -132,13 +136,13 @@ irq_raise(esdi_t *esdi)
 }
 
 static __inline void
-irq_lower(esdi_t *esdi)
+irq_lower(UNUSED(esdi_t *esdi))
 {
     picintc(1 << 14);
 }
 
 static __inline void
-irq_update(esdi_t *esdi)
+irq_update(UNUSED(esdi_t *esdi))
 {
     if (esdi->irqstat && !((pic2.irr | pic2.isr) & 0x40) && !(esdi->fdisk & 2))
         picint(1 << 14);
@@ -159,7 +163,7 @@ esdi_set_callback(esdi_t *esdi, double callback)
 }
 
 double
-esdi_get_xfer_time(esdi_t *esdi, int size)
+esdi_get_xfer_time(UNUSED(esdi_t *esdi), int size)
 {
     /* 390.625 us per sector at 10 Mbit/s = 1280 kB/s. */
     return (3125.0 / 8.0) * (double) size;
@@ -417,6 +421,9 @@ esdi_write(uint16_t port, uint8_t val, void *priv)
             esdi->fdisk = val;
             irq_update(esdi);
             break;
+
+        default:
+            break;
     }
 }
 
@@ -498,6 +505,9 @@ esdi_read(uint16_t port, void *priv)
             irq_lower(esdi);
             temp = esdi->status;
             break;
+
+        default:
+            break;
     }
 
     esdi_at_log("WD1007 read(%04x) = %02x\n", port, temp);
@@ -791,7 +801,7 @@ esdi_callback(void *priv)
 }
 
 static void
-loadhd(esdi_t *esdi, int hdd_num, int d, const char *fn)
+loadhd(esdi_t *esdi, int hdd_num, int d, UNUSED(const char *fn))
 {
     drive_t *drive = &esdi->drives[hdd_num];
 
@@ -822,7 +832,7 @@ esdi_rom_write(uint32_t addr, uint8_t val, void *p)
 }
 
 static void *
-wd1007vse1_init(const device_t *info)
+wd1007vse1_init(UNUSED(const device_t *info))
 {
     int c;
 
diff --git a/src/disk/hdc_esdi_mca.c b/src/disk/hdc_esdi_mca.c
index f8686ba4e..6e7edb1be 100644
--- a/src/disk/hdc_esdi_mca.c
+++ b/src/disk/hdc_esdi_mca.c
@@ -82,6 +82,7 @@
 #include <86box/ui.h>
 #include <86box/hdc.h>
 #include <86box/hdd.h>
+#include <86box/plat_unused.h>
 
 /* These are hardwired. */
 #define ESDI_IOADDR_PRI 0x3510
@@ -117,8 +118,8 @@ typedef struct esdi_t {
     uint16_t cmd_data[4];
     int      cmd_dev;
 
-    int status_pos,
-        status_len;
+    int status_pos;
+    int status_len;
 
     uint16_t status_data[256];
 
@@ -221,7 +222,7 @@ set_irq(esdi_t *dev)
 }
 
 static __inline void
-clear_irq(esdi_t *dev)
+clear_irq(UNUSED(esdi_t *dev))
 {
     picintc(1 << 14);
 }
@@ -241,7 +242,7 @@ esdi_mca_set_callback(esdi_t *dev, double callback)
 }
 
 static double
-esdi_mca_get_xfer_time(esdi_t *esdi, int size)
+esdi_mca_get_xfer_time(UNUSED(esdi_t *esdi), int size)
 {
     /* 390.625 us per sector at 10 Mbit/s = 1280 kB/s. */
     return (3125.0 / 8.0) * (double) size;
@@ -440,6 +441,9 @@ esdi_callback(void *priv)
                     dev->irq_in_progress = 1;
                     set_irq(dev);
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -513,6 +517,9 @@ esdi_callback(void *priv)
                     dev->irq_in_progress = 1;
                     set_irq(dev);
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -546,6 +553,9 @@ esdi_callback(void *priv)
                     dev->irq_in_progress = 1;
                     set_irq(dev);
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -577,6 +587,9 @@ esdi_callback(void *priv)
                     dev->irq_in_progress = 1;
                     set_irq(dev);
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -695,7 +708,6 @@ esdi_callback(void *priv)
                             }
 
                             dev->data[dev->data_pos++] = val & 0xffff;
-                            ;
                         }
 
                         memcpy(dev->sector_buffer[dev->sector_pos++], dev->data, 512);
@@ -714,6 +726,9 @@ esdi_callback(void *priv)
                     set_irq(dev);
                     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -771,6 +786,9 @@ esdi_callback(void *priv)
                     set_irq(dev);
                     ui_sb_update_icon(SB_HDD | HDD_BUS_ESDI, 0);
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -839,6 +857,9 @@ esdi_callback(void *priv)
                     dev->irq_in_progress = 1;
                     set_irq(dev);
                     break;
+
+                default:
+                    break;
             }
             break;
 
@@ -1085,6 +1106,9 @@ esdi_mca_write(int port, uint8_t val, void *priv)
         case 0x10:
             dev->dma = 4;
             break;
+
+        default:
+            break;
     }
 
     if (dev->pos_regs[2] & 1) {
@@ -1113,7 +1137,7 @@ esdi_mca_feedb(void *priv)
 }
 
 static void *
-esdi_init(const device_t *info)
+esdi_init(UNUSED(const device_t *info))
 {
     drive_t *drive;
     esdi_t  *dev;
diff --git a/src/disk/hdc_ide.c b/src/disk/hdc_ide.c
index 2bd1b8b8a..ea771235e 100644
--- a/src/disk/hdc_ide.c
+++ b/src/disk/hdc_ide.c
@@ -111,10 +111,14 @@
 #define IDE_TIME                       10.0
 
 typedef struct {
-    int bit32, cur_dev,
-        irq, inited,
-        diag, force_ata3;
-    uint16_t   base_main, side_main;
+    int        bit32;
+    int        cur_dev;
+    int        irq;
+    int        inited;
+    int        diag;
+    int        force_ata3;
+    uint16_t   base_main;
+    uint16_t   side_main;
     pc_timer_t timer;
     ide_t     *ide[2];
 } ide_board_t;
@@ -717,7 +721,7 @@ ide_next_sector(ide_t *ide)
 }
 
 static void
-loadhd(ide_t *ide, int d, const char *fn)
+loadhd(ide_t *ide, int d, UNUSED(const char *fn))
 {
     if (!hdd_image_load(d)) {
         ide->type = IDE_NONE;
@@ -746,7 +750,9 @@ ide_set_signature(ide_t *ide)
         ide->cylinder           = ide->sc->request_length;
     } else {
         ide->secount = 1;
-        // ide->cylinder = ((ide->type == IDE_HDD) ? 0 : 0xFFFF);
+#if 0
+        ide->cylinder = ((ide->type == IDE_HDD) ? 0 : 0xFFFF);
+#endif
         ide->cylinder = ((ide->type == IDE_HDD) ? 0 : 0x7F7F);
         if (ide->type == IDE_HDD)
             ide->drive = 0;
@@ -851,7 +857,7 @@ ide_set_sector(ide_t *ide, int64_t sector_num)
     if (ide->lba) {
         ide->head     = (sector_num >> 24);
         ide->cylinder = (sector_num >> 8);
-        ide->sector   = (sector_num);
+        ide->sector   = sector_num;
     } else {
         cyl           = sector_num / (hdd[ide->hdd_num].hpc * hdd[ide->hdd_num].spt);
         r             = sector_num % (hdd[ide->hdd_num].hpc * hdd[ide->hdd_num].spt);
@@ -1334,7 +1340,7 @@ dev_reset(ide_t *ide)
 }
 
 void
-ide_write_devctl(uint16_t addr, uint8_t val, void *priv)
+ide_write_devctl(UNUSED(uint16_t addr), uint8_t val, void *priv)
 {
     ide_board_t *dev = (ide_board_t *) priv;
 
@@ -2048,7 +2054,7 @@ ide_readb(uint16_t addr, void *priv)
 }
 
 uint8_t
-ide_read_alt_status(uint16_t addr, void *priv)
+ide_read_alt_status(UNUSED(uint16_t addr), void *priv)
 {
     uint8_t temp = 0xff;
 
@@ -2957,7 +2963,7 @@ ide_ter_init(const device_t *info)
 
 /* Close a standalone IDE unit. */
 static void
-ide_ter_close(void *priv)
+ide_ter_close(UNUSED(void *priv))
 {
     ide_board_close(2);
 }
@@ -2988,7 +2994,7 @@ ide_qua_init(const device_t *info)
 
 /* Close a standalone IDE unit. */
 static void
-ide_qua_close(void *priv)
+ide_qua_close(UNUSED(void *priv))
 {
     ide_board_close(3);
 }
@@ -3087,7 +3093,7 @@ ide_board_reset(int board)
 
 /* Reset a standalone IDE unit. */
 static void
-ide_reset(void *p)
+ide_reset(UNUSED(void *priv))
 {
     ide_log("Resetting IDE...\n");
 
@@ -3100,7 +3106,7 @@ ide_reset(void *p)
 
 /* Close a standalone IDE unit. */
 static void
-ide_close(void *priv)
+ide_close(UNUSED(void *priv))
 {
     ide_log("Closing IDE...\n");
 
diff --git a/src/disk/hdc_ide_cmd640.c b/src/disk/hdc_ide_cmd640.c
index 6f8580cba..cc642b3bb 100644
--- a/src/disk/hdc_ide_cmd640.c
+++ b/src/disk/hdc_ide_cmd640.c
@@ -37,14 +37,17 @@
 #include <86box/zip.h>
 #include <86box/mo.h>
 
-typedef struct
-{
-    uint8_t vlb_idx, id,
-        in_cfg, single_channel,
-        pci, regs[256];
+typedef struct {
+    uint8_t  vlb_idx;
+    uint8_t  id;
+    uint8_t  in_cfg;
+    uint8_t  single_channel;
+    uint8_t  pci, regs[256];
     uint32_t local;
-    int      slot, irq_mode[2],
-        irq_pin, irq_line;
+    int      slot;
+    int      irq_mode[2];
+    int      irq_pin;
+    int      irq_line;
 } cmd640_t;
 
 static int next_id = 0;
@@ -166,6 +169,9 @@ cmd640_common_write(int addr, uint8_t val, cmd640_t *dev)
         case 0x5b: /* Undocumented register that Linux attempts to use! */
             dev->regs[addr] = val;
             break;
+
+        default:
+            break;
     }
 }
 
@@ -188,6 +194,9 @@ cmd640_vlb_write(uint16_t addr, uint8_t val, void *priv)
             if (dev->regs[0x50] & 0x80)
                 dev->in_cfg = 0;
             break;
+
+        default:
+            break;
     }
 }
 
@@ -227,6 +236,9 @@ cmd640_vlb_read(uint16_t addr, void *priv)
             if (dev->regs[0x50] & 0x80)
                 dev->in_cfg = 0;
             break;
+
+        default:
+            break;
     }
 
     return ret;
@@ -462,7 +474,9 @@ cmd640_init(const device_t *info)
         ide_board_set_force_ata3(0, 1);
         ide_board_set_force_ata3(1, 1);
 
-        // ide_pri_disable();
+#if 0
+        ide_pri_disable();
+#endif
     } else if (info->flags & DEVICE_VLB) {
         device_add(&ide_vlb_2ch_device);
 
diff --git a/src/disk/hdc_ide_cmd646.c b/src/disk/hdc_ide_cmd646.c
index a9f5eb883..af5af2557 100644
--- a/src/disk/hdc_ide_cmd646.c
+++ b/src/disk/hdc_ide_cmd646.c
@@ -37,13 +37,15 @@
 #include <86box/zip.h>
 #include <86box/mo.h>
 
-typedef struct
-{
-    uint8_t vlb_idx, single_channel,
-        in_cfg, regs[256];
-    uint32_t local;
-    int      slot, irq_mode[2],
-        irq_pin;
+typedef struct {
+    uint8_t     vlb_idx;
+    uint8_t     single_channel;
+    uint8_t     in_cfg;
+    uint8_t     regs[256];
+    uint32_t    local;
+    int         slot;
+    int         irq_mode[2];
+    int         irq_pin;
     sff8038i_t *bm[2];
 } cmd646_t;
 
@@ -262,6 +264,9 @@ cmd646_pci_write(int func, int addr, uint8_t val, void *priv)
             case 0x78 ... 0x7f:
                 sff_bus_master_write(addr & 0x0f, val, dev->bm[1]);
                 break;
+
+            default:
+                break;
         }
 }
 
diff --git a/src/disk/hdc_ide_opti611.c b/src/disk/hdc_ide_opti611.c
index 06eecb68f..2f893f07e 100644
--- a/src/disk/hdc_ide_opti611.c
+++ b/src/disk/hdc_ide_opti611.c
@@ -28,6 +28,7 @@
 #include <86box/mem.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
+#include <86box/plat_unused.h>
 
 typedef struct
 {
@@ -68,6 +69,9 @@ opti611_cfg_write(uint16_t addr, uint8_t val, void *priv)
         case 0x0006:
             dev->regs[0x06] = val;
             break;
+
+        default:
+            break;
     }
 }
 
@@ -109,6 +113,9 @@ opti611_cfg_read(uint16_t addr, void *priv)
         case 0x0006:
             ret = dev->regs[addr];
             break;
+
+        default:
+            break;
     }
 
     return ret;
@@ -153,7 +160,7 @@ opti611_ide_write(uint16_t addr, uint8_t val, void *priv)
 }
 
 static void
-opti611_ide_writew(uint16_t addr, uint16_t val, void *priv)
+opti611_ide_writew(uint16_t addr, UNUSED(uint16_t val), void *priv)
 {
     opti611_t *dev = (opti611_t *) priv;
 
@@ -169,7 +176,7 @@ opti611_ide_writew(uint16_t addr, uint16_t val, void *priv)
 }
 
 static void
-opti611_ide_writel(uint16_t addr, uint32_t val, void *priv)
+opti611_ide_writel(uint16_t addr, UNUSED(uint32_t val), void *priv)
 {
     opti611_t *dev = (opti611_t *) priv;
 
@@ -281,7 +288,7 @@ opti611_close(void *priv)
 }
 
 static void *
-opti611_init(const device_t *info)
+opti611_init(UNUSED(const device_t *info))
 {
     opti611_t *dev = (opti611_t *) malloc(sizeof(opti611_t));
     memset(dev, 0, sizeof(opti611_t));
diff --git a/src/disk/hdc_ide_sff8038i.c b/src/disk/hdc_ide_sff8038i.c
index a2c80ac7f..e6eb6d6d9 100644
--- a/src/disk/hdc_ide_sff8038i.c
+++ b/src/disk/hdc_ide_sff8038i.c
@@ -42,6 +42,7 @@
 #include <86box/hdc_ide_sff8038i.h>
 #include <86box/zip.h>
 #include <86box/mo.h>
+#include <86box/plat_unused.h>
 
 static int next_id = 0;
 
@@ -160,6 +161,9 @@ sff_bus_master_write(uint16_t port, uint8_t val, void *priv)
             dev->ptr = (dev->ptr & 0x00fffffc) | (val << 24);
             dev->ptr %= (mem_size * 1024);
             break;
+
+        default:
+            break;
     }
 }
 
@@ -185,6 +189,9 @@ sff_bus_master_writew(uint16_t port, uint16_t val, void *priv)
             dev->ptr = (dev->ptr & 0x0000fffc) | (val << 16);
             dev->ptr %= (mem_size * 1024);
             break;
+
+        default:
+            break;
     }
 }
 
@@ -206,6 +213,9 @@ sff_bus_master_writel(uint16_t port, uint32_t val, void *priv)
             dev->ptr %= (mem_size * 1024);
             dev->ptr0 = val & 0xff;
             break;
+
+        default:
+            break;
     }
 }
 
@@ -238,6 +248,9 @@ sff_bus_master_read(uint16_t port, void *priv)
         case 7:
             ret = dev->ptr >> 24;
             break;
+
+        default:
+            break;
     }
 
     sff_log("SFF-8038i Bus master BYTE  read : %04X       %02X\n", port, ret);
@@ -264,6 +277,9 @@ sff_bus_master_readw(uint16_t port, void *priv)
         case 6:
             ret = dev->ptr >> 16;
             break;
+
+        default:
+            break;
     }
 
     sff_log("SFF-8038i Bus master WORD  read : %04X     %04X\n", port, ret);
@@ -287,6 +303,9 @@ sff_bus_master_readl(uint16_t port, void *priv)
         case 4:
             ret = dev->ptr0 | (dev->ptr & 0xffffff00);
             break;
+
+        default:
+            break;
     }
 
     sff_log("sff Bus master DWORD read : %04X %08X\n", port, ret);
@@ -295,7 +314,7 @@ sff_bus_master_readl(uint16_t port, void *priv)
 }
 
 int
-sff_bus_master_dma(int channel, uint8_t *data, int transfer_length, int out, void *priv)
+sff_bus_master_dma(UNUSED(int channel), uint8_t *data, int transfer_length, int out, void *priv)
 {
     sff8038i_t *dev = (sff8038i_t *) priv;
 #ifdef ENABLE_SFF_LOG
@@ -379,8 +398,8 @@ sff_bus_master_set_irq(int channel, void *priv)
     channel &= 0x01;
 
     switch (dev->irq_mode[channel]) {
-        case 0:
         default:
+        case 0:
             /* Legacy IRQ mode. */
             if (irq)
                 picint(1 << (14 + channel));
@@ -481,7 +500,7 @@ sff_set_irq_line(sff8038i_t *dev, int irq_line)
 }
 
 void
-sff_set_irq_level(sff8038i_t *dev, int channel, int irq_level)
+sff_set_irq_level(sff8038i_t *dev, int channel, UNUSED(int irq_level))
 {
     dev->irq_level[channel] = 0;
 }
@@ -492,8 +511,8 @@ sff_set_irq_mode(sff8038i_t *dev, int channel, int irq_mode)
     dev->irq_mode[channel] = irq_mode;
 
     switch (dev->irq_mode[channel]) {
-        case 0:
         default:
+        case 0:
             /* Legacy IRQ mode. */
             sff_log("[%08X] Setting channel %i to legacy IRQ %i\n", dev, channel, 14 + channel);
             break;
@@ -537,7 +556,7 @@ sff_close(void *p)
 
 static void
     *
-    sff_init(const device_t *info)
+    sff_init(UNUSED(const device_t *info))
 {
     sff8038i_t *dev = (sff8038i_t *) malloc(sizeof(sff8038i_t));
     memset(dev, 0, sizeof(sff8038i_t));
diff --git a/src/disk/hdc_st506_at.c b/src/disk/hdc_st506_at.c
index 88fd7192b..eaf9832a5 100644
--- a/src/disk/hdc_st506_at.c
+++ b/src/disk/hdc_st506_at.c
@@ -75,35 +75,35 @@
 #define CMD_SET_PARAMETERS 0x91
 
 typedef struct {
-    int8_t present, /* drive is present */
-        hdd_num,    /* drive number in system */
-        steprate,   /* current servo step rate */
-        spt,        /* physical #sectors per track */
-        hpc,        /* physical #heads per cylinder */
-        pad;
-    int16_t tracks; /* physical #tracks per cylinder */
+    int8_t  present;  /* drive is present */
+    int8_t  hdd_num;  /* drive number in system */
+    int8_t  steprate; /* current servo step rate */
+    int8_t  spt;      /* physical #sectors per track */
+    int8_t  hpc;      /* physical #heads per cylinder */
+    int8_t  pad;
+    int16_t tracks;   /* physical #tracks per cylinder */
 
-    int8_t cfg_spt, /* configured #sectors per track */
-        cfg_hpc;    /* configured #heads per track */
+    int8_t cfg_spt;   /* configured #sectors per track */
+    int8_t cfg_hpc;   /* configured #heads per track */
 
-    int16_t curcyl; /* current track number */
+    int16_t curcyl;   /* current track number */
 } drive_t;
 
 typedef struct {
-    uint8_t precomp, /* 1: precomp/error register */
-        error,
-        secount, /* 2: sector count register */
-        sector,  /* 3: sector number */
-        head,    /* 6: head number + drive select */
-        command, /* 7: command/status */
-        status,
-        fdisk;         /* 8: control register */
+    uint8_t  precomp;  /* 1: precomp/error register */
+    uint8_t  error;
+    uint8_t  secount;  /* 2: sector count register */
+    uint8_t  sector;   /* 3: sector number */
+    uint8_t  head;     /* 6: head number + drive select */
+    uint8_t  command;  /* 7: command/status */
+    uint8_t  status;
+    uint8_t  fdisk;    /* 8: control register */
     uint16_t cylinder; /* 4/5: cylinder LOW and HIGH */
 
-    int8_t reset, /* controller in reset */
-        irqstat,  /* current IRQ status */
-        drvsel,   /* current selected drive */
-        pad;
+    int8_t reset;      /* controller in reset */
+    int8_t irqstat;    /* current IRQ status */
+    int8_t drvsel;     /* current selected drive */
+    int8_t pad;
 
     int        pos;            /* offset within data buffer */
     pc_timer_t callback_timer; /* callback delay timer */
@@ -144,7 +144,7 @@ irq_raise(mfm_t *mfm)
 }
 
 static inline void
-irq_lower(mfm_t *mfm)
+irq_lower(UNUSED(mfm_t *mfm))
 {
     picintc(1 << 14);
 }
@@ -668,7 +668,7 @@ do_callback(void *priv)
 }
 
 static void
-loadhd(mfm_t *mfm, int c, int d, const char *fn)
+loadhd(mfm_t *mfm, int c, int d, UNUSED(const char *fn))
 {
     drive_t *drive = &mfm->drives[c];
 
@@ -686,7 +686,7 @@ loadhd(mfm_t *mfm, int c, int d, const char *fn)
 }
 
 static void *
-mfm_init(const device_t *info)
+mfm_init(UNUSED(const device_t *info))
 {
     mfm_t *mfm;
     int    c;
diff --git a/src/disk/hdc_st506_xt.c b/src/disk/hdc_st506_xt.c
index 6f9358e0a..743f25410 100644
--- a/src/disk/hdc_st506_xt.c
+++ b/src/disk/hdc_st506_xt.c
@@ -238,12 +238,12 @@ typedef struct {
 
     uint16_t cylinder; /* current cylinder */
 
-    uint8_t spt, /* physical parameters */
-        hpc;
+    uint8_t  spt; /* physical parameters */
+    uint8_t  hpc;
     uint16_t tracks;
 
-    uint8_t cfg_spt, /* configured parameters */
-        cfg_hpc;
+    uint8_t  cfg_spt; /* configured parameters */
+    uint8_t  cfg_hpc;
     uint16_t cfg_cyl;
 } drive_t;
 
@@ -253,15 +253,18 @@ typedef struct {
     uint8_t spt; /* sectors-per-track for controller */
 
     uint16_t base; /* controller configuration */
-    int8_t   irq,
-        dma;
+    int8_t   irq;
+    int8_t   dma;
     uint8_t  switches;
     uint8_t  misc;
-    uint8_t  nr_err, err_bv, cur_sec, pad;
-    uint32_t bios_addr,
-        bios_size,
-        bios_ram;
-    rom_t bios_rom;
+    uint8_t  nr_err;
+    uint8_t  err_bv;
+    uint8_t  cur_sec;
+    uint8_t  pad;
+    uint32_t bios_addr;
+    uint32_t bios_size;
+    uint32_t bios_ram;
+    rom_t    bios_rom;
 
     int        state; /* operational data */
     uint8_t    irq_dma;
@@ -272,14 +275,14 @@ typedef struct {
 
     uint8_t command[6]; /* current command request */
     int     drive_sel;
-    int     sector,
-        head,
-        cylinder,
-        count;
+    int     sector;
+    int     head;
+    int     cylinder;
+    int     count;
     uint8_t compl ; /* current request completion code */
 
-    int buff_pos, /* pointers to the RAM buffer */
-        buff_cnt;
+    int buff_pos; /* pointers to the RAM buffer */
+    int buff_cnt;
 
     drive_t drives[MFM_NUM];       /* the attached drives */
     uint8_t scratch[64];           /* ST-11 scratchpad RAM */
@@ -1362,9 +1365,10 @@ mem_read(uint32_t addr, void *priv)
         case ST506_XT_TYPE_ST11R: /* ST-11R */
             mask = 0x1fff;        /* ST-11 decodes RAM on each 8K block */
             break;
-
-            /* default:
-                    break; */
+#if 0
+        default:
+                    break;
+#endif
     }
 
     addr = addr & dev->bios_rom.mask;
@@ -1429,7 +1433,7 @@ loadrom(hdc_t *dev, const char *fn)
 }
 
 static void
-loadhd(hdc_t *dev, int c, int d, const char *fn)
+loadhd(hdc_t *dev, int c, int d, UNUSED(const char *fn))
 {
     drive_t *drive = &dev->drives[c];
 
diff --git a/src/disk/hdc_xta.c b/src/disk/hdc_xta.c
index e698df7ff..7b4fc432f 100644
--- a/src/disk/hdc_xta.c
+++ b/src/disk/hdc_xta.c
@@ -185,12 +185,12 @@ enum {
 typedef struct {
     uint8_t cmd; /* [7:5] class, [4:0] opcode    */
 
-    uint8_t head   : 5, /* [4:0] head number        */
-        drvsel     : 1, /* [5] drive select        */
-        mbz        : 2; /* [7:6] 00            */
+    uint8_t head   : 5; /* [4:0] head number        */
+    uint8_t drvsel : 1; /* [5] drive select        */
+    uint8_t mbz    : 2; /* [7:6] 00            */
 
-    uint8_t sector : 6, /* [5:0] sector number 0-63    */
-        cyl_high   : 2; /* [7:6] cylinder [9:8] bits    */
+    uint8_t sector   : 6; /* [5:0] sector number 0-63    */
+    uint8_t cyl_high : 2; /* [7:6] cylinder [9:8] bits    */
 
     uint8_t cyl_low; /* [7:0] cylinder [7:0] bits    */
 
@@ -216,19 +216,19 @@ typedef struct {
 
 /* Define an attached drive. */
 typedef struct {
-    int8_t id,   /* drive ID on bus */
-        present, /* drive is present */
-        hdd_num, /* index to global disk table */
-        type;    /* drive type ID */
+    int8_t id;   /* drive ID on bus */
+    int8_t present; /* drive is present */
+    int8_t hdd_num; /* index to global disk table */
+    int8_t type;    /* drive type ID */
 
     uint16_t cur_cyl; /* last known position of heads */
 
-    uint8_t spt, /* active drive parameters */
-        hpc;
+    uint8_t  spt; /* active drive parameters */
+    uint8_t  hpc;
     uint16_t tracks;
 
-    uint8_t cfg_spt, /* configured drive parameters */
-        cfg_hpc;
+    uint8_t  cfg_spt; /* configured drive parameters */
+    uint8_t  cfg_hpc;
     uint16_t cfg_tracks;
 } drive_t;
 
@@ -252,17 +252,17 @@ typedef struct {
     pc_timer_t timer;
 
     /* Data transfer. */
-    int16_t buf_idx, /* buffer index and pointer */
-        buf_len;
+    int16_t  buf_idx; /* buffer index and pointer */
+    int16_t  buf_len;
     uint8_t *buf_ptr;
 
     /* Current operation parameters. */
-    dcb_t    dcb;   /* device control block */
-    uint16_t track; /* requested track# */
-    uint8_t  head,  /* requested head# */
-        sector,     /* requested sector# */
-        comp;       /* operation completion byte */
-    int count;      /* requested sector count */
+    dcb_t    dcb;    /* device control block */
+    uint16_t track;  /* requested track# */
+    uint8_t  head;   /* requested head# */
+    uint8_t  sector; /* requested sector# */
+    uint8_t  comp;   /* operation completion byte */
+    int count;       /* requested sector count */
 
     drive_t drives[XTA_NUM]; /* the attached drive(s) */
 
@@ -958,7 +958,9 @@ hdc_write(uint16_t port, uint8_t val, void *priv)
             break;
 
         case 3: /* DMA/IRQ intr register */
-            // xta_log("%s: WriteMASK(%02X)\n", dev->name, val);
+#if 0
+            xta_log("%s: WriteMASK(%02X)\n", dev->name, val);
+#endif
             dev->intr = val;
             break;
     }
diff --git a/src/disk/hdc_xtide.c b/src/disk/hdc_xtide.c
index d1baba8be..5caa2337e 100644
--- a/src/disk/hdc_xtide.c
+++ b/src/disk/hdc_xtide.c
@@ -43,6 +43,7 @@
 #include <86box/device.h>
 #include <86box/hdc.h>
 #include <86box/hdc_ide.h>
+#include <86box/plat_unused.h>
 
 #define ROM_PATH_XT     "roms/hdd/xtide/ide_xt.bin"
 #define ROM_PATH_XTP    "roms/hdd/xtide/ide_xtp.bin"
@@ -193,7 +194,7 @@ xtide_at_386_available(void)
 }
 
 static void *
-xtide_acculogic_init(const device_t *info)
+xtide_acculogic_init(UNUSED(const device_t *info))
 {
     xtide_t *xtide = malloc(sizeof(xtide_t));
 
@@ -228,7 +229,7 @@ xtide_close(void *priv)
 }
 
 static void *
-xtide_at_ps2_init(const device_t *info)
+xtide_at_ps2_init(UNUSED(const device_t *info))
 {
     xtide_t *xtide = malloc(sizeof(xtide_t));
 
diff --git a/src/disk/hdd.c b/src/disk/hdd.c
index 6135c31d8..751121690 100644
--- a/src/disk/hdd.c
+++ b/src/disk/hdd.c
@@ -102,7 +102,7 @@ no_cdrom:
 }
 
 char *
-hdd_bus_to_string(int bus, int cdrom)
+hdd_bus_to_string(int bus, UNUSED(int cdrom))
 {
     char *s = "none";
 
diff --git a/src/disk/hdd_image.c b/src/disk/hdd_image.c
index 856fc382c..0e61271a9 100644
--- a/src/disk/hdd_image.c
+++ b/src/disk/hdd_image.c
@@ -45,7 +45,8 @@ typedef struct
     FILE     *file; /* Used for HDD_IMAGE_RAW, HDD_IMAGE_HDI, and HDD_IMAGE_HDX. */
     MVHDMeta *vhd;  /* Used for HDD_IMAGE_VHD. */
     uint32_t  base;
-    uint32_t  pos, last_sector;
+    uint32_t  pos;
+    uint32_t  last_sector;
     uint8_t   type; /* HDD_IMAGE_RAW, HDD_IMAGE_HDI, HDD_IMAGE_HDX, or HDD_IMAGE_VHD */
     uint8_t   loaded;
 } hdd_image_t;
@@ -637,7 +638,7 @@ hdd_image_get_type(uint8_t id)
 }
 
 void
-hdd_image_unload(uint8_t id, int fn_preserve)
+hdd_image_unload(uint8_t id, UNUSED(int fn_preserve))
 {
     if (strlen(hdd[id].fn) == 0)
         return;
diff --git a/src/disk/mo.c b/src/disk/mo.c
index 5a76d4394..9cf46afab 100644
--- a/src/disk/mo.c
+++ b/src/disk/mo.c
@@ -793,7 +793,7 @@ mo_data_command_finish(mo_t *dev, int len, int block_len, int alloc_len, int dir
 }
 
 static void
-mo_sense_clear(mo_t *dev, int command)
+mo_sense_clear(mo_t *dev, UNUSED(int command))
 {
     mo_sense_key = mo_asc = mo_ascq = 0;
 }
@@ -938,7 +938,7 @@ mo_invalid_field_pl(mo_t *dev)
 }
 
 static int
-mo_blocks(mo_t *dev, int32_t *len, int first_batch, int out)
+mo_blocks(mo_t *dev, int32_t *len, UNUSED(int first_batch), int out)
 {
     *len = 0;
 
@@ -1179,7 +1179,9 @@ mo_pre_execution_check(mo_t *dev, uint8_t *cdb)
 static void
 mo_seek(mo_t *dev, uint32_t pos)
 {
-    /* mo_log("MO %i: Seek %08X\n", dev->id, pos); */
+#if 0
+    mo_log("MO %i: Seek %08X\n", dev->id, pos);
+#endif
     dev->sector_pos = pos;
 }
 
@@ -1687,7 +1689,9 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
                 dev->buffer[1] = 0x80;                                              /*Removable*/
                 dev->buffer[2] = (dev->drv->bus_type == MO_BUS_SCSI) ? 0x02 : 0x00; /*SCSI-2 compliant*/
                 dev->buffer[3] = (dev->drv->bus_type == MO_BUS_SCSI) ? 0x02 : 0x21;
-                // dev->buffer[4] = 31;
+#if 0
+                dev->buffer[4] = 31;
+#endif
                 dev->buffer[4] = 0;
                 if (dev->drv->bus_type == MO_BUS_SCSI) {
                     dev->buffer[6] = 1;    /* 16-bit transfers supported */
@@ -1830,7 +1834,9 @@ mo_command(scsi_common_t *sc, uint8_t *cdb)
             break;
     }
 
-    /* mo_log("MO %i: Phase: %02X, request length: %i\n", dev->id, dev->phase, dev->request_length); */
+#if 0
+    mo_log("MO %i: Phase: %02X, request length: %i\n", dev->id, dev->phase, dev->request_length);
+#endif
 
     if (mo_atapi_phase_to_scsi(dev) == SCSI_PHASE_STATUS)
         mo_buf_free(dev);
diff --git a/src/disk/zip.c b/src/disk/zip.c
index 62b8f0fe1..768963695 100644
--- a/src/disk/zip.c
+++ b/src/disk/zip.c
@@ -1768,7 +1768,9 @@ zip_command(scsi_common_t *sc, uint8_t *cdb)
                 case 1: /* Start the disc and read the TOC. */
                     break;
                 case 2: /* Eject the disc if possible. */
-                    /* zip_eject(dev->id); */
+#if 0
+                    zip_eject(dev->id);
+#endif
                     break;
                 case 3: /* Load the disc (close tray). */
                     zip_reload(dev->id);
@@ -1850,7 +1852,9 @@ zip_command(scsi_common_t *sc, uint8_t *cdb)
                 dev->buffer[1] = 0x80;                                               /*Removable*/
                 dev->buffer[2] = (dev->drv->bus_type == ZIP_BUS_SCSI) ? 0x02 : 0x00; /*SCSI-2 compliant*/
                 dev->buffer[3] = (dev->drv->bus_type == ZIP_BUS_SCSI) ? 0x02 : 0x21;
-                // dev->buffer[4] = 31;
+#if 0
+                dev->buffer[4] = 31;
+#endif
                 dev->buffer[4] = 0;
                 if (dev->drv->bus_type == ZIP_BUS_SCSI) {
                     dev->buffer[6] = 1;    /* 16-bit transfers supported */
@@ -2010,7 +2014,9 @@ atapi_out:
             break;
     }
 
-    /* zip_log("ZIP %i: Phase: %02X, request length: %i\n", dev->id, dev->phase, dev->request_length); */
+#if 0
+    zip_log("ZIP %i: Phase: %02X, request length: %i\n", dev->id, dev->phase, dev->request_length);
+#endif
 
     if (zip_atapi_phase_to_scsi(dev) == SCSI_PHASE_STATUS)
         zip_buf_free(dev);
diff --git a/src/floppy/fdc.c b/src/floppy/fdc.c
index c3bdf293a..e29d5d2f8 100644
--- a/src/floppy/fdc.c
+++ b/src/floppy/fdc.c
@@ -36,6 +36,7 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/fdc_ext.h>
+#include <86box/plat_unused.h>
 
 extern uint64_t motoron[FDD_NUM];
 
@@ -94,7 +95,7 @@ fdc_log(const char *fmt, ...)
 #    define fdc_log(fmt, ...)
 #endif
 
-/*
+#if 0
 const device_t fdc_none_device = {
     .name          = "None",
     .internal_name = "none",
@@ -108,7 +109,7 @@ const device_t fdc_none_device = {
     .force_redraw  = NULL,
     .config        = NULL
 };
-*/
+#endif
 
 const device_t fdc_internal_device = {
     .name          = "Internal",
@@ -130,7 +131,9 @@ typedef const struct {
 
 static fdc_cards_t fdc_cards[] = {
     // clang-format off
-//  { &fdc_none_device     },
+#if 0
+    { &fdc_none_device     },
+#endif
     { &fdc_internal_device },
     { &fdc_b215_device     },
     { &fdc_pii151b_device  },
@@ -598,7 +601,9 @@ static void
 fdc_rate(fdc_t *fdc, int drive)
 {
     fdc_update_rate(fdc, drive);
-    // fdc_log("FDD %c: Setting rate: %i, %i, %i (%i, %i)\n", 0x41 + drive, fdc->drvrate[drive], fdc->rate, fdc_get_densel(fdc, drive), fdc->rwc[drive], fdc->densel_force);
+#if 0
+    fdc_log("FDD %c: Setting rate: %i, %i, %i (%i, %i)\n", 0x41 + drive, fdc->drvrate[drive], fdc->rate, fdc_get_densel(fdc, drive), fdc->rwc[drive], fdc->densel_force);
+#endif
     fdc_log("FDD %c: [%i] Setting rate: %i, %i, %i (%i, %i, %i)\n", 0x41 + drive, fdc->enh_mode, fdc->drvrate[drive], fdc->rate, fdc_get_densel(fdc, drive), fdc->rwc[drive], fdc->densel_force, fdc->densel_polarity);
     fdd_set_densel(fdc_get_densel(fdc, drive));
     fdc_log("FDD %c: [%i] Densel: %i\n", 0x41 + drive, fdc->enh_mode, fdc_get_densel(fdc, drive));
@@ -1136,7 +1141,9 @@ fdc_write(uint16_t addr, uint8_t val, void *priv)
                             fdc->stat     = (1 << fdc->drive);
                             if (!(fdc->flags & FDC_FLAG_PCJR))
                                 fdc->stat |= 0x80;
-                            /* fdc->head = (fdc->params[0] & 4) ? 1 : 0; */
+#if 0
+                            fdc->head = (fdc->params[0] & 4) ? 1 : 0;
+#endif
                             fdc->head = 0; /* TODO: See if this is correct. */
                             fdc->st0  = fdc->params[0] & 0x03;
                             fdc->st0 |= (fdc->params[0] & 4);
@@ -2113,7 +2120,7 @@ fdc_getdata(fdc_t *fdc, int last)
 }
 
 void
-fdc_sectorid(fdc_t *fdc, uint8_t track, uint8_t side, uint8_t sector, uint8_t size, uint8_t crc1, uint8_t crc2)
+fdc_sectorid(fdc_t *fdc, uint8_t track, uint8_t side, uint8_t sector, uint8_t size, UNUSED(uint8_t crc1), UNUSED(uint8_t crc2))
 {
     fdc_int(fdc, 1);
     fdc->stat = 0xD0;
diff --git a/src/floppy/fdc_magitronic.c b/src/floppy/fdc_magitronic.c
index d71721d7b..5ebd9de42 100644
--- a/src/floppy/fdc_magitronic.c
+++ b/src/floppy/fdc_magitronic.c
@@ -29,19 +29,19 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/fdc_ext.h>
+#include <86box/plat_unused.h>
 
 #define ROM_B215     "roms/floppy/magitronic/Magitronic B215 - BIOS ROM.bin"
 #define ROM_ADDR     (uint32_t)(device_get_config_hex20("bios_addr") & 0x000fffff)
 
 #define DRIVE_SELECT (int) (real_drive(dev->fdc_controller, i))
-typedef struct
-{
+typedef struct {
     fdc_t *fdc_controller;
     rom_t  rom;
 } b215_t;
 
 static uint8_t
-b215_read(uint16_t addr, void *priv)
+b215_read(UNUSED(uint16_t addr), void *priv)
 {
     b215_t *dev = (b215_t *) priv;
 
@@ -88,7 +88,7 @@ b215_close(void *priv)
 }
 
 static void *
-b215_init(const device_t *info)
+b215_init(UNUSED(const device_t *info))
 {
     b215_t *dev = (b215_t *) malloc(sizeof(b215_t));
     memset(dev, 0, sizeof(b215_t));
diff --git a/src/floppy/fdc_monster.c b/src/floppy/fdc_monster.c
index 00a9d968a..91598b897 100644
--- a/src/floppy/fdc_monster.c
+++ b/src/floppy/fdc_monster.c
@@ -32,12 +32,12 @@
 #include <86box/fdd.h>
 #include <86box/fdc.h>
 #include <86box/fdc_ext.h>
+#include <86box/plat_unused.h>
 
 #define BIOS_ADDR       (uint32_t)(device_get_config_hex20("bios_addr") & 0x000fffff)
 #define ROM_MONSTER_FDC "roms/floppy/monster-fdc/floppy_bios.bin"
 
-typedef struct
-{
+typedef struct {
     rom_t  bios_rom;
     fdc_t *fdc_pri;
     fdc_t *fdc_sec;
@@ -52,7 +52,7 @@ monster_fdc_close(void *priv)
 }
 
 static void *
-monster_fdc_init(const device_t *info)
+monster_fdc_init(UNUSED(const device_t *info))
 {
     monster_fdc_t *dev;
 
diff --git a/src/floppy/fdc_pii15xb.c b/src/floppy/fdc_pii15xb.c
index be471face..8bbda7991 100644
--- a/src/floppy/fdc_pii15xb.c
+++ b/src/floppy/fdc_pii15xb.c
@@ -80,8 +80,7 @@ MiniMicro 4 also won't work with the XT FDC which the Zilog claims to be.
 #define ROM_PII_151B "roms/floppy/dtk/pii-151b.rom"
 #define ROM_PII_158B "roms/floppy/dtk/pii-158b.rom"
 
-typedef struct
-{
+typedef struct {
     rom_t bios_rom;
 } pii_t;
 
diff --git a/src/floppy/fdd_86f.c b/src/floppy/fdd_86f.c
index f0bf6b7f7..c59e04052 100644
--- a/src/floppy/fdd_86f.c
+++ b/src/floppy/fdd_86f.c
@@ -149,8 +149,14 @@ typedef union {
 } decoded_t;
 
 typedef struct {
-    uint8_t c, h, r, n;
-    uint8_t flags, pad, pad0, pad1;
+    uint8_t c;
+    uint8_t h;
+    uint8_t r;
+    uint8_t n;
+    uint8_t flags;
+    uint8_t pad;
+    uint8_t pad0;
+    uint8_t pad1;
     void   *prev;
 } sector_t;
 
@@ -175,9 +181,16 @@ typedef struct {
  */
 typedef struct {
     FILE   *f;
-    uint8_t state, fill, sector_count, format_state,
-        error_condition, id_found;
-    uint16_t  version, disk_flags, satisfying_bytes, turbo_pos;
+    uint8_t   state;
+    uint8_t   fill;
+    uint8_t   sector_count;
+    uint8_t   format_state;
+    uint8_t   error_condition;
+    uint8_t   id_found;
+    uint16_t  version;
+    uint16_t  disk_flags;
+    uint16_t  satisfying_bytes;
+    uint16_t  turbo_pos;
     uint16_t  cur_track;
     uint16_t  track_encoded_data[2][53048];
     uint16_t *track_surface_data[2];
@@ -191,9 +204,13 @@ typedef struct {
 #ifdef D86F_COMPRESS
     int is_compressed;
 #endif
-    int32_t  extra_bit_cells[2];
-    uint32_t file_size, index_count, track_pos, datac,
-        id_pos, dma_over;
+    int32_t     extra_bit_cells[2];
+    uint32_t    file_size;
+    uint32_t    index_count;
+    uint32_t    track_pos;
+    uint32_t    datac;
+    uint32_t    id_pos;
+    uint32_t    dma_over;
     uint32_t    index_hole_pos[2];
     uint32_t    track_offset[512];
     sector_id_t last_sector;
@@ -203,7 +220,8 @@ typedef struct {
     crc_t       calc_crc;
     crc_t       track_crc;
     char        original_file_name[2048];
-    uint8_t    *filebuf, *outbuf;
+    uint8_t    *filebuf;
+    uint8_t    *outbuf;
     sector_t   *last_side_sector[2];
 } d86f_t;
 
diff --git a/src/floppy/fdd_common.c b/src/floppy/fdd_common.c
index 78434a2ad..d0659d990 100644
--- a/src/floppy/fdd_common.c
+++ b/src/floppy/fdd_common.c
@@ -359,7 +359,7 @@ fdd_get_gap3_size(int rate, int size, int sector)
 uint8_t
 fdd_sector_size_code(int size)
 {
-    int ret = 2;
+    uint8_t ret = 2;
 
     switch (size) {
         case 128:
diff --git a/src/floppy/fdd_imd.c b/src/floppy/fdd_imd.c
index c03481db3..211b18373 100644
--- a/src/floppy/fdd_imd.c
+++ b/src/floppy/fdd_imd.c
@@ -51,7 +51,8 @@ typedef struct {
     FILE       *f;
     char       *buffer;
     uint32_t    start_offs;
-    int         track_count, sides;
+    int         track_count;
+    int         sides;
     int         track;
     uint16_t    disk_flags;
     int         track_width;
@@ -895,7 +896,9 @@ imd_load(int drive, char *fn)
     if (dev->sides == 2)
         dev->disk_flags |= 8;
 
-    /* imd_log("%i tracks, %i sides\n", dev->track_count, dev->sides); */
+#if 0
+    imd_log("%i tracks, %i sides\n", dev->track_count, dev->sides);
+#endif
 
     /* Attach this format to the D86F engine. */
     d86f_handler[drive].disk_flags        = disk_flags;
diff --git a/src/floppy/fdd_img.c b/src/floppy/fdd_img.c
index d9ffaf92d..589f04292 100644
--- a/src/floppy/fdd_img.c
+++ b/src/floppy/fdd_img.c
@@ -450,7 +450,7 @@ side_flags(int drive)
 }
 
 static void
-set_sector(int drive, int side, uint8_t c, uint8_t h, uint8_t r, uint8_t n)
+set_sector(int drive, UNUSED(int side), UNUSED(uint8_t c), uint8_t h, uint8_t r, UNUSED(uint8_t n))
 {
     img_t *dev = img[drive];
 
@@ -459,7 +459,7 @@ set_sector(int drive, int side, uint8_t c, uint8_t h, uint8_t r, uint8_t n)
 }
 
 static uint8_t
-poll_read_data(int drive, int side, uint16_t pos)
+poll_read_data(int drive, UNUSED(int side), uint16_t pos)
 {
     img_t *dev = img[drive];
 
@@ -467,7 +467,7 @@ poll_read_data(int drive, int side, uint16_t pos)
 }
 
 static void
-poll_write_data(int drive, int side, uint16_t pos, uint8_t data)
+poll_write_data(int drive, UNUSED(int side), uint16_t pos, uint8_t data)
 {
     img_t *dev = img[drive];
 
@@ -1031,9 +1031,6 @@ jump_if_fdf:
         } else if (size <= (320 * 1024)) {
             dev->sectors = 8;
             dev->tracks  = 40;
-        } else if (size <= (320 * 1024)) {
-            dev->sectors = 8;
-            dev->tracks  = 40;
         } else if (size <= (360 * 1024)) { /*DD 360K*/
             dev->sectors = 9;
             dev->tracks  = 40;
diff --git a/src/floppy/fdd_json.c b/src/floppy/fdd_json.c
index 4b8fafb23..1b70d8fc8 100644
--- a/src/floppy/fdd_json.c
+++ b/src/floppy/fdd_json.c
@@ -63,25 +63,25 @@
 #define NSECTORS 256
 
 typedef struct {
-    uint8_t track, /* ID: track number */
-        side,      /*     side number */
-        sector;    /*     sector number 1.. */
-    uint16_t size; /* encoded size of sector */
-    uint8_t *data; /* allocated data for it */
+    uint8_t  track;  /* ID: track number */
+    uint8_t  side;   /*     side number */
+    uint8_t  sector; /*     sector number 1.. */
+    uint16_t size;   /* encoded size of sector */
+    uint8_t *data;   /* allocated data for it */
 } sector_t;
 
 typedef struct {
     FILE *f;
 
     /* Geometry. */
-    uint8_t tracks,           /* number of tracks */
-        sides,                /* number of sides */
-        sectors,              /* number of sectors per track */
-        spt[NTRACKS][NSIDES]; /* number of sectors per track */
+    uint8_t tracks;               /* number of tracks */
+    uint8_t sides;                /* number of sides */
+    uint8_t sectors;              /* number of sectors per track */
+    uint8_t spt[NTRACKS][NSIDES]; /* number of sectors per track */
 
-    uint8_t track,      /* current track */
-        side,           /* current side */
-        sector[NSIDES]; /* current sector */
+    uint8_t track;          /* current track */
+    uint8_t side;           /* current side */
+    uint8_t sector[NSIDES]; /* current sector */
 
     uint8_t dmf; /* disk is DMF format */
     uint8_t interleave;
@@ -92,8 +92,8 @@ typedef struct {
     uint8_t gap3_len;
     int     track_width;
 
-    uint16_t disk_flags, /* flags for the entire disk */
-        track_flags;     /* flags for the current track */
+    uint16_t disk_flags;  /* flags for the entire disk */
+    uint16_t track_flags; /* flags for the current track */
 
     uint8_t interleave_ordered[NTRACKS][NSIDES];
 
diff --git a/src/floppy/fdd_mfm.c b/src/floppy/fdd_mfm.c
index 55c549150..5719c3672 100644
--- a/src/floppy/fdd_mfm.c
+++ b/src/floppy/fdd_mfm.c
@@ -69,11 +69,14 @@ typedef struct {
     mfm_track_t     *tracks;
     mfm_adv_track_t *adv_tracks;
 
-    uint16_t disk_flags, pad;
+    uint16_t disk_flags;
+    uint16_t pad;
     uint16_t side_flags[2];
 
-    int br_rounded, rpm_rounded,
-        total_tracks, cur_track;
+    int br_rounded;
+    int rpm_rounded;
+    int total_tracks;
+    int cur_track;
 
     uint8_t track_data[2][256 * 1024];
 } mfm_t;
@@ -170,14 +173,14 @@ set_disk_flags(int drive)
     }
 
     switch (br) {
-        case 500:
-            temp_disk_flags |= 2;
+        default:
+        case 250:
+        case 300:
+            temp_disk_flags |= 0;
             break;
 
-        case 300:
-        case 250:
-        default:
-            temp_disk_flags |= 0;
+        case 500:
+            temp_disk_flags |= 2;
             break;
 
         case 1000:
@@ -285,8 +288,8 @@ get_raw_size(int drive, int side)
     if (track_index == -1) {
         mfm_log("MFM: Unable to find track (%i, %i)\n", dev->cur_track, side);
         switch (br) {
-            case 250:
             default:
+            case 250:
                 return is_300_rpm ? 100000 : 83333;
             case 300:
                 return is_300_rpm ? 120000 : 100000;
diff --git a/src/floppy/fdd_td0.c b/src/floppy/fdd_td0.c
index 56f594c0b..87856b904 100644
--- a/src/floppy/fdd_td0.c
+++ b/src/floppy/fdd_td0.c
@@ -61,12 +61,15 @@
 /* reaches to this value */
 
 typedef struct {
-    uint16_t r,
-        bufcnt, bufndx, bufpos, /* string buffer */
-                                /* the following to allow block reads
-                                   from input in next_word() */
-        ibufcnt, ibufndx;       /* input buffer counters */
-    uint8_t inbuf[BUFSZ];       /* input buffer */
+    uint16_t r;
+    uint16_t bufcnt;      /* string buffer */
+    uint16_t bufndx;      /* string buffer */
+    uint16_t bufpos;      /* string buffer */
+                          /* the following to allow block reads
+                             from input in next_word() */
+    uint16_t ibufcnt;     /* input buffer counters */
+    uint16_t ibufndx;     /* input buffer counters */
+    uint8_t inbuf[BUFSZ]; /* input buffer */
 } tdlzhuf;
 
 typedef struct {
@@ -364,7 +367,7 @@ state_reconst(td0dsk_t *state)
     for (i = 0, j = N_CHAR; j < T; i += 2, j++) {
         k = i + 1;
         f = state->freq[j] = state->freq[i] + state->freq[k];
-        for (k = j - 1; f < state->freq[k]; k--) { };
+        for (k = j - 1; f < state->freq[k]; k--) { }
         k++;
         l = (j - k) * 2;
 
@@ -405,7 +408,7 @@ state_update(td0dsk_t *state, int c)
 
         /* swap nodes to keep the tree freq-ordered */
         if (k > state->freq[l = c + 1]) {
-            while (k > state->freq[++l]) { };
+            while (k > state->freq[++l]) { }
             l--;
             state->freq[c] = state->freq[l];
             state->freq[l] = k;
diff --git a/src/floppy/fdi2raw.c b/src/floppy/fdi2raw.c
index 0be984d8a..7210c89b2 100644
--- a/src/floppy/fdi2raw.c
+++ b/src/floppy/fdi2raw.c
@@ -30,15 +30,11 @@
 #include <stdlib.h>
 #include <wchar.h>
 
-/* IF UAE */
-/*#include "sysconfig.h"
-#include "sysdeps.h"
-#include "zfile.h"*/
-/* ELSE */
 #define xmalloc malloc
 #define HAVE_STDARG_H
 #include <86box/86box.h>
 #include <fdi2raw.h>
+#include <86box/plat_unused.h>
 
 #undef DEBUG
 #define VERBOSE
@@ -69,7 +65,8 @@ datalog(uint8_t *src, int len)
 {
     static char buf[1000];
     static int  offset;
-    int         i = 0, offset2;
+    int         i = 0;
+    int         offset2;
 
     offset2       = offset;
     buf[offset++] = '\'';
@@ -360,7 +357,7 @@ decode_raw_track(FDI *fdi)
 
 /* unknown track */
 static void
-zxx(FDI *fdi)
+zxx(UNUSED(FDI *fdi))
 {
     fdi2raw_log("track %d: unknown track type 0x%02.2X\n", fdi->current_track, fdi->track_type);
 }
@@ -373,7 +370,7 @@ static void zyy (FDI *fdi)
 #endif
 /* empty track */
 static void
-track_empty(FDI *fdi)
+track_empty(UNUSED(FDI *fdi))
 {
     return;
 }
@@ -647,8 +644,9 @@ s0d(FDI *fdi)
 /* ***** */
 
 /* just for testing integrity of Amiga sectors */
-
-/*static void rotateonebit (uint8_t *start, uint8_t *end, int shift)
+#if 0
+static void
+rotateonebit (uint8_t *start, uint8_t *end, int shift)
 {
         if (shift == 0)
                 return;
@@ -657,9 +655,10 @@ s0d(FDI *fdi)
                 start[0] |= start[1] >> (8 - shift);
                 start++;
         }
-}*/
+}
 
-/*static uint16_t getmfmword (uint8_t *mbuf)
+static uint16_t
+getmfmword (uint8_t *mbuf)
 {
         uint32_t v;
 
@@ -670,13 +669,15 @@ s0d(FDI *fdi)
         v |= mbuf[2];
         v >>= check_offset;
         return (uint16_t)v;
-}*/
+}
 
 #define MFMMASK 0x55555555
-/*static uint32_t getmfmlong (uint8_t * mbuf)
+static uint32_t
+getmfmlong (uint8_t * mbuf)
 {
         return ((getmfmword (mbuf) << 16) | getmfmword (mbuf + 2)) & MFMMASK;
-}*/
+}
+#endif
 
 #if 0
 static int amiga_check_track (FDI *fdi)
@@ -1237,7 +1238,7 @@ s1d(FDI *fdi)
 
 /* end marker */
 static void
-sff(FDI *fdi)
+sff(UNUSED(FDI *fdi))
 {
 }
 
@@ -1493,7 +1494,7 @@ fdi_decompress(int pulses, uint8_t *sizep, uint8_t *src, int *dofree)
 }
 
 static void
-dumpstream(int track, uint8_t *stream, int len)
+dumpstream(UNUSED(int track), UNUSED(uint8_t *stream), UNUSED(int len))
 {
 #if 0
     char name[100];
@@ -1713,7 +1714,9 @@ fdi2_decode(FDI *fdi, uint32_t totalavg, uint32_t *avgp, uint32_t *minp, uint32_
 
         /* calculates the current average bitrate from previous decoded data */
         uint32_t avg_size = (uint32_t) ((total << (2 + mfm)) / totaldiv); /* this is the new average size for one MFM bit */
-        /* uint32_t avg_size = (uint32_t)((((float)total)*((float)(mfm+1))*4.0) / ((float)totaldiv)); */
+#if 0
+        uint32_t avg_size = (uint32_t)((((float)total)*((float)(mfm+1))*4.0) / ((float)totaldiv));
+#endif
         /* you can try tighter ranges than 25%, or wider ranges. I would probably go for tighter... */
         if ((avg_size < (standard_MFM_8_bit_cell_size - (pulse_limitval * standard_MFM_8_bit_cell_size / 100))) || (avg_size > (standard_MFM_8_bit_cell_size + (pulse_limitval * standard_MFM_8_bit_cell_size / 100)))) {
             avg_size = standard_MFM_8_bit_cell_size;
@@ -2056,8 +2059,10 @@ decode_lowlevel_track(FDI *fdi, int track, struct fdi_cache *cache)
         idxp[i] = sum;
     }
     len = totalavg / 100000;
-    /* fdi2raw_log("totalavg=%u index=%d (%d) maxidx=%d weakbits=%d len=%d\n",
-            totalavg, indexoffset, maxidx, weakbits, len); */
+#if 0
+    fdi2raw_log("totalavg=%u index=%d (%d) maxidx=%d weakbits=%d len=%d\n",
+                totalavg, indexoffset, maxidx, weakbits, len);
+#endif
     cache->avgp        = avgp;
     cache->idxp        = idxp;
     cache->minp        = minp;
@@ -2239,8 +2244,10 @@ fdi2raw_loadrevolution_2(FDI *fdi, uint16_t *mfmbuf, uint16_t *tracktiming, int
     fdi2_decode(fdi, cache->totalavg,
                 cache->avgp, cache->minp, cache->maxp, cache->idxp,
                 cache->maxidx, &idx, cache->pulses, mfm);
-    /* fdi2raw_log("track %d: nbits=%d avg len=%.2f weakbits=%d idx=%d\n",
-            track, bitoffset, (double)cache->totalavg / bitoffset, cache->weakbits, cache->indexoffset); */
+#if 0
+    fdi2raw_log("track %d: nbits=%d avg len=%.2f weakbits=%d idx=%d\n",
+                track, bitoffset, (double)cache->totalavg / bitoffset, cache->weakbits, cache->indexoffset);
+#endif
     len = fdi->out;
     if (cache->weakbits >= 10 && multirev)
         *multirev = 1;
@@ -2298,8 +2305,10 @@ fdi2raw_loadtrack(FDI *fdi, uint16_t *mfmbuf, uint16_t *tracktiming, int track,
     else
         fdi->bit_rate = 250;
 
-    /* fdi2raw_log("track %d: srclen: %d track_type: %02.2X, bitrate: %d\n",
-            fdi->current_track, fdi->track_src_len, fdi->track_type, fdi->bit_rate); */
+#if 0
+    fdi2raw_log("track %d: srclen: %d track_type: %02.2X, bitrate: %d\n",
+                fdi->current_track, fdi->track_src_len, fdi->track_type, fdi->bit_rate);
+#endif
 
     if ((fdi->track_type & 0xc0) == 0x80) {
 
diff --git a/src/game/gameport.c b/src/game/gameport.c
index 110b884ec..32dbc332e 100644
--- a/src/game/gameport.c
+++ b/src/game/gameport.c
@@ -35,6 +35,7 @@
 #include <86box/joystick_standard.h>
 #include <86box/joystick_sw_pad.h>
 #include <86box/joystick_tm_fcs.h>
+#include <86box/plat_unused.h>
 
 typedef struct {
     pc_timer_t                  timer;
@@ -214,7 +215,7 @@ gameport_time(joystick_instance_t *joystick, int nr, int axis)
 }
 
 static void
-gameport_write(uint16_t addr, uint8_t val, void *priv)
+gameport_write(UNUSED(uint16_t addr), UNUSED(uint8_t val), void *priv)
 {
     gameport_t          *dev      = (gameport_t *) priv;
     joystick_instance_t *joystick = dev->joystick;
@@ -238,7 +239,7 @@ gameport_write(uint16_t addr, uint8_t val, void *priv)
 }
 
 static uint8_t
-gameport_read(uint16_t addr, void *priv)
+gameport_read(UNUSED(uint16_t addr), void *priv)
 {
     gameport_t          *dev      = (gameport_t *) priv;
     joystick_instance_t *joystick = dev->joystick;
@@ -400,7 +401,7 @@ gameport_init(const device_t *info)
 }
 
 static void *
-tmacm_init(const device_t *info)
+tmacm_init(UNUSED(const device_t *info))
 {
     uint16_t    port = 0x0000;
     gameport_t *dev  = NULL;
diff --git a/src/game/joystick_ch_flightstick_pro.c b/src/game/joystick_ch_flightstick_pro.c
index f5785d6f4..49ce824bc 100644
--- a/src/game/joystick_ch_flightstick_pro.c
+++ b/src/game/joystick_ch_flightstick_pro.c
@@ -44,6 +44,7 @@
 #include <86box/timer.h>
 #include <86box/gameport.h>
 #include <86box/joystick_standard.h>
+#include <86box/plat_unused.h>
 
 static void *
 ch_flightstick_pro_init(void)
@@ -52,12 +53,13 @@ ch_flightstick_pro_init(void)
 }
 
 static void
-ch_flightstick_pro_close(void *p)
+ch_flightstick_pro_close(UNUSED(void *priv))
 {
+    //
 }
 
 static uint8_t
-ch_flightstick_pro_read(void *p)
+ch_flightstick_pro_read(UNUSED(void *priv))
 {
     uint8_t ret = 0xf0;
 
@@ -86,12 +88,13 @@ ch_flightstick_pro_read(void *p)
 }
 
 static void
-ch_flightstick_pro_write(void *p)
+ch_flightstick_pro_write(UNUSED(void *priv))
 {
+    //
 }
 
 static int
-ch_flightstick_pro_read_axis(void *p, int axis)
+ch_flightstick_pro_read_axis(UNUSED(void *priv), int axis)
 {
     if (!JOYSTICK_PRESENT(0))
         return AXIS_NOT_PRESENT;
@@ -111,8 +114,9 @@ ch_flightstick_pro_read_axis(void *p, int axis)
 }
 
 static void
-ch_flightstick_pro_a0_over(void *p)
+ch_flightstick_pro_a0_over(UNUSED(void *priv))
 {
+    //
 }
 
 const joystick_if_t joystick_ch_flightstick_pro = {
diff --git a/src/game/joystick_standard.c b/src/game/joystick_standard.c
index 55a28acee..b9c449f99 100644
--- a/src/game/joystick_standard.c
+++ b/src/game/joystick_standard.c
@@ -44,6 +44,7 @@
 #include <86box/timer.h>
 #include <86box/gameport.h>
 #include <86box/joystick_standard.h>
+#include <86box/plat_unused.h>
 
 static void *
 joystick_standard_init(void)
@@ -52,12 +53,13 @@ joystick_standard_init(void)
 }
 
 static void
-joystick_standard_close(void *p)
+joystick_standard_close(UNUSED(void *priv))
 {
+    //
 }
 
 static uint8_t
-joystick_standard_read(void *p)
+joystick_standard_read(UNUSED(void *priv))
 {
     uint8_t ret = 0xf0;
 
@@ -78,7 +80,7 @@ joystick_standard_read(void *p)
 }
 
 static uint8_t
-joystick_standard_read_4button(void *p)
+joystick_standard_read_4button(UNUSED(void *priv))
 {
     uint8_t ret = 0xf0;
 
@@ -97,12 +99,13 @@ joystick_standard_read_4button(void *p)
 }
 
 static void
-joystick_standard_write(void *p)
+joystick_standard_write(UNUSED(void *priv))
 {
+    //
 }
 
 static int
-joystick_standard_read_axis(void *p, int axis)
+joystick_standard_read_axis(UNUSED(void *priv), int axis)
 {
     switch (axis) {
         case 0:
@@ -127,7 +130,7 @@ joystick_standard_read_axis(void *p, int axis)
 }
 
 static int
-joystick_standard_read_axis_4button(void *p, int axis)
+joystick_standard_read_axis_4button(UNUSED(void *priv), int axis)
 {
     if (!JOYSTICK_PRESENT(0))
         return AXIS_NOT_PRESENT;
@@ -147,7 +150,7 @@ joystick_standard_read_axis_4button(void *p, int axis)
 }
 
 static int
-joystick_standard_read_axis_3axis(void *p, int axis)
+joystick_standard_read_axis_3axis(UNUSED(void *priv), int axis)
 {
     if (!JOYSTICK_PRESENT(0))
         return AXIS_NOT_PRESENT;
@@ -167,7 +170,7 @@ joystick_standard_read_axis_3axis(void *p, int axis)
 }
 
 static int
-joystick_standard_read_axis_4axis(void *p, int axis)
+joystick_standard_read_axis_4axis(UNUSED(void *priv), int axis)
 {
     if (!JOYSTICK_PRESENT(0))
         return AXIS_NOT_PRESENT;
@@ -187,7 +190,7 @@ joystick_standard_read_axis_4axis(void *p, int axis)
 }
 
 static int
-joystick_standard_read_axis_6button(void *p, int axis)
+joystick_standard_read_axis_6button(UNUSED(void *priv), int axis)
 {
     if (!JOYSTICK_PRESENT(0))
         return AXIS_NOT_PRESENT;
@@ -206,7 +209,7 @@ joystick_standard_read_axis_6button(void *p, int axis)
     }
 }
 static int
-joystick_standard_read_axis_8button(void *p, int axis)
+joystick_standard_read_axis_8button(UNUSED(void *priv), int axis)
 {
     if (!JOYSTICK_PRESENT(0))
         return AXIS_NOT_PRESENT;
@@ -234,8 +237,9 @@ joystick_standard_read_axis_8button(void *p, int axis)
 }
 
 static void
-joystick_standard_a0_over(void *p)
+joystick_standard_a0_over(UNUSED(void *priv))
 {
+    //
 }
 
 const joystick_if_t joystick_2axis_2button = {
diff --git a/src/game/joystick_sw_pad.c b/src/game/joystick_sw_pad.c
index 9f3fd492c..27ae94290 100644
--- a/src/game/joystick_sw_pad.c
+++ b/src/game/joystick_sw_pad.c
@@ -65,6 +65,7 @@
 #include <86box/timer.h>
 #include <86box/gameport.h>
 #include <86box/joystick_sw_pad.h>
+#include <86box/plat_unused.h>
 
 typedef struct
 {
@@ -79,9 +80,9 @@ typedef struct
 } sw_data;
 
 static void
-sw_timer_over(void *p)
+sw_timer_over(void *priv)
 {
-    sw_data *sw = (sw_data *) p;
+    sw_data *sw = (sw_data *) priv;
 
     sw->poll_clock = !sw->poll_clock;
 
@@ -99,9 +100,9 @@ sw_timer_over(void *p)
 }
 
 static void
-sw_trigger_timer_over(void *p)
+sw_trigger_timer_over(void *priv)
 {
-    sw_data *sw = (sw_data *) p;
+    sw_data *sw = (sw_data *) priv;
 
     timer_disable(&sw->trigger_timer);
 }
@@ -132,17 +133,17 @@ sw_init(void)
 }
 
 static void
-sw_close(void *p)
+sw_close(void *priv)
 {
-    sw_data *sw = (sw_data *) p;
+    sw_data *sw = (sw_data *) priv;
 
     free(sw);
 }
 
 static uint8_t
-sw_read(void *p)
+sw_read(void *priv)
 {
-    sw_data *sw   = (sw_data *) p;
+    sw_data *sw   = (sw_data *) priv;
     uint8_t  temp = 0;
 
     if (!JOYSTICK_PRESENT(0))
@@ -166,9 +167,9 @@ sw_read(void *p)
 }
 
 static void
-sw_write(void *p)
+sw_write(void *priv)
 {
-    sw_data *sw              = (sw_data *) p;
+    sw_data *sw              = (sw_data *) priv;
     int64_t  time_since_last = timer_get_remaining_us(&sw->trigger_timer);
 
     if (!JOYSTICK_PRESENT(0))
@@ -234,7 +235,7 @@ sw_write(void *p)
 }
 
 static int
-sw_read_axis(void *p, int axis)
+sw_read_axis(UNUSED(void *priv), UNUSED(int axis))
 {
     if (!JOYSTICK_PRESENT(0))
         return AXIS_NOT_PRESENT;
@@ -243,9 +244,9 @@ sw_read_axis(void *p, int axis)
 }
 
 static void
-sw_a0_over(void *p)
+sw_a0_over(void *priv)
 {
-    sw_data *sw = (sw_data *) p;
+    sw_data *sw = (sw_data *) priv;
 
     timer_set_delay_u64(&sw->trigger_timer, TIMER_USEC * 10000);
 }
diff --git a/src/game/joystick_tm_fcs.c b/src/game/joystick_tm_fcs.c
index 7bcb15742..d54d0e37d 100644
--- a/src/game/joystick_tm_fcs.c
+++ b/src/game/joystick_tm_fcs.c
@@ -44,6 +44,7 @@
 #include <86box/timer.h>
 #include <86box/gameport.h>
 #include <86box/joystick_standard.h>
+#include <86box/plat_unused.h>
 
 static void *
 tm_fcs_init(void)
@@ -52,12 +53,13 @@ tm_fcs_init(void)
 }
 
 static void
-tm_fcs_close(void *p)
+tm_fcs_close(UNUSED(void *priv))
 {
+    //
 }
 
 static uint8_t
-tm_fcs_read(void *p)
+tm_fcs_read(UNUSED(void *priv))
 {
     uint8_t ret = 0xf0;
 
@@ -76,12 +78,13 @@ tm_fcs_read(void *p)
 }
 
 static void
-tm_fcs_write(void *p)
+tm_fcs_write(UNUSED(void *priv))
 {
+    //
 }
 
 static int
-tm_fcs_read_axis(void *p, int axis)
+tm_fcs_read_axis(UNUSED(void *priv), int axis)
 {
     if (!JOYSTICK_PRESENT(0))
         return AXIS_NOT_PRESENT;
@@ -111,8 +114,9 @@ tm_fcs_read_axis(void *p, int axis)
 }
 
 static void
-tm_fcs_a0_over(void *p)
+tm_fcs_a0_over(UNUSED(void *priv))
 {
+    //
 }
 
 const joystick_if_t joystick_tm_fcs = {
diff --git a/src/include/86box/acpi.h b/src/include/86box/acpi.h
index 18f40d874..b61f84853 100644
--- a/src/include/86box/acpi.h
+++ b/src/include/86box/acpi.h
@@ -61,44 +61,76 @@ extern "C" {
 
 typedef struct
 {
-    uint8_t acpitst, auxen, auxsts, plvl2, plvl3,
-        smicmd, gpio_dir,
-        gpio_val, muxcntrl, ali_soft_smi,
-        timer32, smireg,
-        gpireg[3], gporeg[4],
-        extiotrapsts, extiotrapen;
-    uint16_t pmsts, pmen,
-        pmcntrl, gpsts, gpsts1,
-        gpen, gpen1, gpscien,
-        gpcntrl, gplvl, gpmux,
-        gpsel, gpsmien, pscntrl,
-        gpscists;
-    int      smi_lock, smi_active;
-    uint32_t pcntrl, p2cntrl, glbsts,
-        devsts, glben,
-        glbctl, devctl,
-        padsts, paden,
-        gptren, gptimer,
-        gpo_val, gpi_val,
-        extsmi_val, pad0;
+    uint8_t  acpitst;
+    uint8_t  auxen;
+    uint8_t  auxsts;
+    uint8_t  plvl2;
+    uint8_t  plvl3;
+    uint8_t  smicmd;
+    uint8_t  gpio_dir;
+    uint8_t  gpio_val;
+    uint8_t  muxcntrl;
+    uint8_t  ali_soft_smi;
+    uint8_t  timer32;
+    uint8_t  smireg;
+    uint8_t  gpireg[3];
+    uint8_t  gporeg[4];
+    uint8_t  extiotrapsts, extiotrapen;
+    uint16_t pmsts;
+    uint16_t pmen;
+    uint16_t pmcntrl;
+    uint16_t gpsts;
+    uint16_t gpsts1;
+    uint16_t gpen;
+    uint16_t gpen1;
+    uint16_t gpscien;
+    uint16_t gpcntrl;
+    uint16_t gplvl;
+    uint16_t gpmux;
+    uint16_t gpsel;
+    uint16_t gpsmien;
+    uint16_t pscntrl;
+    uint16_t gpscists;
+    int      smi_lock;
+    int      smi_active;
+    uint32_t pcntrl;
+    uint32_t p2cntrl;
+    uint32_t glbsts;
+    uint32_t devsts;
+    uint32_t glben;
+    uint32_t glbctl;
+    uint32_t devctl;
+    uint32_t padsts;
+    uint32_t paden;
+    uint32_t gptren;
+    uint32_t gptimer;
+    uint32_t gpo_val;
+    uint32_t gpi_val;
+    uint32_t extsmi_val;
+    uint32_t pad0;
 } acpi_regs_t;
 
 typedef struct
 {
     acpi_regs_t regs;
-    uint8_t     gpireg2_default, pad[3],
-        gporeg_default[4],
-        suspend_types[8];
-    uint16_t io_base, aux_io_base;
-    int      vendor,
-        slot, irq_mode,
-        irq_pin, irq_line,
-        mirq_is_level;
-    pc_timer_t timer, resume_timer, pwrbtn_timer;
-    nvr_t     *nvr;
-    apm_t     *apm;
-    void      *i2c,
-        (*trap_update)(void *priv), *trap_priv;
+    uint8_t     gpireg2_default;
+    uint8_t     pad[3];
+    uint8_t     gporeg_default[4];
+    uint8_t     suspend_types[8];
+    uint16_t    io_base;
+    uint16_t    aux_io_base;
+    int         vendor;
+    int         slot, irq_mode;
+    int         irq_pin, irq_line;
+    int         mirq_is_level;
+    pc_timer_t  timer;
+    pc_timer_t  resume_timer;
+    pc_timer_t  pwrbtn_timer;
+    nvr_t      *nvr;
+    apm_t      *apm;
+    void       *i2c;
+    void      (*trap_update)(void *priv);
+    void       *trap_priv;
 } acpi_t;
 
 /* Global variables. */
diff --git a/src/include/86box/apm.h b/src/include/86box/apm.h
index 854969f3d..d9e1a165d 100644
--- a/src/include/86box/apm.h
+++ b/src/include/86box/apm.h
@@ -23,8 +23,9 @@ extern "C" {
 
 typedef struct
 {
-    uint8_t cmd,
-        stat, do_smi;
+    uint8_t cmd;
+    uint8_t stat;
+    uint8_t do_smi;
 } apm_t;
 
 /* Global variables. */
diff --git a/src/include/86box/cdrom.h b/src/include/86box/cdrom.h
index a32177b05..8a3af2956 100644
--- a/src/include/86box/cdrom.h
+++ b/src/include/86box/cdrom.h
@@ -55,9 +55,9 @@ extern "C" {
 enum {
     CDROM_BUS_DISABLED = 0,
     CDROM_BUS_ATAPI    = 5,
-    CDROM_BUS_SCSI,
-    CDROM_BUS_MITSUMI,
-    CDROM_BUS_USB
+    CDROM_BUS_SCSI     = 6,
+    CDROM_BUS_MITSUMI  = 7,
+    CDROM_BUS_USB      = 8
 };
 
 #define KNOWN_CDROM_DRIVE_TYPES 35
@@ -67,12 +67,12 @@ enum {
 
 static const struct
 {
-    const char vendor[9];
-    const char model[17];
-    const char revision[5];
+    const char  vendor[9];
+    const char  model[17];
+    const char  revision[5];
     const char *name;
     const char *internal_name;
-    const int  bus_type;
+    const int   bus_type;
 } cdrom_drive_types[] =
 {
     { "86BOX",    "CD-ROM",             "1.00", "(ATAPI/SCSI) 86BOX CD-ROM 1.00", "86BOX_CD-ROM_1.00", BUS_TYPE_ALL}, /*1*/
@@ -117,15 +117,23 @@ static const struct
 struct cdrom;
 
 typedef struct {
-    uint8_t attr, track,
-        index,
-        abs_m, abs_s, abs_f,
-        rel_m, rel_s, rel_f;
+    uint8_t attr;
+    uint8_t track;
+    uint8_t index;
+    uint8_t abs_m;
+    uint8_t abs_s;
+    uint8_t abs_f;
+    uint8_t rel_m;
+    uint8_t rel_s;
+    uint8_t rel_f;
 } subchannel_t;
 
 typedef struct {
     int     number;
-    uint8_t attr, m, s, f;
+    uint8_t attr;
+    uint8_t m;
+    uint8_t s;
+    uint8_t f;
 } track_info_t;
 
 /* Define the various CD-ROM drive operations (ops). */
@@ -144,32 +152,39 @@ typedef struct cdrom {
     uint8_t id;
 
     union {
-        uint8_t res, res0, /* Reserved for other ID's. */
-            res1,
-            ide_channel, scsi_device_id;
+        uint8_t res;
+        uint8_t res0; /* Reserved for other ID's. */
+        uint8_t res1;
+        uint8_t ide_channel;
+        uint8_t scsi_device_id;
     };
 
-    uint8_t bus_type, /* 0 = ATAPI, 1 = SCSI */
-        bus_mode,     /* Bit 0 = PIO suported;
-                         Bit 1 = DMA supportd. */
-        cd_status,    /* Struct variable reserved for
-                         media status. */
-        speed, cur_speed;
+    uint8_t bus_type;  /* 0 = ATAPI, 1 = SCSI */
+    uint8_t bus_mode;  /* Bit 0 = PIO suported;
+                          Bit 1 = DMA supportd. */
+    uint8_t cd_status; /* Struct variable reserved for
+                          media status. */
+    uint8_t speed;
+    uint8_t cur_speed;
 
     int   is_dir;
     void *priv;
 
-    char image_path[1024],
-        prev_image_path[1024];
+    char image_path[1024];
+    char prev_image_path[1024];
 
     char *image_history[CD_IMAGE_HISTORY];
 
-    uint32_t sound_on, cdrom_capacity,
-        seek_pos,
-        seek_diff, cd_end, type;
+    uint32_t sound_on;
+    uint32_t cdrom_capacity;
+    uint32_t seek_pos;
+    uint32_t seek_diff;
+    uint32_t cd_end, type;
 
-    int host_drive, prev_host_drive,
-        cd_buflen, audio_op;
+    int host_drive;
+    int prev_host_drive;
+    int cd_buflen;
+    int audio_op;
 
     const cdrom_ops_t *ops;
 
diff --git a/src/include/86box/cdrom_image_backend.h b/src/include/86box/cdrom_image_backend.h
index 511ca68eb..67129dc7c 100644
--- a/src/include/86box/cdrom_image_backend.h
+++ b/src/include/86box/cdrom_image_backend.h
@@ -56,10 +56,17 @@ typedef struct {
 } track_file_t;
 
 typedef struct {
-    int number, track_number, attr, sector_size,
-        mode2, form, pre, pad;
-    uint64_t start, length,
-        skip;
+    int           number;
+    int           track_number;
+    int           attr;
+    int           sector_size;
+    int           mode2;
+    int           form;
+    int           pre;
+    int           pad;
+    uint64_t      start;
+    uint64_t      length;
+    uint64_t      skip;
     track_file_t *file;
 } track_t;
 
diff --git a/src/include/86box/ddma.h b/src/include/86box/ddma.h
index ccc423d27..48cc9a6ed 100644
--- a/src/include/86box/ddma.h
+++ b/src/include/86box/ddma.h
@@ -24,7 +24,8 @@ extern "C" {
 typedef struct
 {
     uint16_t io_base;
-    int      channel, enable;
+    int      channel;
+    int      enable;
 } ddma_channel_t;
 
 typedef struct
diff --git a/src/include/86box/device.h b/src/include/86box/device.h
index 2390e5128..295126c22 100644
--- a/src/include/86box/device.h
+++ b/src/include/86box/device.h
@@ -96,8 +96,10 @@ typedef struct {
     const char  *internal_name;
     int          bios_type;
     int          files_no;
-    uint32_t     local, size;
-    void        *dev1, *dev2;
+    uint32_t     local;
+    uint32_t     size;
+    void        *dev1;
+    void        *dev2;
     const char  *files[9];
 } device_config_bios_t;
 
diff --git a/src/include/86box/disksizes.h b/src/include/86box/disksizes.h
index e47b82943..a32990bd9 100644
--- a/src/include/86box/disksizes.h
+++ b/src/include/86box/disksizes.h
@@ -40,10 +40,12 @@ typedef struct {
 
 static const disk_size_t disk_sizes[14] = {
 // clang-format off
-//  { 1,  1, 2, 1, 1,  77, 26, 0, 0,    4, 2, 6,  68 }, /* 250k 8" */
-//  { 1,  2, 2, 1, 1,  77, 26, 0, 0,    4, 2, 6,  68 }, /* 500k 8" */
-//  { 1,  1, 2, 1, 1,  77,  8, 3, 0,    1, 2, 2, 192 }, /* 616k 8" */
-//  { 1,  2, 0, 1, 1,  77,  8, 3, 0,    1, 2, 2, 192 }, /* 1232k 8" */
+#if 0
+    { 1,  1, 2, 1, 1,  77, 26, 0, 0,    4, 2, 6,  68 }, /* 250k 8" */
+    { 1,  2, 2, 1, 1,  77, 26, 0, 0,    4, 2, 6,  68 }, /* 500k 8" */
+    { 1,  1, 2, 1, 1,  77,  8, 3, 0,    1, 2, 2, 192 }, /* 616k 8" */
+    { 1,  2, 0, 1, 1,  77,  8, 3, 0,    1, 2, 2, 192 }, /* 1232k 8" */
+#endif
     { 0,  1, 2, 1, 0,  40,  8, 2, 0xfe, 2, 2, 1,  64 }, /* 160k */
     { 0,  1, 2, 1, 0,  40,  9, 2, 0xfc, 2, 2, 1,  64 }, /* 180k */
     { 0,  2, 2, 1, 0,  40,  8, 2, 0xff, 2, 2, 1, 112 }, /* 320k */
@@ -58,8 +60,10 @@ static const disk_size_t disk_sizes[14] = {
     { 2,  2, 3, 1, 0,  80, 36, 2, 0xf0, 2, 2, 9, 240 }, /* 2.88M */
     { 0, 64, 0, 0, 0,  96, 32, 2,    0, 0, 0, 0,   0 }, /* ZIP 100 */
     { 0, 64, 0, 0, 0, 239, 32, 2,    0, 0, 0, 0,   0 }, /* ZIP 250 */
-//  { 0,  8, 0, 0, 0, 963, 32, 2,    0, 0, 0, 0,   0 }, /* LS-120 */
-//  { 0, 32, 0, 0, 0, 262, 56, 2,    0, 0, 0, 0,   0 }  /* LS-240 */
+#if 0
+    { 0,  8, 0, 0, 0, 963, 32, 2,    0, 0, 0, 0,   0 }, /* LS-120 */
+    { 0, 32, 0, 0, 0, 262, 56, 2,    0, 0, 0, 0,   0 }  /* LS-240 */
+#endif
 // clang-format on
 };
 
diff --git a/src/include/86box/dma.h b/src/include/86box/dma.h
index 904d0b13b..7e46cdd56 100644
--- a/src/include/86box/dma.h
+++ b/src/include/86box/dma.h
@@ -44,21 +44,36 @@
 #define DMA_VERIFY 0x20000
 
 typedef struct {
-    uint8_t m, mode, page, stat,
-        stat_rq, command,
-        ps2_mode, arb_level,
-        sg_command, sg_status,
-        ptr0, enabled,
-        ext_mode, page_l,
-        page_h, pad;
-    uint16_t cb, io_addr,
-        base, transfer_mode;
-    uint32_t ptr, ptr_cur,
-        addr,
-        ab, ac;
-    int cc, wp,
-        size, count,
-        eot;
+    uint8_t  m;
+    uint8_t  mode;
+    uint8_t  page;
+    uint8_t  stat;
+    uint8_t  stat_rq;
+    uint8_t  command;
+    uint8_t  ps2_mode;
+    uint8_t  arb_level;
+    uint8_t  sg_command;
+    uint8_t  sg_status;
+    uint8_t  ptr0;
+    uint8_t  enabled;
+    uint8_t  ext_mode;
+    uint8_t  page_l;
+    uint8_t  page_h;
+    uint8_t  pad;
+    uint16_t cb;
+    uint16_t io_addr;
+    uint16_t base;
+    uint16_t transfer_mode;
+    uint32_t ptr;
+    uint32_t ptr_cur;
+    uint32_t addr;
+    uint32_t ab;
+    uint32_t ac;
+    int      cc;
+    int      wp;
+    int      size;
+    int      count;
+    int      eot;
 } dma_t;
 
 extern dma_t   dma[8];
diff --git a/src/include/86box/fdc.h b/src/include/86box/fdc.h
index 09678b2e5..b0e530754 100644
--- a/src/include/86box/fdc.h
+++ b/src/include/86box/fdc.h
@@ -57,41 +57,78 @@ extern int fdc_type;
 #define FDC_FLAG_QUA            0x3000 /* Is Quaternary */
 
 typedef struct {
-    uint8_t dor, stat, command, processed_cmd, dat, st0, swap, dtl;
-    uint8_t swwp, disable_write, st5, st6, error;
-    uint8_t params[8], res[11];
+    uint8_t dor;
+    uint8_t stat;
+    uint8_t command;
+    uint8_t processed_cmd;
+    uint8_t dat;
+    uint8_t st0;
+    uint8_t swap;
+    uint8_t dtl;
+    uint8_t swwp;
+    uint8_t disable_write;
+    uint8_t st5;
+    uint8_t st6;
+    uint8_t error;
+    uint8_t params[8];
+    uint8_t res[11];
     uint8_t specify[2];
-    uint8_t config, pretrk;
+    uint8_t config;
+    uint8_t pretrk;
     uint8_t fifobuf[16];
 
     uint16_t base_address;
 
-    int head, sector, drive, lastdrive;
-    int pcn[4], eot[4];
-    int rw_track, pos;
-    int pnum, ptot;
-    int rate, reset_stat;
-    int lock, perp;
-    int format_state, format_n;
-    int step, seek_dir;
-    int tc, noprec;
+    int head;
+    int sector;
+    int drive;
+    int lastdrive;
+    int pcn[4];
+    int eot[4];
+    int rw_track;
+    int pos;
+    int pnum;
+    int ptot;
+    int rate;
+    int reset_stat;
+    int lock;
+    int perp;
+    int format_state;
+    int format_n;
+    int step;
+    int seek_dir;
+    int tc;
+    int noprec;
 
-    int data_ready, inread;
-    int bitcell_period, enh_mode;
-    int rwc[4], drvrate[4];
-    int boot_drive, dma;
-    int densel_polarity, densel_force;
-    int fifo, tfifo;
-    int fifobufpos, drv2en;
+    int data_ready;
+    int inread;
+    int bitcell_period;
+    int enh_mode;
+    int rwc[4];
+    int drvrate[4];
+    int boot_drive;
+    int dma;
+    int densel_polarity;
+    int densel_force;
+    int fifo;
+    int tfifo;
+    int fifobufpos;
+    int drv2en;
 
     int gap;
-    int enable_3f1, format_sectors;
-    int max_track, mfm;
-    int deleted, wrong_am;
-    int sc, satisfying_sectors;
-    int fintr, rw_drive;
+    int enable_3f1;
+    int format_sectors;
+    int max_track;
+    int mfm;
+    int deleted;
+    int wrong_am;
+    int sc;
+    int satisfying_sectors;
+    int fintr;
+    int rw_drive;
 
-    int flags, interrupt;
+    int flags;
+    int interrupt;
 
     int irq;    /* Should be 6 by default. */
     int dma_ch; /* Should be 2 by default. */
@@ -99,11 +136,13 @@ typedef struct {
     int bit_rate; /* Should be 250 at start. */
     int paramstogo;
 
-    sector_id_t read_track_sector, format_sector_id;
+    sector_id_t read_track_sector;
+    sector_id_t format_sector_id;
 
     uint64_t watchdog_count;
 
-    pc_timer_t timer, watchdog_timer;
+    pc_timer_t timer;
+    pc_timer_t watchdog_timer;
 } fdc_t;
 
 extern void fdc_remove(fdc_t *fdc);
diff --git a/src/include/86box/gameport.h b/src/include/86box/gameport.h
index 905130da0..8620ce755 100644
--- a/src/include/86box/gameport.h
+++ b/src/include/86box/gameport.h
@@ -91,9 +91,9 @@ typedef struct {
     int (*read_axis)(void *p, int axis);
     void (*a0_over)(void *p);
 
-    int axis_count,
-        button_count,
-        pov_count;
+    int axis_count;
+    int button_count;
+    int pov_count;
     int         max_joysticks;
     const char *axis_names[8];
     const char *button_names[32];
diff --git a/src/include/86box/gdbstub.h b/src/include/86box/gdbstub.h
index 8ac83f625..5d55615b3 100644
--- a/src/include/86box/gdbstub.h
+++ b/src/include/86box/gdbstub.h
@@ -24,14 +24,14 @@
 #define GDBSTUB_MEM_AWATCH 32
 
 enum {
-    GDBSTUB_EXEC = 0,
-    GDBSTUB_SSTEP,
-    GDBSTUB_BREAK,
-    GDBSTUB_BREAK_SW,
-    GDBSTUB_BREAK_HW,
-    GDBSTUB_BREAK_RWATCH,
-    GDBSTUB_BREAK_WWATCH,
-    GDBSTUB_BREAK_AWATCH
+    GDBSTUB_EXEC         = 0,
+    GDBSTUB_SSTEP        = 1,
+    GDBSTUB_BREAK        = 2,
+    GDBSTUB_BREAK_SW     = 3,
+    GDBSTUB_BREAK_HW     = 4,
+    GDBSTUB_BREAK_RWATCH = 5,
+    GDBSTUB_BREAK_WWATCH = 6,
+    GDBSTUB_BREAK_AWATCH = 7
 };
 
 #ifdef USE_GDBSTUB
diff --git a/src/include/86box/hdc_ide.h b/src/include/86box/hdc_ide.h
index 5a3251a3f..8a4c66da3 100644
--- a/src/include/86box/hdc_ide.h
+++ b/src/include/86box/hdc_ide.h
@@ -43,23 +43,37 @@ enum {
 
 #ifdef SCSI_DEVICE_H
 typedef struct ide_s {
-    uint8_t selected,
-        atastat, error,
-        command, fdisk;
-    int type, board,
-        irqstat, service,
-        blocksize, blockcount,
-        hdd_num, channel,
-        pos, sector_pos,
-        lba,
-        reset, mdma_mode,
-        do_initial_read;
-    uint32_t secount, sector,
-        cylinder, head,
-        drive, cylprecomp,
-        cfg_spt, cfg_hpc,
-        lba_addr, tracks,
-        spt, hpc;
+    uint8_t  selected;
+    uint8_t  atastat;
+    uint8_t  error;
+    uint8_t  command;
+    uint8_t  fdisk;
+    int      type;
+    int      board;
+    int      irqstat;
+    int      service;
+    int      blocksize;
+    int      blockcount;
+    int      hdd_num;
+    int      channel;
+    int      pos;
+    int      sector_pos;
+    int      lba;
+    int      reset;
+    int      mdma_mode;
+    int      do_initial_read;
+    uint32_t secount;
+    uint32_t sector;
+    uint32_t cylinder;
+    uint32_t head;
+    uint32_t drive;
+    uint32_t cylprecomp;
+    uint32_t cfg_spt;
+    uint32_t cfg_hpc;
+    uint32_t lba_addr;
+    uint32_t tracks;
+    uint32_t spt;
+    uint32_t hpc;
 
     uint16_t *buffer;
     uint8_t  *sector_buffer;
@@ -96,10 +110,10 @@ extern ide_t *ide_drives[IDE_NUM];
 
    This will eventually be hookable. */
 enum {
-    TYPE_PIO = 0,
-    TYPE_SDMA,
-    TYPE_MDMA,
-    TYPE_UDMA
+    TYPE_PIO  = 0,
+    TYPE_SDMA = 1,
+    TYPE_MDMA = 2,
+    TYPE_UDMA = 3
 };
 
 /* Return:
@@ -108,9 +122,9 @@ enum {
 
    This will eventually be hookable. */
 enum {
-    TIMINGS_DMA = 0,
-    TIMINGS_PIO,
-    TIMINGS_PIO_FC
+    TIMINGS_DMA    = 0,
+    TIMINGS_PIO    = 1,
+    TIMINGS_PIO_FC = 2
 };
 
 extern int ide_ter_enabled;
diff --git a/src/include/86box/hdc_ide_sff8038i.h b/src/include/86box/hdc_ide_sff8038i.h
index b411ecf5d..8f0a0896a 100644
--- a/src/include/86box/hdc_ide_sff8038i.h
+++ b/src/include/86box/hdc_ide_sff8038i.h
@@ -22,17 +22,26 @@
 
 typedef struct
 {
-    uint8_t command, status,
-        ptr0, enabled,
-        dma_mode, pad,
-        pad0, pad1;
-    uint16_t base, pad2;
-    uint32_t ptr, ptr_cur,
-        addr;
-    int count, eot,
-        slot,
-        irq_mode[2], irq_level[2],
-        irq_pin, irq_line;
+    uint8_t  command;
+    uint8_t  status;
+    uint8_t  ptr0;
+    uint8_t  enabled;
+    uint8_t  dma_mode;
+    uint8_t  pad;
+    uint8_t  pad0;
+    uint8_t  pad1;
+    uint16_t base;
+    uint16_t pad2;
+    uint32_t ptr;
+    uint32_t ptr_cur;
+    uint32_t addr;
+    int      count;
+    int      eot;
+    int      slot;
+    int      irq_mode[2];
+    int      irq_level[2];
+    int      irq_pin;
+    int      irq_line;
 } sff8038i_t;
 
 extern const device_t sff8038i_device;
diff --git a/src/include/86box/hdd.h b/src/include/86box/hdd.h
index 1508939ba..6f6b085f2 100644
--- a/src/include/86box/hdd.h
+++ b/src/include/86box/hdd.h
@@ -34,54 +34,54 @@
    Bit 5 = Removable (0 = no, 1 yes). */
 
 enum {
-    BUS_DISABLED		= 0x00,
+    BUS_DISABLED            = 0x00,
 
-    BUS_MFM			= 0x01,	/* These four are for hard disk only. */
-    BUS_XIDE			= 0x02,
-    BUS_XTA			= 0x03,
-    BUS_ESDI			= 0x04,
+    BUS_MFM                 = 0x01,    /* These four are for hard disk only. */
+    BUS_XIDE                = 0x02,
+    BUS_XTA                 = 0x03,
+    BUS_ESDI                = 0x04,
 
-    BUS_PANASONIC		= 0x21,	/ These four are for CD-ROM only. */
-    BUS_PHILIPS			= 0x22,
-    BUS_SONY			= 0x23,
-    BUS_MITSUMI			= 0x24,
+    BUS_PANASONIC           = 0x21,    / These four are for CD-ROM only. */
+    BUS_PHILIPS             = 0x22,
+    BUS_SONY                = 0x23,
+    BUS_MITSUMI             = 0x24,
 
-    BUS_IDE_PIO_ONLY		= 0x05,
-    BUS_IDE_PIO_AND_DMA		= 0x15,
-    BUS_IDE_R_PIO_ONLY		= 0x25,
-    BUS_IDE_R_PIO_AND_DMA	= 0x35,
+    BUS_IDE_PIO_ONLY        = 0x05,
+    BUS_IDE_PIO_AND_DMA     = 0x15,
+    BUS_IDE_R_PIO_ONLY      = 0x25,
+    BUS_IDE_R_PIO_AND_DMA   = 0x35,
 
-    BUS_ATAPI_PIO_ONLY		= 0x06,
-    BUS_ATAPI_PIO_AND_DMA	= 0x16,
-    BUS_ATAPI_R_PIO_ONLY	= 0x26,
-    BUS_ATAPI_R_PIO_AND_DMA	= 0x36,
+    BUS_ATAPI_PIO_ONLY      = 0x06,
+    BUS_ATAPI_PIO_AND_DMA   = 0x16,
+    BUS_ATAPI_R_PIO_ONLY    = 0x26,
+    BUS_ATAPI_R_PIO_AND_DMA = 0x36,
 
-    BUS_SASI			= 0x07,
-    BUS_SASI_R			= 0x27,
+    BUS_SASI                = 0x07,
+    BUS_SASI_R              = 0x27,
 
-    BUS_SCSI			= 0x08,
-    BUS_SCSI_R			= 0x28,
+    BUS_SCSI                = 0x08,
+    BUS_SCSI_R              = 0x28,
 
-    BUS_USB			= 0x09,
-    BUS_USB_R			= 0x29
+    BUS_USB                 = 0x09,
+    BUS_USB_R               = 0x29
 };
 #else
 enum {
     HDD_BUS_DISABLED = 0,
-    HDD_BUS_MFM,
-    HDD_BUS_XTA,
-    HDD_BUS_ESDI,
-    HDD_BUS_IDE,
-    HDD_BUS_ATAPI,
-    HDD_BUS_SCSI,
-    HDD_BUS_USB
+    HDD_BUS_MFM      = 1,
+    HDD_BUS_XTA      = 2,
+    HDD_BUS_ESDI     = 3,
+    HDD_BUS_IDE      = 4,
+    HDD_BUS_ATAPI    = 5,
+    HDD_BUS_SCSI     = 6,
+    HDD_BUS_USB      = 7
 };
 #endif
 
 enum {
-    HDD_OP_SEEK = 0,
-    HDD_OP_READ,
-    HDD_OP_WRITE
+    HDD_OP_SEEK  = 0,
+    HDD_OP_READ  = 2,
+    HDD_OP_WRITE = 3
 };
 
 #define HDD_MAX_ZONES     16
@@ -147,21 +147,23 @@ typedef struct {
         uint8_t ide_channel;
         uint8_t scsi_id;
     };
-    uint8_t bus,
-        res;    /* Reserved for bus mode */
+    uint8_t bus;
+    uint8_t res;    /* Reserved for bus mode */
     uint8_t wp; /* Disk has been mounted READ-ONLY */
-    uint8_t pad, pad0;
+    uint8_t pad;
+    uint8_t pad0;
 
     void *priv;
 
     char fn[1024];         /* Name of current image file */
     char vhd_parent[1041]; /* Differential VHD parent file */
 
-    uint32_t res0, pad1,
-        base,
-        spt,
-        hpc, /* Physical geometry parameters */
-        tracks;
+    uint32_t res0;
+    uint32_t pad1;
+    uint32_t base;
+    uint32_t spt;
+    uint32_t hpc; /* Physical geometry parameters */
+    uint32_t tracks;
 
     hdd_zone_t  zones[HDD_MAX_ZONES];
     uint32_t    num_zones;
diff --git a/src/include/86box/hwm.h b/src/include/86box/hwm.h
index e0410b3a0..dabbc5d45 100644
--- a/src/include/86box/hwm.h
+++ b/src/include/86box/hwm.h
@@ -33,7 +33,8 @@ typedef struct {
 
     uint8_t regs[8];
     uint8_t addr_register;
-    uint8_t i2c_addr : 7, i2c_state : 2;
+    uint8_t i2c_addr : 7;
+    uint8_t i2c_state : 2;
     uint8_t i2c_enabled : 1;
 } lm75_t;
 
diff --git a/src/include/86box/isapnp.h b/src/include/86box/isapnp.h
index 9fff876dc..7259b5710 100644
--- a/src/include/86box/isapnp.h
+++ b/src/include/86box/isapnp.h
@@ -25,25 +25,29 @@
 #define ISAPNP_DMA_DISABLED 4
 
 enum {
-    ISAPNP_CARD_DISABLE = 0,
-    ISAPNP_CARD_ENABLE  = 1,
-    ISAPNP_CARD_FORCE_CONFIG, /* cheat code for UMC UM8669F */
-    ISAPNP_CARD_NO_KEY        /* cheat code for Crystal CS423x */
+    ISAPNP_CARD_DISABLE      = 0,
+    ISAPNP_CARD_ENABLE       = 1,
+    ISAPNP_CARD_FORCE_CONFIG = 2, /* cheat code for UMC UM8669F */
+    ISAPNP_CARD_NO_KEY       = 3  /* cheat code for Crystal CS423x */
 };
 
 typedef struct {
     uint8_t activate;
     struct {
-        uint32_t base : 24, size : 24;
+        uint32_t base : 24;
+        uint32_t size : 24;
     } mem[4];
     struct {
-        uint32_t base, size;
+        uint32_t base;
+        uint32_t size;
     } mem32[4];
     struct {
         uint16_t base;
     } io[8];
     struct {
-        uint8_t irq : 4, level : 1, type : 1;
+        uint8_t irq : 4;
+        uint8_t level : 1;
+        uint8_t type : 1;
     } irq[2];
     struct {
         uint8_t dma : 3;
diff --git a/src/include/86box/keyboard.h b/src/include/86box/keyboard.h
index 4a1c04892..500bb2843 100644
--- a/src/include/86box/keyboard.h
+++ b/src/include/86box/keyboard.h
@@ -24,23 +24,24 @@
 
 enum {
     DEV_KBD = 0,
-    DEV_AUX
+    DEV_AUX = 1
 };
 
 enum {
-    DEV_STATE_MAIN_1 = 0,
-    DEV_STATE_MAIN_OUT,
-    DEV_STATE_MAIN_2,
-    DEV_STATE_MAIN_CMD,
-    DEV_STATE_MAIN_WANT_IN,
-    DEV_STATE_MAIN_IN,
-    DEV_STATE_EXECUTE_BAT,
-    DEV_STATE_MAIN_WANT_EXECUTE_BAT
+    DEV_STATE_MAIN_1                = 0,
+    DEV_STATE_MAIN_OUT              = 1,
+    DEV_STATE_MAIN_2                = 2,
+    DEV_STATE_MAIN_CMD              = 3,
+    DEV_STATE_MAIN_WANT_IN          = 4,
+    DEV_STATE_MAIN_IN               = 5,
+    DEV_STATE_EXECUTE_BAT           = 6,
+    DEV_STATE_MAIN_WANT_EXECUTE_BAT = 7
 };
 
 /* Used by the AT / PS/2 keyboard controller, common device, keyboard, and mouse. */
 typedef struct {
-    uint8_t wantcmd, dat;
+    uint8_t wantcmd;
+    uint8_t dat;
 
     int16_t out_new;
 
@@ -53,9 +54,16 @@ typedef struct {
 typedef struct {
     const char *name; /* name of this device */
 
-    uint8_t type, command, last_scan_code, state,
-            resolution, rate, cmd_queue_start, cmd_queue_end,
-            queue_start, queue_end;
+    uint8_t type;
+    uint8_t command;
+    uint8_t last_scan_code;
+    uint8_t state;
+    uint8_t resolution;
+    uint8_t rate;
+    uint8_t cmd_queue_start;
+    uint8_t cmd_queue_end;
+    uint8_t queue_start;
+    uint8_t queue_end;
 
     uint16_t flags;
 
@@ -65,8 +73,12 @@ typedef struct {
 
     uint8_t queue[64];
 
-    int     fifo_mask, mode,
-            x, y, z, b;
+    int     fifo_mask;
+    int     mode;
+    int     x;
+    int     y;
+    int     z;
+    int     b;
 
     int     *scan;
 
diff --git a/src/include/86box/lpt.h b/src/include/86box/lpt.h
index cb8fc7cc6..a22644b48 100644
--- a/src/include/86box/lpt.h
+++ b/src/include/86box/lpt.h
@@ -10,12 +10,12 @@
 #define LPT_MDA_IRQ  7
 #define LPT4_ADDR    0x0268
 #define LPT4_IRQ     5
-/*
+#if 0
 #define LPT5_ADDR 0x027c
 #define LPT5_IRQ  7
 #define LPT6_ADDR 0x026c
 #define LPT6_IRQ  5
-*/
+#endif
 
 typedef struct
 {
@@ -53,7 +53,7 @@ extern void lpt1_remove_ams(void);
 #define lpt4_irq(a)   lpt_port_irq(3, a)
 #define lpt4_remove() lpt_port_remove(3)
 
-/*
+#if 0
 #define lpt5_init(a)	lpt_port_init(4, a)
 #define lpt5_irq(a)	lpt_port_irq(4, a)
 #define lpt5_remove()	lpt_port_remove(4)
@@ -61,16 +61,20 @@ extern void lpt1_remove_ams(void);
 #define lpt6_init(a)	lpt_port_init(5, a)
 #define lpt6_irq(a)	lpt_port_irq(5, a)
 #define lpt6_remove()	lpt_port_remove(5)
-*/
+#endif
 
 void lpt_devices_init(void);
 void lpt_devices_close(void);
 
 typedef struct {
-    uint8_t enabled, irq,
-        dat, ctrl;
-    uint16_t      addr, pad0;
-    int           device, enable_irq;
+    uint8_t       enabled;
+    uint8_t       irq;
+    uint8_t       dat;
+    uint8_t       ctrl;
+    uint16_t      addr;
+    uint16_t      pad0;
+    int           device;
+    int           enable_irq;
     lpt_device_t *dt;
     void         *priv;
 } lpt_port_t;
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 6b0b1976a..a8119fb6d 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -143,31 +143,31 @@
 #endif
 
 enum {
-    MACHINE_TYPE_NONE = 0,
-    MACHINE_TYPE_8088,
-    MACHINE_TYPE_8086,
-    MACHINE_TYPE_286,
-    MACHINE_TYPE_386SX,
-    MACHINE_TYPE_486SLC,
-    MACHINE_TYPE_386DX,
-    MACHINE_TYPE_386DX_486,
-    MACHINE_TYPE_486,
-    MACHINE_TYPE_486_S2,
-    MACHINE_TYPE_486_S3,
-    MACHINE_TYPE_486_MISC,
-    MACHINE_TYPE_SOCKET4,
-    MACHINE_TYPE_SOCKET5,
-    MACHINE_TYPE_SOCKET7_3V,
-    MACHINE_TYPE_SOCKET7,
-    MACHINE_TYPE_SOCKETS7,
-    MACHINE_TYPE_SOCKET8,
-    MACHINE_TYPE_SLOT1,
-    MACHINE_TYPE_SLOT1_2,
-    MACHINE_TYPE_SLOT1_370,
-    MACHINE_TYPE_SLOT2,
-    MACHINE_TYPE_SOCKET370,
-    MACHINE_TYPE_MISC,
-    MACHINE_TYPE_MAX
+    MACHINE_TYPE_NONE       = 0,
+    MACHINE_TYPE_8088       = 1,
+    MACHINE_TYPE_8086       = 2,
+    MACHINE_TYPE_286        = 3,
+    MACHINE_TYPE_386SX      = 4,
+    MACHINE_TYPE_486SLC     = 5,
+    MACHINE_TYPE_386DX      = 6,
+    MACHINE_TYPE_386DX_486  = 7,
+    MACHINE_TYPE_486        = 8,
+    MACHINE_TYPE_486_S2     = 9,
+    MACHINE_TYPE_486_S3     = 10,
+    MACHINE_TYPE_486_MISC   = 11,
+    MACHINE_TYPE_SOCKET4    = 12,
+    MACHINE_TYPE_SOCKET5    = 13,
+    MACHINE_TYPE_SOCKET7_3V = 14,
+    MACHINE_TYPE_SOCKET7    = 15,
+    MACHINE_TYPE_SOCKETS7   = 16,
+    MACHINE_TYPE_SOCKET8    = 17,
+    MACHINE_TYPE_SLOT1      = 18,
+    MACHINE_TYPE_SLOT1_2    = 19,
+    MACHINE_TYPE_SLOT1_370  = 20,
+    MACHINE_TYPE_SLOT2      = 21,
+    MACHINE_TYPE_SOCKET370  = 22,
+    MACHINE_TYPE_MISC       = 23,
+    MACHINE_TYPE_MAX        = 24
 };
 
 enum {
@@ -281,7 +281,10 @@ typedef struct _machine_ {
     uint32_t    type;
     uintptr_t   chipset;
     int (*init)(const struct _machine_ *);
-    uintptr_t              pad, pad0, pad1, pad2;
+    uintptr_t              pad;
+    uintptr_t              pad0;
+    uintptr_t              pad1;
+    uintptr_t              pad2;
     const machine_cpu_t    cpu;
     uintptr_t              bus_flags;
     uintptr_t              flags;
diff --git a/src/include/86box/mem.h b/src/include/86box/mem.h
index 45520f709..18def5e76 100644
--- a/src/include/86box/mem.h
+++ b/src/include/86box/mem.h
@@ -159,10 +159,10 @@
     mem_set_access((smm ? ACCESS_BUS_SMM : ACCESS_BUS), 1, base, size, is_smram)
 
 typedef struct {
-    uint16_t x : 5,
-        w      : 5,
-        r      : 5,
-        pad    : 1;
+    uint16_t x : 5;
+    uint16_t w : 5;
+    uint16_t r : 5;
+    uint16_t pad : 1;
 } state_t;
 
 typedef union {
@@ -255,7 +255,8 @@ extern uint8_t *ram, *ram2;
 extern uint32_t rammask;
 
 extern uint8_t *rom;
-extern uint32_t biosmask, biosaddr;
+extern uint32_t biosmask;
+extern uint32_t biosaddr;
 
 extern int        readlookup[256];
 extern uintptr_t *readlookup2;
@@ -283,7 +284,8 @@ extern uint32_t mem_logical_addr;
 extern page_t  *pages;
 extern page_t **page_lookup;
 
-extern uint32_t get_phys_virt, get_phys_phys;
+extern uint32_t get_phys_virt;
+extern uint32_t get_phys_phys;
 
 extern int shadowbios;
 extern int shadowbios_write;
diff --git a/src/include/86box/midi.h b/src/include/86box/midi.h
index f965e6c98..029ad06dc 100644
--- a/src/include/86box/midi.h
+++ b/src/include/86box/midi.h
@@ -47,13 +47,21 @@ typedef struct midi_in_handler_t {
 } midi_in_handler_t;
 
 typedef struct midi_t {
-    uint8_t midi_rt_buf[8], midi_cmd_buf[8],
-        midi_status, midi_sysex_data[SYSEX_SIZE];
-    int midi_cmd_pos, midi_cmd_len, midi_cmd_r,
-        midi_realtime, thruchan, midi_clockout;
-    unsigned int midi_sysex_start, midi_sysex_delay,
-        midi_pos;
-    midi_device_t *m_out_device, *m_in_device;
+    uint8_t        midi_rt_buf[8];
+    uint8_t        midi_cmd_buf[8];
+    uint8_t        midi_status;
+    uint8_t        midi_sysex_data[SYSEX_SIZE];
+    int            midi_cmd_pos;
+    int            midi_cmd_len;
+    int            midi_cmd_r;
+    int            midi_realtime;
+    int            thruchan;
+    int            midi_clockout;
+    unsigned int   midi_sysex_start;
+    unsigned int   midi_sysex_delay;
+    unsigned int   midi_pos;
+    midi_device_t *m_out_device;
+    midi_device_t *m_in_device;
 } midi_t;
 
 extern midi_t *midi_out;
diff --git a/src/include/86box/mo.h b/src/include/86box/mo.h
index 19c999ee3..28312e2f5 100644
--- a/src/include/86box/mo.h
+++ b/src/include/86box/mo.h
@@ -85,34 +85,38 @@ static const mo_drive_type_t mo_drive_types[KNOWN_MO_DRIVE_TYPES] = {
 enum {
     MO_BUS_DISABLED = 0,
     MO_BUS_ATAPI    = 5,
-    MO_BUS_SCSI,
-    MO_BUS_USB
+    MO_BUS_SCSI     = 6,
+    MO_BUS_USB      = 7
 };
 
 typedef struct {
     uint8_t id;
 
     union {
-        uint8_t res, res0, /* Reserved for other ID's. */
-            res1,
-            ide_channel, scsi_device_id;
+        uint8_t res;
+        uint8_t res0; /* Reserved for other ID's. */
+        uint8_t res1;
+        uint8_t ide_channel;
+        uint8_t scsi_device_id;
     };
 
-    uint8_t bus_type, /* 0 = ATAPI, 1 = SCSI */
-        bus_mode,     /* Bit 0 = PIO suported;
-                         Bit 1 = DMA supportd. */
-        read_only,    /* Struct variable reserved for
-                         media status. */
-        pad, pad0;
+    uint8_t bus_type;  /* 0 = ATAPI, 1 = SCSI */
+    uint8_t bus_mode;  /* Bit 0 = PIO suported;
+                          Bit 1 = DMA supportd. */
+    uint8_t read_only; /* Struct variable reserved for
+                          media status. */
+    uint8_t pad;
+    uint8_t pad0;
 
     FILE *f;
     void *priv;
 
-    char image_path[1024],
-        prev_image_path[1024];
+    char image_path[1024];
+    char prev_image_path[1024];
 
-    uint32_t type, medium_size,
-        base;
+    uint32_t type;
+    uint32_t medium_size;
+    uint32_t base;
     uint16_t sector_size;
 
 } mo_drive_t;
@@ -122,25 +126,36 @@ typedef struct {
 
     mo_drive_t *drv;
 
-    uint8_t *buffer,
-        atapi_cdb[16],
-        current_cdb[16],
-        sense[256];
+    uint8_t *buffer;
+    uint8_t  atapi_cdb[16];
+    uint8_t  current_cdb[16];
+    uint8_t  sense[256];
 
-    uint8_t status, phase,
-        error, id,
-        features, cur_lun,
-        pad0, pad1;
+    uint8_t status;
+    uint8_t phase;
+    uint8_t error;
+    uint8_t id;
+    uint8_t features;
+    uint8_t cur_lun;
+    uint8_t pad0;
+    uint8_t pad1;
 
-    uint16_t request_length, max_transfer_len;
+    uint16_t request_length;
+    uint16_t max_transfer_len;
 
-    int requested_blocks, packet_status,
-        total_length, do_page_save,
-        unit_attention, request_pos,
-        old_len, pad3;
+    int requested_blocks;
+    int packet_status;
+    int total_length;
+    int do_page_save;
+    int unit_attention;
+    int request_pos;
+    int old_len;
+    int pad3;
 
-    uint32_t sector_pos, sector_len,
-        packet_len, pos;
+    uint32_t sector_pos;
+    uint32_t sector_len;
+    uint32_t packet_len;
+    uint32_t pos;
 
     double callback;
 } mo_t;
diff --git a/src/include/86box/mouse.h b/src/include/86box/mouse.h
index 874bf30de..839c0f11a 100644
--- a/src/include/86box/mouse.h
+++ b/src/include/86box/mouse.h
@@ -43,16 +43,16 @@
 extern "C" {
 #endif
 
-extern int mouse_type;
-extern int mouse_x;
-extern int mouse_y;
-extern int mouse_z;
-extern int mouse_mode; /* 1 = Absolute, 0 = Relative */
-extern int mouse_tablet_in_proximity;
+extern int    mouse_type;
+extern int    mouse_x;
+extern int    mouse_y;
+extern int    mouse_z;
+extern int    mouse_mode; /* 1 = Absolute, 0 = Relative */
+extern int    mouse_tablet_in_proximity;
 extern double mouse_x_abs;
 extern double mouse_y_abs;
-extern int mouse_buttons;
-extern int tablet_tool_type;
+extern int    mouse_buttons;
+extern int    tablet_tool_type;
 
 #ifdef EMU_DEVICE_H
 extern const device_t *mouse_get_device(int mouse);
diff --git a/src/include/86box/net_wd8003.h b/src/include/86box/net_wd8003.h
index a0ea13287..726510cdb 100644
--- a/src/include/86box/net_wd8003.h
+++ b/src/include/86box/net_wd8003.h
@@ -45,13 +45,13 @@
 #define NET_WD8003_H
 
 enum {
-    WD_NONE = 0,
-    WD8003E,   /* WD8003E   :  8-bit ISA, no  interface chip */
-    WD8003EB,  /* WD8003EB  :  8-bit ISA, 5x3 interface chip */
-    WD8013EBT, /* WD8013EBT : 16-bit ISA, no  interface chip */
-    WD8003ETA, /* WD8003ET/A: 16-bit MCA, no  interface chip */
-    WD8003EA,  /* WD8003E/A : 16-bit MCA, 5x3 interface chip */
-    WD8013EPA
+    WD_NONE   = 0,
+    WD8003E   = 1, /* WD8003E   :  8-bit ISA, no  interface chip */
+    WD8003EB  = 2, /* WD8003EB  :  8-bit ISA, 5x3 interface chip */
+    WD8013EBT = 3, /* WD8013EBT : 16-bit ISA, no  interface chip */
+    WD8003ETA = 4, /* WD8003ET/A: 16-bit MCA, no  interface chip */
+    WD8003EA  = 5, /* WD8003E/A : 16-bit MCA, 5x3 interface chip */
+    WD8013EPA = 6
 };
 
 extern const device_t wd8003e_device;
diff --git a/src/include/86box/network.h b/src/include/86box/network.h
index 2684ed1c4..19ec5fa37 100644
--- a/src/include/86box/network.h
+++ b/src/include/86box/network.h
@@ -80,17 +80,17 @@ enum {
 
 /* Supported network cards. */
 enum {
-    NONE = 0,
-    NE1000,
-    NE2000,
-    RTL8019AS,
-    RTL8029AS
+    NONE      = 0,
+    NE1000    = 1,
+    NE2000    = 2,
+    RTL8019AS = 3,
+    RTL8029AS = 4
 };
 
 enum {
-    NET_QUEUE_RX,
-    NET_QUEUE_TX_VM,
-    NET_QUEUE_TX_HOST
+    NET_QUEUE_RX      = 0,
+    NET_QUEUE_TX_VM   = 1,
+    NET_QUEUE_TX_HOST = 2
 };
 
 typedef struct {
@@ -168,11 +168,11 @@ extern "C" {
 #endif
 
 /* Global variables. */
-extern int      nic_do_log; /* config */
+extern int              nic_do_log;     // config
 extern network_devmap_t network_devmap;
-extern int      network_ndev;           // Number of pcap devices
+extern int              network_ndev;   // Number of pcap devices
 extern network_devmap_t network_devmap; // Bitmap of available network types
-extern netdev_t network_devs[NET_HOST_INTF_MAX];
+extern netdev_t         network_devs[NET_HOST_INTF_MAX];
 
 
 /* Function prototypes. */
diff --git a/src/include/86box/nvr.h b/src/include/86box/nvr.h
index 25f5e90ad..baba6b6c4 100644
--- a/src/include/86box/nvr.h
+++ b/src/include/86box/nvr.h
@@ -64,7 +64,8 @@
 typedef struct _nvr_ {
     char    *fn;   /* pathname of image file */
     uint16_t size; /* device configuration */
-    int8_t   irq, is_new;
+    int8_t   irq;
+    int8_t   is_new;
 
     uint8_t    onesec_cnt;
     pc_timer_t onesec_time;
diff --git a/src/include/86box/pci.h b/src/include/86box/pci.h
index 52c2df981..3fcb74f6f 100644
--- a/src/include/86box/pci.h
+++ b/src/include/86box/pci.h
@@ -56,37 +56,37 @@
 #define PCI_ADD_STRICT         0x80
 
 enum {
-    PCI_CARD_NORTHBRIDGE = 0,
-    PCI_CARD_AGPBRIDGE,
-    PCI_CARD_SOUTHBRIDGE,
-    PCI_CARD_SOUTHBRIDGE_IDE,
-    PCI_CARD_SOUTHBRIDGE_PMU,
-    PCI_CARD_SOUTHBRIDGE_USB,
-    PCI_CARD_AGP    = 0x0f,
-    PCI_CARD_NORMAL = 0x10,
-    PCI_CARD_VIDEO,
-    PCI_CARD_SCSI,
-    PCI_CARD_SOUND,
-    PCI_CARD_IDE,
-    PCI_CARD_NETWORK,
-    PCI_CARD_BRIDGE,
+    PCI_CARD_NORTHBRIDGE     = 0,
+    PCI_CARD_AGPBRIDGE       = 1,
+    PCI_CARD_SOUTHBRIDGE     = 2,
+    PCI_CARD_SOUTHBRIDGE_IDE = 3,
+    PCI_CARD_SOUTHBRIDGE_PMU = 4,
+    PCI_CARD_SOUTHBRIDGE_USB = 5,
+    PCI_CARD_AGP             = 0x0f,
+    PCI_CARD_NORMAL          = 0x10,
+    PCI_CARD_VIDEO           = 0x11,
+    PCI_CARD_SCSI            = 0x12,
+    PCI_CARD_SOUND           = 0x13,
+    PCI_CARD_IDE             = 0x14,
+    PCI_CARD_NETWORK         = 0x15,
+    PCI_CARD_BRIDGE          = 0x16,
 };
 
 enum {
-    PCI_ADD_NORTHBRIDGE = 0,
-    PCI_ADD_AGPBRIDGE,
-    PCI_ADD_SOUTHBRIDGE,
-    PCI_ADD_SOUTHBRIDGE_IDE,
-    PCI_ADD_SOUTHBRIDGE_PMU,
-    PCI_ADD_SOUTHBRIDGE_USB,
-    PCI_ADD_AGP    = 0x0f,
-    PCI_ADD_NORMAL = 0x10,
-    PCI_ADD_VIDEO,
-    PCI_ADD_SCSI,
-    PCI_ADD_SOUND,
-    PCI_ADD_IDE,
-    PCI_ADD_NETWORK,
-    PCI_ADD_BRIDGE
+    PCI_ADD_NORTHBRIDGE     = 0,
+    PCI_ADD_AGPBRIDGE       = 1,
+    PCI_ADD_SOUTHBRIDGE     = 2,
+    PCI_ADD_SOUTHBRIDGE_IDE = 3,
+    PCI_ADD_SOUTHBRIDGE_PMU = 4,
+    PCI_ADD_SOUTHBRIDGE_USB = 5,
+    PCI_ADD_AGP             = 0x0f,
+    PCI_ADD_NORMAL          = 0x10,
+    PCI_ADD_VIDEO           = 0x11,
+    PCI_ADD_SCSI            = 0x12,
+    PCI_ADD_SOUND           = 0x13,
+    PCI_ADD_IDE             = 0x14,
+    PCI_ADD_NETWORK         = 0x15,
+    PCI_ADD_BRIDGE          = 0x16
 };
 
 typedef union {
diff --git a/src/include/86box/pic.h b/src/include/86box/pic.h
index 25c866242..dcc6f1358 100644
--- a/src/include/86box/pic.h
+++ b/src/include/86box/pic.h
@@ -20,11 +20,26 @@
 #define EMU_PIC_H
 
 typedef struct pic {
-    uint8_t icw1, icw2, icw3, icw4,
-        imr, isr, irr, ocw2,
-        ocw3, int_pending, is_master, elcr,
-        state, ack_bytes, priority, special_mask_mode,
-        auto_eoi_rotate, interrupt, lines, data_bus;
+    uint8_t     icw1;
+    uint8_t     icw2;
+    uint8_t     icw3;
+    uint8_t     icw4;
+    uint8_t     imr;
+    uint8_t     isr;
+    uint8_t     irr;
+    uint8_t     ocw2;
+    uint8_t     ocw3;
+    uint8_t     int_pending;
+    uint8_t     is_master;
+    uint8_t     elcr;
+    uint8_t     state;
+    uint8_t     ack_bytes;
+    uint8_t     priority;
+    uint8_t     special_mask_mode;
+    uint8_t     auto_eoi_rotate;
+    uint8_t     interrupt;
+    uint8_t     lines;
+    uint8_t     data_bus;
     uint32_t    at;
     struct pic *slaves[8];
 } pic_t;
diff --git a/src/include/86box/pit.h b/src/include/86box/pit.h
index a9d114d8e..044f20dad 100644
--- a/src/include/86box/pit.h
+++ b/src/include/86box/pit.h
@@ -20,16 +20,28 @@
 #define EMU_PIT_H
 
 typedef struct {
-    uint8_t m, ctrl,
-        read_status, latch,
-        s1_det, l_det,
-        bcd, incomplete;
+    uint8_t m;
+    uint8_t ctrl;
+    uint8_t read_status;
+    uint8_t latch;
+    uint8_t s1_det;
+    uint8_t l_det;
+    uint8_t bcd;
+    uint8_t incomplete;
 
     uint16_t rl;
 
-    int rm, wm, gate, out,
-        newcount, clock, using_timer, latched,
-        state, null_count, do_read_status;
+    int rm;
+    int wm;
+    int gate;
+    int out;
+    int newcount;
+    int clock;
+    int using_timer;
+    int latched;
+    int state;
+    int null_count;
+    int do_read_status;
 
     union {
         int count;
@@ -49,7 +61,8 @@ typedef struct {
 } ctr_t;
 
 typedef struct PIT {
-    int        flags, clock;
+    int        flags;
+    int        clock;
     pc_timer_t callback_timer;
 
     ctr_t counters[3];
@@ -58,10 +71,10 @@ typedef struct PIT {
 } pit_t;
 
 enum {
-    PIT_8253 = 0,
-    PIT_8254,
-    PIT_8253_FAST,
-    PIT_8254_FAST
+    PIT_8253      = 0,
+    PIT_8254      = 1,
+    PIT_8253_FAST = 2,
+    PIT_8254_FAST = 3
 };
 
 typedef struct {
diff --git a/src/include/86box/pit_fast.h b/src/include/86box/pit_fast.h
index 242fb4207..d1bca1265 100644
--- a/src/include/86box/pit_fast.h
+++ b/src/include/86box/pit_fast.h
@@ -20,14 +20,23 @@
 #define EMU_PIT_FAST_H
 
 typedef struct {
-    uint8_t m, ctrl,
-        read_status, latch, bcd;
+    uint8_t m;
+    uint8_t ctrl;
+    uint8_t read_status;
+    uint8_t latch;
+    uint8_t bcd;
 
     uint16_t rl;
 
-    int rm, wm, gate, out,
-        newcount, clock, using_timer, latched,
-        do_read_status;
+    int rm;
+    int wm;
+    int gate;
+    int out;
+    int newcount;
+    int clock;
+    int using_timer;
+    int latched;
+    int do_read_status;
     int enabled;
     int disabled;
     int initial;
diff --git a/src/include/86box/plat.h b/src/include/86box/plat.h
index 05b982216..932dfe87b 100644
--- a/src/include/86box/plat.h
+++ b/src/include/86box/plat.h
@@ -81,9 +81,9 @@ extern "C" {
 #endif
 
 /* Global variables residing in the platform module. */
-extern int dopause,          /* system is paused */
-    mouse_capture;           /* mouse is captured in app */
-extern volatile int is_quit; /* system exit requested */
+extern int          dopause;       /* system is paused */
+extern int          mouse_capture; /* mouse is captured in app */
+extern volatile int is_quit;       /* system exit requested */
 
 #ifdef MTR_ENABLED
 extern int tracing_on;
@@ -95,7 +95,9 @@ extern char     emu_version[200]; /* version ID string */
 extern int      rctrl_is_lalt;
 extern int      update_icons;
 
-extern int kbd_req_capture, hide_status_bar, hide_tool_bar;
+extern int kbd_req_capture;
+extern int hide_status_bar;
+extern int hide_tool_bar;
 
 /* System-related functions. */
 extern char    *fix_exe_path(char *str);
diff --git a/src/include/86box/plat_unused.h b/src/include/86box/plat_unused.h
new file mode 100644
index 000000000..73eaebaae
--- /dev/null
+++ b/src/include/86box/plat_unused.h
@@ -0,0 +1,31 @@
+/*
+ * 86Box    A hypervisor and IBM PC system emulator that specializes in
+ *          running old operating systems and software designed for IBM
+ *          PC systems and compatibles from 1981 through fairly recent
+ *          system designs based on the PCI bus.
+ *
+ *          This file is part of the 86Box distribution.
+ *
+ *          Define the various platform support functions.
+ *
+ *
+ *
+ * Authors: Miran Grca, <mgrca8@gmail.com>
+ *          Fred N. van Kempen, <decwiz@yahoo.com>
+ *
+ *          Copyright 2016-2019 Miran Grca.
+ *          Copyright 2017-2019 Fred N. van Kempen.
+ *          Copyright 2021 Laci bá'
+ */
+
+#ifndef EMU_PLAT_UNUSED_H
+#define EMU_PLAT_UNUSED_H
+
+#ifdef _MSC_VER
+#    define UNUSED(arg) arg
+#else
+/* A hack (GCC-specific?) to allow us to ignore unused parameters. */
+#    define UNUSED(arg) __attribute__((unused)) arg
+#endif
+
+#endif /*EMU_PLAT_UNUSED_H*/
diff --git a/src/include/86box/port_6x.h b/src/include/86box/port_6x.h
index 7eb0c9a56..71633f601 100644
--- a/src/include/86box/port_6x.h
+++ b/src/include/86box/port_6x.h
@@ -22,7 +22,8 @@
 #ifdef _TIMER_H_
 typedef struct
 {
-    uint8_t refresh, flags;
+    uint8_t refresh;
+    uint8_t flags;
 
     pc_timer_t refresh_timer;
 } port_6x_t;
diff --git a/src/include/86box/port_92.h b/src/include/86box/port_92.h
index 319b2b3ac..dd33d0681 100644
--- a/src/include/86box/port_92.h
+++ b/src/include/86box/port_92.h
@@ -22,7 +22,8 @@
 #ifdef _TIMER_H_
 typedef struct
 {
-    uint8_t reg, flags;
+    uint8_t reg;
+    uint8_t flags;
 
     pc_timer_t pulse_timer;
 
diff --git a/src/include/86box/ppi.h b/src/include/86box/ppi.h
index 0e12c98f8..d5649bcc8 100644
--- a/src/include/86box/ppi.h
+++ b/src/include/86box/ppi.h
@@ -3,7 +3,8 @@
 
 typedef struct PPI {
     int     s2;
-    uint8_t pa, pb;
+    uint8_t pa;
+    uint8_t pb;
 } PPI;
 
 extern int ppispeakon;
diff --git a/src/include/86box/scsi_cdrom.h b/src/include/86box/scsi_cdrom.h
index 6b94c2aa4..ea7f5f334 100644
--- a/src/include/86box/scsi_cdrom.h
+++ b/src/include/86box/scsi_cdrom.h
@@ -28,25 +28,36 @@ typedef struct {
 
     cdrom_t *drv;
 
-    uint8_t *buffer,
-        atapi_cdb[16],
-        current_cdb[16],
-        sense[256];
+    uint8_t *buffer;
+    uint8_t atapi_cdb[16];
+    uint8_t current_cdb[16];
+    uint8_t sense[256];
 
-    uint8_t status, phase,
-        error, id,
-        features, cur_lun,
-        early, pad1;
+    uint8_t status;
+    uint8_t phase;
+    uint8_t error;
+    uint8_t id;
+    uint8_t features;
+    uint8_t cur_lun;
+    uint8_t early;
+    uint8_t pad1;
 
-    uint16_t request_length, max_transfer_len;
+    uint16_t request_length;
+    uint16_t max_transfer_len;
 
-    int requested_blocks, packet_status,
-        total_length, do_page_save,
-        unit_attention, request_pos,
-        old_len, media_status;
+    int requested_blocks;
+    int packet_status;
+    int total_length;
+    int do_page_save;
+    int unit_attention;
+    int request_pos;
+    int old_len;
+    int media_status;
 
-    uint32_t sector_pos, sector_len,
-        packet_len, pos;
+    uint32_t sector_pos;
+    uint32_t sector_len;
+    uint32_t packet_len;
+    uint32_t pos;
 
     double callback;
 
diff --git a/src/include/86box/scsi_device.h b/src/include/86box/scsi_device.h
index 61048fb54..5af0919f9 100644
--- a/src/include/86box/scsi_device.h
+++ b/src/include/86box/scsi_device.h
@@ -43,142 +43,142 @@
 #define MCR_ERR  0x08 /* Media change request */
 
 /* SCSI commands. */
-#define GPCMD_TEST_UNIT_READY               0x00
-#define GPCMD_REZERO_UNIT                   0x01
-#define GPCMD_REQUEST_SENSE                 0x03
-#define GPCMD_FORMAT_UNIT                   0x04
-#define GPCMD_IOMEGA_SENSE                  0x06
-#define GPCMD_READ_6                        0x08
-#define GPCMD_WRITE_6                       0x0a
-#define GPCMD_SEEK_6                        0x0b
-#define GPCMD_IOMEGA_SET_PROTECTION_MODE    0x0c
-#define GPCMD_IOMEGA_EJECT                  0x0d /* ATAPI only? */
-#define GPCMD_NO_OPERATION_TOSHIBA          0x0d /* Toshiba Vendor Unique command */
-#define GPCMD_NO_OPERATION_NEC              0x0d /* NEC Vendor Unique command */
-#define GPCMD_INQUIRY                       0x12
-#define GPCMD_VERIFY_6                      0x13
-#define GPCMD_MODE_SELECT_6                 0x15
-#define GPCMD_SCSI_RESERVE                  0x16
-#define GPCMD_SCSI_RELEASE                  0x17
-#define GPCMD_MODE_SENSE_6                  0x1a
-#define GPCMD_START_STOP_UNIT               0x1b
-#define GPCMD_SEND_DIAGNOSTIC               0x1d
-#define GPCMD_PREVENT_REMOVAL               0x1e
-#define GPCMD_READ_FORMAT_CAPACITIES        0x23
-#define GPCMD_READ_CDROM_CAPACITY           0x25
-#define GPCMD_UNKNOWN_CHINON                0x26 /*Chinon Vendor Unique command*/
-#define GPCMD_READ_10                       0x28
-#define GPCMD_READ_GENERATION               0x29
-#define GPCMD_WRITE_10                      0x2a
-#define GPCMD_SEEK_10                       0x2b
-#define GPCMD_ERASE_10                      0x2c
-#define GPCMD_WRITE_AND_VERIFY_10           0x2e
-#define GPCMD_VERIFY_10                     0x2f
-#define GPCMD_READ_BUFFER                   0x3c
-#define GPCMD_WRITE_SAME_10                 0x41
-#define GPCMD_READ_SUBCHANNEL               0x42
-#define GPCMD_READ_TOC_PMA_ATIP             0x43
-#define GPCMD_READ_HEADER                   0x44
-#define GPCMD_PLAY_AUDIO_10                 0x45
-#define GPCMD_GET_CONFIGURATION             0x46
-#define GPCMD_PLAY_AUDIO_MSF                0x47
-#define GPCMD_PLAY_AUDIO_TRACK_INDEX        0x48
-#define GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10  0x49
-#define GPCMD_GET_EVENT_STATUS_NOTIFICATION 0x4a
-#define GPCMD_PAUSE_RESUME                  0x4b
-#define GPCMD_STOP_PLAY_SCAN                0x4e
-#define GPCMD_READ_DISC_INFORMATION         0x51
-#define GPCMD_READ_TRACK_INFORMATION        0x52
-#define GPCMD_MODE_SELECT_10                0x55
-#define GPCMD_MODE_SENSE_10                 0x5a
-#define GPCMD_PLAY_AUDIO_12                 0xa5
-#define GPCMD_READ_12                       0xa8
-#define GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12  0xa9
-#define GPCMD_WRITE_12                      0xaa
-#define GPCMD_ERASE_12                      0xac
-#define GPCMD_READ_DVD_STRUCTURE            0xad /* For reading. */
-#define GPCMD_WRITE_AND_VERIFY_12           0xae
-#define GPCMD_VERIFY_12                     0xaf
-#define GPCMD_PLAY_CD_OLD                   0xb4
-#define GPCMD_READ_CD_OLD                   0xb8
-#define GPCMD_READ_CD_MSF                   0xb9
-#define GPCMD_AUDIO_SCAN                    0xba
-#define GPCMD_SET_SPEED                     0xbb
-#define GPCMD_PLAY_CD                       0xbc
-#define GPCMD_MECHANISM_STATUS              0xbd
-#define GPCMD_READ_CD                       0xbe
-#define GPCMD_SEND_DVD_STRUCTURE            0xbf /* This is for writing only, irrelevant to 86Box. */
-#define GPCMD_EJECT_CHINON                  0xc0 /* Chinon Vendor Unique command */
-#define GPCMD_AUDIO_TRACK_SEARCH_TOSHIBA    0xc0 /* Toshiba Vendor Unique command */
-#define GPCMD_UNKNOWN_SONY                  0xc0 /* Sony Vendor Unique command */
-#define GPCMD_PLAY_AUDIO_TOSHIBA            0xc1 /* Toshiba Vendor Unique command */
-#define GPCMD_READ_TOC_SONY                 0xc1 /* Sony Vendor Unique command */
-#define GPCMD_PAUSE_RESUME_ALT              0xc2
-#define GPCMD_READ_SUBCHANNEL_MATSUSHITA    0xc2 /* Matsushita Vendor Unique command */
-#define GPCMD_READ_SUBCHANNEL_SONY          0xc2 /* Sony Vendor Unique command */
-#define GPCMD_STILL_TOSHIBA                 0xc2 /* Toshiba Vendor Unique command */
-#define GPCMD_READ_TOC_MATSUSHITA           0xc3 /* Matsushita Vendor Unique command */
-#define GPCMD_READ_HEADER_SONY              0xc3 /* Sony Vendor Unique command */
-#define GPCMD_SET_STOP_TIME_TOSHIBA         0xc3 /* Toshiba Vendor Unique command */
-#define GPCMD_READ_HEADER_MATSUSHITA        0xc4 /* Matsushita Vendor Unique command */
-#define GPCMD_PLAYBACK_STATUS_TOSHIBA       0xc4 /* Sony Vendor Unique command */
-#define GPCMD_CADDY_EJECT_TOSHIBA           0xc4 /* Toshiba Vendor Unique command */
-#define GPCMD_PAUSE_SONY                    0xc5 /* Sony Vendor Unique command */
-#define GPCMD_PLAY_AUDIO_MATSUSHITA         0xc5 /* Matsushita Vendor Unique command */
-#define GPCMD_STOP_CHINON                   0xc6 /* Chinon Vendor Unique command */
-#define GPCMD_PLAT_TRACK_SONY               0xc6 /* Sony Vendor Unique command */
-#define GPCMD_READ_SUBCODEQ_PLAYING_STATUS_TOSHIBA  0xc6 /* Toshiba Vendor Unique command */
-#define GPCMD_PLAY_AUDIO_MSF_MATSUSHITA     0xc7 /* Matsushita Vendor Unique command*/
-#define GPCMD_PLAY_MSF_SONY                 0xc7 /* Sony Vendor Unique command*/
-#define GPCMD_READ_DISC_INFORMATION_TOSHIBA 0xc7 /* Toshiba Vendor Unique command */
-#define GPCMD_PLAY_AUDIO_TRACK_INDEX_MATSUSHITA 0xc8 /* Matsushita Vendor Unique command */
-#define GPCMD_PLAY_AUDIO_SONY               0xc8 /* Sony Vendor Unique command */
+#define GPCMD_TEST_UNIT_READY                         0x00
+#define GPCMD_REZERO_UNIT                             0x01
+#define GPCMD_REQUEST_SENSE                           0x03
+#define GPCMD_FORMAT_UNIT                             0x04
+#define GPCMD_IOMEGA_SENSE                            0x06
+#define GPCMD_READ_6                                  0x08
+#define GPCMD_WRITE_6                                 0x0a
+#define GPCMD_SEEK_6                                  0x0b
+#define GPCMD_IOMEGA_SET_PROTECTION_MODE              0x0c
+#define GPCMD_IOMEGA_EJECT                            0x0d /* ATAPI only? */
+#define GPCMD_NO_OPERATION_TOSHIBA                    0x0d /* Toshiba Vendor Unique command */
+#define GPCMD_NO_OPERATION_NEC                        0x0d /* NEC Vendor Unique command */
+#define GPCMD_INQUIRY                                 0x12
+#define GPCMD_VERIFY_6                                0x13
+#define GPCMD_MODE_SELECT_6                           0x15
+#define GPCMD_SCSI_RESERVE                            0x16
+#define GPCMD_SCSI_RELEASE                            0x17
+#define GPCMD_MODE_SENSE_6                            0x1a
+#define GPCMD_START_STOP_UNIT                         0x1b
+#define GPCMD_SEND_DIAGNOSTIC                         0x1d
+#define GPCMD_PREVENT_REMOVAL                         0x1e
+#define GPCMD_READ_FORMAT_CAPACITIES                  0x23
+#define GPCMD_READ_CDROM_CAPACITY                     0x25
+#define GPCMD_UNKNOWN_CHINON                          0x26 /*Chinon Vendor Unique command*/
+#define GPCMD_READ_10                                 0x28
+#define GPCMD_READ_GENERATION                         0x29
+#define GPCMD_WRITE_10                                0x2a
+#define GPCMD_SEEK_10                                 0x2b
+#define GPCMD_ERASE_10                                0x2c
+#define GPCMD_WRITE_AND_VERIFY_10                     0x2e
+#define GPCMD_VERIFY_10                               0x2f
+#define GPCMD_READ_BUFFER                             0x3c
+#define GPCMD_WRITE_SAME_10                           0x41
+#define GPCMD_READ_SUBCHANNEL                         0x42
+#define GPCMD_READ_TOC_PMA_ATIP                       0x43
+#define GPCMD_READ_HEADER                             0x44
+#define GPCMD_PLAY_AUDIO_10                           0x45
+#define GPCMD_GET_CONFIGURATION                       0x46
+#define GPCMD_PLAY_AUDIO_MSF                          0x47
+#define GPCMD_PLAY_AUDIO_TRACK_INDEX                  0x48
+#define GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10            0x49
+#define GPCMD_GET_EVENT_STATUS_NOTIFICATION           0x4a
+#define GPCMD_PAUSE_RESUME                            0x4b
+#define GPCMD_STOP_PLAY_SCAN                          0x4e
+#define GPCMD_READ_DISC_INFORMATION                   0x51
+#define GPCMD_READ_TRACK_INFORMATION                  0x52
+#define GPCMD_MODE_SELECT_10                          0x55
+#define GPCMD_MODE_SENSE_10                           0x5a
+#define GPCMD_PLAY_AUDIO_12                           0xa5
+#define GPCMD_READ_12                                 0xa8
+#define GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12            0xa9
+#define GPCMD_WRITE_12                                0xaa
+#define GPCMD_ERASE_12                                0xac
+#define GPCMD_READ_DVD_STRUCTURE                      0xad /* For reading. */
+#define GPCMD_WRITE_AND_VERIFY_12                     0xae
+#define GPCMD_VERIFY_12                               0xaf
+#define GPCMD_PLAY_CD_OLD                             0xb4
+#define GPCMD_READ_CD_OLD                             0xb8
+#define GPCMD_READ_CD_MSF                             0xb9
+#define GPCMD_AUDIO_SCAN                              0xba
+#define GPCMD_SET_SPEED                               0xbb
+#define GPCMD_PLAY_CD                                 0xbc
+#define GPCMD_MECHANISM_STATUS                        0xbd
+#define GPCMD_READ_CD                                 0xbe
+#define GPCMD_SEND_DVD_STRUCTURE                      0xbf /* This is for writing only, irrelevant to 86Box. */
+#define GPCMD_EJECT_CHINON                            0xc0 /* Chinon Vendor Unique command */
+#define GPCMD_AUDIO_TRACK_SEARCH_TOSHIBA              0xc0 /* Toshiba Vendor Unique command */
+#define GPCMD_UNKNOWN_SONY                            0xc0 /* Sony Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_TOSHIBA                      0xc1 /* Toshiba Vendor Unique command */
+#define GPCMD_READ_TOC_SONY                           0xc1 /* Sony Vendor Unique command */
+#define GPCMD_PAUSE_RESUME_ALT                        0xc2
+#define GPCMD_READ_SUBCHANNEL_MATSUSHITA              0xc2 /* Matsushita Vendor Unique command */
+#define GPCMD_READ_SUBCHANNEL_SONY                    0xc2 /* Sony Vendor Unique command */
+#define GPCMD_STILL_TOSHIBA                           0xc2 /* Toshiba Vendor Unique command */
+#define GPCMD_READ_TOC_MATSUSHITA                     0xc3 /* Matsushita Vendor Unique command */
+#define GPCMD_READ_HEADER_SONY                        0xc3 /* Sony Vendor Unique command */
+#define GPCMD_SET_STOP_TIME_TOSHIBA                   0xc3 /* Toshiba Vendor Unique command */
+#define GPCMD_READ_HEADER_MATSUSHITA                  0xc4 /* Matsushita Vendor Unique command */
+#define GPCMD_PLAYBACK_STATUS_TOSHIBA                 0xc4 /* Sony Vendor Unique command */
+#define GPCMD_CADDY_EJECT_TOSHIBA                     0xc4 /* Toshiba Vendor Unique command */
+#define GPCMD_PAUSE_SONY                              0xc5 /* Sony Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_MATSUSHITA                   0xc5 /* Matsushita Vendor Unique command */
+#define GPCMD_STOP_CHINON                             0xc6 /* Chinon Vendor Unique command */
+#define GPCMD_PLAT_TRACK_SONY                         0xc6 /* Sony Vendor Unique command */
+#define GPCMD_READ_SUBCODEQ_PLAYING_STATUS_TOSHIBA    0xc6 /* Toshiba Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_MSF_MATSUSHITA               0xc7 /* Matsushita Vendor Unique command*/
+#define GPCMD_PLAY_MSF_SONY                           0xc7 /* Sony Vendor Unique command*/
+#define GPCMD_READ_DISC_INFORMATION_TOSHIBA           0xc7 /* Toshiba Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_TRACK_INDEX_MATSUSHITA       0xc8 /* Matsushita Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_SONY                         0xc8 /* Sony Vendor Unique command */
 #define GPCMD_PLAY_AUDIO_TRACK_RELATIVE_10_MATSUSHITA 0xc9 /*Matsushita Vendor Unique command */
-#define GPCMD_PLAYBACK_CONTROL_SONY         0xc9 /* Sony Vendor Unique command */
-#define GPCMD_PAUSE_RESUME_MATSUSHITA       0xcb /* Matsushita Vendor Unique command */
-#define GPCMD_SCAN_PIONEER                  0xcd /* Should be equivalent to 0xba */
-#define GPCMD_AUDIO_TRACK_SEARCH_NEC        0xd8 /* NEC Vendor Unique command */
-#define GPCMD_PLAY_AUDIO_NEC                0xd9 /* NEC Vendor Unique command */
-#define GPCMD_STILL_NEC                     0xda /* NEC Vendor Unique command */
-#define GPCMD_SET_SPEED_ALT                 0xda /* Should be equivalent to 0xbb */
-#define GPCMD_SET_STOP_TIME_NEC             0xdb /* NEC Vendor Unique command */
-#define GPCMD_CADDY_EJECT_NEC               0xdc /* NEC Vendor Unique command */
-#define GPCMD_READ_SUBCODEQ_PLAYING_STATUS_NEC  0xdd /* NEC Vendor Unique command */
-#define GPCMD_READ_DISC_INFORMATION_NEC     0xde /* NEC Vendor Unique command */
-#define GPCMD_PLAY_AUDIO_12_MATSUSHITA      0xe5 /* Matsushita Vendor Unique command */
+#define GPCMD_PLAYBACK_CONTROL_SONY                   0xc9 /* Sony Vendor Unique command */
+#define GPCMD_PAUSE_RESUME_MATSUSHITA                 0xcb /* Matsushita Vendor Unique command */
+#define GPCMD_SCAN_PIONEER                            0xcd /* Should be equivalent to 0xba */
+#define GPCMD_AUDIO_TRACK_SEARCH_NEC                  0xd8 /* NEC Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_NEC                          0xd9 /* NEC Vendor Unique command */
+#define GPCMD_STILL_NEC                               0xda /* NEC Vendor Unique command */
+#define GPCMD_SET_SPEED_ALT                           0xda /* Should be equivalent to 0xbb */
+#define GPCMD_SET_STOP_TIME_NEC                       0xdb /* NEC Vendor Unique command */
+#define GPCMD_CADDY_EJECT_NEC                         0xdc /* NEC Vendor Unique command */
+#define GPCMD_READ_SUBCODEQ_PLAYING_STATUS_NEC        0xdd /* NEC Vendor Unique command */
+#define GPCMD_READ_DISC_INFORMATION_NEC               0xde /* NEC Vendor Unique command */
+#define GPCMD_PLAY_AUDIO_12_MATSUSHITA                0xe5 /* Matsushita Vendor Unique command */
 #define GPCMD_PLAY_AUDIO_TRACK_RELATIVE_12_MATSUSHITA 0xe9 /* Matsushita Vendor Unique command */
 
 /* Mode page codes for mode sense/set */
-#define GPMODE_R_W_ERROR_PAGE     0x01
-#define GPMODE_DISCONNECT_PAGE    0x02 /* Disconnect/reconnect page */
-#define GPMODE_FORMAT_DEVICE_PAGE 0x03
-#define GPMODE_RIGID_DISK_PAGE    0x04 /* Rigid disk geometry page */
-#define GPMODE_FLEXIBLE_DISK_PAGE 0x05
-#define GPMODE_CACHING_PAGE       0x08
-#define GPMODE_CDROM_PAGE_SONY    0x08
+#define GPMODE_R_W_ERROR_PAGE        0x01
+#define GPMODE_DISCONNECT_PAGE       0x02 /* Disconnect/reconnect page */
+#define GPMODE_FORMAT_DEVICE_PAGE    0x03
+#define GPMODE_RIGID_DISK_PAGE       0x04 /* Rigid disk geometry page */
+#define GPMODE_FLEXIBLE_DISK_PAGE    0x05
+#define GPMODE_CACHING_PAGE          0x08
+#define GPMODE_CDROM_PAGE_SONY       0x08
 #define GPMODE_CDROM_AUDIO_PAGE_SONY 0x09
-#define GPMODE_CDROM_PAGE         0x0d
-#define GPMODE_CDROM_AUDIO_PAGE   0x0e
-#define GPMODE_CAPABILITIES_PAGE  0x2a
-#define GPMODE_IOMEGA_PAGE        0x2f
-#define GPMODE_UNK_VENDOR_PAGE    0x30
-#define GPMODE_ALL_PAGES          0x3f
+#define GPMODE_CDROM_PAGE            0x0d
+#define GPMODE_CDROM_AUDIO_PAGE      0x0e
+#define GPMODE_CAPABILITIES_PAGE     0x2a
+#define GPMODE_IOMEGA_PAGE           0x2f
+#define GPMODE_UNK_VENDOR_PAGE       0x30
+#define GPMODE_ALL_PAGES             0x3f
 
 /* Mode page codes for presence */
-#define GPMODEP_R_W_ERROR_PAGE     0x0000000000000002LL
-#define GPMODEP_DISCONNECT_PAGE    0x0000000000000004LL
-#define GPMODEP_FORMAT_DEVICE_PAGE 0x0000000000000008LL
-#define GPMODEP_RIGID_DISK_PAGE    0x0000000000000010LL
-#define GPMODEP_FLEXIBLE_DISK_PAGE 0x0000000000000020LL
-#define GPMODEP_CACHING_PAGE       0x0000000000000100LL
-#define GPMODEP_CDROM_PAGE_SONY    0x0000000000000200LL
+#define GPMODEP_R_W_ERROR_PAGE        0x0000000000000002LL
+#define GPMODEP_DISCONNECT_PAGE       0x0000000000000004LL
+#define GPMODEP_FORMAT_DEVICE_PAGE    0x0000000000000008LL
+#define GPMODEP_RIGID_DISK_PAGE       0x0000000000000010LL
+#define GPMODEP_FLEXIBLE_DISK_PAGE    0x0000000000000020LL
+#define GPMODEP_CACHING_PAGE          0x0000000000000100LL
+#define GPMODEP_CDROM_PAGE_SONY       0x0000000000000200LL
 #define GPMODEP_CDROM_AUDIO_PAGE_SONY 0x0000000000000400LL
-#define GPMODEP_CDROM_PAGE         0x0000000000002000LL
-#define GPMODEP_CDROM_AUDIO_PAGE   0x0000000000004000LL
-#define GPMODEP_CAPABILITIES_PAGE  0x0000040000000000LL
-#define GPMODEP_IOMEGA_PAGE        0x0000800000000000LL
-#define GPMODEP_UNK_VENDOR_PAGE    0x0001000000000000LL
-#define GPMODEP_ALL_PAGES          0x8000000000000000LL
+#define GPMODEP_CDROM_PAGE            0x0000000000002000LL
+#define GPMODEP_CDROM_AUDIO_PAGE      0x0000000000004000LL
+#define GPMODEP_CAPABILITIES_PAGE     0x0000040000000000LL
+#define GPMODEP_IOMEGA_PAGE           0x0000800000000000LL
+#define GPMODEP_UNK_VENDOR_PAGE       0x0001000000000000LL
+#define GPMODEP_ALL_PAGES             0x8000000000000000LL
 
 /* SCSI Status Codes */
 #define SCSI_STATUS_OK              0
@@ -349,26 +349,37 @@ typedef struct scsi_common_s {
 
     void *p;
 
-    uint8_t *temp_buffer,
-        atapi_cdb[16], /* This is atapi_cdb in ATAPI-supporting devices,
-                          and pad in SCSI-only devices. */
-        current_cdb[16],
-        sense[256];
+    uint8_t *temp_buffer;
+    uint8_t atapi_cdb[16]; /* This is atapi_cdb in ATAPI-supporting devices,
+                              and pad in SCSI-only devices. */
+    uint8_t current_cdb[16];
+    uint8_t sense[256];
 
-    uint8_t status, phase,
-        error, id,
-        features, cur_lun,
-        pad0, pad1;
+    uint8_t status;
+    uint8_t phase;
+    uint8_t error;
+    uint8_t id;
+    uint8_t features;
+    uint8_t cur_lun;
+    uint8_t pad0;
+    uint8_t pad1;
 
-    uint16_t request_length, max_transfer_len;
+    uint16_t request_length;
+    uint16_t max_transfer_len;
 
-    int requested_blocks, packet_status,
-        total_length, do_page_save,
-        unit_attention, request_pos,
-        old_len, media_status;
+    int requested_blocks;
+    int packet_status;
+    int total_length;
+    int do_page_save;
+    int unit_attention;
+    int request_pos;
+    int old_len;
+    int media_status;
 
-    uint32_t sector_pos, sector_len,
-        packet_len, pos;
+    uint32_t sector_pos;
+    uint32_t sector_len;
+    uint32_t packet_len;
+    uint32_t pos;
 
     double callback;
 } scsi_common_t;
@@ -376,7 +387,8 @@ typedef struct scsi_common_s {
 typedef struct {
     int32_t buffer_length;
 
-    uint8_t  status, phase;
+    uint8_t  status;
+    uint8_t  phase;
     uint16_t type;
 
     scsi_common_t *sc;
diff --git a/src/include/86box/scsi_disk.h b/src/include/86box/scsi_disk.h
index bff40a396..b8ce9892c 100644
--- a/src/include/86box/scsi_disk.h
+++ b/src/include/86box/scsi_disk.h
@@ -21,26 +21,37 @@ typedef struct {
 
     hard_disk_t *drv;
 
-    uint8_t *temp_buffer,
-        pad[16], /* This is atapi_cdb in ATAPI-supporting devices,
-                    and pad in SCSI-only devices. */
-        current_cdb[16],
-        sense[256];
+    uint8_t *temp_buffer;
+    uint8_t pad[16]; /* This is atapi_cdb in ATAPI-supporting devices,
+                        and pad in SCSI-only devices. */
+    uint8_t current_cdb[16];
+    uint8_t sense[256];
 
-    uint8_t status, phase,
-        error, id,
-        pad0, cur_lun,
-        pad1, pad2;
+    uint8_t status;
+    uint8_t phase;
+    uint8_t error;
+    uint8_t id;
+    uint8_t pad0;
+    uint8_t cur_lun;
+    uint8_t pad1;
+    uint8_t pad2;
 
-    uint16_t request_length, pad4;
+    uint16_t request_length;
+    uint16_t pad4;
 
-    int requested_blocks, packet_status,
-        total_length, do_page_save,
-        unit_attention, pad5,
-        pad6, pad7;
+    int requested_blocks;
+    int packet_status;
+    int total_length;
+    int do_page_save;
+    int unit_attention;
+    int pad5;
+    int pad6;
+    int pad7;
 
-    uint32_t sector_pos, sector_len,
-        packet_len, pos;
+    uint32_t sector_pos;
+    uint32_t sector_len;
+    uint32_t packet_len;
+    uint32_t pos;
 
     double callback;
 } scsi_disk_t;
diff --git a/src/include/86box/scsi_x54x.h b/src/include/86box/scsi_x54x.h
index a20f1e788..77ec136be 100644
--- a/src/include/86box/scsi_x54x.h
+++ b/src/include/86box/scsi_x54x.h
@@ -196,28 +196,28 @@
 #define MAX_SG_DESCRIPTORS 32 /* Always make the array 32 elements long, if less are used, that's not an issue. */
 
 #pragma pack(push, 1)
-typedef struct {
+typedef struct addr24_s {
     uint8_t hi;
     uint8_t mid;
     uint8_t lo;
-} addr24;
+} addr24_t;
 
 /* Structure for the INQUIRE_SETUP_INFORMATION reply. */
 typedef struct {
-    uint8_t uOffset     : 4,
-        uTransferPeriod : 3,
-        fSynchronous    : 1;
+    uint8_t uOffset         : 4;
+    uint8_t uTransferPeriod : 3;
+    uint8_t fSynchronous    : 1;
 } ReplyInquireSetupInformationSynchronousValue;
 
 typedef struct {
-    uint8_t fSynchronousInitiationEnabled : 1,
-        fParityCheckingEnabled            : 1,
-        uReserved1                        : 6;
+    uint8_t fSynchronousInitiationEnabled     : 1;
+    uint8_t fParityCheckingEnabled            : 1;
+    uint8_t uReserved1                        : 6;
     uint8_t                                      uBusTransferRate;
     uint8_t                                      uPreemptTimeOnBus;
     uint8_t                                      uTimeOffBus;
     uint8_t                                      cMailbox;
-    addr24                                       MailboxAddress;
+    addr24_t                                     MailboxAddress;
     ReplyInquireSetupInformationSynchronousValue SynchronousValuesId0To7[8];
     uint8_t                                      uDisconnectPermittedId0To7;
     uint8_t                                      VendorSpecificData[28];
@@ -225,12 +225,12 @@ typedef struct {
 
 typedef struct {
     uint8_t Count;
-    addr24  Address;
+    addr24_t Address;
 } MailboxInit_t;
 
 typedef struct {
-    uint8_t CmdStatus;
-    addr24  CCBPointer;
+    uint8_t  CmdStatus;
+    addr24_t CCBPointer;
 } Mailbox_t;
 
 typedef struct {
@@ -278,20 +278,20 @@ typedef struct {
 } CCB32;
 
 typedef struct {
-    uint8_t Opcode;
-    uint8_t Lun     : 3,
-        ControlByte : 2,
-        Id          : 3;
-    uint8_t CdbLength;
-    uint8_t RequestSenseLength;
-    addr24  DataLength;
-    addr24  DataPointer;
-    addr24  LinkPointer;
-    uint8_t LinkId;
-    uint8_t HostStatus;
-    uint8_t TargetStatus;
-    uint8_t Reserved[2];
-    uint8_t Cdb[12];
+    uint8_t  Opcode;
+    uint8_t  Lun         : 3;
+    uint8_t  ControlByte : 2;
+    uint8_t  Id          : 3;
+    uint8_t  CdbLength;
+    uint8_t  RequestSenseLength;
+    addr24_t DataLength;
+    addr24_t DataPointer;
+    addr24_t LinkPointer;
+    uint8_t  LinkId;
+    uint8_t  HostStatus;
+    uint8_t  TargetStatus;
+    uint8_t  Reserved[2];
+    uint8_t  Cdb[12];
 } CCB;
 
 typedef struct {
@@ -347,7 +347,7 @@ typedef struct
         } lba;
     } u;
     uint8_t secount;
-    addr24  dma_address;
+    addr24_t  dma_address;
 } BIOSCMD;
 
 typedef struct {
@@ -356,8 +356,8 @@ typedef struct {
 } SGE32;
 
 typedef struct {
-    addr24 Segment;
-    addr24 SegmentPointer;
+    addr24_t Segment;
+    addr24_t SegmentPointer;
 } SGE;
 #pragma pack(pop)
 
diff --git a/src/include/86box/serial.h b/src/include/86box/serial.h
index 8ed3606a7..5402cd77b 100644
--- a/src/include/86box/serial.h
+++ b/src/include/86box/serial.h
@@ -48,23 +48,52 @@ struct serial_device_s;
 struct serial_s;
 
 typedef struct serial_s {
-    uint8_t lsr, thr, mctrl, rcr,
-        iir, ier, lcr, msr,
-        dat, int_status, scratch, fcr,
-        irq, type, inst, transmit_enabled,
-        fifo_enabled, rcvr_fifo_len, bits, data_bits,
-        baud_cycles, rcvr_fifo_full, txsr, out,
-        msr_set, pad, pad0, pad1;
+    uint8_t lsr;
+    uint8_t thr;
+    uint8_t mctrl;
+    uint8_t rcr;
+    uint8_t iir;
+    uint8_t ier;
+    uint8_t lcr;
+    uint8_t msr;
+    uint8_t dat;
+    uint8_t int_status;
+    uint8_t scratch;
+    uint8_t fcr;
+    uint8_t irq;
+    uint8_t type;
+    uint8_t inst;
+    uint8_t transmit_enabled;
+    uint8_t fifo_enabled;
+    uint8_t rcvr_fifo_len;
+    uint8_t bits;
+    uint8_t data_bits;
+    uint8_t baud_cycles;
+    uint8_t rcvr_fifo_full;
+    uint8_t txsr;
+    uint8_t out;
+    uint8_t msr_set;
+    uint8_t pad;
+    uint8_t pad0;
+    uint8_t pad1;
 
-    uint16_t dlab, base_address, out_new, pad2;
+    uint16_t dlab;
+    uint16_t base_address;
+    uint16_t out_new;
+    uint16_t pad2;
 
-    uint8_t rcvr_fifo_pos, xmit_fifo_pos,
-        rcvr_fifo_end, xmit_fifo_end,
-        rcvr_fifo[SERIAL_FIFO_SIZE], xmit_fifo[SERIAL_FIFO_SIZE];
+    uint8_t rcvr_fifo_pos;
+    uint8_t xmit_fifo_pos;
+    uint8_t rcvr_fifo_end;
+    uint8_t xmit_fifo_end;
+    uint8_t rcvr_fifo[SERIAL_FIFO_SIZE];
+    uint8_t xmit_fifo[SERIAL_FIFO_SIZE];
 
-    pc_timer_t transmit_timer, timeout_timer,
-               receive_timer;
-    double     clock_src, transmit_period;
+    pc_timer_t transmit_timer;
+    pc_timer_t timeout_timer;
+    pc_timer_t receive_timer;
+    double     clock_src;
+    double     transmit_period;
 
     struct serial_device_s *sd;
 } serial_t;
diff --git a/src/include/86box/serial_passthrough.h b/src/include/86box/serial_passthrough.h
index 9612b9500..7ca6479d6 100644
--- a/src/include/86box/serial_passthrough.h
+++ b/src/include/86box/serial_passthrough.h
@@ -43,7 +43,8 @@ typedef struct serial_passthrough_s {
     pc_timer_t                   serial_to_host_timer;
     serial_t                    *serial;
     double                       baudrate;
-    uint8_t                      bits, data_bits;
+    uint8_t                      bits;
+    uint8_t                      data_bits;
     uint8_t                      port;
     uint8_t                      data;
     char                         slave_pt[32]; /* used for pseudo term name of slave side */
diff --git a/src/include/86box/smbus.h b/src/include/86box/smbus.h
index 9bb429b43..0f7c3fa92 100644
--- a/src/include/86box/smbus.h
+++ b/src/include/86box/smbus.h
@@ -26,27 +26,39 @@
 
 enum {
     SMBUS_PIIX4 = 0,
-    SMBUS_VIA
+    SMBUS_VIA   = 1
 };
 
 typedef struct {
-    uint32_t local;
-    uint16_t io_base;
-    int      clock;
-    double   bit_period;
-    uint8_t  stat, next_stat, ctl, cmd, addr,
-        data0, data1,
-        index, data[SMBUS_PIIX4_BLOCK_DATA_SIZE];
+    uint32_t   local;
+    uint16_t   io_base;
+    int        clock;
+    double     bit_period;
+    uint8_t    stat;
+    uint8_t    next_stat;
+    uint8_t    ctl;
+    uint8_t    cmd;
+    uint8_t    addr;
+    uint8_t    data0;
+    uint8_t    data1;
+    uint8_t    index;
+    uint8_t    data[SMBUS_PIIX4_BLOCK_DATA_SIZE];
     pc_timer_t response_timer;
     void      *i2c;
 } smbus_piix4_t;
 
 typedef struct {
-    uint32_t local;
-    uint16_t io_base;
-    uint8_t  stat, next_stat, ctl, cmd, addr,
-        data0, data1,
-        index, data[SMBUS_ALI7101_BLOCK_DATA_SIZE];
+    uint32_t   local;
+    uint16_t   io_base;
+    uint8_t    stat;
+    uint8_t    next_stat;
+    uint8_t    ctl;
+    uint8_t    cmd;
+    uint8_t    addr;
+    uint8_t    data0;
+    uint8_t    data1;
+    uint8_t    index;
+    uint8_t    data[SMBUS_ALI7101_BLOCK_DATA_SIZE];
     pc_timer_t response_timer;
     void      *i2c;
 } smbus_ali7101_t;
diff --git a/src/include/86box/smram.h b/src/include/86box/smram.h
index 84d1cbe8d..707c967f5 100644
--- a/src/include/86box/smram.h
+++ b/src/include/86box/smram.h
@@ -19,13 +19,16 @@
 #define EMU_SMRAM_H
 
 typedef struct _smram_ {
-    struct _smram_ *prev, *next;
+    struct _smram_ *prev;
+    struct _smram_ *next;
 
     mem_mapping_t mapping;
 
-    uint32_t host_base, ram_base,
-        size,
-        old_host_base, old_size;
+    uint32_t host_base;
+    uint32_t ram_base;
+    uint32_t size;
+    uint32_t old_host_base;
+    uint32_t old_size;
 } smram_t;
 
 /* Make a backup copy of host_base and size of all the SMRAM structs, needed so that if
diff --git a/src/include/86box/snd_ac97.h b/src/include/86box/snd_ac97.h
index d6d2eacae..fcd6f251f 100644
--- a/src/include/86box/snd_ac97.h
+++ b/src/include/86box/snd_ac97.h
@@ -93,14 +93,14 @@
 
 /* New codecs should be added to the end of this enum to avoid breaking configs. */
 enum {
-    AC97_CODEC_AD1881 = 0,
-    AC97_CODEC_ALC100,
-    AC97_CODEC_CS4297,
-    AC97_CODEC_CS4297A,
-    AC97_CODEC_WM9701A,
-    AC97_CODEC_STAC9708,
-    AC97_CODEC_STAC9721,
-    AC97_CODEC_AK4540
+    AC97_CODEC_AD1881   = 0,
+    AC97_CODEC_ALC100   = 1,
+    AC97_CODEC_CS4297   = 2,
+    AC97_CODEC_CS4297A  = 3,
+    AC97_CODEC_WM9701A  = 4,
+    AC97_CODEC_STAC9708 = 5,
+    AC97_CODEC_STAC9721 = 6,
+    AC97_CODEC_AK4540   = 7
 };
 
 typedef struct {
diff --git a/src/include/86box/snd_ad1848.h b/src/include/86box/snd_ad1848.h
index 76fc775db..049999da0 100644
--- a/src/include/86box/snd_ad1848.h
+++ b/src/include/86box/snd_ad1848.h
@@ -24,26 +24,42 @@
 
 enum {
     AD1848_TYPE_DEFAULT = 0,
-    AD1848_TYPE_CS4248,
-    AD1848_TYPE_CS4231,
-    AD1848_TYPE_CS4235,
-    AD1848_TYPE_CS4236
+    AD1848_TYPE_CS4248  = 1,
+    AD1848_TYPE_CS4231  = 2,
+    AD1848_TYPE_CS4235  = 3,
+    AD1848_TYPE_CS4236  = 4
 };
 
 typedef struct {
-    uint8_t type, index, xindex, regs[32], xregs[32], status; /* 16 original registers + 16 CS4231A extensions + 32 CS4236 extensions */
+    uint8_t type;
+    uint8_t index;
+    uint8_t xindex;
+    uint8_t regs[32];
+    uint8_t xregs[32];
+    uint8_t status; /* 16 original registers + 16 CS4231A extensions + 32 CS4236 extensions */
 
     int     count;
-    uint8_t trd, mce, wten : 1;
+    uint8_t trd;
+    uint8_t mce;
+    uint8_t wten : 1;
 
-    int16_t out_l, out_r;
-    double  cd_vol_l, cd_vol_r;
-    int     fm_vol_l, fm_vol_r;
-    uint8_t fmt_mask, wave_vol_mask;
+    int16_t out_l;
+    int16_t out_r;
+    double  cd_vol_l;
+    double  cd_vol_r;
+    int     fm_vol_l;
+    int     fm_vol_r;
+    uint8_t fmt_mask;
+    uint8_t wave_vol_mask;
 
-    uint8_t enable : 1, irq : 4, dma : 3, adpcm_ref;
+    uint8_t enable : 1;
+    uint8_t irq    : 4;
+    uint8_t dma    : 3;
+    uint8_t adpcm_ref;
     int8_t  adpcm_step;
-    int     freq, adpcm_data, adpcm_pos;
+    int     freq;
+    int     adpcm_data;
+    int     adpcm_pos;
 
     pc_timer_t timer_count;
     uint64_t   timer_latch;
diff --git a/src/include/86box/snd_emu8k.h b/src/include/86box/snd_emu8k.h
index a163bdeaf..dd01eaac0 100644
--- a/src/include/86box/snd_emu8k.h
+++ b/src/include/86box/snd_emu8k.h
@@ -85,10 +85,14 @@ typedef struct emu8k_mem_pointers_t {
  */
 typedef struct emu8k_envelope_t {
     int     state;
-    int32_t delay_samples, hold_samples, attack_samples;
-    int32_t value_amp_hz, value_db_oct;
+    int32_t delay_samples;
+    int32_t hold_samples;
+    int32_t attack_samples;
+    int32_t value_amp_hz;
+    int32_t value_db_oct;
     int32_t sustain_value_db_oct;
-    int32_t attack_amount_amp_hz, ramp_amount_db_oct;
+    int32_t attack_amount_amp_hz;
+    int32_t ramp_amount_db_oct;
 } emu8k_envelope_t;
 
 typedef struct emu8k_chorus_eng_t {
@@ -320,10 +324,14 @@ typedef struct emu8k_voice_t {
     emu8k_envelope_t vol_envelope;
     emu8k_envelope_t mod_envelope;
 
-    int64_t              lfo1_speed, lfo2_speed;
-    emu8k_mem_internal_t lfo1_count, lfo2_count;
-    int32_t              lfo1_delay_samples, lfo2_delay_samples;
-    int                  vol_l, vol_r;
+    int64_t              lfo1_speed;
+    int64_t              lfo2_speed;
+    emu8k_mem_internal_t lfo1_count;
+    emu8k_mem_internal_t lfo2_count;
+    int32_t              lfo1_delay_samples;
+    int32_t              lfo2_delay_samples;
+    int                  vol_l;
+    int                  vol_r;
 
     int16_t fixed_modenv_filter_height;
     int16_t fixed_modenv_pitch_height;
@@ -342,28 +350,44 @@ typedef struct emu8k_voice_t {
 typedef struct emu8k_t {
     emu8k_voice_t voice[32];
 
-    uint16_t hwcf1, hwcf2, hwcf3;
-    uint32_t hwcf4, hwcf5, hwcf6, hwcf7;
+    uint16_t hwcf1;
+    uint16_t hwcf2;
+    uint16_t hwcf3;
+    uint32_t hwcf4;
+    uint32_t hwcf5;
+    uint32_t hwcf6;
+    uint32_t hwcf7;
 
-    uint16_t init1[32], init2[32], init3[32], init4[32];
+    uint16_t init1[32];
+    uint16_t init2[32];
+    uint16_t init3[32];
+    uint16_t init4[32];
 
-    uint32_t smalr, smarr, smalw, smarw;
-    uint16_t smld_buffer, smrd_buffer;
+    uint32_t smalr;
+    uint32_t smarr;
+    uint32_t smalw;
+    uint32_t smarw;
+    uint16_t smld_buffer;
+    uint16_t smrd_buffer;
 
     uint16_t wc;
 
     uint16_t id;
 
     /* The empty block is used to act as an unallocated memory returning zero. */
-    int16_t *ram, *rom, *empty;
+    int16_t *ram;
+    int16_t *rom;
+    int16_t *empty;
 
     /* RAM pointers are a way to avoid checking ram boundaries on read */
     int16_t *ram_pointers[0x100];
     uint32_t ram_end_addr;
 
-    int cur_reg, cur_voice;
+    int cur_reg;
+    int cur_voice;
 
-    int16_t out_l, out_r;
+    int16_t out_l;
+    int16_t out_r;
 
     emu8k_chorus_eng_t chorus_engine;
     int32_t            chorus_in_buffer[SOUNDBUFLEN];
diff --git a/src/include/86box/snd_mpu401.h b/src/include/86box/snd_mpu401.h
index 00fdd54f6..ed8b89de7 100644
--- a/src/include/86box/snd_mpu401.h
+++ b/src/include/86box/snd_mpu401.h
@@ -71,74 +71,112 @@ typedef enum RecState {
 
 typedef struct mpu_t {
     uint16_t addr;
-    int      uart_mode, intelligent,
-        irq, midi_thru,
-        queue_pos, queue_used;
-    uint8_t rx_data, is_mca,
-        status,
-        queue[MPU401_QUEUE], pos_regs[8];
+    int      uart_mode;
+    int      intelligent;
+    int      irq;
+    int      midi_thru;
+    int      queue_pos;
+    int      queue_used;
+    uint8_t  rx_data;
+    uint8_t  is_mca;
+    uint8_t  status;
+    uint8_t  queue[MPU401_QUEUE];
+    uint8_t  pos_regs[8];
     MpuMode  mode;
     uint8_t  rec_queue[MPU401_INPUT_QUEUE];
-    int      rec_queue_pos, rec_queue_used;
+    int      rec_queue_pos;
+    int      rec_queue_used;
     uint32_t ch_toref[16];
     struct track {
-        int     counter;
-        uint8_t value[3], sys_val,
-            vlength, length;
+        int         counter;
+        uint8_t     value[3];
+        uint8_t     sys_val;
+        uint8_t     vlength;
+        uint8_t     length;
         MpuDataType type;
     } playbuf[8], condbuf;
     struct {
-        int conductor, cond_req,
-            cond_set, block_ack,
-            playing, reset,
-            wsd, wsm, wsd_start,
-            run_irq, irq_pending,
-            track_req,
-            send_now, eoi_scheduled,
-            data_onoff, clock_to_host,
-            sync_in, sysex_in_finished,
-            rec_copy;
+        int      conductor;
+        int      cond_req;
+        int      cond_set;
+        int      block_ack;
+        int      playing;
+        int      reset;
+        int      wsd;
+        int      wsm;
+        int      wsd_start;
+        int      run_irq;
+        int      irq_pending;
+        int      track_req;
+        int      send_now;
+        int      eoi_scheduled;
+        int      data_onoff;
+        int      clock_to_host;
+        int      sync_in;
+        int      sysex_in_finished;
+        int      rec_copy;
         RecState rec;
-        uint8_t  tmask, cmask,
-            amask,
-            last_rtcmd;
-        uint16_t midi_mask, req_mask;
-        uint32_t command_byte, cmd_pending,
-            track, old_track;
+        uint8_t  tmask;
+        uint8_t  cmask;
+        uint8_t  amask;
+        uint8_t  last_rtcmd;
+        uint16_t midi_mask;
+        uint16_t req_mask;
+        uint32_t command_byte;
+        uint32_t cmd_pending;
+        uint32_t track;
+        uint32_t old_track;
     } state;
     struct {
-        uint8_t timebase, old_timebase,
-            tempo, old_tempo,
-            tempo_rel, old_tempo_rel,
-            tempo_grad, cth_rate[4],
-            cth_mode, midimetro,
-            metromeas;
-        uint32_t cth_counter, cth_old,
-            rec_counter;
-        int32_t measure_counter, meas_old,
-            freq;
-        int   ticks_in, active;
-        float freq_mod;
+        uint8_t  timebase;
+        uint8_t  old_timebase;
+        uint8_t  tempo;
+        uint8_t  old_tempo;
+        uint8_t  tempo_rel;
+        uint8_t  old_tempo_rel;
+        uint8_t  tempo_grad;
+        uint8_t  cth_rate[4];
+        uint8_t  cth_mode;
+        uint8_t  midimetro;
+        uint8_t  metromeas;
+        uint32_t cth_counter;
+        uint32_t cth_old;
+        uint32_t rec_counter;
+        int32_t  measure_counter;
+        int32_t  meas_old;
+        int32_t  freq;
+        int      ticks_in;
+        int      active;
+        float    freq_mod;
     } clock;
     struct {
-        int all_thru, midi_thru,
-            sysex_thru, commonmsgs_thru,
-            modemsgs_in, commonmsgs_in,
-            bender_in, sysex_in,
-            allnotesoff_out, rt_affection,
-            rt_out, rt_in,
-            timing_in_stop, data_in_stop,
-            rec_measure_end;
+        int      all_thru;
+        int      midi_thru;
+        int      sysex_thru;
+        int      commonmsgs_thru;
+        int      modemsgs_in;
+        int      commonmsgs_in;
+        int      bender_in;
+        int      sysex_in;
+        int      allnotesoff_out;
+        int      rt_affection;
+        int      rt_out;
+        int      rt_in;
+        int      timing_in_stop;
+        int      data_in_stop;
+        int      rec_measure_end;
         uint8_t  prchg_buf[16];
         uint16_t prchg_mask;
     } filter;
     struct {
         int      on;
-        uint8_t  chan, trmask;
+        uint8_t  chan;
+        uint8_t  trmask;
         uint32_t key[4];
     } chanref[5], inputref[16];
-    pc_timer_t mpu401_event_callback, mpu401_eoi_callback,
-        mpu401_reset_callback;
+    pc_timer_t mpu401_event_callback;
+    pc_timer_t mpu401_eoi_callback;
+    pc_timer_t mpu401_reset_callback;
     void (*ext_irq_update)(void *priv, int set);
     int (*ext_irq_pending)(void *priv);
     void *priv;
diff --git a/src/include/86box/snd_opl.h b/src/include/86box/snd_opl.h
index b4f26543d..ff4e1f4a8 100644
--- a/src/include/86box/snd_opl.h
+++ b/src/include/86box/snd_opl.h
@@ -18,17 +18,17 @@
 #define SOUND_OPL_H
 
 enum fm_type {
-    FM_YM3812 = 0,
-    FM_YMF262,
-    FM_YMF289B,
-    FM_YMF278B,
-    FM_MAX
+    FM_YM3812  = 0, /* OPL2 */
+    FM_YMF262  = 1, /* OPL3 */
+    FM_YMF289B = 2, /* OPL3-L */
+    FM_YMF278B = 3, /* OPL 4 */
+    FM_MAX     = 4
 };
 
 enum fm_driver {
     FM_DRV_NUKED = 0,
-    FM_DRV_YMFM,
-    FM_DRV_MAX
+    FM_DRV_YMFM  = 1,
+    FM_DRV_MAX   = 2
 };
 
 typedef struct {
diff --git a/src/include/86box/snd_sb.h b/src/include/86box/snd_sb.h
index 88f2c74f1..4c6b2bba7 100644
--- a/src/include/86box/snd_sb.h
+++ b/src/include/86box/snd_sb.h
@@ -48,16 +48,16 @@ typedef struct sb_ct1335_mixer_t {
 
 /* SB PRO */
 typedef struct sb_ct1345_mixer_t {
-    double master_l,
-        master_r;
-    double voice_l,
-        voice_r;
-    double fm_l,
-        fm_r;
-    double cd_l,
-        cd_r;
-    double line_l,
-        line_r;
+    double master_l;
+    double master_r;
+    double voice_l;
+    double voice_r;
+    double fm_l;
+    double fm_r;
+    double cd_l;
+    double cd_r;
+    double line_l;
+    double line_r;
     double mic;
     /*see sb_ct1745_mixer for values for input selector*/
     int32_t input_selector;
@@ -76,23 +76,23 @@ typedef struct sb_ct1345_mixer_t {
 
 /* SB16 and AWE32 */
 typedef struct sb_ct1745_mixer_t {
-    double master_l,
-        master_r;
-    double voice_l,
-        voice_r;
-    double fm_l,
-        fm_r;
-    double cd_l,
-        cd_r;
-    double line_l,
-        line_r;
+    double master_l;
+    double master_r;
+    double voice_l;
+    double voice_r;
+    double fm_l;
+    double fm_r;
+    double cd_l;
+    double cd_r;
+    double line_l;
+    double line_r;
     double mic;
     double speaker;
 
-    int bass_l,
-        bass_r;
-    int treble_l,
-        treble_r;
+    int bass_l;
+    int bass_r;
+    int treble_l;
+    int treble_r;
 
     int output_selector;
 #define OUTPUT_MIC    1
@@ -125,12 +125,12 @@ typedef struct sb_ct1745_mixer_t {
 } sb_ct1745_mixer_t;
 
 typedef struct sb_t {
-    uint8_t cms_enabled,
-        opl_enabled,
-        mixer_enabled;
+    uint8_t  cms_enabled;
+    uint8_t  opl_enabled;
+    uint8_t  mixer_enabled;
     cms_t    cms;
-    fm_drv_t opl,
-        opl2;
+    fm_drv_t opl;
+    fm_drv_t opl2;
     sb_dsp_t dsp;
     union {
         sb_ct1335_mixer_t mixer_sb2;
@@ -143,8 +143,8 @@ typedef struct sb_t {
 
     int pos;
 
-    uint8_t pos_regs[8],
-        pnp_rom[512];
+    uint8_t pos_regs[8];
+    uint8_t pnp_rom[512];
 
     uint16_t opl_pnp_addr;
 
diff --git a/src/include/86box/snd_sb_dsp.h b/src/include/86box/snd_sb_dsp.h
index 1e9a91828..86f1ee529 100644
--- a/src/include/86box/snd_sb_dsp.h
+++ b/src/include/86box/snd_sb_dsp.h
@@ -15,19 +15,34 @@ typedef struct sb_dsp_t {
     int   sb_subtype; /* which clone */
     void *parent;     /* "sb_t *" if default subtype, "azt2316a_t *" if aztech. */
 
-    int sb_8_length, sb_8_origlength, sb_8_format, sb_8_autoinit, sb_8_pause, sb_8_enable, sb_8_autolen, sb_8_output;
+    int sb_8_length;
+    int sb_8_origlength;
+    int sb_8_format;
+    int sb_8_autoinit;
+    int sb_8_pause;
+    int sb_8_enable;
+    int sb_8_autolen;
+    int sb_8_output;
     int sb_8_dmanum;
-    int sb_16_length, sb_16_origlength, sb_16_format, sb_16_autoinit, sb_16_pause, sb_16_enable, sb_16_autolen, sb_16_output;
+    int sb_16_length;
+    int sb_16_origlength;
+    int sb_16_format;
+    int sb_16_autoinit;
+    int sb_16_pause;
+    int sb_16_enable;
+    int sb_16_autolen;
+    int sb_16_output;
     int sb_16_dmanum;
     int sb_pausetime;
-    int (*dma_readb)(void *priv),
-        (*dma_readw)(void *priv),
-        (*dma_writeb)(void *priv, uint8_t val),
-        (*dma_writew)(void *priv, uint16_t val);
+    int (*dma_readb)(void *priv);
+    int (*dma_readw)(void *priv);
+    int (*dma_writeb)(void *priv, uint8_t val);
+    int (*dma_writew)(void *priv, uint16_t val);
     void *dma_priv;
 
     uint8_t sb_read_data[256];
-    int     sb_read_wp, sb_read_rp;
+    int     sb_read_wp;
+    int     sb_read_rp;
     int     sb_speaker;
     int     muted;
 
@@ -41,8 +56,8 @@ typedef struct sb_dsp_t {
     int midi_in_timestamp;
 
     int sb_irqnum;
-    void (*irq_update)(void *priv, int set),
-        *irq_priv;
+    void (*irq_update)(void *priv, int set);
+    void  *irq_priv;
 
     uint8_t sbe2;
     int     sbe2count;
@@ -53,23 +68,30 @@ typedef struct sb_dsp_t {
 
     int16_t sbdat;
     int     sbdat2;
-    int16_t sbdatl, sbdatr;
+    int16_t sbdatl;
+    int16_t sbdatr;
 
     uint8_t sbref;
     int8_t  sbstep;
 
     int sbdacpos;
 
-    int sbleftright, sbleftright_default;
+    int sbleftright;
+    int sbleftright_default;
 
     int     sbreset;
     uint8_t sbreaddat;
     uint8_t sb_command;
     uint8_t sb_test;
-    int     sb_timei, sb_timeo;
+    int     sb_timei;
+    int     sb_timeo;
 
-    int sb_irq8, sb_irq16, sb_irq401;
-    int sb_irqm8, sb_irqm16, sb_irqm401;
+    int sb_irq8;
+    int sb_irq16;
+    int sb_irq401;
+    int sb_irqm8;
+    int sb_irqm16;
+    int sb_irqm401;
 
     uint8_t sb_asp_regs[256];
     uint8_t sb_asp_mode;
@@ -79,11 +101,14 @@ typedef struct sb_dsp_t {
 
     uint8_t sb_8051_ram[256];
 
-    int sbenable, sb_enable_i;
+    int sbenable;
+    int sb_enable_i;
 
-    pc_timer_t output_timer, input_timer;
+    pc_timer_t output_timer;
+    pc_timer_t input_timer;
 
-    double sblatcho, sblatchi;
+    double sblatcho;
+    double sblatchi;
 
     uint16_t sb_addr;
 
diff --git a/src/include/86box/snd_sn76489.h b/src/include/86box/snd_sn76489.h
index c8a3a567c..6e7399d54 100644
--- a/src/include/86box/snd_sn76489.h
+++ b/src/include/86box/snd_sn76489.h
@@ -14,8 +14,10 @@ extern int sn76489_mute;
 
 typedef struct sn76489_t {
     int      stat[4];
-    int      latch[4], count[4];
-    int      freqlo[4], freqhi[4];
+    int      latch[4];
+    int      count[4];
+    int      freqlo[4];
+    int      freqhi[4];
     int      vol[4];
     uint32_t shift;
     uint8_t  noise;
diff --git a/src/include/86box/snd_ym7128.h b/src/include/86box/snd_ym7128.h
index 4d5400f34..a0796b1fa 100644
--- a/src/include/86box/snd_ym7128.h
+++ b/src/include/86box/snd_ym7128.h
@@ -2,19 +2,26 @@
 #define SOUND_YM7128_H
 
 typedef struct ym7128_t {
-    int     a0, sci;
+    int     a0;
+    int     sci;
     uint8_t dat;
 
     int     reg_sel;
     uint8_t regs[32];
 
-    int gl[8], gr[8];
-    int vm, vc, vl, vr;
-    int c0, c1;
+    int gl[8];
+    int gr[8];
+    int vm;
+    int vc;
+    int vl;
+    int vr;
+    int c0;
+    int c1;
     int t[9];
 
     int16_t filter_dat;
-    int16_t prev_l, prev_r;
+    int16_t prev_l;
+    int16_t prev_r;
 
     int16_t delay_buffer[2400];
     int     delay_pos;
diff --git a/src/include/86box/spd.h b/src/include/86box/spd.h
index ae4342675..98eb4e178 100644
--- a/src/include/86box/spd.h
+++ b/src/include/86box/spd.h
@@ -46,49 +46,92 @@
 #define SPD_SDR_ATTR_VCC_LOW_5  0x10
 #define SPD_SDR_ATTR_VCC_HI_5   0x20
 
-typedef struct {
-    uint8_t bytes_used, spd_size, mem_type,
-        row_bits, col_bits, banks,
-        data_width_lsb, data_width_msb,
-        signal_level, trac, tcac,
-        config, refresh_rate,
-        dram_width, ecc_width,
-        reserved[47],
-        spd_rev, checksum,
-        mfg_jedec[8], mfg_loc;
+typedef struct spd_edo_t {
+    uint8_t bytes_used;
+    uint8_t spd_size;
+    uint8_t mem_type;
+    uint8_t row_bits;
+    uint8_t col_bits;
+    uint8_t banks;
+    uint8_t data_width_lsb;
+    uint8_t data_width_msb;
+    uint8_t signal_level;
+    uint8_t trac;
+    uint8_t tcac;
+    uint8_t config;
+    uint8_t refresh_rate;
+    uint8_t dram_width;
+    uint8_t ecc_width;
+    uint8_t reserved[47];
+    uint8_t spd_rev;
+    uint8_t checksum;
+    uint8_t mfg_jedec[8];
+    uint8_t mfg_loc;
     char    part_no[18];
-    uint8_t rev_code[2],
-        mfg_year, mfg_week, serial[4], mfg_specific[27],
-        vendor_specific[2],
-        other_data[127],
-        checksum2;
+    uint8_t rev_code[2];
+    uint8_t mfg_year;
+    uint8_t mfg_week;
+    uint8_t serial[4];
+    uint8_t mfg_specific[27];
+    uint8_t vendor_specific[2];
+    uint8_t other_data[127];
+    uint8_t checksum2;
 } spd_edo_t;
 
-typedef struct {
-    uint8_t bytes_used, spd_size, mem_type,
-        row_bits, col_bits, rows,
-        data_width_lsb, data_width_msb,
-        signal_level, tclk, tac,
-        config, refresh_rate,
-        sdram_width, ecc_width,
-        tccd, burst, banks, cas, cslat, we,
-        mod_attr, dev_attr,
-        tclk2, tac2, tclk3, tac3,
-        trp, trrd, trcd, tras,
-        bank_density,
-        ca_setup, ca_hold, data_setup, data_hold,
-        reserved[26],
-        spd_rev, checksum,
-        mfg_jedec[8], mfg_loc;
+typedef struct spd_sdram_t {
+    uint8_t bytes_used;
+    uint8_t spd_size;
+    uint8_t mem_type;
+    uint8_t row_bits;
+    uint8_t col_bits;
+    uint8_t rows;
+    uint8_t data_width_lsb;
+    uint8_t data_width_msb;
+    uint8_t signal_level;
+    uint8_t tclk;
+    uint8_t tac;
+    uint8_t config;
+    uint8_t refresh_rate;
+    uint8_t sdram_width;
+    uint8_t ecc_width;
+    uint8_t tccd;
+    uint8_t burst;
+    uint8_t banks;
+    uint8_t cas;
+    uint8_t cslat;
+    uint8_t we;
+    uint8_t mod_attr;
+    uint8_t dev_attr;
+    uint8_t tclk2;
+    uint8_t tac2;
+    uint8_t tclk3;
+    uint8_t tac3;
+    uint8_t trp;
+    uint8_t trrd;
+    uint8_t trcd;
+    uint8_t tras;
+    uint8_t bank_density;
+    uint8_t ca_setup;
+    uint8_t ca_hold;
+    uint8_t data_setup;
+    uint8_t data_hold;
+    uint8_t reserved[26];
+    uint8_t spd_rev, checksum;
+    uint8_t mfg_jedec[8];
+    uint8_t mfg_loc;
     char    part_no[18];
-    uint8_t rev_code[2],
-        mfg_year, mfg_week, serial[4], mfg_specific[27],
-        freq, features,
-        other_data[127],
-        checksum2;
+    uint8_t rev_code[2];
+    uint8_t mfg_year;
+    uint8_t mfg_week;
+    uint8_t serial[4];
+    uint8_t mfg_specific[27];
+    uint8_t freq;
+    uint8_t features;
+    uint8_t other_data[127];
+    uint8_t checksum2;
 } spd_sdram_t;
 
-typedef struct {
+typedef struct spd_t {
     uint8_t  slot;
     uint16_t size;
     uint16_t row1;
diff --git a/src/include/86box/timer.h b/src/include/86box/timer.h
index c9b89788a..774729e17 100644
--- a/src/include/86box/timer.h
+++ b/src/include/86box/timer.h
@@ -11,14 +11,14 @@
 #define TIMER_ENABLED 1
 
 #pragma pack(push, 1)
-typedef struct
+typedef struct ts_struct_t
 {
     uint32_t frac;
     uint32_t integer;
 } ts_struct_t;
 #pragma pack(pop)
 
-typedef union {
+typedef union ts_t {
     uint64_t    ts64;
     ts_struct_t ts32;
 } ts_t;
@@ -42,14 +42,16 @@ typedef struct pc_timer_t {
 #else
     ts_t ts;
 #endif
-    int    flags, pad; /* The flags are defined above. */
-    double period;     /* This is used for large period timers to count
-                          the microseconds and split the period. */
+    int    flags;  /* The flags are defined above. */
+    int    pad;
+    double period; /* This is used for large period timers to count
+                      the microseconds and split the period. */
 
     void (*callback)(void *p);
     void *p;
 
-    struct pc_timer_t *prev, *next;
+    struct pc_timer_t *prev;
+    struct pc_timer_t *next;
 } pc_timer_t;
 
 #ifdef __cplusplus
diff --git a/src/include/86box/usb.h b/src/include/86box/usb.h
index d0801b99c..8fc844363 100644
--- a/src/include/86box/usb.h
+++ b/src/include/86box/usb.h
@@ -27,28 +27,28 @@ typedef struct usb_device_t usb_device_t;
 
 enum usb_pid
 {
-    USB_PID_OUT = 0xE1,
-    USB_PID_IN = 0x69,
+    USB_PID_OUT   = 0xE1,
+    USB_PID_IN    = 0x69,
     USB_PID_SETUP = 0x2D
 };
 
 enum usb_errors
 {
     USB_ERROR_NO_ERROR = 0,
-    USB_ERROR_NAK = 1,
-    USB_ERROR_OVERRUN = 2,
+    USB_ERROR_NAK      = 1,
+    USB_ERROR_OVERRUN  = 2,
     USB_ERROR_UNDERRUN = 3
 };
 
 enum usb_bus_types
 {
     USB_BUS_OHCI = 0,
-    USB_BUS_UHCI,
-    USB_BUS_MAX
+    USB_BUS_UHCI = 1,
+    USB_BUS_MAX  = 2
 };
 
 /* USB device creation parameters struct */
-typedef struct
+typedef struct usb_params_t
 {
     void (*update_interrupt)(usb_t*, void*);
     /* Handle (but do not raise) SMI. Returns 1 if SMI can be raised, 0 otherwise. */
@@ -69,24 +69,26 @@ typedef struct usb_t
     uint8_t       uhci_io[32];
     ohci_mmio_t   ohci_mmio[1024];
     uint16_t      uhci_io_base;
-    int           uhci_enable, ohci_enable;
-    uint32_t      ohci_mem_base, irq_level;
+    int           uhci_enable;
+    int           ohci_enable;
+    uint32_t      ohci_mem_base;
+    uint32_t      irq_level;
     mem_mapping_t ohci_mmio_mapping;
     pc_timer_t    ohci_frame_timer;
     pc_timer_t    ohci_port_reset_timer[2];
     uint8_t       ohci_interrupt_counter : 3;
-    usb_device_t* ohci_devices[2];
-    usb_device_t* uhci_devices[2];
+    usb_device_t *ohci_devices[2];
+    usb_device_t *uhci_devices[2];
     uint8_t       ohci_usb_buf[4096];
     uint8_t       ohci_initial_start;
 
-    usb_params_t* usb_params;
+    usb_params_t *usb_params;
 } usb_t;
 
 #pragma pack(push, 1)
 
 /* Base USB descriptor struct. */
-typedef struct
+typedef struct usb_desc_base_t
 {
     uint8_t bLength;
     uint8_t bDescriptorType;
@@ -94,46 +96,46 @@ typedef struct
 
 enum usb_desc_setup_req_types
 {
-    USB_SETUP_TYPE_DEVICE = 0x0,
+    USB_SETUP_TYPE_DEVICE    = 0x0,
     USB_SETUP_TYPE_INTERFACE = 0x1,
-    USB_SETUP_TYPE_ENDPOING = 0x2,
-    USB_SETUP_TYPE_OTHER = 0x3,
+    USB_SETUP_TYPE_ENDPOING  = 0x2,
+    USB_SETUP_TYPE_OTHER     = 0x3,
 };
 
 #define USB_SETUP_TYPE_MAX 0x1F
 
 #define USB_SETUP_DEV_TO_HOST 0x80
 
-typedef struct
+typedef struct usb_desc_setup_t
 {
-    uint8_t bmRequestType;
-    uint8_t bRequest;
+    uint8_t  bmRequestType;
+    uint8_t  bRequest;
     uint16_t wValue;
     uint16_t wIndex;
     uint16_t wLength;
 } usb_desc_setup_t;
 
-typedef struct
+typedef struct usb_desc_endpoint_t
 {
     usb_desc_base_t base;
-    uint8_t bEndpointAddress;
-    uint8_t bmAttributes;
-    uint16_t wMaxPacketSize;
-    uint8_t bInterval;
+    uint8_t         bEndpointAddress;
+    uint8_t         bmAttributes;
+    uint16_t        wMaxPacketSize;
+    uint8_t         bInterval;
 } usb_desc_endpoint_t;
 
-typedef struct
+typedef struct usb_desc_hid_t
 {
     usb_desc_base_t base;
 
     uint16_t bcdHID;
-    uint8_t bCountryCode;
-    uint8_t bNumDescriptors;
-    uint8_t bDescriptorType;
+    uint8_t  bCountryCode;
+    uint8_t  bNumDescriptors;
+    uint8_t  bDescriptorType;
     uint16_t wDescriptorLength;
 } usb_desc_hid_t;
 
-typedef struct
+typedef struct usb_desc_interface_t
 {
     usb_desc_base_t base;
 
@@ -146,13 +148,13 @@ typedef struct
     uint8_t iInterface;
 } usb_desc_interface_t;
 
-typedef struct
+typedef struct usb_desc_string_t
 {
     usb_desc_base_t base;
-    uint16_t bString[];
+    uint16_t        bString[];
 } usb_desc_string_t;
 
-typedef struct
+typedef struct usb_desc_conf_t
 {
     usb_desc_base_t base;
 
@@ -164,22 +166,22 @@ typedef struct
     uint8_t  bMaxPower;
 } usb_desc_conf_t;
 
-typedef struct
+typedef struct usb_desc_device_t
 {
     usb_desc_base_t base;
 
     uint16_t bcdUSB;
-    uint8_t bDeviceClass;
-    uint8_t bDeviceSubClass;
-    uint8_t bDeviceProtocol;
-    uint8_t bMaxPacketSize;
+    uint8_t  bDeviceClass;
+    uint8_t  bDeviceSubClass;
+    uint8_t  bDeviceProtocol;
+    uint8_t  bMaxPacketSize;
     uint16_t idVendor;
     uint16_t idProduct;
     uint16_t bcdDevice;
-    uint8_t iManufacturer;
-    uint8_t iProduct;
-    uint8_t iSerialNumber;
-    uint8_t bNumConfigurations;
+    uint8_t  iManufacturer;
+    uint8_t  iProduct;
+    uint8_t  iSerialNumber;
+    uint8_t  bNumConfigurations;
 } usb_desc_device_t;
 
 #pragma pack(pop)
@@ -189,7 +191,7 @@ typedef struct usb_device_t
 {
     usb_desc_device_t device_desc;
     struct {
-        usb_desc_conf_t conf_desc;
+        usb_desc_conf_t  conf_desc;
         usb_desc_base_t* other_descs[16];
     } conf_desc_items;
 
diff --git a/src/include/86box/win.h b/src/include/86box/win.h
index 99620cbeb..35f6688ad 100644
--- a/src/include/86box/win.h
+++ b/src/include/86box/win.h
@@ -103,17 +103,21 @@ extern "C" {
 #endif
 
 extern HINSTANCE hinstance;
-extern HWND      hwndMain,
-    hwndRender,
-    hwndRender2;
-extern HANDLE ghMutex;
-extern HICON  hIcon[256];
-extern int    dpi;
-extern RECT   oldclip;
-extern int    sbar_height, tbar_height, user_resize;
-extern int    acp_utf8;
+extern HWND      hwndMain;
+extern HWND      hwndRender;
+extern HWND      hwndRender2;
+extern HANDLE    ghMutex;
+extern HICON     hIcon[256];
+extern int       dpi;
+extern RECT      oldclip;
+extern int       sbar_height;
+extern int       tbar_height;
+extern int       user_resize;
+extern int       acp_utf8;
 
-// extern int		status_is_open;
+#if 0
+extern int status_is_open;
+#endif
 
 extern char  openfilestring[512];
 extern WCHAR wopenfilestring[512];
diff --git a/src/include/86box/zip.h b/src/include/86box/zip.h
index 3981465ce..9ff69d092 100644
--- a/src/include/86box/zip.h
+++ b/src/include/86box/zip.h
@@ -32,60 +32,75 @@
 enum {
     ZIP_BUS_DISABLED = 0,
     ZIP_BUS_ATAPI    = 5,
-    ZIP_BUS_SCSI,
-    ZIP_BUS_USB
+    ZIP_BUS_SCSI     = 6,
+    ZIP_BUS_USB      = 7
 };
 
-typedef struct {
+typedef struct zip_drive_t {
     uint8_t id;
 
     union {
-        uint8_t res, res0, /* Reserved for other ID's. */
-            res1,
-            ide_channel, scsi_device_id;
+        uint8_t res;
+        uint8_t res0; /* Reserved for other ID's. */
+        uint8_t res1;
+        uint8_t ide_channel;
+        uint8_t scsi_device_id;
     };
 
-    uint8_t bus_type, /* 0 = ATAPI, 1 = SCSI */
-        bus_mode,     /* Bit 0 = PIO suported;
-                         Bit 1 = DMA supportd. */
-        read_only,    /* Struct variable reserved for
-                         media status. */
-        pad, pad0;
+    uint8_t bus_type;  /* 0 = ATAPI, 1 = SCSI */
+    uint8_t bus_mode;  /* Bit 0 = PIO suported;
+                          Bit 1 = DMA supportd. */
+    uint8_t read_only; /* Struct variable reserved for
+                          media status. */
+    uint8_t pad;
+    uint8_t pad0;
 
     FILE *f;
     void *priv;
 
-    char image_path[1024],
-        prev_image_path[1024];
+    char image_path[1024];
+    char prev_image_path[1024];
 
-    uint32_t is_250, medium_size,
-        base;
+    uint32_t is_250;
+    uint32_t medium_size;
+    uint32_t base;
 } zip_drive_t;
 
-typedef struct {
+typedef struct zip_t {
     mode_sense_pages_t ms_pages_saved;
 
     zip_drive_t *drv;
 
-    uint8_t *buffer,
-        atapi_cdb[16],
-        current_cdb[16],
-        sense[256];
+    uint8_t *buffer;
+    uint8_t atapi_cdb[16];
+    uint8_t current_cdb[16];
+    uint8_t sense[256];
 
-    uint8_t status, phase,
-        error, id,
-        features, cur_lun,
-        pad0, pad1;
+    uint8_t status;
+    uint8_t phase;
+    uint8_t error;
+    uint8_t id;
+    uint8_t features;
+    uint8_t cur_lun;
+    uint8_t pad0;
+    uint8_t pad1;
 
-    uint16_t request_length, max_transfer_len;
+    uint16_t request_length;
+    uint16_t max_transfer_len;
 
-    int requested_blocks, packet_status,
-        total_length, do_page_save,
-        unit_attention, request_pos,
-        old_len, pad3;
+    int requested_blocks;
+    int packet_status;
+    int total_length;
+    int do_page_save;
+    int unit_attention;
+    int request_pos;
+    int old_len;
+    int pad3;
 
-    uint32_t sector_pos, sector_len,
-        packet_len, pos;
+    uint32_t sector_pos;
+    uint32_t sector_len;
+    uint32_t packet_len;
+    uint32_t pos;
 
     double callback;
 } zip_t;
diff --git a/src/scsi/scsi_aha154x.c b/src/scsi/scsi_aha154x.c
index 3cfe72760..de2d014c3 100644
--- a/src/scsi/scsi_aha154x.c
+++ b/src/scsi/scsi_aha154x.c
@@ -72,12 +72,12 @@ static uint8_t *aha1542cp_pnp_rom = NULL;
 
 #pragma pack(push, 1)
 typedef struct {
-    uint8_t CustomerSignature[20];
-    uint8_t uAutoRetry;
-    uint8_t uBoardSwitches;
-    uint8_t uChecksum;
-    uint8_t uUnknown;
-    addr24  BIOSMailboxAddress;
+    uint8_t  CustomerSignature[20];
+    uint8_t  uAutoRetry;
+    uint8_t  uBoardSwitches;
+    uint8_t  uChecksum;
+    uint8_t  uUnknown;
+    addr24_t BIOSMailboxAddress;
 } aha_setup_t;
 #pragma pack(pop)
 
diff --git a/src/scsi/scsi_x54x.c b/src/scsi/scsi_x54x.c
index dd71b1a05..b379f322c 100644
--- a/src/scsi/scsi_x54x.c
+++ b/src/scsi/scsi_x54x.c
@@ -606,13 +606,13 @@ x54x_mbi(x54x_t *dev)
 {
     Req_t *req = &dev->Req;
     //  uint32_t CCBPointer = req->CCBPointer;
-    addr24   CCBPointer;
-    CCBU    *CmdBlock              = &(req->CmdBlock);
-    uint8_t  HostStatus            = req->HostStatus;
-    uint8_t  TargetStatus          = req->TargetStatus;
-    uint32_t MailboxCompletionCode = req->MailboxCompletionCode;
-    uint32_t Incoming;
-    uint8_t  bytes[4] = { 0, 0, 0, 0 };
+    addr24_t  CCBPointer;
+    CCBU     *CmdBlock              = &(req->CmdBlock);
+    uint8_t   HostStatus            = req->HostStatus;
+    uint8_t   TargetStatus          = req->TargetStatus;
+    uint32_t  MailboxCompletionCode = req->MailboxCompletionCode;
+    uint32_t  Incoming;
+    uint8_t   bytes[4] = { 0, 0, 0, 0 };
 
     Incoming = dev->MailboxInAddr + (dev->MailboxInPosCur * ((dev->flags & X54X_MBX_24BIT) ? sizeof(Mailbox_t) : sizeof(Mailbox32_t)));
 
@@ -734,7 +734,7 @@ static void
 x54x_set_residue(x54x_t *dev, Req_t *req, int32_t TransferLength)
 {
     uint32_t Residue = 0;
-    addr24   Residue24;
+    addr24_t Residue24;
     int32_t  BufLen   = scsi_devices[dev->bus][req->TargetID].buffer_length;
     uint8_t  bytes[4] = { 0, 0, 0, 0 };
 
@@ -1459,7 +1459,7 @@ x54x_out(uint16_t port, uint8_t val, void *priv)
     int                           suppress = 0;
     uint32_t                      FIFOBuf;
     uint8_t                       reset;
-    addr24                        Address;
+    addr24_t                      Address;
     uint8_t                       host_id = dev->HostID;
     uint8_t                       irq     = 0;