diff --git a/cheevos-new/cheevos.c b/cheevos-new/cheevos.c
index ac817e1964..d32c8c0ea1 100644
--- a/cheevos-new/cheevos.c
+++ b/cheevos-new/cheevos.c
@@ -1306,7 +1306,7 @@ static int rcheevos_prepare_hash_psx(rcheevos_coro_t* coro)
    else
    {
       /* store the exe name, we're about to overwrite buffer */
-      strncpy(exe_name_buffer, exe_name, sizeof(exe_name_buffer));
+      strlcpy(exe_name_buffer, exe_name, sizeof(exe_name_buffer));
       exe_name_buffer[sizeof(exe_name_buffer) - 1] = '\0';
       exe_name_size = strlen(exe_name_buffer);
 
@@ -2581,7 +2581,7 @@ bool rcheevos_load(const void *data)
    CORO_SETUP();
 
    info = (const struct retro_game_info*)data;
-   strncpy(buffer, path_get_extension(info->path), sizeof(buffer));
+   strlcpy(buffer, path_get_extension(info->path), sizeof(buffer));
 
    if (info->data)
    {
@@ -2636,7 +2636,7 @@ bool rcheevos_load(const void *data)
             free((void*)coro->path);
             coro->path = strdup(disc_path);
 
-            strncpy(buffer, path_get_extension(disc_path), sizeof(buffer));
+            strlcpy(buffer, path_get_extension(disc_path), sizeof(buffer));
          }
       }
    }
diff --git a/retroarch.c b/retroarch.c
index 83f5e4d5af..137ebee0a2 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -28962,188 +28962,11 @@ bool accessibility_speak(char* speak_text)
    return accessibility_speak_priority(speak_text, 10);
 }
 
