diff --git a/audio/audio_dsp_filter.c b/audio/audio_dsp_filter.c
index 6a2abd1500..aaa948070e 100644
--- a/audio/audio_dsp_filter.c
+++ b/audio/audio_dsp_filter.c
@@ -24,6 +24,7 @@
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 #include <features/features_cpu.h>
+#include <string/stdstring.h>
 
 #include "audio_dsp_filter.h"
 #include "audio_filters/dspfilter.h"
@@ -64,7 +65,7 @@ static const struct dspfilter_implementation *find_implementation(
    unsigned i;
    for (i = 0; i < dsp->num_plugs; i++)
    {
-      if (!strcmp(dsp->plugs[i].impl->short_ident, ident))
+      if (string_is_equal(dsp->plugs[i].impl->short_ident, ident))
          return dsp->plugs[i].impl;
    }
 
diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c
index d5e8f14b51..d6a6b2c798 100644
--- a/audio/drivers/alsa.c
+++ b/audio/drivers/alsa.c
@@ -16,9 +16,11 @@
 #include <stdlib.h>
 
 #include <lists/string_list.h>
+#include <string/stdstring.h>
 
 #include <alsa/asoundlib.h>
 
+
 #include "../audio_driver.h"
 #include "../../configuration.h"
 #include "../../verbosity.h"
@@ -356,7 +358,7 @@ static void *alsa_device_list_new(void *data)
       /* description of device IOID - input / output identifcation
        * ("Input" or "Output"), NULL means both) */
 
-      if (!io || !strcmp(io,"Output"))
+      if (!io || string_is_equal(io,"Output"))
          string_list_append(s, name, attr);
 
       if (name)
diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 453604cb4d..f1ac4bc3bf 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -25,6 +25,7 @@
 
 #include <retro_assert.h>
 #include <dynamic/dylib.h>
+#include <string/stdstring.h>
 
 #include "vulkan_common.h"
 #include "../../performance_counters.h"
@@ -1242,7 +1243,7 @@ static bool vulkan_find_extensions(const char **exts, unsigned num_exts,
       found = false;
       for (i = 0; i < property_count; i++)
       {
-         if (!strcmp(exts[ext], properties[i].extensionName))
+         if (string_is_equal(exts[ext], properties[i].extensionName))
          {
             found = true;
             break;
diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c
index e4c21883ed..00b7ad8192 100644
--- a/gfx/drivers/drm_gfx.c
+++ b/gfx/drivers/drm_gfx.c
@@ -21,6 +21,7 @@
 #include <errno.h>
 
 #include <rthreads/rthreads.h>
+#include <string/stdstring.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -360,7 +361,7 @@ static uint32_t get_plane_prop_id(uint32_t obj_id, const char *name)
       /* We look for the prop_id we need */
       for (j = 0; j < props->count_props; j++)
       {
-         if (!strcmp(props_info[j]->name, name))
+         if (string_is_equal(props_info[j]->name, name))
             return props_info[j]->prop_id;
       }
       RARCH_ERR ("DRM: plane %d fb property ID with name %s not found\n",
@@ -407,7 +408,7 @@ static uint64_t drm_plane_type(drmModePlane *plane)
    for (j = 0; j < props->count_props; j++)
    {
       /* found the type property */
-      if ( !strcmp(drmModeGetProperty(drm.fd, props->props[j])->name, "type"))
+      if (string_is_equal(drmModeGetProperty(drm.fd, props->props[j])->name, "type"))
          return (props->prop_values[j]);
    }
    return (0);
diff --git a/gfx/video_filter.c b/gfx/video_filter.c
index c4b240386d..cc2903bba0 100644
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@@ -20,6 +20,7 @@
 #include <lists/dir_list.h>
 #include <dynamic/dylib.h>
 #include <features/features_cpu.h>
+#include <string/stdstring.h>
 
 #include "../frontend/frontend_driver.h"
 #include "../config_file_userdata.h"
@@ -107,7 +108,7 @@ softfilter_find_implementation(rarch_softfilter_t *filt, const char *ident)
 
    for (i = 0; i < filt->num_plugs; i++)
    {
-      if (!strcmp(filt->plugs[i].impl->short_ident, ident))
+      if (string_is_equal(filt->plugs[i].impl->short_ident, ident))
          return filt->plugs[i].impl;
    }
 
diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index 025b138dfe..b8a307074a 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -347,11 +347,11 @@ static void udev_input_handle_hotplug(udev_input_t *udev)
    if (string_is_equal(action, "add"))
    {
       device_handle_cb cb      = NULL;
-      if (!strcmp(devtype, "keyboard"))
+      if (string_is_equal(devtype, "keyboard"))
          cb = udev_handle_keyboard;
-      else if (!strcmp(devtype, "touchpad"))
+      else if (string_is_equal(devtype, "touchpad"))
          cb = udev_handle_touchpad;
-      else if (!strcmp(devtype, "mouse"))
+      else if (string_is_equal(devtype, "mouse"))
          cb = udev_handle_mouse;
 
       RARCH_LOG("[udev]: Hotplug add %s: %s.\n", devtype, devnode);
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 3591c826da..8729fab3cc 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -2545,16 +2545,16 @@ static int action_ok_delete_entry(const char *path,
 
    menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist);
 
-   if (!strcmp(playlist->conf_path, g_defaults.content_history->conf_path))
+   if (string_is_equal(playlist->conf_path, g_defaults.content_history->conf_path))
       playlist = g_defaults.content_history;
 #ifdef HAVE_FFMPEG
-   else if (!strcmp(playlist->conf_path, g_defaults.music_history->conf_path))
+   else if (string_is_equal(playlist->conf_path, g_defaults.music_history->conf_path))
       playlist = g_defaults.music_history;
-   else if (!strcmp(playlist->conf_path, g_defaults.video_history->conf_path))
+   else if (string_is_equal(playlist->conf_path, g_defaults.video_history->conf_path))
       playlist = g_defaults.video_history;
 #endif
 #ifdef HAVE_IMAGEVIEWER
-   else if (!strcmp(playlist->conf_path, g_defaults.image_history->conf_path))
+   else if (string_is_equal(playlist->conf_path, g_defaults.image_history->conf_path))
       playlist = g_defaults.image_history;
 #endif