diff --git a/src/video/vid_icd2061.c b/src/video/vid_icd2061.c
index adfaf6ad4..4b98e33b6 100644
--- a/src/video/vid_icd2061.c
+++ b/src/video/vid_icd2061.c
@@ -34,9 +34,12 @@
 typedef struct icd2061_t {
     float freq[3];
 
-    int count, bit_count,
-        unlocked, state;
-    uint32_t data, ctrl;
+    int      count;
+    int      bit_count;
+    int      unlocked;
+    int      state;
+    uint32_t data;
+    uint32_t ctrl;
 } icd2061_t;
 
 #ifdef ENABLE_ICD2061_LOG
@@ -138,7 +141,7 @@ icd2061_write(void *p, int val)
 float
 icd2061_getclock(int clock, void *priv)
 {
-    icd2061_t *icd2061 = (icd2061_t *) priv;
+    const icd2061_t *icd2061 = (icd2061_t *) priv;
 
     if (clock > 2)
         clock = 2;
diff --git a/src/video/vid_ics2494.c b/src/video/vid_ics2494.c
index 16c4139fe..a3f2a18bc 100644
--- a/src/video/vid_ics2494.c
+++ b/src/video/vid_ics2494.c
@@ -51,7 +51,7 @@ ics2494_log(const char *fmt, ...)
 float
 ics2494_getclock(int clock, void *priv)
 {
-    ics2494_t *ics2494 = (ics2494_t *) priv;
+    const ics2494_t *ics2494 = (ics2494_t *) priv;
 
     if (clock > 15)
         clock = 15;
@@ -85,6 +85,9 @@ ics2494_init(const device_t *info)
             ics2494->freq[0xe] = 75000000.0;
             ics2494->freq[0xf] = 94500000.0;
             break;
+
+        default:
+            break;
     }
 
     return ics2494;
diff --git a/src/video/vid_ics2595.c b/src/video/vid_ics2595.c
index 6420ee7e4..ecb414f2b 100644
--- a/src/video/vid_ics2595.c
+++ b/src/video/vid_ics2595.c
@@ -26,9 +26,11 @@
 #include <86box/plat_unused.h>
 
 typedef struct ics2595_t {
-    int oldfs3, oldfs2;
+    int oldfs3;
+    int oldfs2;
     int dat;
-    int pos, state;
+    int pos;
+    int state;
 
     double clocks[16];
     double output_clock;
@@ -43,9 +45,9 @@ enum {
 static int ics2595_div[4] = { 8, 4, 2, 1 };
 
 void
-ics2595_write(void *p, int strobe, int dat)
+ics2595_write(void *priv, int strobe, int dat)
 {
-    ics2595_t *ics2595 = (ics2595_t *) p;
+    ics2595_t *ics2595 = (ics2595_t *) priv;
     int        d;
     int        n;
     int        l;
@@ -88,6 +90,7 @@ static void *
 ics2595_init(UNUSED(const device_t *info))
 {
     ics2595_t *ics2595 = (ics2595_t *) malloc(sizeof(ics2595_t));
+
     memset(ics2595, 0, sizeof(ics2595_t));
 
     return ics2595;
@@ -105,15 +108,15 @@ ics2595_close(void *priv)
 double
 ics2595_getclock(void *priv)
 {
-    ics2595_t *ics2595 = (ics2595_t *) priv;
+    const ics2595_t *ics2595 = (ics2595_t *) priv;
 
     return ics2595->output_clock;
 }
 
 void
-ics2595_setclock(void *p, double clock)
+ics2595_setclock(void *priv, double clock)
 {
-    ics2595_t *ics2595 = (ics2595_t *) p;
+    ics2595_t *ics2595 = (ics2595_t *) priv;
 
     ics2595->output_clock = clock;
 }