diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index 746dee3ab8..3747d7a19b 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -32,6 +32,7 @@
 #endif
 
 #include <compat/strl.h>
+#include <string/stdstring.h>
 #include <file/file_path.h>
 #ifndef IS_SALAMANDER
 #include <lists/file_list.h>
@@ -125,7 +126,7 @@ static void frontend_ps3_get_environment_settings(int *argc, char *argv[],
    /* not launched from external launcher, set default path */
    // second param is multiMAN SELF file
    if(path_file_exists(argv[2]) && *argc > 1
-         && (!strcmp(argv[2], EMULATOR_CONTENT_DIR)))
+         && (string_is_equal(argv[2], EMULATOR_CONTENT_DIR)))
    {
       multiman_detected = true;
       RARCH_LOG("Started from multiMAN, auto-game start enabled.\n");
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 070a87bd67..1e6c6073f3 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -17,6 +17,7 @@
 #include <string.h>
 
 #include <compat/strl.h>
+#include <string/stdstring.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -82,7 +83,7 @@ frontend_ctx_driver_t *frontend_ctx_find_driver(const char *ident)
 
    for (i = 0; frontend_ctx_drivers[i]; i++)
    {
-      if (!strcmp(frontend_ctx_drivers[i]->ident, ident))
+      if (string_is_equal(frontend_ctx_drivers[i]->ident, ident))
          return frontend_ctx_drivers[i];
    }
 
diff --git a/frontend/frontend_salamander.c b/frontend/frontend_salamander.c
index a8581aab09..7ddf61093e 100644
--- a/frontend/frontend_salamander.c
+++ b/frontend/frontend_salamander.c
@@ -133,7 +133,7 @@ static void salamander_init(char *s, size_t len)
          config_get_array(conf, "libretro_path", tmp_str, sizeof(tmp_str));
          config_file_free(conf);
 
-         if (strcmp(tmp_str, "builtin") != 0)
+         if (!string_is_equal(tmp_str, "builtin"))
             strlcpy(s, tmp_str, len);
       }
 #ifdef GEKKO
@@ -146,7 +146,7 @@ static void salamander_init(char *s, size_t len)
 #endif
    }
 
-   if (!config_file_exists || !strcmp(s, ""))
+   if (!config_file_exists || string_is_equal(s, ""))
    {
       char executable_name[PATH_MAX_LENGTH];
 
diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c
index ff7f851206..0f99dccf10 100644
--- a/libretro-common/net/net_http.c
+++ b/libretro-common/net/net_http.c
@@ -28,6 +28,7 @@
 #include <net/net_compat.h>
 #include <net/net_socket.h>
 #include <compat/strl.h>
+#include <string/stdstring.h>
 
 enum
 {
@@ -350,7 +351,7 @@ bool net_http_update(struct http_t *state, size_t* progress, size_t* total)
                state->len = strtol(state->data + 
                      strlen("Content-Length: "), NULL, 10);
             }
-            if (!strcmp(state->data, "Transfer-Encoding: chunked"))
+            if (string_is_equal(state->data, "Transfer-Encoding: chunked"))
                state->bodytype = T_CHUNK;
 
             /* TODO: save headers somewhere */
diff --git a/libretro-common/net/test/Makefile b/libretro-common/net/test/Makefile
index 6578f5116d..f4ae977a6b 100644
--- a/libretro-common/net/test/Makefile
+++ b/libretro-common/net/test/Makefile
@@ -13,9 +13,10 @@ CFLAGS += -Wall -pedantic -std=gnu99
 
 HTTP_TEST_C = \
 				  $(LIBRETRO_COMM_DIR)/net/net_http.c \
-				  net_http_test.c \
 				  $(LIBRETRO_COMM_DIR)/net/net_compat.c \
-				  $(LIBRETRO_COMM_DIR)/compat/compat_strl.c
+				  $(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
+				  $(LIBRETRO_COMM_DIR)/string/stdstring.c \
+				  net_http_test.c
 
 HTTP_TEST_OBJS := $(HTTP_TEST_C:.c=.o)