diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index b3208de92..f644f48e4 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -320,7 +320,7 @@ cpu_get_family(const char *internal_name)
 	int c = 0;
 	while (cpu_families[c].package) {
 		if (!strcmp(internal_name, cpu_families[c].internal_name))
-			return &cpu_families[c];
+			return (cpu_family_t *) &cpu_families[c];
 		c++;
 	}
 
diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c
index 2d98dc0fe..e7523b553 100644
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -1858,5 +1858,5 @@ const cpu_legacy_machine_t cpu_legacy_table[] = {
     {"p6bap",                   cputables_Celeron_Cyrix3},
     {"603tcf",                  cputables_Celeron_Cyrix3},
     {"vpc2007",                 cputables_PentiumIID_Celeron},
-    {NULL, {NULL}}
+    {NULL, NULL}
 };
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 8c08d9ae2..1ca739b9d 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -769,7 +769,7 @@ win_settings_machine_recalc_machine(HWND hdlg)
 	fatal("No eligible CPU families for the selected machine\n");
     settings_enable_window(hdlg, IDC_COMBO_CPU_TYPE, TRUE);
     if (current_eligible == -1) {
-	temp_cpu_f = &cpu_families[listtocpufamily[0]];
+	temp_cpu_f = (cpu_family_t *) &cpu_families[listtocpufamily[0]];
 	settings_set_cur_sel(hdlg, IDC_COMBO_CPU_TYPE, 0);
     } else {
 	settings_set_cur_sel(hdlg, IDC_COMBO_CPU_TYPE, current_eligible);
@@ -937,7 +937,7 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 				break;
 			case IDC_COMBO_CPU_TYPE:
 				if (HIWORD(wParam) == CBN_SELCHANGE) {
-					temp_cpu_f = &cpu_families[listtocpufamily[settings_get_cur_sel(hdlg, IDC_COMBO_CPU_TYPE)]];
+					temp_cpu_f = (cpu_family_t *) &cpu_families[listtocpufamily[settings_get_cur_sel(hdlg, IDC_COMBO_CPU_TYPE)]];
 					temp_cpu = 0;
 					win_settings_machine_recalc_cpu_m(hdlg);
 				}