diff --git a/src/chipset/neat.c b/src/chipset/neat.c
index a54fc312e..3b00b4ffd 100644
--- a/src/chipset/neat.c
+++ b/src/chipset/neat.c
@@ -673,13 +673,14 @@ neat_init(UNUSED(const device_t *info))
 {
     neat_t *dev;
     uint8_t dram_mode = 0;
+    uint8_t i;
 
     /* Create an instance. */
     dev = (neat_t *) malloc(sizeof(neat_t));
     memset(dev, 0x00, sizeof(neat_t));
 
     /* Initialize some of the registers to specific defaults. */
-    for (uint8_t i = REG_RA0; i <= REG_RB11; i++) {
+    for (i = REG_RA0; i <= REG_RB11; i++) {
         dev->indx = i;
         neat_write(0x0023, 0x00, dev);
     }
diff --git a/src/device/mouse_serial.c b/src/device/mouse_serial.c
index 9e4556a88..e9531d78e 100644
--- a/src/device/mouse_serial.c
+++ b/src/device/mouse_serial.c
@@ -674,7 +674,6 @@ ltsermouse_process_data(mouse_t *dev)
         case 0x2a:
             switch (dev->ib) {
                 default:
-                    mouse_serial_log("Serial mouse: Invalid period %02X, using 1200 bps\n", data);
                     fallthrough;
                 case 0x6e:
                     dev->bps = 1200;
diff --git a/src/disk/hdc_st506_xt.c b/src/disk/hdc_st506_xt.c
index 40709d307..79a5a8eba 100644
--- a/src/disk/hdc_st506_xt.c
+++ b/src/disk/hdc_st506_xt.c
@@ -1533,6 +1533,7 @@ static void
 set_switches(hdc_t *dev, hd_type_t *hdt, int num)
 {
     const drive_t *drive;
+    int            c;
     int            e;
 
     dev->switches = 0x00;
@@ -1546,7 +1547,7 @@ set_switches(hdc_t *dev, hd_type_t *hdt, int num)
             continue;
         }
 
-        for (int c = 0; c < num; c++) {
+        for (c = 0; c < num; c++) {
             /* Does the Xebec also support more than 4 types? */
             if ((drive->spt == hdt[c].spt) && (drive->hpc == hdt[c].hpc) && (drive->tracks == hdt[c].tracks)) {
                 /* Olivetti M24/M240: Move the upper 2 bites up by 2 bits, as the