diff --git a/bluetooth/bluetooth_driver.c b/bluetooth/bluetooth_driver.c
index e7bede8089..9fbd34a21e 100644
--- a/bluetooth/bluetooth_driver.c
+++ b/bluetooth/bluetooth_driver.c
@@ -1,206 +1,206 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2021 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#include "../driver.h"
-#include "../list_special.h"
-#include "../retroarch.h"
-#include "../runloop.h"
-#include "../verbosity.h"
-
-#include "bluetooth_driver.h"
-
-static bluetooth_driver_t bluetooth_null = {
-   NULL, /* init */
-   NULL, /* free */
-   NULL, /* scan */
-   NULL, /* get_devices */
-   NULL, /* device_is_connected */
-   NULL, /* device_get_sublabel */
-   NULL, /* connect_device */
-   NULL, /* remove_device */
-   "null",
-};
-
-const bluetooth_driver_t *bluetooth_drivers[] = {
-#ifdef HAVE_BLUETOOTH
-   &bluetooth_bluetoothctl,
-#ifdef HAVE_DBUS
-   &bluetooth_bluez,
-#endif
-#endif
-   &bluetooth_null,
-   NULL,
-};
-
-static bluetooth_driver_state_t bluetooth_driver_st;
-
-bluetooth_driver_state_t *bluetooth_state_get_ptr(void)
-{
-   return &bluetooth_driver_st;
-}
-
-/**
- * config_get_bluetooth_driver_options:
- *
- * Get an enumerated list of all bluetooth driver names,
- * separated by '|'.
- *
- * Returns: string listing of all bluetooth driver names,
- * separated by '|'.
- **/
-const char* config_get_bluetooth_driver_options(void)
-{
-   return char_list_new_special(STRING_LIST_BLUETOOTH_DRIVERS, NULL);
-}
-
-void driver_bluetooth_scan(void)
-{
-   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
-   if (     bt_st
-        &&  bt_st->active
-        &&  bt_st->drv->scan )
-      bt_st->drv->scan(bt_st->data);
-}
-
-void driver_bluetooth_get_devices(struct string_list* devices)
-{
-   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
-   if (     bt_st
-        &&  bt_st->active
-        &&  bt_st->drv->get_devices )
-      bt_st->drv->get_devices(bt_st->data, devices);
-}
-
-bool driver_bluetooth_device_is_connected(unsigned i)
-{
-   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
-   if (    bt_st
-        && bt_st->active
-        && bt_st->drv->device_is_connected )
-      return bt_st->drv->device_is_connected(bt_st->data, i);
-   return false;
-}
-
-void driver_bluetooth_device_get_sublabel(char *s, unsigned i, size_t len)
-{
-   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
-   if (     bt_st
-        &&  bt_st->active
-        &&  bt_st->drv->device_get_sublabel )
-      bt_st->drv->device_get_sublabel(bt_st->data, s, i, len);
-}
-
-bool driver_bluetooth_connect_device(unsigned i)
-{
-   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
-   if (bt_st->active)
-      return bt_st->drv->connect_device(bt_st->data, i);
-   return false;
-}
-
-bool driver_bluetooth_remove_device(unsigned i)
-{
-   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
-   if (bt_st->active)
-      return bt_st->drv->remove_device(bt_st->data, i);
-   return false;
-}
-
-bool bluetooth_driver_ctl(enum rarch_bluetooth_ctl_state state, void *data)
-{
-   bluetooth_driver_state_t *bt_st  = &bluetooth_driver_st;
-   settings_t             *settings = config_get_ptr();
-
-   switch (state)
-   {
-      case RARCH_BLUETOOTH_CTL_DESTROY:
-         bt_st->drv              = NULL;
-         bt_st->data             = NULL;
-         bt_st->active           = false;
-         break;
-      case RARCH_BLUETOOTH_CTL_FIND_DRIVER:
-         {
-            const char *prefix   = "bluetooth driver";
-            int i                = (int)driver_find_index(
-                  "bluetooth_driver",
-                  settings->arrays.bluetooth_driver);
-
-            if (i >= 0)
-               bt_st->drv        = (const bluetooth_driver_t*)bluetooth_drivers[i];
-            else
-            {
-               if (verbosity_is_enabled())
-               {
-                  unsigned d;
-                  RARCH_ERR("Couldn't find any %s named \"%s\"\n", prefix,
-                        settings->arrays.bluetooth_driver);
-                  RARCH_LOG_OUTPUT("Available %ss are:\n", prefix);
-                  for (d = 0; bluetooth_drivers[d]; d++)
-                     RARCH_LOG_OUTPUT("\t%s\n", bluetooth_drivers[d]->ident);
-
-                  RARCH_WARN("Going to default to first %s...\n", prefix);
-               }
-
-               bt_st->drv = (const bluetooth_driver_t*)bluetooth_drivers[0];
-
-               if (!bt_st->drv)
-                  retroarch_fail(1, "find_bluetooth_driver()");
-            }
-         }
-         break;
-      case RARCH_BLUETOOTH_CTL_DEINIT:
-        if (bt_st->data && bt_st->drv)
-        {
-           if (bt_st->drv->free)
-              bt_st->drv->free(bt_st->data);
-        }
-
-        bt_st->data   = NULL;
-        bt_st->active = false;
-        break;
-      case RARCH_BLUETOOTH_CTL_INIT:
-        /* Resource leaks will follow if bluetooth is initialized twice. */
-        if (bt_st->data)
-           return false;
-
-        bluetooth_driver_ctl(RARCH_BLUETOOTH_CTL_FIND_DRIVER, NULL);
-
-        if (bt_st->drv && bt_st->drv->init)
-        {
-           bt_st->active = true;
-           bt_st->data   = bt_st->drv->init();
-
-           if (!bt_st->data)
-           {
-              RARCH_ERR("Failed to initialize bluetooth driver. Will continue without bluetooth.\n");
-              bt_st->active = false;
-           }
-        }
-        else
-           bt_st->active = false;
-        break;
-      default:
-         break;
-   }
-
-   return false;
-}
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2021 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+#include "../driver.h"
+#include "../list_special.h"
+#include "../retroarch.h"
+#include "../runloop.h"
+#include "../verbosity.h"
+
+#include "bluetooth_driver.h"
+
+static bluetooth_driver_t bluetooth_null = {
+   NULL, /* init */
+   NULL, /* free */
+   NULL, /* scan */
+   NULL, /* get_devices */
+   NULL, /* device_is_connected */
+   NULL, /* device_get_sublabel */
+   NULL, /* connect_device */
+   NULL, /* remove_device */
+   "null",
+};
+
+const bluetooth_driver_t *bluetooth_drivers[] = {
+#ifdef HAVE_BLUETOOTH
+   &bluetooth_bluetoothctl,
+#ifdef HAVE_DBUS
+   &bluetooth_bluez,
+#endif
+#endif
+   &bluetooth_null,
+   NULL,
+};
+
+static bluetooth_driver_state_t bluetooth_driver_st = {0};
+
+bluetooth_driver_state_t *bluetooth_state_get_ptr(void)
+{
+   return &bluetooth_driver_st;
+}
+
+/**
+ * config_get_bluetooth_driver_options:
+ *
+ * Get an enumerated list of all bluetooth driver names,
+ * separated by '|'.
+ *
+ * Returns: string listing of all bluetooth driver names,
+ * separated by '|'.
+ **/
+const char* config_get_bluetooth_driver_options(void)
+{
+   return char_list_new_special(STRING_LIST_BLUETOOTH_DRIVERS, NULL);
+}
+
+void driver_bluetooth_scan(void)
+{
+   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
+   if (     bt_st
+        &&  bt_st->active
+        &&  bt_st->drv->scan )
+      bt_st->drv->scan(bt_st->data);
+}
+
+void driver_bluetooth_get_devices(struct string_list* devices)
+{
+   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
+   if (     bt_st
+        &&  bt_st->active
+        &&  bt_st->drv->get_devices )
+      bt_st->drv->get_devices(bt_st->data, devices);
+}
+
+bool driver_bluetooth_device_is_connected(unsigned i)
+{
+   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
+   if (    bt_st
+        && bt_st->active
+        && bt_st->drv->device_is_connected )
+      return bt_st->drv->device_is_connected(bt_st->data, i);
+   return false;
+}
+
+void driver_bluetooth_device_get_sublabel(char *s, unsigned i, size_t len)
+{
+   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
+   if (     bt_st
+        &&  bt_st->active
+        &&  bt_st->drv->device_get_sublabel )
+      bt_st->drv->device_get_sublabel(bt_st->data, s, i, len);
+}
+
+bool driver_bluetooth_connect_device(unsigned i)
+{
+   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
+   if (bt_st->active)
+      return bt_st->drv->connect_device(bt_st->data, i);
+   return false;
+}
+
+bool driver_bluetooth_remove_device(unsigned i)
+{
+   bluetooth_driver_state_t *bt_st = &bluetooth_driver_st;
+   if (bt_st->active)
+      return bt_st->drv->remove_device(bt_st->data, i);
+   return false;
+}
+
+bool bluetooth_driver_ctl(enum rarch_bluetooth_ctl_state state, void *data)
+{
+   bluetooth_driver_state_t *bt_st  = &bluetooth_driver_st;
+   settings_t             *settings = config_get_ptr();
+
+   switch (state)
+   {
+      case RARCH_BLUETOOTH_CTL_DESTROY:
+         bt_st->drv              = NULL;
+         bt_st->data             = NULL;
+         bt_st->active           = false;
+         break;
+      case RARCH_BLUETOOTH_CTL_FIND_DRIVER:
+         {
+            const char *prefix   = "bluetooth driver";
+            int i                = (int)driver_find_index(
+                  "bluetooth_driver",
+                  settings->arrays.bluetooth_driver);
+
+            if (i >= 0)
+               bt_st->drv        = (const bluetooth_driver_t*)bluetooth_drivers[i];
+            else
+            {
+               if (verbosity_is_enabled())
+               {
+                  unsigned d;
+                  RARCH_ERR("Couldn't find any %s named \"%s\"\n", prefix,
+                        settings->arrays.bluetooth_driver);
+                  RARCH_LOG_OUTPUT("Available %ss are:\n", prefix);
+                  for (d = 0; bluetooth_drivers[d]; d++)
+                     RARCH_LOG_OUTPUT("\t%s\n", bluetooth_drivers[d]->ident);
+
+                  RARCH_WARN("Going to default to first %s...\n", prefix);
+               }
+
+               bt_st->drv = (const bluetooth_driver_t*)bluetooth_drivers[0];
+
+               if (!bt_st->drv)
+                  retroarch_fail(1, "find_bluetooth_driver()");
+            }
+         }
+         break;
+      case RARCH_BLUETOOTH_CTL_DEINIT:
+        if (bt_st->data && bt_st->drv)
+        {
+           if (bt_st->drv->free)
+              bt_st->drv->free(bt_st->data);
+        }
+
+        bt_st->data   = NULL;
+        bt_st->active = false;
+        break;
+      case RARCH_BLUETOOTH_CTL_INIT:
+        /* Resource leaks will follow if bluetooth is initialized twice. */
+        if (bt_st->data)
+           return false;
+
+        bluetooth_driver_ctl(RARCH_BLUETOOTH_CTL_FIND_DRIVER, NULL);
+
+        if (bt_st->drv && bt_st->drv->init)
+        {
+           bt_st->active = true;
+           bt_st->data   = bt_st->drv->init();
+
+           if (!bt_st->data)
+           {
+              RARCH_ERR("Failed to initialize bluetooth driver. Will continue without bluetooth.\n");
+              bt_st->active = false;
+           }
+        }
+        else
+           bt_st->active = false;
+        break;
+      default:
+         break;
+   }
+
+   return false;
+}
diff --git a/camera/camera_driver.c b/camera/camera_driver.c
index 2d8d226a9a..8609ef4621 100644
--- a/camera/camera_driver.c
+++ b/camera/camera_driver.c
@@ -1,146 +1,146 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2021 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-
-#include <libretro.h>
-
-#include "../configuration.h"
-#include "../driver.h"
-#include "../list_special.h"
-#include "../runloop.h"
-#include "../verbosity.h"
-
-#include "camera_driver.h"
-
-static void *nullcamera_init(const char *device, uint64_t caps,
-      unsigned width, unsigned height) { return (void*)-1; }
-static void nullcamera_free(void *data) { }
-static void nullcamera_stop(void *data) { }
-static bool nullcamera_start(void *data) { return true; }
-static bool nullcamera_poll(void *a,
-      retro_camera_frame_raw_framebuffer_t b,
-      retro_camera_frame_opengl_texture_t c) { return true; }
-
-static camera_driver_t camera_null = {
-   nullcamera_init,
-   nullcamera_free,
-   nullcamera_start,
-   nullcamera_stop,
-   nullcamera_poll,
-   "null",
-};
-
-const camera_driver_t *camera_drivers[] = {
-#ifdef HAVE_V4L2
-   &camera_v4l2,
-#endif
-#ifdef EMSCRIPTEN
-   &camera_rwebcam,
-#endif
-#ifdef ANDROID
-   &camera_android,
-#endif
-   &camera_null,
-   NULL,
-};
-
-static camera_driver_state_t camera_driver_st;
-
-camera_driver_state_t *camera_state_get_ptr(void)
-{
-   return &camera_driver_st;
-}
-
-/**
- * config_get_camera_driver_options:
- *
- * Get an enumerated list of all camera driver names,
- * separated by '|'.
- *
- * Returns: string listing of all camera driver names,
- * separated by '|'.
- **/
-const char *config_get_camera_driver_options(void)
-{
-   return char_list_new_special(STRING_LIST_CAMERA_DRIVERS, NULL);
-}
-
-bool driver_camera_start(void)
-{
-   camera_driver_state_t *camera_st = &camera_driver_st;
-   if (     camera_st
-         && camera_st->data
-         && camera_st->driver
-         && camera_st->driver->start)
-   {
-      settings_t *settings = config_get_ptr();
-      bool camera_allow    = settings->bools.camera_allow;
-      if (camera_allow)
-         return camera_st->driver->start(camera_st->data);
-
-      runloop_msg_queue_push(
-            "Camera is explicitly disabled.\n", 1, 180, false,
-            NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
-   }
-   return true;
-}
-
-void driver_camera_stop(void)
-{
-   camera_driver_state_t *camera_st = &camera_driver_st;
-   if (     camera_st->driver
-         && camera_st->driver->stop
-         && camera_st->data)
-      camera_st->driver->stop(camera_st->data);
-}
-
-bool camera_driver_find_driver(const char *prefix,
-      bool verbosity_enabled)
-{
-   settings_t *settings         = config_get_ptr();
-   camera_driver_state_t
-      *camera_st                = &camera_driver_st;
-   int i                        = (int)driver_find_index(
-         "camera_driver",
-         settings->arrays.camera_driver);
-
-   if (i >= 0)
-      camera_st->driver = (const camera_driver_t*)camera_drivers[i];
-   else
-   {
-      if (verbosity_enabled)
-      {
-         unsigned d;
-         RARCH_ERR("Couldn't find any %s named \"%s\"\n", prefix,
-               settings->arrays.camera_driver);
-         RARCH_LOG_OUTPUT("Available %ss are:\n", prefix);
-         for (d = 0; camera_drivers[d]; d++)
-         {
-            if (camera_drivers[d])
-            {
-               RARCH_LOG_OUTPUT("\t%s\n", camera_drivers[d]->ident);
-            }
-         }
-
-         RARCH_WARN("Going to default to first %s...\n", prefix);
-      }
-
-      if (!(camera_st->driver = (const camera_driver_t*)camera_drivers[0]))
-         return false;
-   }
-   return true;
-}
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2021 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+
+#include <libretro.h>
+
+#include "../configuration.h"
+#include "../driver.h"
+#include "../list_special.h"
+#include "../runloop.h"
+#include "../verbosity.h"
+
+#include "camera_driver.h"
+
+static void *nullcamera_init(const char *device, uint64_t caps,
+      unsigned width, unsigned height) { return (void*)-1; }
+static void nullcamera_free(void *data) { }
+static void nullcamera_stop(void *data) { }
+static bool nullcamera_start(void *data) { return true; }
+static bool nullcamera_poll(void *a,
+      retro_camera_frame_raw_framebuffer_t b,
+      retro_camera_frame_opengl_texture_t c) { return true; }
+
+static camera_driver_t camera_null = {
+   nullcamera_init,
+   nullcamera_free,
+   nullcamera_start,
+   nullcamera_stop,
+   nullcamera_poll,
+   "null",
+};
+
+const camera_driver_t *camera_drivers[] = {
+#ifdef HAVE_V4L2
+   &camera_v4l2,
+#endif
+#ifdef EMSCRIPTEN
+   &camera_rwebcam,
+#endif
+#ifdef ANDROID
+   &camera_android,
+#endif
+   &camera_null,
+   NULL,
+};
+
+static camera_driver_state_t camera_driver_st     = {0};
+
+camera_driver_state_t *camera_state_get_ptr(void)
+{
+   return &camera_driver_st;
+}
+
+/**
+ * config_get_camera_driver_options:
+ *
+ * Get an enumerated list of all camera driver names,
+ * separated by '|'.
+ *
+ * Returns: string listing of all camera driver names,
+ * separated by '|'.
+ **/
+const char *config_get_camera_driver_options(void)
+{
+   return char_list_new_special(STRING_LIST_CAMERA_DRIVERS, NULL);
+}
+
+bool driver_camera_start(void)
+{
+   camera_driver_state_t *camera_st = &camera_driver_st;
+   if (     camera_st
+         && camera_st->data
+         && camera_st->driver
+         && camera_st->driver->start)
+   {
+      settings_t *settings = config_get_ptr();
+      bool camera_allow    = settings->bools.camera_allow;
+      if (camera_allow)
+         return camera_st->driver->start(camera_st->data);
+
+      runloop_msg_queue_push(
+            "Camera is explicitly disabled.\n", 1, 180, false,
+            NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+   }
+   return true;
+}
+
+void driver_camera_stop(void)
+{
+   camera_driver_state_t *camera_st = &camera_driver_st;
+   if (     camera_st->driver
+         && camera_st->driver->stop
+         && camera_st->data)
+      camera_st->driver->stop(camera_st->data);
+}
+
+bool camera_driver_find_driver(const char *prefix,
+      bool verbosity_enabled)
+{
+   settings_t *settings         = config_get_ptr();
+   camera_driver_state_t 
+      *camera_st                = &camera_driver_st;
+   int i                        = (int)driver_find_index(
+         "camera_driver",
+         settings->arrays.camera_driver);
+
+   if (i >= 0)
+      camera_st->driver = (const camera_driver_t*)camera_drivers[i];
+   else
+   {
+      if (verbosity_enabled)
+      {
+         unsigned d;
+         RARCH_ERR("Couldn't find any %s named \"%s\"\n", prefix,
+               settings->arrays.camera_driver);
+         RARCH_LOG_OUTPUT("Available %ss are:\n", prefix);
+         for (d = 0; camera_drivers[d]; d++)
+         {
+            if (camera_drivers[d])
+            {
+               RARCH_LOG_OUTPUT("\t%s\n", camera_drivers[d]->ident);
+            }
+         }
+
+         RARCH_WARN("Going to default to first %s...\n", prefix);
+      }
+
+      if (!(camera_st->driver = (const camera_driver_t*)camera_drivers[0]))
+         return false;
+   }
+   return true;
+}
diff --git a/cores/libretro-net-retropad/net_retropad_core.c b/cores/libretro-net-retropad/net_retropad_core.c
index 15f7c4b05b..aa38e18c7e 100644
--- a/cores/libretro-net-retropad/net_retropad_core.c
+++ b/cores/libretro-net-retropad/net_retropad_core.c
@@ -87,13 +87,13 @@ struct remote_joypad_message
    uint16_t state;
 };
 
-static float tilt_sensor_values[3];
-static float gyro_sensor_values[3];
 static bool keyboard_state[RETROK_LAST];
 static bool keyboard_state_validated[RETROK_LAST];
 static bool tilt_sensor_enabled    = false;
 static bool gyro_sensor_enabled    = false;
 static bool lux_sensor_enabled     = false;
+static float tilt_sensor_values[3] = {0};
+static float gyro_sensor_values[3] = {0};
 static float lux_sensor_value      = 0.0f;
 static unsigned mouse_type = 0;
 static int pointer_x = 0;
@@ -727,7 +727,7 @@ static void retropad_update_input(void)
                         pointer_y = (int16_t)state;
                   }
                }
