diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index a472781797..902b187070 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -151,7 +151,7 @@ static rcheevos_locals_t rcheevos_locals =
    false /* leaderboard_trackers */
 };
 
-rcheevos_locals_t* get_rcheevos_locals()
+rcheevos_locals_t* get_rcheevos_locals(void)
 {
    return &rcheevos_locals;
 }
diff --git a/cheevos/cheevos_locals.h b/cheevos/cheevos_locals.h
index 34dc7dbe80..5af6fbb464 100644
--- a/cheevos/cheevos_locals.h
+++ b/cheevos/cheevos_locals.h
@@ -151,7 +151,7 @@ typedef struct rcheevos_locals_t
    bool leaderboard_trackers;         /* leaderboard trackers are enabled */
 } rcheevos_locals_t;
 
-rcheevos_locals_t* get_rcheevos_locals();
+rcheevos_locals_t* get_rcheevos_locals(void);
 
 RETRO_END_DECLS
 
diff --git a/deps/7zip/CpuArch.c b/deps/7zip/CpuArch.c
index 02e482e088..ebafb30c03 100644
--- a/deps/7zip/CpuArch.c
+++ b/deps/7zip/CpuArch.c
@@ -144,7 +144,7 @@ int x86cpuid_GetFirm(const Cx86cpuid *p)
   return -1;
 }
 
-BoolInt CPU_Is_InOrder()
+BoolInt CPU_Is_InOrder(void)
 {
   Cx86cpuid p;
   int firm;
@@ -175,7 +175,7 @@ BoolInt CPU_Is_InOrder()
 
 #if !defined(MY_CPU_AMD64) && defined(_WIN32)
 #include <windows.h>
-static BoolInt CPU_Sys_Is_SSE_Supported()
+static BoolInt CPU_Sys_Is_SSE_Supported(void)
 {
   OSVERSIONINFO vi;
   vi.dwOSVersionInfoSize = sizeof(vi);
@@ -188,7 +188,7 @@ static BoolInt CPU_Sys_Is_SSE_Supported()
 #define CHECK_SYS_SSE_SUPPORT
 #endif
 
-BoolInt CPU_Is_Aes_Supported()
+BoolInt CPU_Is_Aes_Supported(void)
 {
   Cx86cpuid p;
   CHECK_SYS_SSE_SUPPORT
@@ -197,7 +197,7 @@ BoolInt CPU_Is_Aes_Supported()
   return (p.c >> 25) & 1;
 }
 
-BoolInt CPU_IsSupported_PageGB()
+BoolInt CPU_IsSupported_PageGB(void)
 {
   Cx86cpuid cpuid;
   if (!x86cpuid_CheckAndRead(&cpuid))
diff --git a/deps/7zip/CpuArch.h b/deps/7zip/CpuArch.h
index bd42938802..f1edae3803 100644
--- a/deps/7zip/CpuArch.h
+++ b/deps/7zip/CpuArch.h
@@ -325,9 +325,9 @@ int x86cpuid_GetFirm(const Cx86cpuid *p);
 #define x86cpuid_GetModel(ver)  (((ver >> 12) &  0xF0) | ((ver >> 4) & 0xF))
 #define x86cpuid_GetStepping(ver) (ver & 0xF)
 
-BoolInt CPU_Is_InOrder();
-BoolInt CPU_Is_Aes_Supported();
-BoolInt CPU_IsSupported_PageGB();
+BoolInt CPU_Is_InOrder(void);
+BoolInt CPU_Is_Aes_Supported(void);
+BoolInt CPU_IsSupported_PageGB(void);
 
 #endif
 
diff --git a/deps/rcheevos/include/rc_hash.h b/deps/rcheevos/include/rc_hash.h
index 7fc61cd678..1e274e6236 100644
--- a/deps/rcheevos/include/rc_hash.h
+++ b/deps/rcheevos/include/rc_hash.h
@@ -120,7 +120,7 @@ extern "C" {
     rc_hash_cdreader_absolute_sector_to_track_sector absolute_sector_to_track_sector;
   };
 
-  void rc_hash_init_default_cdreader();
+  void rc_hash_init_default_cdreader(void);
   void rc_hash_init_custom_cdreader(struct rc_hash_cdreader* reader);
 
   /* ===================================================== */
diff --git a/retroarch.c b/retroarch.c
index 9c08ff84d5..c4060dc9e6 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -39711,29 +39711,31 @@ bool core_options_create_override(bool game_specific)
 {
    char options_path[PATH_MAX_LENGTH];
    config_file_t *conf         = NULL;
-   struct rarch_state *p_rarch = &rarch_st;
 
-   options_path[0] = '\0';
+   options_path[0]             = '\0';
 
-   /* Sanity check - cannot create a folder-specific
-    * override if a game-specific override is
-    * already active */
-   if (!game_specific && runloop_state.game_options_active)
-      goto error;
-
-   /* Get options file path (either game-specific or folder-specific) */
-   if (game_specific)
+   if (!game_specific)
    {
-      if (!retroarch_validate_game_options(
-               options_path,
-            sizeof(options_path), true))
+      /* Sanity check - cannot create a folder-specific
+       * override if a game-specific override is
+       * already active */
+      if (runloop_state.game_options_active)
          goto error;
-   }
-   else
+
+      /* Get options file path (folder-specific) */
       if (!retroarch_validate_folder_options(
                options_path,
                sizeof(options_path), true))
          goto error;
+   }
+   else
+   {
+      /* Get options file path (game-specific) */
+      if (!retroarch_validate_game_options(
+               options_path,
+               sizeof(options_path), true))
+         goto error;
+   }
 
    /* Open config file */
    if (!(conf = config_file_new_from_path_to_string(options_path)))