diff --git a/src/86box.c b/src/86box.c
index e2541f55d..a9bfb2f72 100644
--- a/src/86box.c
+++ b/src/86box.c
@@ -208,16 +208,20 @@ char  exe_path[2048]; /* path (dir) of executable */
 char  usr_path[1024]; /* path (dir) of user data */
 char  cfg_path[1024]; /* full path of config file */
 FILE *stdlog = NULL;  /* file to log output to */
-// int   scrnsz_x = SCREEN_RES_X; /* current screen size, X */
-// int   scrnsz_y = SCREEN_RES_Y; /* current screen size, Y */
+#if 0
+int   scrnsz_x = SCREEN_RES_X; /* current screen size, X */
+int   scrnsz_y = SCREEN_RES_Y; /* current screen size, Y */
+#endif
 int config_changed; /* config has changed */
 int title_update;
 int framecountx        = 0;
 int hard_reset_pending = 0;
 
-// int unscaled_size_x = SCREEN_RES_X; /* current unscaled size X */
-// int unscaled_size_y = SCREEN_RES_Y; /* current unscaled size Y */
-// int efscrnsz_y = SCREEN_RES_Y;
+#if 0
+int unscaled_size_x = SCREEN_RES_X; /* current unscaled size X */
+int unscaled_size_y = SCREEN_RES_Y; /* current unscaled size Y */
+int efscrnsz_y = SCREEN_RES_Y;
+#endif
 
 static wchar_t mouse_msg[3][200];
 
@@ -416,7 +420,6 @@ pc_init(int argc, char *argv[])
     time_t     now;
     int        c;
     int        lvmp = 0;
-    int        i;
 #ifdef ENABLE_NG
     int ng = 0;
 #endif