-
+               
                /* Do not send extra descriptor state - RA side is not prepared to receive it */
                if (i>1)
                   continue;
@@ -1034,7 +1034,7 @@ void NETRETROPAD_CORE_PREFIX(retro_run)(void)
             sensor_item_colors[median_index]   = (uint16_t)(fabsf(32*4*value)) << 11;
       }
    }
-
+   
    /* Button values for sensor test screen, since they do not follow any pattern, it is *
     * provided as a direct list. */
    if (mouse_type == NETRETROPAD_MOUSE)
@@ -1061,7 +1061,7 @@ void NETRETROPAD_CORE_PREFIX(retro_run)(void)
 
       offset = DESC_OFFSET(&mouse, 0, 0, RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP);
       sensor_item_colors[86] = mouse.value[offset] ? 0xA000 : 0x0000;
-
+      
       offset = DESC_OFFSET(&mouse, 0, 0, RETRO_DEVICE_ID_MOUSE_BUTTON_4);
       sensor_item_colors[88] = mouse.value[offset] ? 0xA000 : 0x0000;
 
@@ -1093,7 +1093,7 @@ void NETRETROPAD_CORE_PREFIX(retro_run)(void)
 
       offset = DESC_OFFSET(&lightgun, 0, 0, RETRO_DEVICE_ID_LIGHTGUN_SELECT);
       sensor_item_colors[76] = lightgun.value[offset] ? 0xA000 : 0x0000;
