diff --git a/src/gb/gbMemory.cpp b/src/gb/gbMemory.cpp
index 8dc360ed..820da87c 100644
--- a/src/gb/gbMemory.cpp
+++ b/src/gb/gbMemory.cpp
@@ -1013,7 +1013,8 @@ mapperHuC3RTC gbRTCHuC3 = {
     0, // DateTime
     0, // WritingTime
     0, // ModeFlag
-    0 // ClockShift
+    0, // ClockShift
+    { 0 }
 };
 
 void memoryUpdateHuC3Latch() {
diff --git a/src/libretro/libretro.cpp b/src/libretro/libretro.cpp
index 92ca62e4..ecc2b333 100644
--- a/src/libretro/libretro.cpp
+++ b/src/libretro/libretro.cpp
@@ -970,7 +970,7 @@ static bool option_swapAnalogSticks;
 
 static void update_variables(bool startup)
 {
-    struct retro_variable var = {0};
+    struct retro_variable var = { NULL, NULL };
     char key[256] = {0};
     int disabled_layers = 0;
     int sound_enabled = 0x30F;
diff --git a/src/libretro/libretro_core_options.h b/src/libretro/libretro_core_options.h
index 5b5c8acd..f4d80284 100644
--- a/src/libretro/libretro_core_options.h
+++ b/src/libretro/libretro_core_options.h
@@ -618,7 +618,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
         },
         "enabled"
     },
-    { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+    { NULL, NULL, NULL, NULL, NULL, NULL, { { NULL, NULL } }, NULL },
 };
 
 struct retro_core_options_v2 options_us = {
diff --git a/src/libretro/libretro_core_options_intl.h b/src/libretro/libretro_core_options_intl.h
index 38142c86..81f4e95c 100644
--- a/src/libretro/libretro_core_options_intl.h
+++ b/src/libretro/libretro_core_options_intl.h
@@ -613,7 +613,8 @@ struct retro_core_option_v2_definition option_defs_tr[] = {
         },
         "enabled"
     },
-    { NULL, NULL, NULL, NULL, NULL, NULL, {{0}}, NULL },
+
+    { NULL, NULL, NULL, NULL, NULL, NULL, { { NULL, NULL } }, NULL },
 };
 
 struct retro_core_options_v2 options_tr = {