-bool accessibility_speak_priority(char* speak_text, int priority)
-{
-   RARCH_LOG("Spoke: %s\n", speak_text);
-   const char* voice = NULL;
-   if (accessibility_enabled)
-   {
-#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
-      voice = get_user_language_iso639_1(true);
-      return accessibility_speak_windows(speak_text, voice, priority);
-#elif defined(__APPLE__) && defined(__MACH__)
-      voice = get_user_language_iso639_1(false);
-      return accessibility_speak_macos(speak_text, voice, priority);
-#elif defined(__linux__) || defined(__unix__)
-      voice = get_user_language_iso639_1(true);
-      return accessibility_speak_linux(speak_text, voice, priority);
-#endif
-
-      if (1==0)
-      {
-         return accessibility_speak_ai_service(speak_text, voice, priority);
-      }
-   }
-   return true;
-}
-
-
-bool is_narrator_running(void)
-{
-   if (accessibility_enabled)
-   {
-#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
-      return is_narrator_running_windows();
-#elif defined(__APPLE__) && defined(__MACH__)
-      return is_narrator_running_macos();
-#elif defined(__linux__) || defined(__unix__)
-      return is_narrator_running_linux();
-#endif
-   }
-   return true;
-}
-
-
-#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
-PROCESS_INFORMATION pi;
-bool pi_set = false;
-
-bool terminate_win32_process(PROCESS_INFORMATION pi)
-{
-   TerminateProcess(pi.hProcess,0);
-   CloseHandle(pi.hProcess);
-   CloseHandle(pi.hThread);
-   return true;
-}
-
-bool CreateWin32Process(char* cmd)
-{
-   STARTUPINFO si;
-   ZeroMemory(&si, sizeof(si));
-   si.cb = sizeof(si);
-   ZeroMemory(&pi, sizeof(pi));
-
-   if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, CREATE_NO_WINDOW,
-                      NULL, NULL, &si, &pi))
-   {
-      pi_set = false;
-      return false;
-   }
-   pi_set = true;
-   return true;
-}
-
-char* accessibility_win_language_code(const char* language)
-{
-   if (strcmp(language,"en") == 0)
-      return "Microsoft David Desktop";
-   else if (strcmp(language,"it") == 0)
-      return "Microsoft Cosimo Desktop";
-   else if (strcmp(language,"sv") == 0)
-      return "Microsoft Bengt Desktop";
-   else if (strcmp(language,"fr") == 0)
-      return "Microsoft Paul Desktop";
-   else if (strcmp(language,"de") == 0)
-      return "Microsoft Stefan Desktop";
-   else if (strcmp(language,"he") == 0)
-      return "Microsoft Hemant Desktop";
-   else if (strcmp(language,"id") == 0)
-      return "Microsoft Asaf Desktop";
-   else if (strcmp(language,"es") == 0)
-      return "Microsoft Pablo Desktop";
-   else if (strcmp(language,"nl") == 0)
-      return "Microsoft Frank Desktop";
-   else if (strcmp(language,"ro") == 0)
-      return "Microsoft Andrei Desktop";
-   else if (strcmp(language,"pt_pt") == 0)
-      return "Microsoft Helia Desktop";
-   else if (strcmp(language,"pt_bt") == 0 || strcmp(language,"pt") == 0)
-      return "Microsoft Daniel Desktop";
-   else if (strcmp(language,"th") == 0)
-      return "Microsoft Pattara Desktop";
-   else if (strcmp(language,"ja") == 0)
-      return "Microsoft Ichiro Desktop";
-   else if (strcmp(language,"sk") == 0)
-      return "Microsoft Filip Desktop";
-   else if (strcmp(language,"hi") == 0)
-      return "Microsoft Hemant Desktop";
-   else if (strcmp(language,"ar") == 0)
-      return "Microsoft Naayf Desktop";
-   else if (strcmp(language,"hu") == 0)
-      return "Microsoft Szabolcs Desktop";
-   else if (strcmp(language,"zh_tw") == 0 || strcmp(language,"zh")==0)
-      return "Microsoft Zhiwei Desktop";
-   else if (strcmp(language,"el") == 0)
-      return "Microsoft Stefanos Desktop";
-   else if (strcmp(language,"ru") == 0)
-      return "Microsoft Pavel Desktop";
-   else if (strcmp(language,"nb") == 0)
-      return "Microsoft Jon Desktop";
-   else if (strcmp(language,"da") == 0)
-      return "Microsoft Helle Desktop";
-   else if (strcmp(language,"fi") == 0)
-      return "Microsoft Heidi Desktop";
-   else if (strcmp(language,"zh_hk") == 0)
-      return "Microsoft Danny Desktop";
-   else if (strcmp(language,"zh_cn") == 0)
-      return "Microsoft Kangkang Desktop";
-   else if (strcmp(language,"tr") == 0)
-      return "Microsoft Tolga Desktop";
-   else if (strcmp(language,"ko") == 0)
-      return "Microsoft Heami Desktop";
-   else if (strcmp(language,"pl") == 0)
-      return "Microsoft Adam Desktop";
-   else if (strcmp(language,"cs") == 0) 
-      return "Microsoft Jakub Desktop";
-   else
-      return "";
-}
-
-bool is_narrator_running_windows(void)
-{
-   DWORD status = 0;
-   bool res;
-   if (pi_set == false)
-      return false;
-   res = GetExitCodeProcess(&pi, &status);
-   if (res == true && status == STILL_ACTIVE)
-      return true;
-   return false;
-}
-
-bool accessibility_speak_windows(char* speak_text, const char* voice, int priority)
-{
-   char cmd[1200];
-   char* language = accessibility_win_language_code(voice);
-   bool res;
-   if (priority < 10)
-   {
-      if (is_narrator_running_windows())
-         return true;
-   }
-
-   if (strlen(language) > 0) 
-      snprintf(cmd, sizeof(cmd),
-               "powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.SelectVoice(\\\"%s\\\"); $synth.Speak(\\\"%s\\\");\"", language, speak_text); 
-   else
-      snprintf(cmd, sizeof(cmd),
-               "powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.Speak(\\\"%s\\\");\"", speak_text); 
-   if (pi_set)
-   {
-      terminate_win32_process(pi);
-   }
-   res = CreateWin32Process(cmd);
-   if (!res)
-   {
-      RARCH_LOG("Create subprocess failed. Error: %d\n", GetLastError()); 
-   }
-   return true;
-}
-#endif
 
 #if defined(__APPLE__) && defined(__MACH__)
-char* accessibility_mac_language_code(const char* language)
+static char* accessibility_mac_language_code(const char* language)
 {
+   /* TODO/FIXME - replace strcmp with string_is_equal */
    if (strcmp(language,"en") == 0)
       return "Alex";
    else if (strcmp(language,"it") == 0)
@@ -29215,7 +29038,8 @@ bool is_narrator_running_macos(void)
    return false;
 }
 
-bool accessibility_speak_macos(char* speak_text, const char* voice, int priority)
+static bool accessibility_speak_macos(
+      char* speak_text, const char* voice, int priority)
 {
    int pid;
    char* language_speaker = accessibility_mac_language_code(voice);
@@ -29226,7 +29050,7 @@ bool accessibility_speak_macos(char* speak_text, const char* voice, int priority
       if (is_narrator_running_macos())
          return true;
    }
-   
+
    if (speak_pid > 0)
    {
       /* Kill the running espeak */
@@ -29254,7 +29078,7 @@ bool accessibility_speak_macos(char* speak_text, const char* voice, int priority
       /* child process: replace process with the espeak command */ 
       if (strlen(language_speaker)> 0)
          execvp("say", (char* []) {"say", "-v", language_speaker, 
-                                   speak_text, NULL});
+               speak_text, NULL});
       else
          execvp("say", (char* []) {"say", speak_text, NULL});
    }