-
+      
       offset = DESC_OFFSET(&lightgun, 0, 0, RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN);
       sensor_item_colors[77] = lightgun.value[offset] ? 0xA000 : 0x0000;
 
@@ -1386,7 +1386,7 @@ void NETRETROPAD_CORE_PREFIX(retro_run)(void)
          pointer_prev_y = pointer_y_coord;
       }
    }
-
+   
    NETRETROPAD_CORE_PREFIX(video_cb)(frame_buf, 320, 240, 640);
    retro_sleep(4);
 }
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index ee33178ed1..aa64e6c58d 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -112,10 +112,10 @@ typedef enum
 } CFDomainMask;
 
 #if (defined(OSX) && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101200))
-static int speak_pid    = 0;
+static int speak_pid                            = 0;
 #endif
 
-static char darwin_cpu_model_name[64];
+static char darwin_cpu_model_name[64] = {0};
 
 static void CFSearchPathForDirectoriesInDomains(
       char *s, size_t len)
diff --git a/frontend/drivers/platform_orbis.c b/frontend/drivers/platform_orbis.c
index a2e7cdd1d4..19571dfdd5 100644
--- a/frontend/drivers/platform_orbis.c
+++ b/frontend/drivers/platform_orbis.c
@@ -81,7 +81,7 @@
 #define MODULE_PATH "/data/self/system/common/lib/"
 #define MODULE_PATH_EXT "/app0/sce_module/"
 
-static char eboot_path[512];
+static char eboot_path[512]     = {0};
 SceKernelModule s_piglet_module;
 SceKernelModule s_shacc_module;
 