@@ -467,7 +470,7 @@ pc_init(int argc, char *argv[])
 
         if (!strcasecmp(argv[c], "--help") || !strcasecmp(argv[c], "-?")) {
 usage:
-            for (i = 0; i < FDD_NUM; i++) {
+            for (uint8_t i = 0; i < FDD_NUM; i++) {
                 if (fn[i] != NULL) {
                     free(fn[i]);
                     fn[i] = NULL;
@@ -776,7 +779,7 @@ usage:
     /* Load the configuration file. */
     config_load();
 
-    for (i = 0; i < FDD_NUM; i++) {
+    for (uint8_t i = 0; i < FDD_NUM; i++) {
         if (fn[i] != NULL) {
             if (strlen(fn[i]) <= 511)
                 strncpy(floppyfns[i], fn[i], 511);
@@ -1433,14 +1436,14 @@ reset_screen_size_monitor(int monitor_index)
 void
 reset_screen_size(void)
 {
-    for (int i = 0; i < MONITORS_NUM; i++)
+    for (uint8_t i = 0; i < MONITORS_NUM; i++)
         set_screen_size(monitors[i].mon_unscaled_size_x, monitors[i].mon_efscrnsz_y);
 }
 
 void
 set_screen_size_natural(void)
 {
-    for (int i = 0; i < MONITORS_NUM; i++)
+    for (uint8_t i = 0; i < MONITORS_NUM; i++)
         set_screen_size(monitors[i].mon_unscaled_size_x, monitors[i].mon_unscaled_size_y);
 }
 
diff --git a/src/chipset/intel_815ep.c b/src/chipset/intel_815ep.c
index 8b977c24e..0aaf7648e 100644
--- a/src/chipset/intel_815ep.c
+++ b/src/chipset/intel_815ep.c
@@ -30,7 +30,7 @@
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/device.h>
-#include <86box/plat.h> // Replace with plat_unused.h when upstreamed
+#include <86box/plat_unused.h>
 
 #include <86box/mem.h>
 #include <86box/pci.h>
diff --git a/src/chipset/intel_ich2.c b/src/chipset/intel_ich2.c
index c4033cebb..9db6265db 100644
--- a/src/chipset/intel_ich2.c
+++ b/src/chipset/intel_ich2.c
@@ -30,7 +30,7 @@
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/device.h>
-#include <86box/plat.h> // Replace with plat_unused.h when upstreamed
+#include <86box/plat_unused.h>
 
 #include <86box/apm.h>
 #include <86box/nvr.h>
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index f3638d263..87fce2474 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -80,29 +80,49 @@ fpu_state_t fpu_state;
 uint32_t abrt_error;
 
 #ifdef USE_DYNAREC
-const OpFn *x86_dynarec_opcodes, *x86_dynarec_opcodes_0f;
-const OpFn *x86_dynarec_opcodes_d8_a16, *x86_dynarec_opcodes_d8_a32;
-const OpFn *x86_dynarec_opcodes_d9_a16, *x86_dynarec_opcodes_d9_a32;
-const OpFn *x86_dynarec_opcodes_da_a16, *x86_dynarec_opcodes_da_a32;
-const OpFn *x86_dynarec_opcodes_db_a16, *x86_dynarec_opcodes_db_a32;
-const OpFn *x86_dynarec_opcodes_dc_a16, *x86_dynarec_opcodes_dc_a32;
-const OpFn *x86_dynarec_opcodes_dd_a16, *x86_dynarec_opcodes_dd_a32;
-const OpFn *x86_dynarec_opcodes_de_a16, *x86_dynarec_opcodes_de_a32;
-const OpFn *x86_dynarec_opcodes_df_a16, *x86_dynarec_opcodes_df_a32;
-const OpFn *x86_dynarec_opcodes_REPE, *x86_dynarec_opcodes_REPNE;
+const OpFn *x86_dynarec_opcodes;
+const OpFn *x86_dynarec_opcodes_0f;
+const OpFn *x86_dynarec_opcodes_d8_a16;
+const OpFn *x86_dynarec_opcodes_d8_a32;
+const OpFn *x86_dynarec_opcodes_d9_a16;
+const OpFn *x86_dynarec_opcodes_d9_a32;
+const OpFn *x86_dynarec_opcodes_da_a16;
+const OpFn *x86_dynarec_opcodes_da_a32;
+const OpFn *x86_dynarec_opcodes_db_a16;
+const OpFn *x86_dynarec_opcodes_db_a32;
+const OpFn *x86_dynarec_opcodes_dc_a16;
+const OpFn *x86_dynarec_opcodes_dc_a32;
+const OpFn *x86_dynarec_opcodes_dd_a16;
+const OpFn *x86_dynarec_opcodes_dd_a32;
+const OpFn *x86_dynarec_opcodes_de_a16;
+const OpFn *x86_dynarec_opcodes_de_a32;
+const OpFn *x86_dynarec_opcodes_df_a16;
+const OpFn *x86_dynarec_opcodes_df_a32;
+const OpFn *x86_dynarec_opcodes_REPE;
+const OpFn *x86_dynarec_opcodes_REPNE;
 const OpFn *x86_dynarec_opcodes_3DNOW;
 #endif
 
-const OpFn *x86_opcodes, *x86_opcodes_0f;
-const OpFn *x86_opcodes_d8_a16, *x86_opcodes_d8_a32;
-const OpFn *x86_opcodes_d9_a16, *x86_opcodes_d9_a32;
-const OpFn *x86_opcodes_da_a16, *x86_opcodes_da_a32;
-const OpFn *x86_opcodes_db_a16, *x86_opcodes_db_a32;
-const OpFn *x86_opcodes_dc_a16, *x86_opcodes_dc_a32;
-const OpFn *x86_opcodes_dd_a16, *x86_opcodes_dd_a32;
-const OpFn *x86_opcodes_de_a16, *x86_opcodes_de_a32;
-const OpFn *x86_opcodes_df_a16, *x86_opcodes_df_a32;
-const OpFn *x86_opcodes_REPE, *x86_opcodes_REPNE;
+const OpFn *x86_opcodes;
+const OpFn *x86_opcodes_0f;
+const OpFn *x86_opcodes_d8_a16;
+const OpFn *x86_opcodes_d8_a32;
+const OpFn *x86_opcodes_d9_a16;
+const OpFn *x86_opcodes_d9_a32;
+const OpFn *x86_opcodes_da_a16;
+const OpFn *x86_opcodes_da_a32;
+const OpFn *x86_opcodes_db_a16;
+const OpFn *x86_opcodes_db_a32;
+const OpFn *x86_opcodes_dc_a16;
+const OpFn *x86_opcodes_dc_a32;
+const OpFn *x86_opcodes_dd_a16;
+const OpFn *x86_opcodes_dd_a32;
+const OpFn *x86_opcodes_de_a16;
+const OpFn *x86_opcodes_de_a32;
+const OpFn *x86_opcodes_df_a16;
+const OpFn *x86_opcodes_df_a32;
+const OpFn *x86_opcodes_REPE;
+const OpFn *x86_opcodes_REPNE;
 const OpFn *x86_opcodes_3DNOW;
 
 uint16_t cpu_fast_off_count;
@@ -158,13 +178,35 @@ int is_p6;
 int is_cxsmm;
 int hasfpu;
 
-int timing_rr, timing_mr, timing_mrl, timing_rm, timing_rml;
-int timing_mm, timing_mml, timing_bt, timing_bnt;
-int timing_int, timing_int_rm, timing_int_v86, timing_int_pm;
-int timing_int_pm_outer, timing_iret_rm, timing_iret_v86, timing_iret_pm;
-int timing_iret_pm_outer, timing_call_rm, timing_call_pm, timing_call_pm_gate;
-int timing_call_pm_gate_inner, timing_retf_rm, timing_retf_pm, timing_retf_pm_outer;
-int timing_jmp_rm, timing_jmp_pm, timing_jmp_pm_gate, timing_misaligned;
+int timing_rr;
+int timing_mr;
+int timing_mrl;
+int timing_rm;
+int timing_rml;
+int timing_mm;
+int timing_mml;
+int timing_bt;
+int timing_bnt;
+int timing_int;
+int timing_int_rm;
+int timing_int_v86;
+int timing_int_pm;
+int timing_int_pm_outer;
+int timing_iret_rm;
+int timing_iret_v86;
+int timing_iret_pm;
+int timing_iret_pm_outer;
+int timing_call_rm;
+int timing_call_pm;
+int timing_call_pm_gate;
+int timing_call_pm_gate_inner;
+int timing_retf_rm;
+int timing_retf_pm;
+int timing_retf_pm_outer;
+int timing_jmp_rm;
+int timing_jmp_pm;
+int timing_jmp_pm_gate;
+int timing_misaligned;
 
 uint32_t cpu_features;
 uint32_t cpu_fast_off_flags;
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index d60d7159f..d7343fce6 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -816,10 +816,8 @@ void cyrix_write_seg_descriptor(uint32_t addr, x86seg *seg);
 #define SMHR_VALID     (1 << 0)
 #define SMHR_ADDR_MASK (0xfffffffc)
 
-typedef struct
-{
-    struct
-    {
+typedef struct {
+    struct {
         uint32_t base;
         uint64_t size;
     } arr[8];
diff --git a/src/device/cassette.c b/src/device/cassette.c
index 8bb1c26bd..17b650e81 100644
--- a/src/device/cassette.c
+++ b/src/device/cassette.c
@@ -552,9 +552,8 @@ pc_cas_print_state(UNUSED(const pc_cassette_t *cas))
 static void
 pc_cas_clock_pcm(pc_cassette_t *cas, unsigned long cnt)
 {
-    unsigned long i;
-    unsigned long n;
-    int           v = 0;
+    uint64_t n;
+    int      v = 0;
 
     n = cas->srate * cnt + cas->clk_pcm;
 
@@ -567,11 +566,11 @@ pc_cas_clock_pcm(pc_cassette_t *cas, unsigned long cnt)
     }
 
     if (cas->save) {
-        for (i = 0; i < n; i++) {
+        for (uint64_t i = 0; i < n; i++) {
             pc_cas_write_smp(cas, cas->pcm_out_val);
         }
     } else {
-        for (i = 0; i < n; i++) {
+        for (uint64_t i = 0; i < n; i++) {
             v = pc_cas_read_smp(cas);
         }
 
diff --git a/src/device/hwm_nsc366.c b/src/device/hwm_nsc366.c
index ed8b77143..aa83f437e 100644
--- a/src/device/hwm_nsc366.c
+++ b/src/device/hwm_nsc366.c
@@ -31,7 +31,7 @@
 #include <86box/io.h>
 #include <86box/timer.h>
 #include <86box/device.h>
-#include <86box/plat.h> // Replace with plat_unused.h when upstreamed
+#include <86box/plat_unused.h>
 
 #include <86box/hwm.h>
 #include <86box/nsc366.h>
diff --git a/src/device/intel_ich2_gpio.c b/src/device/intel_ich2_gpio.c
index 292173c53..76299517d 100644
--- a/src/device/intel_ich2_gpio.c
+++ b/src/device/intel_ich2_gpio.c
@@ -30,7 +30,7 @@
 #include <86box/io.h>
 #include <86box/device.h>
 #include <86box/intel_ich2_gpio.h>
-#include <86box/plat.h> // Replace with plat_unused.h when upstreamed
+#include <86box/plat_unused.h>
 
 #ifdef ENABLE_INTEL_ICH2_GPIO_LOG
 int intel_ich2_gpio_do_log = ENABLE_INTEL_ICH2_GPIO_LOG;
diff --git a/src/device/intel_ich2_trap.c b/src/device/intel_ich2_trap.c
index ec58fa2d7..3058e7f65 100644
--- a/src/device/intel_ich2_trap.c
+++ b/src/device/intel_ich2_trap.c
@@ -29,7 +29,7 @@
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/device.h>
-#include <86box/plat.h> // Replace with plat_unused.h when upstreamed
+#include <86box/plat_unused.h>
 
 #include <86box/apm.h>
 #include <86box/nvr.h>
diff --git a/src/device/tco.c b/src/device/tco.c
index fcc5d321b..5b140b9ee 100644
--- a/src/device/tco.c
+++ b/src/device/tco.c
@@ -36,7 +36,7 @@
 #include <86box/pic.h>
 #include <86box/pit.h>
 #include <86box/tco.h>
-#include <86box/plat.h> // Replace with plat_unused.h when upstreamed
+#include <86box/plat_unused.h>
 
 #ifdef ENABLE_TCO_LOG
 int tco_do_log = ENABLE_TCO_LOG;
diff --git a/src/include/86box/86box.h b/src/include/86box/86box.h
index 977d3db63..2f16c92d7 100644
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -193,7 +193,7 @@ extern uint16_t get_last_addr(void);
 
 /* This is for external subtraction of cycles;
    should be in cpu.c but I put it here to avoid
-   having to include cpu.c everywhere. */
+   having to include cpu.h everywhere. */
 extern void sub_cycles(int c);
 extern void resub_cycles(int old_cycles);
 
diff --git a/src/include/86box/agpgart.h b/src/include/86box/agpgart.h
index d73e95e86..fc2976c88 100644
--- a/src/include/86box/agpgart.h
+++ b/src/include/86box/agpgart.h
@@ -20,7 +20,10 @@
 
 typedef struct agpgart_s {
     int           aperture_enable;
-    uint32_t      aperture_base, aperture_size, aperture_mask, gart_base;
+    uint32_t      aperture_base;
+    uint32_t      aperture_size;
+    uint32_t      aperture_mask;
+    uint32_t      gart_base;
     mem_mapping_t aperture_mapping;
 } agpgart_t;
 
diff --git a/src/include/86box/cdrom.h b/src/include/86box/cdrom.h
index 8a3af2956..82098e54e 100644
--- a/src/include/86box/cdrom.h
+++ b/src/include/86box/cdrom.h
@@ -65,52 +65,50 @@ enum {
 #define BUS_TYPE_IDE 1
 #define BUS_TYPE_SCSI 2
 
-static const struct
-{
+static const struct {
     const char  vendor[9];
     const char  model[17];
     const char  revision[5];
     const char *name;
     const char *internal_name;
     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*/
-    { "AZT",      "CDA46802I",          "1.15", "(ATAPI) AZT CDA46802I 1.15", "AZT_CDA46802I_1.15", BUS_TYPE_IDE}, /*2*/
-    { "BTC",      "CD-ROM BCD36XH",     "U1.0", "(ATAPI) BTC CD-ROM BCD36XH U1.0", "BTC_CD-ROM_BCD36XH_U1.0", BUS_TYPE_IDE}, /*3*/
-    { "GOLDSTAR", "CRD-8160B",          "3.14", "(ATAPI) GOLDSTAR CRD-8160B 3.14", "GOLDSTAR_CRD-8160B_3.14", BUS_TYPE_IDE}, /*4*/
-    { "HITACHI",  "CDR-8130",           "0020", "(ATAPI) HITACHI CDR-8130 0020", "HITACHI_CDR-8130_0020", BUS_TYPE_IDE}, /*5*/
-    { "KENWOOD",  "CD-ROM UCR-421",     "208E", "(ATAPI) KENWOOD CD-ROM UCR-421 208E", "KENWOOD_CD-ROM_UCR-421_208E", BUS_TYPE_IDE}, /*6*/
-    { "MATSHITA", "CD-ROM CR-587",      "7S13", "(ATAPI) MATSHITA CD-ROM CR-587 7S13", "MATSHITA_CD-ROM_CR-587_7S13", BUS_TYPE_IDE}, /*7*/
-    { "MATSHITA", "CD-ROM CR-588",      "LS15", "(ATAPI) MATSHITA CD-ROM CR-588 LS15", "MATSHITA_CD-ROM_CR-588_LS15", BUS_TYPE_IDE}, /*8*/
-    { "MATSHITA", "CR-571",             "1.0e", "(ATAPI) MATSHITA CR-571 1.0e", "MATSHITA_CR-571_1.0e", BUS_TYPE_IDE}, /*9*/
-    { "MATSHITA", "CR-572",             "1.0j", "(ATAPI) MATSHITA CR-572 1.0j", "MATSHITA_CR-572_1.0j", BUS_TYPE_IDE}, /*10*/
-    { "MITSUMI",  "CRMC-FX4820T",       "D02A", "(ATAPI) MITSUMI CRMC-FX4820T D02A", "MITSUMI_CRMC-FX4820T_D02A", BUS_TYPE_IDE}, /*11*/
-    { "NEC",      "CD-ROM DRIVE:260",   "1.00", "(ATAPI) NEC CD-ROM DRIVE:260 1.00", "NEC_CD-ROM_DRIVE260_1.00", BUS_TYPE_IDE}, /*12*/
-    { "NEC",      "CD-ROM DRIVE:260",   "1.01", "(ATAPI) NEC CD-ROM DRIVE:260 1.01", "NEC_CD-ROM_DRIVE260_1.01", BUS_TYPE_IDE}, /*13*/
-    { "NEC",      "CD-ROM DRIVE:273",   "4.20", "(ATAPI) NEC CD-ROM DRIVE:273 4.20", "NEC_CD-ROM_DRIVE273_4.20", BUS_TYPE_IDE}, /*14*/
-    { "NEC",      "CD-ROM DRIVE:280",   "1.05", "(ATAPI) NEC CD-ROM DRIVE:280 1.05", "NEC_CD-ROM_DRIVE280_1.05", BUS_TYPE_IDE}, /*15*/
-    { "NEC",      "CD-ROM DRIVE:280",   "3.08", "(ATAPI) NEC CD-ROM DRIVE:280 3.08", "NEC_CD-ROM_DRIVE280_3.08", BUS_TYPE_IDE}, /*16*/
-    { "PHILIPS",  "CD-ROM PCA403CD",    "U31P", "(ATAPI) PHILIPS CD-ROM PCA403CD U31P", "PHILIPS_CD-ROM_PCA403CD_U31P", BUS_TYPE_IDE}, /*17*/
-    { "SONY",     "CD-ROM CDU76",       "1.0i", "(ATAPI) SONY CD-ROM CDU76 1.0i", "SONY_CD-ROM_CDU76_1.0i", BUS_TYPE_IDE}, /*18*/
-    { "SONY",     "CD-ROM CDU311",      "3.0h", "(ATAPI) SONY CD-ROM CDU311 3.0h", "SONY_CD-ROM_CDU311_3.0h", BUS_TYPE_IDE}, /*19*/
-    { "TOSHIBA",  "CD-ROM XM-5302TA",   "0305", "(ATAPI) TOSHIBA CD-ROM XM-5302TA 0305", "TOSHIBA_CD-ROM_XM-5302TA_0305", BUS_TYPE_IDE}, /*20*/
-    { "TOSHIBA",  "CD-ROM XM-5702B",    "TA70", "(ATAPI) TOSHIBA CD-ROM XM-5702B TA70", "TOSHIBA_CD-ROM_XM-5702B_TA70", BUS_TYPE_IDE}, /*21*/
-    { "CHINON",   "CD-ROM CDS-431",     "H42 ", "(SCSI) CHINON CD-ROM CDS-431 H42", "CHINON_CD-ROM_CDS-431_H42", BUS_TYPE_SCSI}, /*22*/
-    { "DEC",      "RRD45   (C) DEC",    "0436", "(SCSI) DEC RRD45 0436", "DEC_RRD45_0436", BUS_TYPE_SCSI}, /*23*/
-    { "MATSHITA", "CD-ROM CR-501",      "1.0b", "(SCSI) MATSHITA CD-ROM CR-501 1.0b", "MATSHITA_CD-ROM_CR-501_1.0b", BUS_TYPE_SCSI}, /*24*/
-    { "NEC",      "CD-ROM DRIVE:74",    "1.00", "(SCSI) NEC CD-ROM DRIVE:74 1.00", "NEC_CD-ROM_DRIVE74_1.00", BUS_TYPE_SCSI}, /*25*/
-    { "NEC",      "CD-ROM DRIVE:464",   "1.05", "(SCSI) NEC CD-ROM DRIVE:464 1.05", "NEC_CD-ROM_DRIVE464_1.05", BUS_TYPE_SCSI}, /*26*/
-    { "SONY",     "CD-ROM CDU-541",     "1.0i", "(SCSI) SONY CD-ROM CDU-541 1.0i", "SONY_CD-ROM_CDU-541_1.0i", BUS_TYPE_SCSI}, /*27*/
-    { "SONY",     "CD-ROM CDU-76S",     "1.00", "(SCSI) SONY CD-ROM CDU-76S 1.00", "SONY_CD-ROM_CDU-76S_1.00", BUS_TYPE_SCSI}, /*28*/
-    { "PHILIPS",  "CDD2600",            "1.07", "(SCSI) PHILIPS CDD2600 1.07", "PHILIPS_CDD2600_1.07", BUS_TYPE_SCSI}, /*29*/
-    { "PIONEER",  "CD-ROM DRM-604X",    "2403", "(SCSI) PIONEER CD-ROM DRM-604X 2403", "PIONEER_CD-ROM_DRM-604X_2403", BUS_TYPE_SCSI}, /*30*/
-    { "PLEXTOR",  "CD-ROM PX-32TS",     "1.03", "(SCSI) PLEXTOR CD-ROM PX-32TS 1.03", "PLEXTOR_CD-ROM_PX-32TS_1.03", BUS_TYPE_SCSI}, /*31*/
-    { "TEAC",     "CD-R55S",            "1.0R", "(SCSI) TEAC CD-R55S 1.0R", "TEAC_CD-R55S_1.0R", BUS_TYPE_SCSI}, /*32*/
-    { "TOSHIBA",  "CD-ROM DRIVE:XM",    "3433", "(SCSI) TOSHIBA CD-ROM DRIVE:XM 3433", "TOSHIBA_CD-ROM_DRIVEXM_3433", BUS_TYPE_SCSI}, /*33*/
-    { "TOSHIBA",  "CD-ROM XM-3301TA",   "0272", "(SCSI) TOSHIBA CD-ROM XM-3301TA 0272", "TOSHIBA_CD-ROM_XM-3301TA_0272", BUS_TYPE_SCSI}, /*34*/
-    { "TOSHIBA",  "CD-ROM XM-5701TA",   "3136", "(SCSI) TOSHIBA CD-ROM XM-5701TA 3136", "TOSHIBA_CD-ROM_XM-5701TA_3136", BUS_TYPE_SCSI}, /*35*/
-    { "",         "",                   "",     "",                             "", -1},
+} cdrom_drive_types[] = {
+    { "86BOX",    "CD-ROM",             "1.00", "(ATAPI/SCSI) 86BOX CD-ROM 1.00",        "86BOX_CD-ROM_1.00",             BUS_TYPE_ALL  }, /*1*/
+    { "AZT",      "CDA46802I",          "1.15", "(ATAPI) AZT CDA46802I 1.15",            "AZT_CDA46802I_1.15",            BUS_TYPE_IDE  }, /*2*/
+    { "BTC",      "CD-ROM BCD36XH",     "U1.0", "(ATAPI) BTC CD-ROM BCD36XH U1.0",       "BTC_CD-ROM_BCD36XH_U1.0",       BUS_TYPE_IDE  }, /*3*/
+    { "GOLDSTAR", "CRD-8160B",          "3.14", "(ATAPI) GOLDSTAR CRD-8160B 3.14",       "GOLDSTAR_CRD-8160B_3.14",       BUS_TYPE_IDE  }, /*4*/
+    { "HITACHI",  "CDR-8130",           "0020", "(ATAPI) HITACHI CDR-8130 0020",         "HITACHI_CDR-8130_0020",         BUS_TYPE_IDE  }, /*5*/
+    { "KENWOOD",  "CD-ROM UCR-421",     "208E", "(ATAPI) KENWOOD CD-ROM UCR-421 208E",   "KENWOOD_CD-ROM_UCR-421_208E",   BUS_TYPE_IDE  }, /*6*/
+    { "MATSHITA", "CD-ROM CR-587",      "7S13", "(ATAPI) MATSHITA CD-ROM CR-587 7S13",   "MATSHITA_CD-ROM_CR-587_7S13",   BUS_TYPE_IDE  }, /*7*/
+    { "MATSHITA", "CD-ROM CR-588",      "LS15", "(ATAPI) MATSHITA CD-ROM CR-588 LS15",   "MATSHITA_CD-ROM_CR-588_LS15",   BUS_TYPE_IDE  }, /*8*/
+    { "MATSHITA", "CR-571",             "1.0e", "(ATAPI) MATSHITA CR-571 1.0e",          "MATSHITA_CR-571_1.0e",          BUS_TYPE_IDE  }, /*9*/
+    { "MATSHITA", "CR-572",             "1.0j", "(ATAPI) MATSHITA CR-572 1.0j",          "MATSHITA_CR-572_1.0j",          BUS_TYPE_IDE  }, /*10*/
+    { "MITSUMI",  "CRMC-FX4820T",       "D02A", "(ATAPI) MITSUMI CRMC-FX4820T D02A",     "MITSUMI_CRMC-FX4820T_D02A",     BUS_TYPE_IDE  }, /*11*/
+    { "NEC",      "CD-ROM DRIVE:260",   "1.00", "(ATAPI) NEC CD-ROM DRIVE:260 1.00",     "NEC_CD-ROM_DRIVE260_1.00",      BUS_TYPE_IDE  }, /*12*/
+    { "NEC",      "CD-ROM DRIVE:260",   "1.01", "(ATAPI) NEC CD-ROM DRIVE:260 1.01",     "NEC_CD-ROM_DRIVE260_1.01",      BUS_TYPE_IDE  }, /*13*/
+    { "NEC",      "CD-ROM DRIVE:273",   "4.20", "(ATAPI) NEC CD-ROM DRIVE:273 4.20",     "NEC_CD-ROM_DRIVE273_4.20",      BUS_TYPE_IDE  }, /*14*/
+    { "NEC",      "CD-ROM DRIVE:280",   "1.05", "(ATAPI) NEC CD-ROM DRIVE:280 1.05",     "NEC_CD-ROM_DRIVE280_1.05",      BUS_TYPE_IDE  }, /*15*/
+    { "NEC",      "CD-ROM DRIVE:280",   "3.08", "(ATAPI) NEC CD-ROM DRIVE:280 3.08",     "NEC_CD-ROM_DRIVE280_3.08",      BUS_TYPE_IDE  }, /*16*/
+    { "PHILIPS",  "CD-ROM PCA403CD",    "U31P", "(ATAPI) PHILIPS CD-ROM PCA403CD U31P",  "PHILIPS_CD-ROM_PCA403CD_U31P",  BUS_TYPE_IDE  }, /*17*/
+    { "SONY",     "CD-ROM CDU76",       "1.0i", "(ATAPI) SONY CD-ROM CDU76 1.0i",        "SONY_CD-ROM_CDU76_1.0i",        BUS_TYPE_IDE  }, /*18*/
+    { "SONY",     "CD-ROM CDU311",      "3.0h", "(ATAPI) SONY CD-ROM CDU311 3.0h",       "SONY_CD-ROM_CDU311_3.0h",       BUS_TYPE_IDE  }, /*19*/
+    { "TOSHIBA",  "CD-ROM XM-5302TA",   "0305", "(ATAPI) TOSHIBA CD-ROM XM-5302TA 0305", "TOSHIBA_CD-ROM_XM-5302TA_0305", BUS_TYPE_IDE  }, /*20*/
+    { "TOSHIBA",  "CD-ROM XM-5702B",    "TA70", "(ATAPI) TOSHIBA CD-ROM XM-5702B TA70",  "TOSHIBA_CD-ROM_XM-5702B_TA70",  BUS_TYPE_IDE  }, /*21*/
+    { "CHINON",   "CD-ROM CDS-431",     "H42 ", "(SCSI) CHINON CD-ROM CDS-431 H42",      "CHINON_CD-ROM_CDS-431_H42",     BUS_TYPE_SCSI }, /*22*/
+    { "DEC",      "RRD45   (C) DEC",    "0436", "(SCSI) DEC RRD45 0436",                 "DEC_RRD45_0436",                BUS_TYPE_SCSI }, /*23*/
+    { "MATSHITA", "CD-ROM CR-501",      "1.0b", "(SCSI) MATSHITA CD-ROM CR-501 1.0b",    "MATSHITA_CD-ROM_CR-501_1.0b",   BUS_TYPE_SCSI }, /*24*/
+    { "NEC",      "CD-ROM DRIVE:74",    "1.00", "(SCSI) NEC CD-ROM DRIVE:74 1.00",       "NEC_CD-ROM_DRIVE74_1.00",       BUS_TYPE_SCSI }, /*25*/
+    { "NEC",      "CD-ROM DRIVE:464",   "1.05", "(SCSI) NEC CD-ROM DRIVE:464 1.05",      "NEC_CD-ROM_DRIVE464_1.05",      BUS_TYPE_SCSI }, /*26*/
+    { "SONY",     "CD-ROM CDU-541",     "1.0i", "(SCSI) SONY CD-ROM CDU-541 1.0i",       "SONY_CD-ROM_CDU-541_1.0i",      BUS_TYPE_SCSI }, /*27*/
+    { "SONY",     "CD-ROM CDU-76S",     "1.00", "(SCSI) SONY CD-ROM CDU-76S 1.00",       "SONY_CD-ROM_CDU-76S_1.00",      BUS_TYPE_SCSI }, /*28*/
+    { "PHILIPS",  "CDD2600",            "1.07", "(SCSI) PHILIPS CDD2600 1.07",           "PHILIPS_CDD2600_1.07",          BUS_TYPE_SCSI }, /*29*/
+    { "PIONEER",  "CD-ROM DRM-604X",    "2403", "(SCSI) PIONEER CD-ROM DRM-604X 2403",   "PIONEER_CD-ROM_DRM-604X_2403",  BUS_TYPE_SCSI }, /*30*/
+    { "PLEXTOR",  "CD-ROM PX-32TS",     "1.03", "(SCSI) PLEXTOR CD-ROM PX-32TS 1.03",    "PLEXTOR_CD-ROM_PX-32TS_1.03",   BUS_TYPE_SCSI }, /*31*/
+    { "TEAC",     "CD-R55S",            "1.0R", "(SCSI) TEAC CD-R55S 1.0R",              "TEAC_CD-R55S_1.0R",             BUS_TYPE_SCSI }, /*32*/
+    { "TOSHIBA",  "CD-ROM DRIVE:XM",    "3433", "(SCSI) TOSHIBA CD-ROM DRIVE:XM 3433",   "TOSHIBA_CD-ROM_DRIVEXM_3433",   BUS_TYPE_SCSI }, /*33*/
+    { "TOSHIBA",  "CD-ROM XM-3301TA",   "0272", "(SCSI) TOSHIBA CD-ROM XM-3301TA 0272",  "TOSHIBA_CD-ROM_XM-3301TA_0272", BUS_TYPE_SCSI }, /*34*/
+    { "TOSHIBA",  "CD-ROM XM-5701TA",   "3136", "(SCSI) TOSHIBA CD-ROM XM-5701TA 3136",  "TOSHIBA_CD-ROM_XM-5701TA_3136", BUS_TYPE_SCSI }, /*35*/
+    { "",         "",                   "",     "",                                      "",                              -1            },
 };
 
 /* To shut up the GCC compilers. */
@@ -179,7 +177,8 @@ typedef struct cdrom {
     uint32_t cdrom_capacity;
     uint32_t seek_pos;
     uint32_t seek_diff;
-    uint32_t cd_end, type;
+    uint32_t cd_end;
+    uint32_t type;
 
     int host_drive;
     int prev_host_drive;
diff --git a/src/include/86box/gameport.h b/src/include/86box/gameport.h
index 8620ce755..7556fa0d5 100644
--- a/src/include/86box/gameport.h
+++ b/src/include/86box/gameport.h
@@ -57,8 +57,7 @@ typedef struct {
         int  id;
     } pov[4];
 
-    struct
-    {
+    struct {
         char name[260];
         int  id;
     } slider[2];
@@ -84,16 +83,16 @@ typedef struct {
     const char *name;
     const char *internal_name;
 
-    void *(*init)(void);
-    void (*close)(void *p);
+    void   *(*init)(void);
+    void    (*close)(void *p);
     uint8_t (*read)(void *p);
-    void (*write)(void *p);
-    int (*read_axis)(void *p, int axis);
-    void (*a0_over)(void *p);
+    void    (*write)(void *p);
+    int     (*read_axis)(void *p, int axis);
+    void    (*a0_over)(void *p);
 
-    int axis_count;
-    int button_count;
-    int 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/machine/m_at_socket370.c b/src/machine/m_at_socket370.c
index e5ea1cdb2..0ca90433d 100644
--- a/src/machine/m_at_socket370.c
+++ b/src/machine/m_at_socket370.c
@@ -597,7 +597,7 @@ machine_at_m6tsl_init(const machine_t *model)
     device_add(ics9xxx_get(ICS9250_08));    /* ICS Clock Chip */
     intel_815ep_spd_init();                 /* SPD */
 #if 0
-//  spd_register(SPD_TYPE_SDRAM, 0x7, 512); /* SPD */
+    spd_register(SPD_TYPE_SDRAM, 0x7, 512); /* SPD */
 #endif
 
     return ret;
diff --git a/src/mem/sst_flash.c b/src/mem/sst_flash.c
index 169a1dc6d..d9be436e9 100644
--- a/src/mem/sst_flash.c
+++ b/src/mem/sst_flash.c
@@ -17,7 +17,7 @@
  *
  *          Copyright 2008-2020 Sarah Walker.
  *          Copyright 2016-2020 Miran Grca.
- *          Copyright 2020      Melissa Goad.
+ *          Copyright 2020      Melody Goad.
  *          Copyright 2022-2023 Jasmine Iwanek.
  */
 #include <stdio.h>
diff --git a/src/sio/sio_w83627hf.c b/src/sio/sio_w83627hf.c
index 2744a9a46..4a14cf9e1 100644
--- a/src/sio/sio_w83627hf.c
+++ b/src/sio/sio_w83627hf.c
@@ -94,7 +94,7 @@ Notes : ISAPnP is missing and the Hardware Monitor I2C is not implemented.
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/device.h>
-#include <86box/plat.h> // Replace with plat_unused.h when upstreamed
+#include <86box/plat_unused.h>
 
 #include <86box/fdd.h>
 #include <86box/fdc.h>
diff --git a/src/sound/snd_ac97_intel.c b/src/sound/snd_ac97_intel.c
index a34f2087a..ba6cb0006 100644
--- a/src/sound/snd_ac97_intel.c
+++ b/src/sound/snd_ac97_intel.c
@@ -35,7 +35,7 @@
 #include <86box/timer.h>
 #include <86box/io.h>
 #include <86box/device.h>
-#include <86box/plat.h> // Replace with plat_unused.h when upstreamed
+#include <86box/plat_unused.h>
 
 #include <86box/snd_ac97.h>
 #include <86box/snd_ac97_intel.h>