@@ -29262,16 +29086,180 @@ bool accessibility_speak_macos(char* speak_text, const char* voice, int priority
 }
 #endif
 
+#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
+static char *accessibility_win_language_code(const char* language)
+{
+   /* TODO/FIXME - replace strcmp with string_is_equal */
+   if (strcmp(language,"en") == 0)
+      return "Microsoft David Desktop";
+   else if (strcmp(language,"it") == 0)
+      return "Microsoft Cosimo Desktop";
+   else if (strcmp(language,"sv") == 0)
+      return "Microsoft Bengt Desktop";
+   else if (strcmp(language,"fr") == 0)
+      return "Microsoft Paul Desktop";
+   else if (strcmp(language,"de") == 0)
+      return "Microsoft Stefan Desktop";
+   else if (strcmp(language,"he") == 0)
+      return "Microsoft Hemant Desktop";
+   else if (strcmp(language,"id") == 0)
+      return "Microsoft Asaf Desktop";
+   else if (strcmp(language,"es") == 0)
+      return "Microsoft Pablo Desktop";
+   else if (strcmp(language,"nl") == 0)
+      return "Microsoft Frank Desktop";
+   else if (strcmp(language,"ro") == 0)
+      return "Microsoft Andrei Desktop";
+   else if (strcmp(language,"pt_pt") == 0)
+      return "Microsoft Helia Desktop";
+   else if (strcmp(language,"pt_bt") == 0 || strcmp(language,"pt") == 0)
+      return "Microsoft Daniel Desktop";
+   else if (strcmp(language,"th") == 0)
+      return "Microsoft Pattara Desktop";
+   else if (strcmp(language,"ja") == 0)
+      return "Microsoft Ichiro Desktop";
+   else if (strcmp(language,"sk") == 0)
+      return "Microsoft Filip Desktop";
+   else if (strcmp(language,"hi") == 0)
+      return "Microsoft Hemant Desktop";
+   else if (strcmp(language,"ar") == 0)
+      return "Microsoft Naayf Desktop";
+   else if (strcmp(language,"hu") == 0)
+      return "Microsoft Szabolcs Desktop";
+   else if (strcmp(language,"zh_tw") == 0 || strcmp(language,"zh")==0)
+      return "Microsoft Zhiwei Desktop";
+   else if (strcmp(language,"el") == 0)
+      return "Microsoft Stefanos Desktop";
+   else if (strcmp(language,"ru") == 0)
+      return "Microsoft Pavel Desktop";
+   else if (strcmp(language,"nb") == 0)
+      return "Microsoft Jon Desktop";
+   else if (strcmp(language,"da") == 0)
+      return "Microsoft Helle Desktop";
+   else if (strcmp(language,"fi") == 0)
+      return "Microsoft Heidi Desktop";
+   else if (strcmp(language,"zh_hk") == 0)
+      return "Microsoft Danny Desktop";
+   else if (strcmp(language,"zh_cn") == 0)
+      return "Microsoft Kangkang Desktop";
+   else if (strcmp(language,"tr") == 0)
+      return "Microsoft Tolga Desktop";
+   else if (strcmp(language,"ko") == 0)
+      return "Microsoft Heami Desktop";
+   else if (strcmp(language,"pl") == 0)
+      return "Microsoft Adam Desktop";
+   else if (strcmp(language,"cs") == 0) 
+      return "Microsoft Jakub Desktop";
+   else
+      return "";
+}
+#endif
+
+#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
+PROCESS_INFORMATION pi;
+bool pi_set = false;
+
+static bool terminate_win32_process(PROCESS_INFORMATION pi)
+{
+   TerminateProcess(pi.hProcess,0);
+   CloseHandle(pi.hProcess);
+   CloseHandle(pi.hThread);
+   return true;
+}
+
+static bool create_win32_process(char* cmd)
+{
+   STARTUPINFO si;
+   ZeroMemory(&si, sizeof(si));
+   si.cb = sizeof(si);
+   ZeroMemory(&pi, sizeof(pi));
+
+   if (!CreateProcess(NULL, cmd, NULL, NULL, FALSE, CREATE_NO_WINDOW,
+                      NULL, NULL, &si, &pi))
+   {
+      pi_set = false;
+      return false;
+   }
+   pi_set = true;
+   return true;
+}
+
+static bool is_narrator_running_windows(void)
+{
+   DWORD status = 0;
+   bool res;
+   if (pi_set == false)
+      return false;
+   res = GetExitCodeProcess(&pi, &status);
+   if (res && status == STILL_ACTIVE)
+      return true;
+   return false;
+}
+
+static bool accessibility_speak_windows(
+      char* speak_text, const char* voice, int priority)
+{
+   char cmd[1200];
+   char* language = accessibility_win_language_code(voice);
+   bool res;
+   if (priority < 10)
+   {
+      if (is_narrator_running_windows())
+         return true;
+   }
+
+   if (strlen(language) > 0) 
+      snprintf(cmd, sizeof(cmd),
+               "powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.SelectVoice(\\\"%s\\\"); $synth.Speak(\\\"%s\\\");\"", language, speak_text); 
+   else
+      snprintf(cmd, sizeof(cmd),
+               "powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.Speak(\\\"%s\\\");\"", speak_text); 
+   if (pi_set)
+      terminate_win32_process(pi);
+   res = create_win32_process(cmd);
+   if (!res)
+   {
+      RARCH_LOG("Create subprocess failed. Error: %d\n", GetLastError()); 
+   }
+   return true;
+}
+#endif
+
+bool accessibility_speak_priority(char* speak_text, int priority)
+{
+   RARCH_LOG("Spoke: %s\n", speak_text);
+   const char* voice = NULL;
+   if (accessibility_enabled)
+   {
+#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
+      voice = get_user_language_iso639_1(true);
+      return accessibility_speak_windows(speak_text, voice, priority);
+#elif defined(__APPLE__) && defined(__MACH__)
+      voice = get_user_language_iso639_1(false);
+      return accessibility_speak_macos(speak_text, voice, priority);
+#elif defined(__linux__) || defined(__unix__)
+      voice = get_user_language_iso639_1(true);
+      return accessibility_speak_linux(speak_text, voice, priority);
+#endif
+
+      if (1==0)
+      {
+         return accessibility_speak_ai_service(speak_text, voice, priority);
+      }
+   }
+   return true;
+}
 
 #if defined(__linux__) || defined(__unix__)
