diff --git a/src/include/86box/vid_cga.h b/src/include/86box/vid_cga.h
index 414460acc..f49fc73cc 100644
--- a/src/include/86box/vid_cga.h
+++ b/src/include/86box/vid_cga.h
@@ -69,12 +69,12 @@ typedef struct cga_t {
 } cga_t;
 
 void    cga_init(cga_t *cga);
-void    cga_out(uint16_t addr, uint8_t val, void *p);
-uint8_t cga_in(uint16_t addr, void *p);
-void    cga_write(uint32_t addr, uint8_t val, void *p);
-uint8_t cga_read(uint32_t addr, void *p);
+void    cga_out(uint16_t addr, uint8_t val, void *priv);
+uint8_t cga_in(uint16_t addr, void *priv);
+void    cga_write(uint32_t addr, uint8_t val, void *priv);
+uint8_t cga_read(uint32_t addr, void *priv);
 void    cga_recalctimings(cga_t *cga);
-void    cga_poll(void *p);
+void    cga_poll(void *priv);
 
 #ifdef EMU_DEVICE_H
 extern const device_config_t cga_config[];
diff --git a/src/video/vid_cga.c b/src/video/vid_cga.c
index 69d9609c6..14ff3b221 100644
--- a/src/video/vid_cga.c
+++ b/src/video/vid_cga.c
@@ -99,7 +99,7 @@ cga_out(uint16_t addr, uint8_t val, void *priv)
 uint8_t
 cga_in(uint16_t addr, void *priv)
 {
-    cga_t *cga = (cga_t *) priv;
+    const cga_t *cga = (cga_t *) priv;
 
     uint8_t ret = 0xff;
 
@@ -135,7 +135,7 @@ cga_pravetz_out(UNUSED(uint16_t addr), uint8_t val, void *priv)
 uint8_t
 cga_pravetz_in(UNUSED(uint16_t addr), void *priv)
 {
-    cga_t *cga = (cga_t *) priv;
+    const cga_t *cga = (cga_t *) priv;
 
     return (cga->fontbase >> 8);
 }