diff --git a/src/Makefile.mingw b/src/Makefile.mingw
index c7850ce4a..a41ace019 100644
--- a/src/Makefile.mingw
+++ b/src/Makefile.mingw
@@ -113,13 +113,10 @@ VIDOBJ	= video.o \
 	    vid_ati_eeprom.o vid_ati18800.o vid_ati28800.o \
 	      vid_ati68860_ramdac.o vid_ati_mach64.o \
 	      vid_ics2595.o \
-	    vid_cl_gd.o vid_cl_gd_blit.o vid_cl_ramdac.o \
-	    vid_bt485_ramdac.o \
 	    vid_sdac_ramdac.o \
 	    vid_stg_ramdac.o \
 	    vid_unk_ramdac.o \
 	    vid_wy700.o \
-	    vid_nv_riva128.o \
 	    vid_voodoo.o \
 	    vid_pcjr.o vid_ps1_svga.o \
 	    vid_olivetti_m24.o \
diff --git a/src/Makefile.mingw64 b/src/Makefile.mingw64
index c880ecaac..19d33a53b 100644
--- a/src/Makefile.mingw64
+++ b/src/Makefile.mingw64
@@ -113,13 +113,10 @@ VIDOBJ	= video.o \
 	    vid_ati_eeprom.o vid_ati18800.o vid_ati28800.o \
 	      vid_ati68860_ramdac.o vid_ati_mach64.o \
 	      vid_ics2595.o \
-	    vid_cl_gd.o vid_cl_gd_blit.o vid_cl_ramdac.o \
-	    vid_bt485_ramdac.o \
 	    vid_sdac_ramdac.o \
 	    vid_stg_ramdac.o \
 	    vid_unk_ramdac.o \
 	    vid_wy700.o \
-	    vid_nv_riva128.o \
 	    vid_voodoo.o \
 	    vid_pcjr.o vid_ps1_svga.o \
 	    vid_olivetti_m24.o \
diff --git a/src/vid_nv_riva128.c b/src/vid_nv_riva128.c
index 5fdcfc2b0..06c08f5c0 100644
--- a/src/vid_nv_riva128.c
+++ b/src/vid_nv_riva128.c
@@ -3335,7 +3335,7 @@ static void rivatnt2_add_status_info(char *s, int max_len, void *p)
 static device_config_t rivatnt2_config[] =
 {
 	{
-		"model", "Card model", CONFIG_SELECTION, 0,
+		"model", "Card model", CONFIG_SELECTION, "", 0,
 		{
 			{
 				"Vanilla TNT2", 0,
@@ -3349,7 +3349,7 @@ static device_config_t rivatnt2_config[] =
 		},
 	},
 	{
-		"memory", "Memory size", CONFIG_SELECTION, 32,
+		"memory", "Memory size", CONFIG_SELECTION, "", 32,
 		{
 			{
 				"4 MB", 4
@@ -3407,7 +3407,7 @@ static device_config_t rivatnt2_config[] =
 		},
 	},
 	{
-		-1
+		"", "", -1
 	}
 };