-bool is_narrator_running_linux(void)
+static bool is_narrator_running_linux(void)
 {
    if (kill(speak_pid, 0) == 0)
       return true;
    return false;
 }
 
-bool accessibility_speak_linux(char* speak_text, const char* language, int priority)
+static bool accessibility_speak_linux(
+      char* speak_text, const char* language, int priority)
 {
    int pid;
    char* voice_out = malloc(3+strlen(language));
@@ -29315,6 +29303,23 @@ bool accessibility_speak_linux(char* speak_text, const char* language, int prior
 }
 #endif
 
+
+bool is_narrator_running(void)
+{
+   if (accessibility_enabled)
+   {
+#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
+      return is_narrator_running_windows();
+#elif defined(__APPLE__) && defined(__MACH__)
+      return is_narrator_running_macos();
+#elif defined(__linux__) || defined(__unix__)
+      return is_narrator_running_linux();
+#endif
+   }
+   return true;
+}
+
+
 bool accessibility_speak_ai_service(char* speak_text, const char* language, int priority)
 {
 #if defined(HAVE_NETWORKING) && defined(HAVE_TRANSLATE)
diff --git a/retroarch.h b/retroarch.h
index 6a27f64479..b4bf65641a 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -2020,8 +2020,6 @@ bool menu_widgets_ready(void);
 
 unsigned int retroarch_get_rotation(void);
 
-RETRO_END_DECLS
-
 bool is_input_keyboard_display_on(void);
 bool is_accessibility_enabled(void);
 bool accessibility_speak(char* speak_text);
@@ -2030,17 +2028,9 @@ bool accessibility_startup_message(void);
 
 bool is_narrator_running(void);
 
-#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
-bool is_narrator_running_windows(void);
-bool accessibility_speak_windows(char* speak_text, const char* voice, int priority);
-#elif defined(__APPLE__) && defined(__MACH__)
-bool is_narrator_running_macos(void);
-char* accessibility_mac_language_code(const char* language);
-bool accessibility_speak_macos(char* speak_text, const char* voice, int priority);
-#elif defined(__linux__) || defined(__unix__)
-bool is_narrator_running_linux(void);
-bool accessibility_speak_linux(char* speak_text, const char* voice, int priority);
-#endif
-bool accessibility_speak_ai_service(char* speak_text, const char* voice, int priority);
+bool accessibility_speak_ai_service(
+      char* speak_text, const char* voice, int priority);
+
+RETRO_END_DECLS
 
 #endif