@@ -160,7 +160,7 @@ static void frontend_orbis_get_env(int *argc, char *argv[],
 
    if (!string_is_empty(argv[CONTENT_PATH_ARG_INDEX]))
    {
-      static char path[PATH_MAX_LENGTH];
+      static char path[PATH_MAX_LENGTH] = {0};
       struct rarch_main_wrap      *args =
          (struct rarch_main_wrap*)params_data;
 
diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c
index d33116573f..3e2b242ab0 100644
--- a/frontend/drivers/platform_ps2.c
+++ b/frontend/drivers/platform_ps2.c
@@ -50,10 +50,10 @@
 #define DEFAULT_PARTITION "hdd0:__common:pfs"
 #endif
 
-static char mountPoint[50];
-static char mountString[10];
-static char cwd[FILENAME_MAX];
 static enum frontend_fork ps2_fork_mode      = FRONTEND_FORK_NONE;
+static char cwd[FILENAME_MAX]                = {0};
+static char mountString[10]                  = {0};
+static char mountPoint[50]                   = {0};
 static enum HDD_MOUNT_STATUS hddMountStatus  = HDD_MOUNT_INIT_STATUS_NOT_READY;
 static enum HDD_INIT_STATUS hddStatus        = HDD_INIT_STATUS_UNKNOWN;
 
@@ -265,7 +265,7 @@ static void frontend_ps2_get_env(int *argc, char *argv[],
 #ifndef IS_SALAMANDER
    if (!string_is_empty(argv[1]))
    {
-      static char path[FILENAME_MAX];
+      static char path[FILENAME_MAX] = {0};
       struct rarch_main_wrap      *args =
          (struct rarch_main_wrap*)params_data;
 
diff --git a/frontend/drivers/platform_psp.c b/frontend/drivers/platform_psp.c
index 54c09b80b0..fed3d5ce9d 100644
--- a/frontend/drivers/platform_psp.c
+++ b/frontend/drivers/platform_psp.c
@@ -81,8 +81,8 @@ PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER|THREAD_ATTR_VFPU);
 unsigned int sceLibcHeapSize            = SCE_LIBC_SIZE;
 #endif
 
-static char eboot_path[512];
-static char user_path[512];
+static char eboot_path[512]             = {0};
+static char user_path[512]              = {0};
 static enum frontend_fork psp_fork_mode = FRONTEND_FORK_NONE;
 
 static void frontend_psp_get_env_settings(int *argc, char *argv[],
diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
index be1dd517c2..7410f2cc7d 100644
--- a/frontend/drivers/platform_unix.c
+++ b/frontend/drivers/platform_unix.c
@@ -124,7 +124,7 @@ static uint8_t g_platform_android_flags  = 0;
 #define PROC_ACPI_SYSFS_AC_ADAPTER_PATH  "/sys/class/power_supply/ACAD"
 #define PROC_ACPI_SYSFS_BATTERY_PATH     "/sys/class/power_supply"
 #define PROC_ACPI_AC_ADAPTER_PATH        "/proc/acpi/ac_adapter"
-static char unix_cpu_model_name[64];
+static char unix_cpu_model_name[64]      = {0};
 #endif
 
 /* /proc/meminfo parameters */
@@ -1366,7 +1366,7 @@ static void frontend_unix_get_env(int *argc,
 
    if (android_app->getStringExtra && jstr)
    {
-      static char config_path[PATH_MAX_LENGTH];
+      static char config_path[PATH_MAX_LENGTH] = {0};
       const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
 
       if (argv && *argv)
diff --git a/frontend/drivers/platform_xdk.c b/frontend/drivers/platform_xdk.c
index f2e4aac799..3ccfb75f6d 100644
--- a/frontend/drivers/platform_xdk.c
+++ b/frontend/drivers/platform_xdk.c
@@ -59,7 +59,7 @@ static void frontend_xdk_get_environment_settings(int *argc, char *argv[],
    DWORD volume_device_type;
 #endif
 #ifndef IS_SALAMANDER
-   static char path[PATH_MAX_LENGTH];
+   static char path[PATH_MAX_LENGTH] = {0};
 #if defined(_XBOX1)
    LAUNCH_DATA ptr;
    DWORD launch_type;
diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 958b4459f9..69f9bdefa6 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -73,19 +73,18 @@ Colormap g_x11_cmap;
 #ifdef HAVE_XF86VM
 static XF86VidModeModeInfo desktop_mode;
 #endif
-static XConfigureEvent g_x11_xce;
+static bool xdg_screensaver_available       = true;
+static bool g_x11_has_focus                 = false;
+static bool g_x11_true_full                 = false;
+static XConfigureEvent g_x11_xce            = {0};
 static Atom XA_NET_WM_STATE;
 static Atom XA_NET_WM_STATE_FULLSCREEN;
 static Atom XA_NET_MOVERESIZE_WINDOW;
 static Atom g_x11_quit_atom;
 static XIM g_x11_xim;
 static XIC g_x11_xic;
+
 static enum retro_key x11_keysym_lut[RETROK_LAST];
-
-static bool xdg_screensaver_available       = true;
-static bool g_x11_has_focus                 = false;
-static bool g_x11_true_full                 = false;
-
 static unsigned *x11_keysym_rlut            = NULL;
 static unsigned x11_keysym_rlut_size        = 0;
 
diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c
index e3967ef182..7ce3597ccb 100644
--- a/input/drivers_joypad/psp_joypad.c
+++ b/input/drivers_joypad/psp_joypad.c
@@ -39,7 +39,7 @@
 /* TODO/FIXME - static globals */
 static int psp2_model;
 static SceCtrlPortInfo old_ctrl_info, curr_ctrl_info;
-static SceCtrlActuator actuators[DEFAULT_MAX_PADS];
+static SceCtrlActuator actuators[DEFAULT_MAX_PADS] = {0};
 
 #define LERP(p, f, t) ((((p * 10) * (t * 10)) / (f * 10)) / 10)
 #define AREA(lx, ly, rx, ry, x, y) (lx <= x && x < rx && ly <= y && y < ry)
@@ -202,12 +202,12 @@ static int16_t psp_joypad_state(
       const uint32_t joyaxis = (binds[i].joyaxis != AXIS_NONE)
          ? binds[i].joyaxis : joypad_info->auto_binds[i].joyaxis;
       if (
-               (uint16_t)joykey != NO_BTN
+               (uint16_t)joykey != NO_BTN 
             && (pad_state[port_idx] & (UINT64_C(1) << (uint16_t)joykey))
          )
          ret |= ( 1 << i);
       else if (joyaxis != AXIS_NONE &&
-            ((float)abs(psp_joypad_axis_state(port_idx, joyaxis))
+            ((float)abs(psp_joypad_axis_state(port_idx, joyaxis)) 
              / 0x8000) > joypad_info->axis_threshold)
          ret |= (1 << i);
    }
@@ -272,7 +272,7 @@ static void psp_joypad_poll(void)
       SceCtrlData state_tmp;
       unsigned i  = player;
 #if defined(VITA)
-      unsigned p = (psp2_model == SCE_KERNEL_MODEL_VITATV)
+      unsigned p = (psp2_model == SCE_KERNEL_MODEL_VITATV) 
          ? player + 1 : player;
       if (curr_ctrl_info.port[p] == SCE_CTRL_TYPE_UNPAIRED)
          continue;
@@ -303,7 +303,7 @@ static void psp_joypad_poll(void)
          unsigned i;
          SceTouchData touch_surface = {0};
          sceTouchPeek(input_backtouch_toggle
-               ? SCE_TOUCH_PORT_FRONT
+               ? SCE_TOUCH_PORT_FRONT 
                : SCE_TOUCH_PORT_BACK,
                &touch_surface, 1);
 
diff --git a/libretro-common/audio/audio_mixer.c b/libretro-common/audio/audio_mixer.c
index ec87bcdf34..a274989be4 100644
--- a/libretro-common/audio/audio_mixer.c
+++ b/libretro-common/audio/audio_mixer.c
@@ -198,7 +198,7 @@ struct audio_mixer_voice
 };
 
 /* TODO/FIXME - static globals */
-static struct audio_mixer_voice s_voices[AUDIO_MIXER_MAX_VOICES];
+static struct audio_mixer_voice s_voices[AUDIO_MIXER_MAX_VOICES] = {0};
 static unsigned s_rate = 0;
 
 static void audio_mixer_release(audio_mixer_voice_t* voice);
diff --git a/libretro-common/net/net_compat.c b/libretro-common/net/net_compat.c
index ab73e8a963..6f225664b4 100644
--- a/libretro-common/net/net_compat.c
+++ b/libretro-common/net/net_compat.c
@@ -115,8 +115,8 @@ int inet_pton(int af, const char *src, void *dst)
 #elif defined(_XBOX)
 struct hostent *gethostbyname(const char *name)
 {
-   static struct in_addr addr;
-   static struct hostent he;
+   static struct in_addr addr = {0};
+   static struct hostent he   = {0};
    WSAEVENT event;
    XNDNS          *dns = NULL;
    struct hostent *ret = NULL;
@@ -180,8 +180,8 @@ uint32_t inet_addr(const char *cp)
 
 struct hostent *gethostbyname(const char *name)
 {
-   static struct SceNetInAddr addr;
-   static struct hostent      he;
+   static struct SceNetInAddr addr = {0};
+   static struct hostent      he   = {0};
    int rid;
    struct hostent *ret = NULL;
 
diff --git a/libretro-common/vfs/vfs_implementation_cdrom.c b/libretro-common/vfs/vfs_implementation_cdrom.c
index 4dd83a8d10..093cd9cc02 100644
--- a/libretro-common/vfs/vfs_implementation_cdrom.c
+++ b/libretro-common/vfs/vfs_implementation_cdrom.c
@@ -31,7 +31,7 @@
 #endif
 
 /* TODO/FIXME - static global variable */
-static cdrom_toc_t vfs_cdrom_toc;
+static cdrom_toc_t vfs_cdrom_toc = {0};
 
 const cdrom_toc_t* retro_vfs_file_get_cdrom_toc(void)
 {
@@ -93,8 +93,8 @@ int64_t retro_vfs_file_seek_cdrom(
             break;
          case SEEK_END:
             {
-               ssize_t pregap_lba_len = (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].audio
-                     ? 0
+               ssize_t pregap_lba_len = (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].audio 
+                     ? 0 
                      : (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba_start));
                ssize_t lba_len        = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_size - pregap_lba_len;
 #ifdef CDROM_DEBUG
@@ -153,7 +153,7 @@ void retro_vfs_file_open_cdrom(
 
    stream->cdrom.cur_track = 1;
 
-   if (     !string_is_equal_noncase(ext, "cue")
+   if (     !string_is_equal_noncase(ext, "cue") 
          && !string_is_equal_noncase(ext, "bin"))
       return;
 
@@ -231,7 +231,7 @@ void retro_vfs_file_open_cdrom(
    size_t path_len   = strlen(path);
    const char *ext   = path_get_extension(path);
 
-   if (     !string_is_equal_noncase(ext, "cue")
+   if (     !string_is_equal_noncase(ext, "cue") 
          && !string_is_equal_noncase(ext, "bin"))
       return;
 
@@ -378,7 +378,7 @@ int64_t retro_vfs_file_read_cdrom(libretro_vfs_implementation_file *stream,
 
    if (string_is_equal_noncase(ext, "cue"))
    {
-      if ((int64_t)len >= (int64_t)stream->cdrom.cue_len
+      if ((int64_t)len >= (int64_t)stream->cdrom.cue_len 
             - stream->cdrom.byte_pos)
          len = stream->cdrom.cue_len - stream->cdrom.byte_pos - 1;
 #ifdef CDROM_DEBUG
@@ -403,17 +403,17 @@ int64_t retro_vfs_file_read_cdrom(libretro_vfs_implementation_file *stream,
       unsigned char rframe = 0;
       size_t skip          = stream->cdrom.byte_pos % 2352;
 
-      if (stream->cdrom.byte_pos >=
+      if (stream->cdrom.byte_pos >= 
             vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_bytes)
          return 0;
 
-      if (stream->cdrom.byte_pos + len >
+      if (stream->cdrom.byte_pos + len > 
             vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_bytes)
-         len -= (stream->cdrom.byte_pos + len)
+         len -= (stream->cdrom.byte_pos + len) 
             - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_bytes;
 
       cdrom_lba_to_msf(stream->cdrom.cur_lba, &min, &sec, &frame);
-      cdrom_lba_to_msf(stream->cdrom.cur_lba
+      cdrom_lba_to_msf(stream->cdrom.cur_lba 
             - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba,
             &rmin, &rsec, &rframe);
 
@@ -452,8 +452,8 @@ int64_t retro_vfs_file_read_cdrom(libretro_vfs_implementation_file *stream,
       }
 
       stream->cdrom.byte_pos += len;
-      stream->cdrom.cur_lba   =
-         vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba
+      stream->cdrom.cur_lba   = 
+         vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba 
          + (stream->cdrom.byte_pos / 2352);
 
       cdrom_lba_to_msf(stream->cdrom.cur_lba,
diff --git a/network/cloud_sync/webdav.c b/network/cloud_sync/webdav.c
index 9398adbefd..7620ee7aa3 100644
--- a/network/cloud_sync/webdav.c
+++ b/network/cloud_sync/webdav.c
@@ -61,7 +61,7 @@ typedef struct
    unsigned nc;
 } webdav_state_t;
 
-static webdav_state_t webdav_driver_st;
+static webdav_state_t webdav_driver_st = {0};
 
 webdav_state_t *webdav_state_get_ptr(void)
 {
diff --git a/network/cloud_sync_driver.c b/network/cloud_sync_driver.c
index db7b038697..4bf166c816 100644
--- a/network/cloud_sync_driver.c
+++ b/network/cloud_sync_driver.c
@@ -35,7 +35,7 @@ const cloud_sync_driver_t *cloud_sync_drivers[] = {
    NULL
 };
 
-static cloud_sync_driver_state_t cloud_sync_driver_st;
+static cloud_sync_driver_state_t cloud_sync_driver_st = {0};
 
 cloud_sync_driver_state_t *cloud_sync_state_get_ptr(void)
 {
diff --git a/network/discord.c b/network/discord.c
index 643a8b8ff5..347a0802da 100644
--- a/network/discord.c
+++ b/network/discord.c
@@ -1,504 +1,504 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2021 - Daniel De Matteis
- *  Copyright (C) 2016-2019 - Andr�s Su�rez
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <retro_miscellaneous.h>
-#include <file/file_path.h>
-#include <string/stdstring.h>
-#include <net/net_http.h>
-#include <features/features_cpu.h>
-#include <time/rtime.h>
-
-#ifdef HAVE_CHEEVOS
-#include "../cheevos/cheevos.h"
-#endif
-
-#ifdef HAVE_NETWORKING
-#include "netplay/netplay.h"
-#endif
-
-#include "../paths.h"
-#include "../file_path_special.h"
-#include "../tasks/tasks_internal.h"
-#include "../tasks/task_file_transfer.h"
-
-#ifdef HAVE_MENU
-#include "../menu/menu_cbs.h"
-#include "../menu/menu_driver.h"
-#endif
-
-#include "discord.h"
-
-#define CDN_URL "https://cdn.discordapp.com/avatars"
-
-/* Forward declaration */
-#if defined(__cplusplus) && !defined(CXX_BUILD)
-extern "C"
-{
-#endif
-   void Discord_Register(const char *a, const char *b);
-#if defined(__cplusplus) && !defined(CXX_BUILD)
-}
-#endif
-
-static discord_state_t discord_state_st; /* int64_t alignment */
-
-discord_state_t *discord_state_get_ptr(void)
-{
-   return &discord_state_st;
-}
-
-bool discord_is_ready(void)
-{
-   discord_state_t *discord_st = &discord_state_st;
-   return discord_st->ready;
-}
-
-char *discord_get_own_username(void)
-{
-   discord_state_t *discord_st = &discord_state_st;
-   if (discord_st->ready)
-      return discord_st->user_name;
-   return NULL;
-}
-
-char *discord_get_own_avatar(void)
-{
-   discord_state_t *discord_st = &discord_state_st;
-   if (discord_st->ready)
-      return discord_st->user_avatar;
-   return NULL;
-}
-
-bool discord_avatar_is_ready(void)
-{
-   return false;
-}
-
-void discord_avatar_set_ready(bool ready)
-{
-   discord_state_t *discord_st = &discord_state_st;
-   discord_st->avatar_ready    = ready;
-}
-
-#ifdef HAVE_MENU
-static bool discord_download_avatar(
-      discord_state_t *discord_st,
-      const char* user_id, const char* avatar_id)
-{
-   static char url[PATH_MAX_LENGTH];
-   static char url_encoded[PATH_MAX_LENGTH];
-   static char full_path[PATH_MAX_LENGTH];
-   static char buf[PATH_MAX_LENGTH];
-   file_transfer_t     *transf = NULL;
-
-   fill_pathname_application_special(buf,
-            sizeof(buf),
-            APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_DISCORD_AVATARS);
-   fill_pathname_join_special(full_path, buf, avatar_id, sizeof(full_path));
-   strlcpy(discord_st->user_avatar,
-         avatar_id, sizeof(discord_st->user_avatar));
-
-   if (path_is_valid(full_path))
-      return true;
-
-   if (string_is_empty(avatar_id))
-      return false;
-
-   snprintf(url, sizeof(url), "%s/%s/%s" FILE_PATH_PNG_EXTENSION, CDN_URL, user_id, avatar_id);
-   net_http_urlencode_full(url_encoded, url, sizeof(url_encoded));
-   snprintf(buf, sizeof(buf), "%s" FILE_PATH_PNG_EXTENSION, avatar_id);
-
-   transf           = (file_transfer_t*)malloc(sizeof(*transf));
-
-   transf->enum_idx  = MENU_ENUM_LABEL_CB_DISCORD_AVATAR;
-   strlcpy(transf->path, buf, sizeof(transf->path));
-   transf->user_data = NULL;
-
-   task_push_http_transfer_file(url_encoded, true, NULL, cb_generic_download, transf);
-
-   return false;
-}
-#endif
-
-static void handle_discord_ready(const DiscordUser* connectedUser)
-{
-   discord_state_t *discord_st = &discord_state_st;
-   strlcpy(discord_st->user_name,
-         connectedUser->username, sizeof(discord_st->user_name));
-
-#ifdef HAVE_MENU
-   discord_download_avatar(discord_st,
-         connectedUser->userId, connectedUser->avatar);
-#endif
-}
-
-static void handle_discord_disconnected(int errcode, const char* message)
-{
-}
-
-static void handle_discord_error(int errcode, const char* message)
-{
-}
-
-static void handle_discord_join_cb(retro_task_t *task, void *task_data,
-      void *user_data, const char *error)
-{
-   char hostname[512];
-   struct netplay_room *room;
-   char *room_data             = NULL;
-   http_transfer_data_t *data  = (http_transfer_data_t*)task_data;
-   discord_state_t *discord_st = &discord_state_st;
-
-   if (error)
-      goto done;
-   if (!data || !data->data || !data->len)
-      goto done;
-   if (data->status != 200)
-      goto done;
-
-   if (!(room_data = (char*)malloc(data->len + 1)))
-      goto done;
-   memcpy(room_data, data->data, data->len);
-   room_data[data->len] = '\0';
-
-   netplay_rooms_parse(room_data, strlen(room_data));
-   free(room_data);
-
-   if ((room = netplay_room_get(0)))
-   {
-      if (room->host_method == NETPLAY_HOST_METHOD_MITM)
-         snprintf(hostname, sizeof(hostname), "%s|%d|%s",
-            room->mitm_address, room->mitm_port, room->mitm_session);
-      else
-         snprintf(hostname, sizeof(hostname), "%s|%d",
-            room->address, room->port);
-
-      discord_st->connecting = true;
-      if (discord_st->ready)
-         discord_update(PRESENCE_NETPLAY_CLIENT);
-
-      task_push_netplay_crc_scan(room->gamecrc, room->gamename,
-         room->subsystem_name, room->corename, hostname);
-   }
-
-   netplay_rooms_free();
-
-done:
-   free(user_data);
-}
-
-static void handle_discord_join(const char *secret)
-{
-   int room_id;
-   char url[512];
-
-   if ((room_id = (int)strtol(secret, NULL, 10)))
-   {
-      size_t _len;
-      discord_state_t *discord_st = &discord_state_st;
-      snprintf(discord_st->peer_party_id,
-            sizeof(discord_st->peer_party_id),
-            "%d", room_id);
-
-      _len = strlcpy(url, FILE_PATH_LOBBY_LIBRETRO_URL, sizeof(url));
-      strlcpy(url       + _len,
-            discord_st->peer_party_id,
-            sizeof(url) - _len);
-
-      task_push_http_transfer(url, true, NULL, handle_discord_join_cb, NULL);
-   }
-}
-
-static void handle_discord_spectate(const char *secret)
-{
-}
-
-#if 0
-#ifdef HAVE_MENU
-static void handle_discord_join_response(void *ignore, const char *line)
-{
-   /* TODO/FIXME: needs in-game widgets */
-   if (strstr(line, "yes"))
-      Discord_Respond(user_id, DISCORD_REPLY_YES);
-
-   menu_input_dialog_end();
-   retroarch_menu_running_finished(false);
-}
-#endif
-#endif
-
-static void handle_discord_join_request(const DiscordUser *request)
-{
-#ifdef HAVE_MENU
-#if 0
-   char buf[PATH_MAX_LENGTH];
-   menu_input_ctx_line_t line = {0};
-#endif
-   discord_state_t *discord_st = &discord_state_st;
-
-   discord_download_avatar(discord_st, request->userId, request->avatar);
-
-#if 0
-   /* TODO/FIXME: Needs in-game widgets */
-   retroarch_menu_running();
-
-   snprintf(buf, sizeof(buf), "%s %s?",
-      msg_hash_to_str(MSG_DISCORD_CONNECTION_REQUEST), request->username);
-   line.label         = buf;
-   line.label_setting = "no_setting";
-   line.cb            = handle_discord_join_response;
-
-   /* TODO/FIXME: needs in-game widgets
-    * TODO/FIXME: bespoke dialog, should show while in-game
-    * and have a hotkey to accept
-    * TODO/FIXME: show avatar of the user connecting
-    */
-   if (!menu_input_dialog_start(&line))
-      return;
-#endif
-#endif
-}
-
-void discord_update(enum presence presence)
-{
-   discord_state_t *discord_st = &discord_state_st;
-#ifdef HAVE_CHEEVOS
-   char cheevos_richpresence[256];
-   char cheevos_badge_url[256];
-#endif
-
-   if (presence == discord_st->status)
-      return;
-
-   if (!discord_st->connecting
-         &&
-         (   presence == PRESENCE_NONE
-          || presence == PRESENCE_MENU))
-   {
-      memset(&discord_st->presence,
-            0, sizeof(discord_st->presence));
-      discord_st->peer_party_id[0] = '\0';
-   }
-
-   switch (presence)
-   {
-      case PRESENCE_MENU:
-         discord_st->presence.details        = msg_hash_to_str(
-               MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU);
-         discord_st->presence.largeImageKey  = "base";
-         discord_st->presence.largeImageText = msg_hash_to_str(
-               MENU_ENUM_LABEL_VALUE_NO_CORE);
-         discord_st->presence.instance       = 0;
-         break;
-      case PRESENCE_GAME_PAUSED:
-         discord_st->presence.smallImageKey  = "paused";
-         discord_st->presence.smallImageText = msg_hash_to_str(
-               MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PAUSED);
-         discord_st->presence.details        = msg_hash_to_str(
-               MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME_PAUSED);
-         discord_st->pause_time              = time(0);
-         discord_st->elapsed_time            = difftime(discord_st->pause_time,
-               discord_st->start_time);
-         discord_st->presence.startTimestamp = discord_st->pause_time;
-         break;
-      case PRESENCE_GAME:
-         {
-            core_info_t      *core_info     = NULL;
-            core_info_get_current_core(&core_info);
-
-            if (core_info)
-            {
-               const char *system_id               =
-                    core_info->system_id
-                  ? core_info->system_id
-                  : "core";
-               const char *label                   = NULL;
-               const struct playlist_entry *entry  = NULL;
-               playlist_t *current_playlist        = playlist_get_cached();
-
-               if (current_playlist)
-               {
-                  playlist_get_index_by_path(
-                        current_playlist,
-                        path_get(RARCH_PATH_CONTENT),
-                        &entry);
-
-                  if (entry && !string_is_empty(entry->label))
-                     label = entry->label;
-               }
-
-               if (!label)
-                  label = path_basename(path_get(RARCH_PATH_BASENAME));
-               discord_st->presence.largeImageKey = system_id;
-
-               if (core_info->display_name)
-                  discord_st->presence.largeImageText =
-                     core_info->display_name;
-
-               discord_st->start_time              = time(0);
-               if (discord_st->pause_time != 0)
-                  discord_st->start_time           = time(0) -
-                     discord_st->elapsed_time;
-
-               discord_st->pause_time              = 0;
-               discord_st->elapsed_time            = 0;
-
-               discord_st->presence.smallImageKey  = "playing";
-               discord_st->presence.smallImageText = msg_hash_to_str(
-                     MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PLAYING);
-               discord_st->presence.startTimestamp = discord_st->start_time;
-
-#ifdef HAVE_CHEEVOS
-               if (rcheevos_get_game_badge_url(cheevos_badge_url, sizeof(cheevos_badge_url)))
-                  discord_st->presence.largeImageKey = cheevos_badge_url;
-
-               if (rcheevos_get_richpresence(cheevos_richpresence, sizeof(cheevos_richpresence)) > 0)
-                  discord_st->presence.details     = cheevos_richpresence;
-               else
-#endif
-                  discord_st->presence.details     = msg_hash_to_str(
-                     MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME);
-
-               discord_st->presence.state          = label;
-               discord_st->presence.instance       = 0;
-
-               if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
-               {
-                  discord_st->peer_party_id[0]     = '\0';
-                  discord_st->connecting           = false;
-                  discord_st->presence.partyId     = NULL;
-                  discord_st->presence.partyMax    = 0;
-                  discord_st->presence.partySize   = 0;
-                  discord_st->presence.joinSecret  = (const char*)'\0';
-               }
-            }
-         }
-         break;
-      case PRESENCE_NETPLAY_HOSTING:
-         {
-            char join_secret[128];
-            struct netplay_room *room   = &networking_state_get_ptr()->host_room;
-            if (room->id == 0)
-               return;
-
-            snprintf(discord_st->self_party_id,
-                  sizeof(discord_st->self_party_id), "%d", room->id);
-            snprintf(join_secret,
-                  sizeof(join_secret), "%d|%" PRId64,
-                  room->id, cpu_features_get_time_usec());
-
-            discord_st->presence.joinSecret     = strdup(join_secret);
-#if 0
-            discord_st->presence.spectateSecret = "SPECSPECSPEC";
-#endif
-            discord_st->presence.partyId        = strdup(discord_st->self_party_id);
-            discord_st->presence.partyMax       = 2;
-            discord_st->presence.partySize      = 1;
-         }
-         break;
-      case PRESENCE_NETPLAY_CLIENT:
-         discord_st->presence.partyId    = strdup(discord_st->peer_party_id);
-         break;
-      case PRESENCE_NETPLAY_NETPLAY_STOPPED:
-         {
-            if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
-            !netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_CONNECTED, NULL))
-            {
-               discord_st->peer_party_id[0]     = '\0';
-               discord_st->connecting           = false;
-               discord_st->presence.partyId     = NULL;
-               discord_st->presence.partyMax    = 0;
-               discord_st->presence.partySize   = 0;
-               discord_st->presence.joinSecret  = (const char*)'\0';
-            }
-         }
-         break;
-#ifdef HAVE_CHEEVOS
-      case PRESENCE_RETROACHIEVEMENTS:
-         if (discord_st->pause_time)
-            return;
-
-         if (rcheevos_get_game_badge_url(cheevos_badge_url, sizeof(cheevos_badge_url)))
-            discord_st->presence.largeImageKey = cheevos_badge_url;
-
-         if (rcheevos_get_richpresence(cheevos_richpresence, sizeof(cheevos_richpresence)) > 0)
-            discord_st->presence.details = cheevos_richpresence;
-         presence = PRESENCE_GAME;
-         break;
-#endif
-      case PRESENCE_SHUTDOWN:
-            discord_st->presence.partyId    = NULL;
-            discord_st->presence.partyMax   = 0;
-            discord_st->presence.partySize  = 0;
-            discord_st->presence.joinSecret = (const char*)'\0';
-            discord_st->connecting          = false;
-      default:
-         break;
-   }
-
-   Discord_UpdatePresence(&discord_st->presence);
-#ifdef DISCORD_DISABLE_IO_THREAD
-   Discord_UpdateConnection();
-#endif
-   discord_st->status = presence;
-}
-
-void discord_init(const char *discord_app_id, char *args)
-{
-   size_t _len;
-   DiscordEventHandlers handlers;
-#ifdef _WIN32
-   char full_path[PATH_MAX_LENGTH];
-#endif
-   char command[PATH_MAX_LENGTH];
-   discord_state_t *discord_st = &discord_state_st;
-
-   discord_st->start_time      = time(0);
-
-   handlers.ready              = handle_discord_ready;
-   handlers.disconnected       = handle_discord_disconnected;
-   handlers.errored            = handle_discord_error;
-   handlers.joinGame           = handle_discord_join;
-   handlers.spectateGame       = handle_discord_spectate;
-   handlers.joinRequest        = handle_discord_join_request;
-
-   Discord_Initialize(discord_app_id, &handlers, 0, NULL);
-#ifdef DISCORD_DISABLE_IO_THREAD
-   Discord_UpdateConnection();
-#endif
-
-#ifdef _WIN32
-   fill_pathname_application_path(full_path, sizeof(full_path));
-   if (strstr(args, full_path))
-      strlcpy(command, args, sizeof(command));
-   else
-   {
-      path_basedir(full_path);
-      _len = strlcpy(command, full_path, sizeof(command));
-      strlcpy(command       + _len,
-            args,
-            sizeof(command) - _len);
-   }
-#else
-   _len = strlcpy(command, "sh -c ", sizeof(command));
-   strlcpy(command + _len, args, sizeof(command) - _len);
-#endif
-   Discord_Register(discord_app_id, command);
-#ifdef DISCORD_DISABLE_IO_THREAD
-   Discord_UpdateConnection();
-#endif
-   discord_st->ready = true;
-}
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2021 - Daniel De Matteis
+ *  Copyright (C) 2016-2019 - Andr�s Su�rez
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <retro_miscellaneous.h>
+#include <file/file_path.h>
+#include <string/stdstring.h>
+#include <net/net_http.h>
+#include <features/features_cpu.h>
+#include <time/rtime.h>
+
+#ifdef HAVE_CHEEVOS
+#include "../cheevos/cheevos.h"
+#endif
+
+#ifdef HAVE_NETWORKING
+#include "netplay/netplay.h"
+#endif
+
+#include "../paths.h"
+#include "../file_path_special.h"
+#include "../tasks/tasks_internal.h"
+#include "../tasks/task_file_transfer.h"
+
+#ifdef HAVE_MENU
+#include "../menu/menu_cbs.h"
+#include "../menu/menu_driver.h"
+#endif
+
+#include "discord.h"
+
+#define CDN_URL "https://cdn.discordapp.com/avatars"
+
+/* Forward declaration */
+#if defined(__cplusplus) && !defined(CXX_BUILD)
+extern "C"
+{
+#endif
+   void Discord_Register(const char *a, const char *b);
+#if defined(__cplusplus) && !defined(CXX_BUILD)
+}
+#endif
+
+static discord_state_t discord_state_st = {0}; /* int64_t alignment */
+
+discord_state_t *discord_state_get_ptr(void)
+{
+   return &discord_state_st;
+}
+
+bool discord_is_ready(void)
+{
+   discord_state_t *discord_st = &discord_state_st;
+   return discord_st->ready;
+}
+
+char *discord_get_own_username(void)
+{
+   discord_state_t *discord_st = &discord_state_st;
+   if (discord_st->ready)
+      return discord_st->user_name;
+   return NULL;
+}
+
+char *discord_get_own_avatar(void)
+{
+   discord_state_t *discord_st = &discord_state_st;
+   if (discord_st->ready)
+      return discord_st->user_avatar;
+   return NULL;
+}
+
+bool discord_avatar_is_ready(void)
+{
+   return false;
+}
+
+void discord_avatar_set_ready(bool ready)
+{
+   discord_state_t *discord_st = &discord_state_st;
+   discord_st->avatar_ready    = ready;
+}
+
+#ifdef HAVE_MENU
+static bool discord_download_avatar(
+      discord_state_t *discord_st,
+      const char* user_id, const char* avatar_id)
+{
+   static char url[PATH_MAX_LENGTH];
+   static char url_encoded[PATH_MAX_LENGTH];
+   static char full_path[PATH_MAX_LENGTH];
+   static char buf[PATH_MAX_LENGTH];
+   file_transfer_t     *transf = NULL;
+
+   fill_pathname_application_special(buf,
+            sizeof(buf),
+            APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_DISCORD_AVATARS);
+   fill_pathname_join_special(full_path, buf, avatar_id, sizeof(full_path));
+   strlcpy(discord_st->user_avatar,
+         avatar_id, sizeof(discord_st->user_avatar));
+
+   if (path_is_valid(full_path))
+      return true;
+
+   if (string_is_empty(avatar_id))
+      return false;
+
+   snprintf(url, sizeof(url), "%s/%s/%s" FILE_PATH_PNG_EXTENSION, CDN_URL, user_id, avatar_id);
+   net_http_urlencode_full(url_encoded, url, sizeof(url_encoded));
+   snprintf(buf, sizeof(buf), "%s" FILE_PATH_PNG_EXTENSION, avatar_id);
+
+   transf           = (file_transfer_t*)malloc(sizeof(*transf));
+
+   transf->enum_idx  = MENU_ENUM_LABEL_CB_DISCORD_AVATAR;
+   strlcpy(transf->path, buf, sizeof(transf->path));
+   transf->user_data = NULL;
+
+   task_push_http_transfer_file(url_encoded, true, NULL, cb_generic_download, transf);
+
+   return false;
+}
+#endif
+
+static void handle_discord_ready(const DiscordUser* connectedUser)
+{
+   discord_state_t *discord_st = &discord_state_st;
+   strlcpy(discord_st->user_name,
+         connectedUser->username, sizeof(discord_st->user_name));
+
+#ifdef HAVE_MENU
+   discord_download_avatar(discord_st,
+         connectedUser->userId, connectedUser->avatar);
+#endif
+}
+
+static void handle_discord_disconnected(int errcode, const char* message)
+{
+}
+
+static void handle_discord_error(int errcode, const char* message)
+{
+}
+
+static void handle_discord_join_cb(retro_task_t *task, void *task_data,
+      void *user_data, const char *error)
+{
+   char hostname[512];
+   struct netplay_room *room;
+   char *room_data             = NULL;
+   http_transfer_data_t *data  = (http_transfer_data_t*)task_data;
+   discord_state_t *discord_st = &discord_state_st;
+
+   if (error)
+      goto done;
+   if (!data || !data->data || !data->len)
+      goto done;
+   if (data->status != 200)
+      goto done;
+
+   if (!(room_data = (char*)malloc(data->len + 1)))
+      goto done;
+   memcpy(room_data, data->data, data->len);
+   room_data[data->len] = '\0';
+
+   netplay_rooms_parse(room_data, strlen(room_data));
+   free(room_data);
+
+   if ((room = netplay_room_get(0)))
+   {
+      if (room->host_method == NETPLAY_HOST_METHOD_MITM)
+         snprintf(hostname, sizeof(hostname), "%s|%d|%s",
+            room->mitm_address, room->mitm_port, room->mitm_session);
+      else
+         snprintf(hostname, sizeof(hostname), "%s|%d",
+            room->address, room->port);
+
+      discord_st->connecting = true;
+      if (discord_st->ready)
+         discord_update(PRESENCE_NETPLAY_CLIENT);
+
+      task_push_netplay_crc_scan(room->gamecrc, room->gamename,
+         room->subsystem_name, room->corename, hostname);
+   }
+
+   netplay_rooms_free();
+
+done:
+   free(user_data);
+}
+
+static void handle_discord_join(const char *secret)
+{
+   int room_id;
+   char url[512];
+
+   if ((room_id = (int)strtol(secret, NULL, 10)))
+   {
+      size_t _len;
+      discord_state_t *discord_st = &discord_state_st;
+      snprintf(discord_st->peer_party_id,
+            sizeof(discord_st->peer_party_id),
+            "%d", room_id);
+
+      _len = strlcpy(url, FILE_PATH_LOBBY_LIBRETRO_URL, sizeof(url));
+      strlcpy(url       + _len,
+            discord_st->peer_party_id,
+            sizeof(url) - _len);
+
+      task_push_http_transfer(url, true, NULL, handle_discord_join_cb, NULL);
+   }
+}
+
+static void handle_discord_spectate(const char *secret)
+{
+}
+
+#if 0
+#ifdef HAVE_MENU
+static void handle_discord_join_response(void *ignore, const char *line)
+{
+   /* TODO/FIXME: needs in-game widgets */
+   if (strstr(line, "yes"))
+      Discord_Respond(user_id, DISCORD_REPLY_YES);
+
+   menu_input_dialog_end();
+   retroarch_menu_running_finished(false);
+}
+#endif
+#endif
+
+static void handle_discord_join_request(const DiscordUser *request)
+{
+#ifdef HAVE_MENU
+#if 0
+   char buf[PATH_MAX_LENGTH];
+   menu_input_ctx_line_t line = {0};
+#endif
+   discord_state_t *discord_st = &discord_state_st;
+
+   discord_download_avatar(discord_st, request->userId, request->avatar);
+
+#if 0
+   /* TODO/FIXME: Needs in-game widgets */
+   retroarch_menu_running();
+
+   snprintf(buf, sizeof(buf), "%s %s?",
+      msg_hash_to_str(MSG_DISCORD_CONNECTION_REQUEST), request->username);
+   line.label         = buf;
+   line.label_setting = "no_setting";
+   line.cb            = handle_discord_join_response;
+
+   /* TODO/FIXME: needs in-game widgets
+    * TODO/FIXME: bespoke dialog, should show while in-game
+    * and have a hotkey to accept
+    * TODO/FIXME: show avatar of the user connecting
+    */
+   if (!menu_input_dialog_start(&line))
+      return;
+#endif
+#endif
+}
+
+void discord_update(enum presence presence)
+{
+   discord_state_t *discord_st = &discord_state_st;
+#ifdef HAVE_CHEEVOS
+   char cheevos_richpresence[256];
+   char cheevos_badge_url[256];
+#endif
+
+   if (presence == discord_st->status)
+      return;
+
+   if (!discord_st->connecting
+         &&
+         (   presence == PRESENCE_NONE
+          || presence == PRESENCE_MENU))
+   {
+      memset(&discord_st->presence,
+            0, sizeof(discord_st->presence));
+      discord_st->peer_party_id[0] = '\0';
+   }
+
+   switch (presence)
+   {
+      case PRESENCE_MENU:
+         discord_st->presence.details        = msg_hash_to_str(
+               MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU);
+         discord_st->presence.largeImageKey  = "base";
+         discord_st->presence.largeImageText = msg_hash_to_str(
+               MENU_ENUM_LABEL_VALUE_NO_CORE);
+         discord_st->presence.instance       = 0;
+         break;
+      case PRESENCE_GAME_PAUSED:
+         discord_st->presence.smallImageKey  = "paused";
+         discord_st->presence.smallImageText = msg_hash_to_str(
+               MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PAUSED);
+         discord_st->presence.details        = msg_hash_to_str(
+               MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME_PAUSED);
+         discord_st->pause_time              = time(0);
+         discord_st->elapsed_time            = difftime(discord_st->pause_time,
+               discord_st->start_time);
+         discord_st->presence.startTimestamp = discord_st->pause_time;
+         break;
+      case PRESENCE_GAME:
+         {
+            core_info_t      *core_info     = NULL;
+            core_info_get_current_core(&core_info);
+
+            if (core_info)
+            {
+               const char *system_id               =
+                    core_info->system_id
+                  ? core_info->system_id
+                  : "core";
+               const char *label                   = NULL;
+               const struct playlist_entry *entry  = NULL;
+               playlist_t *current_playlist        = playlist_get_cached();
+
+               if (current_playlist)
+               {
+                  playlist_get_index_by_path(
+                        current_playlist,
+                        path_get(RARCH_PATH_CONTENT),
+                        &entry);
+
+                  if (entry && !string_is_empty(entry->label))
+                     label = entry->label;
+               }
+
+               if (!label)
+                  label = path_basename(path_get(RARCH_PATH_BASENAME));
+               discord_st->presence.largeImageKey = system_id;
+
+               if (core_info->display_name)
+                  discord_st->presence.largeImageText =
+                     core_info->display_name;
+
+               discord_st->start_time              = time(0);
+               if (discord_st->pause_time != 0)
+                  discord_st->start_time           = time(0) -
+                     discord_st->elapsed_time;
+
+               discord_st->pause_time              = 0;
+               discord_st->elapsed_time            = 0;
+
+               discord_st->presence.smallImageKey  = "playing";
+               discord_st->presence.smallImageText = msg_hash_to_str(
+                     MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PLAYING);
+               discord_st->presence.startTimestamp = discord_st->start_time;
+
+#ifdef HAVE_CHEEVOS
+               if (rcheevos_get_game_badge_url(cheevos_badge_url, sizeof(cheevos_badge_url)))
+                  discord_st->presence.largeImageKey = cheevos_badge_url;
+
+               if (rcheevos_get_richpresence(cheevos_richpresence, sizeof(cheevos_richpresence)) > 0)
+                  discord_st->presence.details     = cheevos_richpresence;
+               else
+#endif
+                  discord_st->presence.details     = msg_hash_to_str(
+                     MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME);
+
+               discord_st->presence.state          = label;
+               discord_st->presence.instance       = 0;
+
+               if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
+               {
+                  discord_st->peer_party_id[0]     = '\0';
+                  discord_st->connecting           = false;
+                  discord_st->presence.partyId     = NULL;
+                  discord_st->presence.partyMax    = 0;
+                  discord_st->presence.partySize   = 0;
+                  discord_st->presence.joinSecret  = (const char*)'\0';
+               }
+            }
+         }
+         break;
+      case PRESENCE_NETPLAY_HOSTING:
+         {
+            char join_secret[128];
+            struct netplay_room *room   = &networking_state_get_ptr()->host_room;
+            if (room->id == 0)
+               return;
+
+            snprintf(discord_st->self_party_id,
+                  sizeof(discord_st->self_party_id), "%d", room->id);
+            snprintf(join_secret,
+                  sizeof(join_secret), "%d|%" PRId64,
+                  room->id, cpu_features_get_time_usec());
+
+            discord_st->presence.joinSecret     = strdup(join_secret);
+#if 0
+            discord_st->presence.spectateSecret = "SPECSPECSPEC";
+#endif
+            discord_st->presence.partyId        = strdup(discord_st->self_party_id);
+            discord_st->presence.partyMax       = 2;
+            discord_st->presence.partySize      = 1;
+         }
+         break;
+      case PRESENCE_NETPLAY_CLIENT:
+         discord_st->presence.partyId    = strdup(discord_st->peer_party_id);
+         break;
+      case PRESENCE_NETPLAY_NETPLAY_STOPPED:
+         {
+            if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
+            !netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_CONNECTED, NULL))
+            {
+               discord_st->peer_party_id[0]     = '\0';
+               discord_st->connecting           = false;
+               discord_st->presence.partyId     = NULL;
+               discord_st->presence.partyMax    = 0;
+               discord_st->presence.partySize   = 0;
+               discord_st->presence.joinSecret  = (const char*)'\0';
+            }
+         }
+         break;
+#ifdef HAVE_CHEEVOS
+      case PRESENCE_RETROACHIEVEMENTS:
+         if (discord_st->pause_time)
+            return;
+
+         if (rcheevos_get_game_badge_url(cheevos_badge_url, sizeof(cheevos_badge_url)))
+            discord_st->presence.largeImageKey = cheevos_badge_url;
+
+         if (rcheevos_get_richpresence(cheevos_richpresence, sizeof(cheevos_richpresence)) > 0)
+            discord_st->presence.details = cheevos_richpresence;
+         presence = PRESENCE_GAME;
+         break;
+#endif
+      case PRESENCE_SHUTDOWN:
+            discord_st->presence.partyId    = NULL;
+            discord_st->presence.partyMax   = 0;
+            discord_st->presence.partySize  = 0;
+            discord_st->presence.joinSecret = (const char*)'\0';
+            discord_st->connecting          = false;
+      default:
+         break;
+   }
+
+   Discord_UpdatePresence(&discord_st->presence);
+#ifdef DISCORD_DISABLE_IO_THREAD
+   Discord_UpdateConnection();
+#endif
+   discord_st->status = presence;
+}
+
+void discord_init(const char *discord_app_id, char *args)
+{
+   size_t _len;
+   DiscordEventHandlers handlers;
+#ifdef _WIN32
+   char full_path[PATH_MAX_LENGTH];
+#endif
+   char command[PATH_MAX_LENGTH];
+   discord_state_t *discord_st = &discord_state_st;
+
+   discord_st->start_time      = time(0);
+
+   handlers.ready              = handle_discord_ready;
+   handlers.disconnected       = handle_discord_disconnected;
+   handlers.errored            = handle_discord_error;
+   handlers.joinGame           = handle_discord_join;
+   handlers.spectateGame       = handle_discord_spectate;
+   handlers.joinRequest        = handle_discord_join_request;
+
+   Discord_Initialize(discord_app_id, &handlers, 0, NULL);
+#ifdef DISCORD_DISABLE_IO_THREAD
+   Discord_UpdateConnection();
+#endif
+
+#ifdef _WIN32
+   fill_pathname_application_path(full_path, sizeof(full_path));
+   if (strstr(args, full_path))
+      strlcpy(command, args, sizeof(command));
+   else
+   {
+      path_basedir(full_path);
+      _len = strlcpy(command, full_path, sizeof(command));
+      strlcpy(command       + _len,
+            args,
+            sizeof(command) - _len);
+   }
+#else
+   _len = strlcpy(command, "sh -c ", sizeof(command));
+   strlcpy(command + _len, args, sizeof(command) - _len);
+#endif
+   Discord_Register(discord_app_id, command);
+#ifdef DISCORD_DISABLE_IO_THREAD
+   Discord_UpdateConnection();
+#endif
+   discord_st->ready = true;
+}
diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index 03548892c3..2ba5202abb 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -209,7 +209,7 @@ const mitm_server_t netplay_mitm_server_list[NETPLAY_MITM_SERVERS] = {
    { "custom",    MENU_ENUM_LABEL_VALUE_NETPLAY_MITM_SERVER_LOCATION_CUSTOM }
 };
 
-static net_driver_state_t networking_driver_st;
+static net_driver_state_t networking_driver_st = {0};
 
 net_driver_state_t *networking_state_get_ptr(void)
 {
diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c
index c3d10d2ee4..9b6f989f18 100644
--- a/tasks/task_netplay_find_content.c
+++ b/tasks/task_netplay_find_content.c
@@ -91,7 +91,7 @@ struct netplay_crc_scan_data
    char hostname[512];
 };
 
-static struct netplay_crc_scan_state scan_state;
+static struct netplay_crc_scan_state scan_state = {0};
 
 static bool find_content_by_crc(playlist_config_t *playlist_config,
       const struct string_list *playlists, uint32_t crc,
diff --git a/tasks/task_netplay_lan_scan.c b/tasks/task_netplay_lan_scan.c
index ca2d123f14..f34d1cb56b 100644
--- a/tasks/task_netplay_lan_scan.c
+++ b/tasks/task_netplay_lan_scan.c
@@ -87,7 +87,7 @@ static void task_netplay_lan_scan_callback(retro_task_t *task,
 
 bool task_push_netplay_lan_scan(void (*cb)(const void*), unsigned timeout)
 {
-   static struct netplay_lan_scan_data data;
+   static struct netplay_lan_scan_data data = {0};
    retro_task_t *task;
 
    /* Do not run more than one LAN scan task at a time. */
diff --git a/tasks/task_netplay_nat_traversal.c b/tasks/task_netplay_nat_traversal.c
index b4d7203e5d..3b7fa3634d 100644
--- a/tasks/task_netplay_nat_traversal.c
+++ b/tasks/task_netplay_nat_traversal.c
@@ -163,8 +163,8 @@ done:
 
 static void task_netplay_nat_traversal_handler(retro_task_t *task)
 {
-   static struct natt_device    device;
    static struct natt_discovery discovery = {-1, -1};
+   static struct natt_device    device    = {0};
    struct nat_traversal_data   *data      = (struct nat_traversal_data*)task->task_data;
 
    /* Try again on the next call. */